summaryrefslogtreecommitdiffstats
path: root/kicker/extensions/kasbar/kasclockitem.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:43:14 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kicker/extensions/kasbar/kasclockitem.cpp
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker/extensions/kasbar/kasclockitem.cpp')
-rw-r--r--kicker/extensions/kasbar/kasclockitem.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp
index 51dac687d..6545f57eb 100644
--- a/kicker/extensions/kasbar/kasclockitem.cpp
+++ b/kicker/extensions/kasbar/kasclockitem.cpp
@@ -75,8 +75,8 @@ KasPopup *KasClockItem::createPopup()
void KasClockItem::updateTime()
{
- setText( KGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) );
- lcd->display( KGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) );
+ setText( TDEGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) );
+ lcd->display( TDEGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) );
update();
}