From 2178da111f72dc574457d5242d120b4d10ea5edd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:50:05 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kworldwatch/mapwidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kworldwatch/mapwidget.cpp') diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp index 7dc10e2..3c292bd 100644 --- a/kworldwatch/mapwidget.cpp +++ b/kworldwatch/mapwidget.cpp @@ -369,7 +369,7 @@ TQString MapWidget::cityTime(const TQString &city) time_t t = time(NULL); TQDateTime dt; dt.setTime_t(t); - result.append(TQString("%1, %2").arg(KGlobal::locale()->formatTime(dt.time(), true)).arg(KGlobal::locale()->formatDate(dt.date(), true))); + result.append(TQString("%1, %2").arg(TDEGlobal::locale()->formatTime(dt.time(), true)).arg(TDEGlobal::locale()->formatDate(dt.date(), true))); if (initial_TZ != 0) setenv("TZ", initial_TZ, 1); @@ -453,7 +453,7 @@ void MapWidget::showIndicator(const TQPoint &pos) int w = _cityIndicator->width(); int h = _cityIndicator->height(); - TQRect desk = KGlobalSettings::desktopGeometry(pos); + TQRect desk = TDEGlobalSettings::desktopGeometry(pos); TQPoint newPos; -- cgit v1.2.1