jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-16 23:42:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move libcockatrice_server to libcockatrice_network/server/remote

Browse source 
Took 1 hour 41 minutes

Took 39 seconds

Took 4 minutes
This commit is contained in:
Lukas Brübach 2025-10-08 15:29:44 +02:00
parent eb7c4cae6c
commit 133c02f973
118 changed files with 218 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

8
servatrice/src/isl_interface.cpp
View file

@ -3,6 +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 <QSslSocket>
#include <google/protobuf/descriptor.h>
#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
@ -16,10 +20,6 @@
#include <libcockatrice/protocol/pb/event_user_left.pb.h>
#include <libcockatrice/protocol/pb/event_user_message.pb.h>
#include <libcockatrice/protocol/pb/isl_message.pb.h>
#include <libcockatrice/server/debug_pb_message.h>
#include <libcockatrice/server/get_pb_extension.h>
#include <libcockatrice/server/server_protocolhandler.h>
#include <libcockatrice/server/server_room.h>
void IslInterface::sharedCtor(const QSslCertificate &cert, const QSslKey &privateKey)
{

4
servatrice/src/servatrice.cpp
View file

@ -29,6 +29,8 @@
#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>
@ -43,8 +45,6 @@
#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>
#include <libcockatrice/server/server_room.h>
#include <libcockatrice/utility/featureset.h>
Servatrice_GameServer::Servatrice_GameServer(Servatrice *_server,
int _numberPools,

2
servatrice/src/servatrice.h
View file

@ -20,6 +20,7 @@
#ifndef SERVATRICE_H
#define SERVATRICE_H
#include <../../libcockatrice_network/libcockatrice/server/remote/server.h>
#include <QHostAddress>
#include <QMetaType>
#include <QMutex>
@ -29,7 +30,6 @@
#include <QSslKey>
#include <QTcpServer>
#include <QWebSocketServer>
#include <libcockatrice/server/server.h>
#include <utility>
Q_DECLARE_METATYPE(QSqlDatabase)

4
servatrice/src/servatrice_database_interface.h
View file

@ -1,12 +1,12 @@
#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 <QChar>
#include <QHash>
#include <QObject>
#include <QSqlDatabase>
#include <libcockatrice/server/server.h>
#include <libcockatrice/server/server_database_interface.h>
#define DATABASE_SCHEMA_VERSION 34

4
servatrice/src/serversocketinterface.cpp
View file

@ -28,6 +28,8 @@
#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>
@ -78,8 +80,6 @@
#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/server/server_response_containers.h>
#include <libcockatrice/server/server_room.h>
#include <libcockatrice/utility/trice_limits.h>
#include <string>

4
servatrice/src/serversocketinterface.h
View file

@ -20,11 +20,11 @@
#ifndef SERVERSOCKETINTERFACE_H
#define SERVERSOCKETINTERFACE_H
#include <../../libcockatrice_network/libcockatrice/server/remote/server_protocolhandler.h>
#include <QHostAddress>
#include <QMutex>
#include <QTcpSocket>
#include <QWebSocket>
#include <libcockatrice/server/server_protocolhandler.h>
class Servatrice;
class Servatrice_DatabaseInterface;
@ -146,7 +146,7 @@ public:
AbstractServerSocketInterface(Servatrice *_server,
Servatrice_DatabaseInterface *_databaseInterface,
QObject *parent = 0);
~AbstractServerSocketInterface(){};
~AbstractServerSocketInterface() {};
bool initSession();
virtual QHostAddress getPeerAddress() const = 0;