diff options
34 files changed, 33 insertions, 33 deletions
diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp index d17e1f6213..05b459f40f 100644 --- a/backends/platform/dc/vmsave.cpp +++ b/backends/platform/dc/vmsave.cpp @@ -28,7 +28,7 @@ #include "dc.h" #include "icon.h" #include <common/savefile.h> -#include <gui/newgui.h> +#include <gui/GuiManager.h> #include <gui/message.h> #include <backends/saves/compressed/compressed-saves.h> diff --git a/backends/platform/ds/arm9/source/dsoptions.cpp b/backends/platform/ds/arm9/source/dsoptions.cpp index a6996c0fcb..277e8876c3 100644 --- a/backends/platform/ds/arm9/source/dsoptions.cpp +++ b/backends/platform/ds/arm9/source/dsoptions.cpp @@ -23,7 +23,7 @@ #include "dsoptions.h" #include "dsmain.h" #include "gui/dialog.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/ListWidget.h" #include "gui/TabWidget.h" #include "osystem_ds.h" diff --git a/backends/platform/wince/CELauncherDialog.cpp b/backends/platform/wince/CELauncherDialog.cpp index b8ca824686..21a967336e 100644 --- a/backends/platform/wince/CELauncherDialog.cpp +++ b/backends/platform/wince/CELauncherDialog.cpp @@ -30,7 +30,7 @@ #include "engines/metaengine.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/widget.h" #include "gui/browser.h" #include "gui/message.h" diff --git a/base/main.cpp b/base/main.cpp index 6a589eb0fb..cc79b6f126 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -43,7 +43,7 @@ #include "common/file.h" #include "common/fs.h" #include "common/system.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/message.h" #if defined(_WIN32_WCE) diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp index 26c3ca1217..4729b248a0 100644 --- a/engines/dialogs.cpp +++ b/engines/dialogs.cpp @@ -32,7 +32,7 @@ #include "graphics/scaler.h" #include "gui/about.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/launcher.h" #include "gui/ListWidget.h" #include "gui/ThemeEval.h" diff --git a/engines/engine.cpp b/engines/engine.cpp index c0de2df66e..b0931d3c42 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -37,7 +37,7 @@ #include "common/savefile.h" #include "common/system.h" #include "gui/message.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "sound/mixer.h" #include "engines/dialogs.h" #include "engines/metaengine.h" diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index cdbc2e3661..bca34ebd1b 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -35,7 +35,7 @@ #include "gui/about.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/ListWidget.h" #include "gui/ThemeEval.h" diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index 13df905f44..6e8995d726 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -28,7 +28,7 @@ #include "common/system.h" #include "gui/message.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "scumm/debugger.h" #include "scumm/dialogs.h" diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 7d44734073..aeb1269865 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -30,7 +30,7 @@ #include "common/system.h" #include "gui/message.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "graphics/cursorman.h" diff --git a/engines/sword1/resman.cpp b/engines/sword1/resman.cpp index 49211e7cfa..e139de0bf1 100644 --- a/engines/sword1/resman.cpp +++ b/engines/sword1/resman.cpp @@ -36,7 +36,7 @@ #include "sword1/swordres.h" #include "gui/message.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" namespace Sword1 { void guiFatalError(char *msg) { diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index 37ac537217..86c8bf1676 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -39,7 +39,7 @@ #include "common/config-manager.h" #include "gui/message.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" namespace Sword1 { diff --git a/gui/EditTextWidget.cpp b/gui/EditTextWidget.cpp index 873c578638..c977ecc3d0 100644 --- a/gui/EditTextWidget.cpp +++ b/gui/EditTextWidget.cpp @@ -24,7 +24,7 @@ #include "gui/EditTextWidget.h" #include "gui/dialog.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/ThemeEval.h" diff --git a/gui/newgui.cpp b/gui/GuiManager.cpp index 49879011e6..00babbea17 100644 --- a/gui/newgui.cpp +++ b/gui/GuiManager.cpp @@ -27,7 +27,7 @@ #include "common/util.h" #include "common/config-manager.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/dialog.h" #include "gui/ThemeEngine.h" #include "gui/ThemeEval.h" diff --git a/gui/newgui.h b/gui/GuiManager.h index c2ec61dd34..c2ec61dd34 100644 --- a/gui/newgui.h +++ b/gui/GuiManager.h diff --git a/gui/KeysDialog.h b/gui/KeysDialog.h index 6d780e665a..d18bcb3617 100644 --- a/gui/KeysDialog.h +++ b/gui/KeysDialog.h @@ -26,7 +26,7 @@ #ifndef KEYSDIALOG_H #define KEYSDIALOG_H -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/dialog.h" #include "gui/ListWidget.h" #include "common/str.h" diff --git a/gui/ListWidget.cpp b/gui/ListWidget.cpp index cb0ef54888..86838d9832 100644 --- a/gui/ListWidget.cpp +++ b/gui/ListWidget.cpp @@ -27,7 +27,7 @@ #include "gui/ListWidget.h" #include "gui/ScrollBarWidget.h" #include "gui/dialog.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/ThemeEval.h" diff --git a/gui/PopUpWidget.cpp b/gui/PopUpWidget.cpp index 60f36247d5..4792833580 100644 --- a/gui/PopUpWidget.cpp +++ b/gui/PopUpWidget.cpp @@ -25,7 +25,7 @@ #include "common/system.h" #include "common/events.h" #include "gui/dialog.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/PopUpWidget.h" #include "engines/engine.h" diff --git a/gui/ScrollBarWidget.cpp b/gui/ScrollBarWidget.cpp index 797bf1fdab..6e27535bfd 100644 --- a/gui/ScrollBarWidget.cpp +++ b/gui/ScrollBarWidget.cpp @@ -24,7 +24,7 @@ #include "ScrollBarWidget.h" #include "gui/dialog.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" namespace GUI { diff --git a/gui/TabWidget.cpp b/gui/TabWidget.cpp index 402e9075c1..3fe000e1ec 100644 --- a/gui/TabWidget.cpp +++ b/gui/TabWidget.cpp @@ -25,7 +25,7 @@ #include "common/util.h" #include "gui/TabWidget.h" #include "gui/dialog.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/ThemeEval.h" diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp index 1a82671c7b..72f841a7a9 100644 --- a/gui/ThemeParser.cpp +++ b/gui/ThemeParser.cpp @@ -33,7 +33,7 @@ #include "gui/ThemeEngine.h" #include "gui/ThemeEval.h" #include "gui/ThemeParser.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "graphics/VectorRenderer.h" namespace GUI { diff --git a/gui/about.cpp b/gui/about.cpp index 923ef36ed9..8e887076b6 100644 --- a/gui/about.cpp +++ b/gui/about.cpp @@ -29,7 +29,7 @@ #include "common/system.h" #include "common/util.h" #include "gui/about.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/widget.h" #include "gui/ThemeEval.h" diff --git a/gui/browser.cpp b/gui/browser.cpp index 02af47ee7c..961f2ced4c 100644 --- a/gui/browser.cpp +++ b/gui/browser.cpp @@ -23,7 +23,7 @@ */ #include "gui/browser.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/ListWidget.h" #include "common/config-manager.h" diff --git a/gui/chooser.cpp b/gui/chooser.cpp index 5ec30f3612..04f68a60b0 100644 --- a/gui/chooser.cpp +++ b/gui/chooser.cpp @@ -24,7 +24,7 @@ #include "common/system.h" #include "gui/chooser.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/ListWidget.h" namespace GUI { diff --git a/gui/console.h b/gui/console.h index 298662a40f..cf86e40bc8 100644 --- a/gui/console.h +++ b/gui/console.h @@ -26,7 +26,7 @@ #define CONSOLE_DIALOG_H #include "gui/dialog.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" namespace GUI { diff --git a/gui/dialog.cpp b/gui/dialog.cpp index 7aea3cb722..2c42cb1d75 100644 --- a/gui/dialog.cpp +++ b/gui/dialog.cpp @@ -24,7 +24,7 @@ #include "common/events.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/dialog.h" #include "gui/widget.h" #include "gui/PopUpWidget.h" diff --git a/gui/editable.cpp b/gui/editable.cpp index f82f06f4ce..38dcb1ecf5 100644 --- a/gui/editable.cpp +++ b/gui/editable.cpp @@ -24,7 +24,7 @@ #include "common/events.h" #include "gui/editable.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" namespace GUI { diff --git a/gui/editable.h b/gui/editable.h index e09c4a3df4..f01a4a5da2 100644 --- a/gui/editable.h +++ b/gui/editable.h @@ -28,7 +28,7 @@ #include "common/str.h" #include "common/rect.h" #include "gui/widget.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" namespace GUI { diff --git a/gui/launcher.cpp b/gui/launcher.cpp index d28e322d15..f28671dff7 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -37,7 +37,7 @@ #include "gui/launcher.h" #include "gui/massadd.h" #include "gui/message.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/options.h" #include "gui/saveload.h" #include "gui/EditTextWidget.h" diff --git a/gui/massadd.cpp b/gui/massadd.cpp index ae37db46f9..642e4c713a 100644 --- a/gui/massadd.cpp +++ b/gui/massadd.cpp @@ -30,7 +30,7 @@ #include "gui/launcher.h" // For addGameToConf() #include "gui/massadd.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/widget.h" diff --git a/gui/message.cpp b/gui/message.cpp index 4d63a96c56..7dc850482b 100644 --- a/gui/message.cpp +++ b/gui/message.cpp @@ -26,7 +26,7 @@ #include "common/str.h" #include "common/system.h" #include "gui/message.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/ThemeEval.h" #include "gui/widget.h" diff --git a/gui/module.mk b/gui/module.mk index 249d6e7fa5..5dfb524e6b 100644 --- a/gui/module.mk +++ b/gui/module.mk @@ -9,11 +9,11 @@ MODULE_OBJS := \ dialog.o \ editable.o \ EditTextWidget.o \ + GuiManager.o \ launcher.o \ ListWidget.o \ massadd.o \ message.o \ - newgui.o \ object.o \ options.o \ PopUpWidget.o \ diff --git a/gui/object.cpp b/gui/object.cpp index c6f554ab83..233a5f07c6 100644 --- a/gui/object.cpp +++ b/gui/object.cpp @@ -25,7 +25,7 @@ #include "common/system.h" #include "gui/object.h" #include "gui/widget.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/ThemeEval.h" namespace GUI { diff --git a/gui/options.cpp b/gui/options.cpp index d435db85a5..c5331bfc42 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -26,7 +26,7 @@ #include "gui/themebrowser.h" #include "gui/chooser.h" #include "gui/message.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/ThemeEval.h" #include "gui/options.h" #include "gui/PopUpWidget.h" diff --git a/gui/widget.cpp b/gui/widget.cpp index 41576b5933..995de2fe06 100644 --- a/gui/widget.cpp +++ b/gui/widget.cpp @@ -26,7 +26,7 @@ #include "graphics/fontman.h" #include "gui/widget.h" #include "gui/dialog.h" -#include "gui/newgui.h" +#include "gui/GuiManager.h" #include "gui/ThemeEval.h" |