From 59a076e9336f1eebda8650437e6bc61077be1516 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:40 -0600 Subject: Remove additional unneeded tq method conversions --- kworldwatch/about.ui | 2 +- kworldwatch/flags.cpp | 12 ++++++------ kworldwatch/flow.cpp | 6 +++--- kworldwatch/maploader.cpp | 4 ++-- kworldwatch/mapwidget.cpp | 2 +- kworldwatch/zoneclock.cpp | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'kworldwatch') diff --git a/kworldwatch/about.ui b/kworldwatch/about.ui index 206a85c..334ea07 100644 --- a/kworldwatch/about.ui +++ b/kworldwatch/about.ui @@ -119,7 +119,7 @@ Copyright: (c) 2000 Matthias Hoelzer-Kluepfel - + WordBreak|AlignVCenter|AlignLeft diff --git a/kworldwatch/flags.cpp b/kworldwatch/flags.cpp index 6f9837f..0b726a8 100644 --- a/kworldwatch/flags.cpp +++ b/kworldwatch/flags.cpp @@ -121,9 +121,9 @@ void FlagList::save(KConfig *config) int cnt=0; for ( ; it.current(); ++it) { - config->writeEntry(TQString("Flag_%1_Color").tqarg(cnt), it.current()->color()); - config->writeEntry(TQString("Flag_%1_Latitude").tqarg(cnt), it.current()->latitude()); - config->writeEntry(TQString("Flag_%1_Longitude").tqarg(cnt), it.current()->longitude()); + config->writeEntry(TQString("Flag_%1_Color").arg(cnt), it.current()->color()); + config->writeEntry(TQString("Flag_%1_Latitude").arg(cnt), it.current()->latitude()); + config->writeEntry(TQString("Flag_%1_Longitude").arg(cnt), it.current()->longitude()); cnt++; } } @@ -136,9 +136,9 @@ void FlagList::load(KConfig *config) for (int i=0; ireadDoubleNumEntry(TQString("Flag_%1_Longitude").tqarg(i)), - config->readDoubleNumEntry(TQString("Flag_%1_Latitude").tqarg(i)), - config->readColorEntry(TQString("Flag_%1_Color").tqarg(i)))); + addFlag(new Flag(config->readDoubleNumEntry(TQString("Flag_%1_Longitude").arg(i)), + config->readDoubleNumEntry(TQString("Flag_%1_Latitude").arg(i)), + config->readColorEntry(TQString("Flag_%1_Color").arg(i)))); } } diff --git a/kworldwatch/flow.cpp b/kworldwatch/flow.cpp index 724275e..cb35521 100644 --- a/kworldwatch/flow.cpp +++ b/kworldwatch/flow.cpp @@ -155,7 +155,7 @@ int SimpleFlow::count() const { \reimp */ TQLayoutItem* SimpleFlow::itemAt(int index) const { - return index >= 0 && index < list.count() ? (const_cast&>(list).tqat(index)) : 0; + return index >= 0 && index < list.count() ? (const_cast&>(list).at(index)) : 0; } /*! @@ -164,8 +164,8 @@ TQLayoutItem* SimpleFlow::itemAt(int index) const { TQLayoutItem* SimpleFlow::takeAt(int index) { if (index < 0 || index >= list.count()) return 0; - TQLayoutItem *item = list.tqat(index); - list.remove(list.tqat(index)); + TQLayoutItem *item = list.at(index); + list.remove(list.at(index)); delete item; invalidate(); diff --git a/kworldwatch/maploader.cpp b/kworldwatch/maploader.cpp index 62fc49a..bb62e4f 100644 --- a/kworldwatch/maploader.cpp +++ b/kworldwatch/maploader.cpp @@ -63,7 +63,7 @@ TQPtrList MapLoader::themes() TQStringList MapLoader::maps(const TQString &theme) { - return KGlobal::dirs()->findAllResources("data", TQString("kworldclock/maps/%1/*.jpg").tqarg(theme)); + return KGlobal::dirs()->findAllResources("data", TQString("kworldclock/maps/%1/*.jpg").arg(theme)); } @@ -101,7 +101,7 @@ void MapLoader::load(unsigned int width, const TQString &theme, unsigned int hei size = 800; } else - image = TQImage(locate("data", TQString("kworldclock/maps/%1/%2.jpg").tqarg(theme).tqarg(size))); + image = TQImage(locate("data", TQString("kworldclock/maps/%1/%2.jpg").arg(theme).arg(size))); if (height == 0) height = width/2; diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp index 255ce3f..93bca75 100644 --- a/kworldwatch/mapwidget.cpp +++ b/kworldwatch/mapwidget.cpp @@ -366,7 +366,7 @@ TQString MapWidget::cityTime(const TQString &city) time_t t = time(NULL); TQDateTime dt; dt.setTime_t(t); - result.append(TQString("%1, %2").tqarg(KGlobal::locale()->formatTime(dt.time(), true)).tqarg(KGlobal::locale()->formatDate(dt.date(), true))); + result.append(TQString("%1, %2").arg(KGlobal::locale()->formatTime(dt.time(), true)).arg(KGlobal::locale()->formatDate(dt.date(), true))); if (initial_TZ != 0) setenv("TZ", initial_TZ, 1); diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp index bc61c9b..9f1c953 100644 --- a/kworldwatch/zoneclock.cpp +++ b/kworldwatch/zoneclock.cpp @@ -122,7 +122,7 @@ void ZoneClock::editClock() _name = _dlg->ClockCaption->text().append(":"); _nameLabel->setText(_dlg->ClockCaption->text().append(":")); updateTime(); - tqlayout()->tqinvalidate(); + tqlayout()->invalidate(); emit changed(); } @@ -152,7 +152,7 @@ void ZoneClock::updateTime() time_t t = time(NULL); TQDateTime dt; dt.setTime_t(t); - _timeLabel->setText(TQString("%1, %2").tqarg(KGlobal::locale()->formatTime(dt.time(), true)).tqarg(KGlobal::locale()->formatDate(dt.date(), true))); + _timeLabel->setText(TQString("%1, %2").arg(KGlobal::locale()->formatTime(dt.time(), true)).arg(KGlobal::locale()->formatDate(dt.date(), true))); if (initial_TZ != 0) setenv("TZ", initial_TZ, 1); @@ -266,8 +266,8 @@ void ZoneClockPanel::save(KConfig *config) { TQString n = it.current()->name(); n = n.left(n.length()-1); - config->writeEntry(TQString("Clock_%1_Name").tqarg(cnt), n); - config->writeEntry(TQString("Clock_%1_Zone").tqarg(cnt), it.current()->zone()); + config->writeEntry(TQString("Clock_%1_Name").arg(cnt), n); + config->writeEntry(TQString("Clock_%1_Zone").arg(cnt), it.current()->zone()); cnt++; } } @@ -281,7 +281,7 @@ void ZoneClockPanel::load(KConfig *config) for (int i=0; ireadEntry(TQString("Clock_%1_Zone").tqarg(i)), config->readEntry(TQString("Clock_%1_Name").tqarg(i))); + addClock(config->readEntry(TQString("Clock_%1_Zone").arg(i)), config->readEntry(TQString("Clock_%1_Name").arg(i))); } } -- cgit v1.2.1