X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Faction.cpp;h=665a5e1b734f0cf8657a4d751310f3fb3528b6e9;hp=f160ac4c239aba120cade34f772dd5f48416b8d0;hb=e8cec3162ce6a41c78764b64f704cb5fee5e0257;hpb=4775cbfc0dde54bad2a483a51409f392187a20f3 diff --git a/src/uisupport/action.cpp b/src/uisupport/action.cpp index f160ac4c..665a5e1b 100644 --- a/src/uisupport/action.cpp +++ b/src/uisupport/action.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,16 +20,27 @@ * Parts of this implementation are taken from KDE's kaction.cpp * ***************************************************************************/ -#include - #include "action.h" -Action::Action(QObject *parent) : QWidgetAction(parent) { +#include + +Action::Action(QObject *parent) +#ifdef HAVE_KDE +: KAction(parent) +#else +: QWidgetAction(parent) +#endif +{ init(); } Action::Action(const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut) -: QWidgetAction(parent) { +#ifdef HAVE_KDE +: KAction(parent) +#else +: QWidgetAction(parent) +#endif +{ init(); setText(text); setShortcut(shortcut); @@ -38,7 +49,12 @@ Action::Action(const QString &text, QObject *parent, const QObject *receiver, co } Action::Action(const QIcon &icon, const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut) -: QWidgetAction(parent) { +#ifdef HAVE_KDE +: KAction(parent) +#else +: QWidgetAction(parent) +#endif +{ init(); setIcon(icon); setText(text); @@ -47,6 +63,9 @@ Action::Action(const QIcon &icon, const QString &text, QObject *parent, const QO connect(this, SIGNAL(triggered()), receiver, slot); } +#ifdef HAVE_KDE +void Action::init() { } +#else void Action::init() { connect(this, SIGNAL(triggered(bool)), this, SLOT(slotTriggered())); @@ -87,3 +106,5 @@ void Action::setShortcut(const QKeySequence &key, ShortcutTypes type) { if(type & ActiveShortcut) QAction::setShortcut(key); } + +#endif /* HAVE_KDE */