From e8a55a90584eebc37315d13bd31dbfb74dcaec0b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:10:44 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name (cherry picked from commit 15c49bc5b6d612d4021619c4f71c8bca1d692e28) --- src/kcm/configdlg.ui | 16 +++++------ src/knemod/backends/nettoolsbackend.cpp | 6 ++--- src/knemod/interface.cpp | 16 +++++------ src/knemod/interfaceicon.cpp | 8 +++--- src/knemod/interfaceicon.h | 4 +-- src/knemod/interfacemonitor.cpp | 2 +- src/knemod/interfacemonitor.h | 2 +- src/knemod/interfacestatistics.cpp | 36 ++++++++++++------------- src/knemod/interfacestatisticsdlg.ui | 4 +-- src/knemod/interfacestatusdialog.cpp | 8 +++--- src/knemod/interfacestatusdlg.ui | 16 +++++------ src/knemod/interfacetooltip.cpp | 2 +- src/knemod/signalplotter.cpp | 4 +-- 13 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/kcm/configdlg.ui b/src/kcm/configdlg.ui index 1cb9c07..31a8129 100644 --- a/src/kcm/configdlg.ui +++ b/src/kcm/configdlg.ui @@ -196,7 +196,7 @@ for example 'eth0', 'wlan0' or 'ppp0'. Expanding - + 41 61 @@ -300,7 +300,7 @@ When reconnected the icon will be shown again. Fixed - + 20 21 @@ -479,7 +479,7 @@ of wireless devices not in the tooltips of standard interfaces.</b> Expanding - + 70 129 @@ -507,7 +507,7 @@ of wireless devices not in the tooltips of standard interfaces.</b> Expanding - + 70 130 @@ -636,7 +636,7 @@ of wireless devices not in the tooltips of standard interfaces.</b> Expanding - + 60 21 @@ -709,7 +709,7 @@ of wireless devices not in the tooltips of standard interfaces.</b> Expanding - + 131 21 @@ -793,7 +793,7 @@ of wireless devices not in the tooltips of standard interfaces.</b> Expanding - + 100 21 @@ -812,7 +812,7 @@ of wireless devices not in the tooltips of standard interfaces.</b> Expanding - + 31 30 diff --git a/src/knemod/backends/nettoolsbackend.cpp b/src/knemod/backends/nettoolsbackend.cpp index 8f54fa4..39de4e9 100644 --- a/src/knemod/backends/nettoolsbackend.cpp +++ b/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() diff --git a/src/knemod/interface.cpp b/src/knemod/interface.cpp index 2242e40..3745312 100644 --- a/src/knemod/interface.cpp +++ b/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() ); } diff --git a/src/knemod/interfaceicon.cpp b/src/knemod/interfaceicon.cpp index b82f406..98740c2 100644 --- a/src/knemod/interfaceicon.cpp +++ b/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(); diff --git a/src/knemod/interfaceicon.h b/src/knemod/interfaceicon.h index 6e4c098..56335bb 100644 --- a/src/knemod/interfaceicon.h +++ b/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 diff --git a/src/knemod/interfacemonitor.cpp b/src/knemod/interfacemonitor.cpp index a3b11a3..fefa45f 100644 --- a/src/knemod/interfacemonitor.cpp +++ b/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(); diff --git a/src/knemod/interfacemonitor.h b/src/knemod/interfacemonitor.h index b10f98e..aba98e2 100644 --- a/src/knemod/interfacemonitor.h +++ b/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 diff --git a/src/knemod/interfacestatistics.cpp b/src/knemod/interfacestatistics.cpp index c013603..1d0c5df 100644 --- a/src/knemod/interfacestatistics.cpp +++ b/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 diff --git a/src/knemod/interfacestatisticsdlg.ui b/src/knemod/interfacestatisticsdlg.ui index acfa50d..9365e2a 100644 --- a/src/knemod/interfacestatisticsdlg.ui +++ b/src/knemod/interfacestatisticsdlg.ui @@ -192,7 +192,7 @@ Expanding - + 211 31 @@ -209,7 +209,7 @@ Expanding - + 201 31 diff --git a/src/knemod/interfacestatusdialog.cpp b/src/knemod/interfacestatusdialog.cpp index 0569946..93f3a15 100644 --- a/src/knemod/interfacestatusdialog.cpp +++ b/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 @@ -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" ); } diff --git a/src/knemod/interfacestatusdlg.ui b/src/knemod/interfacestatusdlg.ui index 6ee9cf4..b871180 100644 --- a/src/knemod/interfacestatusdlg.ui +++ b/src/knemod/interfacestatusdlg.ui @@ -13,7 +13,7 @@ - Interface tqStatus + Interface Status true @@ -47,7 +47,7 @@ Expanding - + 81 30 @@ -171,7 +171,7 @@ - textLabeltqStatus + textLabelStatus @@ -212,7 +212,7 @@ textLabel2 - tqStatus: + Status: @@ -507,7 +507,7 @@ Expanding - + 81 16 @@ -642,7 +642,7 @@ Expanding - + 81 50 @@ -708,7 +708,7 @@ Expanding - + 0 21 @@ -736,7 +736,7 @@ Expanding - + 0 21 diff --git a/src/knemod/interfacetooltip.cpp b/src/knemod/interfacetooltip.cpp index a909817..ac94a08 100644 --- a/src/knemod/interfacetooltip.cpp +++ b/src/knemod/interfacetooltip.cpp @@ -68,7 +68,7 @@ void InterfaceToolTip::setupText( TQString& text ) text += "" + mToolTips[2].first + "" + i18n( "Connection established." ) + ""; 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 diff --git a/src/knemod/signalplotter.cpp b/src/knemod/signalplotter.cpp index 6a362a6..6810d82 100644 --- a/src/knemod/signalplotter.cpp +++ b/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; @@ -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 );