aboutsummaryrefslogtreecommitdiff
path: root/Core/CoreObject
diff options
context:
space:
mode:
authorDarkelarious <github@333networks.com>2025-03-08 15:11:53 +0100
committerDarkelarious <github@333networks.com>2025-03-08 15:11:53 +0100
commit74ff50c5ca343b5829287f6e7ee2b916aa29720e (patch)
tree00011aba29c389b17e9a1c538e552fbe1c6e131e /Core/CoreObject
parent920fa82d1e184732205fcbbd96b2143f9503e8e3 (diff)
downloadMasterserver-Qt5-74ff50c5ca343b5829287f6e7ee2b916aa29720e.tar.gz
Masterserver-Qt5-74ff50c5ca343b5829287f6e7ee2b916aa29720e.zip
reorganise files
Sort out code/source files that were mixed with other repository files. No new functional changes.
Diffstat (limited to 'Core/CoreObject')
-rw-r--r--Core/CoreObject/coreobject.cpp5
-rw-r--r--Core/CoreObject/coreobject.h30
-rw-r--r--Core/CoreObject/serverinfostructure.h31
3 files changed, 0 insertions, 66 deletions
diff --git a/Core/CoreObject/coreobject.cpp b/Core/CoreObject/coreobject.cpp
deleted file mode 100644
index 11d1ab6..0000000
--- a/Core/CoreObject/coreobject.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "coreobject.h"
-
-CoreObject::CoreObject()
-{
-}
diff --git a/Core/CoreObject/coreobject.h b/Core/CoreObject/coreobject.h
deleted file mode 100644
index 91bd33b..0000000
--- a/Core/CoreObject/coreobject.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef COREOBJECT_H
-#define COREOBJECT_H
-
-#include "Core/CoreObject/serverinfostructure.h"
-#include "Core/GameInfo/gameinfostructure.h"
-#include "Logger/logger.h"
-#include "Settings/settingstructure.h"
-
-class CoreObject
-{
-public:
- CoreObject();
-
- // struct with internal and external settings
- SettingStructure Settings;
-
- // list of game details: gamename, cipher
- QHash<QString, GameInfo> SupportedGames;
-
- // logging functions
- Logger Log;
-
- // server address list acquired through third party masterservers
- QList<ServerInfo> PendingServers;
-
- // generate our session/identification string, to prevent self-syncing
- QString masterserverIdentity; // msid value
-};
-
-#endif // COREOBJECT_H
diff --git a/Core/CoreObject/serverinfostructure.h b/Core/CoreObject/serverinfostructure.h
deleted file mode 100644
index 4f86adb..0000000
--- a/Core/CoreObject/serverinfostructure.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef SERVERINFOSTRUCTURE_H
-#define SERVERINFOSTRUCTURE_H
-
-#include <QDateTime>
-#include <QHostAddress>
-
-struct ServerInfo
-{
- // server address
- QHostAddress ip;
-
- // server port
- unsigned short port = 0;
-
- // gamename
- QString gamename = "";
-
- // date that the serverinfo was added or last updated
- qint64 time = QDateTime::currentSecsSinceEpoch();
-};
-
-// compare operator
-inline bool operator== (const ServerInfo serverInfo1, const ServerInfo serverInfo2)
-{
- // compare address, port and gamename. ignore time.
- return ( serverInfo1.ip.isEqual(serverInfo2.ip) and
- serverInfo1.port == serverInfo2.port and
- serverInfo1.gamename == serverInfo2.gamename );
-}
-
-#endif // SERVERINFOSTRUCTURE_H