From d979df2f36840b03425e5dc40907f16d10fe4b5c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:23 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 238d438877620ed73915f2360d820cfc0c9131cc. --- src/kcm/configdialog.cpp | 14 ++--- src/kcm/configdlg.ui | 32 +++++----- src/knemod/backends/nettoolsbackend.cpp | 6 +- src/knemod/interface.cpp | 20 +++---- 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 | 10 ++-- src/knemod/interfacestatusdlg.ui | 100 ++++++++++++++++---------------- src/knemod/interfacetooltip.cpp | 4 +- src/knemod/interfacetooltip.h | 2 +- src/knemod/knemodaemon.cpp | 12 ++-- src/knemod/signalplotter.cpp | 10 ++-- src/knemod/signalplotter.h | 2 +- 17 files changed, 134 insertions(+), 134 deletions(-) diff --git a/src/kcm/configdialog.cpp b/src/kcm/configdialog.cpp index 1a2c1c7..70950db 100644 --- a/src/kcm/configdialog.cpp +++ b/src/kcm/configdialog.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -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 ); } } diff --git a/src/kcm/configdlg.ui b/src/kcm/configdlg.ui index 0a76e2d..1cb9c07 100644 --- a/src/kcm/configdlg.ui +++ b/src/kcm/configdlg.ui @@ -41,7 +41,7 @@ - layout4 + tqlayout4 @@ -146,7 +146,7 @@ for example 'eth0', 'wlan0' or 'ppp0'. - layout6 + tqlayout6 @@ -196,7 +196,7 @@ for example 'eth0', 'wlan0' or 'ppp0'. Expanding - + 41 61 @@ -242,7 +242,7 @@ for example 'eth0', 'wlan0' or 'ppp0'. - layout5 + tqlayout5 @@ -284,7 +284,7 @@ When reconnected the icon will be shown again. - layout3 + tqlayout3 @@ -300,7 +300,7 @@ When reconnected the icon will be shown again. Fixed - + 20 21 @@ -334,7 +334,7 @@ of bluetooth adaptors. - layout7_2 + tqlayout7_2 @@ -371,7 +371,7 @@ of bluetooth adaptors. - layout7 + tqlayout7 @@ -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 @@ -763,7 +763,7 @@ of wireless devices not in the tooltips of standard interfaces.</b> Description: - + AlignTop @@ -774,7 +774,7 @@ of wireless devices not in the tooltips of standard interfaces.</b> - + WordBreak|AlignVCenter @@ -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 39de4e9..8f54fa4 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::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() diff --git a/src/knemod/interface.cpp b/src/knemod/interface.cpp index 905702a..eefb658 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( 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 diff --git a/src/knemod/interfaceicon.cpp b/src/knemod/interfaceicon.cpp index 091782b..5e8db2a 100644 --- a/src/knemod/interfaceicon.cpp +++ b/src/knemod/interfaceicon.cpp @@ -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(); diff --git a/src/knemod/interfaceicon.h b/src/knemod/interfaceicon.h index 56335bb..6e4c098 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 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 diff --git a/src/knemod/interfacemonitor.cpp b/src/knemod/interfacemonitor.cpp index fefa45f..a3b11a3 100644 --- a/src/knemod/interfacemonitor.cpp +++ b/src/knemod/interfacemonitor.cpp @@ -31,7 +31,7 @@ InterfaceMonitor::~InterfaceMonitor() { } -void InterfaceMonitor::checkStatus( Interface* interface ) +void InterfaceMonitor::checktqStatus( Interface* interface ) { int currentState; int previousState = interface->getState(); diff --git a/src/knemod/interfacemonitor.h b/src/knemod/interfacemonitor.h index aba98e2..b10f98e 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 checkStatus( Interface* interface ); + void checktqStatus( Interface* interface ); signals: // the interface is now connected diff --git a/src/knemod/interfacestatistics.cpp b/src/knemod/interfacestatistics.cpp index 1d0c5df..c013603 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::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 diff --git a/src/knemod/interfacestatisticsdlg.ui b/src/knemod/interfacestatisticsdlg.ui index 9365e2a..acfa50d 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 d170b88..0569946 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 ) { - 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" ); } diff --git a/src/knemod/interfacestatusdlg.ui b/src/knemod/interfacestatusdlg.ui index e5eec3e..6ee9cf4 100644 --- a/src/knemod/interfacestatusdlg.ui +++ b/src/knemod/interfacestatusdlg.ui @@ -13,7 +13,7 @@ - Interface Status + Interface tqStatus true @@ -47,7 +47,7 @@ Expanding - + 81 30 @@ -69,7 +69,7 @@ textLabelIP - + AlignVCenter|AlignRight @@ -77,7 +77,7 @@ textLabelSubnet - + AlignVCenter|AlignRight @@ -85,7 +85,7 @@ variableText1 - + AlignVCenter|AlignRight @@ -93,7 +93,7 @@ variableText2 - + AlignVCenter|AlignRight @@ -101,7 +101,7 @@ variableText3 - + AlignVCenter|AlignRight @@ -154,7 +154,7 @@ - + AlignVCenter|AlignRight @@ -165,18 +165,18 @@ - + AlignVCenter|AlignRight - textLabelStatus + textLabeltqStatus - + AlignVCenter|AlignRight @@ -187,7 +187,7 @@ - + AlignVCenter|AlignRight @@ -212,7 +212,7 @@ textLabel2 - Status: + tqStatus: @@ -254,7 +254,7 @@ Received - + AlignVCenter|AlignRight @@ -265,7 +265,7 @@ Sent - + AlignVCenter|AlignRight @@ -273,7 +273,7 @@ textLabelPacketsSend - + AlignVCenter|AlignRight @@ -281,7 +281,7 @@ textLabelPacketsReceived - + AlignVCenter|AlignRight @@ -300,7 +300,7 @@ Bytes: - + AlignTop @@ -311,7 +311,7 @@ Speed: - + AlignTop @@ -319,7 +319,7 @@ textLabelBytesSend - + AlignVCenter|AlignRight @@ -327,7 +327,7 @@ textLabelBytesReceived - + AlignVCenter|AlignRight @@ -335,7 +335,7 @@ textLabelSpeedSend - + AlignVCenter|AlignRight @@ -343,7 +343,7 @@ textLabelSpeedReceived - + AlignVCenter|AlignRight @@ -375,7 +375,7 @@ This year: - + AlignTop @@ -386,7 +386,7 @@ Received - + AlignVCenter|AlignRight @@ -397,7 +397,7 @@ Total - + AlignVCenter|AlignRight @@ -408,7 +408,7 @@ This month: - + AlignTop @@ -416,7 +416,7 @@ textLabelTodayReceived - + AlignVCenter|AlignRight @@ -424,7 +424,7 @@ textLabelMonthReceived - + AlignVCenter|AlignRight @@ -432,7 +432,7 @@ textLabelYearReceived - + AlignVCenter|AlignRight @@ -440,7 +440,7 @@ textLabelTodayTotal - + AlignVCenter|AlignRight @@ -448,7 +448,7 @@ textLabelMonthTotal - + AlignVCenter|AlignRight @@ -456,7 +456,7 @@ textLabelYearTotal - + AlignVCenter|AlignRight @@ -467,7 +467,7 @@ Sent - + AlignVCenter|AlignRight @@ -475,7 +475,7 @@ textLabelMonthSent - + AlignVCenter|AlignRight @@ -483,7 +483,7 @@ textLabelYearSent - + AlignVCenter|AlignRight @@ -491,7 +491,7 @@ textLabelTodaySent - + AlignVCenter|AlignRight @@ -507,7 +507,7 @@ Expanding - + 81 16 @@ -542,7 +542,7 @@ - + AlignVCenter|AlignRight @@ -561,7 +561,7 @@ - + AlignVCenter|AlignRight @@ -593,7 +593,7 @@ textLabelBitRate - + AlignVCenter|AlignRight @@ -601,7 +601,7 @@ textLabelFreqChannel - + AlignVCenter|AlignRight @@ -612,7 +612,7 @@ - + AlignVCenter|AlignRight @@ -620,7 +620,7 @@ textLabelNickName - + AlignVCenter|AlignRight @@ -642,7 +642,7 @@ Expanding - + 81 50 @@ -672,7 +672,7 @@ - + AlignVCenter|AlignRight @@ -683,7 +683,7 @@ - + AlignVCenter|AlignRight @@ -692,7 +692,7 @@ - layout2 + tqlayout2 @@ -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 aba8e99..a909817 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::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; diff --git a/src/knemod/interfacetooltip.h b/src/knemod/interfacetooltip.h index c9024af..9403675 100644 --- a/src/knemod/interfacetooltip.h +++ b/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 geometry in screen + * and optionally the TQToolTipGroup details and the tqgeometry in screen * coordinates. */ void maybeTip( const TQPoint& ); diff --git a/src/knemod/knemodaemon.cpp b/src/knemod/knemodaemon.cpp index 030494a..313ccb6 100644 --- a/src/knemod/knemodaemon.cpp +++ b/src/knemod/knemodaemon.cpp @@ -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 ); } diff --git a/src/knemod/signalplotter.cpp b/src/knemod/signalplotter.cpp index aa7c1f1..6a362a6 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 ); - 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 ); } } diff --git a/src/knemod/signalplotter.h b/src/knemod/signalplotter.h index f73f2fe..10c7083 100644 --- a/src/knemod/signalplotter.h +++ b/src/knemod/signalplotter.h @@ -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; -- cgit v1.2.3