Browse Source

Rename a number of old tq methods that are no longer tq specific

pull/1/head
Timothy Pearson 10 years ago
parent
commit
238d438877
  1. 14
      src/kcm/configdialog.cpp
  2. 32
      src/kcm/configdlg.ui
  3. 6
      src/knemod/backends/nettoolsbackend.cpp
  4. 20
      src/knemod/interface.cpp
  5. 8
      src/knemod/interfaceicon.cpp
  6. 4
      src/knemod/interfaceicon.h
  7. 2
      src/knemod/interfacemonitor.cpp
  8. 2
      src/knemod/interfacemonitor.h
  9. 36
      src/knemod/interfacestatistics.cpp
  10. 4
      src/knemod/interfacestatisticsdlg.ui
  11. 10
      src/knemod/interfacestatusdialog.cpp
  12. 100
      src/knemod/interfacestatusdlg.ui
  13. 4
      src/knemod/interfacetooltip.cpp
  14. 2
      src/knemod/interfacetooltip.h
  15. 12
      src/knemod/knemodaemon.cpp
  16. 10
      src/knemod/signalplotter.cpp
  17. 2
      src/knemod/signalplotter.h

14
src/kcm/configdialog.cpp

@ -20,7 +20,7 @@
#include <tqfile.h>
#include <tqdict.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqcstring.h>
#include <tqlistbox.h>
#include <tqcheckbox.h>
@ -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 );
}
}

32
src/kcm/configdlg.ui

@ -41,7 +41,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@ -146,7 +146,7 @@ for example 'eth0', 'wlan0' or 'ppp0'.</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -196,7 +196,7 @@ for example 'eth0', 'wlan0' or 'ppp0'.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>41</width>
<height>61</height>
@ -242,7 +242,7 @@ for example 'eth0', 'wlan0' or 'ppp0'.</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -284,7 +284,7 @@ When reconnected the icon will be shown again.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@ -300,7 +300,7 @@ When reconnected the icon will be shown again.</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@ -334,7 +334,7 @@ of bluetooth adaptors.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7_2</cstring>
<cstring>layout7_2</cstring>
</property>
<hbox>
<property name="name">
@ -371,7 +371,7 @@ of bluetooth adaptors.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -479,7 +479,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>70</width>
<height>129</height>
@ -507,7 +507,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>70</width>
<height>130</height>
@ -636,7 +636,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>60</width>
<height>21</height>
@ -709,7 +709,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>131</width>
<height>21</height>
@ -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>
@ -793,7 +793,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>100</width>
<height>21</height>
@ -812,7 +812,7 @@ of wireless devices not in the tooltips of standard interfaces.&lt;/b&gt;</strin
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>31</width>
<height>30</height>

6
src/knemod/backends/nettoolsbackend.cpp

@ -142,7 +142,7 @@ void NetToolsBackend::routeProcessExited( KProcess* process )
void NetToolsBackend::routeProcessStdout( KProcess*, char* buffer, int buflen )
{
mRouteStdout += TQString::tqfromLatin1( buffer, buflen );
mRouteStdout += TQString::fromLatin1( buffer, buflen );
}
void NetToolsBackend::ifconfigProcessExited( KProcess* process )
@ -157,7 +157,7 @@ void NetToolsBackend::ifconfigProcessExited( KProcess* process )
void NetToolsBackend::ifconfigProcessStdout( KProcess*, char* buffer, int buflen )
{
mIfconfigStdout += TQString::tqfromLatin1( buffer, buflen );
mIfconfigStdout += TQString::fromLatin1( buffer, buflen );
}
void NetToolsBackend::iwconfigProcessExited( KProcess* process )
@ -172,7 +172,7 @@ void NetToolsBackend::iwconfigProcessExited( KProcess* process )
void NetToolsBackend::iwconfigProcessStdout( KProcess*, char* buffer, int buflen )
{
mIwconfigStdout += TQString::tqfromLatin1( buffer, buflen );
mIwconfigStdout += TQString::fromLatin1( buffer, buflen );
}
void NetToolsBackend::parseIfconfigOutput()

20
src/knemod/interface.cpp

@ -52,13 +52,13 @@ Interface::Interface( TQString ifname,
mPlotterSettings( plotterSettings )
{
connect( &mMonitor, TQT_SIGNAL( statusChanged( int ) ),
&mIcon, TQT_SLOT( updatetqStatus( int ) ) );
&mIcon, TQT_SLOT( updateStatus( int ) ) );
connect( &mMonitor, TQT_SIGNAL( available( int ) ),
&mIcon, TQT_SLOT( updateTraytqStatus( int ) ) );
&mIcon, TQT_SLOT( updateTrayStatus( int ) ) );
connect( &mMonitor, TQT_SIGNAL( notAvailable( int ) ),
&mIcon, TQT_SLOT( updateTraytqStatus( int ) ) );
&mIcon, TQT_SLOT( updateTrayStatus( int ) ) );
connect( &mMonitor, TQT_SIGNAL( notExisting( int ) ),
&mIcon, TQT_SLOT( updateTraytqStatus( int ) ) );
&mIcon, TQT_SLOT( updateTrayStatus( int ) ) );
connect( &mMonitor, TQT_SIGNAL( available( int ) ),
this, TQT_SLOT( setStartTime( int ) ) );
connect( &mMonitor, TQT_SIGNAL( statusChanged( int ) ),
@ -92,9 +92,9 @@ Interface::~Interface()
void Interface::configChanged()
{
// UNKNOWN_STATE to avoid notification
mIcon.updateTraytqStatus( UNKNOWN_STATE );
mIcon.updateTrayStatus( UNKNOWN_STATE );
// handle changed iconset by user
mIcon.updatetqStatus( mState );
mIcon.updateStatus( mState );
mIcon.updateToolTip();
mIcon.updateMenu();
@ -127,12 +127,12 @@ void Interface::configChanged()
void Interface::activateMonitor()
{
mMonitor.checktqStatus( this );
mMonitor.checkStatus( this );
}
void Interface::setStartTime( int )
{
mStartTime.setDate( TQDate::tqcurrentDate() );
mStartTime.setDate( TQDate::currentDate() );
mStartTime.setTime( TQTime::currentTime() );
}
@ -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

8
src/knemod/interfaceicon.cpp

@ -59,7 +59,7 @@ InterfaceIcon::~InterfaceIcon()
delete mTray;
}
void InterfaceIcon::updatetqStatus( int status )
void InterfaceIcon::updateStatus( int status )
{
if ( mTray == 0L )
return;
@ -152,10 +152,10 @@ void InterfaceIcon::updateMenu()
void InterfaceIcon::resizeIcon()
{
updateTraytqStatus(0);
updateTrayStatus(0);
}
void InterfaceIcon::updateTraytqStatus( int previousState )
void InterfaceIcon::updateTrayStatus( int previousState )
{
bool interfaceExists = mInterface->getData().existing;
bool interfaceAvailable = mInterface->getData().available;
@ -244,7 +244,7 @@ void InterfaceIcon::updateTraytqStatus( int previousState )
connect( mTray, TQT_SIGNAL( iconResized() ),
this, TQT_SLOT( resizeIcon() ) );
updatetqStatus( mInterface->getState() );
updateStatus( mInterface->getState() );
updateToolTip();
updateMenu();
mTray->show();

4
src/knemod/interfaceicon.h

@ -68,12 +68,12 @@ public slots:
/*
* Changes the icon image displayed in the tray
*/
void updatetqStatus( int status );
void updateStatus( int status );
/*
* Creates or deletes the tray icon
*/
void updateTraytqStatus( int previousState );
void updateTrayStatus( int previousState );
/*
* Resizes the tray icon

2
src/knemod/interfacemonitor.cpp

@ -31,7 +31,7 @@ InterfaceMonitor::~InterfaceMonitor()
{
}
void InterfaceMonitor::checktqStatus( Interface* interface )
void InterfaceMonitor::checkStatus( Interface* interface )
{
int currentState;
int previousState = interface->getState();

2
src/knemod/interfacemonitor.h

@ -53,7 +53,7 @@ public:
/**
* Tell the monitor to check the status of the interface
*/
void checktqStatus( Interface* interface );
void checkStatus( Interface* interface );
signals:
// the interface is now connected

36
src/knemod/interfacestatistics.cpp

@ -276,21 +276,21 @@ void InterfaceStatistics::clearYearStatistics()
void InterfaceStatistics::checkCurrentEntry()
{
if ( mCurrentDay->day != TQDate::tqcurrentDate().day() ||
mCurrentDay->month != TQDate::tqcurrentDate().month() ||
mCurrentDay->year != TQDate::tqcurrentDate().year() )
if ( mCurrentDay->day != TQDate::currentDate().day() ||
mCurrentDay->month != TQDate::currentDate().month() ||
mCurrentDay->year != TQDate::currentDate().year() )
{
// current day has changed
updateCurrentDay();
if ( mCurrentMonth->month != TQDate::tqcurrentDate().month() ||
mCurrentMonth->year != TQDate::tqcurrentDate().year() )
if ( mCurrentMonth->month != TQDate::currentDate().month() ||
mCurrentMonth->year != TQDate::currentDate().year() )
{
// current month has also changed
updateCurrentMonth();
}
if ( mCurrentYear->year != TQDate::tqcurrentDate().year() )
if ( mCurrentYear->year != TQDate::currentDate().year() )
{
// current year has also changed
updateCurrentYear();
@ -312,9 +312,9 @@ void InterfaceStatistics::updateCurrentDay()
mCurrentDay = mDayStatistics.first();
while ( mCurrentDay )
{
if ( mCurrentDay->day == TQDate::tqcurrentDate().day() &&
mCurrentDay->month == TQDate::tqcurrentDate().month() &&
mCurrentDay->year == TQDate::tqcurrentDate().year() )
if ( mCurrentDay->day == TQDate::currentDate().day() &&
mCurrentDay->month == TQDate::currentDate().month() &&
mCurrentDay->year == TQDate::currentDate().year() )
{
// found current day in list
return;
@ -324,9 +324,9 @@ void InterfaceStatistics::updateCurrentDay()
// the current day is not in the list
mCurrentDay = new StatisticEntry();
mCurrentDay->day = TQDate::tqcurrentDate().day();
mCurrentDay->month = TQDate::tqcurrentDate().month();
mCurrentDay->year = TQDate::tqcurrentDate().year();
mCurrentDay->day = TQDate::currentDate().day();
mCurrentDay->month = TQDate::currentDate().month();
mCurrentDay->year = TQDate::currentDate().year();
mCurrentDay->rxBytes = 0;
mCurrentDay->txBytes = 0;
mDayStatistics.append( mCurrentDay ); // TODO: insert at correct position
@ -338,8 +338,8 @@ void InterfaceStatistics::updateCurrentMonth()
mCurrentMonth = mMonthStatistics.first();
while ( mCurrentMonth )
{
if ( mCurrentMonth->month == TQDate::tqcurrentDate().month() &&
mCurrentMonth->year == TQDate::tqcurrentDate().year() )
if ( mCurrentMonth->month == TQDate::currentDate().month() &&
mCurrentMonth->year == TQDate::currentDate().year() )
{
// found current month in list
return;
@ -350,8 +350,8 @@ void InterfaceStatistics::updateCurrentMonth()
// the current month is not in the list
mCurrentMonth = new StatisticEntry();
mCurrentMonth->day = 0;
mCurrentMonth->month = TQDate::tqcurrentDate().month();
mCurrentMonth->year = TQDate::tqcurrentDate().year();
mCurrentMonth->month = TQDate::currentDate().month();
mCurrentMonth->year = TQDate::currentDate().year();
mCurrentMonth->rxBytes = 0;
mCurrentMonth->txBytes = 0;
mMonthStatistics.append( mCurrentMonth ); // TODO: insert at correct position
@ -363,7 +363,7 @@ void InterfaceStatistics::updateCurrentYear()
mCurrentYear = mYearStatistics.first();
while ( mCurrentYear )
{
if ( mCurrentYear->year == TQDate::tqcurrentDate().year() )
if ( mCurrentYear->year == TQDate::currentDate().year() )
{
// found current year in list
return;
@ -375,7 +375,7 @@ void InterfaceStatistics::updateCurrentYear()
mCurrentYear = new StatisticEntry();
mCurrentYear->day = 0;
mCurrentYear->month = 0;
mCurrentYear->year = TQDate::tqcurrentDate().year();
mCurrentYear->year = TQDate::currentDate().year();
mCurrentYear->rxBytes = 0;
mCurrentYear->txBytes = 0;
mYearStatistics.append( mCurrentYear ); // TODO: insert at correct position

4
src/knemod/interfacestatisticsdlg.ui

@ -192,7 +192,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>211</width>
<height>31</height>
@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>201</width>
<height>31</height>

10
src/knemod/interfacestatusdialog.cpp

@ -141,8 +141,8 @@ void InterfaceStatusDialog::updateDialog()
textLabelAlias->setText( settings.alias );
if ( data.available )
{
textLabeltqStatus->setText( i18n( "Connection established." ) );
int upsecs = mInterface->getStartTime().secsTo( TQDateTime::tqcurrentDateTime() );
textLabelStatus->setText( i18n( "Connection established." ) );
int upsecs = mInterface->getStartTime().secsTo( TQDateTime::currentDateTime() );
int updays = upsecs / 86400; // don't use TQDateTime::daysTo() because
// we only want complete days
@ -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;
@ -163,12 +163,12 @@ void InterfaceStatusDialog::updateDialog()
}
else if ( data.existing )
{
textLabeltqStatus->setText( i18n( "Not connected." ) );
textLabelStatus->setText( i18n( "Not connected." ) );
textLabelUptime->setText( "00:00:00" );
}
else
{
textLabeltqStatus->setText( i18n( "Not existing." ) );
textLabelStatus->setText( i18n( "Not existing." ) );
textLabelUptime->setText( "00:00:00" );
}

100
src/knemod/interfacestatusdlg.ui

@ -13,7 +13,7 @@
</rect>
</property>
<property name="caption">
<string>Interface tqStatus</string>
<string>Interface Status</string>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>
@ -47,7 +47,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>81</width>
<height>30</height>
@ -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,18 +165,18 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
<widget class="TQLabel" row="2" column="1">
<property name="name">
<cstring>textLabeltqStatus</cstring>
<cstring>textLabelStatus</cstring>
</property>
<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>
@ -212,7 +212,7 @@
<cstring>textLabel2</cstring>
</property>
<property name="text">
<string>tqStatus:</string>
<string>Status:</string>
</property>
</widget>
<widget class="TQLabel" row="3" column="0">
@ -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>
@ -507,7 +507,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>81</width>
<height>16</height>
@ -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>
@ -642,7 +642,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>81</width>
<height>50</height>
@ -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>
@ -692,7 +692,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -708,7 +708,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>0</width>
<height>21</height>
@ -736,7 +736,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>0</width>
<height>21</height>

4
src/knemod/interfacetooltip.cpp

@ -68,7 +68,7 @@ void InterfaceToolTip::setupText( TQString& text )
text += "<tr><td>" + mToolTips[2].first + "</td><td>" + i18n( "Connection established." ) + "</td></tr>";
if ( toolTipContent & UPTIME )
{
int upsecs = mInterface->getStartTime().secsTo( TQDateTime::tqcurrentDateTime() );
int upsecs = mInterface->getStartTime().secsTo( TQDateTime::currentDateTime() );
int updays = upsecs / 86400; // don't use TQDateTime::daysTo() because
// we only want complete days
@ -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;

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

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

10
src/knemod/signalplotter.cpp

@ -56,7 +56,7 @@ SignalPlotter::SignalPlotter( TQWidget *parent, const char *name )
// Anything smaller than this does not make sense.
setMinimumSize( 16, 16 );
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
TQSizePolicy::Expanding, false ) );
mShowVerticalLines = true;
@ -429,12 +429,12 @@ 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
* widget to create a 3D like look. */
p.setPen( TQColor( tqcolorGroup().light() ) );
p.setPen( TQColor( colorGroup().light() ) );
p.drawLine( 0, h - 1, w - 1, h - 1 );
p.drawLine( w - 1, 0, w - 1, h - 1 );
@ -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 );
}
}

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

Loading…
Cancel
Save