diff --git a/src/kcm/configdialog.cpp b/src/kcm/configdialog.cpp
index 70950db..6da6e91 100644
--- a/src/kcm/configdialog.cpp
+++ b/src/kcm/configdialog.cpp
@@ -314,11 +314,11 @@ void ConfigDialog::load()
{
TQString entry;
InterfaceCommand cmd;
- entry = TQString( "RunAsRoot%1" ).tqarg( i + 1 );
+ entry = TQString( "RunAsRoot%1" ).arg( i + 1 );
cmd.runAsRoot = config->readBoolEntry( entry );
- entry = TQString( "Command%1" ).tqarg( i + 1 );
+ entry = TQString( "Command%1" ).arg( i + 1 );
cmd.command = config->readEntry( entry );
- entry = TQString( "MenuText%1" ).tqarg( i + 1 );
+ entry = TQString( "MenuText%1" ).arg( i + 1 );
cmd.menuText = config->readEntry( entry );
settings->commands.append( cmd );
}
@@ -384,11 +384,11 @@ void ConfigDialog::save()
for ( uint i = 0; i < settings->commands.size(); i++ )
{
TQString entry;
- entry = TQString( "RunAsRoot%1" ).tqarg( i + 1 );
+ entry = TQString( "RunAsRoot%1" ).arg( i + 1 );
config->writeEntry( entry, settings->commands[i].runAsRoot );
- entry = TQString( "Command%1" ).tqarg( i + 1 );
+ entry = TQString( "Command%1" ).arg( i + 1 );
config->writeEntry( entry, settings->commands[i].command );
- entry = TQString( "MenuText%1" ).tqarg( i + 1 );
+ entry = TQString( "MenuText%1" ).arg( i + 1 );
config->writeEntry( entry, settings->commands[i].menuText );
}
}
diff --git a/src/kcm/configdlg.ui b/src/kcm/configdlg.ui
index 31a8129..a9fa86f 100644
--- a/src/kcm/configdlg.ui
+++ b/src/kcm/configdlg.ui
@@ -763,7 +763,7 @@ of wireless devices not in the tooltips of standard interfaces.</b>
Description:
-
+
AlignTop
@@ -774,7 +774,7 @@ of wireless devices not in the tooltips of standard interfaces.</b>
-
+
WordBreak|AlignVCenter
diff --git a/src/knemod/interface.cpp b/src/knemod/interface.cpp
index 3745312..8c9ec94 100644
--- a/src/knemod/interface.cpp
+++ b/src/knemod/interface.cpp
@@ -398,7 +398,7 @@ void Interface::configurePlotter()
break;
}
mVisibleBeams = nextVisibleBeams;
- mPlotter->tqrepaint();
+ mPlotter->repaint();
}
void Interface::startStatistics()
@@ -464,7 +464,7 @@ void Interface::activateOrHide( TQWidget* widget, bool onlyActivate )
NET::WMGeometry | NET::XAWMState | NET::WMState | NET::WMWindowType );
if( info2.mappingState() != NET::Visible )
continue; // not visible on current desktop -> ignore
- if( !info2.geometry().intersects( widget->tqgeometry()))
+ if( !info2.geometry().intersects( widget->geometry()))
continue; // not obscuring the window -> ignore
if( !info1.hasState( NET::KeepAbove ) && info2.hasState( NET::KeepAbove ))
continue; // obscured by window kept above -> ignore
diff --git a/src/knemod/interfacestatusdialog.cpp b/src/knemod/interfacestatusdialog.cpp
index 93f3a15..d170b88 100644
--- a/src/knemod/interfacestatusdialog.cpp
+++ b/src/knemod/interfacestatusdialog.cpp
@@ -150,7 +150,7 @@ void InterfaceStatusDialog::updateDialog()
if ( updays == 1 )
uptime = "1 day, ";
else if ( updays > 1 )
- uptime = TQString( "%1 days, " ).tqarg( updays );
+ uptime = TQString( "%1 days, " ).arg( updays );
upsecs -= 86400 * updays; // we only want the seconds of today
int hrs = upsecs / 3600;
diff --git a/src/knemod/interfacestatusdlg.ui b/src/knemod/interfacestatusdlg.ui
index b871180..b56b6c1 100644
--- a/src/knemod/interfacestatusdlg.ui
+++ b/src/knemod/interfacestatusdlg.ui
@@ -69,7 +69,7 @@
textLabelIP
-
+
AlignVCenter|AlignRight
@@ -77,7 +77,7 @@
textLabelSubnet
-
+
AlignVCenter|AlignRight
@@ -85,7 +85,7 @@
variableText1
-
+
AlignVCenter|AlignRight
@@ -93,7 +93,7 @@
variableText2
-
+
AlignVCenter|AlignRight
@@ -101,7 +101,7 @@
variableText3
-
+
AlignVCenter|AlignRight
@@ -154,7 +154,7 @@
-
+
AlignVCenter|AlignRight
@@ -165,7 +165,7 @@
-
+
AlignVCenter|AlignRight
@@ -176,7 +176,7 @@
-
+
AlignVCenter|AlignRight
@@ -187,7 +187,7 @@
-
+
AlignVCenter|AlignRight
@@ -254,7 +254,7 @@
Received
-
+
AlignVCenter|AlignRight
@@ -265,7 +265,7 @@
Sent
-
+
AlignVCenter|AlignRight
@@ -273,7 +273,7 @@
textLabelPacketsSend
-
+
AlignVCenter|AlignRight
@@ -281,7 +281,7 @@
textLabelPacketsReceived
-
+
AlignVCenter|AlignRight
@@ -300,7 +300,7 @@
Bytes:
-
+
AlignTop
@@ -311,7 +311,7 @@
Speed:
-
+
AlignTop
@@ -319,7 +319,7 @@
textLabelBytesSend
-
+
AlignVCenter|AlignRight
@@ -327,7 +327,7 @@
textLabelBytesReceived
-
+
AlignVCenter|AlignRight
@@ -335,7 +335,7 @@
textLabelSpeedSend
-
+
AlignVCenter|AlignRight
@@ -343,7 +343,7 @@
textLabelSpeedReceived
-
+
AlignVCenter|AlignRight
@@ -375,7 +375,7 @@
This year:
-
+
AlignTop
@@ -386,7 +386,7 @@
Received
-
+
AlignVCenter|AlignRight
@@ -397,7 +397,7 @@
Total
-
+
AlignVCenter|AlignRight
@@ -408,7 +408,7 @@
This month:
-
+
AlignTop
@@ -416,7 +416,7 @@
textLabelTodayReceived
-
+
AlignVCenter|AlignRight
@@ -424,7 +424,7 @@
textLabelMonthReceived
-
+
AlignVCenter|AlignRight
@@ -432,7 +432,7 @@
textLabelYearReceived
-
+
AlignVCenter|AlignRight
@@ -440,7 +440,7 @@
textLabelTodayTotal
-
+
AlignVCenter|AlignRight
@@ -448,7 +448,7 @@
textLabelMonthTotal
-
+
AlignVCenter|AlignRight
@@ -456,7 +456,7 @@
textLabelYearTotal
-
+
AlignVCenter|AlignRight
@@ -467,7 +467,7 @@
Sent
-
+
AlignVCenter|AlignRight
@@ -475,7 +475,7 @@
textLabelMonthSent
-
+
AlignVCenter|AlignRight
@@ -483,7 +483,7 @@
textLabelYearSent
-
+
AlignVCenter|AlignRight
@@ -491,7 +491,7 @@
textLabelTodaySent
-
+
AlignVCenter|AlignRight
@@ -542,7 +542,7 @@
-
+
AlignVCenter|AlignRight
@@ -561,7 +561,7 @@
-
+
AlignVCenter|AlignRight
@@ -593,7 +593,7 @@
textLabelBitRate
-
+
AlignVCenter|AlignRight
@@ -601,7 +601,7 @@
textLabelFreqChannel
-
+
AlignVCenter|AlignRight
@@ -612,7 +612,7 @@
-
+
AlignVCenter|AlignRight
@@ -620,7 +620,7 @@
textLabelNickName
-
+
AlignVCenter|AlignRight
@@ -672,7 +672,7 @@
-
+
AlignVCenter|AlignRight
@@ -683,7 +683,7 @@
-
+
AlignVCenter|AlignRight
diff --git a/src/knemod/interfacetooltip.cpp b/src/knemod/interfacetooltip.cpp
index ac94a08..aba8e99 100644
--- a/src/knemod/interfacetooltip.cpp
+++ b/src/knemod/interfacetooltip.cpp
@@ -76,7 +76,7 @@ void InterfaceToolTip::setupText( TQString& text )
if ( updays == 1 )
uptime = "1 day, ";
else if ( updays > 1 )
- uptime = TQString( "%1 days, " ).tqarg( updays );
+ uptime = TQString( "%1 days, " ).arg( updays );
upsecs -= 86400 * updays; // we only want the seconds of today
int hrs = upsecs / 3600;
diff --git a/src/knemod/interfacetooltip.h b/src/knemod/interfacetooltip.h
index 9403675..c9024af 100644
--- a/src/knemod/interfacetooltip.h
+++ b/src/knemod/interfacetooltip.h
@@ -54,7 +54,7 @@ public:
* be shown and must decide whether there is a tool tip for the point p
* in the widget that this TQToolTip object relates to. If so, maybeTip()
* must call tip() with the rectangle the tip applies to, the tip's text
- * and optionally the TQToolTipGroup details and the tqgeometry in screen
+ * and optionally the TQToolTipGroup details and the geometry in screen
* coordinates.
*/
void maybeTip( const TQPoint& );
diff --git a/src/knemod/knemodaemon.cpp b/src/knemod/knemodaemon.cpp
index 313ccb6..030494a 100644
--- a/src/knemod/knemodaemon.cpp
+++ b/src/knemod/knemodaemon.cpp
@@ -140,11 +140,11 @@ void KNemoDaemon::readConfig()
{
TQString entry;
InterfaceCommand cmd;
- entry = TQString( "RunAsRoot%1" ).tqarg( i + 1 );
+ entry = TQString( "RunAsRoot%1" ).arg( i + 1 );
cmd.runAsRoot = config->readBoolEntry( entry );
- entry = TQString( "Command%1" ).tqarg( i + 1 );
+ entry = TQString( "Command%1" ).arg( i + 1 );
cmd.command = config->readEntry( entry );
- entry = TQString( "MenuText%1" ).tqarg( i + 1 );
+ entry = TQString( "MenuText%1" ).arg( i + 1 );
cmd.menuText = config->readEntry( entry );
settings.commands.append( cmd );
}
@@ -247,11 +247,11 @@ void KNemoDaemon::reparseConfiguration()
{
TQString entry;
InterfaceCommand cmd;
- entry = TQString( "RunAsRoot%1" ).tqarg( i + 1 );
+ entry = TQString( "RunAsRoot%1" ).arg( i + 1 );
cmd.runAsRoot = config->readBoolEntry( entry );
- entry = TQString( "Command%1" ).tqarg( i + 1 );
+ entry = TQString( "Command%1" ).arg( i + 1 );
cmd.command = config->readEntry( entry );
- entry = TQString( "MenuText%1" ).tqarg( i + 1 );
+ entry = TQString( "MenuText%1" ).arg( i + 1 );
cmd.menuText = config->readEntry( entry );
settings->commands.append( cmd );
}
diff --git a/src/knemod/signalplotter.cpp b/src/knemod/signalplotter.cpp
index 6810d82..aa7c1f1 100644
--- a/src/knemod/signalplotter.cpp
+++ b/src/knemod/signalplotter.cpp
@@ -429,7 +429,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* )
TQPixmap pm( w, h );
TQPainter p;
- p.tqbegin( TQT_TQPAINTDEVICE(&pm), this );
+ p.begin( TQT_TQPAINTDEVICE(&pm), this );
pm.fill( mBackgroundColor );
/* Draw white line along the bottom and the right side of the
@@ -687,14 +687,14 @@ void SignalPlotter::paintEvent( TQPaintEvent* )
top + y * ( h / mHorizontalLinesCount ) );
if ( mShowLabels && h > ( mFontSize + 1 ) * ( mHorizontalLinesCount + 1 )
&& w > 60 ) {
- val = TQString( "%1" ).tqarg( maxValue - y * ( range / mHorizontalLinesCount ) );
+ val = TQString( "%1" ).arg( maxValue - y * ( range / mHorizontalLinesCount ) );
p.drawText( 6, top + y * ( h / mHorizontalLinesCount ) - 1, val );
}
}
if ( mShowLabels && h > ( mFontSize + 1 ) * ( mHorizontalLinesCount + 1 )
&& w > 60 ) {
- val = TQString( "%1" ).tqarg( minValue );
+ val = TQString( "%1" ).arg( minValue );
p.drawText( 6, top + h - 2, val );
}
}
diff --git a/src/knemod/signalplotter.h b/src/knemod/signalplotter.h
index 10c7083..f73f2fe 100644
--- a/src/knemod/signalplotter.h
+++ b/src/knemod/signalplotter.h
@@ -151,7 +151,7 @@ class SignalPlotter : public TQDialog
/**
* The name of the interface.
- * Needed to store the tqgeometry of the plotter in the right
+ * Needed to store the geometry of the plotter in the right
* group of the config file.
*/
TQString mName;