From 06c2dd77f692b319d32a4abfe71566885196ee2a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:41:19 -0600 Subject: [PATCH] Remove additional unneeded tq method conversions --- src/main.cpp | 2 +- src/netlistviewitem.cpp | 4 +-- src/netlistviewitem.h | 12 ++++----- src/netparams.h | 2 +- src/ui_NetParamsWizard.ui | 24 +++++++++--------- src/ui_main.ui | 2 +- src/ui_netparamsedit.cpp | 2 +- src/ui_netparamswizard.cpp | 2 +- src/wlassistant.cpp | 52 +++++++++++++++++++------------------- 9 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index ec72c06..cdc8fc6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char **argv) KApplication app; WirelessAssistant *mainWin = 0; mainWin = new WirelessAssistant(); - mainWin->setCaption( TQString("%1 %2").tqarg(description).tqarg(version) ); + mainWin->setCaption( TQString("%1 %2").arg(description).arg(version) ); app.setMainWidget( mainWin ); mainWin->show(); diff --git a/src/netlistviewitem.cpp b/src/netlistviewitem.cpp index 45a8968..178b7e3 100644 --- a/src/netlistviewitem.cpp +++ b/src/netlistviewitem.cpp @@ -26,7 +26,7 @@ #include #include -void NetListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void NetListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { /// HACK fixes: higher item (connected) is drawn using regular height upon widget change (widgetStack); if ( height()!=mHeight ) @@ -165,7 +165,7 @@ void NetListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column } default: - KListViewItem::paintCell(p, cg, column, width, tqalignment); + KListViewItem::paintCell(p, cg, column, width, alignment); } //switch } diff --git a/src/netlistviewitem.h b/src/netlistviewitem.h index 5b55f0a..b3ca41c 100644 --- a/src/netlistviewitem.h +++ b/src/netlistviewitem.h @@ -65,9 +65,9 @@ public: void setChannel(const TQString& theValue) { - if ( mChannel != theValue ) { //tqrepaint only if difference visible in quality stars + if ( mChannel != theValue ) { //repaint only if difference visible in quality stars mChannel = theValue; - tqrepaint(); + repaint(); } } @@ -111,7 +111,7 @@ public: mHeight-=10; } setHeight( mHeight ); - tqrepaint(); + repaint(); } @@ -122,9 +122,9 @@ public: void setQuality(const int& theValue) { - if ( int(mQuality/8) != int(theValue/8) ) { //tqrepaint only if difference visible in quality stars + if ( int(mQuality/8) != int(theValue/8) ) { //repaint only if difference visible in quality stars mQuality = theValue; - tqrepaint(); + repaint(); } else mQuality = theValue; } @@ -150,7 +150,7 @@ public: private: - virtual void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + virtual void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); virtual int width(const TQFontMetrics &fm, const TQListView *lv, int column) const; virtual TQString key( int column, bool ascending ) const; diff --git a/src/netparams.h b/src/netparams.h index fbc2b7b..966dd08 100644 --- a/src/netparams.h +++ b/src/netparams.h @@ -79,7 +79,7 @@ public: r = true; } if ( (hiddenEssid) && (!wasHiddenEssid) ) - if ( KMessageBox::questionYesNo(0, i18n("

The network has stopped broadcasting its ESSID since the last time you were connected.

Would you like to use '%1' as an ESSID for this network?

NOTE: If you answer No, a dialog will appear where you will be able to specify a different ESSID.

").tqarg(essid) ) != 3 ) // !=YES + if ( KMessageBox::questionYesNo(0, i18n("

The network has stopped broadcasting its ESSID since the last time you were connected.

Would you like to use '%1' as an ESSID for this network?

NOTE: If you answer No, a dialog will appear where you will be able to specify a different ESSID.

").arg(essid) ) != 3 ) // !=YES r = true; wasHiddenEssid = hiddenEssid; diff --git a/src/ui_NetParamsWizard.ui b/src/ui_NetParamsWizard.ui index 9ee709a..22967fe 100644 --- a/src/ui_NetParamsWizard.ui +++ b/src/ui_NetParamsWizard.ui @@ -46,7 +46,7 @@ <p>You will be asked a few questions necessary to configure this connection.</p> <p><i>Press Next to continue.</i></p> - + WordBreak|AlignTop @@ -99,7 +99,7 @@ ESSID: - + AlignVCenter|AlignRight @@ -312,7 +312,7 @@ Secondary DNS: - + AlignVCenter|AlignRight @@ -339,7 +339,7 @@ IP: - + AlignVCenter|AlignRight @@ -350,7 +350,7 @@ Netmask: - + AlignVCenter|AlignRight @@ -369,7 +369,7 @@ Primary DNS: - + AlignVCenter|AlignRight @@ -380,7 +380,7 @@ Gateway: - + AlignVCenter|AlignRight @@ -404,7 +404,7 @@ Domain: - + AlignVCenter|AlignRight @@ -415,7 +415,7 @@ Broadcast: - + AlignVCenter|AlignRight @@ -641,7 +641,7 @@ WEP key: - + AlignVCenter|AlignRight @@ -746,7 +746,7 @@ WPA Key: - + AlignVCenter|AlignRight @@ -868,7 +868,7 @@ <p>You have successfully finished configuring this connection.</p> <p><b>Press Finish to connect!</b></p> - + WordBreak|AlignTop diff --git a/src/ui_main.ui b/src/ui_main.ui index acdeb3e..60ec781 100644 --- a/src/ui_main.ui +++ b/src/ui_main.ui @@ -362,7 +362,7 @@ Ready - + WordBreak|AlignVCenter diff --git a/src/ui_netparamsedit.cpp b/src/ui_netparamsedit.cpp index 1b757a8..757dde9 100644 --- a/src/ui_netparamsedit.cpp +++ b/src/ui_netparamsedit.cpp @@ -81,7 +81,7 @@ void ui_NetParamsEdit::setValues( const WANetParams & np ) } } if (np.wpa) { - labelWpaSettings->setText( TQString("%1").tqarg( np.wpaSettings.join("
") ) ); + labelWpaSettings->setText( TQString("%1").arg( np.wpaSettings.join("
") ) ); if ( np.wpaKey.left(2)=="s:" ) { //ASCII key checkWpaAscii->setChecked(true); wpaKey->setText( np.wpaKey.right(np.wpaKey.length()-2) ); diff --git a/src/ui_netparamswizard.cpp b/src/ui_netparamswizard.cpp index de8c39f..42a93d2 100644 --- a/src/ui_netparamswizard.cpp +++ b/src/ui_netparamswizard.cpp @@ -55,7 +55,7 @@ void ui_NetParamsWizard::setWepEnabled( bool w ) void ui_NetParamsWizard::setWpaEnabled( bool w, TQStringList settings ) { setAppropriate( page(5), w ); - if (w) labelWpaSettings->setText( TQString("%1").tqarg( settings.join("
") ) ); + if (w) labelWpaSettings->setText( TQString("%1").arg( settings.join("
") ) ); } diff --git a/src/wlassistant.cpp b/src/wlassistant.cpp index ef59019..5677de9 100644 --- a/src/wlassistant.cpp +++ b/src/wlassistant.cpp @@ -101,7 +101,7 @@ WirelessAssistant::~WirelessAssistant() void WirelessAssistant::init() { statusLabel->setText(i18n("Initializing...")); - statusLabel->tqrepaint(); + statusLabel->repaint(); //////////////////////////////////////// ///// CHECK FOR SYSFS (KERNEL 2.6) ///// @@ -197,7 +197,7 @@ void WirelessAssistant::init() ///// DETECT & SET PATHS ///// if (!Commands.allFound) { //all ok or ONLY dhcpcd not found (i.e. dhclient present). std::cout << "Missing executables (" << Commands.notFound.join("', '").ascii() << "). Exiting." << std::endl; - KMessageBox::error(0, i18n("Executable(s) '%1' could not be found.\nWireless Assistant will now quit.").tqarg(Commands.notFound.join("', '")) ); + KMessageBox::error(0, i18n("Executable(s) '%1' could not be found.\nWireless Assistant will now quit.").arg(Commands.notFound.join("', '")) ); close(); return; } @@ -235,7 +235,7 @@ void WirelessAssistant::checkConnectionStatus() } else if (connectedItem) { //connection LOST setConnectedItem(0); timerConnectionCheck->stop(); - if ( autoReconnect || KMessageBox::questionYesNo(0, i18n("Connection to '%1' has been lost!\nWould you like to reconnect?").tqarg(NetParams.essid), i18n("Connection Lost") , KStdGuiItem::yes(), KStdGuiItem::no() ) == KMessageBox::Yes ) { + if ( autoReconnect || KMessageBox::questionYesNo(0, i18n("Connection to '%1' has been lost!\nWould you like to reconnect?").arg(NetParams.essid), i18n("Connection Lost") , KStdGuiItem::yes(), KStdGuiItem::no() ) == KMessageBox::Yes ) { netDisconnect( true ); netConnect(); } @@ -249,7 +249,7 @@ void WirelessAssistant::removeNetParams() TQString ap = nvi->ap(); TQString essid = nvi->essid(); for (TQStringList::Iterator nps = NetParamsList.begin(); nps != NetParamsList.end(); nps++) { if ( (*nps).section(",",2,2)==ap && (*nps).section(",",1,1)==essid) { - if ( KMessageBox::warningContinueCancel(0, i18n("

Settings for network '%1' are about to be deleted.

Would you like to continue?

").tqarg(essid)) == KMessageBox::Continue ) { + if ( KMessageBox::warningContinueCancel(0, i18n("

Settings for network '%1' are about to be deleted.

Would you like to continue?

").arg(essid)) == KMessageBox::Continue ) { if (nvi->hidden()) // hiddenEssid = 1 nvi->setEssid(""); NetParamsList.remove(nps); @@ -282,7 +282,7 @@ void WirelessAssistant::setDNS( const WANetParams & np ) f.close(); } else { std::cout << "dns setup error: " << f.name().ascii() << " is not writeable." << std::endl; - KMessageBox::error(0, i18n("

File '%1' could not be opened for writing.

Nameserver(s) and/or domain are not set.

").tqarg(f.name()) ); + KMessageBox::error(0, i18n("

File '%1' could not be opened for writing.

Nameserver(s) and/or domain are not set.

").arg(f.name()) ); } } @@ -314,19 +314,19 @@ void WirelessAssistant::netScan( const WANetParams & np ) } if ( !WATools::isUp(np.iface.ascii()) ) { - statusLabel->setText(i18n("Bringing interface %1 up...").tqarg(np.iface.ascii())); + statusLabel->setText(i18n("Bringing interface %1 up...").arg(np.iface.ascii())); //runCommand( Commands.cmd("ifup",np) ); WATools::setUp(true, np.iface.ascii()); if (DelayBeforeScanning>0) { statusLabel->setText(i18n("Waiting before scanning...")); - statusLabel->tqrepaint(); + statusLabel->repaint(); KApplication::eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); usleep(DelayBeforeScanning * 1000000); // delay * 1000ms } } statusLabel->setText(i18n("Scanning...")); - statusLabel->tqrepaint(); + statusLabel->repaint(); netList->clear(); @@ -570,7 +570,7 @@ void WirelessAssistant::netConnect() setNetParamsFromList( netList->selectedItem() ); //can't connect if WPA needed, and wpa_supplicant and wpa_cli not available if ( NetParams.wpa && !wpaAvailable ) { - KMessageBox::error(0, i18n("

Can not connect to network '%1'.

The network you are trying to connect to requires WPA authentication. The necessary executables wpa_supplicant and wpa_cli could not be found. Install wpa_supplicant and restart Wireless Assistant to connect.

").tqarg(NetParams.essid) ); + KMessageBox::error(0, i18n("

Can not connect to network '%1'.

The network you are trying to connect to requires WPA authentication. The necessary executables wpa_supplicant and wpa_cli could not be found. Install wpa_supplicant and restart Wireless Assistant to connect.

").arg(NetParams.essid) ); timerConnectionCheck->start(WA_CONNECTION_CHECK_INTERVAL); //resume connection checking return; } @@ -579,7 +579,7 @@ void WirelessAssistant::netConnect() if ( (NetParams.essid=="") || (!setNetParamsFromConfig( search )) ) { ui_NetParamsWizard *netwiz = new ui_NetParamsWizard; if (!NetParams.hiddenEssid) - netwiz->setCaption( i18n("%1 - First Connection Wizard").tqarg(NetParams.essid) ); + netwiz->setCaption( i18n("%1 - First Connection Wizard").arg(NetParams.essid) ); netwiz->setEssidEnabled( NetParams.hiddenEssid ); netwiz->setWepEnabled( NetParams.wep ); netwiz->setWpaEnabled( NetParams.wpa, NetParams.wpaSettings ); @@ -650,8 +650,8 @@ void WirelessAssistant::netConnect( const WANetParams & np ) std::cout << "No pre-connection command specified." << std::endl; - statusLabel->setText( i18n("Connecting to '%1'...").tqarg(np.essid) ); - statusLabel->tqrepaint(); + statusLabel->setText( i18n("Connecting to '%1'...").arg(np.essid) ); + statusLabel->repaint(); if (!WATools::isUp(np.iface.ascii()) ) WATools::setUp( true, np.iface.ascii() ); //runCommand( Commands.cmd("ifup", np) ); if ( runCommand( Commands.cmd("iwconfig_set", np) ).find("8B04") > -1 ) { // error 8B04 - Request 'Set Frequency' not supported. @@ -710,7 +710,7 @@ void WirelessAssistant::netConnect( const WANetParams & np ) if (autoQuit) this->close(); groupAPs ? setConnectedItem( np.essid ) : setConnectedItem( np.ap ); - statusLabel->setText( i18n("Successfully connected to '%1'.").tqarg(np.essid) ); + statusLabel->setText( i18n("Successfully connected to '%1'.").arg(np.essid) ); setUi(1); } else { std::cout << "CONNECTION FAILED." << std::endl; @@ -757,7 +757,7 @@ void WirelessAssistant::setConnectedItem( const TQString & netid ) void WirelessAssistant::netDisconnect( const bool & quiet ) { - if ( (quiet) || (KMessageBox::warningContinueCancel(0, i18n("

You are about to disconnect from '%1'.

Would you like to continue?

").tqarg(connectedItem->essid()) )== KMessageBox::Continue ) ) { + if ( (quiet) || (KMessageBox::warningContinueCancel(0, i18n("

You are about to disconnect from '%1'.

Would you like to continue?

").arg(connectedItem->essid()) )== KMessageBox::Continue ) ) { timerConnectionCheck->stop(); //stop while disconnecting. if ( !NetParams.preDisconnectionCommand.isEmpty() ) { @@ -769,13 +769,13 @@ void WirelessAssistant::netDisconnect( const bool & quiet ) statusLabel->setText( i18n("Disconnecting...") ); - statusLabel->tqrepaint(); + statusLabel->repaint(); setConnectedItem( 0 ); if ( NetParams.dhcp ) { if ( dhcpClientRunning() ) { runCommand( Commands.cmd( "kill_dhcp", NetParams ) ); statusLabel->setText( i18n("Waiting for DHCP client to shut down...") ); - statusLabel->tqrepaint(); + statusLabel->repaint(); TQTimer* tmr = new TQTimer(); tmr->start(1500, true); //wait 1.5sec for dhcp client to really shutdown, single shot. while ( tmr->isActive() ) { @@ -960,7 +960,7 @@ TQString WirelessAssistant::runCommand( const TQStringList & cmd, int timeout, b TQToolTip::remove (buttonClose); TQToolTip::add - ( buttonClose, i18n("Terminate current process\n(%1)").tqarg( p->arguments().join(" ") ) ); + ( buttonClose, i18n("Terminate current process\n(%1)").arg( p->arguments().join(" ") ) ); } i++; } @@ -1059,7 +1059,7 @@ void WirelessAssistant::editNetParams() ui_NetParamsEdit *netedit = new ui_NetParamsEdit(); netedit->setValues( NetParams ); - netedit->setCaption( i18n("%1 Settings").tqarg(NetParams.essid) ); + netedit->setCaption( i18n("%1 Settings").arg(NetParams.essid) ); netedit->exec(); if (netedit->result() == TQDialog::Rejected) { delete netedit; @@ -1085,7 +1085,7 @@ bool WirelessAssistant::dhcpClientRunning() TQString pidFile; pidPaths << "/etc/" << "/etc/dhcpc/" << "/var/run/"; if ( Commands.dhcpClient=="dhcpcd" ) - pidFile = TQString("dhcpcd-%1.pid").tqarg(NetParams.iface.ascii()); + pidFile = TQString("dhcpcd-%1.pid").arg(NetParams.iface.ascii()); else pidFile = TQString("dhclient.pid"); @@ -1185,14 +1185,14 @@ bool WirelessAssistant::generateWpaConfigFile( const TQString& essid, const TQSt bool WirelessAssistant::setWpaClientEnabled( bool e, const TQString& iface, TQString driver ) { if (!e) { - if ( runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").tqarg(NetParams.iface) << "terminate" ).contains("OK") ) { + if ( runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").arg(NetParams.iface) << "terminate" ).contains("OK") ) { TQFile( wpaConfigFile ).remove(); return 1; } else return 0; // wpa client was not running. } - if ( !runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").tqarg(NetParams.iface) << "status" ).contains("Failed to connect") ) { + if ( !runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").arg(NetParams.iface) << "status" ).contains("Failed to connect") ) { std::cout << "WPA client already running. Reconfiguring..." << std::endl; runCommand( TQStringList(Commands.wpa_cli) << "reconfigure" ); } else { @@ -1215,9 +1215,9 @@ bool WirelessAssistant::setWpaClientEnabled( bool e, const TQString& iface, TQSt wp->clearArguments(); wp->addArgument( Commands.wpa_supplicant ); wp->addArgument( "-W" ); //wait for control interface - wp->addArgument( TQString("-D%1").tqarg(driver) ); - wp->addArgument( TQString("-i%1").tqarg(iface) ); - wp->addArgument( TQString("-c%1").tqarg(wpaConfigFile) ); + wp->addArgument( TQString("-D%1").arg(driver) ); + wp->addArgument( TQString("-i%1").arg(iface) ); + wp->addArgument( TQString("-c%1").arg(wpaConfigFile) ); //std::cout << "Starting WPA client: " << wp->arguments().join(" ").ascii() << std::endl; if ( !wp->start() ) { std::cout << "Failed to start WPA client." << std::endl; @@ -1231,14 +1231,14 @@ bool WirelessAssistant::setWpaClientEnabled( bool e, const TQString& iface, TQSt TQString o; int i = 0; - while ( !(o =runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").tqarg(NetParams.iface) << "status" )).contains("Failed to connect") ) { + while ( !(o =runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").arg(NetParams.iface) << "status" )).contains("Failed to connect") ) { for (int c = 0; c < 15; c++) { usleep(75*1000); //75msec KApplication::eventLoop()->processEvents( TQEventLoop::AllEvents ); i++; } if (i>400) { //more than 30sec have passed - runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").tqarg(NetParams.iface) << "terminate" ); + runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").arg(NetParams.iface) << "terminate" ); return 0; } if ( o.contains("wpa_state=COMPLETED") ) {