moved traintastic and settings class to seperate folder

server/CMakeLists.txt

@@ -127,6 +127,8 @@ file(GLOB SOURCES
   "src/log/*.cpp"
   "src/train/*.hpp"
   "src/train/*.cpp"
+  "src/traintastic/*.hpp"
+  "src/traintastic/*.cpp"
   "src/vehicle/*.hpp"
   "src/vehicle/*.cpp"
   "src/vehicle/rail/*.hpp"

server/src/core/client.cpp

@@ -3,7 +3,7 @@
  *
  * 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
@@ -23,7 +23,7 @@
 #include "client.hpp"
 //#include "console.hpp"
 //#include "objectregistry.hpp"
-#include "traintastic.hpp"
+#include "../traintastic/traintastic.hpp"
 #include "eventloop.hpp"
 #include "session.hpp"
 #include "../log/log.hpp"

server/src/core/idobject.cpp

@@ -1,7 +1,7 @@
 /**
  * Traintastic
  *
- * 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
@@ -19,7 +19,7 @@
  */
 
 #include "idobject.hpp"
-#include "traintastic.hpp"
+#include "../traintastic/traintastic.hpp"
 #include "../world/getworld.hpp"
 #include "attributes.hpp"
 #include "../utils/displayname.hpp"

server/src/core/session.cpp

@@ -23,7 +23,7 @@
 #include "session.hpp"
 #include <boost/algorithm/string.hpp>
 #include <boost/uuid/random_generator.hpp>
-#include "traintastic.hpp"
+#include "../traintastic/traintastic.hpp"
 #include "client.hpp"
 #include "abstractproperty.hpp"
 #include "abstractunitproperty.hpp"
@@ -47,7 +47,7 @@
 
 
 
-#include "settings.hpp"
+#include "../traintastic/settings.hpp"
 
 #include "../hardware/decoder/decoderlist.hpp"
 

server/src/main.cpp

@@ -3,7 +3,7 @@
  *
  * 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
@@ -26,7 +26,7 @@
 #endif
 #include "options.hpp"
 #include "core/eventloop.hpp"
-#include "core/traintastic.hpp"
+#include "traintastic/traintastic.hpp"
 #include "log/log.hpp"
 #include <traintastic/locale/locale.hpp>
 #include <traintastic/utils/standardpaths.hpp>

server/src/os/windows/trayicon.cpp

@@ -3,7 +3,7 @@
  *
  * This file is part of the traintastic source code.
  *
- * Copyright (C) 2021 Reinder Feenstra
+ * Copyright (C) 2021-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
@@ -23,7 +23,7 @@
 #include "trayicon.hpp"
 #include <cassert>
 #include "../../core/eventloop.hpp"
-#include "../../core/traintastic.hpp"
+#include "../../traintastic/traintastic.hpp"
 
 namespace Windows {
 

server/src/traintastic/settings.cpp

@@ -1,5 +1,5 @@
 /**
- * server/src/core/settings.cpp
+ * server/src/traintastic/settings.cpp
  *
  * This file is part of the traintastic source code.
  *
@@ -23,7 +23,7 @@
 #include "settings.hpp"
 #include <fstream>
 #include <iomanip>
-#include "attributes.hpp"
+#include "../core/attributes.hpp"
 #include "traintastic.hpp"
 #include "../log/log.hpp"
 #include "../utils/category.hpp"

server/src/traintastic/settings.hpp

@@ -1,5 +1,5 @@
 /**
- * server/src/core/settings.hpp
+ * server/src/traintastic/settings.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,12 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_CORE_SETTINGS_HPP
-#define TRAINTASTIC_SERVER_CORE_SETTINGS_HPP
+#ifndef TRAINTASTIC_SERVER_TRAINTASTIC_SETTINGS_HPP
+#define TRAINTASTIC_SERVER_TRAINTASTIC_SETTINGS_HPP
 
-#include "object.hpp"
+#include "../core/object.hpp"
 #include <traintastic/utils/stdfilesystem.hpp>
-#include "property.hpp"
+#include "../core/property.hpp"
 
 class Settings : public Object
 {

server/src/traintastic/traintastic.cpp

@@ -1,5 +1,5 @@
 /**
- * server/src/core/traintastic.cpp
+ * server/src/traintastic/traintastic.cpp
  *
  * This file is part of the traintastic source code.
  *
@@ -28,10 +28,9 @@
 #include <version.hpp>
 #include <traintastic/codename.hpp>
 #include <traintastic/utils/str.hpp>
-#include "eventloop.hpp"
-#include "settings.hpp"
-#include "client.hpp"
-#include "attributes.hpp"
+#include "../core/eventloop.hpp"
+#include "../core/client.hpp"
+#include "../core/attributes.hpp"
 #include "../world/world.hpp"
 #include "../world/worldlist.hpp"
 #include "../world/worldloader.hpp"

server/src/traintastic/traintastic.hpp

@@ -1,5 +1,5 @@
 /**
- * server/src/core/traintastic.hpp
+ * server/src/traintastic/traintastic.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,17 +20,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_CORE_TRAINTASTIC_HPP
-#define TRAINTASTIC_SERVER_CORE_TRAINTASTIC_HPP
+#ifndef TRAINTASTIC_SERVER_TRAINTASTIC_TRAINTASTIC_HPP
+#define TRAINTASTIC_SERVER_TRAINTASTIC_TRAINTASTIC_HPP
 
 #include <memory>
 #include <list>
 #include <traintastic/utils/stdfilesystem.hpp>
 #include <boost/asio.hpp>
 #include <boost/uuid/uuid.hpp>
-#include "object.hpp"
-#include "objectproperty.hpp"
-#include "method.hpp"
+#include "../core/object.hpp"
+#include "../core/objectproperty.hpp"
+#include "../core/method.hpp"
 #include "settings.hpp"
 #include "../world/world.hpp"
 #include "../world/worldlist.hpp"

server/src/world/world.cpp

@@ -28,13 +28,13 @@
 #include <boost/uuid/string_generator.hpp>
 #include <boost/uuid/uuid_io.hpp>
 #include "worldsaver.hpp"
-#include "../core/traintastic.hpp"
+#include "../traintastic/traintastic.hpp"
 #include "../core/objectlisttablemodel.hpp"
 #include "../core/attributes.hpp"
 #include "../core/abstractvectorproperty.hpp"
 #include "../log/log.hpp"
 #include "../utils/displayname.hpp"
-#include "../core/traintastic.hpp"
+#include "../traintastic/traintastic.hpp"
 
 using nlohmann::json;
 

server/src/world/worldlist.cpp

@@ -3,7 +3,7 @@
  *
  * This file is part of the traintastic source code.
  *
- * Copyright (C) 2019-2020 Reinder Feenstra
+ * Copyright (C) 2019-2020,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
@@ -23,7 +23,7 @@
 #include "worldlist.hpp"
 #include <fstream>
 #include <boost/uuid/string_generator.hpp>
-#include "../core/traintastic.hpp"
+#include "../traintastic/traintastic.hpp"
 #include "../log/log.hpp"
 #include "worldlisttablemodel.hpp"
 #include "ctwreader.hpp"