TDE
/
tdetoys
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdetoys
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove additional unneeded tq method conversions

Browse Source 
(cherry picked from commit 59a076e933)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent b4dcf7866a
commit 82719e3d37
28 changed files with 118 additions and 118 deletions
Show Stats Download Patch File Download Diff File

2
amor/amor.cpp
Unescape View File

@ -748,7 +748,7 @@ void Amor::slotOffsetChanged(int off)
//
void Amor::slotAbout()
{
TQString about = i18n("Amor Version %1\n\n").tqarg(AMOR_VERSION) +
TQString about = i18n("Amor Version %1\n\n").arg(AMOR_VERSION) +
i18n("Amusing Misuse Of Resources\n\n") +
i18n("Copyright (c) 1999 Martin R. Jones <mjones@kde.org>\n\n") +
i18n("Original Author: Martin R. Jones <mjones@kde.org>\n") +

8
amor/amorbubble.cpp
Unescape View File

@ -83,12 +83,12 @@ AmorBubble::~AmorBubble()
//---------------------------------------------------------------------------
//
// Set the message to display in the bubble. Causes the tqgeometry of the
// Set the message to display in the bubble. Causes the geometry of the
// widget to be recalculated.
//
void AmorBubble::setMessage(const TQString& message)
{
mMessage = TQString( "<html>%1</html>" ).tqarg( message );
mMessage = TQString( "<html>%1</html>" ).arg( message );
// hacks because heightForWidth() doesn't work.
setGeometry( -1000, 0, 300, 1000 );
show();
@ -108,7 +108,7 @@ void AmorBubble::calcGeometry()
mBound.setHeight( mBrowser->contentsHeight() );
mBound.moveBy(ARROW_WIDTH+BORDER_SIZE, BORDER_SIZE);
// initialise the default tqgeometry of the bubble
// initialise the default geometry of the bubble
int w = mBound.width() + BORDER_SIZE * 2 + ARROW_WIDTH;
int h = mBound.height() + BORDER_SIZE * 2;
int xpos = mOriginX + BUBBLE_OFFSET;
@ -141,7 +141,7 @@ void AmorBubble::calcGeometry()
setGeometry(xpos, ypos, w, h);
mBrowser->setGeometry( mBound );
// create and apply the tqshape mask
// create and apply the shape mask
mMask.resize(w, h);
mMask.fill(color0);
TQPainter maskPainter(&mMask);

4
amor/amorbubble.h
Unescape View File

@ -40,7 +40,7 @@ class TQTimer;
//---------------------------------------------------------------------------
//
// AmorBubble displays a message in a tqshaped window
// AmorBubble displays a message in a shaped window
//
class AmorBubble : public TQWidget
{
@ -70,7 +70,7 @@ protected:
int mOriginX; // X origin of bubble arrow
int mOriginY; // Y origin of bubble arrow
TQRect mBound; // bounds of the text
TQBitmap mMask; // tqshape mask
TQBitmap mMask; // shape mask
VertPos mArrowVert; // vertical position of the arrow
HorzPos mArrowHorz; // horizontal position of the arrow
TQTextBrowser *mBrowser; // displays the message

2
amor/amorwidget.cpp
Unescape View File

@ -64,7 +64,7 @@ void AmorWidget::setPixmap(const TQPixmap *pixmap)
{
XShapeCombineMask( x11Display(), winId(), ShapeBounding, 0, 0,
mPixmap->mask()->handle(), ShapeSet );
tqrepaint(false);
repaint(false);
}
update();

2
amor/amorwidget.h
Unescape View File

@ -36,7 +36,7 @@
//---------------------------------------------------------------------------
//
// AmorWidget displays a tqshaped pixmap
// AmorWidget displays a shaped pixmap
//
class AmorWidget : public TQWidget
{

4
eyesapplet/eyes.cpp
Unescape View File

@ -55,11 +55,11 @@ EyesApplet::EyesApplet(const TQString& configFile, Type t, int actions,
int EyesApplet::widthForHeight(int h) const
{
return static_cast<int>(1.4 * h); // rectangular tqshape.
return static_cast<int>(1.4 * h); // rectangular shape.
}
int EyesApplet::heightForWidth(int w) const
{
return static_cast<int>(w / 1.4); // rectangular tqshape.
return static_cast<int>(w / 1.4); // rectangular shape.
}
void EyesApplet::resizeEvent( TQResizeEvent*e )

4
fifteenapplet/fifteenapplet.cpp
Unescape View File

@ -198,14 +198,14 @@ void PiecesTable::randomizeMap()
}
}
}
tqrepaint();
repaint();
_randomized = true;
}
void PiecesTable::resetMap()
{
initMap();
tqrepaint();
repaint();
}
void PiecesTable::checkwin()

56
fifteenapplet/qttableview.cpp
Unescape View File

@ -88,7 +88,7 @@ void QCornerSquare::paintEvent( TQPaintEvent * )
used by functions such as setXOffset() or maxYOffset().
\i The \e widget coordinates. (0,0) is the top-left corner of the widget,
\e including the frame. They are used by functions such as tqrepaint().
\e including the frame. They are used by functions such as repaint().
\i The \e view coordinates. (0,0) is the top-left corner of the view, \e
excluding the frame. This is the least-used coordinate system; it is used by
@ -135,7 +135,7 @@ void QCornerSquare::paintEvent( TQPaintEvent * )
The \link setCellHeight() cell height\endlink and \link setCellWidth()
cell width\endlink are set to 0.
Frame line tqshapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
Frame line shapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
see TQFrame::setFrameStyle().
Note that the \a f argument is \e not \link setTableFlags() table
@ -207,7 +207,7 @@ void QtTableView::show()
/*!
\overload void QtTableView::tqrepaint( bool erase )
\overload void QtTableView::repaint( bool erase )
Repaints the entire view.
*/
@ -221,16 +221,16 @@ void QtTableView::show()
If \a w is negative, it is replaced with <code>width() - x</code>.
If \a h is negative, it is replaced with <code>height() - y</code>.
Doing a tqrepaint() usually is faster than doing an update(), but
Doing a repaint() usually is faster than doing an update(), but
calling update() many times in a row will generate a single paint
event.
At present, QtTableView is the only widget that reimplements \link
TQWidget::tqrepaint() tqrepaint()\endlink. It does this because by
TQWidget::repaint() repaint()\endlink. It does this because by
clearing and then repainting one cell at at time, it can make the
screen flicker less than it would otherwise. */
void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase )
void QtTableView::repaint( int x, int y, int w, int h, bool erase )
{
if ( !isVisible() || testWState(WState_BlockUpdates) )
return;
@ -249,7 +249,7 @@ void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase )
}
/*!
\overload void QtTableView::tqrepaint( const TQRect &r, bool erase )
\overload void QtTableView::repaint( const TQRect &r, bool erase )
Replaints rectangle \a r. If \a erase is TRUE draws the background
using the palette's background.
*/
@ -288,7 +288,7 @@ void QtTableView::setNumRows( int rows )
nRows = rows;
if ( autoUpdate() && isVisible() &&
( oldLastVisible != lastRowVisible() || oldTopCell != topCell() ) )
tqrepaint( oldTopCell != topCell() );
repaint( oldTopCell != topCell() );
} else {
// Be more careful - if destructing, bad things might happen.
nRows = rows;
@ -328,7 +328,7 @@ void QtTableView::setNumCols( int cols )
if ( autoUpdate() && isVisible() ) {
int maxCol = lastColVisible();
if ( maxCol >= oldCols || maxCol >= nCols )
tqrepaint();
repaint();
}
updateScrollBars( horRange );
updateFrameSize();
@ -591,7 +591,7 @@ void QtTableView::setCellWidth( int cellWidth )
updateScrollBars( horSteps | horRange );
if ( autoUpdate() && isVisible() )
tqrepaint();
repaint();
}
@ -643,7 +643,7 @@ void QtTableView::setCellHeight( int cellHeight )
#endif
cellH = (short)cellHeight;
if ( autoUpdate() && isVisible() )
tqrepaint();
repaint();
updateScrollBars( verSteps | verRange );
}
@ -817,7 +817,7 @@ void QtTableView::setTableFlags( uint f )
(f & Tbl_snapToVGrid) != 0 && yCellDelta != 0 ) {
snapToGrid( (f & Tbl_snapToHGrid) != 0, // do snapping
(f & Tbl_snapToVGrid) != 0 );
repaintMask |= Tbl_snapToGrid; // tqrepaint table
repaintMask |= Tbl_snapToGrid; // repaint table
}
}
@ -825,7 +825,7 @@ void QtTableView::setTableFlags( uint f )
setAutoUpdate( TRUE );
updateScrollBars();
if ( isVisible() && (f & repaintMask) )
tqrepaint();
repaint();
}
}
@ -881,7 +881,7 @@ void QtTableView::clearTableFlags( uint f )
(f & Tbl_smoothVScrolling) != 0 && yCellDelta != 0 ) {
snapToGrid( (f & Tbl_smoothHScrolling) != 0, // do snapping
(f & Tbl_smoothVScrolling) != 0 );
repaintMask |= Tbl_smoothScrolling; // tqrepaint table
repaintMask |= Tbl_smoothScrolling; // repaint table
}
}
if ( f & Tbl_snapToHGrid ) {
@ -894,7 +894,7 @@ void QtTableView::clearTableFlags( uint f )
setAutoUpdate( TRUE );
updateScrollBars(); // returns immediately if nothing to do
if ( isVisible() && (f & repaintMask) )
tqrepaint();
repaint();
}
}
@ -916,20 +916,20 @@ void QtTableView::clearTableFlags( uint f )
automatically whenever it has changed in some way (for example, when a
\link setTableFlags() flag\endlink is changed).
If \a enable is FALSE, the view does NOT tqrepaint itself or update
If \a enable is FALSE, the view does NOT repaint itself or update
its internal state variables when it is changed. This can be
useful to avoid flicker during large changes and is singularly
useless otherwise. Disable auto-update, do the changes, re-enable
auto-update and call tqrepaint().
auto-update and call repaint().
\warning Do not leave the view in this state for a long time
(i.e., between events). If, for example, the user interacts with the
view when auto-update is off, strange things can happen.
Setting auto-update to TRUE does not tqrepaint the view; you must call
tqrepaint() to do this.
Setting auto-update to TRUE does not repaint the view; you must call
repaint() to do this.
\sa autoUpdate(), tqrepaint()
\sa autoUpdate(), repaint()
*/
void QtTableView::setAutoUpdate( bool enable )
@ -963,7 +963,7 @@ void QtTableView::updateCell( int row, int col, bool erase )
TQRect uR = TQRect( xPos, yPos,
cellW ? cellW : cellWidth(col),
cellH ? cellH : cellHeight(row) );
tqrepaint( uR.intersect(viewRect()), erase );
repaint( uR.intersect(viewRect()), erase );
}
@ -1379,7 +1379,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
// Note that this needs to be done regardless whether we do
// eraseInPaint or not. Reason: a subclass may implement
// flicker-freeness and encourage the use of tqrepaint(FALSE).
// flicker-freeness and encourage the use of repaint(FALSE).
// The subclass, however, cannot draw all pixels, just those
// inside the cells. So QtTableView is reponsible for all pixels
// outside the cells.
@ -1426,7 +1426,7 @@ void QtTableView::resizeEvent( TQResizeEvent * )
void QtTableView::updateView()
{
tqrepaint( viewRect() );
repaint( viewRect() );
}
/*!
@ -1522,7 +1522,7 @@ void QtTableView::setHorScrollBar( bool on, bool update )
else
sbDirty = sbDirty | verMask;
if ( hideScrollBar && isVisible() )
tqrepaint( hScrollBar->x(), hScrollBar->y(),
repaint( hScrollBar->x(), hScrollBar->y(),
width() - hScrollBar->x(), hScrollBar->height() );
}
if ( update )
@ -1561,7 +1561,7 @@ void QtTableView::setVerScrollBar( bool on, bool update )
else
sbDirty = sbDirty | horMask;
if ( hideScrollBar && isVisible() )
tqrepaint( vScrollBar->x(), vScrollBar->y(),
repaint( vScrollBar->x(), vScrollBar->y(),
vScrollBar->width(), height() - vScrollBar->y() );
}
if ( update )
@ -2006,7 +2006,7 @@ void QtTableView::updateScrollBars( uint f )
if ( sbDirty & horValue )
hScrollBar->setValue( xOffs );
// show scrollbar only when it has a sane tqgeometry
// show scrollbar only when it has a sane geometry
if ( !hScrollBar->isVisible() )
hScrollBar->show();
}
@ -2030,7 +2030,7 @@ void QtTableView::updateScrollBars( uint f )
if ( sbDirty & verValue )
vScrollBar->setValue( yOffs );
// show scrollbar only when it has a sane tqgeometry
// show scrollbar only when it has a sane geometry
if ( !vScrollBar->isVisible() )
vScrollBar->show();
}
@ -2253,7 +2253,7 @@ void QtTableView::showOrHideScrollBars()
Call this function when the table view's total size is changed;
typically because the result of cellHeight() or cellWidth() have changed.
This function does not tqrepaint the widget.
This function does not repaint the widget.
*/
void QtTableView::updateTableSize()

14
fifteenapplet/qttableview.h
Unescape View File

@ -32,9 +32,9 @@ public:
virtual void setPalette( const TQPalette & );
void show();
void tqrepaint( bool erase=TRUE );
void tqrepaint( int x, int y, int w, int h, bool erase=TRUE );
void tqrepaint( const TQRect &, bool erase=TRUE );
void repaint( bool erase=TRUE );
void repaint( int x, int y, int w, int h, bool erase=TRUE );
void repaint( const TQRect &, bool erase=TRUE );
protected:
QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 );
@ -235,11 +235,11 @@ inline TQRect QtTableView::cellUpdateRect() const
inline bool QtTableView::autoUpdate() const
{ return isUpdatesEnabled(); }
inline void QtTableView::tqrepaint( bool erase )
{ tqrepaint( 0, 0, width(), height(), erase ); }
inline void QtTableView::repaint( bool erase )
{ repaint( 0, 0, width(), height(), erase ); }
inline void QtTableView::tqrepaint( const TQRect &r, bool erase )
{ tqrepaint( r.x(), r.y(), r.width(), r.height(), erase ); }
inline void QtTableView::repaint( const TQRect &r, bool erase )
{ repaint( r.x(), r.y(), r.width(), r.height(), erase ); }
inline void QtTableView::updateScrollBars()
{ updateScrollBars( 0 ); }

4
kmoon/kmoonapplet.cpp
Unescape View File

@ -136,7 +136,7 @@ void MoonPAWidget::settings()
config->writeEntry("Mask", moon->mask());
config->sync();
}
tqrepaint();
repaint();
}
void MoonPAWidget::timerEvent( TQTimerEvent * )
@ -145,7 +145,7 @@ void MoonPAWidget::timerEvent( TQTimerEvent * )
time(&clock);
struct tm *t = localtime(&clock);
moon->calcStatus(mktime(t));
moon->tqrepaint();
moon->repaint();
}
void MoonPAWidget::mousePressEvent( TQMouseEvent *e)

12
kmoon/kmoonwidget.cpp
Unescape View File

@ -217,14 +217,14 @@ void MoonWidget::calcStatus( time_t time )
}
renderGraphic();
tqrepaint();
repaint();
}
TQImage MoonWidget::loadMoon(int index)
{
if (index == 0) // the new moon has the wrong filename
index = 29;
TQString filename = TQString("kmoon/pics/moon%1.png").tqarg(index);
TQString filename = TQString("kmoon/pics/moon%1.png").arg(index);
TQString path = locate("data", filename);
if (path.isNull())
kdFatal() << "cound't find " << filename << ". Exiting.\n";
@ -238,21 +238,21 @@ void MoonWidget::setAngle(int value)
{
_angle = value;
renderGraphic();
tqrepaint();
repaint();
}
void MoonWidget::setNorthHemi(bool n)
{
_north = n;
renderGraphic();
tqrepaint();
repaint();
}
void MoonWidget::setMask(bool value)
{
_mask = value;
renderGraphic();
tqrepaint();
repaint();
}
void MoonWidget::paintEvent(TQPaintEvent *)
@ -263,7 +263,7 @@ void MoonWidget::paintEvent(TQPaintEvent *)
void MoonWidget::resizeEvent(TQResizeEvent *)
{
renderGraphic();
tqrepaint();
repaint();
}
void MoonWidget::renderGraphic()

4
kodo/kimagenumber.cpp
Unescape View File

@ -47,7 +47,7 @@ void KImageNumber::paintEvent(TQPaintEvent*)
data.sprintf("%06.1f", m_value);
for(unsigned int i=0; i < data.length(); i++) {
int wl = data.tqat(i).latin1() - '0';
int wl = data.at(i).latin1() - '0';
if(data.at(i) == '.')
wl = 10;
bitBlt(this, i*each, 0, fontPix, wl*each, 0, each, fontPix->height());
@ -57,7 +57,7 @@ void KImageNumber::paintEvent(TQPaintEvent*)
void KImageNumber::setValue(double v)
{
m_value = v;
tqrepaint(false);
repaint(false);
}
double KImageNumber::value() const

6
kteatime/tealist.cpp
Unescape View File

@ -15,12 +15,12 @@ TQString int2time(int time)
{
TQString str;
if (time / 60)
str.append(i18n("%1 min").tqarg(time / 60));
str.append(i18n("%1 min").arg(time / 60));
if (time % 60)
if (str.isEmpty())
str.append(i18n("%1 s").tqarg(time % 60));
str.append(i18n("%1 s").arg(time % 60));
else
str.append(i18n(" %1 s").tqarg(time % 60));
str.append(i18n(" %1 s").arg(time % 60));
return str;
}

18
kteatime/toplevel.cpp
Unescape View File

@ -207,7 +207,7 @@ void TopLevel::resizeEvent ( TQResizeEvent * )
teaNotReadyPixmap = loadSizedIcon("tea_not_ready", width());
teaAnim1Pixmap = loadSizedIcon("tea_anim1", width());
teaAnim2Pixmap = loadSizedIcon("tea_anim2", width());
tqrepaint();
repaint();
}
/** Handle mousePressEvent */
@ -302,7 +302,7 @@ void TopLevel::timerEvent(TQTimerEvent *)
menu->setItemChecked(current_selected, true);
}
TQString teaMessage = i18n("The %1 is now ready!").tqarg(current_name);
TQString teaMessage = i18n("The %1 is now ready!").arg(current_name);
// invoke action
if (useNotify) {
KNotifyClient::event(winId(), "tea", teaMessage);
@ -317,7 +317,7 @@ void TopLevel::timerEvent(TQTimerEvent *)
teaMessage, teaAnim1Pixmap, this, "popup", 0);
// FIXME: does auto-deletion work without timeout?
setToolTip(teaMessage);
tqrepaint();
repaint();
} else {
// timer not yet run out; just update tray-icon (if configured)...
if (useTrayVis) {
@ -325,18 +325,18 @@ void TopLevel::timerEvent(TQTimerEvent *)
if (pDone - percentDone > 8) {
// update icon not every second, but only if somewhat noticable
percentDone = pDone;
tqrepaint();
repaint();
}
}
// ...and Tooltip
TQString min = int2time(seconds);
setToolTip(i18n("%1 left for %2").tqarg(min).tqarg(current_name));
setToolTip(i18n("%1 left for %2").arg(min).arg(current_name));
}
} else {
// no tea is steeping; just animate icon
if (ready) {
firstFrame = !firstFrame;
tqrepaint();
repaint();
}
}
}
@ -447,7 +447,7 @@ void TopLevel::start()
ready = false;
enable_menuEntries(); // disable "start", enable "stop"
tqrepaint();
repaint();
}
}
@ -467,7 +467,7 @@ void TopLevel::stop()
}
setToolTip(i18n("The Tea Cooker"), true);
tqrepaint();
repaint();
}
/* open dialog to start an 'anonymous' tea */
@ -721,7 +721,7 @@ void TopLevel::config()
rightside->addWidget(editgroup, 0, 0);
TQHBox *propbox = new TQHBox(editgroup);
// FIXME: - must enforce correct vertical tqalignment of each label-editor pair
// FIXME: - must enforce correct vertical alignment of each label-editor pair
// (better use one HBox for each label-editor pair?)
TQVBox *propleft = new TQVBox(propbox);
TQVBox *propright = new TQVBox(propbox);

8
kweather/dockwidget.cpp
Unescape View File

@ -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>&nbsp;</td><td>&nbsp;</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>";

2
kweather/kweather.cpp
Unescape View File

@ -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"),

10
kweather/metar_parser.cpp
Unescape View File

@ -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;

2
kweather/prefdialogdata.ui
Unescape View File

@ -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">

26
kweather/reportview.cpp
Unescape View File

@ -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\">&nbsp;</td>";
.arg(temp).arg(dewPoint).arg(pressure).arg(relHumidity)
.arg(wind) + "<td width=\"50\">&nbsp;</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>&nbsp;</td><td>&nbsp;</td>";
contents += "</tr>";
@ -162,7 +162,7 @@ void reportView::render(){
+ i18n( "Sunrise:" ) + "</th><td>%1</td>" +
"<td width=\"50\">&nbsp;</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>";

2
kweather/serviceconfigwidget.cpp
Unescape View File

@ -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 ) );
}
}
}

6
kweather/weatherbutton.cpp
Unescape View File

@ -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 );
}

4
kweather/weatherlib.cpp
Unescape View File

@ -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;

2
kworldwatch/about.ui
Unescape View File

@ -119,7 +119,7 @@
Copyright: (c) 2000 Matthias Hoelzer-Kluepfel</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
<property name="wordwrap" stdset="0">

12
kworldwatch/flags.cpp
Unescape View File

@ -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; i<num; ++i)
{
addFlag(new Flag(config->readDoubleNumEntry(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))));
}
}

6
kworldwatch/flow.cpp
Unescape View File

@ -155,7 +155,7 @@ int SimpleFlow::count() const {
\reimp
*/
TQLayoutItem* SimpleFlow::itemAt(int index) const {
return index >= 0 && index < list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(list).tqat(index)) : 0;
return index >= 0 && index < list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(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();

4
kworldwatch/maploader.cpp
Unescape View File

@ -63,7 +63,7 @@ TQPtrList<MapTheme> 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;

2
kworldwatch/mapwidget.cpp
Unescape View File

@ -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);

10
kworldwatch/zoneclock.cpp
Unescape View File

@ -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; i<num; ++i)
{
addClock(config->readEntry(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)));
}
}

Write Preview
Loading…
Cancel
Save