Made the PopupMenu a Popup subclass

It's a natural better fit. The SkinLoader was changed into a singleton,
since it's used by both Window and Popup classes.

1 files changed, 7 insertions, 4 deletions

diff --git a/src/gui/skin.h b/src/gui/skin.h
index 25a9f0e4..c56072d3 100644
--- a/src/gui/skin.h
+++ b/src/gui/skin.h
@@ -98,8 +98,8 @@ class Skin
 class SkinLoader 
 {
     public:
-        SkinLoader();
-        ~SkinLoader();
+        static SkinLoader *instance();
+        static void deleteInstance();
 
         /**
          * Loads a skin.
@@ -113,6 +113,9 @@ class SkinLoader
         void updateAlpha();
 
     private:
+        SkinLoader();
+        ~SkinLoader();
+
         Skin *readSkin(const std::string &filename);
 
         // Map containing all window skins
@@ -125,8 +128,8 @@ class SkinLoader
          * The config listener that listens to changes relevant to all skins.
          */
         ConfigListener *mSkinConfigListener;
-};
 
-extern SkinLoader *skinLoader;
+        static SkinLoader *mInstance;
+};
 
 #endif