diff options
Diffstat (limited to 'kworldwatch')
| -rw-r--r-- | kworldwatch/applet.cpp | 8 | ||||
| -rw-r--r-- | kworldwatch/cities.cpp | 2 | ||||
| -rw-r--r-- | kworldwatch/main.cpp | 2 | ||||
| -rw-r--r-- | kworldwatch/maploader.cpp | 4 | ||||
| -rw-r--r-- | kworldwatch/mapwidget.cpp | 4 | ||||
| -rw-r--r-- | kworldwatch/zoneclock.cpp | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/kworldwatch/applet.cpp b/kworldwatch/applet.cpp index 5accd63..4559c92 100644 --- a/kworldwatch/applet.cpp +++ b/kworldwatch/applet.cpp @@ -44,8 +44,8 @@ extern "C" { KDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("kworldclock"); - KGlobal::locale()->insertCatalogue("timezones"); // For time zone translation + TDEGlobal::locale()->insertCatalogue("kworldclock"); + TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translation return new KWWApplet(configFile, KPanelApplet::Normal, 0, parent, "kwwapplet"); @@ -58,7 +58,7 @@ KWWApplet::KWWApplet(const TQString& configFile, Type type, int actions, : KPanelApplet(configFile, type, actions, parent, name) { // make use of the icons installed for ksaferppp - KGlobal::iconLoader()->addAppDir("kworldwatch"); + TDEGlobal::iconLoader()->addAppDir("kworldwatch"); TQVBoxLayout *vbox = new TQVBoxLayout(this, 0,0); @@ -106,7 +106,7 @@ void KWWApplet::mousePressEvent(TQMouseEvent *e) { bool clicked = false; - if (KGlobalSettings::singleClick()) + if (TDEGlobalSettings::singleClick()) { clicked = e->type() == TQMouseEvent::MouseButtonPress; } diff --git a/kworldwatch/cities.cpp b/kworldwatch/cities.cpp index 6626beb..a88c3a6 100644 --- a/kworldwatch/cities.cpp +++ b/kworldwatch/cities.cpp @@ -51,7 +51,7 @@ CityList::~CityList() void CityList::readCityLists() { - TQStringList lists = KGlobal::dirs()->findAllResources("data", "kworldclock/*.tab"); + TQStringList lists = TDEGlobal::dirs()->findAllResources("data", "kworldclock/*.tab"); for (TQStringList::Iterator it = lists.begin(); it != lists.end(); ++it) readCityList(*it); } diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp index edcad2a..3ebdbd4 100644 --- a/kworldwatch/main.cpp +++ b/kworldwatch/main.cpp @@ -51,7 +51,7 @@ WorldWideWatch::WorldWideWatch(bool restore, TQWidget *parent, const char *name) : KMainWindow(parent, name) { - KGlobal::locale()->insertCatalogue("timezones"); // For time zone translation + TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translation TQWidget *w = new TQWidget(this); setCentralWidget(w); diff --git a/kworldwatch/maploader.cpp b/kworldwatch/maploader.cpp index bb62e4f..50b6fa0 100644 --- a/kworldwatch/maploader.cpp +++ b/kworldwatch/maploader.cpp @@ -49,7 +49,7 @@ TQPtrList<MapTheme> MapLoader::themes() { TQPtrList<MapTheme> result; - TQStringList files = KGlobal::dirs()->findAllResources("data", "kworldclock/maps/*/*.desktop"); + TQStringList files = TDEGlobal::dirs()->findAllResources("data", "kworldclock/maps/*/*.desktop"); for (TQStringList::Iterator it=files.begin(); it != files.end(); ++it) { KDesktopFile conf(*it); @@ -63,7 +63,7 @@ TQPtrList<MapTheme> MapLoader::themes() TQStringList MapLoader::maps(const TQString &theme) { - return KGlobal::dirs()->findAllResources("data", TQString("kworldclock/maps/%1/*.jpg").arg(theme)); + return TDEGlobal::dirs()->findAllResources("data", TQString("kworldclock/maps/%1/*.jpg").arg(theme)); } 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; diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp index 5a60394..95bdef4 100644 --- a/kworldwatch/zoneclock.cpp +++ b/kworldwatch/zoneclock.cpp @@ -155,7 +155,7 @@ void ZoneClock::updateTime() time_t t = time(NULL); TQDateTime dt; dt.setTime_t(t); - _timeLabel->setText(TQString("%1, %2").arg(KGlobal::locale()->formatTime(dt.time(), true)).arg(KGlobal::locale()->formatDate(dt.date(), true))); + _timeLabel->setText(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); |