summaryrefslogtreecommitdiffstats
path: root/ksim/ksimsysinfo.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:20 -0600
commitaef5eada7f51ee48f3d21448db290bd8f06953a8 (patch)
tree9d6e7572ebcc27e402501d6966f9b46361a1702c /ksim/ksimsysinfo.cpp
parent95d05392f9bc01594738a1e06ebf23123b3d3e6e (diff)
downloadtdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.tar.gz
tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'ksim/ksimsysinfo.cpp')
-rw-r--r--ksim/ksimsysinfo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp
index 7140e3a..7c39e22 100644
--- a/ksim/ksimsysinfo.cpp
+++ b/ksim/ksimsysinfo.cpp
@@ -76,7 +76,7 @@ void KSim::Sysinfo::clockUptimeUpdate()
if (m_timeLabel) {
TQTime now = TQTime::currentTime();
- time = KGlobal::locale()->formatTime(now, true);
+ time = TDEGlobal::locale()->formatTime(now, true);
if ( now == TQTime(0, 0) )
updateDate = true;
@@ -86,7 +86,7 @@ void KSim::Sysinfo::clockUptimeUpdate()
// only update the date when necessary
if (m_dateLabel) {
if (updateDate) {
- m_dateLabel->setText(KGlobal::locale()->formatDate(TQDate::currentDate()));
+ m_dateLabel->setText(TDEGlobal::locale()->formatDate(TQDate::currentDate()));
updateDate = false;
}
}