aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/ui
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-07-21 18:19:07 +0200
committerEinar Johan Trøan Sømåen2012-07-21 19:15:33 +0200
commit5683f076331d2831eb4720b65bb53e8d01ca33ee (patch)
tree4357d989476643db887d5f5a95f6fd165afd0514 /engines/wintermute/ui
parent0622b2c5b8260c0f0c01122d6fbc5e10013d1613 (diff)
downloadscummvm-rg350-5683f076331d2831eb4720b65bb53e8d01ca33ee.tar.gz
scummvm-rg350-5683f076331d2831eb4720b65bb53e8d01ca33ee.tar.bz2
scummvm-rg350-5683f076331d2831eb4720b65bb53e8d01ca33ee.zip
WINTERMUTE: Rename CamelCased filenames to prefixed_under_score-filenames
This is mostly a lead-up to namespacing the Ad/Base folders, and then possibly removing the prefixes from the files, it also has the added benefit of getting rid of the odd case-typos that makes for issues on platforms that don't ignore case.
Diffstat (limited to 'engines/wintermute/ui')
-rw-r--r--engines/wintermute/ui/ui_button.cpp (renamed from engines/wintermute/ui/UIButton.cpp)28
-rw-r--r--engines/wintermute/ui/ui_button.h (renamed from engines/wintermute/ui/UIButton.h)2
-rw-r--r--engines/wintermute/ui/ui_edit.cpp (renamed from engines/wintermute/ui/UIEdit.cpp)34
-rw-r--r--engines/wintermute/ui/ui_edit.h (renamed from engines/wintermute/ui/UIEdit.h)2
-rw-r--r--engines/wintermute/ui/ui_entity.cpp (renamed from engines/wintermute/ui/UIEntity.cpp)18
-rw-r--r--engines/wintermute/ui/ui_entity.h (renamed from engines/wintermute/ui/UIEntity.h)2
-rw-r--r--engines/wintermute/ui/ui_object.cpp (renamed from engines/wintermute/ui/UIObject.cpp)16
-rw-r--r--engines/wintermute/ui/ui_object.h (renamed from engines/wintermute/ui/UIObject.h)2
-rw-r--r--engines/wintermute/ui/ui_text.cpp (renamed from engines/wintermute/ui/UIText.cpp)26
-rw-r--r--engines/wintermute/ui/ui_text.h (renamed from engines/wintermute/ui/UIText.h)2
-rw-r--r--engines/wintermute/ui/ui_tiled_image.cpp (renamed from engines/wintermute/ui/UITiledImage.cpp)12
-rw-r--r--engines/wintermute/ui/ui_tiled_image.h (renamed from engines/wintermute/ui/UITiledImage.h)2
-rw-r--r--engines/wintermute/ui/ui_window.cpp (renamed from engines/wintermute/ui/UIWindow.cpp)38
-rw-r--r--engines/wintermute/ui/ui_window.h (renamed from engines/wintermute/ui/UIWindow.h)2
14 files changed, 93 insertions, 93 deletions
diff --git a/engines/wintermute/ui/UIButton.cpp b/engines/wintermute/ui/ui_button.cpp
index 273f923376..5b1867b652 100644
--- a/engines/wintermute/ui/UIButton.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -27,21 +27,21 @@
*/
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/ui/UIButton.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/ui/ui_button.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIButton.h b/engines/wintermute/ui/ui_button.h
index 5bdc075ebc..c6538f4423 100644
--- a/engines/wintermute/ui/UIButton.h
+++ b/engines/wintermute/ui/ui_button.h
@@ -30,7 +30,7 @@
#define WINTERMUTE_UIBUTTON_H
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
#include "engines/wintermute/dctypes.h" // Added by ClassView
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIEdit.cpp b/engines/wintermute/ui/ui_edit.cpp
index 610853d8cb..237b944332 100644
--- a/engines/wintermute/ui/UIEdit.cpp
+++ b/engines/wintermute/ui/ui_edit.cpp
@@ -26,24 +26,24 @@
* Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/ui/UIEdit.h"
-#include "engines/wintermute/ui/UIObject.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/BKeyboardState.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/ui/ui_edit.h"
+#include "engines/wintermute/ui/ui_object.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/base_keyboard_state.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script.h"
#include "engines/wintermute/utils/utils.h"
#include "common/util.h"
#include "common/keyboard.h"
diff --git a/engines/wintermute/ui/UIEdit.h b/engines/wintermute/ui/ui_edit.h
index 7249301592..400cd7b578 100644
--- a/engines/wintermute/ui/UIEdit.h
+++ b/engines/wintermute/ui/ui_edit.h
@@ -30,7 +30,7 @@
#define WINTERMUTE_UIEDIT_H
#include "engines/wintermute/persistent.h"
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
#include "common/events.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIEntity.cpp b/engines/wintermute/ui/ui_entity.cpp
index 7fbd2d13ff..012ff0390f 100644
--- a/engines/wintermute/ui/UIEntity.cpp
+++ b/engines/wintermute/ui/ui_entity.cpp
@@ -26,15 +26,15 @@
* Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/ad/AdEntity.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/ui/UIEntity.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/ad/ad_entity.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/ui/ui_entity.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIEntity.h b/engines/wintermute/ui/ui_entity.h
index b0711838a5..6873000681 100644
--- a/engines/wintermute/ui/UIEntity.h
+++ b/engines/wintermute/ui/ui_entity.h
@@ -29,7 +29,7 @@
#ifndef WINTERMUTE_UIENTITY_H
#define WINTERMUTE_UIENTITY_H
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
namespace WinterMute {
class CAdEntity;
diff --git a/engines/wintermute/ui/UIObject.cpp b/engines/wintermute/ui/ui_object.cpp
index 8b3dc19537..605b5b74b1 100644
--- a/engines/wintermute/ui/UIObject.cpp
+++ b/engines/wintermute/ui/ui_object.cpp
@@ -26,15 +26,15 @@
* Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/ui/UIObject.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/ui/UIWindow.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/ui/ui_object.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/ui/ui_window.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIObject.h b/engines/wintermute/ui/ui_object.h
index 26eecefe89..35bd092592 100644
--- a/engines/wintermute/ui/UIObject.h
+++ b/engines/wintermute/ui/ui_object.h
@@ -30,7 +30,7 @@
#define WINTERMUTE_UIOBJECT_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
#include "engines/wintermute/dctypes.h" // Added by ClassView
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIText.cpp b/engines/wintermute/ui/ui_text.cpp
index a496483f67..6309d05a1e 100644
--- a/engines/wintermute/ui/UIText.cpp
+++ b/engines/wintermute/ui/ui_text.cpp
@@ -27,19 +27,19 @@
*/
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/ui/UIText.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/ui/ui_text.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIText.h b/engines/wintermute/ui/ui_text.h
index 62fbf00b0a..dc633dc042 100644
--- a/engines/wintermute/ui/UIText.h
+++ b/engines/wintermute/ui/ui_text.h
@@ -30,7 +30,7 @@
#define WINTERMUTE_UITEXT_H
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UITiledImage.cpp b/engines/wintermute/ui/ui_tiled_image.cpp
index 04a2cfca58..39b39b556d 100644
--- a/engines/wintermute/ui/UITiledImage.cpp
+++ b/engines/wintermute/ui/ui_tiled_image.cpp
@@ -27,13 +27,13 @@
*/
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ui/UITiledImage.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UITiledImage.h b/engines/wintermute/ui/ui_tiled_image.h
index 379af85e81..79adf7caac 100644
--- a/engines/wintermute/ui/UITiledImage.h
+++ b/engines/wintermute/ui/ui_tiled_image.h
@@ -30,7 +30,7 @@
#define WINTERMUTE_UITILEDIMAGE_H
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
#include "common/rect.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIWindow.cpp b/engines/wintermute/ui/ui_window.cpp
index 35330e720e..269744a3c2 100644
--- a/engines/wintermute/ui/UIWindow.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -27,25 +27,25 @@
*/
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ui/UIWindow.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BKeyboardState.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/ui/UIButton.h"
-#include "engines/wintermute/ui/UIEdit.h"
-#include "engines/wintermute/ui/UIText.h"
-#include "engines/wintermute/ui/UITiledImage.h"
-#include "engines/wintermute/base/BViewport.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_keyboard_state.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/ui/ui_button.h"
+#include "engines/wintermute/ui/ui_edit.h"
+#include "engines/wintermute/ui/ui_text.h"
+#include "engines/wintermute/ui/ui_tiled_image.h"
+#include "engines/wintermute/ui/ui_window.h"
+#include "engines/wintermute/base/base_viewport.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/ui/UIWindow.h b/engines/wintermute/ui/ui_window.h
index f1d46711ff..6fe24c6a2c 100644
--- a/engines/wintermute/ui/UIWindow.h
+++ b/engines/wintermute/ui/ui_window.h
@@ -30,7 +30,7 @@
#define WINTERMUTE_UIWINDOW_H
-#include "UIObject.h"
+#include "engines/wintermute/ui/ui_object.h"
#include "common/events.h"
namespace WinterMute {