From 94d21f607b45bcc6b27618c060dbee7fd12d23ab Mon Sep 17 00:00:00 2001 From: Reinder Feenstra Date: Thu, 30 Mar 2023 19:34:49 +0200 Subject: [PATCH] fix: more missing includes --- server/src/board/tile/rail/turnout/turnout3wayrailtile.cpp | 1 + .../src/board/tile/rail/turnout/turnoutdoublesliprailtile.cpp | 1 + server/src/board/tile/rail/turnout/turnoutleftrailtile.cpp | 1 + server/src/board/tile/rail/turnout/turnoutrightrailtile.cpp | 1 + .../src/board/tile/rail/turnout/turnoutsinglesliprailtile.cpp | 1 + server/src/board/tile/rail/turnout/turnoutwyerailtile.cpp | 1 + server/src/hardware/decoder/list/decoderlist.cpp | 1 + server/src/hardware/decoder/list/decoderlisttablemodel.cpp | 1 + .../src/hardware/identification/list/identificationlist.cpp | 1 + .../identification/list/identificationlisttablemodel.cpp | 1 + server/src/hardware/input/map/blockinputmapitem.cpp | 1 + server/src/hardware/output/list/outputlisttablemodel.cpp | 1 + server/src/hardware/protocol/traintasticdiy/kernel.cpp | 1 + server/src/hardware/protocol/z21/messages.cpp | 1 + server/src/hardware/throttle/throttle.cpp | 1 + server/test/board/addtile.cpp | 1 + server/test/board/mergetile.cpp | 1 + server/test/board/movetile.cpp | 1 + server/test/board/resizetile.cpp | 1 + server/test/board/saveload.cpp | 1 + server/test/hardware/interface.cpp | 1 + server/test/lua/script.cpp | 1 + server/test/lua/script/class_get.cpp | 4 ++++ server/test/objectcreatedestroy.cpp | 1 + 24 files changed, 27 insertions(+) diff --git a/server/src/board/tile/rail/turnout/turnout3wayrailtile.cpp b/server/src/board/tile/rail/turnout/turnout3wayrailtile.cpp index e90a9d44..e30fda6a 100644 --- a/server/src/board/tile/rail/turnout/turnout3wayrailtile.cpp +++ b/server/src/board/tile/rail/turnout/turnout3wayrailtile.cpp @@ -23,6 +23,7 @@ #include "turnout3wayrailtile.hpp" #include "../../../../core/objectproperty.tpp" #include "../../../../core/attributes.hpp" +#include "../../../../core/objectproperty.tpp" static const std::array positionValues = {TurnoutPosition::Straight, TurnoutPosition::Left, TurnoutPosition::Right, TurnoutPosition::Unknown}; static const std::array setPositionValues = {TurnoutPosition::Straight, TurnoutPosition::Left, TurnoutPosition::Right}; diff --git a/server/src/board/tile/rail/turnout/turnoutdoublesliprailtile.cpp b/server/src/board/tile/rail/turnout/turnoutdoublesliprailtile.cpp index dd0f38cb..934c59ee 100644 --- a/server/src/board/tile/rail/turnout/turnoutdoublesliprailtile.cpp +++ b/server/src/board/tile/rail/turnout/turnoutdoublesliprailtile.cpp @@ -22,6 +22,7 @@ #include "turnoutdoublesliprailtile.hpp" #include "../../../../core/attributes.hpp" +#include "../../../../core/objectproperty.tpp" static const std::array positionValues = {TurnoutPosition::Left, TurnoutPosition::Right, TurnoutPosition::Crossed, TurnoutPosition::Diverged, diff --git a/server/src/board/tile/rail/turnout/turnoutleftrailtile.cpp b/server/src/board/tile/rail/turnout/turnoutleftrailtile.cpp index 7a31774a..0d6a051e 100644 --- a/server/src/board/tile/rail/turnout/turnoutleftrailtile.cpp +++ b/server/src/board/tile/rail/turnout/turnoutleftrailtile.cpp @@ -22,6 +22,7 @@ #include "turnoutleftrailtile.hpp" #include "../../../../core/attributes.hpp" +#include "../../../../core/objectproperty.tpp" static const std::array positionValues = {TurnoutPosition::Straight, TurnoutPosition::Left, TurnoutPosition::Unknown}; static const std::array setPositionValues = {TurnoutPosition::Straight, TurnoutPosition::Left}; diff --git a/server/src/board/tile/rail/turnout/turnoutrightrailtile.cpp b/server/src/board/tile/rail/turnout/turnoutrightrailtile.cpp index 4bfc2649..4bc35614 100644 --- a/server/src/board/tile/rail/turnout/turnoutrightrailtile.cpp +++ b/server/src/board/tile/rail/turnout/turnoutrightrailtile.cpp @@ -22,6 +22,7 @@ #include "turnoutrightrailtile.hpp" #include "../../../../core/attributes.hpp" +#include "../../../../core/objectproperty.tpp" static const std::array positionValues = {TurnoutPosition::Straight, TurnoutPosition::Right, TurnoutPosition::Unknown}; static const std::array setPositionValues = {TurnoutPosition::Straight, TurnoutPosition::Right}; diff --git a/server/src/board/tile/rail/turnout/turnoutsinglesliprailtile.cpp b/server/src/board/tile/rail/turnout/turnoutsinglesliprailtile.cpp index b446e213..57494c03 100644 --- a/server/src/board/tile/rail/turnout/turnoutsinglesliprailtile.cpp +++ b/server/src/board/tile/rail/turnout/turnoutsinglesliprailtile.cpp @@ -22,6 +22,7 @@ #include "turnoutsinglesliprailtile.hpp" #include "../../../../core/attributes.hpp" +#include "../../../../core/objectproperty.tpp" static const std::array positionValues = {TurnoutPosition::Crossed, TurnoutPosition::Diverged, TurnoutPosition::DoubleSlipStraightA, TurnoutPosition::DoubleSlipStraightB, diff --git a/server/src/board/tile/rail/turnout/turnoutwyerailtile.cpp b/server/src/board/tile/rail/turnout/turnoutwyerailtile.cpp index d0383981..076dc760 100644 --- a/server/src/board/tile/rail/turnout/turnoutwyerailtile.cpp +++ b/server/src/board/tile/rail/turnout/turnoutwyerailtile.cpp @@ -22,6 +22,7 @@ #include "turnoutwyerailtile.hpp" #include "../../../../core/attributes.hpp" +#include "../../../../core/objectproperty.tpp" static const std::array positionValues = {TurnoutPosition::Left, TurnoutPosition::Right, TurnoutPosition::Unknown}; static const std::array setPositionValues = {TurnoutPosition::Left, TurnoutPosition::Right}; diff --git a/server/src/hardware/decoder/list/decoderlist.cpp b/server/src/hardware/decoder/list/decoderlist.cpp index 8075d407..6b6c20c6 100644 --- a/server/src/hardware/decoder/list/decoderlist.cpp +++ b/server/src/hardware/decoder/list/decoderlist.cpp @@ -24,6 +24,7 @@ #include "decoderlisttablemodel.hpp" #include "../../../world/getworld.hpp" #include "../../../core/attributes.hpp" +#include "../../../core/objectproperty.tpp" #include "../../../utils/displayname.hpp" #include "../../../utils/ifndefndebug.hpp" diff --git a/server/src/hardware/decoder/list/decoderlisttablemodel.cpp b/server/src/hardware/decoder/list/decoderlisttablemodel.cpp index bfdc6477..b2aa51fc 100644 --- a/server/src/hardware/decoder/list/decoderlisttablemodel.cpp +++ b/server/src/hardware/decoder/list/decoderlisttablemodel.cpp @@ -22,6 +22,7 @@ #include "decoderlisttablemodel.hpp" #include "decoderlist.hpp" +#include "../../../core/objectproperty.tpp" #include "../../../utils/displayname.hpp" static std::string_view displayName(DecoderListColumn column) diff --git a/server/src/hardware/identification/list/identificationlist.cpp b/server/src/hardware/identification/list/identificationlist.cpp index d54f20a1..5bf8c6b3 100644 --- a/server/src/hardware/identification/list/identificationlist.cpp +++ b/server/src/hardware/identification/list/identificationlist.cpp @@ -25,6 +25,7 @@ #include "../identificationcontroller.hpp" #include "../../../world/getworld.hpp" #include "../../../core/attributes.hpp" +#include "../../../core/objectproperty.tpp" #include "../../../utils/displayname.hpp" IdentificationList::IdentificationList(Object& _parent, std::string_view parentPropertyName, IdentificationListColumn _columns) diff --git a/server/src/hardware/identification/list/identificationlisttablemodel.cpp b/server/src/hardware/identification/list/identificationlisttablemodel.cpp index 4b037918..c015d2c0 100644 --- a/server/src/hardware/identification/list/identificationlisttablemodel.cpp +++ b/server/src/hardware/identification/list/identificationlisttablemodel.cpp @@ -22,6 +22,7 @@ #include "identificationlisttablemodel.hpp" #include "identificationlist.hpp" +#include "../../../core/objectproperty.tpp" #include "../../../utils/displayname.hpp" bool IdentificationListTableModel::isListedProperty(std::string_view name) diff --git a/server/src/hardware/input/map/blockinputmapitem.cpp b/server/src/hardware/input/map/blockinputmapitem.cpp index a68d5747..cdda1873 100644 --- a/server/src/hardware/input/map/blockinputmapitem.cpp +++ b/server/src/hardware/input/map/blockinputmapitem.cpp @@ -23,6 +23,7 @@ #include "blockinputmapitem.hpp" #include "blockinputmap.hpp" #include "../../../core/attributes.hpp" +#include "../../../core/objectproperty.tpp" #include "../../../world/getworld.hpp" #include "../../../utils/displayname.hpp" #include "../../../utils/sensor.hpp" diff --git a/server/src/hardware/output/list/outputlisttablemodel.cpp b/server/src/hardware/output/list/outputlisttablemodel.cpp index b05a37e8..8ac885bb 100644 --- a/server/src/hardware/output/list/outputlisttablemodel.cpp +++ b/server/src/hardware/output/list/outputlisttablemodel.cpp @@ -22,6 +22,7 @@ #include "outputlisttablemodel.hpp" #include "outputlist.hpp" +#include "../../../core/objectproperty.tpp" #include "../../../utils/displayname.hpp" bool OutputListTableModel::isListedProperty(std::string_view name) diff --git a/server/src/hardware/protocol/traintasticdiy/kernel.cpp b/server/src/hardware/protocol/traintasticdiy/kernel.cpp index e6f20a11..7c32cba7 100644 --- a/server/src/hardware/protocol/traintasticdiy/kernel.cpp +++ b/server/src/hardware/protocol/traintasticdiy/kernel.cpp @@ -30,6 +30,7 @@ #include "../../../utils/inrange.hpp" #include "../../../utils/setthreadname.hpp" #include "../../../core/eventloop.hpp" +#include "../../../core/objectproperty.tpp" #include "../../../log/log.hpp" #include "../../../world/world.hpp" diff --git a/server/src/hardware/protocol/z21/messages.cpp b/server/src/hardware/protocol/z21/messages.cpp index 4d2bf199..4a651a27 100644 --- a/server/src/hardware/protocol/z21/messages.cpp +++ b/server/src/hardware/protocol/z21/messages.cpp @@ -22,6 +22,7 @@ #include "messages.hpp" #include "../../decoder/decoder.hpp" +#include "../../../core/objectproperty.tpp" #include "../../../utils/tohex.hpp" namespace Z21 { diff --git a/server/src/hardware/throttle/throttle.cpp b/server/src/hardware/throttle/throttle.cpp index 7b0ad9a2..5a972638 100644 --- a/server/src/hardware/throttle/throttle.cpp +++ b/server/src/hardware/throttle/throttle.cpp @@ -22,6 +22,7 @@ #include "throttle.hpp" #include "../../core/attributes.hpp" +#include "../../core/objectproperty.tpp" #include "../../hardware/decoder/decoder.hpp" #include "../../utils/displayname.hpp" #include "../../world/world.hpp" diff --git a/server/test/board/addtile.cpp b/server/test/board/addtile.cpp index a07f8df7..f523f757 100644 --- a/server/test/board/addtile.cpp +++ b/server/test/board/addtile.cpp @@ -22,6 +22,7 @@ #include #include "../src/world/world.hpp" +#include "../src/core/objectproperty.tpp" #include "../src/board/board.hpp" #include "../src/board/boardlist.hpp" diff --git a/server/test/board/mergetile.cpp b/server/test/board/mergetile.cpp index 98d34d5c..03a9fb50 100644 --- a/server/test/board/mergetile.cpp +++ b/server/test/board/mergetile.cpp @@ -22,6 +22,7 @@ #include #include "../src/world/world.hpp" +#include "../src/core/objectproperty.tpp" #include "../src/board/board.hpp" #include "../src/board/boardlist.hpp" #include "../src/board/tile/rail/straightrailtile.hpp" diff --git a/server/test/board/movetile.cpp b/server/test/board/movetile.cpp index 757ee8d2..94b77aee 100644 --- a/server/test/board/movetile.cpp +++ b/server/test/board/movetile.cpp @@ -22,6 +22,7 @@ #include #include "../src/world/world.hpp" +#include "../src/core/objectproperty.tpp" #include "../src/board/board.hpp" #include "../src/board/boardlist.hpp" #include "../src/board/tile/rail/straightrailtile.hpp" diff --git a/server/test/board/resizetile.cpp b/server/test/board/resizetile.cpp index 73ef0328..72b6d1f5 100644 --- a/server/test/board/resizetile.cpp +++ b/server/test/board/resizetile.cpp @@ -22,6 +22,7 @@ #include #include "../src/world/world.hpp" +#include "../src/core/objectproperty.tpp" #include "../src/board/board.hpp" #include "../src/board/boardlist.hpp" #include "../src/board/tile/rail/blockrailtile.hpp" diff --git a/server/test/board/saveload.cpp b/server/test/board/saveload.cpp index 4b2f2c20..fee55a69 100644 --- a/server/test/board/saveload.cpp +++ b/server/test/board/saveload.cpp @@ -24,6 +24,7 @@ #include "../src/world/world.hpp" #include "../src/world/worldloader.hpp" #include "../src/world/worldsaver.hpp" +#include "../src/core/objectproperty.tpp" #include "../src/board/board.hpp" #include "../src/board/boardlist.hpp" #include "../src/board/tile/rail/curve90railtile.hpp" diff --git a/server/test/hardware/interface.cpp b/server/test/hardware/interface.cpp index eb9ee177..14f29941 100644 --- a/server/test/hardware/interface.cpp +++ b/server/test/hardware/interface.cpp @@ -24,6 +24,7 @@ #include #include "../src/world/world.hpp" +#include "../src/core/objectproperty.tpp" #include "../src/hardware/interface/interfacelist.hpp" #include "../src/hardware/decoder/list/decoderlist.hpp" #include "../src/hardware/input/input.hpp" diff --git a/server/test/lua/script.cpp b/server/test/lua/script.cpp index 4ed4279e..b3f33077 100644 --- a/server/test/lua/script.cpp +++ b/server/test/lua/script.cpp @@ -22,6 +22,7 @@ #include #include "../../src/world/world.hpp" +#include "../../src/core/objectproperty.tpp" #include "../../src/lua/scriptlist.hpp" TEST_CASE("Lua script: no code, start/stop, disable", "[lua][lua-script]") diff --git a/server/test/lua/script/class_get.cpp b/server/test/lua/script/class_get.cpp index 179ba478..d2be67ca 100644 --- a/server/test/lua/script/class_get.cpp +++ b/server/test/lua/script/class_get.cpp @@ -22,7 +22,11 @@ #include #include "../../hardware/interfaces.hpp" +#include "../../../src/core/objectproperty.tpp" #include "../../../src/hardware/interface/interfacelist.hpp" +#include "../../../src/hardware/decoder/list/decoderlist.hpp" +#include "../../../src/hardware/input/list/inputlist.hpp" +#include "../../../src/hardware/output/list/outputlist.hpp" #include "../../../src/world/world.hpp" #include "../../../src/lua/enums.hpp" #include "../../../src/lua/sets.hpp" diff --git a/server/test/objectcreatedestroy.cpp b/server/test/objectcreatedestroy.cpp index efc57f84..1c1f3a41 100644 --- a/server/test/objectcreatedestroy.cpp +++ b/server/test/objectcreatedestroy.cpp @@ -22,6 +22,7 @@ #include #include "../src/world/world.hpp" +#include "../src/core/objectproperty.tpp" #include "../src/board/board.hpp" #include "../src/board/boardlist.hpp" #include "../src/hardware/decoder/list/decoderlist.hpp"