using main window as hotkeys storage

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2522 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 5 insertions, 20 deletions

diff --git a/src/plugins/Ui/skinned/dock.cpp b/src/plugins/Ui/skinned/dock.cpp
index d8ca5f49a..0c4ceae03 100644
--- a/src/plugins/Ui/skinned/dock.cpp
+++ b/src/plugins/Ui/skinned/dock.cpp
@@ -73,7 +73,6 @@ QPoint Dock::snapDesktop(QPoint npos, QWidget* mv)
     return npos;
 }
 
-
 QPoint Dock::snap (QPoint npos, QWidget* mv, QWidget* st)
 {
     int nx = npos.x() - st->x();
@@ -130,7 +129,8 @@ void Dock::addWidget (QWidget *widget)
 {
     m_widgetList.append (widget);
     m_dockedList.append (false);
-    widget->addActions(m_actions);
+    if(m_mainWidget)
+        widget->addActions(m_mainWidget->actions());
 }
 
 void Dock::move (QWidget* mv, QPoint npos)
@@ -255,18 +255,12 @@ bool Dock::isDocked (QWidget* mv, QWidget* st)
 
 void Dock::addActions (QList<QAction *> actions)
 {
-    QList<QAction *> new_actions;
-    foreach(QAction *action, actions)
+    if(!m_mainWidget)
     {
-        if(!m_actions.contains(action))
-        {
-            connect(action, SIGNAL(destroyed(QObject *)), SLOT(removeAction(QObject *)));
-            new_actions.append(action);
-            m_actions.append(action);
-        }
+        qFatal("Dock: main widget is null");
     }
     for (int i = 0; i<m_widgetList.size(); ++i)
-        m_widgetList.at (i)->addActions (new_actions);
+        m_widgetList.at (i)->addActions (actions);
 }
 
 bool Dock::isUnder(QWidget* upper, QWidget* nether, int dy)
@@ -287,8 +281,3 @@ void Dock::align(QWidget* w, int dy)
         }
     }
 }
-
-void Dock::removeAction(QObject *action)
-{
-    m_actions.removeAll(qobject_cast<QAction *> (action));
-}
diff --git a/src/plugins/Ui/skinned/dock.h b/src/plugins/Ui/skinned/dock.h
index eb5572475..6984317d7 100644
--- a/src/plugins/Ui/skinned/dock.h
+++ b/src/plugins/Ui/skinned/dock.h
@@ -45,9 +45,6 @@ public:
     void addActions(QList<QAction *> actions);
     void align(QWidget*, int dy);
 
-private slots:
-    void removeAction(QObject *action);
-
 private:
     QPoint snapDesktop(QPoint, QWidget*);
     QPoint snap(QPoint, QWidget*, QWidget*);
@@ -58,7 +55,6 @@ private:
     QList <QWidget *> m_widgetList;
     QList <bool> m_dockedList;
     QList <QPoint> m_delta_list;
-    QList <QAction *> m_actions;
 };
 
 #endif