3 files changed, 23 insertions, 22 deletions

diff --git a/src/qmmpui/general.cpp b/src/qmmpui/general.cpp
index 7bf9514d7..d8cfe1989 100644
--- a/src/qmmpui/general.cpp
+++ b/src/qmmpui/general.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   Copyright (C) 2008-2010 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,19 +23,17 @@
 #include <QList>
 #include <QApplication>
 #include <qmmp/qmmp.h>
-
 #include "general.h"
 
+QList<GeneralFactory*> *General::m_factories = 0;
+QStringList General::m_files;
 
-static QList<GeneralFactory*> *factories = 0;
-static QStringList files;
-
-static void checkFactories()
+void General::checkFactories()
 {
-    if (! factories)
+    if (!m_factories)
     {
-        files.clear();
-        factories = new QList<GeneralFactory *>;
+        m_files.clear();
+        m_factories = new QList<GeneralFactory *>;
         QDir pluginsDir (Qmmp::pluginsPath());
         pluginsDir.cd("General");
         foreach (QString fileName, pluginsDir.entryList(QDir::Files))
@@ -53,8 +51,8 @@ static void checkFactories()
 
             if (factory)
             {
-                factories->append(factory);
-                files << pluginsDir.absoluteFilePath(fileName);
+                m_factories->append(factory);
+                m_files << pluginsDir.absoluteFilePath(fileName);
                 qApp->installTranslator(factory->createTranslator(qApp));
             }
         }
@@ -81,22 +79,22 @@ void General::toggleVisibility()
     emit toggleVisibilityCalled();
 }
 
-QList<GeneralFactory*> *General::generalFactories()
+QList<GeneralFactory*> *General::factories()
 {
     checkFactories();
-    return factories;
+    return m_factories;
 }
 
-QStringList General::generalFiles()
+QStringList General::files()
 {
     checkFactories();
-    return files;
+    return m_files;
 }
 
 void General::setEnabled(GeneralFactory* factory, bool enable)
 {
     checkFactories();
-    if (!factories->contains(factory))
+    if (!m_factories->contains(factory))
         return;
 
     QString name = factory->properties().shortName;
@@ -116,7 +114,7 @@ void General::setEnabled(GeneralFactory* factory, bool enable)
 bool General::isEnabled(GeneralFactory* factory)
 {
     checkFactories();
-    if (!factories->contains(factory))
+    if (!m_factories->contains(factory))
         return FALSE;
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat );
     QStringList genList = settings.value("General/enabled_plugins").toStringList();
diff --git a/src/qmmpui/general.h b/src/qmmpui/general.h
index 244d02114..8ead65b37 100644
--- a/src/qmmpui/general.h
+++ b/src/qmmpui/general.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008-2009 by Ilya Kotov                                 *
+ *   Copyright (C) 2008-2010 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -44,11 +44,11 @@ public:
     /*!
      * Returns a list of the loaded general plugin factories.
      */
-    static QList<GeneralFactory*> *generalFactories();
+    static QList<GeneralFactory*> *factories();
     /*!
      * Returns a list of the loaded general plugin files.
      */
-    static QStringList generalFiles();
+    static QStringList files();
     /*!
      * Sets whether the general plugin is enabled.
      * @param factory General plugin factory.
@@ -84,6 +84,9 @@ public slots:
 private:
     QMap <uint, QString> m_strValues;
     QMap <uint, uint> m_numValues;
+    static QList<GeneralFactory*> *m_factories;
+    static QStringList m_files;
+    static void checkFactories();
 };
 
 #endif
diff --git a/src/qmmpui/generalhandler.cpp b/src/qmmpui/generalhandler.cpp
index 06025586f..744591243 100644
--- a/src/qmmpui/generalhandler.cpp
+++ b/src/qmmpui/generalhandler.cpp
@@ -38,7 +38,7 @@ GeneralHandler::GeneralHandler(QObject *parent)
     m_toolsMenu = 0;
     m_playlistMenu = 0;
     GeneralFactory* factory;
-    foreach(factory, *General::generalFactories())
+    foreach(factory, *General::factories())
     {
         if (General::isEnabled(factory))
         {
@@ -94,7 +94,7 @@ void GeneralHandler::showSettings(GeneralFactory* factory, QWidget* parentWidget
 bool GeneralHandler::visibilityControl()
 {
     GeneralFactory* factory;
-    foreach(factory, *General::generalFactories())
+    foreach(factory, *General::factories())
     {
         if (General::isEnabled(factory) && factory->properties().visibilityControl)
             return TRUE;