diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:40:51 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:40:51 -0600 |
commit | 4c097708c4cc24f3b8e4c21f14644f5715767d47 (patch) | |
tree | e8ca4b1d3a3b3de0d18e5f144dcef9b36f830b84 /kicker-applets/kbinaryclock/kbinaryclock.cpp | |
parent | 0642ee50634d90e255c6f45194f6a47dc1157cde (diff) | |
download | tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.tar.gz tdeaddons-4c097708c4cc24f3b8e4c21f14644f5715767d47.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker-applets/kbinaryclock/kbinaryclock.cpp')
-rw-r--r-- | kicker-applets/kbinaryclock/kbinaryclock.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index 73319c5..2e84474 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -42,7 +42,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { - KGlobal::locale()->insertCatalogue( "kbinaryclock"); + TDEGlobal::locale()->insertCatalogue( "kbinaryclock"); return new KBinaryClock( configFile, KPanelApplet::Normal, KPanelApplet::Preferences, parent, "kbinaryclock"); } @@ -145,7 +145,7 @@ KBinaryClock::KBinaryClock(const TQString& configFile, Type type, int actions, T KBinaryClock::~KBinaryClock() { delete prefs; - KGlobal::locale()->removeCatalogue( "kbinaryclock"); + TDEGlobal::locale()->removeCatalogue( "kbinaryclock"); } /** @@ -227,7 +227,7 @@ void KBinaryClock::preferences(){ */ void KBinaryClock::updateClock(){ TQString time = "hhmmss"; - if(KGlobal::locale()->use12Clock()) + if(TDEGlobal::locale()->use12Clock()) time += "ap"; TQString currentTime = (TQTime::currentTime()).toString(time); @@ -289,7 +289,7 @@ void KBinaryClock::openContextMenu() { KPopupMenu *menu = new KPopupMenu(); menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) ); - KLocale *loc = KGlobal::locale(); + KLocale *loc = TDEGlobal::locale(); TQDateTime dt = TQDateTime::currentDateTime(); KPopupMenu *copyMenu = new KPopupMenu( menu ); @@ -320,7 +320,7 @@ void KBinaryClock::openContextMenu() { } int result = menu->exec( TQCursor::pos() ); - KProcess proc; + TDEProcess proc; switch (result) { case 102: preferences(); @@ -330,13 +330,13 @@ void KBinaryClock::openContextMenu() { proc << "--nonewdcop"; proc << TQString("%1 clock --lang %2") .arg(locate("exe", "kcmshell")) - .arg(KGlobal::locale()->language()); - proc.start(KProcess::DontCare); + .arg(TDEGlobal::locale()->language()); + proc.start(TDEProcess::DontCare); break; case 104: proc << locate("exe", "kcmshell"); proc << "language"; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); break; case 110: preferences(); @@ -379,7 +379,7 @@ void KBinaryClock::toggleCalendar() } // make calendar fully visible - TQRect deskR = KGlobalSettings::desktopGeometry(TQPoint(0,0)); + TQRect deskR = TDEGlobalSettings::desktopGeometry(TQPoint(0,0)); if (c.y()+h > deskR.bottom()) c.setY(deskR.bottom()-h-1); if (c.x()+w > deskR.right()) c.setX(deskR.right()-w-1); @@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) { - tip(m_clock->geometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false)); + tip(m_clock->geometry(), TDEGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false)); } #include "kbinaryclock.moc" |