From bdc69f31c0be94191015838886bdcc2bc67f1acb Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Fri, 22 Mar 2013 14:26:24 +0000 Subject: [PATCH] Fix includes for GUI stuff --- SConscript | 1 + src/gui/Style.cpp | 2 +- src/gui/colourpicker/ColourPickerActivity.cpp | 6 ++--- src/gui/dialogues/ConfirmPrompt.cpp | 2 +- src/gui/dialogues/ErrorMessage.cpp | 2 +- src/gui/dialogues/InformationMessage.cpp | 2 +- src/gui/dialogues/TextPrompt.cpp | 2 +- .../elementsearch/ElementSearchActivity.cpp | 6 ++--- src/gui/elementsearch/ElementSearchActivity.h | 2 +- src/gui/filebrowser/FileBrowserActivity.cpp | 8 +++--- src/gui/game/GameController.cpp | 26 +++++++++---------- src/gui/game/GameModel.cpp | 2 +- src/gui/game/GameView.cpp | 6 ++--- src/gui/game/PropertyTool.cpp | 4 +-- src/gui/game/SignTool.cpp | 2 +- src/gui/game/Tool.cpp | 2 +- src/gui/interface/DropDown.cpp | 2 +- src/gui/interface/ProgressBar.cpp | 2 +- .../localbrowser/LocalBrowserController.cpp | 2 +- src/gui/localbrowser/LocalBrowserView.cpp | 4 +-- src/gui/login/LoginView.cpp | 2 +- src/gui/options/OptionsController.cpp | 2 +- src/gui/options/OptionsModel.cpp | 2 +- src/gui/options/OptionsView.cpp | 2 +- src/gui/preview/PreviewController.cpp | 4 +-- src/gui/preview/PreviewView.cpp | 6 ++--- src/gui/profile/ProfileActivity.cpp | 2 +- src/gui/save/LocalSaveActivity.cpp | 8 +++--- src/gui/save/ServerSaveActivity.cpp | 8 +++--- src/gui/search/SearchController.cpp | 6 ++--- src/gui/tags/TagsView.cpp | 2 +- src/gui/update/UpdateActivity.cpp | 2 +- 32 files changed, 66 insertions(+), 65 deletions(-) diff --git a/SConscript b/SConscript index 69aa6fefd..847ce44f5 100644 --- a/SConscript +++ b/SConscript @@ -258,6 +258,7 @@ if(GetOption('macosx')): if(GetOption('win')): sources += env.RES('resources/powder-res.rc') sources+=Glob("src/*/*.cpp") +sources+=Glob("src/gui/*/*.cpp") sources+=Glob("src/simulation/elements/*.cpp") sources+=Glob("src/simulation/tools/*.cpp") sources+=Glob("src/client/requestbroker/*.cpp") diff --git a/src/gui/Style.cpp b/src/gui/Style.cpp index 920e1b51a..29e1d405f 100644 --- a/src/gui/Style.cpp +++ b/src/gui/Style.cpp @@ -1,6 +1,6 @@ #include -#include "Style.h" +#include "gui/Style.h" #include "gui/interface/Colour.h" namespace style { diff --git a/src/gui/colourpicker/ColourPickerActivity.cpp b/src/gui/colourpicker/ColourPickerActivity.cpp index 1e5c0c19e..a7ac2398e 100644 --- a/src/gui/colourpicker/ColourPickerActivity.cpp +++ b/src/gui/colourpicker/ColourPickerActivity.cpp @@ -4,10 +4,10 @@ #include "gui/interface/Textbox.h" #include "gui/interface/Label.h" #include "gui/interface/Keys.h" -#include "game/Tool.h" -#include "Style.h" +#include "gui/game/Tool.h" +#include "gui/Style.h" #include "Format.h" -#include "game/GameModel.h" +#include "gui/game/GameModel.h" ColourPickerActivity::ColourPickerActivity(ui::Colour initialColour, ColourPickedCallback * callback) : WindowActivity(ui::Point(-1, -1), ui::Point(266, 175)), diff --git a/src/gui/dialogues/ConfirmPrompt.cpp b/src/gui/dialogues/ConfirmPrompt.cpp index d558195f9..ba4060f34 100644 --- a/src/gui/dialogues/ConfirmPrompt.cpp +++ b/src/gui/dialogues/ConfirmPrompt.cpp @@ -1,5 +1,5 @@ #include "ConfirmPrompt.h" -#include "Style.h" +#include "gui/Style.h" #include "gui/interface/Label.h" #include "gui/interface/Button.h" #include "PowderToy.h" diff --git a/src/gui/dialogues/ErrorMessage.cpp b/src/gui/dialogues/ErrorMessage.cpp index 37a635c56..b793aeee1 100644 --- a/src/gui/dialogues/ErrorMessage.cpp +++ b/src/gui/dialogues/ErrorMessage.cpp @@ -1,4 +1,4 @@ -#include "Style.h" +#include "gui/Style.h" #include "ErrorMessage.h" #include "gui/interface/Button.h" #include "gui/interface/Label.h" diff --git a/src/gui/dialogues/InformationMessage.cpp b/src/gui/dialogues/InformationMessage.cpp index 2455b72a1..23b92dc37 100644 --- a/src/gui/dialogues/InformationMessage.cpp +++ b/src/gui/dialogues/InformationMessage.cpp @@ -1,4 +1,4 @@ -#include "Style.h" +#include "gui/Style.h" #include "InformationMessage.h" #include "gui/interface/Button.h" #include "gui/interface/Label.h" diff --git a/src/gui/dialogues/TextPrompt.cpp b/src/gui/dialogues/TextPrompt.cpp index 929bf069e..92539ca8d 100644 --- a/src/gui/dialogues/TextPrompt.cpp +++ b/src/gui/dialogues/TextPrompt.cpp @@ -2,7 +2,7 @@ #include "TextPrompt.h" #include "gui/interface/Label.h" #include "gui/interface/Button.h" -#include "Style.h" +#include "gui/Style.h" #include "PowderToy.h" class CloseAction: public ui::ButtonAction diff --git a/src/gui/elementsearch/ElementSearchActivity.cpp b/src/gui/elementsearch/ElementSearchActivity.cpp index 6f4943817..624f0ff3c 100644 --- a/src/gui/elementsearch/ElementSearchActivity.cpp +++ b/src/gui/elementsearch/ElementSearchActivity.cpp @@ -3,9 +3,9 @@ #include "gui/interface/Textbox.h" #include "gui/interface/Label.h" #include "gui/interface/Keys.h" -#include "game/Tool.h" -#include "Style.h" -#include "game/GameModel.h" +#include "gui/game/Tool.h" +#include "gui/Style.h" +#include "gui/game/GameModel.h" class ElementSearchActivity::ToolAction: public ui::ButtonAction { diff --git a/src/gui/elementsearch/ElementSearchActivity.h b/src/gui/elementsearch/ElementSearchActivity.h index da2b2547a..dec37e537 100644 --- a/src/gui/elementsearch/ElementSearchActivity.h +++ b/src/gui/elementsearch/ElementSearchActivity.h @@ -6,7 +6,7 @@ #include "Activity.h" #include "gui/interface/Window.h" #include "gui/interface/Textbox.h" -#include "game/ToolButton.h" +#include "gui/game/ToolButton.h" class Tool; diff --git a/src/gui/filebrowser/FileBrowserActivity.cpp b/src/gui/filebrowser/FileBrowserActivity.cpp index 5c97bae7e..7612ae228 100644 --- a/src/gui/filebrowser/FileBrowserActivity.cpp +++ b/src/gui/filebrowser/FileBrowserActivity.cpp @@ -9,12 +9,12 @@ #include "client/Client.h" #include "client/SaveFile.h" #include "client/GameSave.h" -#include "Style.h" +#include "gui/Style.h" #include "tasks/Task.h" #include "simulation/SaveRenderer.h" -#include "dialogues/TextPrompt.h" -#include "dialogues/ConfirmPrompt.h" -#include "dialogues/ErrorMessage.h" +#include "gui/dialogues/TextPrompt.h" +#include "gui/dialogues/ConfirmPrompt.h" +#include "gui/dialogues/ErrorMessage.h" class Thumbnail; diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp index db572e6f6..8df50366e 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 a72845c88..37194a516 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 b7db87f95..c11a59d0a 100644 --- a/src/gui/game/GameView.cpp +++ b/src/gui/game/GameView.cpp @@ -2,7 +2,7 @@ #include #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 fda3e90f1..05726d38d 100644 --- a/src/gui/game/PropertyTool.cpp +++ b/src/gui/game/PropertyTool.cpp @@ -1,6 +1,6 @@ #include #include -#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 10de6ed18..a4042b197 100644 --- a/src/gui/game/SignTool.cpp +++ b/src/gui/game/SignTool.cpp @@ -1,5 +1,5 @@ #include -#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 42f9b59d2..def6e46f5 100644 --- a/src/gui/game/Tool.cpp +++ b/src/gui/game/Tool.cpp @@ -1,6 +1,6 @@ #include #include "Tool.h" -#include "game/Brush.h" +#include "gui/game/Brush.h" #include "simulation/Simulation.h" diff --git a/src/gui/interface/DropDown.cpp b/src/gui/interface/DropDown.cpp index 4c1d76111..f1dda7c33 100644 --- a/src/gui/interface/DropDown.cpp +++ b/src/gui/interface/DropDown.cpp @@ -1,5 +1,5 @@ #include -#include "Style.h" +#include "gui/Style.h" #include "Button.h" #include "DropDown.h" diff --git a/src/gui/interface/ProgressBar.cpp b/src/gui/interface/ProgressBar.cpp index eda88f696..95da72cec 100644 --- a/src/gui/interface/ProgressBar.cpp +++ b/src/gui/interface/ProgressBar.cpp @@ -1,5 +1,5 @@ #include "ProgressBar.h" -#include "Style.h" +#include "gui/Style.h" using namespace ui; diff --git a/src/gui/localbrowser/LocalBrowserController.cpp b/src/gui/localbrowser/LocalBrowserController.cpp index 232e18d2d..a1a01ed40 100644 --- a/src/gui/localbrowser/LocalBrowserController.cpp +++ b/src/gui/localbrowser/LocalBrowserController.cpp @@ -3,7 +3,7 @@ #include "client/Client.h" #include "LocalBrowserController.h" #include "gui/interface/Engine.h" -#include "dialogues/ConfirmPrompt.h" +#include "gui/dialogues/ConfirmPrompt.h" #include "tasks/TaskWindow.h" #include "tasks/Task.h" diff --git a/src/gui/localbrowser/LocalBrowserView.cpp b/src/gui/localbrowser/LocalBrowserView.cpp index 68753c5db..a25c281f9 100644 --- a/src/gui/localbrowser/LocalBrowserView.cpp +++ b/src/gui/localbrowser/LocalBrowserView.cpp @@ -8,8 +8,8 @@ #include "gui/interface/SaveButton.h" #include "gui/interface/Keys.h" -#include "dialogues/ErrorMessage.h" -#include "dialogues/ConfirmPrompt.h" +#include "gui/dialogues/ErrorMessage.h" +#include "gui/dialogues/ConfirmPrompt.h" #include "LocalBrowserController.h" #include "LocalBrowserModel.h" #include "LocalBrowserModelException.h" diff --git a/src/gui/login/LoginView.cpp b/src/gui/login/LoginView.cpp index 2bb9eaf24..8ebbeb5b9 100644 --- a/src/gui/login/LoginView.cpp +++ b/src/gui/login/LoginView.cpp @@ -4,7 +4,7 @@ #include "gui/interface/Label.h" #include "gui/interface/Textbox.h" #include "gui/interface/Keys.h" -#include "Style.h" +#include "gui/Style.h" class LoginView::LoginAction : public ui::ButtonAction { diff --git a/src/gui/options/OptionsController.cpp b/src/gui/options/OptionsController.cpp index 17c42f4fd..672f2fcb8 100644 --- a/src/gui/options/OptionsController.cpp +++ b/src/gui/options/OptionsController.cpp @@ -1,5 +1,5 @@ #include "OptionsController.h" -#include "dialogues/ErrorMessage.h" +#include "gui/dialogues/ErrorMessage.h" OptionsController::OptionsController(GameModel * gModel_, ControllerCallback * callback_): callback(callback_), diff --git a/src/gui/options/OptionsModel.cpp b/src/gui/options/OptionsModel.cpp index 8ca2a3074..829bf0ccd 100644 --- a/src/gui/options/OptionsModel.cpp +++ b/src/gui/options/OptionsModel.cpp @@ -1,5 +1,5 @@ #include "simulation/Air.h" -#include "game/GameModel.h" +#include "gui/game/GameModel.h" #include "OptionsModel.h" OptionsModel::OptionsModel(GameModel * gModel_) { diff --git a/src/gui/options/OptionsView.cpp b/src/gui/options/OptionsView.cpp index f3c9d05c9..71c86aa4c 100644 --- a/src/gui/options/OptionsView.cpp +++ b/src/gui/options/OptionsView.cpp @@ -1,5 +1,5 @@ #include "OptionsView.h" -#include "Style.h" +#include "gui/Style.h" #include "gui/interface/Button.h" #include "gui/interface/Label.h" #include "gui/interface/DropDown.h" diff --git a/src/gui/preview/PreviewController.cpp b/src/gui/preview/PreviewController.cpp index 1616c6399..30622c2a2 100644 --- a/src/gui/preview/PreviewController.cpp +++ b/src/gui/preview/PreviewController.cpp @@ -4,8 +4,8 @@ #include "PreviewView.h" #include "PreviewModel.h" #include "PreviewModelException.h" -#include "dialogues/ErrorMessage.h" -#include "login/LoginController.h" +#include "gui/dialogues/ErrorMessage.h" +#include "gui/login/LoginController.h" #include "Controller.h" PreviewController::PreviewController(int saveID, int saveDate, ControllerCallback * callback): diff --git a/src/gui/preview/PreviewView.cpp b/src/gui/preview/PreviewView.cpp index 81b0d342f..42117322f 100644 --- a/src/gui/preview/PreviewView.cpp +++ b/src/gui/preview/PreviewView.cpp @@ -2,14 +2,14 @@ #include #include #include "PreviewView.h" -#include "dialogues/TextPrompt.h" +#include "gui/dialogues/TextPrompt.h" #include "simulation/SaveRenderer.h" #include "gui/interface/Point.h" #include "gui/interface/Window.h" #include "gui/interface/Textbox.h" -#include "Style.h" +#include "gui/Style.h" #include "Format.h" -#include "search/Thumbnail.h" +#include "gui/search/Thumbnail.h" #include "client/Client.h" #include "gui/interface/ScrollPanel.h" #include "gui/interface/AvatarButton.h" diff --git a/src/gui/profile/ProfileActivity.cpp b/src/gui/profile/ProfileActivity.cpp index d60885919..54da81e4b 100644 --- a/src/gui/profile/ProfileActivity.cpp +++ b/src/gui/profile/ProfileActivity.cpp @@ -6,7 +6,7 @@ #include "gui/interface/AvatarButton.h" #include "gui/interface/ScrollPanel.h" #include "gui/interface/Keys.h" -#include "Style.h" +#include "gui/Style.h" #include "client/Client.h" #include "client/UserInfo.h" #include "client/requestbroker/RequestListener.h" diff --git a/src/gui/save/LocalSaveActivity.cpp b/src/gui/save/LocalSaveActivity.cpp index 17c3f89e2..f494f0992 100644 --- a/src/gui/save/LocalSaveActivity.cpp +++ b/src/gui/save/LocalSaveActivity.cpp @@ -2,13 +2,13 @@ #include "gui/interface/Label.h" #include "gui/interface/Textbox.h" #include "gui/interface/Button.h" -#include "search/Thumbnail.h" +#include "gui/search/Thumbnail.h" #include "client/requestbroker/RequestBroker.h" -#include "dialogues/ErrorMessage.h" -#include "dialogues/ConfirmPrompt.h" +#include "gui/dialogues/ErrorMessage.h" +#include "gui/dialogues/ConfirmPrompt.h" #include "client/Client.h" #include "client/GameSave.h" -#include "Style.h" +#include "gui/Style.h" class LocalSaveActivity::CancelAction: public ui::ButtonAction { diff --git a/src/gui/save/ServerSaveActivity.cpp b/src/gui/save/ServerSaveActivity.cpp index a845815ee..e8dfc1d5e 100644 --- a/src/gui/save/ServerSaveActivity.cpp +++ b/src/gui/save/ServerSaveActivity.cpp @@ -4,12 +4,12 @@ #include "gui/interface/Button.h" #include "gui/interface/Checkbox.h" #include "client/requestbroker/RequestBroker.h" -#include "dialogues/ErrorMessage.h" -#include "dialogues/ConfirmPrompt.h" -#include "dialogues/InformationMessage.h" +#include "gui/dialogues/ErrorMessage.h" +#include "gui/dialogues/ConfirmPrompt.h" +#include "gui/dialogues/InformationMessage.h" #include "client/Client.h" #include "tasks/Task.h" -#include "Style.h" +#include "gui/Style.h" #include "client/GameSave.h" class ServerSaveActivity::CancelAction: public ui::ButtonAction diff --git a/src/gui/search/SearchController.cpp b/src/gui/search/SearchController.cpp index d53bbff60..b8819624f 100644 --- a/src/gui/search/SearchController.cpp +++ b/src/gui/search/SearchController.cpp @@ -5,9 +5,9 @@ #include "SearchModel.h" #include "SearchView.h" #include "gui/interface/Panel.h" -#include "dialogues/ConfirmPrompt.h" -#include "dialogues/ErrorMessage.h" -#include "preview/PreviewController.h" +#include "gui/dialogues/ConfirmPrompt.h" +#include "gui/dialogues/ErrorMessage.h" +#include "gui/preview/PreviewController.h" #include "client/Client.h" #include "tasks/Task.h" #include "tasks/TaskWindow.h" diff --git a/src/gui/tags/TagsView.cpp b/src/gui/tags/TagsView.cpp index 313943cd9..03b289366 100644 --- a/src/gui/tags/TagsView.cpp +++ b/src/gui/tags/TagsView.cpp @@ -1,7 +1,7 @@ #include "client/Client.h" #include "TagsView.h" -#include "dialogues/ErrorMessage.h" +#include "gui/dialogues/ErrorMessage.h" #include "TagsController.h" #include "TagsModel.h" #include "TagsModelException.h" diff --git a/src/gui/update/UpdateActivity.cpp b/src/gui/update/UpdateActivity.cpp index fed34d4bc..7eadf7f7f 100644 --- a/src/gui/update/UpdateActivity.cpp +++ b/src/gui/update/UpdateActivity.cpp @@ -1,6 +1,6 @@ #include #include -#include "dialogues/ConfirmPrompt.h" +#include "gui/dialogues/ConfirmPrompt.h" #include "gui/interface/Engine.h" #include "UpdateActivity.h" #include "tasks/Task.h"