From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:34 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 808e453c56036211f57482ed847d54aca01bba68. --- wifi/kcmwifi/configadvanced.ui | 2 +- wifi/kcmwifi/configcrypto.ui | 18 ++++++------ wifi/kcmwifi/configcrypto.ui.h | 8 +++--- wifi/kcmwifi/ifconfigpagebase.ui | 28 +++++++++---------- wifi/kcmwifi/kcmwifi.cpp | 18 ++++++------ wifi/kcmwifi/mainconfig.cpp | 6 ++-- wifi/kcmwifi/mainconfigbase.ui | 6 ++-- wifi/kcmwifi/vendorconfig.cpp | 2 +- wifi/kcmwifi/wificonfig.cpp | 4 +-- wifi/kwifimanager.cpp | 44 +++++++++++++++--------------- wifi/kwifimanager.h | 4 +-- wifi/kwireless/kwirelesswidget.cpp | 6 ++-- wifi/kwireless/linuxwirelesswidget.cpp | 8 +++--- wifi/kwireless/propertytable.cpp | 2 +- wifi/locator.cpp | 8 +++--- wifi/networkscanning.cpp | 16 +++++------ wifi/statistics.cpp | 4 +-- wifi/status.cpp | 50 +++++++++++++++++----------------- wifi/status.h | 4 +-- wifi/strength.cpp | 4 +-- 20 files changed, 121 insertions(+), 121 deletions(-) (limited to 'wifi') diff --git a/wifi/kcmwifi/configadvanced.ui b/wifi/kcmwifi/configadvanced.ui index 1e54d280..3eda59d7 100644 --- a/wifi/kcmwifi/configadvanced.ui +++ b/wifi/kcmwifi/configadvanced.ui @@ -96,7 +96,7 @@ Expanding - + 40 20 diff --git a/wifi/kcmwifi/configcrypto.ui b/wifi/kcmwifi/configcrypto.ui index 41cfdf33..76736675 100644 --- a/wifi/kcmwifi/configcrypto.ui +++ b/wifi/kcmwifi/configcrypto.ui @@ -260,7 +260,7 @@ Expanding - + 80 20 @@ -310,25 +310,25 @@ le_key1 textChanged(const TQString&) ConfigCrypto - slotUpdateKey1Status(const TQString&) + slotUpdateKey1tqStatus(const TQString&) le_key2 textChanged(const TQString&) ConfigCrypto - slotUpdateKey2Status(const TQString&) + slotUpdateKey2tqStatus(const TQString&) le_key3 textChanged(const TQString&) ConfigCrypto - slotUpdateKey3Status(const TQString&) + slotUpdateKey3tqStatus(const TQString&) le_key4 textChanged(const TQString&) ConfigCrypto - slotUpdateKey4Status(const TQString&) + slotUpdateKey4tqStatus(const TQString&) @@ -345,10 +345,10 @@ configcrypto.ui.h - slotUpdateKey1Status( const TQString & key ) - slotUpdateKey2Status( const TQString & key ) - slotUpdateKey3Status( const TQString & key ) - slotUpdateKey4Status( const TQString & key ) + slotUpdateKey1tqStatus( const TQString & key ) + slotUpdateKey2tqStatus( const TQString & key ) + slotUpdateKey3tqStatus( const TQString & key ) + slotUpdateKey4tqStatus( const TQString & key ) load( const IfConfig & ifconfig ) diff --git a/wifi/kcmwifi/configcrypto.ui.h b/wifi/kcmwifi/configcrypto.ui.h index acb98974..be561bff 100644 --- a/wifi/kcmwifi/configcrypto.ui.h +++ b/wifi/kcmwifi/configcrypto.ui.h @@ -32,7 +32,7 @@ void ConfigCrypto::save( IfConfig &ifconfig ) } -void ConfigCrypto::slotUpdateKey1Status(const TQString& key) +void ConfigCrypto::slotUpdateKey1tqStatus(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { @@ -63,7 +63,7 @@ void ConfigCrypto::slotUpdateKey1Status(const TQString& key) } } -void ConfigCrypto::slotUpdateKey2Status(const TQString& key) +void ConfigCrypto::slotUpdateKey2tqStatus(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { @@ -94,7 +94,7 @@ void ConfigCrypto::slotUpdateKey2Status(const TQString& key) } } -void ConfigCrypto::slotUpdateKey3Status(const TQString& key) +void ConfigCrypto::slotUpdateKey3tqStatus(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { @@ -125,7 +125,7 @@ void ConfigCrypto::slotUpdateKey3Status(const TQString& key) } } -void ConfigCrypto::slotUpdateKey4Status(const TQString& key) +void ConfigCrypto::slotUpdateKey4tqStatus(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { diff --git a/wifi/kcmwifi/ifconfigpagebase.ui b/wifi/kcmwifi/ifconfigpagebase.ui index f5aedf41..089284aa 100644 --- a/wifi/kcmwifi/ifconfigpagebase.ui +++ b/wifi/kcmwifi/ifconfigpagebase.ui @@ -18,7 +18,7 @@ - layout16 + tqlayout16 @@ -80,7 +80,7 @@ Expanding - + 226 20 @@ -91,7 +91,7 @@ - layout13 + tqlayout13 @@ -126,7 +126,7 @@ Expanding - + 196 20 @@ -137,7 +137,7 @@ - layout11 + tqlayout11 @@ -178,7 +178,7 @@ Expanding - + 285 20 @@ -189,7 +189,7 @@ - layout6 + tqlayout6 @@ -286,7 +286,7 @@ Expanding - + 190 20 @@ -297,7 +297,7 @@ - layout5 + tqlayout5 @@ -354,7 +354,7 @@ Expanding - + 413 20 @@ -365,7 +365,7 @@ - layout14 + tqlayout14 @@ -392,7 +392,7 @@ Expanding - + 131 20 @@ -403,7 +403,7 @@ - layout17 + tqlayout17 @@ -444,7 +444,7 @@ Expanding - + 396 20 diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp index ddc81408..36ca0daf 100644 --- a/wifi/kcmwifi/kcmwifi.cpp +++ b/wifi/kcmwifi/kcmwifi.cpp @@ -18,7 +18,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include @@ -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").arg( i+1 )); + tabs->addTab(ifConfigPage, i18n ("Config &%1").tqarg( 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").arg( m_activeVendorCount+1 ) ); + tabs->addTab(ifConfigPage, i18n ("Vendor %1").tqarg( 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").arg( i+1 ), i ); + tabs->insertTab(ifConfigPage, i18n ("Config &%1").tqarg( 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]").arg( i+1 ) - << TQString( "%1").arg( ifconfig.m_keys[ i ].rawKey() ); + << TQString( "[%1]").tqarg( i+1 ) + << TQString( "%1").tqarg( ifconfig.m_keys[ i ].rawKey() ); } } @@ -308,7 +308,7 @@ void KCMWifi::activate() proc << "key" << ifconfig.cryptomodeAsString(); proc << "key" - << TQString( "[%1]" ).arg( ifconfig.activeKeyId() ); + << TQString( "[%1]" ).tqarg( ifconfig.activeKeyId() ); proc << "key" << "on"; } @@ -334,10 +334,10 @@ void KCMWifi::activate() { proc << "power" << "period" - << TQString( "%1" ).arg( ifconfig.m_wakeupPeriod ); + << TQString( "%1" ).tqarg( ifconfig.m_wakeupPeriod ); proc << "power" << "timeout" - << TQString( "%1" ).arg( ifconfig.m_sleepTimeout ); + << TQString( "%1" ).tqarg( ifconfig.m_sleepTimeout ); proc << ifconfig.powermodeAsString(); } diff --git a/wifi/kcmwifi/mainconfig.cpp b/wifi/kcmwifi/mainconfig.cpp index c740df69..ca2a666d 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" ).arg( i ) ); + cmb_presetConfig->insertItem( i18n( "Config %1" ).tqarg( i ) ); } @@ -91,12 +91,12 @@ void MainConfig::registerConfig( int number ) { if ( number >= KCMWifi::vendorBase ) { - cmb_presetConfig->insertItem( i18n( "Vendor %1" ).arg( number-KCMWifi::vendorBase+1 ) ); + cmb_presetConfig->insertItem( i18n( "Vendor %1" ).tqarg( number-KCMWifi::vendorBase+1 ) ); } else { WifiConfig* config = WifiConfig::instance(); - cmb_presetConfig->insertItem( i18n( "Config %1" ).arg( number ), number-1 ); + cmb_presetConfig->insertItem( i18n( "Config %1" ).tqarg( number ), number-1 ); } } diff --git a/wifi/kcmwifi/mainconfigbase.ui b/wifi/kcmwifi/mainconfigbase.ui index 5fcb1dab..77e168c1 100644 --- a/wifi/kcmwifi/mainconfigbase.ui +++ b/wifi/kcmwifi/mainconfigbase.ui @@ -48,7 +48,7 @@ Expanding - + 146 20 @@ -117,7 +117,7 @@ Expanding - + 106 20 @@ -134,7 +134,7 @@ Expanding - + 66 20 diff --git a/wifi/kcmwifi/vendorconfig.cpp b/wifi/kcmwifi/vendorconfig.cpp index e415c276..395cbc58 100644 --- a/wifi/kcmwifi/vendorconfig.cpp +++ b/wifi/kcmwifi/vendorconfig.cpp @@ -184,7 +184,7 @@ is incremented _after_ successful setup of each given config. */ TQString value = buffer.section ( ' ', 1, 1 ); kdDebug ( ) << "Variable " << var << " contains " << value << ".\n"; // evaluate the meaningful lines - if ( var.startsWith ( "wireless", false ) ) + if ( var.tqstartsWith ( "wireless", false ) ) { if ( var.endsWith ( "essid" ) ) { diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp index 1cd6b3f2..bce6afd9 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" ).arg( i+1 ); + TQString group = TQString( "Configuration %1" ).tqarg( 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" ).arg( i+1 ); + TQString group = TQString( "Configuration %1" ).tqarg( i+1 ); config->setGroup( group ); config->writeEntry( "NetworkName", m_networkName ); diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp index 8ce5b07e..67b9378e 100644 --- a/wifi/kwifimanager.cpp +++ b/wifi/kwifimanager.cpp @@ -22,7 +22,7 @@ // include files for QT #include #include -#include +#include #include #include #include @@ -184,7 +184,7 @@ KWiFiManagerApp::slotLogESSID (TQString essid) if (!log_file.open (IO_WriteOnly | IO_Append)) kdDebug () << "Logging failed!" << endl; TQTextStream stream (&log_file); - stream << TQDateTime::currentDateTime().toString ().latin1 (); + stream << TQDateTime::tqcurrentDateTime().toString ().latin1 (); stream << " Entering network: " << essid.latin1() << endl; log_file.close (); } @@ -262,7 +262,7 @@ KWiFiManagerApp::slotChangeTrayIcon () } else if (((str == 0) && (mode == 2)) || (!validdata)) { - sstrength2.setText( TQString::fromLatin1("0") ); + sstrength2.setText( TQString::tqfromLatin1("0") ); ICON = strength->OOR_DOWN; if (led->state == true) led->Off (); @@ -286,7 +286,7 @@ KWiFiManagerApp::slotChangeTrayIcon () labelfont.setStretch( TQFont::Condensed ); labelfont.setBold( true ); sstrength2.setFont( labelfont ); - sstrength2.setFixedSize( sstrength2.sizeHint() ); + sstrength2.setFixedSize( sstrength2.tqsizeHint() ); } TQPixmap labeltemp = TQPixmap::grabWidget( &sstrength2 ); labeltemp.setMask( labeltemp.createHeuristicMask() ); @@ -360,10 +360,10 @@ KWiFiManagerApp::initView () view = new TQWidget (this, "mainwidget"); view->setBackgroundMode (PaletteBackground); setCentralWidget (view); - TQGridLayout *zentrallayout = new TQGridLayout (view); - zentrallayout->setMargin( KDialog::marginHint() ); + TQGridLayout *zentraltqlayout = new TQGridLayout (view); + zentraltqlayout->setMargin( KDialog::marginHint() ); speedmeter = new Speed (view, device); - status = new Status (view, device); + status = new tqStatus (view, device); location = new Locator (view, device); strength = new Strength (view, device); pictogram = new Picture (view, device); @@ -377,25 +377,25 @@ KWiFiManagerApp::initView () strength->setMinimumSize (strength->mySizeHint()); speedmeter->setMinimumHeight (60); status->setMinimumHeight (60); - zentrallayout->addWidget (pictogram, 0, 0); - zentrallayout->addWidget (strength, 1, 0); - zentrallayout->addWidget (speedmeter, 0, 1); - zentrallayout->addMultiCellWidget (status, 1, 2, 1, 1); - zentrallayout->addWidget (scan, 2, 0); - zentrallayout->addMultiCellWidget (location, 3, 3, 0, 1, TQt::AlignLeft); + zentraltqlayout->addWidget (pictogram, 0, 0); + zentraltqlayout->addWidget (strength, 1, 0); + zentraltqlayout->addWidget (speedmeter, 0, 1); + zentraltqlayout->addMultiCellWidget (status, 1, 2, 1, 1); + zentraltqlayout->addWidget (scan, 2, 0); + 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 (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 (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 (essidChanged (TQString)), this, TQT_SLOT (slotLogESSID (TQString))); - connect (device, TQT_SIGNAL (essidChanged (TQString)), location, TQT_SLOT (repaint ())); - connect (device, TQT_SIGNAL (statusChanged ()), location, TQT_SLOT (repaint ())); + connect (device, TQT_SIGNAL (essidChanged (TQString)), location, TQT_SLOT (tqrepaint ())); + connect (device, TQT_SIGNAL (statusChanged ()), location, TQT_SLOT (tqrepaint ())); 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 (repaint ())); - connect (device, TQT_SIGNAL (txPowerChanged ()), strength, TQT_SLOT (repaint ())); + connect (device, TQT_SIGNAL (txPowerChanged ()), pictogram, TQT_SLOT (tqrepaint ())); + connect (device, TQT_SIGNAL (txPowerChanged ()), strength, TQT_SLOT (tqrepaint ())); 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(repaint())); + connect(device,TQT_SIGNAL(statsUpdated()),statistik,TQT_SLOT(tqrepaint())); statistik->show (); } diff --git a/wifi/kwifimanager.h b/wifi/kwifimanager.h index 6a58de44..c52969ac 100644 --- a/wifi/kwifimanager.h +++ b/wifi/kwifimanager.h @@ -39,7 +39,7 @@ class KProcess; #include "interface_wireless.h" #include "interface_dcop.h" class Strength; -class Status; +class tqStatus; class Picture; class Locator; class Speed; @@ -115,7 +115,7 @@ private: Speed *speedmeter; TQBoxLayout *bla; TQLabel *profil; - Status *status; + tqStatus *status; Strength *strength; Picture *pictogram; Locator *location; diff --git a/wifi/kwireless/kwirelesswidget.cpp b/wifi/kwireless/kwirelesswidget.cpp index 77e20128..86bb6ed7 100644 --- a/wifi/kwireless/kwirelesswidget.cpp +++ b/wifi/kwireless/kwirelesswidget.cpp @@ -50,7 +50,7 @@ float DeviceInfo::quality() TQString DeviceInfo::qualityString() { - return i18n("%1%").arg(TQString::number(m_quality*100, 'f', 0)); + return i18n("%1%").tqarg(TQString::number(m_quality*100, 'f', 0)); } float DeviceInfo::signal() @@ -60,7 +60,7 @@ float DeviceInfo::signal() TQString DeviceInfo::signalString() { - return i18n("%1%").arg(TQString::number(m_signal*100, 'f', 0)); + return i18n("%1%").tqarg(TQString::number(m_signal*100, 'f', 0)); } float DeviceInfo::noise() @@ -70,7 +70,7 @@ float DeviceInfo::noise() TQString DeviceInfo::noiseString() { - return i18n("%1%").arg(TQString::number(m_noise*100, 'f', 0)); + return i18n("%1%").tqarg(TQString::number(m_noise*100, 'f', 0)); } const TQString& DeviceInfo::device() diff --git a/wifi/kwireless/linuxwirelesswidget.cpp b/wifi/kwireless/linuxwirelesswidget.cpp index 3efdbf98..02b7e217 100644 --- a/wifi/kwireless/linuxwirelesswidget.cpp +++ b/wifi/kwireless/linuxwirelesswidget.cpp @@ -187,7 +187,7 @@ void LinuxWireLessWidget::poll() if(updateNeeded) { emit(updateDeviceInfo(&deviceInfo)); - repaint(false); + tqrepaint(false); } if(updateToolTip) { @@ -199,9 +199,9 @@ void LinuxWireLessWidget::poll() if (!text.isEmpty()) text.append('\n'); text += i18n("%1: Link Quality %2, Bitrate: %3") - .arg(info->device()) - .arg(info->qualityString()) - .arg(info->bitrateString()); + .tqarg(info->device()) + .tqarg(info->qualityString()) + .tqarg(info->bitrateString()); } TQToolTip::add(this, text); diff --git a/wifi/kwireless/propertytable.cpp b/wifi/kwireless/propertytable.cpp index 79fcbe89..7c73b1c2 100644 --- a/wifi/kwireless/propertytable.cpp +++ b/wifi/kwireless/propertytable.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include "propertytable.h" diff --git a/wifi/locator.cpp b/wifi/locator.cpp index 2ca40398..6bb0cd62 100644 --- a/wifi/locator.cpp +++ b/wifi/locator.cpp @@ -35,12 +35,12 @@ Locator::generateLocWidget () sentence = new TQLabel (i18n ("AccessPoint: ") + whois (mac.local8Bit (), APs), this); setFixedSize (TQSize - (sentence->sizeHint ().width () + 2, - sentence->sizeHint ().height ())); + (sentence->tqsizeHint ().width () + 2, + sentence->tqsizeHint ().height ())); sentence-> setFixedSize (TQSize - (sentence->sizeHint ().width () + 2, - sentence->sizeHint ().height ())); + (sentence->tqsizeHint ().width () + 2, + sentence->tqsizeHint ().height ())); sentence->show (); widgetbild = TQPixmap::grabWidget (sentence); delete sentence; diff --git a/wifi/networkscanning.cpp b/wifi/networkscanning.cpp index 46b3a27d..0e2a42a8 100644 --- a/wifi/networkscanning.cpp +++ b/wifi/networkscanning.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include @@ -119,26 +119,26 @@ NetworkScanning::switchToNetwork() TQString tempfilename = tempfile->name(); cmdline = (TQString)"ifconfig %1 down\n"; - cmdline = cmdline.arg( device->get_interface_name() ); + cmdline = cmdline.tqarg( 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.arg( device->get_interface_name() ); - cmdline = cmdline.arg( KProcess::quote( networks->text( networks->currentRow(), 0 ) ) ); + cmdline = cmdline.tqarg( device->get_interface_name() ); + cmdline = cmdline.tqarg( 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.arg( modetemp ); + cmdline = cmdline.tqarg( modetemp ); if ( encryption != NONE ) { - cmdline = cmdline.arg( (encryption == VALID_STRING ? "s:" : "" ) + KProcess::quote( networks->text( networks->currentRow(), 3 ) ) ); + cmdline = cmdline.tqarg( (encryption == VALID_STRING ? "s:" : "" ) + KProcess::quote( networks->text( networks->currentRow(), 3 ) ) ); } else { - cmdline = cmdline.arg("off"); + cmdline = cmdline.tqarg("off"); } write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) ); cmdline = (TQString)"ifconfig %1 up\n"; - cmdline = cmdline.arg( device->get_interface_name() ); + cmdline = cmdline.tqarg( 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/statistics.cpp b/wifi/statistics.cpp index 15295180..7dfe88b6 100644 --- a/wifi/statistics.cpp +++ b/wifi/statistics.cpp @@ -102,10 +102,10 @@ Statistics::paintEvent (TQPaintEvent *) { if (showStatsNoise) { statpainter->setPen (red); - statpainter->drawPolyline (datensatz2, 1); + statpainter->tqdrawPolyline (datensatz2, 1); } statpainter->setPen (blue); - statpainter->drawPolyline (datensatz, 1); + statpainter->tqdrawPolyline (datensatz, 1); } delete statpainter; } diff --git a/wifi/status.cpp b/wifi/status.cpp index 4d8b5784..0bd45b3a 100644 --- a/wifi/status.cpp +++ b/wifi/status.cpp @@ -22,13 +22,13 @@ #include #include -Status::Status (TQWidget * parent, Interface_wireless * device) +tqStatus::tqStatus (TQWidget * parent, Interface_wireless * device) : TQWidget (parent, "KWiFiManager status") { this->device = device; } -bool Status::generateStatsWidget () +bool tqStatus::generateStatsWidget () { double freq = 0.; @@ -69,79 +69,79 @@ bool Status::generateStatsWidget () { if (freq / 1000000. > 5690.) { - temp3 = temp3.arg(140); + temp3 = temp3.tqarg(140); } else if (freq / 1000000. > 5670.) { - temp3 = temp3.arg(136); + temp3 = temp3.tqarg(136); } else if (freq / 1000000. > 5650.) { - temp3 = temp3.arg(132); + temp3 = temp3.tqarg(132); } else if (freq / 1000000. > 5630.) { - temp3 = temp3.arg(128); + temp3 = temp3.tqarg(128); } else if (freq / 1000000. > 5610.) { - temp3 = temp3.arg(124); + temp3 = temp3.tqarg(124); } else if (freq / 1000000. > 5590.) { - temp3 = temp3.arg(120); + temp3 = temp3.tqarg(120); } else if (freq / 1000000. > 5570.) { - temp3 = temp3.arg(116); + temp3 = temp3.tqarg(116); } else if (freq / 1000000. > 5550.) { - temp3 = temp3.arg(112); + temp3 = temp3.tqarg(112); } else if (freq / 1000000. > 5530.) { - temp3 = temp3.arg(108); + temp3 = temp3.tqarg(108); } else if (freq / 1000000. > 5510.) { - temp3 = temp3.arg(104); + temp3 = temp3.tqarg(104); } else if (freq / 1000000. > 5490.) { - temp3 = temp3.arg(100); + temp3 = temp3.tqarg(100); } else if (freq / 1000000. > 5310.) { - temp3 = temp3.arg(64); + temp3 = temp3.tqarg(64); } else if (freq / 1000000. > 5290.) { - temp3 = temp3.arg(60); + temp3 = temp3.tqarg(60); } else if (freq / 1000000. > 5270.) { - temp3 = temp3.arg(56); + temp3 = temp3.tqarg(56); } else if (freq / 1000000. > 5250.) { - temp3 = temp3.arg(52); + temp3 = temp3.tqarg(52); } else if (freq / 1000000. > 5230.) { - temp3 = temp3.arg(48); + temp3 = temp3.tqarg(48); } else if (freq / 1000000. > 5210.) { - temp3 = temp3.arg(44); + temp3 = temp3.tqarg(44); } else if (freq / 1000000. > 5190.) { - temp3 = temp3.arg(40); + temp3 = temp3.tqarg(40); } else if (freq / 1000000. > 5170.) { - temp3 = temp3.arg(36); + temp3 = temp3.tqarg(36); } else if (freq / 1000000. > 2474.) { @@ -361,10 +361,10 @@ bool Status::generateStatsWidget () else enc = new TQLabel (i18n ("active"), content); } - // content->setFixedSize (content->sizeHint ()); - content->setMinimumSize(content->sizeHint()); + // content->setFixedSize (content->tqsizeHint ()); + content->setMinimumSize(content->tqsizeHint()); if ( content->minimumWidth() < 280 ) content->setMinimumWidth( 280 ); - setFixedSize (content->minimumSize()); + setFixedSize (content->tqminimumSize()); content->show (); widgetbild = TQPixmap::grabWidget (content); delete @@ -373,7 +373,7 @@ bool Status::generateStatsWidget () } void -Status::paintEvent (TQPaintEvent *) +tqStatus::paintEvent (TQPaintEvent *) { TQPainter *paintArea = new TQPainter (this); generateStatsWidget (); diff --git a/wifi/status.h b/wifi/status.h index 59efff87..dfdfd81d 100644 --- a/wifi/status.h +++ b/wifi/status.h @@ -26,10 +26,10 @@ class Interface_wireless; -class Status:public TQWidget +class tqStatus:public TQWidget { public: - Status (TQWidget * parent, Interface_wireless * device); + tqStatus (TQWidget * parent, Interface_wireless * device); private: void paintEvent (TQPaintEvent *); bool generateStatsWidget (); diff --git a/wifi/strength.cpp b/wifi/strength.cpp index a448cfdb..e33a6155 100644 --- a/wifi/strength.cpp +++ b/wifi/strength.cpp @@ -63,7 +63,7 @@ TQSize Strength::mySizeHint () // up to now: this is the height required to get a decent logo display // now determine height of TQLabels to calculate the extra needed height TQLabel heightTest( "ABC", 0 ); - temp->setHeight( temp->height() + 2 * heightTest.sizeHint().height() + 10 ); + temp->setHeight( temp->height() + 2 * heightTest.tqsizeHint().height() + 10 ); return *temp; } @@ -149,7 +149,7 @@ Strength::updateInfo (TQPaintEvent *) else if (((strength == 0) && (mode == 2)) || (!validdata)) { sstrength1 = i18n("OUT OF RANGE"); - sstrength2 = TQString::fromLatin1("0"); + sstrength2 = TQString::tqfromLatin1("0"); strengthpainter->drawPixmap (50, 10, *OOR_DOWN); } else -- cgit v1.2.3