Browse Source

Remove additional unneeded tq method conversions

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
01f9b26fda
10 changed files with 64 additions and 64 deletions
  1. +6
    -6
      src/kcm/configdialog.cpp
  2. +2
    -2
      src/kcm/configdlg.ui
  3. +2
    -2
      src/knemod/interface.cpp
  4. +1
    -1
      src/knemod/interfacestatusdialog.cpp
  5. +41
    -41
      src/knemod/interfacestatusdlg.ui
  6. +1
    -1
      src/knemod/interfacetooltip.cpp
  7. +1
    -1
      src/knemod/interfacetooltip.h
  8. +6
    -6
      src/knemod/knemodaemon.cpp
  9. +3
    -3
      src/knemod/signalplotter.cpp
  10. +1
    -1
      src/knemod/signalplotter.h

+ 6
- 6
src/kcm/configdialog.cpp View File

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


+ 2
- 2
src/kcm/configdlg.ui View File

@@ -763,7 +763,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
<property name="text">
<string>Description:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@@ -774,7 +774,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>


+ 2
- 2
src/knemod/interface.cpp View File

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


+ 1
- 1
src/knemod/interfacestatusdialog.cpp View File

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


+ 41
- 41
src/knemod/interfacestatusdlg.ui View File

@@ -69,7 +69,7 @@
<property name="name">
<cstring>textLabelIP</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -77,7 +77,7 @@
<property name="name">
<cstring>textLabelSubnet</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -85,7 +85,7 @@
<property name="name">
<cstring>variableText1</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -93,7 +93,7 @@
<property name="name">
<cstring>variableText2</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -101,7 +101,7 @@
<property name="name">
<cstring>variableText3</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -154,7 +154,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -165,7 +165,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -176,7 +176,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -187,7 +187,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -254,7 +254,7 @@
<property name="text">
<string>Received</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -265,7 +265,7 @@
<property name="text">
<string>Sent</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -273,7 +273,7 @@
<property name="name">
<cstring>textLabelPacketsSend</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -281,7 +281,7 @@
<property name="name">
<cstring>textLabelPacketsReceived</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -300,7 +300,7 @@
<property name="text">
<string>Bytes:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@@ -311,7 +311,7 @@
<property name="text">
<string>Speed:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@@ -319,7 +319,7 @@
<property name="name">
<cstring>textLabelBytesSend</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -327,7 +327,7 @@
<property name="name">
<cstring>textLabelBytesReceived</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -335,7 +335,7 @@
<property name="name">
<cstring>textLabelSpeedSend</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -343,7 +343,7 @@
<property name="name">
<cstring>textLabelSpeedReceived</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -375,7 +375,7 @@
<property name="text">
<string>This year:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@@ -386,7 +386,7 @@
<property name="text">
<string>Received</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -397,7 +397,7 @@
<property name="text">
<string>Total</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -408,7 +408,7 @@
<property name="text">
<string>This month:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@@ -416,7 +416,7 @@
<property name="name">
<cstring>textLabelTodayReceived</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -424,7 +424,7 @@
<property name="name">
<cstring>textLabelMonthReceived</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -432,7 +432,7 @@
<property name="name">
<cstring>textLabelYearReceived</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -440,7 +440,7 @@
<property name="name">
<cstring>textLabelTodayTotal</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -448,7 +448,7 @@
<property name="name">
<cstring>textLabelMonthTotal</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -456,7 +456,7 @@
<property name="name">
<cstring>textLabelYearTotal</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -467,7 +467,7 @@
<property name="text">
<string>Sent</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -475,7 +475,7 @@
<property name="name">
<cstring>textLabelMonthSent</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -483,7 +483,7 @@
<property name="name">
<cstring>textLabelYearSent</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -491,7 +491,7 @@
<property name="name">
<cstring>textLabelTodaySent</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -542,7 +542,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -561,7 +561,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -593,7 +593,7 @@
<property name="name">
<cstring>textLabelBitRate</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -601,7 +601,7 @@
<property name="name">
<cstring>textLabelFreqChannel</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -612,7 +612,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -620,7 +620,7 @@
<property name="name">
<cstring>textLabelNickName</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -672,7 +672,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -683,7 +683,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>


+ 1
- 1
src/knemod/interfacetooltip.cpp View File

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


+ 1
- 1
src/knemod/interfacetooltip.h View File

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


+ 6
- 6
src/knemod/knemodaemon.cpp View File

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


+ 3
- 3
src/knemod/signalplotter.cpp View File

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


+ 1
- 1
src/knemod/signalplotter.h View File

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


Loading…
Cancel
Save