diff options
33 files changed, 40 insertions, 40 deletions
diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp index 59c30578dd..2f913055fc 100644 --- a/backends/keymapper/remap-dialog.cpp +++ b/backends/keymapper/remap-dialog.cpp @@ -26,7 +26,7 @@ #ifdef ENABLE_KEYMAPPER -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/widgets/popup.h" #include "gui/widgets/scrollbar.h" #include "gui/ThemeEval.h" diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp index 07ac9460ec..6c8289684f 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/GuiManager.h> +#include <gui/gui-manager.h> #include <gui/message.h> #include <common/zlib.h> diff --git a/backends/platform/ds/arm9/source/dsoptions.cpp b/backends/platform/ds/arm9/source/dsoptions.cpp index 8597b318c9..a693d2aee3 100644 --- a/backends/platform/ds/arm9/source/dsoptions.cpp +++ b/backends/platform/ds/arm9/source/dsoptions.cpp @@ -26,7 +26,7 @@ #include "dsoptions.h" #include "dsmain.h" #include "gui/dialog.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/widgets/list.h" #include "gui/widgets/tab.h" #include "osystem_ds.h" diff --git a/backends/platform/wince/CELauncherDialog.cpp b/backends/platform/wince/CELauncherDialog.cpp index 66a691f51b..de1bb2f1f6 100644 --- a/backends/platform/wince/CELauncherDialog.cpp +++ b/backends/platform/wince/CELauncherDialog.cpp @@ -32,7 +32,7 @@ #include "engines/metaengine.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/widget.h" #include "gui/browser.h" #include "gui/message.h" diff --git a/backends/vkeybd/virtual-keyboard-gui.cpp b/backends/vkeybd/virtual-keyboard-gui.cpp index ad9dd9f638..8bfadfd88c 100644 --- a/backends/vkeybd/virtual-keyboard-gui.cpp +++ b/backends/vkeybd/virtual-keyboard-gui.cpp @@ -29,7 +29,7 @@ #include "graphics/cursorman.h" #include "graphics/fontman.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" namespace Common { diff --git a/base/main.cpp b/base/main.cpp index 44b0aa908d..2af1e3382f 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -49,7 +49,7 @@ #include "common/tokenizer.h" #include "common/translation.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/message.h" #include "gui/error.h" diff --git a/dists/iphone/scummvm.xcodeproj/project.pbxproj b/dists/iphone/scummvm.xcodeproj/project.pbxproj index a2c28f8c66..6e44f351d1 100755 --- a/dists/iphone/scummvm.xcodeproj/project.pbxproj +++ b/dists/iphone/scummvm.xcodeproj/project.pbxproj @@ -917,7 +917,7 @@ DF09418B0F63CB26002D821E /* thumbnail_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */; }; DF09418C0F63CB26002D821E /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; }; DF0941920F63CB26002D821E /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; }; - DF0941930F63CB26002D821E /* GuiManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* GuiManager.cpp */; }; + DF0941930F63CB26002D821E /* gui-manager.hcpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* gui-manager.hcpp */; }; DF0941940F63CB26002D821E /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; }; DF0941950F63CB26002D821E /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; }; DF0941960F63CB26002D821E /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; }; @@ -1061,7 +1061,7 @@ DF2EC51A10E64EE600765801 /* wave6581.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2EC51710E64EE600765801 /* wave6581.cpp */; }; DF2FFB930F485D890006E566 /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; }; DF2FFBD30F485DFB0006E566 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; }; - DF2FFBD90F485E360006E566 /* GuiManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* GuiManager.cpp */; }; + DF2FFBD90F485E360006E566 /* gui-manager.hcpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* gui-manager.hcpp */; }; DF2FFBFC0F4860A60006E566 /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; }; DF2FFC290F4862520006E566 /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; }; DF2FFC2A0F4862520006E566 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; }; @@ -3057,7 +3057,7 @@ DFF95C200FB22D5700A3EC78 /* thumbnail_intern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAAB0010F011392003E9390 /* thumbnail_intern.cpp */; }; DFF95C210FB22D5700A3EC78 /* dither.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFB900F485D890006E566 /* dither.cpp */; }; DFF95C270FB22D5700A3EC78 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD10F485DFB0006E566 /* debug.cpp */; }; - DFF95C280FB22D5700A3EC78 /* GuiManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* GuiManager.cpp */; }; + DFF95C280FB22D5700A3EC78 /* gui-manager.hcpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBD50F485E360006E566 /* gui-manager.hcpp */; }; DFF95C290FB22D5700A3EC78 /* posix-saves.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFBF80F4860A60006E566 /* posix-saves.cpp */; }; DFF95C2A0FB22D5700A3EC78 /* bmv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC1F0F4862520006E566 /* bmv.cpp */; }; DFF95C2B0FB22D5700A3EC78 /* dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2FFC200F4862520006E566 /* dialogs.cpp */; }; @@ -3362,8 +3362,8 @@ DF2FFB920F485D890006E566 /* pixelformat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pixelformat.h; sourceTree = "<group>"; }; DF2FFBD10F485DFB0006E566 /* debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debug.cpp; sourceTree = "<group>"; }; DF2FFBD20F485DFB0006E566 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; }; - DF2FFBD50F485E360006E566 /* GuiManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GuiManager.cpp; sourceTree = "<group>"; }; - DF2FFBD60F485E360006E566 /* GuiManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuiManager.h; sourceTree = "<group>"; }; + DF2FFBD50F485E360006E566 /* gui-manager.hcpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui-manager.hcpp; sourceTree = "<group>"; }; + DF2FFBD60F485E360006E566 /* gui-manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui-manager.h; sourceTree = "<group>"; }; DF2FFBDB0F485E480006E566 /* scummclassic.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = scummclassic.zip; sourceTree = "<group>"; }; DF2FFBF80F4860A60006E566 /* posix-saves.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "posix-saves.cpp"; sourceTree = "<group>"; }; DF2FFBF90F4860A60006E566 /* posix-saves.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "posix-saves.h"; sourceTree = "<group>"; }; @@ -7446,8 +7446,8 @@ DFE4779B0D81F4E900B6D1FB /* EditTextWidget.h */, DF9B9246118E46730069C19D /* error.cpp */, DF9B9247118E46730069C19D /* error.h */, - DF2FFBD50F485E360006E566 /* GuiManager.cpp */, - DF2FFBD60F485E360006E566 /* GuiManager.h */, + DF2FFBD50F485E360006E566 /* gui-manager.hcpp */, + DF2FFBD60F485E360006E566 /* gui-manager.h */, DFE4779E0D81F4E900B6D1FB /* Key.cpp */, DFE4779F0D81F4E900B6D1FB /* Key.h */, DFE477A20D81F4E900B6D1FB /* launcher.cpp */, @@ -8470,7 +8470,7 @@ DFAAB0020F011392003E9390 /* thumbnail_intern.cpp in Sources */, DF2FFB930F485D890006E566 /* dither.cpp in Sources */, DF2FFBD30F485DFB0006E566 /* debug.cpp in Sources */, - DF2FFBD90F485E360006E566 /* GuiManager.cpp in Sources */, + DF2FFBD90F485E360006E566 /* gui-manager.hcpp in Sources */, DF2FFBFC0F4860A60006E566 /* posix-saves.cpp in Sources */, DF2FFC290F4862520006E566 /* bmv.cpp in Sources */, DF2FFC2A0F4862520006E566 /* dialogs.cpp in Sources */, @@ -9496,7 +9496,7 @@ DF09418B0F63CB26002D821E /* thumbnail_intern.cpp in Sources */, DF09418C0F63CB26002D821E /* dither.cpp in Sources */, DF0941920F63CB26002D821E /* debug.cpp in Sources */, - DF0941930F63CB26002D821E /* GuiManager.cpp in Sources */, + DF0941930F63CB26002D821E /* gui-manager.hcpp in Sources */, DF0941940F63CB26002D821E /* posix-saves.cpp in Sources */, DF0941950F63CB26002D821E /* bmv.cpp in Sources */, DF0941960F63CB26002D821E /* dialogs.cpp in Sources */, @@ -10531,7 +10531,7 @@ DFF95C200FB22D5700A3EC78 /* thumbnail_intern.cpp in Sources */, DFF95C210FB22D5700A3EC78 /* dither.cpp in Sources */, DFF95C270FB22D5700A3EC78 /* debug.cpp in Sources */, - DFF95C280FB22D5700A3EC78 /* GuiManager.cpp in Sources */, + DFF95C280FB22D5700A3EC78 /* gui-manager.hcpp in Sources */, DFF95C290FB22D5700A3EC78 /* posix-saves.cpp in Sources */, DFF95C2A0FB22D5700A3EC78 /* bmv.cpp in Sources */, DFF95C2B0FB22D5700A3EC78 /* dialogs.cpp in Sources */, diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp index 23d69db9d7..0d70be1ccd 100644 --- a/engines/dialogs.cpp +++ b/engines/dialogs.cpp @@ -33,7 +33,7 @@ #include "graphics/scaler.h" #include "gui/about.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/launcher.h" #include "gui/widgets/list.h" #include "gui/message.h" diff --git a/engines/engine.cpp b/engines/engine.cpp index 4176d003f1..b8ddc631df 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -46,7 +46,7 @@ #include "gui/debugger.h" #include "gui/message.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "sound/mixer.h" diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index d262acabc4..8c8d77a9a6 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -34,7 +34,7 @@ #include "common/md5.h" #include "sound/mididrv.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/dialog.h" #include "gui/widget.h" diff --git a/engines/mohawk/dialogs.cpp b/engines/mohawk/dialogs.cpp index a7369b4825..a4645b4e77 100644 --- a/engines/mohawk/dialogs.cpp +++ b/engines/mohawk/dialogs.cpp @@ -28,7 +28,7 @@ #include "mohawk/riven.h" #include "mohawk/dialogs.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "common/savefile.h" #include "common/translation.h" diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index 9507c10eb2..729e66b310 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -36,7 +36,7 @@ #include "gui/about.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/widgets/list.h" #include "gui/ThemeEval.h" diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index dc3a5d26b3..ab5357f1dd 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/GuiManager.h" +#include "gui/gui-manager.h" #include "scumm/debugger.h" #include "scumm/dialogs.h" diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index b9b8a865a8..e6110ee976 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -34,7 +34,7 @@ #include "engines/util.h" #include "gui/message.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "graphics/cursorman.h" diff --git a/engines/sword1/resman.cpp b/engines/sword1/resman.cpp index 228cd28bb7..2bad8a79a7 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/GuiManager.h" +#include "gui/gui-manager.h" namespace Sword1 { void guiFatalError(char *msg) { diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index 0dcadeca2a..537720401d 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -41,7 +41,7 @@ #include "engines/util.h" #include "gui/message.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" namespace Sword1 { diff --git a/gui/KeysDialog.h b/gui/KeysDialog.h index fcf8f818bd..4626e0245a 100644 --- a/gui/KeysDialog.h +++ b/gui/KeysDialog.h @@ -26,7 +26,7 @@ #ifndef KEYSDIALOG_H #define KEYSDIALOG_H -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/dialog.h" #include "gui/widgets/list.h" #include "common/str.h" diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp index 0daf2528dd..70d81a962e 100644 --- a/gui/ThemeParser.cpp +++ b/gui/ThemeParser.cpp @@ -26,7 +26,7 @@ #include "gui/ThemeEngine.h" #include "gui/ThemeEval.h" #include "gui/ThemeParser.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "graphics/VectorRenderer.h" diff --git a/gui/Tooltip.cpp b/gui/Tooltip.cpp index 272fa66072..067afb8246 100644 --- a/gui/Tooltip.cpp +++ b/gui/Tooltip.cpp @@ -26,7 +26,7 @@ #include "graphics/fontman.h" #include "gui/widget.h" #include "gui/dialog.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/Tooltip.h" #include "gui/ThemeEval.h" diff --git a/gui/about.cpp b/gui/about.cpp index 86d28b4f61..dbdfb67eac 100644 --- a/gui/about.cpp +++ b/gui/about.cpp @@ -30,7 +30,7 @@ #include "common/translation.h" #include "common/util.h" #include "gui/about.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/widget.h" #include "gui/ThemeEval.h" diff --git a/gui/browser.cpp b/gui/browser.cpp index f9be918279..4ee6bafdde 100644 --- a/gui/browser.cpp +++ b/gui/browser.cpp @@ -23,7 +23,7 @@ */ #include "gui/browser.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/widgets/list.h" #include "common/config-manager.h" diff --git a/gui/chooser.cpp b/gui/chooser.cpp index 9193f1b5b3..f5e7d26a32 100644 --- a/gui/chooser.cpp +++ b/gui/chooser.cpp @@ -25,7 +25,7 @@ #include "common/system.h" #include "common/translation.h" #include "gui/chooser.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/widgets/list.h" namespace GUI { diff --git a/gui/console.h b/gui/console.h index 52762b065f..ab590fbf81 100644 --- a/gui/console.h +++ b/gui/console.h @@ -26,7 +26,7 @@ #define CONSOLE_DIALOG_H #include "gui/dialog.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" namespace GUI { diff --git a/gui/dialog.cpp b/gui/dialog.cpp index 71ebd34d35..2c2b0603d6 100644 --- a/gui/dialog.cpp +++ b/gui/dialog.cpp @@ -24,7 +24,7 @@ #include "common/events.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/dialog.h" #include "gui/widget.h" #include "gui/widgets/popup.h" diff --git a/gui/GuiManager.cpp b/gui/gui-manager.cpp index 22a69f1ee5..22a69f1ee5 100644 --- a/gui/GuiManager.cpp +++ b/gui/gui-manager.cpp diff --git a/gui/GuiManager.h b/gui/gui-manager.h index ee1351dc9b..ee1351dc9b 100644 --- a/gui/GuiManager.h +++ b/gui/gui-manager.h diff --git a/gui/launcher.cpp b/gui/launcher.cpp index cd3e3aace0..fb9f882090 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -38,7 +38,7 @@ #include "gui/launcher.h" #include "gui/massadd.h" #include "gui/message.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/options.h" #include "gui/saveload.h" #include "gui/widgets/edittext.h" diff --git a/gui/massadd.cpp b/gui/massadd.cpp index bb4b65b681..197caae675 100644 --- a/gui/massadd.cpp +++ b/gui/massadd.cpp @@ -31,7 +31,7 @@ #include "gui/launcher.h" // For addGameToConf() #include "gui/massadd.h" -#include "gui/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/widget.h" #include "gui/widgets/list.h" diff --git a/gui/message.cpp b/gui/message.cpp index 06b4524eab..2d097a75a9 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/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/ThemeEval.h" #include "gui/widget.h" diff --git a/gui/module.mk b/gui/module.mk index 2fae810165..df6b76172a 100644 --- a/gui/module.mk +++ b/gui/module.mk @@ -7,7 +7,7 @@ MODULE_OBJS := \ debugger.o \ dialog.o \ error.o \ - GuiManager.o \ + gui-manager.o \ launcher.o \ massadd.o \ message.o \ diff --git a/gui/object.cpp b/gui/object.cpp index 537c127033..bf8e7a8642 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/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/ThemeEval.h" namespace GUI { diff --git a/gui/options.cpp b/gui/options.cpp index a3f9075d9b..ba083ebe92 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/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/ThemeEval.h" #include "gui/options.h" #include "gui/widgets/popup.h" diff --git a/gui/widget.cpp b/gui/widget.cpp index f8713a14db..fc95526251 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/GuiManager.h" +#include "gui/gui-manager.h" #include "gui/ThemeEval.h" |