5 files changed, 7 insertions, 10 deletions
diff --git a/src/plugins/General/mpris/mpris1/rootobject.cpp b/src/plugins/General/mpris/mpris1/rootobject.cpp
index 7c4267d08..2c97897a9 100644
--- a/src/plugins/General/mpris/mpris1/rootobject.cpp
+++ b/src/plugins/General/mpris/mpris1/rootobject.cpp
@@ -20,7 +20,7 @@
 
 #include <QDBusMetaType>
 #include <QDBusArgument>
-
+#include <qmmpui/uihelper.h>
 #include <qmmp/qmmp.h>
 #include "rootobject.h"
 
@@ -71,5 +71,5 @@ Version RootObject::MprisVersion()
 
 void RootObject::Quit()
 {
-    QMetaObject::invokeMethod(parent(), "exit");
+    UiHelper::instance()->exit();
 }
diff --git a/src/plugins/General/mpris/mpris2/root2object.cpp b/src/plugins/General/mpris/mpris2/root2object.cpp
index 1f964272e..3e0d2f5b4 100644
--- a/src/plugins/General/mpris/mpris2/root2object.cpp
+++ b/src/plugins/General/mpris/mpris2/root2object.cpp
@@ -27,6 +27,7 @@
 #include <qmmp/inputsource.h>
 #include <qmmp/inputsourcefactory.h>
 #include <qmmp/metadatamanager.h>
+#include <qmmpui/uihelper.h>
 #include "root2object.h"
 
 Root2Object::Root2Object(QObject *parent) : QDBusAbstractAdaptor(parent)
@@ -82,7 +83,7 @@ QStringList Root2Object::supportedUriSchemes() const
 
 void Root2Object::Quit()
 {
-    QMetaObject::invokeMethod(parent(), "exit");
+    UiHelper::instance()->exit();
 }
 
 void Root2Object::Raise(){}
diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp
index 28b765e19..6191ee725 100644
--- a/src/plugins/General/statusicon/statusicon.cpp
+++ b/src/plugins/General/statusicon/statusicon.cpp
@@ -70,7 +70,7 @@ StatusIcon::StatusIcon(QObject *parent)
     menu->addAction(nextIcon, tr("Next"), m_player, SLOT(next()));
     menu->addAction(previousIcon, tr("Previous"), m_player, SLOT(previous()));
     menu->addSeparator();
-    menu->addAction(tr("Exit"), this, SLOT(exit()));
+    menu->addAction(tr("Exit"), UiHelper::instance(), SLOT(exit()));
     m_tray->setContextMenu(menu);
     connect (m_core, SIGNAL(metaDataChanged ()), SLOT(showMetaData()));
     connect (m_core, SIGNAL(stateChanged (Qmmp::State)), SLOT(setState(Qmmp::State)));
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index 5e54fc1a1..3c025484c 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -66,12 +66,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 
     new ActionManager();
 
-    //prepare libqmmp and libqmmpui libraries for playing
     m_player = MediaPlayer::instance();
     m_core = SoundCore::instance();
     m_pl_manager = PlayListManager::instance();
-    //additional featuries
-    //new PlaylistParser(this);
     m_generalHandler = UiHelper::instance();
 
     //user interface
diff --git a/src/plugins/Ui/skinned/pluginitem.cpp b/src/plugins/Ui/skinned/pluginitem.cpp
index 0f2679bb0..57daf7dc0 100644
--- a/src/plugins/Ui/skinned/pluginitem.cpp
+++ b/src/plugins/Ui/skinned/pluginitem.cpp
@@ -130,7 +130,6 @@ void PluginItem::showAbout(QWidget *parent)
     default:
         ;
     }
-
 }
 
 void PluginItem::showSettings(QWidget *parent)
@@ -153,7 +152,7 @@ void PluginItem::showSettings(QWidget *parent)
         Visual::showSettings(static_cast<VisualFactory *>(m_factory), parent);
         break;
     case PluginItem::GENERAL:
-        UiHelper::instance()->showSettings(static_cast<GeneralFactory *>(m_factory), parent);
+        General::showSettings(static_cast<GeneralFactory *>(m_factory), parent);
         break;
     default:
         ;
@@ -180,7 +179,7 @@ void PluginItem::setEnabled(bool enabled)
         Visual::setEnabled(static_cast<VisualFactory *>(m_factory), enabled);
         break;
     case PluginItem::GENERAL:
-        UiHelper::instance()->setEnabled(static_cast<GeneralFactory *>(m_factory), enabled);
+        General::setEnabled(static_cast<GeneralFactory *>(m_factory), enabled);
         break;
     default:
         ;