projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test our newly acquired shortcut capabilities by finally allowing Ctrl+F to trigger...
[quassel.git]
/
src
/
uisupport
/
actioncollection.cpp
diff --git
a/src/uisupport/actioncollection.cpp
b/src/uisupport/actioncollection.cpp
index
a20d918
..
8a5d606
100644
(file)
--- a/
src/uisupport/actioncollection.cpp
+++ b/
src/uisupport/actioncollection.cpp
@@
-21,6
+21,7
@@
***************************************************************************/
#include <QAction>
***************************************************************************/
#include <QAction>
+#include <QDebug>
#include "actioncollection.h"
#include "actioncollection.h"
@@
-49,7
+50,7
@@
QList<QAction *> ActionCollection::actions() const {
}
Action *ActionCollection::addAction(const QString &name, Action *action) {
}
Action *ActionCollection::addAction(const QString &name, Action *action) {
- QAction *act = addAction(name,
action
);
+ QAction *act = addAction(name,
static_cast<QAction *>(action)
);
Q_ASSERT(act == action);
return action;
}
Q_ASSERT(act == action);
return action;
}
@@
-206,6
+207,10
@@
void ActionCollection::clearAssociatedWidgets() {
_associatedWidgets.clear();
}
_associatedWidgets.clear();
}
+void ActionCollection::associatedWidgetDestroyed(QObject *obj) {
+ _associatedWidgets.removeAll(static_cast<QWidget *>(obj));
+}
+
bool ActionCollection::unlistAction(QAction *action) {
// This might be called with a partly destroyed QAction!
bool ActionCollection::unlistAction(QAction *action) {
// This might be called with a partly destroyed QAction!