WAGE: Change namespace of MacWindow

2 files changed, 13 insertions, 13 deletions

diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 7df635a1ff..6ec1831454 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -145,8 +145,8 @@ MacWindowManager::~MacWindowManager() {
         delete _windows[i];
 }
 
-Wage::MacWindow *MacWindowManager::addWindow(bool scrollable, bool resizable, bool editable) {
-	Wage::MacWindow *w = new Wage::MacWindow(_lastId, scrollable, resizable, editable, this);
+MacWindow *MacWindowManager::addWindow(bool scrollable, bool resizable, bool editable) {
+	MacWindow *w = new MacWindow(_lastId, scrollable, resizable, editable, this);
 
     _windows.push_back(w);
     _windowStack.push_back(w);
@@ -246,8 +246,8 @@ void MacWindowManager::draw() {
 	if (_fullRefresh)
 		drawDesktop();
 
-    for (Common::List<Wage::BaseMacWindow *>::const_iterator it = _windowStack.begin(); it != _windowStack.end(); it++) {
-		Wage::BaseMacWindow *w = *it;
+    for (Common::List<BaseMacWindow *>::const_iterator it = _windowStack.begin(); it != _windowStack.end(); it++) {
+		BaseMacWindow *w = *it;
         if (w->draw(_screen, _fullRefresh)) {
             w->setDirty(false);
 
@@ -274,8 +274,8 @@ bool MacWindowManager::processEvent(Common::Event &event) {
             event.type != Common::EVENT_LBUTTONUP)
         return false;
 
-	if (_windows[_activeWindow]->isEditable() && _windows[_activeWindow]->getType() == Wage::kWindowWindow &&
-			((Wage::MacWindow *)_windows[_activeWindow])->getInnerDimensions().contains(event.mouse.x, event.mouse.y)) {
+	if (_windows[_activeWindow]->isEditable() && _windows[_activeWindow]->getType() == kWindowWindow &&
+			((MacWindow *)_windows[_activeWindow])->getInnerDimensions().contains(event.mouse.x, event.mouse.y)) {
 		if (_cursorIsArrow) {
 			CursorMan.replaceCursor(macCursorBeam, 11, 16, 3, 8, 3);
 			_cursorIsArrow = false;
@@ -287,9 +287,9 @@ bool MacWindowManager::processEvent(Common::Event &event) {
 		}
 	}
 
-    for (Common::List<Wage::BaseMacWindow *>::const_iterator it = _windowStack.end(); it != _windowStack.begin();) {
+    for (Common::List<BaseMacWindow *>::const_iterator it = _windowStack.end(); it != _windowStack.begin();) {
         it--;
-		Wage::BaseMacWindow *w = *it;
+		BaseMacWindow *w = *it;
 
         if (w->hasAllFocus() || w->getDimensions().contains(event.mouse.x, event.mouse.y)) {
             if (event.type == Common::EVENT_LBUTTONDOWN || event.type == Common::EVENT_LBUTTONUP)
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index ccc9234a6c..45532edf1e 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -55,7 +55,7 @@
 
 #include "graphics/fontman.h"
 
-#include "engines\wage\macwindow.h"
+#include "engines/wage/macwindow.h"
 
 namespace Wage {
 	class MacWindow;
@@ -97,7 +97,7 @@ public:
 	bool hasBuiltInFonts() { return _builtInFonts; }
 	const Font *getFont(const char *name, FontManager::FontUsage fallback);
 
-	Wage::MacWindow *addWindow(bool scrollable, bool resizable, bool editable);
+	MacWindow *addWindow(bool scrollable, bool resizable, bool editable);
 	Wage::Menu *addMenu();
 	void setActive(int id);
 
@@ -107,7 +107,7 @@ public:
 
 	bool processEvent(Common::Event &event);
 
-	Wage::BaseMacWindow *getWindow(int id) { return _windows[id]; }
+	BaseMacWindow *getWindow(int id) { return _windows[id]; }
 
 	Patterns &getPatterns() { return _patterns; }
 	void drawFilledRoundRect(ManagedSurface *surface, Common::Rect &rect, int arc, int color);
@@ -122,8 +122,8 @@ private:
 private:
 	ManagedSurface *_screen;
 
-	Common::List<Wage::BaseMacWindow *> _windowStack;
-	Common::Array<Wage::BaseMacWindow *> _windows;
+	Common::List<BaseMacWindow *> _windowStack;
+	Common::Array<BaseMacWindow *> _windows;
 
 	int _lastId;
 	int _activeWindow;