diff options
Diffstat (limited to 'kkbswitch/kbswitchtrayicon.cpp')
| -rw-r--r-- | kkbswitch/kbswitchtrayicon.cpp | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/kkbswitch/kbswitchtrayicon.cpp b/kkbswitch/kbswitchtrayicon.cpp index 057d3ab..76ebfc9 100644 --- a/kkbswitch/kbswitchtrayicon.cpp +++ b/kkbswitch/kbswitchtrayicon.cpp @@ -25,20 +25,12 @@ #include "boldmenuitem.h" #endif #include <tdepopupmenu.h> -#if TDE_VERSION_MAJOR >= 3 - #include <kstandarddirs.h> -#else - #include <kstddirs.h> -#endif +#include <kstandarddirs.h> #include <tdelocale.h> #include <kstdaction.h> #include <tdeaction.h> #include <tdeaboutapplication.h> -#if TDE_VERSION_MAJOR >= 3 - #include <tdeapplication.h> -#else - #include <kapp.h> -#endif +#include <tdeapplication.h> #include <kiconloader.h> #include <kdebug.h> #include <tdeversion.h> @@ -64,12 +56,7 @@ static TQColor getActiveTextColor(TDEPopupMenu *menu) KBSwitchTrayIcon::KBSwitchTrayIcon(KBConfig *conf){ TQPixmap pix; -#if TDE_VERSION_MAJOR >= 3 TDEActionCollection *actions = new TDEActionCollection(this); - #define ACTION_PARENT actions -#else - #define ACTION_PARENT this -#endif m_kbconf = conf; //TQObject::connect(conf, TQ_SIGNAL(changed()), this, TQ_SLOT(updateMenuIcons())); @@ -78,11 +65,11 @@ KBSwitchTrayIcon::KBSwitchTrayIcon(KBConfig *conf){ TQObject::connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int))); menu->insertSeparator(); - TDEAction *pref = KStdAction::preferences(this, TQ_SIGNAL(preferencesSelected()), ACTION_PARENT); + TDEAction *pref = KStdAction::preferences(this, TQ_SIGNAL(preferencesSelected()), actions); pref->plug(menu); - TDEAction *help = KStdAction::help(this, TQ_SLOT(slotHelp()), ACTION_PARENT); + TDEAction *help = KStdAction::help(this, TQ_SLOT(slotHelp()), actions); help->plug(menu); - TDEAction *about = KStdAction::aboutApp(this, TQ_SLOT(slotAbout()), ACTION_PARENT); + TDEAction *about = KStdAction::aboutApp(this, TQ_SLOT(slotAbout()), actions); about->plug(menu); /*TQString path = locate("icon", "hicolor/16x16/apps/locale.png"); |