Fix includes for GUI stuff

6 files changed, 21 insertions, 21 deletions

diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp
index db572e6..8df5036 100644
--- a/src/gui/game/GameController.cpp
+++ b/src/gui/game/GameController.cpp
@@ -7,23 +7,23 @@
 #include "GameModel.h"
 #include "client/SaveInfo.h"
 #include "client/GameSave.h"
-#include "search/SearchController.h"
-#include "render/RenderController.h"
-#include "login/LoginController.h"
+#include "gui/search/SearchController.h"
+#include "gui/render/RenderController.h"
+#include "gui/login/LoginController.h"
 #include "gui/interface/Point.h"
-#include "dialogues/ErrorMessage.h"
-#include "dialogues/InformationMessage.h"
-#include "dialogues/ConfirmPrompt.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/dialogues/InformationMessage.h"
+#include "gui/dialogues/ConfirmPrompt.h"
 #include "GameModelException.h"
 #include "simulation/Air.h"
-#include "elementsearch/ElementSearchActivity.h"
-#include "profile/ProfileActivity.h"
-#include "colourpicker/ColourPickerActivity.h"
-#include "update/UpdateActivity.h"
+#include "gui/elementsearch/ElementSearchActivity.h"
+#include "gui/profile/ProfileActivity.h"
+#include "gui/colourpicker/ColourPickerActivity.h"
+#include "gui/update/UpdateActivity.h"
 #include "Notification.h"
-#include "filebrowser/FileBrowserActivity.h"
-#include "save/LocalSaveActivity.h"
-#include "save/ServerSaveActivity.h"
+#include "gui/filebrowser/FileBrowserActivity.h"
+#include "gui/save/LocalSaveActivity.h"
+#include "gui/save/ServerSaveActivity.h"
 #include "gui/interface/Keys.h"
 #include "simulation/Snapshot.h"
 #include "debug/DebugInfo.h"
diff --git a/src/gui/game/GameModel.cpp b/src/gui/game/GameModel.cpp
index a72845c..37194a5 100644
--- a/src/gui/game/GameModel.cpp
+++ b/src/gui/game/GameModel.cpp
@@ -12,7 +12,7 @@
 #include "BitmapBrush.h"
 #include "client/Client.h"
 #include "client/GameSave.h"
-#include "game/DecorationTool.h"
+#include "gui/game/DecorationTool.h"
 #include "GameModelException.h"
 #include "QuickOptions.h"
 #include "Format.h"
diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp
index b7db87f..c11a59d 100644
--- a/src/gui/game/GameView.cpp
+++ b/src/gui/game/GameView.cpp
@@ -2,7 +2,7 @@
 #include <iomanip>
 
 #include "Config.h"
-#include "Style.h"
+#include "gui/Style.h"
 #include "GameView.h"
 #include "graphics/Graphics.h"
 #include "gui/interface/Window.h"
@@ -10,10 +10,10 @@
 #include "gui/interface/Colour.h"
 #include "gui/interface/Keys.h"
 #include "gui/interface/Slider.h"
-#include "search/Thumbnail.h"
+#include "gui/search/Thumbnail.h"
 #include "simulation/SaveRenderer.h"
 #include "simulation/SimulationData.h"
-#include "dialogues/ConfirmPrompt.h"
+#include "gui/dialogues/ConfirmPrompt.h"
 #include "Format.h"
 #include "QuickOption.h"
 #include "IntroText.h"
diff --git a/src/gui/game/PropertyTool.cpp b/src/gui/game/PropertyTool.cpp
index fda3e90..05726d3 100644
--- a/src/gui/game/PropertyTool.cpp
+++ b/src/gui/game/PropertyTool.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <sstream>
-#include "Style.h"
+#include "gui/Style.h"
 #include "simulation/Simulation.h"
 #include "Tool.h"
 #include "gui/interface/Window.h"
@@ -9,7 +9,7 @@
 #include "gui/interface/Textbox.h"
 #include "gui/interface/DropDown.h"
 #include "gui/interface/Keys.h"
-#include "dialogues/ErrorMessage.h"
+#include "gui/dialogues/ErrorMessage.h"
 
 class PropertyWindow: public ui::Window
 {
diff --git a/src/gui/game/SignTool.cpp b/src/gui/game/SignTool.cpp
index 10de6ed..a4042b1 100644
--- a/src/gui/game/SignTool.cpp
+++ b/src/gui/game/SignTool.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "Style.h"
+#include "gui/Style.h"
 #include "simulation/Simulation.h"
 #include "Tool.h"
 #include "gui/interface/Window.h"
diff --git a/src/gui/game/Tool.cpp b/src/gui/game/Tool.cpp
index 42f9b59..def6e46 100644
--- a/src/gui/game/Tool.cpp
+++ b/src/gui/game/Tool.cpp
@@ -1,6 +1,6 @@
 #include <string>
 #include "Tool.h"
-#include "game/Brush.h"
+#include "gui/game/Brush.h"
 
 #include "simulation/Simulation.h"