diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 15:11:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 15:11:21 -0600 |
| commit | f537c21b68e08f649b1b297bce8f3904603137e0 (patch) | |
| tree | fb33065387509dea898c90022ddec9c3f8ede86d /kicker/applets/clock/clock.cpp | |
| parent | dc5f267664506a312203c26bfe9001a448b0bb0f (diff) | |
| download | tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.tar.gz tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.zip | |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kicker/applets/clock/clock.cpp')
| -rw-r--r-- | kicker/applets/clock/clock.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index ad687839d..92420e652 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -924,9 +924,9 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, reconfigure(); // initialize clock widget slotUpdate(); - if (kapp->authorizeKAction("kicker_rmb")) + if (kapp->authorizeTDEAction("kicker_rmb")) { - menu = new KPopupMenu(); + menu = new TDEPopupMenu(); connect(menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu())); connect(menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); setCustomMenu(menu); @@ -1485,7 +1485,7 @@ void ClockApplet::toggleCalendar() void ClockApplet::openContextMenu() { - if (!menu || !kapp->authorizeKAction("kicker_rmb")) + if (!menu || !kapp->authorizeTDEAction("kicker_rmb")) return; menu->exec( TQCursor::pos() ); @@ -1544,7 +1544,7 @@ void ClockApplet::aboutToShowContextMenu() TQDateTime dt = TQDateTime::currentDateTime(); dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset)); - KPopupMenu *copyMenu = new KPopupMenu( menu ); + TDEPopupMenu *copyMenu = new TDEPopupMenu( menu ); copyMenu->insertItem(loc->formatDateTime(dt), 201); copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date())), 202); copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date()), true), 203); @@ -1558,7 +1558,7 @@ void ClockApplet::aboutToShowContextMenu() if (!bImmutable) { - KPopupMenu *zoneMenu = new KPopupMenu( menu ); + TDEPopupMenu *zoneMenu = new TDEPopupMenu( menu ); connect(zoneMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); for (int i = 0; i <= zone->remoteZoneCount(); i++) { @@ -1575,7 +1575,7 @@ void ClockApplet::aboutToShowContextMenu() zoneMenu->insertSeparator(); zoneMenu->insertItem(SmallIcon("configure"), i18n("&Configure Timezones..."), 110); - KPopupMenu *type_menu = new KPopupMenu(menu); + TDEPopupMenu *type_menu = new TDEPopupMenu(menu); connect(type_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); type_menu->insertItem(i18n("&Plain"), Prefs::EnumType::Plain, 1); type_menu->insertItem(i18n("&Digital"), Prefs::EnumType::Digital, 2); |