From 1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:58:08 -0600 Subject: Remove additional unneeded tq method conversions --- wifi/kcmwifi/kcmwifi.cpp | 16 +++++++------- wifi/kcmwifi/mainconfig.cpp | 6 +++--- wifi/kcmwifi/wificonfig.cpp | 4 ++-- wifi/kwifimanager.cpp | 18 ++++++++-------- wifi/kwireless/kwirelesswidget.cpp | 6 +++--- wifi/kwireless/linuxwirelesswidget.cpp | 8 +++---- wifi/networkscanning.cpp | 14 ++++++------- wifi/status.cpp | 38 +++++++++++++++++----------------- 8 files changed, 55 insertions(+), 55 deletions(-) (limited to 'wifi') diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp index 36ca0daf..743f3d2e 100644 --- a/wifi/kcmwifi/kcmwifi.cpp +++ b/wifi/kcmwifi/kcmwifi.cpp @@ -54,7 +54,7 @@ KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &) for ( int i=0; im_numConfigs; ++i ) { IfConfigPage *ifConfigPage = new IfConfigPage( i, tabs, "m_configPage" ); - tabs->addTab(ifConfigPage, i18n ("Config &%1").tqarg( i+1 )); + tabs->addTab(ifConfigPage, i18n ("Config &%1").arg( i+1 )); connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) ); m_ifConfigPage[ i ] = ifConfigPage; @@ -146,7 +146,7 @@ IfConfigPage* KCMWifi::addConfigTab( int count, bool vendor ) if (vendor) { IfConfigPage *ifConfigPage = new IfConfigPage( vendorBase + m_activeVendorCount, tabs, "m_configPage" ); - tabs->addTab(ifConfigPage, i18n ("Vendor %1").tqarg( m_activeVendorCount+1 ) ); + tabs->addTab(ifConfigPage, i18n ("Vendor %1").arg( m_activeVendorCount+1 ) ); connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) ); m_ifConfigPage[ vendorBase+m_activeVendorCount ] = ifConfigPage; m_mainConfig->registerConfig( vendorBase+m_activeVendorCount ); @@ -169,7 +169,7 @@ IfConfigPage* KCMWifi::addConfigTab( int count, bool vendor ) for ( int i=config->m_numConfigs; im_numConfigs+count; i++ ) { IfConfigPage *ifConfigPage = new IfConfigPage( i, tabs, "m_configPage" ); - tabs->insertTab(ifConfigPage, i18n ("Config &%1").tqarg( i+1 ), i ); + tabs->insertTab(ifConfigPage, i18n ("Config &%1").arg( i+1 ), i ); connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) ); m_ifConfigPage[ i ] = ifConfigPage; m_mainConfig->registerConfig( i+1 ); @@ -295,8 +295,8 @@ void KCMWifi::activate() if ( ifconfig.m_keys[ i ].isValid( ifconfig.m_keys[ i ].key() ) > INVALID ) { proc << "key" - << TQString( "[%1]").tqarg( i+1 ) - << TQString( "%1").tqarg( ifconfig.m_keys[ i ].rawKey() ); + << TQString( "[%1]").arg( i+1 ) + << TQString( "%1").arg( ifconfig.m_keys[ i ].rawKey() ); } } @@ -308,7 +308,7 @@ void KCMWifi::activate() proc << "key" << ifconfig.cryptomodeAsString(); proc << "key" - << TQString( "[%1]" ).tqarg( ifconfig.activeKeyId() ); + << TQString( "[%1]" ).arg( ifconfig.activeKeyId() ); proc << "key" << "on"; } @@ -334,10 +334,10 @@ void KCMWifi::activate() { proc << "power" << "period" - << TQString( "%1" ).tqarg( ifconfig.m_wakeupPeriod ); + << TQString( "%1" ).arg( ifconfig.m_wakeupPeriod ); proc << "power" << "timeout" - << TQString( "%1" ).tqarg( ifconfig.m_sleepTimeout ); + << TQString( "%1" ).arg( ifconfig.m_sleepTimeout ); proc << ifconfig.powermodeAsString(); } diff --git a/wifi/kcmwifi/mainconfig.cpp b/wifi/kcmwifi/mainconfig.cpp index ca2a666d..c740df69 100644 --- a/wifi/kcmwifi/mainconfig.cpp +++ b/wifi/kcmwifi/mainconfig.cpp @@ -39,7 +39,7 @@ MainConfig::MainConfig( TQWidget *parent, const char *name ) WifiConfig *config = WifiConfig::instance(); for (int i=1;i<=config->m_numConfigs;i++) { - cmb_presetConfig->insertItem( i18n( "Config %1" ).tqarg( i ) ); + cmb_presetConfig->insertItem( i18n( "Config %1" ).arg( i ) ); } @@ -91,12 +91,12 @@ void MainConfig::registerConfig( int number ) { if ( number >= KCMWifi::vendorBase ) { - cmb_presetConfig->insertItem( i18n( "Vendor %1" ).tqarg( number-KCMWifi::vendorBase+1 ) ); + cmb_presetConfig->insertItem( i18n( "Vendor %1" ).arg( number-KCMWifi::vendorBase+1 ) ); } else { WifiConfig* config = WifiConfig::instance(); - cmb_presetConfig->insertItem( i18n( "Config %1" ).tqarg( number ), number-1 ); + cmb_presetConfig->insertItem( i18n( "Config %1" ).arg( number ), number-1 ); } } diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp index bce6afd9..1cd6b3f2 100644 --- a/wifi/kcmwifi/wificonfig.cpp +++ b/wifi/kcmwifi/wificonfig.cpp @@ -119,7 +119,7 @@ void IfConfig::load( KConfig *config, int i ) { TQString entry; - TQString group = TQString( "Configuration %1" ).tqarg( i+1 ); + TQString group = TQString( "Configuration %1" ).arg( i+1 ); config->setGroup( group ); m_networkName = config->readEntry( "NetworkName" ); @@ -150,7 +150,7 @@ void IfConfig::load( KConfig *config, int i ) void IfConfig::save( KConfig *config, int i ) { - TQString group = TQString( "Configuration %1" ).tqarg( i+1 ); + TQString group = TQString( "Configuration %1" ).arg( i+1 ); config->setGroup( group ); config->writeEntry( "NetworkName", m_networkName ); diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp index 78728de1..fa62e58a 100644 --- a/wifi/kwifimanager.cpp +++ b/wifi/kwifimanager.cpp @@ -385,17 +385,17 @@ KWiFiManagerApp::initView () zentraltqlayout->addMultiCellWidget (location, 3, 3, 0, 1, TQt::AlignLeft); connect (device, TQT_SIGNAL (interfaceChanged ()), this, TQT_SLOT (slotChangeWindowCaption ())); connect (device, TQT_SIGNAL (strengthChanged ()), this, TQT_SLOT (slotChangeTrayIcon ())); - connect (device, TQT_SIGNAL (strengthChanged ()), strength, TQT_SLOT (tqrepaint ())); - connect (device, TQT_SIGNAL (statusChanged ()), status, TQT_SLOT (tqrepaint ())); - connect (device, TQT_SIGNAL (speedChanged ()), speedmeter, TQT_SLOT (tqrepaint ())); - connect (device, TQT_SIGNAL (modeChanged ()), pictogram, TQT_SLOT (tqrepaint ())); + connect (device, TQT_SIGNAL (strengthChanged ()), strength, TQT_SLOT (repaint ())); + connect (device, TQT_SIGNAL (statusChanged ()), status, TQT_SLOT (repaint ())); + connect (device, TQT_SIGNAL (speedChanged ()), speedmeter, TQT_SLOT (repaint ())); + connect (device, TQT_SIGNAL (modeChanged ()), pictogram, TQT_SLOT (repaint ())); connect (device, TQT_SIGNAL (essidChanged (TQString)), this, TQT_SLOT (slotLogESSID (TQString))); - connect (device, TQT_SIGNAL (essidChanged (TQString)), location, TQT_SLOT (tqrepaint ())); - connect (device, TQT_SIGNAL (statusChanged ()), location, TQT_SLOT (tqrepaint ())); + connect (device, TQT_SIGNAL (essidChanged (TQString)), location, TQT_SLOT (repaint ())); + connect (device, TQT_SIGNAL (statusChanged ()), location, TQT_SLOT (repaint ())); connect (device, TQT_SIGNAL (txPowerChanged ()), this, TQT_SLOT (slotTXPowerChanged ())); connect (device, TQT_SIGNAL (txPowerChanged ()), this, TQT_SLOT (slotChangeTrayIcon ())); - connect (device, TQT_SIGNAL (txPowerChanged ()), pictogram, TQT_SLOT (tqrepaint ())); - connect (device, TQT_SIGNAL (txPowerChanged ()), strength, TQT_SLOT (tqrepaint ())); + connect (device, TQT_SIGNAL (txPowerChanged ()), pictogram, TQT_SLOT (repaint ())); + connect (device, TQT_SIGNAL (txPowerChanged ()), strength, TQT_SLOT (repaint ())); connect (scan, TQT_SIGNAL (clicked()), this, TQT_SLOT (slotNetworkScan())); } @@ -427,7 +427,7 @@ KWiFiManagerApp::slotStartStatViewer () delete statistik; statistik = new Statistics (device, showStatsNoise); statistik->setFixedSize (590, 300); - connect(device,TQT_SIGNAL(statsUpdated()),statistik,TQT_SLOT(tqrepaint())); + connect(device,TQT_SIGNAL(statsUpdated()),statistik,TQT_SLOT(repaint())); statistik->show (); } diff --git a/wifi/kwireless/kwirelesswidget.cpp b/wifi/kwireless/kwirelesswidget.cpp index 86bb6ed7..77e20128 100644 --- a/wifi/kwireless/kwirelesswidget.cpp +++ b/wifi/kwireless/kwirelesswidget.cpp @@ -50,7 +50,7 @@ float DeviceInfo::quality() TQString DeviceInfo::qualityString() { - return i18n("%1%").tqarg(TQString::number(m_quality*100, 'f', 0)); + return i18n("%1%").arg(TQString::number(m_quality*100, 'f', 0)); } float DeviceInfo::signal() @@ -60,7 +60,7 @@ float DeviceInfo::signal() TQString DeviceInfo::signalString() { - return i18n("%1%").tqarg(TQString::number(m_signal*100, 'f', 0)); + return i18n("%1%").arg(TQString::number(m_signal*100, 'f', 0)); } float DeviceInfo::noise() @@ -70,7 +70,7 @@ float DeviceInfo::noise() TQString DeviceInfo::noiseString() { - return i18n("%1%").tqarg(TQString::number(m_noise*100, 'f', 0)); + return i18n("%1%").arg(TQString::number(m_noise*100, 'f', 0)); } const TQString& DeviceInfo::device() diff --git a/wifi/kwireless/linuxwirelesswidget.cpp b/wifi/kwireless/linuxwirelesswidget.cpp index 02b7e217..3efdbf98 100644 --- a/wifi/kwireless/linuxwirelesswidget.cpp +++ b/wifi/kwireless/linuxwirelesswidget.cpp @@ -187,7 +187,7 @@ void LinuxWireLessWidget::poll() if(updateNeeded) { emit(updateDeviceInfo(&deviceInfo)); - tqrepaint(false); + repaint(false); } if(updateToolTip) { @@ -199,9 +199,9 @@ void LinuxWireLessWidget::poll() if (!text.isEmpty()) text.append('\n'); text += i18n("%1: Link Quality %2, Bitrate: %3") - .tqarg(info->device()) - .tqarg(info->qualityString()) - .tqarg(info->bitrateString()); + .arg(info->device()) + .arg(info->qualityString()) + .arg(info->bitrateString()); } TQToolTip::add(this, text); diff --git a/wifi/networkscanning.cpp b/wifi/networkscanning.cpp index 0e2a42a8..509e1f9f 100644 --- a/wifi/networkscanning.cpp +++ b/wifi/networkscanning.cpp @@ -119,26 +119,26 @@ NetworkScanning::switchToNetwork() TQString tempfilename = tempfile->name(); cmdline = (TQString)"ifconfig %1 down\n"; - cmdline = cmdline.tqarg( device->get_interface_name() ); + cmdline = cmdline.arg( device->get_interface_name() ); write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) ); cmdline = (TQString)"iwconfig %1 essid %2 mode %3 enc %4\n"; - cmdline = cmdline.tqarg( device->get_interface_name() ); - cmdline = cmdline.tqarg( KProcess::quote( networks->text( networks->currentRow(), 0 ) ) ); + cmdline = cmdline.arg( device->get_interface_name() ); + cmdline = cmdline.arg( KProcess::quote( networks->text( networks->currentRow(), 0 ) ) ); TQString modetemp; if (networks->text( networks->currentRow(), 1 ) == i18n("Managed") ) modetemp = "Managed"; else modetemp = "Ad-Hoc"; - cmdline = cmdline.tqarg( modetemp ); + cmdline = cmdline.arg( modetemp ); if ( encryption != NONE ) { - cmdline = cmdline.tqarg( (encryption == VALID_STRING ? "s:" : "" ) + KProcess::quote( networks->text( networks->currentRow(), 3 ) ) ); + cmdline = cmdline.arg( (encryption == VALID_STRING ? "s:" : "" ) + KProcess::quote( networks->text( networks->currentRow(), 3 ) ) ); } else { - cmdline = cmdline.tqarg("off"); + cmdline = cmdline.arg("off"); } write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) ); cmdline = (TQString)"ifconfig %1 up\n"; - cmdline = cmdline.tqarg( device->get_interface_name() ); + cmdline = cmdline.arg( device->get_interface_name() ); write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) ); delete tempfile; // autoDeletion off, so the file remains on disk diff --git a/wifi/status.cpp b/wifi/status.cpp index 3d344800..4d8b5784 100644 --- a/wifi/status.cpp +++ b/wifi/status.cpp @@ -69,79 +69,79 @@ bool Status::generateStatsWidget () { if (freq / 1000000. > 5690.) { - temp3 = temp3.tqarg(140); + temp3 = temp3.arg(140); } else if (freq / 1000000. > 5670.) { - temp3 = temp3.tqarg(136); + temp3 = temp3.arg(136); } else if (freq / 1000000. > 5650.) { - temp3 = temp3.tqarg(132); + temp3 = temp3.arg(132); } else if (freq / 1000000. > 5630.) { - temp3 = temp3.tqarg(128); + temp3 = temp3.arg(128); } else if (freq / 1000000. > 5610.) { - temp3 = temp3.tqarg(124); + temp3 = temp3.arg(124); } else if (freq / 1000000. > 5590.) { - temp3 = temp3.tqarg(120); + temp3 = temp3.arg(120); } else if (freq / 1000000. > 5570.) { - temp3 = temp3.tqarg(116); + temp3 = temp3.arg(116); } else if (freq / 1000000. > 5550.) { - temp3 = temp3.tqarg(112); + temp3 = temp3.arg(112); } else if (freq / 1000000. > 5530.) { - temp3 = temp3.tqarg(108); + temp3 = temp3.arg(108); } else if (freq / 1000000. > 5510.) { - temp3 = temp3.tqarg(104); + temp3 = temp3.arg(104); } else if (freq / 1000000. > 5490.) { - temp3 = temp3.tqarg(100); + temp3 = temp3.arg(100); } else if (freq / 1000000. > 5310.) { - temp3 = temp3.tqarg(64); + temp3 = temp3.arg(64); } else if (freq / 1000000. > 5290.) { - temp3 = temp3.tqarg(60); + temp3 = temp3.arg(60); } else if (freq / 1000000. > 5270.) { - temp3 = temp3.tqarg(56); + temp3 = temp3.arg(56); } else if (freq / 1000000. > 5250.) { - temp3 = temp3.tqarg(52); + temp3 = temp3.arg(52); } else if (freq / 1000000. > 5230.) { - temp3 = temp3.tqarg(48); + temp3 = temp3.arg(48); } else if (freq / 1000000. > 5210.) { - temp3 = temp3.tqarg(44); + temp3 = temp3.arg(44); } else if (freq / 1000000. > 5190.) { - temp3 = temp3.tqarg(40); + temp3 = temp3.arg(40); } else if (freq / 1000000. > 5170.) { - temp3 = temp3.tqarg(36); + temp3 = temp3.arg(36); } else if (freq / 1000000. > 2474.) { -- cgit v1.2.1