From 78ab7c7a2877efd245293ad00cd36bcaa8646507 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Fri, 5 Mar 2010 07:39:43 -0700
Subject: Rename SkinLoader to Theme
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also merge the guialpha ConfigListener into Theme.

Reviewed-by: Thorbjørn Lindeijer
---
 src/gui/gui.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/gui/gui.cpp')

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 1e36523c..a59b0157 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -24,7 +24,7 @@
 #include "gui/focushandler.h"
 #include "gui/palette.h"
 #include "gui/sdlinput.h"
-#include "gui/skin.h"
+#include "gui/theme.h"
 #include "gui/truetypefont.h"
 
 #include "gui/widgets/window.h"
@@ -154,7 +154,7 @@ Gui::~Gui()
 
     delete guiInput;
 
-    SkinLoader::deleteInstance();
+    Theme::deleteInstance();
 }
 
 void Gui::logic()
@@ -209,8 +209,7 @@ void Gui::setUseCustomCursor(bool customCursor)
             SDL_ShowCursor(SDL_DISABLE);
 
             // Load the mouse cursor
-            mMouseCursors = SkinLoader::getImageSetFromTheme("mouse.png",
-                                                             40, 40);
+            mMouseCursors = Theme::getImageSetFromTheme("mouse.png", 40, 40);
 
             if (!mMouseCursors)
                 logger->error("Unable to load mouse cursors.");
-- 
cgit v1.2.3-70-g09d2