Renamed gui/newgui.cpp -> gui/GuiManager.cpp and gui/newgui.h -> gui/GuiManager.h

svn-id: r35668
2025-05-13 09:36:21 +00:00 · 2009-01-02 03:21:40 +00:00 · 2009-01-02 03:21:40 +00:00 · 690b88f982
commit 690b88f982
parent 4ec7876972
34 changed files with 33 additions and 33 deletions
--- 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>

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

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

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

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

--- a/gui/GuiManager.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"
--- a/gui/GuiManager.h
+++ b/gui/GuiManager.h
--- 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"
--- 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"

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

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

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

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

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

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

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


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

--- 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 \
--- 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 {
--- 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"
--- 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"