Bläddra i källkod

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

This reverts commit 238d438877.
tags/r14.0.0
Timothy Pearson 8 år sedan
förälder
incheckning
d979df2f36
17 ändrade filer med 134 tillägg och 134 borttagningar
  1. +7
    -7
      src/kcm/configdialog.cpp
  2. +16
    -16
      src/kcm/configdlg.ui
  3. +3
    -3
      src/knemod/backends/nettoolsbackend.cpp
  4. +10
    -10
      src/knemod/interface.cpp
  5. +4
    -4
      src/knemod/interfaceicon.cpp
  6. +2
    -2
      src/knemod/interfaceicon.h
  7. +1
    -1
      src/knemod/interfacemonitor.cpp
  8. +1
    -1
      src/knemod/interfacemonitor.h
  9. +18
    -18
      src/knemod/interfacestatistics.cpp
  10. +2
    -2
      src/knemod/interfacestatisticsdlg.ui
  11. +5
    -5
      src/knemod/interfacestatusdialog.cpp
  12. +50
    -50
      src/knemod/interfacestatusdlg.ui
  13. +2
    -2
      src/knemod/interfacetooltip.cpp
  14. +1
    -1
      src/knemod/interfacetooltip.h
  15. +6
    -6
      src/knemod/knemodaemon.cpp
  16. +5
    -5
      src/knemod/signalplotter.cpp
  17. +1
    -1
      src/knemod/signalplotter.h

+ 7
- 7
src/kcm/configdialog.cpp Visa fil

@@ -20,7 +20,7 @@
#include <tqfile.h>
#include <tqdict.h>
#include <tqlabel.h>
#include <layout.h>
#include <tqlayout.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" ).arg( i + 1 );
entry = TQString( "RunAsRoot%1" ).tqarg( i + 1 );
cmd.runAsRoot = config->readBoolEntry( entry );
entry = TQString( "Command%1" ).arg( i + 1 );
entry = TQString( "Command%1" ).tqarg( i + 1 );
cmd.command = config->readEntry( entry );
entry = TQString( "MenuText%1" ).arg( i + 1 );
entry = TQString( "MenuText%1" ).tqarg( 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" ).arg( i + 1 );
entry = TQString( "RunAsRoot%1" ).tqarg( i + 1 );
config->writeEntry( entry, settings->commands[i].runAsRoot );
entry = TQString( "Command%1" ).arg( i + 1 );
entry = TQString( "Command%1" ).tqarg( i + 1 );
config->writeEntry( entry, settings->commands[i].command );
entry = TQString( "MenuText%1" ).arg( i + 1 );
entry = TQString( "MenuText%1" ).tqarg( i + 1 );
config->writeEntry( entry, settings->commands[i].menuText );
}
}


+ 16
- 16
src/kcm/configdlg.ui Visa fil

@@ -41,7 +41,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
<property name="name">
<cstring>layout4</cstring>
<cstring>tqlayout4</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>layout6</cstring>
<cstring>tqlayout6</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="sizeHint">
<property name="tqsizeHint">
<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>layout5</cstring>
<cstring>tqlayout5</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>layout3</cstring>
<cstring>tqlayout3</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="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -334,7 +334,7 @@ of bluetooth adaptors.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout7_2</cstring>
<cstring>tqlayout7_2</cstring>
</property>
<hbox>
<property name="name">
@@ -371,7 +371,7 @@ of bluetooth adaptors.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout7</cstring>
<cstring>tqlayout7</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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<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="alignment">
<property name="tqalignment">
<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="alignment">
<property name="tqalignment">
<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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<size>
<width>31</width>
<height>30</height>


+ 3
- 3
src/knemod/backends/nettoolsbackend.cpp Visa fil

@@ -142,7 +142,7 @@ void NetToolsBackend::routeProcessExited( KProcess* process )

void NetToolsBackend::routeProcessStdout( KProcess*, char* buffer, int buflen )
{
mRouteStdout += TQString::fromLatin1( buffer, buflen );
mRouteStdout += TQString::tqfromLatin1( 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::fromLatin1( buffer, buflen );
mIfconfigStdout += TQString::tqfromLatin1( 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::fromLatin1( buffer, buflen );
mIwconfigStdout += TQString::tqfromLatin1( buffer, buflen );
}

void NetToolsBackend::parseIfconfigOutput()


+ 10
- 10
src/knemod/interface.cpp Visa fil

@@ -52,13 +52,13 @@ Interface::Interface( TQString ifname,
mPlotterSettings( plotterSettings )
{
connect( &mMonitor, TQT_SIGNAL( statusChanged( int ) ),
&mIcon, TQT_SLOT( updateStatus( int ) ) );
&mIcon, TQT_SLOT( updatetqStatus( int ) ) );
connect( &mMonitor, TQT_SIGNAL( available( int ) ),
&mIcon, TQT_SLOT( updateTrayStatus( int ) ) );
&mIcon, TQT_SLOT( updateTraytqStatus( int ) ) );
connect( &mMonitor, TQT_SIGNAL( notAvailable( int ) ),
&mIcon, TQT_SLOT( updateTrayStatus( int ) ) );
&mIcon, TQT_SLOT( updateTraytqStatus( int ) ) );
connect( &mMonitor, TQT_SIGNAL( notExisting( int ) ),
&mIcon, TQT_SLOT( updateTrayStatus( int ) ) );
&mIcon, TQT_SLOT( updateTraytqStatus( 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.updateTrayStatus( UNKNOWN_STATE );
mIcon.updateTraytqStatus( UNKNOWN_STATE );
// handle changed iconset by user
mIcon.updateStatus( mState );
mIcon.updatetqStatus( mState );
mIcon.updateToolTip();
mIcon.updateMenu();

@@ -127,12 +127,12 @@ void Interface::configChanged()

void Interface::activateMonitor()
{
mMonitor.checkStatus( this );
mMonitor.checktqStatus( this );
}

void Interface::setStartTime( int )
{
mStartTime.setDate( TQDate::currentDate() );
mStartTime.setDate( TQDate::tqcurrentDate() );
mStartTime.setTime( TQTime::currentTime() );
}

@@ -398,7 +398,7 @@ void Interface::configurePlotter()
break;
}
mVisibleBeams = nextVisibleBeams;
mPlotter->repaint();
mPlotter->tqrepaint();
}

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->geometry()))
if( !info2.geometry().intersects( widget->tqgeometry()))
continue; // not obscuring the window -> ignore
if( !info1.hasState( NET::KeepAbove ) && info2.hasState( NET::KeepAbove ))
continue; // obscured by window kept above -> ignore


+ 4
- 4
src/knemod/interfaceicon.cpp Visa fil

@@ -59,7 +59,7 @@ InterfaceIcon::~InterfaceIcon()
delete mTray;
}

void InterfaceIcon::updateStatus( int status )
void InterfaceIcon::updatetqStatus( int status )
{
if ( mTray == 0L )
return;
@@ -152,10 +152,10 @@ void InterfaceIcon::updateMenu()

void InterfaceIcon::resizeIcon()
{
updateTrayStatus(0);
updateTraytqStatus(0);
}

void InterfaceIcon::updateTrayStatus( int previousState )
void InterfaceIcon::updateTraytqStatus( int previousState )
{
bool interfaceExists = mInterface->getData().existing;
bool interfaceAvailable = mInterface->getData().available;
@@ -244,7 +244,7 @@ void InterfaceIcon::updateTrayStatus( int previousState )
connect( mTray, TQT_SIGNAL( iconResized() ),
this, TQT_SLOT( resizeIcon() ) );

updateStatus( mInterface->getState() );
updatetqStatus( mInterface->getState() );
updateToolTip();
updateMenu();
mTray->show();


+ 2
- 2
src/knemod/interfaceicon.h Visa fil

@@ -68,12 +68,12 @@ public slots:
/*
* Changes the icon image displayed in the tray
*/
void updateStatus( int status );
void updatetqStatus( int status );

/*
* Creates or deletes the tray icon
*/
void updateTrayStatus( int previousState );
void updateTraytqStatus( int previousState );

/*
* Resizes the tray icon


+ 1
- 1
src/knemod/interfacemonitor.cpp Visa fil

@@ -31,7 +31,7 @@ InterfaceMonitor::~InterfaceMonitor()
{
}

void InterfaceMonitor::checkStatus( Interface* interface )
void InterfaceMonitor::checktqStatus( Interface* interface )
{
int currentState;
int previousState = interface->getState();


+ 1
- 1
src/knemod/interfacemonitor.h Visa fil

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

signals:
// the interface is now connected


+ 18
- 18
src/knemod/interfacestatistics.cpp Visa fil

@@ -276,21 +276,21 @@ void InterfaceStatistics::clearYearStatistics()

void InterfaceStatistics::checkCurrentEntry()
{
if ( mCurrentDay->day != TQDate::currentDate().day() ||
mCurrentDay->month != TQDate::currentDate().month() ||
mCurrentDay->year != TQDate::currentDate().year() )
if ( mCurrentDay->day != TQDate::tqcurrentDate().day() ||
mCurrentDay->month != TQDate::tqcurrentDate().month() ||
mCurrentDay->year != TQDate::tqcurrentDate().year() )
{
// current day has changed
updateCurrentDay();

if ( mCurrentMonth->month != TQDate::currentDate().month() ||
mCurrentMonth->year != TQDate::currentDate().year() )
if ( mCurrentMonth->month != TQDate::tqcurrentDate().month() ||
mCurrentMonth->year != TQDate::tqcurrentDate().year() )
{
// current month has also changed
updateCurrentMonth();
}

if ( mCurrentYear->year != TQDate::currentDate().year() )
if ( mCurrentYear->year != TQDate::tqcurrentDate().year() )
{
// current year has also changed
updateCurrentYear();
@@ -312,9 +312,9 @@ void InterfaceStatistics::updateCurrentDay()
mCurrentDay = mDayStatistics.first();
while ( mCurrentDay )
{
if ( mCurrentDay->day == TQDate::currentDate().day() &&
mCurrentDay->month == TQDate::currentDate().month() &&
mCurrentDay->year == TQDate::currentDate().year() )
if ( mCurrentDay->day == TQDate::tqcurrentDate().day() &&
mCurrentDay->month == TQDate::tqcurrentDate().month() &&
mCurrentDay->year == TQDate::tqcurrentDate().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::currentDate().day();
mCurrentDay->month = TQDate::currentDate().month();
mCurrentDay->year = TQDate::currentDate().year();
mCurrentDay->day = TQDate::tqcurrentDate().day();
mCurrentDay->month = TQDate::tqcurrentDate().month();
mCurrentDay->year = TQDate::tqcurrentDate().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::currentDate().month() &&
mCurrentMonth->year == TQDate::currentDate().year() )
if ( mCurrentMonth->month == TQDate::tqcurrentDate().month() &&
mCurrentMonth->year == TQDate::tqcurrentDate().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::currentDate().month();
mCurrentMonth->year = TQDate::currentDate().year();
mCurrentMonth->month = TQDate::tqcurrentDate().month();
mCurrentMonth->year = TQDate::tqcurrentDate().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::currentDate().year() )
if ( mCurrentYear->year == TQDate::tqcurrentDate().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::currentDate().year();
mCurrentYear->year = TQDate::tqcurrentDate().year();
mCurrentYear->rxBytes = 0;
mCurrentYear->txBytes = 0;
mYearStatistics.append( mCurrentYear ); // TODO: insert at correct position


+ 2
- 2
src/knemod/interfacestatisticsdlg.ui Visa fil

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


+ 5
- 5
src/knemod/interfacestatusdialog.cpp Visa fil

@@ -141,8 +141,8 @@ void InterfaceStatusDialog::updateDialog()
textLabelAlias->setText( settings.alias );
if ( data.available )
{
textLabelStatus->setText( i18n( "Connection established." ) );
int upsecs = mInterface->getStartTime().secsTo( TQDateTime::currentDateTime() );
textLabeltqStatus->setText( i18n( "Connection established." ) );
int upsecs = mInterface->getStartTime().secsTo( TQDateTime::tqcurrentDateTime() );
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, " ).arg( updays );
uptime = TQString( "%1 days, " ).tqarg( 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 )
{
textLabelStatus->setText( i18n( "Not connected." ) );
textLabeltqStatus->setText( i18n( "Not connected." ) );
textLabelUptime->setText( "00:00:00" );
}
else
{
textLabelStatus->setText( i18n( "Not existing." ) );
textLabeltqStatus->setText( i18n( "Not existing." ) );
textLabelUptime->setText( "00:00:00" );
}



+ 50
- 50
src/knemod/interfacestatusdlg.ui Visa fil

@@ -13,7 +13,7 @@
</rect>
</property>
<property name="caption">
<string>Interface Status</string>
<string>Interface tqStatus</string>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>
@@ -47,7 +47,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>81</width>
<height>30</height>
@@ -69,7 +69,7 @@
<property name="name">
<cstring>textLabelIP</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -77,7 +77,7 @@
<property name="name">
<cstring>textLabelSubnet</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -85,7 +85,7 @@
<property name="name">
<cstring>variableText1</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -93,7 +93,7 @@
<property name="name">
<cstring>variableText2</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -101,7 +101,7 @@
<property name="name">
<cstring>variableText3</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -154,7 +154,7 @@
<property name="text">
<string></string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -165,18 +165,18 @@
<property name="text">
<string></string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
<widget class="TQLabel" row="2" column="1">
<property name="name">
<cstring>textLabelStatus</cstring>
<cstring>textLabeltqStatus</cstring>
</property>
<property name="text">
<string></string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -187,7 +187,7 @@
<property name="text">
<string></string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -212,7 +212,7 @@
<cstring>textLabel2</cstring>
</property>
<property name="text">
<string>Status:</string>
<string>tqStatus:</string>
</property>
</widget>
<widget class="TQLabel" row="3" column="0">
@@ -254,7 +254,7 @@
<property name="text">
<string>Received</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -265,7 +265,7 @@
<property name="text">
<string>Sent</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -273,7 +273,7 @@
<property name="name">
<cstring>textLabelPacketsSend</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -281,7 +281,7 @@
<property name="name">
<cstring>textLabelPacketsReceived</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -300,7 +300,7 @@
<property name="text">
<string>Bytes:</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignTop</set>
</property>
</widget>
@@ -311,7 +311,7 @@
<property name="text">
<string>Speed:</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignTop</set>
</property>
</widget>
@@ -319,7 +319,7 @@
<property name="name">
<cstring>textLabelBytesSend</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -327,7 +327,7 @@
<property name="name">
<cstring>textLabelBytesReceived</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -335,7 +335,7 @@
<property name="name">
<cstring>textLabelSpeedSend</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -343,7 +343,7 @@
<property name="name">
<cstring>textLabelSpeedReceived</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -375,7 +375,7 @@
<property name="text">
<string>This year:</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignTop</set>
</property>
</widget>
@@ -386,7 +386,7 @@
<property name="text">
<string>Received</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -397,7 +397,7 @@
<property name="text">
<string>Total</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -408,7 +408,7 @@
<property name="text">
<string>This month:</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignTop</set>
</property>
</widget>
@@ -416,7 +416,7 @@
<property name="name">
<cstring>textLabelTodayReceived</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -424,7 +424,7 @@
<property name="name">
<cstring>textLabelMonthReceived</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -432,7 +432,7 @@
<property name="name">
<cstring>textLabelYearReceived</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -440,7 +440,7 @@
<property name="name">
<cstring>textLabelTodayTotal</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -448,7 +448,7 @@
<property name="name">
<cstring>textLabelMonthTotal</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -456,7 +456,7 @@
<property name="name">
<cstring>textLabelYearTotal</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -467,7 +467,7 @@
<property name="text">
<string>Sent</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -475,7 +475,7 @@
<property name="name">
<cstring>textLabelMonthSent</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -483,7 +483,7 @@
<property name="name">
<cstring>textLabelYearSent</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -491,7 +491,7 @@
<property name="name">
<cstring>textLabelTodaySent</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -507,7 +507,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>81</width>
<height>16</height>
@@ -542,7 +542,7 @@
<property name="text">
<string></string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -561,7 +561,7 @@
<property name="text">
<string></string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -593,7 +593,7 @@
<property name="name">
<cstring>textLabelBitRate</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -601,7 +601,7 @@
<property name="name">
<cstring>textLabelFreqChannel</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -612,7 +612,7 @@
<property name="text">
<string></string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -620,7 +620,7 @@
<property name="name">
<cstring>textLabelNickName</cstring>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -642,7 +642,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>81</width>
<height>50</height>
@@ -672,7 +672,7 @@
<property name="text">
<string></string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -683,7 +683,7 @@
<property name="text">
<string></string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -692,7 +692,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout2</cstring>
<cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -708,7 +708,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>0</width>
<height>21</height>
@@ -736,7 +736,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>0</width>
<height>21</height>


+ 2
- 2
src/knemod/interfacetooltip.cpp Visa fil

@@ -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::currentDateTime() );
int upsecs = mInterface->getStartTime().secsTo( TQDateTime::tqcurrentDateTime() );
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, " ).arg( updays );
uptime = TQString( "%1 days, " ).tqarg( updays );

upsecs -= 86400 * updays; // we only want the seconds of today
int hrs = upsecs / 3600;


+ 1
- 1
src/knemod/interfacetooltip.h Visa fil

@@ -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 geometry in screen
* and optionally the TQToolTipGroup details and the tqgeometry in screen
* coordinates.
*/
void maybeTip( const TQPoint& );


+ 6
- 6
src/knemod/knemodaemon.cpp Visa fil

@@ -140,11 +140,11 @@ void KNemoDaemon::readConfig()
{
TQString entry;
InterfaceCommand cmd;
entry = TQString( "RunAsRoot%1" ).arg( i + 1 );
entry = TQString( "RunAsRoot%1" ).tqarg( i + 1 );
cmd.runAsRoot = config->readBoolEntry( entry );
entry = TQString( "Command%1" ).arg( i + 1 );
entry = TQString( "Command%1" ).tqarg( i + 1 );
cmd.command = config->readEntry( entry );
entry = TQString( "MenuText%1" ).arg( i + 1 );
entry = TQString( "MenuText%1" ).tqarg( 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" ).arg( i + 1 );
entry = TQString( "RunAsRoot%1" ).tqarg( i + 1 );
cmd.runAsRoot = config->readBoolEntry( entry );
entry = TQString( "Command%1" ).arg( i + 1 );
entry = TQString( "Command%1" ).tqarg( i + 1 );
cmd.command = config->readEntry( entry );
entry = TQString( "MenuText%1" ).arg( i + 1 );
entry = TQString( "MenuText%1" ).tqarg( i + 1 );
cmd.menuText = config->readEntry( entry );
settings->commands.append( cmd );
}


+ 5
- 5
src/knemod/signalplotter.cpp Visa fil

@@ -56,7 +56,7 @@ SignalPlotter::SignalPlotter( TQWidget *parent, const char *name )

// Anything smaller than this does not make sense.
setMinimumSize( 16, 16 );
setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
TQSizePolicy::Expanding, false ) );

mShowVerticalLines = true;
@@ -429,12 +429,12 @@ void SignalPlotter::paintEvent( TQPaintEvent* )

TQPixmap pm( w, h );
TQPainter p;
p.begin( TQT_TQPAINTDEVICE(&pm), this );
p.tqbegin( 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( colorGroup().light() ) );
p.setPen( TQColor( tqcolorGroup().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" ).arg( maxValue - y * ( range / mHorizontalLinesCount ) );
val = TQString( "%1" ).tqarg( 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" ).arg( minValue );
val = TQString( "%1" ).tqarg( minValue );
p.drawText( 6, top + h - 2, val );
}
}


+ 1
- 1
src/knemod/signalplotter.h Visa fil

@@ -151,7 +151,7 @@ class SignalPlotter : public TQDialog

/**
* The name of the interface.
* Needed to store the geometry of the plotter in the right
* Needed to store the tqgeometry of the plotter in the right
* group of the config file.
*/
TQString mName;


Laddar…
Avbryt
Spara