matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix includes for GUI stuff

Browse Source
This commit is contained in:
Simon Robertshaw 2013-03-22 14:26:24 +00:00
parent 9abe51526c
commit bdc69f31c0
32 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SConscript
View File

@ -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")

2
src/gui/Style.cpp
View File

@ -1,6 +1,6 @@
#include <iostream>
#include "Style.h"
#include "gui/Style.h"
#include "gui/interface/Colour.h"
namespace style {

6
src/gui/colourpicker/ColourPickerActivity.cpp
View File

@ -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)),

2
src/gui/dialogues/ConfirmPrompt.cpp
View File

@ -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"

2
src/gui/dialogues/ErrorMessage.cpp
View File

@ -1,4 +1,4 @@
#include "Style.h"
#include "gui/Style.h"
#include "ErrorMessage.h"
#include "gui/interface/Button.h"
#include "gui/interface/Label.h"

2
src/gui/dialogues/InformationMessage.cpp
View File

@ -1,4 +1,4 @@
#include "Style.h"
#include "gui/Style.h"
#include "InformationMessage.h"
#include "gui/interface/Button.h"
#include "gui/interface/Label.h"

2
src/gui/dialogues/TextPrompt.cpp
View File

@ -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

6
src/gui/elementsearch/ElementSearchActivity.cpp
View File

@ -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
{

2
src/gui/elementsearch/ElementSearchActivity.h
View File

@ -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;

8
src/gui/filebrowser/FileBrowserActivity.cpp
View File

@ -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;

26
src/gui/game/GameController.cpp
View File

@ -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"

2
src/gui/game/GameModel.cpp
View File

@ -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"

6
src/gui/game/GameView.cpp
View File

@ -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"

4
src/gui/game/PropertyTool.cpp
View File

@ -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
{

2
src/gui/game/SignTool.cpp
View File

@ -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"

2
src/gui/game/Tool.cpp
View File

@ -1,6 +1,6 @@
#include <string>
#include "Tool.h"
#include "game/Brush.h"
#include "gui/game/Brush.h"
#include "simulation/Simulation.h"

2
src/gui/interface/DropDown.cpp
View File

@ -1,5 +1,5 @@
#include <iostream>
#include "Style.h"
#include "gui/Style.h"
#include "Button.h"
#include "DropDown.h"

2
src/gui/interface/ProgressBar.cpp
View File

@ -1,5 +1,5 @@
#include "ProgressBar.h"
#include "Style.h"
#include "gui/Style.h"
using namespace ui;

2
src/gui/localbrowser/LocalBrowserController.cpp
View File

@ -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"

4
src/gui/localbrowser/LocalBrowserView.cpp
View File

@ -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"

2
src/gui/login/LoginView.cpp
View File

@ -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
{

2
src/gui/options/OptionsController.cpp
View File

@ -1,5 +1,5 @@
#include "OptionsController.h"
#include "dialogues/ErrorMessage.h"
#include "gui/dialogues/ErrorMessage.h"
OptionsController::OptionsController(GameModel * gModel_, ControllerCallback * callback_):
callback(callback_),

2
src/gui/options/OptionsModel.cpp
View File

@ -1,5 +1,5 @@
#include "simulation/Air.h"
#include "game/GameModel.h"
#include "gui/game/GameModel.h"
#include "OptionsModel.h"
OptionsModel::OptionsModel(GameModel * gModel_) {

2
src/gui/options/OptionsView.cpp
View File

@ -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"

4
src/gui/preview/PreviewController.cpp
View File

@ -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):

6
src/gui/preview/PreviewView.cpp
View File

@ -2,14 +2,14 @@
#include <vector>
#include <cmath>
#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"

2
src/gui/profile/ProfileActivity.cpp
View File

@ -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"

8
src/gui/save/LocalSaveActivity.cpp
View File

@ -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
{

8
src/gui/save/ServerSaveActivity.cpp
View File

@ -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

6
src/gui/search/SearchController.cpp
View File

@ -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"

2
src/gui/tags/TagsView.cpp
View File

@ -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"

2
src/gui/update/UpdateActivity.cpp
View File

@ -1,6 +1,6 @@
#include <bzlib.h>
#include <sstream>
#include "dialogues/ConfirmPrompt.h"
#include "gui/dialogues/ConfirmPrompt.h"
#include "gui/interface/Engine.h"
#include "UpdateActivity.h"
#include "tasks/Task.h"