Browse Source

Rename old tq methods that no longer need a unique name

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
15c49bc5b6
13 changed files with 62 additions and 62 deletions
  1. +8
    -8
      src/kcm/configdlg.ui
  2. +3
    -3
      src/knemod/backends/nettoolsbackend.cpp
  3. +8
    -8
      src/knemod/interface.cpp
  4. +4
    -4
      src/knemod/interfaceicon.cpp
  5. +2
    -2
      src/knemod/interfaceicon.h
  6. +1
    -1
      src/knemod/interfacemonitor.cpp
  7. +1
    -1
      src/knemod/interfacemonitor.h
  8. +18
    -18
      src/knemod/interfacestatistics.cpp
  9. +2
    -2
      src/knemod/interfacestatisticsdlg.ui
  10. +4
    -4
      src/knemod/interfacestatusdialog.cpp
  11. +8
    -8
      src/knemod/interfacestatusdlg.ui
  12. +1
    -1
      src/knemod/interfacetooltip.cpp
  13. +2
    -2
      src/knemod/signalplotter.cpp

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

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


+ 3
- 3
src/knemod/backends/nettoolsbackend.cpp View File

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


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

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



+ 4
- 4
src/knemod/interfaceicon.cpp View File

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


+ 2
- 2
src/knemod/interfaceicon.h View File

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


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

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

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


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

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


+ 18
- 18
src/knemod/interfacestatistics.cpp View File

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


+ 2
- 2
src/knemod/interfacestatisticsdlg.ui View File

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


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

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

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



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

@@ -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>
@@ -171,7 +171,7 @@
</widget>
<widget class="TQLabel" row="2" column="1">
<property name="name">
<cstring>textLabeltqStatus</cstring>
<cstring>textLabelStatus</cstring>
</property>
<property name="text">
<string></string>
@@ -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">
@@ -507,7 +507,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>81</width>
<height>16</height>
@@ -642,7 +642,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>81</width>
<height>50</height>
@@ -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>


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

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



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

@@ -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;
@@ -434,7 +434,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* )
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 );



Loading…
Cancel
Save