From 59c83ff0e2482a402a14e6ba666aad93dd0d5cd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Wed, 8 Oct 2025 15:39:41 +0200
Subject: [PATCH] Adjust servatrice.

Took 5 minutes


Took 2 minutes
---
 servatrice/CMakeLists.txt                      | 4 ++--
 servatrice/src/isl_interface.cpp               | 8 ++++----
 servatrice/src/servatrice.cpp                  | 4 ++--
 servatrice/src/servatrice.h                    | 2 +-
 servatrice/src/servatrice_database_interface.h | 4 ++--
 servatrice/src/serversocketinterface.cpp       | 6 +++---
 servatrice/src/serversocketinterface.h         | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt
index 02a2e1afd..a17b517a0 100644
--- a/servatrice/CMakeLists.txt
+++ b/servatrice/CMakeLists.txt
@@ -107,12 +107,12 @@ add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESO
 
 if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD")
   target_link_libraries(
-    servatrice libcockatrice_deck_list libcockatrice_server Threads::Threads ${SERVATRICE_QT_MODULES}
+      servatrice libcockatrice_deck_list libcockatrice_network Threads::Threads ${SERVATRICE_QT_MODULES}
     ${LIBEXECINFO_LIBRARY}
   )
 else()
   target_link_libraries(
-    servatrice libcockatrice_deck_list libcockatrice_server Threads::Threads ${SERVATRICE_QT_MODULES}
+      servatrice libcockatrice_deck_list libcockatrice_network Threads::Threads ${SERVATRICE_QT_MODULES}
   )
 endif()
 
diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp
index 0453b83bd..5fb48a6f6 100644
--- a/servatrice/src/isl_interface.cpp
+++ b/servatrice/src/isl_interface.cpp
@@ -3,10 +3,10 @@
 #include "main.h"
 #include "server_logger.h"
 
-#include <../../libcockatrice_network/libcockatrice/server/remote/server_protocolhandler.h>
-#include <../../libcockatrice_network/libcockatrice/server/remote/server_room.h>
-#include <../../libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.h>
-#include <../../libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.h>
+#include <libcockatrice/network/server/remote/server_protocolhandler.h>
+#include <libcockatrice/network/server/remote/server_room.h>
+#include <libcockatrice/protocol/debug_pb_message.h>
+#include <libcockatrice/protocol/get_pb_extension.h>
 #include <QSslSocket>
 #include <google/protobuf/descriptor.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index b246c2b66..3fea6b38d 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -29,8 +29,6 @@
 #include "settingscache.h"
 #include "smtpclient.h"
 
-#include <../../libcockatrice_network/libcockatrice/server/remote/server_room.h>
-#include <../../libcockatrice_protocol/libcockatrice/protocol/featureset.h>
 #include <QDateTime>
 #include <QDebug>
 #include <QFile>
@@ -42,6 +40,8 @@
 #include <QUrl>
 #include <iostream>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/network/server/remote/server_room.h>
+#include <libcockatrice/protocol/featureset.h>
 #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_server_message.pb.h>
 #include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h
index d5c87a4ab..93e0ced7f 100644
--- a/servatrice/src/servatrice.h
+++ b/servatrice/src/servatrice.h
@@ -20,7 +20,6 @@
 #ifndef SERVATRICE_H
 #define SERVATRICE_H
 
-#include <../../libcockatrice_network/libcockatrice/server/remote/server.h>
 #include <QHostAddress>
 #include <QMetaType>
 #include <QMutex>
@@ -30,6 +29,7 @@
 #include <QSslKey>
 #include <QTcpServer>
 #include <QWebSocketServer>
+#include <libcockatrice/network/server/remote/server.h>
 #include <utility>
 
 Q_DECLARE_METATYPE(QSqlDatabase)
diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h
index 310aa432d..bb4ebc420 100644
--- a/servatrice/src/servatrice_database_interface.h
+++ b/servatrice/src/servatrice_database_interface.h
@@ -1,8 +1,8 @@
 #ifndef SERVATRICE_DATABASE_INTERFACE_H
 #define SERVATRICE_DATABASE_INTERFACE_H
 
-#include <../../libcockatrice_network/libcockatrice/server/remote/server.h>
-#include <../../libcockatrice_network/libcockatrice/server/remote/server_database_interface.h>
+#include <libcockatrice/network/server/remote/server.h>
+#include <libcockatrice/network/server/remote/server_database_interface.h>
 #include <QChar>
 #include <QHash>
 #include <QObject>
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index 03faa2b0f..e660c41d2 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -28,8 +28,6 @@
 #include "settingscache.h"
 #include "version_string.h"
 
-#include <../../libcockatrice_network/libcockatrice/server/remote/server_response_containers.h>
-#include <../../libcockatrice_network/libcockatrice/server/remote/server_room.h>
 #include <QDateTime>
 #include <QDebug>
 #include <QHostAddress>
@@ -39,6 +37,9 @@
 #include <QString>
 #include <iostream>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/network/server/remote/game/server_player.h>
+#include <libcockatrice/network/server/remote/server_response_containers.h>
+#include <libcockatrice/network/server/remote/server_room.h>
 #include <libcockatrice/protocol/pb/command_deck_del.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_download.pb.h>
@@ -79,7 +80,6 @@
 #include <libcockatrice/protocol/pb/serverinfo_deckstorage.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/server/game/server_player.h>
 #include <libcockatrice/utility/trice_limits.h>
 #include <string>
 
diff --git a/servatrice/src/serversocketinterface.h b/servatrice/src/serversocketinterface.h
index 213dae1d9..c0fa5a84c 100644
--- a/servatrice/src/serversocketinterface.h
+++ b/servatrice/src/serversocketinterface.h
@@ -20,7 +20,7 @@
 #ifndef SERVERSOCKETINTERFACE_H
 #define SERVERSOCKETINTERFACE_H
 
-#include <../../libcockatrice_network/libcockatrice/server/remote/server_protocolhandler.h>
+#include <libcockatrice/network/server/remote/server_protocolhandler.h>
 #include <QHostAddress>
 #include <QMutex>
 #include <QTcpSocket>