moved network related classes to seperate folder

server/CMakeLists.txt

@@ -125,6 +125,8 @@ file(GLOB SOURCES
   "src/hardware/protocol/z21/iohandler/*.cpp"
   "src/log/*.hpp"
   "src/log/*.cpp"
+  "src/network/*.hpp"
+  "src/network/*.cpp"
   "src/train/*.hpp"
   "src/train/*.cpp"
   "src/traintastic/*.hpp"

server/src/network/client.cpp

@@ -1,5 +1,5 @@
 /**
- * server/src/core/client.cpp
+ * server/src/network/client.cpp
  *
  * This file is part of the traintastic source code.
  *
@@ -24,7 +24,7 @@
 //#include "console.hpp"
 //#include "objectregistry.hpp"
 #include "../traintastic/traintastic.hpp"
-#include "eventloop.hpp"
+#include "../core/eventloop.hpp"
 #include "session.hpp"
 #include "../log/log.hpp"
 

server/src/network/client.hpp

@@ -1,9 +1,9 @@
 /**
- * server/src/core/client.hpp
+ * server/src/network/client.hpp
  *
  * This file is part of the traintastic source code.
  *
- * Copyright (C) 2019-2021 Reinder Feenstra
+ * Copyright (C) 2019-2022 Reinder Feenstra
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_CORE_CLIENT_HPP
-#define TRAINTASTIC_SERVER_CORE_CLIENT_HPP
+#ifndef TRAINTASTIC_SERVER_NETWORK_CLIENT_HPP
+#define TRAINTASTIC_SERVER_NETWORK_CLIENT_HPP
 
 //#include "Message.hpp"
 //#include "MessageQueue.hpp"
@@ -36,7 +36,7 @@
 //#include "status.hpp"
 //#include <chrono>
 //#include <cmath>
-#include "objectptr.hpp"
+#include "../core/objectptr.hpp"
 #include <traintastic/network/message.hpp>
 
 class Traintastic;

server/src/network/handlelist.hpp

@@ -1,5 +1,5 @@
 /**
- * server/src/core/handlelist.hpp
+ * server/src/network/handlelist.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_CORE_HANDLELIST_HPP
-#define TRAINTASTIC_SERVER_CORE_HANDLELIST_HPP
+#ifndef TRAINTASTIC_SERVER_NETWORK_HANDLELIST_HPP
+#define TRAINTASTIC_SERVER_NETWORK_HANDLELIST_HPP
 
 #include <cstdint>
 #include <cassert>

server/src/network/session.cpp

@@ -1,5 +1,5 @@
 /**
- * server/src/core/session.cpp
+ * server/src/network/session.cpp
  *
  * This file is part of the traintastic source code.
  *
@@ -25,17 +25,17 @@
 #include <boost/uuid/random_generator.hpp>
 #include "../traintastic/traintastic.hpp"
 #include "client.hpp"
-#include "abstractproperty.hpp"
-#include "abstractunitproperty.hpp"
-#include "abstractvectorproperty.hpp"
-#include "abstractvalueattribute.hpp"
-#include "abstractvaluesattribute.hpp"
+#include "../core/abstractproperty.hpp"
+#include "../core/abstractunitproperty.hpp"
+#include "../core/abstractvectorproperty.hpp"
+#include "../core/abstractvalueattribute.hpp"
+#include "../core/abstractvaluesattribute.hpp"
 #include <traintastic/enum/interfaceitemtype.hpp>
 #include <traintastic/enum/attributetype.hpp>
-#include "tablemodel.hpp"
+#include "../core/tablemodel.hpp"
 #include "../world/world.hpp"
-#include "idobject.hpp"
-#include "subobject.hpp"
+#include "../core/idobject.hpp"
+#include "../core/subobject.hpp"
 #include "../log/log.hpp"
 #include "../log/memorylogger.hpp"
 #include "../hardware/input/monitor/inputmonitor.hpp"

server/src/network/session.hpp

@@ -1,5 +1,5 @@
 /**
- * server/src/core/session.hpp
+ * server/src/network/session.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_CORE_SESSION_HPP
-#define TRAINTASTIC_SERVER_CORE_SESSION_HPP
+#ifndef TRAINTASTIC_SERVER_NETWORK_SESSION_HPP
+#define TRAINTASTIC_SERVER_NETWORK_SESSION_HPP
 
 #include <memory>
 #include <boost/uuid/uuid.hpp>
@@ -29,8 +29,8 @@
 #include <traintastic/network/message.hpp>
 #include <traintastic/enum/tristate.hpp>
 #include "handlelist.hpp"
-#include "objectptr.hpp"
-#include "tablemodelptr.hpp"
+#include "../core/objectptr.hpp"
+#include "../core/tablemodelptr.hpp"
 
 class Client;
 class MemoryLogger;

server/src/traintastic/traintastic.cpp

@@ -29,7 +29,7 @@
 #include <traintastic/codename.hpp>
 #include <traintastic/utils/str.hpp>
 #include "../core/eventloop.hpp"
-#include "../core/client.hpp"
+#include "../network/client.hpp"
 #include "../core/attributes.hpp"
 #include "../world/world.hpp"
 #include "../world/worldlist.hpp"