diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:59:40 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:59:40 -0600 |
commit | 59a076e9336f1eebda8650437e6bc61077be1516 (patch) | |
tree | a2e4658f80b77270d84b50bd116f84eaea7efab0 /kweather | |
parent | 3ee504ecba6caf3c2609a8648fe3659f2b541544 (diff) | |
download | tdetoys-59a076e9336f1eebda8650437e6bc61077be1516.tar.gz tdetoys-59a076e9336f1eebda8650437e6bc61077be1516.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'kweather')
-rw-r--r-- | kweather/dockwidget.cpp | 8 | ||||
-rw-r--r-- | kweather/kweather.cpp | 2 | ||||
-rw-r--r-- | kweather/metar_parser.cpp | 10 | ||||
-rw-r--r-- | kweather/prefdialogdata.ui | 2 | ||||
-rw-r--r-- | kweather/reportview.cpp | 26 | ||||
-rw-r--r-- | kweather/serviceconfigwidget.cpp | 2 | ||||
-rw-r--r-- | kweather/weatherbutton.cpp | 6 | ||||
-rw-r--r-- | kweather/weatherlib.cpp | 4 |
8 files changed, 30 insertions, 30 deletions
diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp index bfcc097..f5205d4 100644 --- a/kweather/dockwidget.cpp +++ b/kweather/dockwidget.cpp @@ -112,19 +112,19 @@ void dockwidget::showWeather() "<th><nobr>" + i18n( "Rel. Humidity:" ) + "</nobr></th><td><nobr>%4</nobr></td></nobr></tr>" "<tr><th><nobr>" + i18n( "Wind Speed:" ) + "</nobr></th><td><nobr>%5</nobr></td>") - .tqarg(temp).tqarg(dewPoint).tqarg(pressure).tqarg(relHumidity).tqarg(wind); + .arg(temp).arg(dewPoint).arg(pressure).arg(relHumidity).arg(wind); if ( !heatIndex.isEmpty() ) - tip += TQString("<th><nobr>" + i18n( "Heat Index:" ) + "</nobr></th><td><nobr>%1</nobr></td>").tqarg(heatIndex); + tip += TQString("<th><nobr>" + i18n( "Heat Index:" ) + "</nobr></th><td><nobr>%1</nobr></td>").arg(heatIndex); else if ( !windChill.isEmpty() ) - tip += TQString("<th><nobr>" + i18n( "Wind Chill:" ) + "</nobr></th><td><nobr>%1</nobr></td>").tqarg(windChill); + tip += TQString("<th><nobr>" + i18n( "Wind Chill:" ) + "</nobr></th><td><nobr>%1</nobr></td>").arg(windChill); else tip += "<td> </td><td> </td>"; tip += "</tr>"; tip += TQString("<tr><th><nobr>" + i18n( "Sunrise:" ) + "</nobr></th><td><nobr>%1</nobr></td>" + "<th><nobr>" + i18n( "Sunset:" ) + "</nobr></th><td><nobr>%2</nobr></td>") - .tqarg(sunRiseTime).tqarg(sunSetTime); + .arg(sunRiseTime).arg(sunSetTime); tip += "</tr></table>"; diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp index 324a610..9dd5def 100644 --- a/kweather/kweather.cpp +++ b/kweather/kweather.cpp @@ -86,7 +86,7 @@ kweather::~kweather() void kweather::initContextMenu() { mContextMenu = new KPopupMenu(this); - mContextMenu->insertTitle(i18n("KWeather - %1").tqarg( reportLocation ), -1, 0); + mContextMenu->insertTitle(i18n("KWeather - %1").arg( reportLocation ), -1, 0); mContextMenu->insertItem(SmallIcon("viewmag"), i18n("Show &Report"), this, TQT_SLOT(doReport()), 0, -1, 1); mContextMenu->insertItem(SmallIcon("reload"), i18n("&Update Now"), diff --git a/kweather/metar_parser.cpp b/kweather/metar_parser.cpp index d65d4da..b6715f0 100644 --- a/kweather/metar_parser.cpp +++ b/kweather/metar_parser.cpp @@ -170,22 +170,22 @@ bool MetarParser::parseCover(const TQString &s) if (sCode == "FEW") { - skycondition = i18n( "Few clouds at %1" ).tqarg(sClouds); + skycondition = i18n( "Few clouds at %1" ).arg(sClouds); weatherInfo.clouds += 2; } else if (sCode == "SCT") { - skycondition = i18n( "Scattered clouds at %1" ).tqarg(sClouds); + skycondition = i18n( "Scattered clouds at %1" ).arg(sClouds); weatherInfo.clouds += 4; } else if (sCode == "BKN") { - skycondition = i18n( "Broken clouds at %1" ).tqarg(sClouds); + skycondition = i18n( "Broken clouds at %1" ).arg(sClouds); weatherInfo.clouds += 8; } else if (sCode == "OVC") { - skycondition = i18n( "Overcast clouds at %1" ).tqarg(sClouds); + skycondition = i18n( "Overcast clouds at %1" ).arg(sClouds); weatherInfo.clouds += 64; } else if ((sCode == "CLR") || (sCode == "SKC") || (sCode == "CAVOK")) @@ -343,7 +343,7 @@ bool MetarParser::parseCurrent(const TQString &s) else if (sCode.contains("DS")) phenomena = i18n("Dust Storm"); - if (currentWeather.isEmpty()) currentWeather = i18n("%1 is the intensity, %2 is the descriptor and %3 is the phenomena", "%1 %2 %3").tqarg(intensity).tqarg(descriptor).tqarg(phenomena); + if (currentWeather.isEmpty()) currentWeather = i18n("%1 is the intensity, %2 is the descriptor and %3 is the phenomena", "%1 %2 %3").arg(intensity).arg(descriptor).arg(phenomena); if (!currentWeather.isEmpty()) weatherInfo.qsCurrentList << currentWeather; diff --git a/kweather/prefdialogdata.ui b/kweather/prefdialogdata.ui index 596c54a..7b61ead 100644 --- a/kweather/prefdialogdata.ui +++ b/kweather/prefdialogdata.ui @@ -129,7 +129,7 @@ <property name="title"> <string>Panel Display Options</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="exclusive"> diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp index f25df19..3ef28b4 100644 --- a/kweather/reportview.cpp +++ b/kweather/reportview.cpp @@ -93,7 +93,7 @@ void reportView::render(){ TQStringList cover = m_weatherService->cover(m_locationCode ); TQStringList weather = m_weatherService->weather(m_locationCode ); - setCaption(i18n("Weather Report - %1").tqarg( locationName ) ); + setCaption(i18n("Weather Report - %1").arg( locationName ) ); TQString weatherText = "<ul>\n"; @@ -114,24 +114,24 @@ void reportView::render(){ TQString contents = "<html><head><style type=\"text/css\">" + TQString("body { font-family: \"%1\"; font-size: %2pt; color: %3; background-color: %4; }\n") - .tqarg(fntFamily).tqarg(fntSize).tqarg(textColor).tqarg(baseColor) + + .arg(fntFamily).arg(fntSize).arg(textColor).arg(baseColor) + TQString("div.headerTitle { background-color: %1; color: %2; padding: 4px; font-size: 120%; border: solid %3 1px; }\n") - .tqarg(hlColor).tqarg(hlTextColor).tqarg(textColor) + + .arg(hlColor).arg(hlTextColor).arg(textColor) + TQString("div.headerMsg { background-color: %1; color: %2; border-bottom: solid %3 1px; " "border-left: solid %4 1px; border-right: solid %5 1px; margin-bottom: 1em; padding: 2px; }\n") - .tqarg(bgColor).tqarg(textColor).tqarg(textColor).tqarg(textColor).tqarg(textColor) + - TQString("</style><title></title></head><body dir=\"%1\">").tqarg( TQApplication::reverseLayout()?"rtl":"ltr") + - "<div class=\"headerTitle\"><b>" + i18n( "Weather Report - %1 - %2" ).tqarg( locationName ).tqarg( countryName ) + + .arg(bgColor).arg(textColor).arg(textColor).arg(textColor).arg(textColor) + + TQString("</style><title></title></head><body dir=\"%1\">").arg( TQApplication::reverseLayout()?"rtl":"ltr") + + "<div class=\"headerTitle\"><b>" + i18n( "Weather Report - %1 - %2" ).arg( locationName ).arg( countryName ) + "</b></div>\n"; if ( ! date.isEmpty() ) - contents += "<div class=\"headerMsg\"><b>" + i18n( "Latest data from %1" ).tqarg(date) + "</b></div>\n"; + contents += "<div class=\"headerMsg\"><b>" + i18n( "Latest data from %1" ).arg(date) + "</b></div>\n"; contents += TQString( "<table><tr><td width=\"60\" style=\"text-align: center; border: dotted %1 1px;\">" "<img width=\"64\" height=\"64\" src=\"%2\" /></td>" "<td style=\"vertical-align: top\">%3</td></tr>") - .tqarg(bgColor).tqarg(KURL(icon).url()).tqarg(weatherText) + + .arg(bgColor).arg(KURL(icon).url()).arg(weatherText) + "</table><table>" + TQString("<tr><th style=\"text-align: right\">" + i18n( "Temperature:" ) + "</th><td>%1</td>" @@ -145,15 +145,15 @@ void reportView::render(){ + "</th><td>%4</td></tr>" "<tr><th style=\"text-align: right\">" + i18n( "Wind Speed:" ) + "</th><td>%5</td>") - .tqarg(temp).tqarg(dewPoint).tqarg(pressure).tqarg(relHumidity) - .tqarg(wind) + "<td width=\"50\"> </td>"; + .arg(temp).arg(dewPoint).arg(pressure).arg(relHumidity) + .arg(wind) + "<td width=\"50\"> </td>"; if (!heatIndex.isEmpty()) contents += TQString("<th style=\"text-align: right\">" - + i18n( "Heat Index:" ) + "</th><td>%1</td>").tqarg(heatIndex); + + i18n( "Heat Index:" ) + "</th><td>%1</td>").arg(heatIndex); else if (!windChill.isEmpty()) contents += TQString("<th style=\"text-align: right\">" - + i18n( "Wind Chill:" ) + "</th><td>%1</td>").tqarg(windChill); + + i18n( "Wind Chill:" ) + "</th><td>%1</td>").arg(windChill); else contents += "<td> </td><td> </td>"; contents += "</tr>"; @@ -162,7 +162,7 @@ void reportView::render(){ + i18n( "Sunrise:" ) + "</th><td>%1</td>" + "<td width=\"50\"> </td><th style=\"text-align: right\">" + i18n( "Sunset:" ) + "</th><td>%2</td>") - .tqarg(sunRiseTime).tqarg(sunSetTime); + .arg(sunRiseTime).arg(sunSetTime); contents += "</tr></table></body></html>"; diff --git a/kweather/serviceconfigwidget.cpp b/kweather/serviceconfigwidget.cpp index 08a3b51..a71d4b6 100644 --- a/kweather/serviceconfigwidget.cpp +++ b/kweather/serviceconfigwidget.cpp @@ -194,7 +194,7 @@ void ServiceConfigWidget::loadLocations() parseStationEntry( entryIt.data(), station, uid ); new StationItem( stateItem, station, uid ); mStationMap.insert( uid, TQString( "%1, %2" ) - .tqarg( station ).tqarg( *stateIt ) ); + .arg( station ).arg( *stateIt ) ); } } } diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp index ceb4360..ee88962 100644 --- a/kweather/weatherbutton.cpp +++ b/kweather/weatherbutton.cpp @@ -124,14 +124,14 @@ void WeatherButton::slotIconChanged( int group ) return; generateIcons(); - tqrepaint( false ); + repaint( false ); } void WeatherButton::enterEvent( TQEvent *e ) { m_highlight = true; - tqrepaint( false ); + repaint( false ); TQButton::enterEvent( e ); } @@ -139,7 +139,7 @@ void WeatherButton::leaveEvent( TQEvent *e ) { m_highlight = false; - tqrepaint( false ); + repaint( false ); TQButton::enterEvent( e ); } diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp index ae40734..59a10dc 100644 --- a/kweather/weatherlib.cpp +++ b/kweather/weatherlib.cpp @@ -144,7 +144,7 @@ void WeatherLib::slotCopyDone(KIO::Job* job) // File error kdDebug( 12006 ) << "File empty error..." << endl; KPassivePopup::message( i18n("KWeather Error!"), - i18n("The temp file %1 was empty.").tqarg(d->target->name()), 0L,"error" ); + i18n("The temp file %1 was empty.").arg(d->target->name()), 0L,"error" ); d->updated = false; } } @@ -153,7 +153,7 @@ void WeatherLib::slotCopyDone(KIO::Job* job) // File error kdDebug( 12006 ) << "File read error..." << endl; KPassivePopup::message( i18n("KWeather Error!"), - i18n("Could not read the temp file %1.").tqarg(d->target->name()), 0L,"error" ); + i18n("Could not read the temp file %1.").arg(d->target->name()), 0L,"error" ); d->updated = false; } delete d->target; |