X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.h;h=866cd9477d8e1b93af8c43ef467ccf75ba24612e;hp=8b2bec864022d86b1d8fa4b8975a21155f148940;hb=c64a887d0f05222590299fb2bb8d56fa9fadb16d;hpb=084d95e60b0fb587b1950a3e4f8ec5e4f017446c diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h index 8b2bec86..866cd947 100644 --- a/src/uisupport/actioncollection.h +++ b/src/uisupport/actioncollection.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-2012 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * *************************************************************************** * This is a subset of the API of KDE's KActionCollection. * ***************************************************************************/ @@ -36,10 +36,11 @@ class QWidget; class Action; class QAction; -class ActionCollection : public QObject { - Q_OBJECT +class ActionCollection : public QObject +{ + Q_OBJECT - public: +public: explicit ActionCollection(QObject *parent); virtual ~ActionCollection(); @@ -79,29 +80,31 @@ class ActionCollection : public QObject { /// Create new action under the given name, add it to the collection and connect its triggered(bool) signal to the specified receiver. template - ActionType *add(const QString &name, const QObject *receiver = 0, const char *member = 0) { - ActionType *a = new ActionType(this); - if(receiver && member) - connect(a, SIGNAL(triggered(bool)), receiver, member); - addAction(name, a); - return a; + ActionType *add(const QString &name, const QObject *receiver = 0, const char *member = 0) + { + ActionType *a = new ActionType(this); + if (receiver && member) + connect(a, SIGNAL(triggered(bool)), receiver, member); + addAction(name, a); + return a; } - signals: + +signals: void inserted(QAction *action); void actionHovered(QAction *action); void actionTriggered(QAction *action); - protected slots: +protected slots: virtual void connectNotify(const char *signal); virtual void slotActionTriggered(); - private slots: +private slots: void slotActionHovered(); void actionDestroyed(QObject *); void associatedWidgetDestroyed(QObject *); - private: +private: bool unlistAction(QAction *); QMap _actionByName; @@ -112,6 +115,7 @@ class ActionCollection : public QObject { bool _connectTriggered; }; + int ActionCollection::count() const { return actions().count(); } bool ActionCollection::isEmpty() const { return actions().count(); } @@ -119,13 +123,15 @@ bool ActionCollection::isEmpty() const { return actions().count(); } #include -class ActionCollection : public KActionCollection { - Q_OBJECT +class ActionCollection : public KActionCollection +{ + Q_OBJECT - public: +public: explicit ActionCollection(QObject *parent) : KActionCollection(parent) {}; - }; + + #endif #endif