aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/ui
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/ui')
-rw-r--r--engines/wintermute/ui/ui_button.cpp4
-rw-r--r--engines/wintermute/ui/ui_button.h4
-rw-r--r--engines/wintermute/ui/ui_edit.cpp4
-rw-r--r--engines/wintermute/ui/ui_edit.h4
-rw-r--r--engines/wintermute/ui/ui_entity.cpp4
-rw-r--r--engines/wintermute/ui/ui_entity.h4
-rw-r--r--engines/wintermute/ui/ui_object.cpp4
-rw-r--r--engines/wintermute/ui/ui_object.h4
-rw-r--r--engines/wintermute/ui/ui_text.cpp4
-rw-r--r--engines/wintermute/ui/ui_text.h4
-rw-r--r--engines/wintermute/ui/ui_tiled_image.cpp4
-rw-r--r--engines/wintermute/ui/ui_tiled_image.h4
-rw-r--r--engines/wintermute/ui/ui_window.cpp4
-rw-r--r--engines/wintermute/ui/ui_window.h4
14 files changed, 28 insertions, 28 deletions
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index fb125ef94c..d13ad235bc 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -41,7 +41,7 @@
#include "engines/wintermute/base/scriptables/script.h"
#include "engines/wintermute/base/scriptables/script_stack.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(UIButton, false)
@@ -1205,4 +1205,4 @@ bool UIButton::persist(BasePersistenceManager *persistMgr) {
return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_button.h b/engines/wintermute/ui/ui_button.h
index 5c034d6113..61cdef476e 100644
--- a/engines/wintermute/ui/ui_button.h
+++ b/engines/wintermute/ui/ui_button.h
@@ -33,7 +33,7 @@
#include "engines/wintermute/ui/ui_object.h"
#include "engines/wintermute/dctypes.h" // Added by ClassView
-namespace WinterMute {
+namespace Wintermute {
class UIButton : public UIObject {
public:
@@ -74,6 +74,6 @@ public:
virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp
index 88c68a3314..23c783d200 100644
--- a/engines/wintermute/ui/ui_edit.cpp
+++ b/engines/wintermute/ui/ui_edit.cpp
@@ -47,7 +47,7 @@
#include "common/util.h"
#include "common/keyboard.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(UIEdit, false)
@@ -948,4 +948,4 @@ bool UIEdit::persist(BasePersistenceManager *persistMgr) {
return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_edit.h b/engines/wintermute/ui/ui_edit.h
index 221b8aa151..ea943e3d57 100644
--- a/engines/wintermute/ui/ui_edit.h
+++ b/engines/wintermute/ui/ui_edit.h
@@ -33,7 +33,7 @@
#include "engines/wintermute/ui/ui_object.h"
#include "common/events.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseFont;
class UIEdit : public UIObject {
public:
@@ -67,6 +67,6 @@ public:
virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/ui/ui_entity.cpp b/engines/wintermute/ui/ui_entity.cpp
index 8008e96050..038b256c24 100644
--- a/engines/wintermute/ui/ui_entity.cpp
+++ b/engines/wintermute/ui/ui_entity.cpp
@@ -36,7 +36,7 @@
#include "engines/wintermute/base/scriptables/script.h"
#include "engines/wintermute/base/scriptables/script_stack.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(UIEntity, false)
@@ -363,4 +363,4 @@ bool UIEntity::persist(BasePersistenceManager *persistMgr) {
return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_entity.h b/engines/wintermute/ui/ui_entity.h
index 9c9bffdc4a..bc44c1f112 100644
--- a/engines/wintermute/ui/ui_entity.h
+++ b/engines/wintermute/ui/ui_entity.h
@@ -31,7 +31,7 @@
#include "engines/wintermute/ui/ui_object.h"
-namespace WinterMute {
+namespace Wintermute {
class AdEntity;
class UIEntity : public UIObject {
public:
@@ -53,6 +53,6 @@ public:
virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/ui/ui_object.cpp b/engines/wintermute/ui/ui_object.cpp
index 8f1356020e..31f1b9aa33 100644
--- a/engines/wintermute/ui/ui_object.cpp
+++ b/engines/wintermute/ui/ui_object.cpp
@@ -36,7 +36,7 @@
#include "engines/wintermute/base/scriptables/script_stack.h"
#include "engines/wintermute/base/font/base_font_storage.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(UIObject, false)
@@ -647,4 +647,4 @@ bool UIObject::saveAsText(BaseDynamicBuffer *buffer, int indent) {
return STATUS_FAILED;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_object.h b/engines/wintermute/ui/ui_object.h
index 50d0a08873..8059207a9a 100644
--- a/engines/wintermute/ui/ui_object.h
+++ b/engines/wintermute/ui/ui_object.h
@@ -33,7 +33,7 @@
#include "engines/wintermute/base/base_object.h"
#include "engines/wintermute/dctypes.h" // Added by ClassView
-namespace WinterMute {
+namespace Wintermute {
class UITiledImage;
class BaseFont;
@@ -79,6 +79,6 @@ public:
virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/ui/ui_text.cpp b/engines/wintermute/ui/ui_text.cpp
index 56fea4edf9..038df55c42 100644
--- a/engines/wintermute/ui/ui_text.cpp
+++ b/engines/wintermute/ui/ui_text.cpp
@@ -41,7 +41,7 @@
#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(UIText, false)
@@ -519,4 +519,4 @@ bool UIText::sizeToFit() {
return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_text.h b/engines/wintermute/ui/ui_text.h
index ee2e63c448..54817ccf52 100644
--- a/engines/wintermute/ui/ui_text.h
+++ b/engines/wintermute/ui/ui_text.h
@@ -32,7 +32,7 @@
#include "engines/wintermute/ui/ui_object.h"
-namespace WinterMute {
+namespace Wintermute {
class UIText : public UIObject {
private:
@@ -55,6 +55,6 @@ public:
virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp
index 62c07bf1d7..0cf28b81f5 100644
--- a/engines/wintermute/ui/ui_tiled_image.cpp
+++ b/engines/wintermute/ui/ui_tiled_image.cpp
@@ -35,7 +35,7 @@
#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(UITiledImage, false)
@@ -390,4 +390,4 @@ bool UITiledImage::persist(BasePersistenceManager *persistMgr) {
return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_tiled_image.h b/engines/wintermute/ui/ui_tiled_image.h
index 2d7068e7cd..863bf7d1ea 100644
--- a/engines/wintermute/ui/ui_tiled_image.h
+++ b/engines/wintermute/ui/ui_tiled_image.h
@@ -33,7 +33,7 @@
#include "engines/wintermute/ui/ui_object.h"
#include "common/rect.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSubFrame;
class UITiledImage : public BaseObject {
public:
@@ -58,6 +58,6 @@ public:
Rect32 _downRight;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index 4f3ee9ff43..d33de9881c 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -47,7 +47,7 @@
#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(UIWindow, false)
@@ -1441,4 +1441,4 @@ bool UIWindow::getWindowObjects(BaseArray<UIObject *> &objects, bool interactive
return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_window.h b/engines/wintermute/ui/ui_window.h
index 556850f6fa..8093e2b8f4 100644
--- a/engines/wintermute/ui/ui_window.h
+++ b/engines/wintermute/ui/ui_window.h
@@ -33,7 +33,7 @@
#include "engines/wintermute/ui/ui_object.h"
#include "common/events.h"
-namespace WinterMute {
+namespace Wintermute {
class UIButton;
class BaseViewport;
@@ -89,6 +89,6 @@ public:
virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif