diff options
Diffstat (limited to 'wifi')
39 files changed, 575 insertions, 575 deletions
diff --git a/wifi/interface_dcop.h b/wifi/interface_dcop.h index 9a4149c0..4bbe7905 100644 --- a/wifi/interface_dcop.h +++ b/wifi/interface_dcop.h @@ -8,7 +8,7 @@ class dcop_interface : virtual public DCOPObject K_DCOP k_dcop: - virtual QString interface() const = 0; + virtual TQString interface() const = 0; }; #endif diff --git a/wifi/interface_wireless.cpp b/wifi/interface_wireless.cpp index 5ece6301..d04efa95 100644 --- a/wifi/interface_wireless.cpp +++ b/wifi/interface_wireless.cpp @@ -16,9 +16,9 @@ ***************************************************************************/ #include "interface_wireless.h" -#include <qdir.h> -#include <qfile.h> -#include <qstringlist.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqstringlist.h> #ifndef WITHOUT_ARTS #include <arts/artsflow.h> @@ -32,10 +32,10 @@ #include <klocale.h> #include <kprocio.h> #include <kdebug.h> -#include <qstring.h> +#include <tqstring.h> #include <arpa/inet.h> -Interface_wireless::Interface_wireless (QStringList * ignoreInterfaces) +Interface_wireless::Interface_wireless (TQStringList * ignoreInterfaces) { this->ignoreInterfaces = ignoreInterfaces; has_frequency = false; @@ -94,7 +94,7 @@ bool Interface_wireless::get_mode (int &ext_mode) } } -bool Interface_wireless::get_key (QString & ext_key, +bool Interface_wireless::get_key (TQString & ext_key, int &ext_size, int &ext_flags) { @@ -111,7 +111,7 @@ bool Interface_wireless::get_key (QString & ext_key, } } -QString Interface_wireless::get_essid () +TQString Interface_wireless::get_essid () { return essid; } @@ -126,13 +126,13 @@ int Interface_wireless::get_txpower_disabled() return txpower_disabled; } -bool Interface_wireless::get_AP_info (QString & mac, QString &/*ip*/) +bool Interface_wireless::get_AP_info (TQString & mac, TQString &/*ip*/) { mac = access_point_address; return false; } -QString Interface_wireless::get_IP_info () +TQString Interface_wireless::get_IP_info () { return ip_address; } @@ -142,7 +142,7 @@ double Interface_wireless::get_bitrate () return bitrate; } -QString Interface_wireless::get_interface_name () +TQString Interface_wireless::get_interface_name () { return interface_name; } @@ -196,12 +196,12 @@ MyTimeNotify::notifyTime () #endif QString -whois (const char *MAC_ADR, QStringList APList) +whois (const char *MAC_ADR, TQStringList APList) { - for (QStringList::Iterator it = APList.begin (); it != APList.end (); + for (TQStringList::Iterator it = APList.begin (); it != APList.end (); (it++)++) { - if ((*it) == (QString) MAC_ADR) + if ((*it) == (TQString) MAC_ADR) return *(++it); } return i18n ("UNKNOWN"); diff --git a/wifi/interface_wireless.h b/wifi/interface_wireless.h index 029a8156..0a92709e 100644 --- a/wifi/interface_wireless.h +++ b/wifi/interface_wireless.h @@ -20,9 +20,9 @@ #include "config.h" -#include <qobject.h> -#include <qstring.h> -#include <qtable.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqtable.h> #ifndef WITHOUT_ARTS #include <arts/iomanager.h> @@ -35,28 +35,28 @@ const int MAX_HISTORY = 240; // number of device states to be saved class Interface_wireless:public QObject { Q_OBJECT public: - Interface_wireless (QStringList * ignoreInterfaces); + Interface_wireless (TQStringList * ignoreInterfaces); virtual ~ Interface_wireless() { }; virtual bool get_device_freq (double &freq); // true: device returned valid frequency virtual bool get_mode (int &mode); // true: device returned valid mode info - virtual bool get_key (QString & key, int &size, int &flags); + virtual bool get_key (TQString & key, int &size, int &flags); // true: device has set up a valid crypto key - virtual QString get_essid (); - virtual bool get_AP_info (QString & mac, QString & ip); + virtual TQString get_essid (); + virtual bool get_AP_info (TQString & mac, TQString & ip); // true: could retrieve IP, false: returned IP info invalid - virtual QString get_IP_info (); + virtual TQString get_IP_info (); virtual double get_bitrate (); - virtual QString get_interface_name (); + virtual TQString get_interface_name (); // if no device is attached, return empty QString virtual bool get_current_quality (int &sig, int &noi, int &qua); // quality info is only valid when true - virtual QTable* get_available_networks () = 0; + virtual TQTable* get_available_networks () = 0; virtual bool get_has_txpower(); virtual int get_txpower_disabled(); - virtual void setActiveDevice( QString device ) = 0; + virtual void setActiveDevice( TQString device ) = 0; // stats int sigLevel[MAX_HISTORY]; int sigLevelMin, sigLevelMax; @@ -75,7 +75,7 @@ signals: void statusChanged (); void modeChanged (); void speedChanged (); - void essidChanged (QString essid); + void essidChanged (TQString essid); void txPowerChanged (); void statsUpdated (); protected: @@ -86,18 +86,18 @@ protected: bool has_mode; int mode; bool has_key; - QString key; + TQString key; int key_size; int key_flags; - QString essid; - QString access_point_address; - QString ip_address; + TQString essid; + TQString access_point_address; + TQString ip_address; double bitrate; - QString interface_name; + TQString interface_name; int socket; bool has_range; int range; - QStringList * ignoreInterfaces; + TQStringList * ignoreInterfaces; bool has_txpower; int txpower_disabled; }; @@ -120,6 +120,6 @@ public: #endif -QString whois (const char *MAC_ADR, QStringList APList); +TQString whois (const char *MAC_ADR, TQStringList APList); #endif /* INTERFACE_WIRELESS_H */ diff --git a/wifi/interface_wireless_wirelessextensions.cpp b/wifi/interface_wireless_wirelessextensions.cpp index 874eefb3..878b9460 100644 --- a/wifi/interface_wireless_wirelessextensions.cpp +++ b/wifi/interface_wireless_wirelessextensions.cpp @@ -17,9 +17,9 @@ #include "interface_wireless_wirelessextensions.h" #include <iwlib.h> -#include <qdir.h> -#include <qfile.h> -#include <qtable.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqtable.h> #include <kmessagebox.h> @@ -40,7 +40,7 @@ #include <kstandarddirs.h> #include <kprocio.h> #include <kdebug.h> -#include <qstring.h> +#include <tqstring.h> #include <arpa/inet.h> #include <sys/socket.h> #include <netinet/in.h> @@ -79,7 +79,7 @@ /* ================================== FROM IWCONFIG.C ================================== */ int -Interface_wireless_wirelessextensions::get_info (int skfd, const QString& interface, +Interface_wireless_wirelessextensions::get_info (int skfd, const TQString& interface, struct wireless_info& info) { struct iwreq wrq; @@ -248,7 +248,7 @@ Interface_wireless_wirelessextensions::get_info (int skfd, const QString& interf /* ================================ END IWCONFIG.C ================================ */ -Interface_wireless_wirelessextensions::Interface_wireless_wirelessextensions (QStringList * ignoreInterfaces) +Interface_wireless_wirelessextensions::Interface_wireless_wirelessextensions (TQStringList * ignoreInterfaces) : Interface_wireless(ignoreInterfaces) { } @@ -261,7 +261,7 @@ bool Interface_wireless_wirelessextensions::isSocketOpen() return (socket > 0); } -void Interface_wireless_wirelessextensions::setActiveDevice( QString device ) +void Interface_wireless_wirelessextensions::setActiveDevice( TQString device ) { kdDebug () << "activating wireless device " << device << endl; interface_name = device; @@ -287,30 +287,30 @@ void Interface_wireless_wirelessextensions::setNoActiveDevice( ) has_mode = false; mode = 0; has_key = 0; - key = QString::null; + key = TQString::null; key_size = 0; key_flags = 0; - essid = QString::null; - access_point_address = QString::null; - ip_address = QString::null; + essid = TQString::null; + access_point_address = TQString::null; + ip_address = TQString::null; bitrate = 0; has_range = false; has_txpower = false; txpower_disabled = 0; // propagate the changes - setActiveDevice( QString::null ); + setActiveDevice( TQString::null ); } -QStringList Interface_wireless_wirelessextensions::available_wifi_devices() +TQStringList Interface_wireless_wirelessextensions::available_wifi_devices() { - QFile procnetdev(PROC_NET_DEV); + TQFile procnetdev(PROC_NET_DEV); procnetdev.open (IO_ReadOnly); kdDebug () << "Autodetecting..." << endl; - QStringList liste; - QString device; + TQStringList liste; + TQString device; while (!procnetdev.atEnd()) { procnetdev.readLine (device, 9999); int pos = device.find (':'); @@ -344,11 +344,11 @@ bool Interface_wireless_wirelessextensions::autodetect_device() if (!isSocketOpen()) return false; - QStringList liste = available_wifi_devices(); + TQStringList liste = available_wifi_devices(); - for (QStringList::Iterator it = liste.begin (); it != liste.end (); ++it) + for (TQStringList::Iterator it = liste.begin (); it != liste.end (); ++it) { - QString device = *it; + TQString device = *it; kdDebug () << "[ " << device << " ] " << endl; wireless_info info; int result = get_info (socket, device, info); @@ -499,9 +499,9 @@ bool Interface_wireless_wirelessextensions::poll_device_info () if (sa->sa_family == AF_INET) { sin = (struct sockaddr_in *) sa; - if (ip_address != (QString) inet_ntoa (sin->sin_addr)) + if (ip_address != (TQString) inet_ntoa (sin->sin_addr)) emitStatusChanged = true; - ip_address = (QString) inet_ntoa (sin->sin_addr); + ip_address = (TQString) inet_ntoa (sin->sin_addr); } else { @@ -521,17 +521,17 @@ bool Interface_wireless_wirelessextensions::poll_device_info () return true; } -QTable* Interface_wireless_wirelessextensions::get_available_networks () +TQTable* Interface_wireless_wirelessextensions::get_available_networks () { - networks = new QTable(0,4,0); + networks = new TQTable(0,4,0); networks->horizontalHeader()->setLabel( 0, i18n("Network Name") ); networks->horizontalHeader()->setLabel( 1, i18n("Mode") ); networks->horizontalHeader()->setLabel( 2, i18n("Quality") ); networks->horizontalHeader()->setLabel( 3, i18n("WEP") ); KProcIO *iwlist = new KProcIO; - QString iwlist_bin = KStandardDirs::findExe("iwlist"); + TQString iwlist_bin = KStandardDirs::findExe("iwlist"); if(iwlist_bin.isEmpty()) iwlist_bin = KStandardDirs::findExe("iwlist", "/usr/local/sbin:/usr/sbin:/sbin"); if(iwlist_bin.isEmpty()) @@ -539,7 +539,7 @@ QTable* Interface_wireless_wirelessextensions::get_available_networks () *iwlist << iwlist_bin << interface_name << "scanning"; -// connect ( iwlist, SIGNAL ( readReady ( KProcIO * ) ), this, SLOT ( parseScanData ( KProcIO * ) ) ); +// connect ( iwlist, TQT_SIGNAL ( readReady ( KProcIO * ) ), this, TQT_SLOT ( parseScanData ( KProcIO * ) ) ); if ( !iwlist->start ( KProcess::Block ) ) KMessageBox::sorry ( 0, i18n ( "Unable to perform the scan. Please make sure the executable \"iwlist\" is in your $PATH." ), @@ -558,7 +558,7 @@ QTable* Interface_wireless_wirelessextensions::get_available_networks () void Interface_wireless_wirelessextensions::parseScanData ( KProcIO * iwlist ) { - QString data; + TQString data; int cellcount = 0, iteratecount = 0; bool ignoreRemainingBits = false; while ( iwlist->readln ( data, true ) >= 0 ) @@ -578,16 +578,16 @@ Interface_wireless_wirelessextensions::parseScanData ( KProcIO * iwlist ) } if ( data.contains ( "ESSID:" ) ) { - QString ssid = data.mid ( data.find ( "\"" ) + 1, data.length ( ) - data.find ( "\"" ) - 2 ); + TQString ssid = data.mid ( data.find ( "\"" ) + 1, data.length ( ) - data.find ( "\"" ) - 2 ); if ((ssid=="") || (ssid==" ")) ssid = "(hidden cell)"; networks->setText ( cellcount - 1, 0, ssid ); } if ( data.contains ( "Mode:" ) ) { if ( data.contains ( "Master" ) ) - networks->setText ( cellcount - 1, 1, QString ( i18n ( "Managed" ) ) ); + networks->setText ( cellcount - 1, 1, TQString ( i18n ( "Managed" ) ) ); if ( data.contains ( "Ad-Hoc" ) ) - networks->setText ( cellcount - 1, 1, QString ( i18n ( "Ad-Hoc" ) ) ); + networks->setText ( cellcount - 1, 1, TQString ( i18n ( "Ad-Hoc" ) ) ); // if could be that this cell belongs to an SSID already discovered, or that there are more than one // hidden cells, which doesn't give any new information. So, we first search for duplicates and delete // this row if it's a duplicate. If the same SSID is there once as Managed and once as Ad-Hoc it is no @@ -608,30 +608,30 @@ Interface_wireless_wirelessextensions::parseScanData ( KProcIO * iwlist ) if ( !ignoreRemainingBits && data.contains ( "Encryption key:" ) ) { if ( data.contains ( "off" ) ) - networks->setText ( cellcount - 1, 3, QString ( "off" ) ); + networks->setText ( cellcount - 1, 3, TQString ( "off" ) ); else - networks->setText ( cellcount - 1, 3, QString ( "on" ) ); + networks->setText ( cellcount - 1, 3, TQString ( "on" ) ); } if ( !ignoreRemainingBits && data.contains ( "Quality:" ) ) { - QString quality = data.mid ( data.find ( ":" ) + 1, data.find ( "/" ) - data.find ( ":" ) - 1 ); + TQString quality = data.mid ( data.find ( ":" ) + 1, data.find ( "/" ) - data.find ( ":" ) - 1 ); networks->setText ( cellcount - 1, 2, quality ); } if ( !ignoreRemainingBits && data.contains ( "Quality=" ) ) { - QString quality = data.mid ( data.find ( "=" ) + 1, data.find ( "/" ) - data.find ( "=" ) - 1 ); + TQString quality = data.mid ( data.find ( "=" ) + 1, data.find ( "/" ) - data.find ( "=" ) - 1 ); networks->setText ( cellcount - 1, 2, quality ); } if ( !ignoreRemainingBits && data.contains ( "wpa_ie" ) ) { - networks->setText ( cellcount - 1, 3, QString ( "WPA" ) ); + networks->setText ( cellcount - 1, 3, TQString ( "WPA" ) ); } if ( !ignoreRemainingBits && data.contains ( "rsn_ie" ) ) { - networks->setText ( cellcount - 1, 3, QString ( "WPA2" ) ); + networks->setText ( cellcount - 1, 3, TQString ( "WPA2" ) ); } } diff --git a/wifi/interface_wireless_wirelessextensions.h b/wifi/interface_wireless_wirelessextensions.h index 96d91566..b5e9782d 100644 --- a/wifi/interface_wireless_wirelessextensions.h +++ b/wifi/interface_wireless_wirelessextensions.h @@ -20,8 +20,8 @@ #include "config.h" -#include <qstring.h> -#include <qtable.h> +#include <tqstring.h> +#include <tqtable.h> #ifndef WITHOUT_ARTS #include <arts/iomanager.h> @@ -41,11 +41,11 @@ extern "C" class Interface_wireless_wirelessextensions:public Interface_wireless { Q_OBJECT public: - Interface_wireless_wirelessextensions (QStringList * ignoreInterfaces); - QTable* get_available_networks (); + Interface_wireless_wirelessextensions (TQStringList * ignoreInterfaces); + TQTable* get_available_networks (); public: - void setActiveDevice( QString device ); + void setActiveDevice( TQString device ); public slots: bool poll_device_info (); @@ -53,12 +53,12 @@ public slots: private: bool isSocketOpen(); void setNoActiveDevice( ); - QStringList available_wifi_devices(); + TQStringList available_wifi_devices(); bool autodetect_device(); - QString print_scanning_token (struct iw_event *event); - int get_info (int skfd, const QString& interface, struct wireless_info& info); - QTable* networks; + TQString print_scanning_token (struct iw_event *event); + int get_info (int skfd, const TQString& interface, struct wireless_info& info); + TQTable* networks; private slots: void parseScanData ( KProcIO * iwlist ); }; diff --git a/wifi/kcmwifi/configcrypto.ui.h b/wifi/kcmwifi/configcrypto.ui.h index 6ada4aa4..261e3411 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 QString& key) +void ConfigCrypto::slotUpdateKey1Status(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { @@ -63,7 +63,7 @@ void ConfigCrypto::slotUpdateKey1Status(const QString& key) } } -void ConfigCrypto::slotUpdateKey2Status(const QString& key) +void ConfigCrypto::slotUpdateKey2Status(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { @@ -94,7 +94,7 @@ void ConfigCrypto::slotUpdateKey2Status(const QString& key) } } -void ConfigCrypto::slotUpdateKey3Status(const QString& key) +void ConfigCrypto::slotUpdateKey3Status(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { @@ -125,7 +125,7 @@ void ConfigCrypto::slotUpdateKey3Status(const QString& key) } } -void ConfigCrypto::slotUpdateKey4Status(const QString& key) +void ConfigCrypto::slotUpdateKey4Status(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { diff --git a/wifi/kcmwifi/ifconfigpage.cpp b/wifi/kcmwifi/ifconfigpage.cpp index 887c817d..8b96b63b 100644 --- a/wifi/kcmwifi/ifconfigpage.cpp +++ b/wifi/kcmwifi/ifconfigpage.cpp @@ -23,11 +23,11 @@ #include <klocale.h> #include <kurlrequester.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qradiobutton.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> #include "configcrypto.h" #include "configpower.h" @@ -37,41 +37,41 @@ #include <unistd.h> #include <sys/types.h> -IfConfigPage::IfConfigPage( int configNum, QWidget *parent, const char *name ) +IfConfigPage::IfConfigPage( int configNum, TQWidget *parent, const char *name ) : IfConfigPageBase( parent, name ), m_configNum( configNum ) { - connect( cb_pmEnabled, SIGNAL( toggled( bool ) ), SIGNAL( changed() ) ); - connect( cb_useCrypto, SIGNAL( toggled( bool ) ), SIGNAL( changed() ) ); - connect( le_networkName, SIGNAL( textChanged( const QString & ) ), - SIGNAL( changed() ) ); - connect( cmb_wifiMode, SIGNAL( activated( int ) ), SIGNAL( changed() ) ); - connect( cmb_speed, SIGNAL( activated( int ) ), SIGNAL( changed() ) ); - connect( cb_runScript, SIGNAL( toggled( bool ) ), SIGNAL( changed() ) ); - connect( url_connectScript, SIGNAL( textChanged( const QString & ) ), - SIGNAL( changed() ) ); - connect( cb_Autodetect, SIGNAL( toggled( bool ) ), SIGNAL( changed() ) ); - connect( le_interface, SIGNAL( textChanged( const QString & ) ), - SIGNAL( changed() ) ); - - connect( pb_setupPower, SIGNAL( clicked() ), SLOT( slotSetupPower() ) ); - connect( pb_setupCrypto, SIGNAL( clicked() ), SLOT( slotSetupCrypto() ) ); - - connect( cb_useCrypto, SIGNAL( toggled( bool ) ), - pb_setupCrypto, SLOT( setEnabled( bool ) ) ); - connect( cb_pmEnabled, SIGNAL( toggled( bool ) ), - pb_setupPower, SLOT( setEnabled( bool ) ) ); - connect( cb_runScript, SIGNAL( toggled( bool ) ), - lb_connectScript, SLOT( setEnabled( bool ) ) ); - connect( cb_runScript, SIGNAL( toggled( bool ) ), - lb_connectScript, SLOT( setEnabled( bool ) ) ); - connect( cb_runScript, SIGNAL( toggled( bool ) ), - lb_connectScript, SLOT( setEnabled( bool ) ) ); - connect( cb_Autodetect, SIGNAL( toggled( bool ) ), - le_interface, SLOT( setDisabled( bool ) ) ); - - connect( cb_Autodetect, SIGNAL( toggled( bool ) ), - this, SLOT ( slotResetInterface( bool ) ) ); + connect( cb_pmEnabled, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) ); + connect( cb_useCrypto, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) ); + connect( le_networkName, TQT_SIGNAL( textChanged( const TQString & ) ), + TQT_SIGNAL( changed() ) ); + connect( cmb_wifiMode, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); + connect( cmb_speed, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); + connect( cb_runScript, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) ); + connect( url_connectScript, TQT_SIGNAL( textChanged( const TQString & ) ), + TQT_SIGNAL( changed() ) ); + connect( cb_Autodetect, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) ); + connect( le_interface, TQT_SIGNAL( textChanged( const TQString & ) ), + TQT_SIGNAL( changed() ) ); + + connect( pb_setupPower, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSetupPower() ) ); + connect( pb_setupCrypto, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSetupCrypto() ) ); + + connect( cb_useCrypto, TQT_SIGNAL( toggled( bool ) ), + pb_setupCrypto, TQT_SLOT( setEnabled( bool ) ) ); + connect( cb_pmEnabled, TQT_SIGNAL( toggled( bool ) ), + pb_setupPower, TQT_SLOT( setEnabled( bool ) ) ); + connect( cb_runScript, TQT_SIGNAL( toggled( bool ) ), + lb_connectScript, TQT_SLOT( setEnabled( bool ) ) ); + connect( cb_runScript, TQT_SIGNAL( toggled( bool ) ), + lb_connectScript, TQT_SLOT( setEnabled( bool ) ) ); + connect( cb_runScript, TQT_SIGNAL( toggled( bool ) ), + lb_connectScript, TQT_SLOT( setEnabled( bool ) ) ); + connect( cb_Autodetect, TQT_SIGNAL( toggled( bool ) ), + le_interface, TQT_SLOT( setDisabled( bool ) ) ); + + connect( cb_Autodetect, TQT_SIGNAL( toggled( bool ) ), + this, TQT_SLOT ( slotResetInterface( bool ) ) ); } void IfConfigPage::slotResetInterface( bool checked ) @@ -120,7 +120,7 @@ void IfConfigPage::save() IfConfig &ifconfig = config->m_ifConfig[ m_configNum ]; ifconfig.m_networkName = le_networkName->text(); - ifconfig.m_interface = cb_Autodetect->isChecked()? QString::null : + ifconfig.m_interface = cb_Autodetect->isChecked()? TQString::null : le_interface->text(); ifconfig.m_wifiMode = ( IfConfig::WifiMode ) cmb_wifiMode->currentItem(); ifconfig.m_speed = ( IfConfig::Speed ) cmb_speed->currentItem(); diff --git a/wifi/kcmwifi/ifconfigpage.h b/wifi/kcmwifi/ifconfigpage.h index d7db8a93..bb79f215 100644 --- a/wifi/kcmwifi/ifconfigpage.h +++ b/wifi/kcmwifi/ifconfigpage.h @@ -28,7 +28,7 @@ class IfConfigPage : public IfConfigPageBase Q_OBJECT public: - IfConfigPage( int configNum, QWidget *parent, const char *name ); + IfConfigPage( int configNum, TQWidget *parent, const char *name ); ~IfConfigPage() {} void load(); diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp index 693edc92..743f3d2e 100644 --- a/wifi/kcmwifi/kcmwifi.cpp +++ b/wifi/kcmwifi/kcmwifi.cpp @@ -18,10 +18,10 @@ Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qtabwidget.h> -#include <qcombobox.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqtabwidget.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> #include <kaboutdata.h> #include <kdebug.h> @@ -39,13 +39,13 @@ #include "wificonfig.h" #include "vendorconfig.h" -typedef KGenericFactory < KCMWifi, QWidget > KWiFiFactory; +typedef KGenericFactory < KCMWifi, TQWidget > KWiFiFactory; K_EXPORT_COMPONENT_FACTORY (kcm_wifi, KWiFiFactory("kcmwifi") ) -KCMWifi::KCMWifi(QWidget * parent, const char *name, const QStringList &) +KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &) : KCModule (parent, name) { - tabs = new QTabWidget (this, "tabs"); + tabs = new TQTabWidget (this, "tabs"); m_mainConfig = new MainConfig(this, "m_mainConfig"); @@ -55,18 +55,18 @@ KCMWifi::KCMWifi(QWidget * parent, const char *name, const QStringList &) { IfConfigPage *ifConfigPage = new IfConfigPage( i, tabs, "m_configPage" ); tabs->addTab(ifConfigPage, i18n ("Config &%1").arg( i+1 )); - connect(ifConfigPage, SIGNAL(changed()), SLOT( slotChanged() ) ); + connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) ); m_ifConfigPage[ i ] = ifConfigPage; } - QVBoxLayout *top = new QVBoxLayout (this, 0, KDialog::spacingHint()); + TQVBoxLayout *top = new TQVBoxLayout (this, 0, KDialog::spacingHint()); top->addWidget( tabs ); top->addWidget( m_mainConfig ); top->addStretch(); - connect(m_mainConfig, SIGNAL(changed()), SLOT( slotChanged() ) ); - connect(m_mainConfig, SIGNAL(activateClicked()), SLOT(slotActivate())); + connect(m_mainConfig, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) ); + connect(m_mainConfig, TQT_SIGNAL(activateClicked()), TQT_SLOT(slotActivate())); if ( geteuid() != 0 ) { @@ -147,7 +147,7 @@ IfConfigPage* KCMWifi::addConfigTab( int count, bool vendor ) { IfConfigPage *ifConfigPage = new IfConfigPage( vendorBase + m_activeVendorCount, tabs, "m_configPage" ); tabs->addTab(ifConfigPage, i18n ("Vendor %1").arg( m_activeVendorCount+1 ) ); - connect(ifConfigPage, SIGNAL(changed()), SLOT( slotChanged() ) ); + connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) ); m_ifConfigPage[ vendorBase+m_activeVendorCount ] = ifConfigPage; m_mainConfig->registerConfig( vendorBase+m_activeVendorCount ); m_activeVendorCount++; @@ -170,7 +170,7 @@ IfConfigPage* KCMWifi::addConfigTab( int count, bool vendor ) { IfConfigPage *ifConfigPage = new IfConfigPage( i, tabs, "m_configPage" ); tabs->insertTab(ifConfigPage, i18n ("Config &%1").arg( i+1 ), i ); - connect(ifConfigPage, SIGNAL(changed()), SLOT( slotChanged() ) ); + connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) ); m_ifConfigPage[ i ] = ifConfigPage; m_mainConfig->registerConfig( i+1 ); retval = ifConfigPage; @@ -203,7 +203,7 @@ void KCMWifi::activate() { KProcess proc; - QStringList failedParts; + TQStringList failedParts; WifiConfig *config = WifiConfig::instance(); int index; @@ -219,7 +219,7 @@ void KCMWifi::activate() IfConfig ifconfig = config->m_ifConfig[ index ]; - QString tempInterface; + TQString tempInterface; if ( ifconfig.m_interface.isEmpty() ) { tempInterface = config->autoDetectInterface(); @@ -295,8 +295,8 @@ void KCMWifi::activate() if ( ifconfig.m_keys[ i ].isValid( ifconfig.m_keys[ i ].key() ) > INVALID ) { proc << "key" - << QString( "[%1]").arg( i+1 ) - << QString( "%1").arg( 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" - << QString( "[%1]" ).arg( ifconfig.activeKeyId() ); + << TQString( "[%1]" ).arg( ifconfig.activeKeyId() ); proc << "key" << "on"; } @@ -334,10 +334,10 @@ void KCMWifi::activate() { proc << "power" << "period" - << QString( "%1" ).arg( ifconfig.m_wakeupPeriod ); + << TQString( "%1" ).arg( ifconfig.m_wakeupPeriod ); proc << "power" << "timeout" - << QString( "%1" ).arg( ifconfig.m_sleepTimeout ); + << TQString( "%1" ).arg( ifconfig.m_sleepTimeout ); proc << ifconfig.powermodeAsString(); } @@ -361,7 +361,7 @@ void KCMWifi::activate() if ( ifconfig.m_runScript ) { proc.clearArguments(); - proc << QStringList::split( " ", ifconfig.m_connectScript ); + proc << TQStringList::split( " ", ifconfig.m_connectScript ); proc.start(KProcess::DontCare); } diff --git a/wifi/kcmwifi/kcmwifi.h b/wifi/kcmwifi/kcmwifi.h index 87822ac0..5ba2af33 100644 --- a/wifi/kcmwifi/kcmwifi.h +++ b/wifi/kcmwifi/kcmwifi.h @@ -23,7 +23,7 @@ #include <kcmodule.h> -#include <qstring.h> +#include <tqstring.h> class IfConfigPage; class MainConfig; @@ -34,7 +34,7 @@ class KCMWifi : public KCModule { Q_OBJECT public: - KCMWifi (QWidget * parent, const char *name, const QStringList &); + KCMWifi (TQWidget * parent, const char *name, const TQStringList &); ~KCMWifi (); void load(); @@ -55,7 +55,7 @@ protected slots: private: MainConfig *m_mainConfig; IfConfigPage *m_ifConfigPage[ 15 ]; // that makes 5 vendor configs - QTabWidget* tabs; + TQTabWidget* tabs; int m_activeVendorCount; }; diff --git a/wifi/kcmwifi/mainconfig.cpp b/wifi/kcmwifi/mainconfig.cpp index 9cdcfcec..c740df69 100644 --- a/wifi/kcmwifi/mainconfig.cpp +++ b/wifi/kcmwifi/mainconfig.cpp @@ -30,10 +30,10 @@ #include <kpushbutton.h> #include <knuminput.h> -#include <qcheckbox.h> -#include <qfile.h> +#include <tqcheckbox.h> +#include <tqfile.h> -MainConfig::MainConfig( QWidget *parent, const char *name ) +MainConfig::MainConfig( TQWidget *parent, const char *name ) : MainConfigBase( parent, name ) { WifiConfig *config = WifiConfig::instance(); @@ -43,12 +43,12 @@ MainConfig::MainConfig( QWidget *parent, const char *name ) } - connect( cb_usePreset, SIGNAL( toggled( bool ) ), SIGNAL( changed() ) ); - connect( cmb_presetConfig, SIGNAL( activated( int ) ), SIGNAL( changed() ) ); - connect( sb_numConfigs, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) ); + connect( cb_usePreset, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) ); + connect( cmb_presetConfig, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); + connect( sb_numConfigs, TQT_SIGNAL( valueChanged( int ) ), TQT_SIGNAL( changed() ) ); - connect( pb_activate, SIGNAL( clicked() ), SIGNAL( activateClicked() ) ); - connect( sb_numConfigs, SIGNAL( valueChanged( int ) ), SLOT( slotChangeNumConfigs( int ) ) ); + connect( pb_activate, TQT_SIGNAL( clicked() ), TQT_SIGNAL( activateClicked() ) ); + connect( sb_numConfigs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotChangeNumConfigs( int ) ) ); } diff --git a/wifi/kcmwifi/mainconfig.h b/wifi/kcmwifi/mainconfig.h index 55458fa4..edc09560 100644 --- a/wifi/kcmwifi/mainconfig.h +++ b/wifi/kcmwifi/mainconfig.h @@ -30,7 +30,7 @@ class MainConfig : public MainConfigBase Q_OBJECT public: - MainConfig( QWidget *parent, const char *name=0 ); + MainConfig( TQWidget *parent, const char *name=0 ); ~MainConfig() {} void load(); diff --git a/wifi/kcmwifi/vendorconfig.cpp b/wifi/kcmwifi/vendorconfig.cpp index 36460c4a..e415c276 100644 --- a/wifi/kcmwifi/vendorconfig.cpp +++ b/wifi/kcmwifi/vendorconfig.cpp @@ -17,12 +17,12 @@ Boston, MA 02110-1301, USA. */ -#include <qdir.h> -#include <qstringlist.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qcombobox.h> -#include <qcheckbox.h> +#include <tqdir.h> +#include <tqstringlist.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> #include <kdebug.h> #include <klineedit.h> @@ -54,19 +54,19 @@ VendorConfig::initSuSE_92plus ( ) /* configurations are located in /etc/sysconfig/network/ifcfg-wlan* there can be more than one if there are multiple wireless interfaces */ - QDir filelist ( "/etc/sysconfig/network", "ifcfg-wlan*" ); - QStringList files = filelist.entryList ( ); + TQDir filelist ( "/etc/sysconfig/network", "ifcfg-wlan*" ); + TQStringList files = filelist.entryList ( ); if ( files.count() == 0 ) { return; } - for ( QStringList::Iterator it = files.begin ( ); it != files.end ( ); ++it ) + for ( TQStringList::Iterator it = files.begin ( ); it != files.end ( ); ++it ) { if ( ( ( *it ).endsWith ( "~" ) ) == false ) { // ignore backup files - QFile configfile ( QString ( "/etc/sysconfig/network/%1" ).arg ( *it ) ); + TQFile configfile ( TQString ( "/etc/sysconfig/network/%1" ).arg ( *it ) ); configfile.open ( IO_ReadOnly ); kdDebug ( ) << "Opened SuSE configuration file " << configfile.name ( ) << "\n"; @@ -82,12 +82,12 @@ VendorConfig::initSuSE_92plus ( ) WifiConfig *config = WifiConfig::instance ( ); IfConfig & ifconfig = config->m_ifConfig[KCMWifi::vendorBase + m_totalConfigs]; - QString buffer; + TQString buffer; while ( configfile.readLine ( buffer, 255 ) != -1 ) { // lines look like WIRELESS_ESSID='bla', so split it into WIRELESS_ESSID and bla - QString var = buffer.section ( '=', 0, 0 ); - QString value = buffer.section ( '=', 1, 1 ); + TQString var = buffer.section ( '=', 0, 0 ); + TQString value = buffer.section ( '=', 1, 1 ); value = value.mid ( 1, value.length ( ) - 3 ); kdDebug ( ) << "Variable " << var << " contains " << value << ".\n"; // evaluate the meaningful lines @@ -157,7 +157,7 @@ VendorConfig::initSuSE_92plus ( ) void VendorConfig::initDebian ( ) { - QFile configfile ( QString ( "/etc/network/interfaces" ) ); + TQFile configfile ( TQString ( "/etc/network/interfaces" ) ); if ( !configfile.open ( IO_ReadOnly ) ) { return; @@ -176,12 +176,12 @@ is incremented _after_ successful setup of each given config. */ WifiConfig *config = WifiConfig::instance ( ); IfConfig & ifconfig = config->m_ifConfig[KCMWifi::vendorBase + m_totalConfigs]; - QString buffer; + TQString buffer; while ( configfile.readLine ( buffer, 255 ) != -1 ) { // lines look like wireless-defaultkey bla, so split it into wireless-defaultkey and bla - QString var = buffer.section ( ' ', 0, 0 ); - QString value = buffer.section ( ' ', 1, 1 ); + TQString var = buffer.section ( ' ', 0, 0 ); + TQString value = buffer.section ( ' ', 1, 1 ); kdDebug ( ) << "Variable " << var << " contains " << value << ".\n"; // evaluate the meaningful lines if ( var.startsWith ( "wireless", false ) ) diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp index 5afd041f..53f1c7e0 100644 --- a/wifi/kcmwifi/wificonfig.cpp +++ b/wifi/kcmwifi/wificonfig.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include <qfile.h> +#include <tqfile.h> #include <ksimpleconfig.h> #include <kglobal.h> @@ -28,23 +28,23 @@ #include "wificonfig.h" -static QStringList speedList; -static QStringList wifiModeList; -static QStringList cryptoModeList; -static QStringList powerModeList; +static TQStringList speedList; +static TQStringList wifiModeList; +static TQStringList cryptoModeList; +static TQStringList powerModeList; Key::Key() { } -Key::Key( const QString &key ) +Key::Key( const TQString &key ) { setKey( key ); } -QString Key::rawKey() const +TQString Key::rawKey() const { - QString s = m_key; + TQString s = m_key; if ( isValid( m_key ) >= STRING_64 ) s = "s:" + s; @@ -52,12 +52,12 @@ QString Key::rawKey() const return s; } -void Key::setKey( const QString &key ) +void Key::setKey( const TQString &key ) { m_key = key; } -KeyStates Key::isValid ( QString keyCandidate ) +KeyStates Key::isValid ( TQString keyCandidate ) { if (keyCandidate.isEmpty()) { kdDebug() << "Ignoring key: empty.\n"; @@ -117,9 +117,9 @@ IfConfig::IfConfig() void IfConfig::load( KConfig *config, int i ) { - QString entry; + TQString entry; - QString group = QString( "Configuration %1" ).arg( 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 ) { - QString group = QString( "Configuration %1" ).arg( i+1 ); + TQString group = TQString( "Configuration %1" ).arg( i+1 ); config->setGroup( group ); config->writeEntry( "NetworkName", m_networkName ); @@ -227,11 +227,11 @@ void WifiConfig::save() m_config->sync(); } -QString WifiConfig::autoDetectInterface() +TQString WifiConfig::autoDetectInterface() { m_detectedInterface.truncate( 0 ); - QFile procFile ( "/proc/net/dev" ); + TQFile procFile ( "/proc/net/dev" ); if ( !procFile.open( IO_ReadOnly ) ) { @@ -240,8 +240,8 @@ QString WifiConfig::autoDetectInterface() return m_detectedInterface; } - QStringList list; - QString line; + TQStringList list; + TQString line; while ( !procFile.atEnd() ) { @@ -262,14 +262,14 @@ QString WifiConfig::autoDetectInterface() return m_detectedInterface; } - for ( QStringList::Iterator it = list.begin (); it != list.end (); ++it ) + for ( TQStringList::Iterator it = list.begin (); it != list.end (); ++it ) { if ( ((*it).contains("wifi"))==0 ) { // if the name is wifiX, ignore KProcIO test; test << "iwconfig"; test << *it; - connect( &test, SIGNAL( readReady( KProcIO * ) ), - this, SLOT( slotTestInterface( KProcIO * ) ) ); + connect( &test, TQT_SIGNAL( readReady( KProcIO * ) ), + this, TQT_SLOT( slotTestInterface( KProcIO * ) ) ); test.start ( KProcess::Block ); } } @@ -286,7 +286,7 @@ QString WifiConfig::autoDetectInterface() void WifiConfig::slotTestInterface( KProcIO *proc ) { - QString output; + TQString output; proc->readln( output ); if ( output.find ( "no wireless extensions" ) == -1 ) { @@ -295,22 +295,22 @@ void WifiConfig::slotTestInterface( KProcIO *proc ) } } -QString IfConfig::speedAsString() +TQString IfConfig::speedAsString() { return speedList[ m_speed ]; } -QString IfConfig::wifimodeAsString() +TQString IfConfig::wifimodeAsString() { return wifiModeList[ m_wifiMode ]; } -QString IfConfig::cryptomodeAsString() +TQString IfConfig::cryptomodeAsString() { return cryptoModeList[ m_cryptoMode ]; } -QString IfConfig::powermodeAsString() +TQString IfConfig::powermodeAsString() { return powerModeList[ m_pmMode ]; } @@ -325,42 +325,42 @@ Key IfConfig::activeKey() return m_keys[ m_activeKey-1 ]; } -IfConfig::Speed IfConfig::convertToSpeedFromString( const QString &s ) +IfConfig::Speed IfConfig::convertToSpeedFromString( const TQString &s ) { return ( IfConfig::Speed )speedList.findIndex( s ); } -void IfConfig::speedFromString( const QString &s ) +void IfConfig::speedFromString( const TQString &s ) { m_speed = convertToSpeedFromString( s ); } -IfConfig::WifiMode IfConfig::convertToWifiModeFromString( const QString &s ) +IfConfig::WifiMode IfConfig::convertToWifiModeFromString( const TQString &s ) { return ( IfConfig::WifiMode )wifiModeList.findIndex( s ); } -void IfConfig::wifimodeFromString( const QString &s ) +void IfConfig::wifimodeFromString( const TQString &s ) { m_wifiMode = convertToWifiModeFromString( s ); } -IfConfig::CryptoMode IfConfig::convertToCryptoModeFromString( const QString &s ) +IfConfig::CryptoMode IfConfig::convertToCryptoModeFromString( const TQString &s ) { return ( IfConfig::CryptoMode )cryptoModeList.findIndex( s ); } -void IfConfig::cryptomodeFromString( const QString &s ) +void IfConfig::cryptomodeFromString( const TQString &s ) { m_cryptoMode = convertToCryptoModeFromString( s ); } -IfConfig::PowerMode IfConfig::convertToPowerModeFromString( const QString &s ) +IfConfig::PowerMode IfConfig::convertToPowerModeFromString( const TQString &s ) { return ( IfConfig::PowerMode )powerModeList.findIndex( s ); } -void IfConfig::powermodeFromString( const QString &s ) +void IfConfig::powermodeFromString( const TQString &s ) { m_pmMode = convertToPowerModeFromString( s ); } diff --git a/wifi/kcmwifi/wificonfig.h b/wifi/kcmwifi/wificonfig.h index b9186298..b78e32f6 100644 --- a/wifi/kcmwifi/wificonfig.h +++ b/wifi/kcmwifi/wificonfig.h @@ -20,8 +20,8 @@ #ifndef WIFICONFIG_H #define WIFICONFIG_H -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> #include "kcmwifi.h" @@ -33,20 +33,20 @@ enum KeyStates { EMPTY=0, INVALID=1, HEX_64=2, HEX_128=3, HEX_256=4, STRING_64=5 class Key { public: - Key( const QString &key ); + Key( const TQString &key ); Key(); - QString key() const { return m_key; } - static KeyStates isValid( QString keyCandidate ); - QString rawKey() const; + TQString key() const { return m_key; } + static KeyStates isValid( TQString keyCandidate ); + TQString rawKey() const; - void setKey( const QString &key ); + void setKey( const TQString &key ); protected: - QString m_key; + TQString m_key; }; -typedef QValueList<Key> KeyList; +typedef TQValueList<Key> KeyList; class IfConfig { @@ -61,29 +61,29 @@ class IfConfig void load( KConfig *config, int i ); void save( KConfig *config, int i ); - QString speedAsString(); - QString wifimodeAsString(); - QString cryptomodeAsString(); - QString powermodeAsString(); + TQString speedAsString(); + TQString wifimodeAsString(); + TQString cryptomodeAsString(); + TQString powermodeAsString(); int activeKeyId(); Key activeKey(); - static Speed convertToSpeedFromString( const QString &s ); - static WifiMode convertToWifiModeFromString( const QString &s ); - static PowerMode convertToPowerModeFromString( const QString &s ); - static CryptoMode convertToCryptoModeFromString( const QString &s ); + static Speed convertToSpeedFromString( const TQString &s ); + static WifiMode convertToWifiModeFromString( const TQString &s ); + static PowerMode convertToPowerModeFromString( const TQString &s ); + static CryptoMode convertToCryptoModeFromString( const TQString &s ); - void speedFromString( const QString &s ); - void wifimodeFromString( const QString &s ); - void powermodeFromString( const QString &s ); - void cryptomodeFromString( const QString &s ); + void speedFromString( const TQString &s ); + void wifimodeFromString( const TQString &s ); + void powermodeFromString( const TQString &s ); + void cryptomodeFromString( const TQString &s ); - QString m_networkName; - QString m_interface; + TQString m_networkName; + TQString m_interface; WifiMode m_wifiMode; Speed m_speed; bool m_runScript; - QString m_connectScript; + TQString m_connectScript; bool m_useCrypto; CryptoMode m_cryptoMode; @@ -101,7 +101,7 @@ class WifiConfig : QObject Q_OBJECT public: static WifiConfig *instance(); - QString autoDetectInterface(); + TQString autoDetectInterface(); ~WifiConfig(); void load(); @@ -120,7 +120,7 @@ class WifiConfig : QObject KSimpleConfig *m_config; static WifiConfig *m_instance; - QString m_detectedInterface; + TQString m_detectedInterface; }; #endif // WIFICONFIG_H diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp index 5e64a683..4267b7ed 100644 --- a/wifi/kwifimanager.cpp +++ b/wifi/kwifimanager.cpp @@ -20,14 +20,14 @@ #include <fstream> // include files for QT -#include <qdatetime.h> -#include <qdir.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qimage.h> -#include <qbitmap.h> -#include <qtimer.h> -#include <qpushbutton.h> +#include <tqdatetime.h> +#include <tqdir.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqimage.h> +#include <tqbitmap.h> +#include <tqtimer.h> +#include <tqpushbutton.h> // include files for KDE #include <kapplication.h> @@ -62,10 +62,10 @@ #define ID_STATUS_MSG 1 -QStringList APs; +TQStringList APs; bool useAlternateStrengthCalc; -KWiFiManagerApp::KWiFiManagerApp (QWidget *, const char *name): +KWiFiManagerApp::KWiFiManagerApp (TQWidget *, const char *name): DCOPObject("dcop_interface"), KMainWindow (0, name), device(0), m_shuttingDown(false), m_iconSize( 22 ) { statistik = 0; @@ -73,11 +73,11 @@ DCOPObject("dcop_interface"), KMainWindow (0, name), device(0), m_shuttingDown(f useAlternateStrengthCalc = false; init_whois_db (); - QStringList *ignoreInterfaces; + TQStringList *ignoreInterfaces; if (kapp->isRestored()) - ignoreInterfaces = new QStringList(); + ignoreInterfaces = new TQStringList(); else - ignoreInterfaces = new QStringList( usedInterfacesList() ); + ignoreInterfaces = new TQStringList( usedInterfacesList() ); // substitute the following line with a different interface if required device = new Interface_wireless_wirelessextensions (ignoreInterfaces); @@ -102,14 +102,14 @@ DCOPObject("dcop_interface"), KMainWindow (0, name), device(0), m_shuttingDown(f fileDisableRadio->setEnabled (false); #endif - counter = new QTimer (this); - connect (counter, SIGNAL (timeout ()), device, SLOT (poll_device_info())); + counter = new TQTimer (this); + connect (counter, TQT_SIGNAL (timeout ()), device, TQT_SLOT (poll_device_info())); counter->start (1000); - tricorder_trigger = new QTimer (); - connect (tricorder_trigger, SIGNAL (timeout ()), this, - SLOT (tricorder_beep ())); - connect (trayicon, SIGNAL (quitSelected ()), this, SLOT (slotFileQuit ())); + tricorder_trigger = new TQTimer (); + connect (tricorder_trigger, TQT_SIGNAL (timeout ()), this, + TQT_SLOT (tricorder_beep ())); + connect (trayicon, TQT_SIGNAL (quitSelected ()), this, TQT_SLOT (slotFileQuit ())); slotToggleTric(); //set to value saved by KConfig setAutoSaveSettings(); @@ -143,26 +143,26 @@ void KWiFiManagerApp::init_whois_db () { KStandardDirs finder; - QString kdedir = + TQString kdedir = finder.findResourceDir ("data", "kwifimanager/locations/NOWHERE.loc"); kdedir += "kwifimanager/locations/"; - QDir *locations = new QDir (kdedir); + TQDir *locations = new TQDir (kdedir); if (!locations->exists ()) kdDebug () << "A grave error occurred while searching for files with AccessPoint information." << endl; - QStringList *entries = new QStringList (locations->entryList ()); - QString content; - QString content2; - for (QStringList::Iterator it = entries->begin (); it != entries->end (); + TQStringList *entries = new TQStringList (locations->entryList ()); + TQString content; + TQString content2; + for (TQStringList::Iterator it = entries->begin (); it != entries->end (); it++) { if ((*it) != "." && (*it) != "..") { - QFile datei (kdedir + (*it)); + TQFile datei (kdedir + (*it)); datei.open (IO_ReadOnly); while (datei.readLine (content, 255) != -1) { - QString temp (content); + TQString temp (content); content.truncate (content.find (' ')); content = content.upper (); content2 = temp.right (temp.length () - temp.find (' ') - 1); @@ -177,14 +177,14 @@ KWiFiManagerApp::init_whois_db () } void -KWiFiManagerApp::slotLogESSID (QString essid) +KWiFiManagerApp::slotLogESSID (TQString essid) { - QFile log_file( locateLocal( "data", "kwifimanager/kwifimanager.log", true ) ); + TQFile log_file( locateLocal( "data", "kwifimanager/kwifimanager.log", true ) ); kdDebug() << "Log file is " << log_file.name() << endl; if (!log_file.open (IO_WriteOnly | IO_Append)) kdDebug () << "Logging failed!" << endl; - QTextStream stream (&log_file); - stream << QDateTime::currentDateTime().toString ().latin1 (); + TQTextStream stream (&log_file); + stream << TQDateTime::currentDateTime().toString ().latin1 (); stream << " Entering network: " << essid.latin1() << endl; log_file.close (); } @@ -198,13 +198,13 @@ KWiFiManagerApp::slotTXPowerChanged () void KWiFiManagerApp::slotChangeTrayIcon () { - QPixmap* ICON; + TQPixmap* ICON; int sig, noi, str; double freq = 0.; bool validdata = device->get_current_quality (sig, noi, str); if ( settingsUseAlternateCalc->isChecked() ) str = sig - noi; int mode; - QLabel sstrength2( i18n("N/A"), 0, 0 ); + TQLabel sstrength2( i18n("N/A"), 0, 0 ); if ( ( device->get_txpower_disabled() ) || ( !device->get_device_freq ( freq ) ) ) { @@ -220,49 +220,49 @@ KWiFiManagerApp::slotChangeTrayIcon () } else if (validdata && (str > 45)) { - sstrength2.setText( QString::number(str) ); + sstrength2.setText( TQString::number(str) ); ICON = strength->EXCELLENT; if (led->state == false) led->On (); } else if (validdata && (str > 35)) { - sstrength2.setText( QString::number(str) ); + sstrength2.setText( TQString::number(str) ); ICON = strength->EXCELLENT; if (led->state == false) led->On (); } else if (validdata && (str > 25)) { - sstrength2.setText( QString::number(str) ); + sstrength2.setText( TQString::number(str) ); ICON = strength->EXCELLENT; if (led->state == false) led->On (); } else if (validdata && (str > 15)) { - sstrength2.setText( QString::number(str) ); + sstrength2.setText( TQString::number(str) ); ICON = strength->GOOD; if (led->state == false) led->On (); } else if (validdata && (str > 5)) { - sstrength2.setText( QString::number(str) ); + sstrength2.setText( TQString::number(str) ); ICON = strength->MARGINAL; if (led->state == false) led->On (); } else if (validdata && (str > 0)) { - sstrength2.setText( QString::number(str) ); + sstrength2.setText( TQString::number(str) ); ICON = strength->OOR_MINIMUM; if (led->state == true) led->Off (); } else if (((str == 0) && (mode == 2)) || (!validdata)) { - sstrength2.setText( QString::fromLatin1("0") ); + sstrength2.setText( TQString::fromLatin1("0") ); ICON = strength->OOR_DOWN; if (led->state == true) led->Off (); @@ -274,28 +274,28 @@ KWiFiManagerApp::slotChangeTrayIcon () led->Off (); } - QPixmap temp (m_iconSize+8, m_iconSize+8); - QPainter bla (&temp); + TQPixmap temp (m_iconSize+8, m_iconSize+8); + TQPainter bla (&temp); bla.fillRect (0, 0, m_iconSize+8, m_iconSize+8, backgroundBrush ()); - bla.drawPixmap ( QRect(1, 4, m_iconSize+2,m_iconSize+2), *ICON ); + bla.drawPixmap ( TQRect(1, 4, m_iconSize+2,m_iconSize+2), *ICON ); if (showStrength) { - static QFont labelfont ( "Helvetica", 10 ); + static TQFont labelfont ( "Helvetica", 10 ); - labelfont.setStyleHint( QFont::SansSerif ); - labelfont.setStretch( QFont::Condensed ); + labelfont.setStyleHint( TQFont::SansSerif ); + labelfont.setStretch( TQFont::Condensed ); labelfont.setBold( true ); sstrength2.setFont( labelfont ); sstrength2.setFixedSize( sstrength2.sizeHint() ); } - QPixmap labeltemp = QPixmap::grabWidget( &sstrength2 ); + TQPixmap labeltemp = TQPixmap::grabWidget( &sstrength2 ); labeltemp.setMask( labeltemp.createHeuristicMask() ); bla.drawPixmap (0, 0, labeltemp ); temp.setMask (temp.createHeuristicMask() ); trayicon->setPixmap ( temp ); this->setIcon( temp ); - QToolTip::add( trayicon, "SSID: "+device->get_essid() ); + TQToolTip::add( trayicon, "SSID: "+device->get_essid() ); } void @@ -305,43 +305,43 @@ KWiFiManagerApp::initActions () if (config->hasGroup("General")) config->setGroup("General"); fileDisableRadio = new KToggleAction (i18n ("&Disable Radio"), 0, this, - SLOT (slotDisableRadio ()), actionCollection (), "disable_radio"); + TQT_SLOT (slotDisableRadio ()), actionCollection (), "disable_radio"); fileDisableRadio->setChecked( false ); settingsUseAlternateCalc = new KToggleAction (i18n ("&Use Alternate Strength Calculation"), 0, this, - SLOT (slotToggleStrengthCalc ()), actionCollection (), "use_alt_calculation"); + TQT_SLOT (slotToggleStrengthCalc ()), actionCollection (), "use_alt_calculation"); settingsUseAlternateCalc->setChecked( config->readBoolEntry("useAlternateStrengthCalculation") ); slotToggleStrengthCalc(); //set to value saved by KConfig settingsShowStatsNoise = new KToggleAction (i18n ("Show &Noise Graph in Statistics Window"), 0, this, - SLOT (slotShowStatsNoise ()), actionCollection (), "show_stats_noise"); + TQT_SLOT (slotShowStatsNoise ()), actionCollection (), "show_stats_noise"); settingsShowStatsNoise->setChecked( config->readBoolEntry("showStatsNoise") ); slotShowStatsNoise(); //set to value saved by KConfig settingsShowStrengthNumber = new KToggleAction (i18n ("&Show Strength Number in System Tray"), 0, this, - SLOT (slotToggleShowStrengthNumber ()), actionCollection (), "show_strength_number_in_tray"); + TQT_SLOT (slotToggleShowStrengthNumber ()), actionCollection (), "show_strength_number_in_tray"); settingsShowStrengthNumber->setChecked( config->readBoolEntry("showStrengthNumberInTray") ); slotToggleShowStrengthNumber (); //set to value saved by KConfig - KStdAction::quit (this, SLOT (slotFileQuit ()), actionCollection ()); + KStdAction::quit (this, TQT_SLOT (slotFileQuit ()), actionCollection ()); new KAction (i18n ("Configuration &Editor..."), 0, this, - SLOT (slotStartConfigEditor ()), actionCollection (), "configuration_editor"); + TQT_SLOT (slotStartConfigEditor ()), actionCollection (), "configuration_editor"); new KAction (i18n ("Connection &Statistics"), 0, this, - SLOT (slotStartStatViewer ()), actionCollection (), "connection_statistics"); + TQT_SLOT (slotStartStatViewer ()), actionCollection (), "connection_statistics"); settingsAcousticScanning = new KToggleAction (i18n ("&Acoustic Scanning"), 0, this, - SLOT (slotToggleTric ()), + TQT_SLOT (slotToggleTric ()), actionCollection (), "acoustic_scanning"); settingsAcousticScanning->setChecked( config->readBoolEntry("acousticScanning") ); #ifdef WITHOUT_ARTS settingsAcousticScanning->setEnabled( false); #endif settingsStayInSystrayOnClose = new KToggleAction (i18n ("Stay in System &Tray on Close"), 0, this, - SLOT (slotToggleStayInSystray()), + TQT_SLOT (slotToggleStayInSystray()), actionCollection (), "stay_in_systray_on_close"); settingsStayInSystrayOnClose->setChecked( config->readBoolEntry("stayInSystrayOnClose") ); createGUI(); @@ -357,22 +357,22 @@ KWiFiManagerApp::initView () trayicon = new KSystemTray (this); trayicon->show (); - view = new QWidget (this, "mainwidget"); + view = new TQWidget (this, "mainwidget"); view->setBackgroundMode (PaletteBackground); setCentralWidget (view); - QGridLayout *zentrallayout = new QGridLayout (view); + TQGridLayout *zentrallayout = new TQGridLayout (view); zentrallayout->setMargin( KDialog::marginHint() ); speedmeter = new Speed (view, device); status = new Status (view, device); location = new Locator (view, device); strength = new Strength (view, device); pictogram = new Picture (view, device); - scan = new QPushButton (i18n("Scan for &Networks..."),view); + scan = new TQPushButton (i18n("Scan for &Networks..."),view); slotChangeWindowCaption (); - QToolTip::add (strength, i18n ("The current signal strength")); - QToolTip::add (speedmeter, i18n ("The speed at which the wireless LAN card is operating")); - QToolTip::add (status, i18n ("Detailed connection status")); - QToolTip::add (scan, i18n ("Performs a scan to discover the networks you can log into")); + TQToolTip::add (strength, i18n ("The current signal strength")); + TQToolTip::add (speedmeter, i18n ("The speed at which the wireless LAN card is operating")); + TQToolTip::add (status, i18n ("Detailed connection status")); + TQToolTip::add (scan, i18n ("Performs a scan to discover the networks you can log into")); pictogram->setMinimumSize (pictogram->mySizeHint()); strength->setMinimumSize (strength->mySizeHint()); speedmeter->setMinimumHeight (60); @@ -383,20 +383,20 @@ KWiFiManagerApp::initView () zentrallayout->addMultiCellWidget (status, 1, 2, 1, 1); zentrallayout->addWidget (scan, 2, 0); zentrallayout->addMultiCellWidget (location, 3, 3, 0, 1, Qt::AlignLeft); - connect (device, SIGNAL (interfaceChanged ()), this, SLOT (slotChangeWindowCaption ())); - connect (device, SIGNAL (strengthChanged ()), this, SLOT (slotChangeTrayIcon ())); - connect (device, SIGNAL (strengthChanged ()), strength, SLOT (repaint ())); - connect (device, SIGNAL (statusChanged ()), status, SLOT (repaint ())); - connect (device, SIGNAL (speedChanged ()), speedmeter, SLOT (repaint ())); - connect (device, SIGNAL (modeChanged ()), pictogram, SLOT (repaint ())); - connect (device, SIGNAL (essidChanged (QString)), this, SLOT (slotLogESSID (QString))); - connect (device, SIGNAL (essidChanged (QString)), location, SLOT (repaint ())); - connect (device, SIGNAL (statusChanged ()), location, SLOT (repaint ())); - connect (device, SIGNAL (txPowerChanged ()), this, SLOT (slotTXPowerChanged ())); - connect (device, SIGNAL (txPowerChanged ()), this, SLOT (slotChangeTrayIcon ())); - connect (device, SIGNAL (txPowerChanged ()), pictogram, SLOT (repaint ())); - connect (device, SIGNAL (txPowerChanged ()), strength, SLOT (repaint ())); - connect (scan, SIGNAL (clicked()), this, SLOT (slotNetworkScan())); + 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 (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 (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 (scan, TQT_SIGNAL (clicked()), this, TQT_SLOT (slotNetworkScan())); } void @@ -427,7 +427,7 @@ KWiFiManagerApp::slotStartStatViewer () delete statistik; statistik = new Statistics (device, showStatsNoise); statistik->setFixedSize (590, 300); - connect(device,SIGNAL(statsUpdated()),statistik,SLOT(repaint())); + connect(device,TQT_SIGNAL(statsUpdated()),statistik,TQT_SLOT(repaint())); statistik->show (); } @@ -439,13 +439,13 @@ KWiFiManagerApp::slotDisableRadio () if ( disablePower != 0 && disablePower->isRunning() ) { return; } - QString interface = device->get_interface_name(); + TQString interface = device->get_interface_name(); if (interface.isEmpty()) { return; } - QString onOrOff; + TQString onOrOff; if ( fileDisableRadio->isChecked() ) { onOrOff = "on"; } else { @@ -460,7 +460,7 @@ KWiFiManagerApp::slotDisableRadio () //*disablePower << "kdesu" << "iwconfig" << "eth1" << "txpower" << onOrOff; *disablePower << "kdesu" << "iwconfig" << interface << "txpower" << onOrOff; - connect( disablePower, SIGNAL(processExited(KProcess*)), this, SLOT(slotDisablePowerProcessExited()) ); + connect( disablePower, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotDisablePowerProcessExited()) ); disablePower->start(KProcess::NotifyOnExit); } @@ -578,7 +578,7 @@ void KWiFiManagerApp::readProperties( KConfig* conf) else hide(); - QString dev = conf->readEntry( "wifidevice" ); + TQString dev = conf->readEntry( "wifidevice" ); if (!dev.isEmpty()) device->setActiveDevice(dev); } @@ -605,7 +605,7 @@ KWiFiManagerApp::queryExit() } // List of network interfaces used by all running kwifimanager applications -QStringList usedInterfacesList() +TQStringList usedInterfacesList() { // Register with DCOP DCOPClient *client = kapp->dcopClient(); @@ -613,19 +613,19 @@ QStringList usedInterfacesList() client->setDefaultObject( "dcop_interface" ); // shamelessly stolen from kdelibs/kio/booksmarks/kbookmarkimporter_crash.cc - QStringList ignoreInterfaces; + TQStringList ignoreInterfaces; QCStringList apps = client->registeredApplications(); for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it ) { - QCString &clientId = *it; + TQCString &clientId = *it; if ( qstrncmp(clientId, "kwifimanager", 12) != 0 ) continue; DCOPRef ask( clientId, "dcop_interface" ); DCOPReply reply = ask.call( "interface()" ); - QString interface; + TQString interface; if ( reply.isValid() ) { - QString i = reply; + TQString i = reply; interface = i; } if (!interface.isEmpty()) diff --git a/wifi/kwifimanager.h b/wifi/kwifimanager.h index cdf8c726..3d814b4e 100644 --- a/wifi/kwifimanager.h +++ b/wifi/kwifimanager.h @@ -47,7 +47,7 @@ class Statistics; class NetworkScanning; class Led; -extern QStringList usedInterfacesList(); +extern TQStringList usedInterfacesList(); enum speedlevels { AUTO, M1, M2, M55, M11 }; @@ -58,21 +58,21 @@ enum cryptomodes struct configuration_data { - QString net_name[5]; - QString disp_name[5]; + TQString net_name[5]; + TQString disp_name[5]; bool managed[5]; bool crypto_enabled[5]; int active_crypto_key[5]; - QString active_key_string[5]; - QString crypto1[5], crypto2[5], crypto3[5], crypto4[5]; + TQString active_key_string[5]; + TQString crypto1[5], crypto2[5], crypto3[5], crypto4[5]; bool crypto_is_string1[5], crypto_is_string2[5], crypto_is_string3[5], crypto_is_string4[5]; cryptomodes crypto_mode[5]; bool pm_enabled[5]; int sleep_time[5]; - QString sleep_time_string[5]; + TQString sleep_time_string[5]; int wake_time[5]; - QString wake_time_string[5]; + TQString wake_time_string[5]; speedlevels bitrate[5]; packetmode packet[5]; }; @@ -80,9 +80,9 @@ struct configuration_data class KWiFiManagerApp:public KMainWindow, virtual public dcop_interface { Q_OBJECT public: - KWiFiManagerApp (QWidget * parent = 0, const char * name = 0); + KWiFiManagerApp (TQWidget * parent = 0, const char * name = 0); ~KWiFiManagerApp (); - QString interface () const { return device ? device->get_interface_name() : QString::null; }; + TQString interface () const { return device ? device->get_interface_name() : TQString::null; }; public: bool startDocked() { return m_startDocked; } public slots: @@ -96,7 +96,7 @@ Q_OBJECT public: void slotToggleStayInSystray (); void slotChangeTrayIcon (); void slotChangeWindowCaption (); - void slotLogESSID (QString essid); + void slotLogESSID (TQString essid); void slotTXPowerChanged (); void slotShowStatsNoise (); void slotNetworkScan(); @@ -110,14 +110,14 @@ private: void initActions (); void initView (); Speed *speedmeter; - QBoxLayout *bla; - QLabel *profil; + TQBoxLayout *bla; + TQLabel *profil; Status *status; Strength *strength; Picture *pictogram; Locator *location; NetworkScanning* scanwidget; - QWidget *view; + TQWidget *view; Statistics *statistik; KToggleAction *fileDisableRadio; KToggleAction *settingsUseAlternateCalc; @@ -127,10 +127,10 @@ private: KToggleAction *settingsShowStrengthNumber; KSystemTray *trayicon; void init_whois_db (); - QTimer *tricorder_trigger, *counter; - QPixmap *pixmap; + TQTimer *tricorder_trigger, *counter; + TQPixmap *pixmap; Interface_wireless *device; - QPushButton * scan; + TQPushButton * scan; Led *led; KProcess* disablePower; bool showStrength; diff --git a/wifi/kwireless/kwireless.cpp b/wifi/kwireless/kwireless.cpp index ff584603..39b66a76 100644 --- a/wifi/kwireless/kwireless.cpp +++ b/wifi/kwireless/kwireless.cpp @@ -17,8 +17,8 @@ #include "kwirelesswidget.h" -KWireLess::KWireLess(const QString& configFile, Type type, - int actions, QWidget *parent, const char *name) +KWireLess::KWireLess(const TQString& configFile, Type type, + int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name) { ksConfig = config(); @@ -68,7 +68,7 @@ int KWireLess::heightForWidth(int) const return widget->preferredHeight(); } -void KWireLess::resizeEvent(QResizeEvent *) +void KWireLess::resizeEvent(TQResizeEvent *) { widget->setGeometry(0, 0, width(), height()); } @@ -76,7 +76,7 @@ void KWireLess::resizeEvent(QResizeEvent *) extern "C" { - KDE_EXPORT KPanelApplet* init( QWidget *parent, const QString configFile) + KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) { KGlobal::locale()->insertCatalogue("kwireless"); return new KWireLess(configFile, KPanelApplet::Normal, diff --git a/wifi/kwireless/kwireless.h b/wifi/kwireless/kwireless.h index 5a4597af..828ad184 100644 --- a/wifi/kwireless/kwireless.h +++ b/wifi/kwireless/kwireless.h @@ -15,7 +15,7 @@ #endif #include <kpanelapplet.h> -#include <qstring.h> +#include <tqstring.h> #include <kconfig.h> class KWireLessWidget; @@ -25,8 +25,8 @@ class KWireLess : public KPanelApplet Q_OBJECT public: - KWireLess(const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0); + KWireLess(const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *parent = 0, const char *name = 0); ~KWireLess(); virtual int widthForHeight(int height) const; @@ -36,7 +36,7 @@ public: virtual void preferences(); protected: - void resizeEvent(QResizeEvent *); + void resizeEvent(TQResizeEvent *); private: KConfig *ksConfig; diff --git a/wifi/kwireless/kwirelesswidget.cpp b/wifi/kwireless/kwirelesswidget.cpp index 3ae2ff8c..08f4336b 100644 --- a/wifi/kwireless/kwirelesswidget.cpp +++ b/wifi/kwireless/kwirelesswidget.cpp @@ -7,11 +7,11 @@ http://www.hackerbuero.org $ */ -#include <qtimer.h> -#include <qpainter.h> -#include <qpen.h> -#include <qcolor.h> -#include <qpointarray.h> +#include <tqtimer.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqcolor.h> +#include <tqpointarray.h> #include <kglobalsettings.h> #include <kdebug.h> #include <kpassivepopup.h> @@ -25,12 +25,12 @@ extern "C" { #include <math.h> } -QPtrList<DeviceInfo> KWireLessWidget::deviceInfo; -QMutex KWireLessWidget::mutex; -QTimer *KWireLessWidget::timer; +TQPtrList<DeviceInfo> KWireLessWidget::deviceInfo; +TQMutex KWireLessWidget::mutex; +TQTimer *KWireLessWidget::timer; int KWireLessWidget::m_instances; -DeviceInfo::DeviceInfo(QString _device, QString _essid, QString _encr, +DeviceInfo::DeviceInfo(TQString _device, TQString _essid, TQString _encr, float _quality, float _signal, float _noise, int _bitrate) : m_device(_device), @@ -48,9 +48,9 @@ float DeviceInfo::quality() return m_quality; } -QString DeviceInfo::qualityString() +TQString DeviceInfo::qualityString() { - return i18n("%1%").arg(QString::number(m_quality*100, 'f', 0)); + return i18n("%1%").arg(TQString::number(m_quality*100, 'f', 0)); } float DeviceInfo::signal() @@ -58,9 +58,9 @@ float DeviceInfo::signal() return m_signal; } -QString DeviceInfo::signalString() +TQString DeviceInfo::signalString() { - return i18n("%1%").arg(QString::number(m_signal*100, 'f', 0)); + return i18n("%1%").arg(TQString::number(m_signal*100, 'f', 0)); } float DeviceInfo::noise() @@ -68,26 +68,26 @@ float DeviceInfo::noise() return m_noise ; } -QString DeviceInfo::noiseString() +TQString DeviceInfo::noiseString() { - return i18n("%1%").arg(QString::number(m_noise*100, 'f', 0)); + return i18n("%1%").arg(TQString::number(m_noise*100, 'f', 0)); } -const QString& DeviceInfo::device() +const TQString& DeviceInfo::device() { return m_device; } -const QString& DeviceInfo::essid() +const TQString& DeviceInfo::essid() { return m_essid; } -QString DeviceInfo::bitrateString() +TQString DeviceInfo::bitrateString() { - QString bitrate; - QTextOStream b(&bitrate); + TQString bitrate; + TQTextOStream b(&bitrate); b.precision(2); switch((int)log10(m_bitrate)) @@ -123,7 +123,7 @@ bool DeviceInfo::usesEncryption() return !m_encr.isEmpty(); } -QString DeviceInfo::encrString() +TQString DeviceInfo::encrString() { if(m_encr.isEmpty()) { @@ -135,8 +135,8 @@ QString DeviceInfo::encrString() } } -KWireLessWidget::KWireLessWidget(QWidget *parent, const char* name) - : QWidget(parent, name), +KWireLessWidget::KWireLessWidget(TQWidget *parent, const char* name) + : TQWidget(parent, name), mode(Horizontal), frameWidth(1), qualityBarWidth(6), @@ -149,8 +149,8 @@ KWireLessWidget::KWireLessWidget(QWidget *parent, const char* name) if(timer == 0) { // this way, only the poll() method of the first instance will // ever be called (intended behaviour): - timer = new QTimer(this); - connect(timer, SIGNAL(timeout()), SLOT(poll())); + timer = new TQTimer(this); + connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(poll())); // single shot, will be restartet at the end of poll () timer->start(100, true); } @@ -181,26 +181,26 @@ void KWireLessWidget::setMode(KWireLessWidget::Mode _mode) mode = _mode; } -void KWireLessWidget::mousePressEvent(QMouseEvent *e) +void KWireLessWidget::mousePressEvent(TQMouseEvent *e) { - if( e->button() == QMouseEvent::LeftButton) + if( e->button() == TQMouseEvent::LeftButton) { PropertiesDialog dialog(this); - connect(this, SIGNAL(updateDeviceInfo(QPtrList<DeviceInfo> *)), - &dialog, SLOT(update(QPtrList<DeviceInfo> *))); + connect(this, TQT_SIGNAL(updateDeviceInfo(TQPtrList<DeviceInfo> *)), + &dialog, TQT_SLOT(update(TQPtrList<DeviceInfo> *))); dialog.exec(); } } -void KWireLessWidget::paintEvent(QPaintEvent*) +void KWireLessWidget::paintEvent(TQPaintEvent*) { // WORK_TO_DO: paint other devices, too: // for quick repaints, we need a buffered painter! int w, h, space; const int bevel = qualityBarWidth/2; - QPainter painter(this); - QPointArray points; - QColor color, brush; + TQPainter painter(this); + TQPointArray points; + TQColor color, brush; // do stuff that does not rely on device being valid (e.g., // non-nil): @@ -216,7 +216,7 @@ void KWireLessWidget::paintEvent(QPaintEvent*) w = space; } - painter.setPen(QPen(Qt::black, frameWidth)); + painter.setPen(TQPen(Qt::black, frameWidth)); painter.setBrush(KGlobalSettings::baseColor()); painter.drawRect(0, 0, w, h); @@ -267,12 +267,12 @@ void KWireLessWidget::paintEvent(QPaintEvent*) QMIN(position + bevel/2, w-frameWidth), frameWidth+qualityBarWidth-1, frameWidth, frameWidth+qualityBarWidth-1); } - painter.setPen(QPen(color)); + painter.setPen(TQPen(color)); painter.setBrush(brush); painter.drawPolygon(points); // draw the signal bar: - painter.setPen(QPen(Qt::darkRed)); + painter.setPen(TQPen(Qt::darkRed)); painter.setBrush(Qt::red); if(mode == Vertical) @@ -289,7 +289,7 @@ void KWireLessWidget::paintEvent(QPaintEvent*) painter.drawRect(x, y, w1, signalBarWidth); } // draw the noise bar: - painter.setPen(QPen(Qt::gray)); + painter.setPen(TQPen(Qt::gray)); painter.setBrush(Qt::lightGray); if(mode == Vertical) @@ -308,7 +308,7 @@ void KWireLessWidget::paintEvent(QPaintEvent*) } } -KWireLessWidget* KWireLessWidget::makeWireLessWidget(QWidget *parent, +KWireLessWidget* KWireLessWidget::makeWireLessWidget(TQWidget *parent, const char *name) { #if 1 diff --git a/wifi/kwireless/kwirelesswidget.h b/wifi/kwireless/kwirelesswidget.h index 5a374d07..3321b583 100644 --- a/wifi/kwireless/kwirelesswidget.h +++ b/wifi/kwireless/kwirelesswidget.h @@ -10,32 +10,32 @@ #ifndef KWIRELESS_WIDGET_H #define KWIRELESS_WIDGET_H -#include <qwidget.h> -#include <qptrlist.h> -#include <qmutex.h> -#include <qstringlist.h> +#include <tqwidget.h> +#include <tqptrlist.h> +#include <tqmutex.h> +#include <tqstringlist.h> class DeviceInfo { public: - DeviceInfo(QString _device=QString::null, QString _essid=QString::null, - QString _encr=QString::null, + DeviceInfo(TQString _device=TQString::null, TQString _essid=TQString::null, + TQString _encr=TQString::null, float _quality=0, float _signal=0, float _noise=0, int _bitrate=0); - QString bitrateString(); + TQString bitrateString(); float quality(); - QString qualityString(); + TQString qualityString(); float signal(); - QString signalString(); + TQString signalString(); float noise(); - QString noiseString(); - const QString& device(); - const QString& essid(); + TQString noiseString(); + const TQString& device(); + const TQString& essid(); bool usesEncryption(); - QString encrString(); + TQString encrString(); protected: - QString m_device; // the device name (e.g., eth1) - QString m_essid; // the network name + TQString m_device; // the device name (e.g., eth1) + TQString m_essid; // the network name // all this values are coefficients (values between 0 and 1): float m_quality; // link quality level @@ -43,7 +43,7 @@ protected: float m_signal; // the signal level // all these values are absolut, e.g., 11000000 = 11MBit/sec: int m_bitrate; // bit rate - QString m_encr; + TQString m_encr; }; /** This wigdet displays the information about one wireless device. @@ -58,10 +58,10 @@ public: Horizontal, Vertical }; - static KWireLessWidget* makeWireLessWidget(QWidget *parent = 0, + static KWireLessWidget* makeWireLessWidget(TQWidget *parent = 0, const char *name = 0); protected: - KWireLessWidget(QWidget *parent=0, const char* name=0); + KWireLessWidget(TQWidget *parent=0, const char* name=0); public: ~KWireLessWidget(); void setMode(Mode); @@ -70,8 +70,8 @@ public: int preferredWidth(); int instances(); protected: - void paintEvent(QPaintEvent*); - void mousePressEvent(QMouseEvent *e); + void paintEvent(TQPaintEvent*); + void mousePressEvent(TQMouseEvent *e); protected: Mode mode; int frameWidth; @@ -81,12 +81,12 @@ protected: // some static device information // a list of DeviceInfo objects, this needs to be filled by the // poll method: - static QPtrList<DeviceInfo> deviceInfo; - static QTimer *timer; // the poll timer - static QMutex mutex; + static TQPtrList<DeviceInfo> deviceInfo; + static TQTimer *timer; // the poll timer + static TQMutex mutex; static int m_instances; signals: - void updateDeviceInfo(QPtrList<DeviceInfo> *); + void updateDeviceInfo(TQPtrList<DeviceInfo> *); protected slots: /** poll() is system dependent and needs to be implemented by deriving classes. diff --git a/wifi/kwireless/linuxwirelesswidget.cpp b/wifi/kwireless/linuxwirelesswidget.cpp index de35b84b..3efdbf98 100644 --- a/wifi/kwireless/linuxwirelesswidget.cpp +++ b/wifi/kwireless/linuxwirelesswidget.cpp @@ -7,8 +7,8 @@ http://www.hackerbuero.org $ */ -#include <qtooltip.h> -#include <qtimer.h> +#include <tqtooltip.h> +#include <tqtimer.h> #include <kdebug.h> #include <klocale.h> #include <unistd.h> // for ::close @@ -21,9 +21,9 @@ extern "C" { } int LinuxWireLessWidget::socketFD; -QStringList LinuxWireLessWidget::deviceNames; +TQStringList LinuxWireLessWidget::deviceNames; -LinuxWireLessWidget::LinuxWireLessWidget(QWidget *parent, const char* name) +LinuxWireLessWidget::LinuxWireLessWidget(TQWidget *parent, const char* name) : KWireLessWidget(parent, name), m_number (-1) { @@ -37,7 +37,7 @@ LinuxWireLessWidget::~LinuxWireLessWidget() { kdDebug() << "KWireLessWidget dtor: closing FD, over and out." << endl; - ::close(socketFD); // prevent from using QWidget::close + ::close(socketFD); // prevent from using TQWidget::close socketFD = 0; } } @@ -91,7 +91,7 @@ void LinuxWireLessWidget::poll() } // ----- get the device information: - QStringList::Iterator it; + TQStringList::Iterator it; deviceInfo.clear(); for(it=deviceNames.begin(); it!=deviceNames.end(); ++it) @@ -110,7 +110,7 @@ void LinuxWireLessWidget::poll() } else { // WORK_TO_DO: decide whether updates are needed or not // create a DeviceInfo object and fill it: - QString dev, essid, encr; + TQString dev, essid, encr; float quality=0, signal=0, noise=0; int bitrate; @@ -192,7 +192,7 @@ void LinuxWireLessWidget::poll() if(updateToolTip) { DeviceInfo *info; - QString text; + TQString text; for(info=deviceInfo.first(); info; info=deviceInfo.next()) { @@ -203,7 +203,7 @@ void LinuxWireLessWidget::poll() .arg(info->qualityString()) .arg(info->bitrateString()); } - QToolTip::add(this, text); + TQToolTip::add(this, text); updateToolTip = false; } diff --git a/wifi/kwireless/linuxwirelesswidget.h b/wifi/kwireless/linuxwirelesswidget.h index 3bbd085c..fe695d68 100644 --- a/wifi/kwireless/linuxwirelesswidget.h +++ b/wifi/kwireless/linuxwirelesswidget.h @@ -16,7 +16,7 @@ class LinuxWireLessWidget : public KWireLessWidget { Q_OBJECT public: - LinuxWireLessWidget(QWidget *parent=0, const char* name=0); + LinuxWireLessWidget(TQWidget *parent=0, const char* name=0); ~LinuxWireLessWidget(); protected: /** poll() is supposed to read the information from @@ -24,7 +24,7 @@ protected: void poll(); static int socketFD; // the socket file descriptor to talk to the // driver - static QStringList deviceNames; + static TQStringList deviceNames; static int devEnumHandler(int skfd, char * ifname, char * args[], diff --git a/wifi/kwireless/propertytable.cpp b/wifi/kwireless/propertytable.cpp index 7011c691..7c73b1c2 100644 --- a/wifi/kwireless/propertytable.cpp +++ b/wifi/kwireless/propertytable.cpp @@ -7,11 +7,11 @@ http://www.hackerbuero.org $ */ -#include <qtable.h> -#include <qcombobox.h> -#include <qtimer.h> -#include <qptrlist.h> -#include <qtextstream.h> +#include <tqtable.h> +#include <tqcombobox.h> +#include <tqtimer.h> +#include <tqptrlist.h> +#include <tqtextstream.h> #include <kdialogbase.h> #include <klocale.h> #include "propertytable.h" @@ -21,7 +21,7 @@ extern "C" { #include <math.h> } -PropertyTable::PropertyTable(QWidget *parent, const char* name) +PropertyTable::PropertyTable(TQWidget *parent, const char* name) : PropertyTableBase(parent, name) { } @@ -30,7 +30,7 @@ PropertyTable::~PropertyTable() { } -PropertiesDialog::PropertiesDialog(QWidget *parent, const char *name) +PropertiesDialog::PropertiesDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Wireless Network Device Properties"), KDialogBase::Ok, KDialogBase::Ok, true), @@ -42,14 +42,14 @@ PropertiesDialog::PropertiesDialog(QWidget *parent, const char *name) table->table->setSorting(false); table->table->setReadOnly(true); adjustSize(); - timer = new QTimer(this); - connect(timer, SIGNAL(timeout()), SLOT(timeout())); + timer = new TQTimer(this); + connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); timer->start(3000, false); - connect(table->cbDeviceSelector, SIGNAL(activated(int)), - SLOT(selected(int))); + connect(table->cbDeviceSelector, TQT_SIGNAL(activated(int)), + TQT_SLOT(selected(int))); } -void PropertiesDialog::update(QPtrList<DeviceInfo> *_info) +void PropertiesDialog::update(TQPtrList<DeviceInfo> *_info) { int selection = table->cbDeviceSelector->currentItem(); @@ -57,7 +57,7 @@ void PropertiesDialog::update(QPtrList<DeviceInfo> *_info) info = _info; DeviceInfo *device; - QPtrListIterator<DeviceInfo> it(*info); + TQPtrListIterator<DeviceInfo> it(*info); table->cbDeviceSelector->clear(); @@ -102,7 +102,7 @@ void PropertiesDialog::selected(int index) device = info->at(index); } - QString fields[] = + TQString fields[] = { i18n("Device:"), i18n("ESSID (network name):"), @@ -114,7 +114,7 @@ void PropertiesDialog::selected(int index) }; const int NoOfFields = sizeof(fields)/sizeof(fields[0]); - QString values[] = + TQString values[] = { device->device(), device->essid(), diff --git a/wifi/kwireless/propertytable.h b/wifi/kwireless/propertytable.h index 4eadc78a..b8b7f004 100644 --- a/wifi/kwireless/propertytable.h +++ b/wifi/kwireless/propertytable.h @@ -11,7 +11,7 @@ #define KWIRELESS_PROPERTYTABLE_H #include <kdialogbase.h> -#include <qptrlist.h> +#include <tqptrlist.h> #include "propertytablebase.h" class DeviceInfo; @@ -21,7 +21,7 @@ class PropertyTable : public PropertyTableBase { Q_OBJECT public: - PropertyTable(QWidget *parent = 0, const char* name = 0); + PropertyTable(TQWidget *parent = 0, const char* name = 0); ~PropertyTable(); }; @@ -30,14 +30,14 @@ class PropertiesDialog : public KDialogBase { Q_OBJECT public: - PropertiesDialog(QWidget *parent = 0, const char *name = 0); + PropertiesDialog(TQWidget *parent = 0, const char *name = 0); protected: PropertyTable *table; - QPtrList<DeviceInfo> *info; + TQPtrList<DeviceInfo> *info; bool wait; - QTimer *timer; + TQTimer *timer; public slots: - void update(QPtrList<DeviceInfo> *); + void update(TQPtrList<DeviceInfo> *); void timeout(); void selected(int); }; diff --git a/wifi/locator.cpp b/wifi/locator.cpp index dc4e4ce1..ad4e7945 100644 --- a/wifi/locator.cpp +++ b/wifi/locator.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include <qpainter.h> +#include <tqpainter.h> #include "locator.h" #include "interface_wireless.h" -extern QStringList APs; +extern TQStringList APs; -Locator::Locator (QWidget * parent, Interface_wireless * device):QWidget (parent, +Locator::Locator (TQWidget * parent, Interface_wireless * device):TQWidget (parent, "KwiFiManager") { this->device = device; @@ -30,10 +30,10 @@ Locator::Locator (QWidget * parent, Interface_wireless * device):QWidget (parent void Locator::generateLocWidget () { - QString mac, ip; + TQString mac, ip; device->get_AP_info (mac, ip); sentence = - new QLabel (i18n ("AccessPoint: ") + whois (mac.local8Bit (), APs), this); + new TQLabel (i18n ("AccessPoint: ") + whois (mac.local8Bit (), APs), this); setFixedSize (QSize (sentence->sizeHint ().width () + 2, sentence->sizeHint ().height ())); @@ -42,14 +42,14 @@ Locator::generateLocWidget () (sentence->sizeHint ().width () + 2, sentence->sizeHint ().height ())); sentence->show (); - widgetbild = QPixmap::grabWidget (sentence); + widgetbild = TQPixmap::grabWidget (sentence); delete sentence; } void -Locator::paintEvent (QPaintEvent *) +Locator::paintEvent (TQPaintEvent *) { - QPainter *locatorpainter = new QPainter (this); + TQPainter *locatorpainter = new TQPainter (this); generateLocWidget (); locatorpainter->drawPixmap (0, 0, widgetbild); delete locatorpainter; diff --git a/wifi/locator.h b/wifi/locator.h index af63c70c..54f2c683 100644 --- a/wifi/locator.h +++ b/wifi/locator.h @@ -18,9 +18,9 @@ #ifndef LOCATOR_H #define LOCATOR_H -#include <qwidget.h> -#include <qpixmap.h> -#include <qlabel.h> +#include <tqwidget.h> +#include <tqpixmap.h> +#include <tqlabel.h> #include <klocale.h> @@ -29,12 +29,12 @@ class Interface_wireless; class Locator:public QWidget { public: - Locator (QWidget * parent, Interface_wireless * device); + Locator (TQWidget * parent, Interface_wireless * device); private: - void paintEvent (QPaintEvent *); + void paintEvent (TQPaintEvent *); void generateLocWidget (); - QPixmap widgetbild; - QLabel *sentence; + TQPixmap widgetbild; + TQLabel *sentence; Interface_wireless *device; }; diff --git a/wifi/networkscanning.cpp b/wifi/networkscanning.cpp index 5a15ffbc..7e2a0e12 100644 --- a/wifi/networkscanning.cpp +++ b/wifi/networkscanning.cpp @@ -17,11 +17,11 @@ #include <stdio.h> -#include <qstring.h> -#include <qwidget.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qtable.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqtable.h> #include <kdebug.h> #include <klocale.h> @@ -32,7 +32,7 @@ #include "networkscanning.h" #include "interface_wireless.h" -NetworkScanning::NetworkScanning (Interface_wireless * dev, QWidget * parent, const char * name ) : QWidget ( parent, name ) { +NetworkScanning::NetworkScanning (Interface_wireless * dev, TQWidget * parent, const char * name ) : TQWidget ( parent, name ) { device = dev; networkScan(); } @@ -52,24 +52,24 @@ NetworkScanning::networkScan () if ( networks->text( i, 3 ) == i18n( "off" )) networks->setRowReadOnly( i, true ); } - networks->setSelectionMode(QTable::SingleRow); - connect(networks,SIGNAL(selectionChanged()),this,SLOT(checkWEP())); + networks->setSelectionMode(TQTable::SingleRow); + connect(networks,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(checkWEP())); this->setCaption( i18n( "Scan Results" ) ); - QGridLayout* networkSelectionLayout = new QGridLayout ( this, 2, 3, 0, 5); - switchNet = new QPushButton( i18n( "Switch to Network..." ), this ); + TQGridLayout* networkSelectionLayout = new TQGridLayout ( this, 2, 3, 0, 5); + switchNet = new TQPushButton( i18n( "Switch to Network..." ), this ); switchNet->setEnabled(false); - QPushButton* close = new QPushButton( i18n( "Close" ), this ); + TQPushButton* close = new TQPushButton( i18n( "Close" ), this ); - networks->reparent( this, QPoint( 0, 0 ) ); + networks->reparent( this, TQPoint( 0, 0 ) ); networks->setLeftMargin( 0 ); networks->verticalHeader()->hide(); - connect ( close, SIGNAL( clicked() ), this, SLOT( hide() ) ); - connect ( switchNet, SIGNAL( clicked() ), this, SLOT( switchToNetwork() ) ); - connect ( networks, SIGNAL( currentChanged(int,int)), this, SLOT( checkSettings(int,int))); - connect ( networks, SIGNAL( valueChanged(int,int)), this, SLOT( checkSettings(int,int))); + connect ( close, TQT_SIGNAL( clicked() ), this, TQT_SLOT( hide() ) ); + connect ( switchNet, TQT_SIGNAL( clicked() ), this, TQT_SLOT( switchToNetwork() ) ); + connect ( networks, TQT_SIGNAL( currentChanged(int,int)), this, TQT_SLOT( checkSettings(int,int))); + connect ( networks, TQT_SIGNAL( valueChanged(int,int)), this, TQT_SLOT( checkSettings(int,int))); networkSelectionLayout->addMultiCellWidget( networks, 0, 0, 0, 2 ); networkSelectionLayout->addWidget( switchNet, 1, 0 ); @@ -113,20 +113,20 @@ NetworkScanning::switchToNetwork() return; } - QString cmdline; + TQString cmdline; - KTempFile* tempfile = new KTempFile( QString::null, QString::null, 0700 ); - QString tempfilename = tempfile->name(); + KTempFile* tempfile = new KTempFile( TQString::null, TQString::null, 0700 ); + TQString tempfilename = tempfile->name(); - cmdline = (QString)"ifconfig %1 down\n"; + cmdline = (TQString)"ifconfig %1 down\n"; cmdline = cmdline.arg( device->get_interface_name() ); write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) ); - cmdline = (QString)"iwconfig %1 essid %2 mode %3 enc %4\n"; + 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 ) ) ); - QString modetemp; + TQString modetemp; if (networks->text( networks->currentRow(), 1 ) == i18n("Managed") ) modetemp = "Managed"; else modetemp = "Ad-Hoc"; cmdline = cmdline.arg( modetemp ); @@ -137,7 +137,7 @@ NetworkScanning::switchToNetwork() } write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) ); - cmdline = (QString)"ifconfig %1 up\n"; + cmdline = (TQString)"ifconfig %1 up\n"; cmdline = cmdline.arg( device->get_interface_name() ); write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) ); diff --git a/wifi/networkscanning.h b/wifi/networkscanning.h index 5964db3a..a09b7b69 100644 --- a/wifi/networkscanning.h +++ b/wifi/networkscanning.h @@ -19,7 +19,7 @@ #ifndef NETWORKSCANNING_H #define NETWORKSCANNING_H -#include <qwidget.h> +#include <tqwidget.h> class QTable; class QPushButton; @@ -34,13 +34,13 @@ class NetworkScanning : public QWidget Q_OBJECT public: - NetworkScanning (Interface_wireless * dev, QWidget * parent = 0, const char * name = 0 ); + NetworkScanning (Interface_wireless * dev, TQWidget * parent = 0, const char * name = 0 ); protected: void networkScan (); - QTable* networks; + TQTable* networks; Interface_wireless * device; - QPushButton* switchNet; + TQPushButton* switchNet; protected slots: void checkSettings(int row, int); diff --git a/wifi/picture.cpp b/wifi/picture.cpp index 11d77cae..5e4d28c5 100644 --- a/wifi/picture.cpp +++ b/wifi/picture.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include <qwidget.h> -#include <qpainter.h> -#include <qpixmap.h> +#include <tqwidget.h> +#include <tqpainter.h> +#include <tqpixmap.h> #include <kstandarddirs.h> #include "picture.h" #include "interface_wireless.h" @@ -25,22 +25,22 @@ #define X_OFFSET 20 #define Y_OFFSET 10 -Picture::Picture (QWidget * parent, Interface_wireless * device):QWidget (parent, +Picture::Picture (TQWidget * parent, Interface_wireless * device):TQWidget (parent, "picture") { this->device = device; KStandardDirs finder; kdedir = finder.findResourceDir ("data", "kwifimanager/pics/no_card.png"); kdedir += "kwifimanager/pics/"; - NO_CARD = new QPixmap (kdedir + "no_card.png"); - AD_HOC = new QPixmap (kdedir + "ad_hoc.png"); - ALL_ALONE = new QPixmap (kdedir + "all_alone.png"); - AP_CONNECT = new QPixmap (kdedir + "ap_connect.png"); + NO_CARD = new TQPixmap (kdedir + "no_card.png"); + AD_HOC = new TQPixmap (kdedir + "ad_hoc.png"); + ALL_ALONE = new TQPixmap (kdedir + "all_alone.png"); + AP_CONNECT = new TQPixmap (kdedir + "ap_connect.png"); } -QSize Picture::mySizeHint() { +TQSize Picture::mySizeHint() { /* make this quite general, just in case someone uses different icons */ - QSize* temp = new QSize(NO_CARD->size()); + TQSize* temp = new TQSize(NO_CARD->size()); if (AD_HOC->size().width() > temp->width ()) { temp->setWidth (AD_HOC->size().width ()); } if (AD_HOC->size().height() > temp->height()) { temp->setHeight(AD_HOC->size().height()); } if (ALL_ALONE->size().width() > temp->width ()) { temp->setWidth (ALL_ALONE->size().width ()); } @@ -62,9 +62,9 @@ Picture::~Picture () } void -Picture::paintEvent (QPaintEvent *) +Picture::paintEvent (TQPaintEvent *) { - QPainter *picturepainter = new QPainter (this); + TQPainter *picturepainter = new TQPainter (this); double freq; int mode; device->get_mode (mode); diff --git a/wifi/picture.h b/wifi/picture.h index 8d9b6bfc..b863516e 100644 --- a/wifi/picture.h +++ b/wifi/picture.h @@ -24,13 +24,13 @@ class QSize; class Picture:public QWidget { public: - Picture (QWidget * parent, Interface_wireless * device); - QSize mySizeHint(); + Picture (TQWidget * parent, Interface_wireless * device); + TQSize mySizeHint(); ~Picture (); private: - void paintEvent (QPaintEvent *); - QPixmap *NO_CARD, *ALL_ALONE, *AD_HOC, *AP_CONNECT; - QString kdedir; + void paintEvent (TQPaintEvent *); + TQPixmap *NO_CARD, *ALL_ALONE, *AD_HOC, *AP_CONNECT; + TQString kdedir; Interface_wireless *device; }; diff --git a/wifi/speed.cpp b/wifi/speed.cpp index fdb7256c..ae199d90 100644 --- a/wifi/speed.cpp +++ b/wifi/speed.cpp @@ -15,23 +15,23 @@ * * ***************************************************************************/ -#include <qpainter.h> +#include <tqpainter.h> #include <klocale.h> #include <kdebug.h> #include "speed.h" #include "interface_wireless.h" -Speed::Speed (QWidget * parent, Interface_wireless * device):QWidget (parent, +Speed::Speed (TQWidget * parent, Interface_wireless * device):TQWidget (parent, "KWiFiManager") { this->device = device; } void -Speed::paintEvent (QPaintEvent *) +Speed::paintEvent (TQPaintEvent *) { - QPainter speedpainter (this); - QColor farbe; + TQPainter speedpainter (this); + TQColor farbe; farbe.setRgb (0, 255, 0); if (device->get_bitrate () < 6000000) farbe.setRgb (0, 200, 0); diff --git a/wifi/speed.h b/wifi/speed.h index 41f15b70..48b949b3 100644 --- a/wifi/speed.h +++ b/wifi/speed.h @@ -18,16 +18,16 @@ #ifndef SPEED_H #define SPEED_H -#include <qwidget.h> +#include <tqwidget.h> class Interface_wireless; class Speed:public QWidget { public: - Speed (QWidget * parent, Interface_wireless * device); + Speed (TQWidget * parent, Interface_wireless * device); private: - void paintEvent (QPaintEvent *); + void paintEvent (TQPaintEvent *); Interface_wireless *device; }; diff --git a/wifi/statistics.cpp b/wifi/statistics.cpp index 2ad8d393..a7716de1 100644 --- a/wifi/statistics.cpp +++ b/wifi/statistics.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include <qwidget.h> -#include <qpainter.h> +#include <tqwidget.h> +#include <tqpainter.h> #include <klocale.h> #include "statistics.h" #include "interface_wireless.h" -Statistics::Statistics (Interface_wireless * device, bool showStatsNoise):QWidget (0, +Statistics::Statistics (Interface_wireless * device, bool showStatsNoise):TQWidget (0, "KWiFiManager") { this->setCaption (i18n ("Statistics - KWiFiManager")); @@ -30,10 +30,10 @@ Statistics::Statistics (Interface_wireless * device, bool showStatsNoise):QWidge } void -Statistics::paintEvent (QPaintEvent *) +Statistics::paintEvent (TQPaintEvent *) { - statpainter = new QPainter (this); - QColor farbe (255, 255, 255); + statpainter = new TQPainter (this); + TQColor farbe (255, 255, 255); statpainter->drawText (40, 30, i18n ("Noise/Signal Level Statistics")); statpainter->drawText (150, 260, i18n ("BLUE = signal level, RED = noise level")); @@ -42,8 +42,8 @@ Statistics::paintEvent (QPaintEvent *) statpainter->drawText (21, 274, i18n ("-240 s")); statpainter->drawText (510, 274, i18n ("now")); statpainter->fillRect (41, 41, 480, 201, farbe); - QPointArray datensatz (240); - QPointArray datensatz2 (240); + TQPointArray datensatz (240); + TQPointArray datensatz2 (240); // we may need to scale the output to fit into the window, so here we // determine the range of values int bottom = @@ -53,8 +53,8 @@ Statistics::paintEvent (QPaintEvent *) (device->sigLevelMax > device->noiseLevelMax) ? device->sigLevelMax : device->noiseLevelMax; int datarange = top - bottom; - statpainter->drawText (10, 50, QString ("%1").arg (top)); - statpainter->drawText (10, 240, QString ("%1").arg (bottom)); + statpainter->drawText (10, 50, TQString ("%1").arg (top)); + statpainter->drawText (10, 240, TQString ("%1").arg (bottom)); // if values are all below 0, this indicates proper dBm values diff --git a/wifi/statistics.h b/wifi/statistics.h index f8c99dd9..dc43ef41 100644 --- a/wifi/statistics.h +++ b/wifi/statistics.h @@ -24,8 +24,8 @@ class Statistics:public QWidget public: Statistics (Interface_wireless * device, bool showStatsNoise); private: - QPainter * statpainter; - void paintEvent (QPaintEvent *); + TQPainter * statpainter; + void paintEvent (TQPaintEvent *); Interface_wireless *device; bool showStatsNoise; }; diff --git a/wifi/status.cpp b/wifi/status.cpp index b40fa67d..e7ace893 100644 --- a/wifi/status.cpp +++ b/wifi/status.cpp @@ -22,8 +22,8 @@ #include <unistd.h> #include <sys/types.h> -Status::Status (QWidget * parent, Interface_wireless * device) - : QWidget (parent, "KWiFiManager status") +Status::Status (TQWidget * parent, Interface_wireless * device) + : TQWidget (parent, "KWiFiManager status") { this->device = device; } @@ -38,29 +38,29 @@ bool Status::generateStatsWidget () qual = 0; device->get_current_quality (sig, noi, qual); content = - new QGroupBox (2, Qt::Horizontal, i18n ("Status of Active Connection"), + new TQGroupBox (2, Qt::Horizontal, i18n ("Status of Active Connection"), this); bool has_freq = device->get_device_freq (freq); if ((!has_freq) || (qual == 0)) { - stat = new QLabel (i18n ("Searching for network: "), content); + stat = new TQLabel (i18n ("Searching for network: "), content); } else - stat = new QLabel (i18n ("Connected to network: "), content); - net_id = new QLabel (device->get_essid (), content); - ap_str = new QLabel (i18n ("Access point: "), content); + stat = new TQLabel (i18n ("Connected to network: "), content); + net_id = new TQLabel (device->get_essid (), content); + ap_str = new TQLabel (i18n ("Access point: "), content); QString mac, ip; device->get_AP_info (mac, ip); if ((mac != "44:44:44:44:44:44") && (mac != "00:00:00:00:00:00")) { - ap_ad = new QLabel (mac, content); + ap_ad = new TQLabel (mac, content); } else { - ap_ad = new QLabel (i18n("- no access point -"),content); + ap_ad = new TQLabel (i18n("- no access point -"),content); } - local_ip_string = new QLabel (i18n ("Local IP: "), content); - local_ip_content = new QLabel (device->get_IP_info (), content); - fr_str = new QLabel (i18n ("Frequency [channel]: "), content); + local_ip_string = new TQLabel (i18n ("Local IP: "), content); + local_ip_content = new TQLabel (device->get_IP_info (), content); + fr_str = new TQLabel (i18n ("Frequency [channel]: "), content); QString temp3 = "%1"; QString @@ -342,10 +342,10 @@ bool Status::generateStatsWidget () temp3 = temp3.arg (freq); } - fr = new QLabel ( has_freq ? temp2 + " [" + temp3 + "]" : "" , content); + fr = new TQLabel ( has_freq ? temp2 + " [" + temp3 + "]" : "" , content); if (geteuid () == 0) { - enc_str = new QLabel (i18n ("Encryption: "), content); + enc_str = new TQLabel (i18n ("Encryption: "), content); QString key; int @@ -356,26 +356,26 @@ bool Status::generateStatsWidget () // will the following line suffice? if (size == 0) { - enc = new QLabel (i18n ("off"), content); + enc = new TQLabel (i18n ("off"), content); } else - enc = new QLabel (i18n ("active"), content); + enc = new TQLabel (i18n ("active"), content); } // content->setFixedSize (content->sizeHint ()); content->setMinimumSize(content->sizeHint()); if ( content->minimumWidth() < 280 ) content->setMinimumWidth( 280 ); setFixedSize (content->minimumSize()); content->show (); - widgetbild = QPixmap::grabWidget (content); + widgetbild = TQPixmap::grabWidget (content); delete content; return true; } void -Status::paintEvent (QPaintEvent *) +Status::paintEvent (TQPaintEvent *) { - QPainter *paintArea = new QPainter (this); + TQPainter *paintArea = new TQPainter (this); generateStatsWidget (); paintArea->drawPixmap (0, 0, widgetbild); delete paintArea; diff --git a/wifi/status.h b/wifi/status.h index 0c7f0d3e..9b8aed52 100644 --- a/wifi/status.h +++ b/wifi/status.h @@ -18,25 +18,25 @@ #ifndef STATUS_H #define STATUS_H -#include <qwidget.h> -#include <qpainter.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qpixmap.h> +#include <tqwidget.h> +#include <tqpainter.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqpixmap.h> class Interface_wireless; class Status:public QWidget { public: - Status (QWidget * parent, Interface_wireless * device); + Status (TQWidget * parent, Interface_wireless * device); private: - void paintEvent (QPaintEvent *); + void paintEvent (TQPaintEvent *); bool generateStatsWidget (); - QGroupBox *content; - QLabel *stat, *net_id, *ap_str, *ap_ad, *fr_str, *fr, *enc_str, *enc, + TQGroupBox *content; + TQLabel *stat, *net_id, *ap_str, *ap_ad, *fr_str, *fr, *enc_str, *enc, *local_ip_content, *local_ip_string; - QPixmap widgetbild, widgetbildalt; + TQPixmap widgetbild, widgetbildalt; Interface_wireless *device; }; diff --git a/wifi/strength.cpp b/wifi/strength.cpp index 0bb43f6c..ad4314c0 100644 --- a/wifi/strength.cpp +++ b/wifi/strength.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include <qwidget.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qlabel.h> +#include <tqwidget.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqlabel.h> #include <kstandarddirs.h> #include <klocale.h> #include <kdebug.h> @@ -27,25 +27,25 @@ extern bool useAlternateStrengthCalc; -Strength::Strength (QWidget * parent, Interface_wireless * device):QWidget (parent, +Strength::Strength (TQWidget * parent, Interface_wireless * device):TQWidget (parent, "strength") { this->device = device; KStandardDirs finder; kdedir = finder.findResourceDir ("data", "kwifimanager/pics/no_card.png"); kdedir += "kwifimanager/pics/"; - NOT_CON_OFFLINE_ADHOC = new QPixmap (kdedir + "offline.png"); - EXCELLENT = new QPixmap (kdedir + "excellent.png"); - GOOD = new QPixmap (kdedir + "good.png"); - MARGINAL = new QPixmap (kdedir + "marginal.png"); - OOR_MINIMUM = new QPixmap (kdedir + "oor_minimum.png"); - OOR_DOWN = new QPixmap (kdedir + "oor_down.png"); + NOT_CON_OFFLINE_ADHOC = new TQPixmap (kdedir + "offline.png"); + EXCELLENT = new TQPixmap (kdedir + "excellent.png"); + GOOD = new TQPixmap (kdedir + "good.png"); + MARGINAL = new TQPixmap (kdedir + "marginal.png"); + OOR_MINIMUM = new TQPixmap (kdedir + "oor_minimum.png"); + OOR_DOWN = new TQPixmap (kdedir + "oor_down.png"); } -QSize Strength::mySizeHint () +TQSize Strength::mySizeHint () { /* make this quite general, just in case someone uses different icons */ - QSize* temp = new QSize(NOT_CON_OFFLINE_ADHOC->size()); + TQSize* temp = new TQSize(NOT_CON_OFFLINE_ADHOC->size()); if (EXCELLENT->size().width() > temp->width ()) { temp->setWidth (EXCELLENT->size().width ()); } if (EXCELLENT->size().height() > temp->height()) { temp->setHeight(EXCELLENT->size().height()); } if (GOOD->size().width() > temp->width ()) { temp->setWidth (GOOD->size().width ()); } @@ -62,7 +62,7 @@ QSize Strength::mySizeHint () temp->setHeight(temp->height() + 30); // up to now: this is the height required to get a decent logo display // now determine height of QLabels to calculate the extra needed height - QLabel heightTest( "ABC", 0 ); + TQLabel heightTest( "ABC", 0 ); temp->setHeight( temp->height() + 2 * heightTest.sizeHint().height() + 10 ); return *temp; } @@ -77,16 +77,16 @@ Strength::~Strength () } void -Strength::paintEvent (QPaintEvent * event) +Strength::paintEvent (TQPaintEvent * event) { updateInfo (event); } void -Strength::updateInfo (QPaintEvent *) +Strength::updateInfo (TQPaintEvent *) { - QPainter *strengthpainter = new QPainter (this); - QString sstrength1, sstrength2( i18n("N/A") ); + TQPainter *strengthpainter = new TQPainter (this); + TQString sstrength1, sstrength2( i18n("N/A") ); int mode; double freq; @@ -113,43 +113,43 @@ Strength::updateInfo (QPaintEvent *) else if (validdata && (strength > 45)) { sstrength1 = i18n("ULTIMATE"); - sstrength2 = QString::number(strength); + sstrength2 = TQString::number(strength); strengthpainter->drawPixmap (50, 10, *EXCELLENT); } else if (validdata && (strength > 35)) { sstrength1 = i18n("TOP"); - sstrength2 = QString::number(strength); + sstrength2 = TQString::number(strength); strengthpainter->drawPixmap (50, 10, *EXCELLENT); } else if (validdata && (strength > 25)) { sstrength1 = i18n("EXCELLENT"); - sstrength2 = QString::number(strength); + sstrength2 = TQString::number(strength); strengthpainter->drawPixmap (50, 10, *EXCELLENT); } else if (validdata && (strength > 15)) { sstrength1 = i18n("GOOD"); - sstrength2 = QString::number(strength); + sstrength2 = TQString::number(strength); strengthpainter->drawPixmap (50, 10, *GOOD); } else if (validdata && (strength > 5)) { sstrength1 = i18n("WEAK"); - sstrength2 = QString::number(strength); + sstrength2 = TQString::number(strength); strengthpainter->drawPixmap (50, 10, *MARGINAL); } else if (validdata && (strength > 0)) { sstrength1 = i18n("MINIMUM"); - sstrength2 = QString::number(strength); + sstrength2 = TQString::number(strength); strengthpainter->drawPixmap (50, 10, *OOR_MINIMUM); } else if (((strength == 0) && (mode == 2)) || (!validdata)) { sstrength1 = i18n("OUT OF RANGE"); - sstrength2 = QString::fromLatin1("0"); + sstrength2 = TQString::fromLatin1("0"); strengthpainter->drawPixmap (50, 10, *OOR_DOWN); } else diff --git a/wifi/strength.h b/wifi/strength.h index b03eb215..c8b9eb0b 100644 --- a/wifi/strength.h +++ b/wifi/strength.h @@ -17,7 +17,7 @@ #ifndef STRENGTH_H #define STRENGTH_H -#include <qwidget.h> +#include <tqwidget.h> class Interface_wireless; class QSize; @@ -26,15 +26,15 @@ class Strength:public QWidget { Q_OBJECT public: - Strength (QWidget * parent, Interface_wireless * device); - QSize mySizeHint(); + Strength (TQWidget * parent, Interface_wireless * device); + TQSize mySizeHint(); ~Strength (); - QPixmap *NOT_CON_OFFLINE_ADHOC, *OOR_DOWN, *OOR_MINIMUM, *MARGINAL, *GOOD, *EXCELLENT; + TQPixmap *NOT_CON_OFFLINE_ADHOC, *OOR_DOWN, *OOR_MINIMUM, *MARGINAL, *GOOD, *EXCELLENT; public slots: - void updateInfo (QPaintEvent *); + void updateInfo (TQPaintEvent *); private: - QString kdedir; - void paintEvent (QPaintEvent *); + TQString kdedir; + void paintEvent (TQPaintEvent *); Interface_wireless *device; }; |