Remove additional unneeded tq method conversions

pull/1/head
Timothy Pearson 12 years ago
parent 896459f74f
commit 06c2dd77f6

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

@ -26,7 +26,7 @@
#include <kiconeffect.h>
#include <tdeversion.h>
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
}

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

@ -79,7 +79,7 @@ public:
r = true;
}
if ( (hiddenEssid) && (!wasHiddenEssid) )
if ( KMessageBox::questionYesNo(0, i18n("<qt><p>The network has stopped broadcasting its ESSID since the last time you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for this network?</p><p><i>NOTE: If you answer No, a dialog will appear where you will be able to specify a different ESSID.</i></p></qt>").tqarg(essid) ) != 3 ) // !=YES
if ( KMessageBox::questionYesNo(0, i18n("<qt><p>The network has stopped broadcasting its ESSID since the last time you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for this network?</p><p><i>NOTE: If you answer No, a dialog will appear where you will be able to specify a different ESSID.</i></p></qt>").arg(essid) ) != 3 ) // !=YES
r = true;
wasHiddenEssid = hiddenEssid;

@ -46,7 +46,7 @@
&lt;p&gt;You will be asked a few questions necessary to configure this connection.&lt;/p&gt;
&lt;p&gt;&lt;i&gt;Press Next to continue.&lt;/i&gt;&lt;/p&gt;</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -99,7 +99,7 @@
<property name="text">
<string>ESSID:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -312,7 +312,7 @@
<property name="text">
<string>Secondary DNS:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -339,7 +339,7 @@
<property name="text">
<string>IP:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -350,7 +350,7 @@
<property name="text">
<string>Netmask:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -369,7 +369,7 @@
<property name="text">
<string>Primary DNS:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -380,7 +380,7 @@
<property name="text">
<string>Gateway:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -404,7 +404,7 @@
<property name="text">
<string>Domain:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -415,7 +415,7 @@
<property name="text">
<string>Broadcast:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -641,7 +641,7 @@
<property name="text">
<string>WEP key:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -746,7 +746,7 @@
<property name="text">
<string>WPA Key:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -868,7 +868,7 @@
&lt;p&gt;You have successfully finished configuring this connection.&lt;/p&gt;
&lt;p&gt;&lt;b&gt;Press Finish to connect!&lt;/b&gt;&lt;/p&gt;</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>

@ -362,7 +362,7 @@
<property name="text">
<string>Ready</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
<property name="whatsThis" stdset="0">

@ -81,7 +81,7 @@ void ui_NetParamsEdit::setValues( const WANetParams & np )
}
}
if (np.wpa) {
labelWpaSettings->setText( TQString("<i>%1</i>").tqarg( np.wpaSettings.join("<br>") ) );
labelWpaSettings->setText( TQString("<i>%1</i>").arg( np.wpaSettings.join("<br>") ) );
if ( np.wpaKey.left(2)=="s:" ) { //ASCII key
checkWpaAscii->setChecked(true);
wpaKey->setText( np.wpaKey.right(np.wpaKey.length()-2) );

@ -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("<i>%1</i>").tqarg( settings.join("<br>") ) );
if (w) labelWpaSettings->setText( TQString("<i>%1</i>").arg( settings.join("<br>") ) );
}

@ -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("<qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would you like to continue?</p></qt>").tqarg(essid)) == KMessageBox::Continue ) {
if ( KMessageBox::warningContinueCancel(0, i18n("<qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would you like to continue?</p></qt>").arg(essid)) == KMessageBox::Continue ) {
if (nvi->hidden()) // hiddenEssid = 1
nvi->setEssid("<hidden>");
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("<qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) and/or domain are not set.</p></qt>").tqarg(f.name()) );
KMessageBox::error(0, i18n("<qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) and/or domain are not set.</p></qt>").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("<qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are trying to connect to requires WPA authentication. The necessary executables <i>wpa_supplicant</i> and <i>wpa_cli</i> could not be found. Install <i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt>").tqarg(NetParams.essid) );
KMessageBox::error(0, i18n("<qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are trying to connect to requires WPA authentication. The necessary executables <i>wpa_supplicant</i> and <i>wpa_cli</i> could not be found. Install <i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt>").arg(NetParams.essid) );
timerConnectionCheck->start(WA_CONNECTION_CHECK_INTERVAL); //resume connection checking
return;
}
@ -579,7 +579,7 @@ void WirelessAssistant::netConnect()
if ( (NetParams.essid=="<hidden>") || (!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("<qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to continue?<p></qt>").tqarg(connectedItem->essid()) )== KMessageBox::Continue ) ) {
if ( (quiet) || (KMessageBox::warningContinueCancel(0, i18n("<qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to continue?<p></qt>").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") ) {

Loading…
Cancel
Save