diff options
Diffstat (limited to 'src/plugins/Ui/skinned/dock.cpp')
| -rw-r--r-- | src/plugins/Ui/skinned/dock.cpp | 21 |
1 files changed, 5 insertions, 16 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)); -} |