summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
Diffstat (limited to 'wifi')
-rw-r--r--wifi/interface_wireless.cpp2
-rw-r--r--wifi/interface_wireless.h9
-rw-r--r--wifi/interface_wireless_wirelessextensions.cpp46
-rw-r--r--wifi/interface_wireless_wirelessextensions.h5
-rw-r--r--wifi/kcmwifi/configadvanced.ui14
-rw-r--r--wifi/kcmwifi/configcrypto.ui64
-rw-r--r--wifi/kcmwifi/configcrypto.ui.h10
-rw-r--r--wifi/kcmwifi/configpower.ui22
-rw-r--r--wifi/kcmwifi/configpower.ui.h2
-rw-r--r--wifi/kcmwifi/ifconfigpage.cpp6
-rw-r--r--wifi/kcmwifi/ifconfigpage.h3
-rw-r--r--wifi/kcmwifi/ifconfigpagebase.ui76
-rw-r--r--wifi/kcmwifi/kcmwifi.cpp20
-rw-r--r--wifi/kcmwifi/kcmwifi.h3
-rw-r--r--wifi/kcmwifi/mainconfig.cpp14
-rw-r--r--wifi/kcmwifi/mainconfig.h3
-rw-r--r--wifi/kcmwifi/mainconfigbase.ui18
-rw-r--r--wifi/kcmwifi/vendorconfig.cpp14
-rw-r--r--wifi/kcmwifi/wificonfig.cpp22
-rw-r--r--wifi/kcmwifi/wificonfig.h3
-rw-r--r--wifi/kwifimanager.cpp66
-rw-r--r--wifi/kwifimanager.h15
-rw-r--r--wifi/kwireless/kwireless.cpp8
-rw-r--r--wifi/kwireless/kwireless.h3
-rw-r--r--wifi/kwireless/kwirelesswidget.cpp62
-rw-r--r--wifi/kwireless/kwirelesswidget.h11
-rw-r--r--wifi/kwireless/linuxwirelesswidget.cpp12
-rw-r--r--wifi/kwireless/linuxwirelesswidget.h3
-rw-r--r--wifi/kwireless/propertytable.cpp8
-rw-r--r--wifi/kwireless/propertytable.h6
-rw-r--r--wifi/kwireless/propertytablebase.ui10
-rw-r--r--wifi/locator.cpp14
-rw-r--r--wifi/locator.h4
-rw-r--r--wifi/networkscanning.cpp18
-rw-r--r--wifi/networkscanning.h7
-rw-r--r--wifi/picture.cpp16
-rw-r--r--wifi/picture.h4
-rw-r--r--wifi/speed.cpp22
-rw-r--r--wifi/speed.h4
-rw-r--r--wifi/statistics.cpp8
-rw-r--r--wifi/statistics.h2
-rw-r--r--wifi/status.cpp62
-rw-r--r--wifi/status.h4
-rw-r--r--wifi/strength.cpp8
-rw-r--r--wifi/strength.h8
45 files changed, 381 insertions, 360 deletions
diff --git a/wifi/interface_wireless.cpp b/wifi/interface_wireless.cpp
index d04efa95..52513a59 100644
--- a/wifi/interface_wireless.cpp
+++ b/wifi/interface_wireless.cpp
@@ -195,7 +195,7 @@ MyTimeNotify::notifyTime ()
#endif
-QString
+TQString
whois (const char *MAC_ADR, TQStringList APList)
{
for (TQStringList::Iterator it = APList.begin (); it != APList.end ();
diff --git a/wifi/interface_wireless.h b/wifi/interface_wireless.h
index 0a92709e..583f5c34 100644
--- a/wifi/interface_wireless.h
+++ b/wifi/interface_wireless.h
@@ -32,9 +32,12 @@
const int POLL_DELAY_MS = 250; // how much time between device polls
const int MAX_HISTORY = 240; // number of device states to be saved
-class Interface_wireless:public QObject
+class Interface_wireless:public TQObject
{
-Q_OBJECT public:
+ Q_OBJECT
+ TQ_OBJECT
+
+public:
Interface_wireless (TQStringList * ignoreInterfaces);
virtual ~ Interface_wireless() { };
@@ -50,7 +53,7 @@ Q_OBJECT public:
virtual TQString get_IP_info ();
virtual double get_bitrate ();
virtual TQString get_interface_name ();
- // if no device is attached, return empty QString
+ // if no device is attached, return empty TQString
virtual bool get_current_quality (int &sig, int &noi, int &qua);
// quality info is only valid when true
virtual TQTable* get_available_networks () = 0;
diff --git a/wifi/interface_wireless_wirelessextensions.cpp b/wifi/interface_wireless_wirelessextensions.cpp
index 878b9460..22fa96ae 100644
--- a/wifi/interface_wireless_wirelessextensions.cpp
+++ b/wifi/interface_wireless_wirelessextensions.cpp
@@ -287,19 +287,19 @@ void Interface_wireless_wirelessextensions::setNoActiveDevice( )
has_mode = false;
mode = 0;
has_key = 0;
- key = TQString::null;
+ key = TQString();
key_size = 0;
key_flags = 0;
- essid = TQString::null;
- access_point_address = TQString::null;
- ip_address = TQString::null;
+ essid = TQString();
+ access_point_address = TQString();
+ ip_address = TQString();
bitrate = 0;
has_range = false;
has_txpower = false;
txpower_disabled = 0;
// propagate the changes
- setActiveDevice( TQString::null );
+ setActiveDevice( TQString() );
}
TQStringList Interface_wireless_wirelessextensions::available_wifi_devices()
@@ -313,7 +313,7 @@ TQStringList Interface_wireless_wirelessextensions::available_wifi_devices()
TQString device;
while (!procnetdev.atEnd()) {
procnetdev.readLine (device, 9999);
- int pos = device.find (':');
+ int pos = device.tqfind (':');
if (pos == -1)
continue;
device = device.left(pos).stripWhiteSpace();
@@ -353,7 +353,7 @@ bool Interface_wireless_wirelessextensions::autodetect_device()
wireless_info info;
int result = get_info (socket, device, info);
if ((result != -ENODEV) && (result != -ENOTSUP) &&
- (!ignoreInterfaces || ignoreInterfaces->findIndex(device)==-1))
+ (!ignoreInterfaces || ignoreInterfaces->tqfindIndex(device)==-1))
{
setActiveDevice(device);
}
@@ -564,29 +564,29 @@ Interface_wireless_wirelessextensions::parseScanData ( KProcIO * iwlist )
while ( iwlist->readln ( data, true ) >= 0 )
{
kdDebug ( ) << "iwlist: " << data << "\n";
- if ( data.contains ( "does not support scanning" ) )
+ if ( data.tqcontains ( "does not support scanning" ) )
KMessageBox::sorry ( 0,
i18n
( "Your card does not support scanning. The results window will not contain any results." ),
i18n ( "Scanning not possible" ) );
- if ( data.contains ( "Scan completed" ) )
+ if ( data.tqcontains ( "Scan completed" ) )
cellcount = 0; // at the very beginning of a scan
- if ( data.contains ( "Cell" ) ) {
+ if ( data.tqcontains ( "Cell" ) ) {
cellcount++; // new cell discovered
networks->setNumRows ( networks->numRows() +1 );
ignoreRemainingBits = false;
}
- if ( data.contains ( "ESSID:" ) )
+ if ( data.tqcontains ( "ESSID:" ) )
{
- TQString ssid = data.mid ( data.find ( "\"" ) + 1, data.length ( ) - data.find ( "\"" ) - 2 );
+ TQString ssid = data.mid ( data.tqfind ( "\"" ) + 1, data.length ( ) - data.tqfind ( "\"" ) - 2 );
if ((ssid=="") || (ssid==" ")) ssid = "(hidden cell)";
networks->setText ( cellcount - 1, 0, ssid );
}
- if ( data.contains ( "Mode:" ) )
+ if ( data.tqcontains ( "Mode:" ) )
{
- if ( data.contains ( "Master" ) )
+ if ( data.tqcontains ( "Master" ) )
networks->setText ( cellcount - 1, 1, TQString ( i18n ( "Managed" ) ) );
- if ( data.contains ( "Ad-Hoc" ) )
+ if ( data.tqcontains ( "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
@@ -605,31 +605,31 @@ Interface_wireless_wirelessextensions::parseScanData ( KProcIO * iwlist )
}
}
}
- if ( !ignoreRemainingBits && data.contains ( "Encryption key:" ) )
+ if ( !ignoreRemainingBits && data.tqcontains ( "Encryption key:" ) )
{
- if ( data.contains ( "off" ) )
+ if ( data.tqcontains ( "off" ) )
networks->setText ( cellcount - 1, 3, TQString ( "off" ) );
else
networks->setText ( cellcount - 1, 3, TQString ( "on" ) );
}
- if ( !ignoreRemainingBits && data.contains ( "Quality:" ) )
+ if ( !ignoreRemainingBits && data.tqcontains ( "Quality:" ) )
{
- TQString quality = data.mid ( data.find ( ":" ) + 1, data.find ( "/" ) - data.find ( ":" ) - 1 );
+ TQString quality = data.mid ( data.tqfind ( ":" ) + 1, data.tqfind ( "/" ) - data.tqfind ( ":" ) - 1 );
networks->setText ( cellcount - 1, 2, quality );
}
- if ( !ignoreRemainingBits && data.contains ( "Quality=" ) )
+ if ( !ignoreRemainingBits && data.tqcontains ( "Quality=" ) )
{
- TQString quality = data.mid ( data.find ( "=" ) + 1, data.find ( "/" ) - data.find ( "=" ) - 1 );
+ TQString quality = data.mid ( data.tqfind ( "=" ) + 1, data.tqfind ( "/" ) - data.tqfind ( "=" ) - 1 );
networks->setText ( cellcount - 1, 2, quality );
}
- if ( !ignoreRemainingBits && data.contains ( "wpa_ie" ) )
+ if ( !ignoreRemainingBits && data.tqcontains ( "wpa_ie" ) )
{
networks->setText ( cellcount - 1, 3, TQString ( "WPA" ) );
}
- if ( !ignoreRemainingBits && data.contains ( "rsn_ie" ) )
+ if ( !ignoreRemainingBits && data.tqcontains ( "rsn_ie" ) )
{
networks->setText ( cellcount - 1, 3, TQString ( "WPA2" ) );
}
diff --git a/wifi/interface_wireless_wirelessextensions.h b/wifi/interface_wireless_wirelessextensions.h
index c41fa762..1e9c9f8c 100644
--- a/wifi/interface_wireless_wirelessextensions.h
+++ b/wifi/interface_wireless_wirelessextensions.h
@@ -40,7 +40,10 @@ extern "C"
class Interface_wireless_wirelessextensions:public Interface_wireless
{
-Q_OBJECT public:
+ Q_OBJECT
+ TQ_OBJECT
+
+public:
Interface_wireless_wirelessextensions (TQStringList * ignoreInterfaces);
TQTable* get_available_networks ();
diff --git a/wifi/kcmwifi/configadvanced.ui b/wifi/kcmwifi/configadvanced.ui
index beeda9fe..536fa9a5 100644
--- a/wifi/kcmwifi/configadvanced.ui
+++ b/wifi/kcmwifi/configadvanced.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>Form1</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>Form1</cstring>
</property>
@@ -25,7 +25,7 @@
</rect>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>lbl_channel</cstring>
</property>
@@ -41,7 +41,7 @@
<string>Channel:</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>lbl_txPower</cstring>
</property>
@@ -70,7 +70,7 @@
</rect>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>cb_forceAP</cstring>
</property>
@@ -96,7 +96,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -111,7 +111,7 @@
</rect>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>lbl_apMAC</cstring>
</property>
@@ -141,5 +141,5 @@
</property>
</widget>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/wifi/kcmwifi/configcrypto.ui b/wifi/kcmwifi/configcrypto.ui
index 7ef18da2..4dc4e408 100644
--- a/wifi/kcmwifi/configcrypto.ui
+++ b/wifi/kcmwifi/configcrypto.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ConfigCrypto</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>ConfigCrypto</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="3">
+ <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>gb_keys</cstring>
</property>
@@ -38,7 +38,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>lb_key1</cstring>
</property>
@@ -49,7 +49,7 @@
<string>The first encryption key. 5 or 13 characters are ASCII keys, 10 or 26 characters are hexadecimal keys.</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>lb_key3</cstring>
</property>
@@ -60,7 +60,7 @@
<string>The third encryption key. 5 or 13 characters are ASCII keys, 10 or 26 characters are hexadecimal keys.</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>lb_key2</cstring>
</property>
@@ -71,7 +71,7 @@
<string>The second encryption key. 5 or 13 characters are ASCII keys, 10 or 26 characters are hexadecimal keys.</string>
</property>
</widget>
- <widget class="QLabel" row="3" column="0">
+ <widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>lb_key4</cstring>
</property>
@@ -82,7 +82,7 @@
<string>The fourth encryption key. 5 or 13 characters are ASCII keys, 10 or 26 characters are hexadecimal keys.</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="2">
+ <widget class="TQLabel" row="0" column="2">
<property name="name">
<cstring>format_1</cstring>
</property>
@@ -101,7 +101,7 @@
<enum>RichText</enum>
</property>
</widget>
- <widget class="QLabel" row="1" column="2">
+ <widget class="TQLabel" row="1" column="2">
<property name="name">
<cstring>format_2</cstring>
</property>
@@ -146,7 +146,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QLabel" row="2" column="2">
+ <widget class="TQLabel" row="2" column="2">
<property name="name">
<cstring>format_3</cstring>
</property>
@@ -178,7 +178,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QLabel" row="3" column="2">
+ <widget class="TQLabel" row="3" column="2">
<property name="name">
<cstring>format_4</cstring>
</property>
@@ -212,7 +212,7 @@
</widget>
</grid>
</widget>
- <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="3">
+ <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>bg_cryptoMode</cstring>
</property>
@@ -226,7 +226,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>rb_openMode</cstring>
</property>
@@ -237,7 +237,7 @@
<string>Makes the card accept encrypted and unencrypted packets.</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>rb_restrictMode</cstring>
</property>
@@ -260,14 +260,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>80</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>lb_useKey</cstring>
</property>
@@ -278,7 +278,7 @@
<string>Sets which of the four keys is to be used for transmitting packets.</string>
</property>
</widget>
- <widget class="QComboBox" row="0" column="1">
+ <widget class="TQComboBox" row="0" column="1">
<item>
<property name="text">
<string>Key 1</string>
@@ -308,27 +308,27 @@
<connections>
<connection>
<sender>le_key1</sender>
- <signal>textChanged(const QString&amp;)</signal>
+ <signal>textChanged(const TQString&amp;)</signal>
<receiver>ConfigCrypto</receiver>
- <slot>slotUpdateKey1Status(const QString&amp;)</slot>
+ <slot>slotUpdateKey1tqStatus(const TQString&amp;)</slot>
</connection>
<connection>
<sender>le_key2</sender>
- <signal>textChanged(const QString&amp;)</signal>
+ <signal>textChanged(const TQString&amp;)</signal>
<receiver>ConfigCrypto</receiver>
- <slot>slotUpdateKey2Status(const QString&amp;)</slot>
+ <slot>slotUpdateKey2tqStatus(const TQString&amp;)</slot>
</connection>
<connection>
<sender>le_key3</sender>
- <signal>textChanged(const QString&amp;)</signal>
+ <signal>textChanged(const TQString&amp;)</signal>
<receiver>ConfigCrypto</receiver>
- <slot>slotUpdateKey3Status(const QString&amp;)</slot>
+ <slot>slotUpdateKey3tqStatus(const TQString&amp;)</slot>
</connection>
<connection>
<sender>le_key4</sender>
- <signal>textChanged(const QString&amp;)</signal>
+ <signal>textChanged(const TQString&amp;)</signal>
<receiver>ConfigCrypto</receiver>
- <slot>slotUpdateKey4Status(const QString&amp;)</slot>
+ <slot>slotUpdateKey4tqStatus(const TQString&amp;)</slot>
</connection>
</connections>
<tabstops>
@@ -344,18 +344,18 @@
<include location="local" impldecl="in declaration">wificonfig.h</include>
<include location="local" impldecl="in implementation">configcrypto.ui.h</include>
</includes>
-<slots>
- <slot>slotUpdateKey1Status( const QString &amp; key )</slot>
- <slot>slotUpdateKey2Status( const QString &amp; key )</slot>
- <slot>slotUpdateKey3Status( const QString &amp; key )</slot>
- <slot>slotUpdateKey4Status( const QString &amp; key )</slot>
-</slots>
+<Q_SLOTS>
+ <slot>slotUpdateKey1tqStatus( const TQString &amp; key )</slot>
+ <slot>slotUpdateKey2tqStatus( const TQString &amp; key )</slot>
+ <slot>slotUpdateKey3tqStatus( const TQString &amp; key )</slot>
+ <slot>slotUpdateKey4tqStatus( const TQString &amp; key )</slot>
+</Q_SLOTS>
<functions>
<function specifier="non virtual">load( const IfConfig &amp; ifconfig )</function>
<function specifier="non virtual">save( IfConfig &amp; ifconfig )</function>
</functions>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/wifi/kcmwifi/configcrypto.ui.h b/wifi/kcmwifi/configcrypto.ui.h
index 261e3411..be561bff 100644
--- a/wifi/kcmwifi/configcrypto.ui.h
+++ b/wifi/kcmwifi/configcrypto.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
@@ -32,7 +32,7 @@ void ConfigCrypto::save( IfConfig &ifconfig )
}
-void ConfigCrypto::slotUpdateKey1Status(const TQString& key)
+void ConfigCrypto::slotUpdateKey1tqStatus(const TQString& key)
{
KeyStates status = ::Key::isValid( key );
switch (status) {
@@ -63,7 +63,7 @@ void ConfigCrypto::slotUpdateKey1Status(const TQString& key)
}
}
-void ConfigCrypto::slotUpdateKey2Status(const TQString& key)
+void ConfigCrypto::slotUpdateKey2tqStatus(const TQString& key)
{
KeyStates status = ::Key::isValid( key );
switch (status) {
@@ -94,7 +94,7 @@ void ConfigCrypto::slotUpdateKey2Status(const TQString& key)
}
}
-void ConfigCrypto::slotUpdateKey3Status(const TQString& key)
+void ConfigCrypto::slotUpdateKey3tqStatus(const TQString& key)
{
KeyStates status = ::Key::isValid( key );
switch (status) {
@@ -125,7 +125,7 @@ void ConfigCrypto::slotUpdateKey3Status(const TQString& key)
}
}
-void ConfigCrypto::slotUpdateKey4Status(const TQString& key)
+void ConfigCrypto::slotUpdateKey4tqStatus(const TQString& key)
{
KeyStates status = ::Key::isValid( key );
switch (status) {
diff --git a/wifi/kcmwifi/configpower.ui b/wifi/kcmwifi/configpower.ui
index fa44c928..c1ec4fd7 100644
--- a/wifi/kcmwifi/configpower.ui
+++ b/wifi/kcmwifi/configpower.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ConfigPower</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>ConfigPower</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>lb_sleepTimeout</cstring>
</property>
@@ -55,7 +55,7 @@
<string> sec</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>lb_wakeupPeriod</cstring>
</property>
@@ -66,7 +66,7 @@
<string>Sets how long the card will be online and looking for new packages before it falls asleep.</string>
</property>
</widget>
- <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="2">
+ <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>bg_packets</cstring>
</property>
@@ -80,7 +80,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>bg_allPackets</cstring>
</property>
@@ -91,7 +91,7 @@
<string>Listen to all packet types.</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>rb_unicastOnly</cstring>
</property>
@@ -102,7 +102,7 @@
<string>Listen to Unicast packets only.</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>rb_multicastOnly</cstring>
</property>
@@ -145,12 +145,12 @@
<include location="local" impldecl="in declaration">wificonfig.h</include>
<include location="local" impldecl="in implementation">configpower.ui.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot>load( const IfConfig &amp; ifconfig )</slot>
<slot>save( IfConfig &amp; ifconfig )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/wifi/kcmwifi/configpower.ui.h b/wifi/kcmwifi/configpower.ui.h
index feb0906f..2c197703 100644
--- a/wifi/kcmwifi/configpower.ui.h
+++ b/wifi/kcmwifi/configpower.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/wifi/kcmwifi/ifconfigpage.cpp b/wifi/kcmwifi/ifconfigpage.cpp
index 8b96b63b..01dee241 100644
--- a/wifi/kcmwifi/ifconfigpage.cpp
+++ b/wifi/kcmwifi/ifconfigpage.cpp
@@ -37,8 +37,8 @@
#include <unistd.h>
#include <sys/types.h>
-IfConfigPage::IfConfigPage( int configNum, TQWidget *parent, const char *name )
- : IfConfigPageBase( parent, name ),
+IfConfigPage::IfConfigPage( int configNum, TQWidget *tqparent, const char *name )
+ : IfConfigPageBase( tqparent, name ),
m_configNum( configNum )
{
connect( cb_pmEnabled, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) );
@@ -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()? TQString::null :
+ ifconfig.m_interface = cb_Autodetect->isChecked()? TQString() :
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 bb79f215..5e09e46d 100644
--- a/wifi/kcmwifi/ifconfigpage.h
+++ b/wifi/kcmwifi/ifconfigpage.h
@@ -26,9 +26,10 @@
class IfConfigPage : public IfConfigPageBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- IfConfigPage( int configNum, TQWidget *parent, const char *name );
+ IfConfigPage( int configNum, TQWidget *tqparent, const char *name );
~IfConfigPage() {}
void load();
diff --git a/wifi/kcmwifi/ifconfigpagebase.ui b/wifi/kcmwifi/ifconfigpagebase.ui
index 45df9e19..51e48c22 100644
--- a/wifi/kcmwifi/ifconfigpagebase.ui
+++ b/wifi/kcmwifi/ifconfigpagebase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>IfConfigPageBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>IfConfigPageBase</cstring>
</property>
@@ -16,15 +16,15 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="0" column="0">
+ <widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>layout16</cstring>
+ <cstring>tqlayout16</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>lb_netName</cstring>
</property>
@@ -40,7 +40,7 @@
<cstring>le_networkName</cstring>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>lb_ifName</cstring>
</property>
@@ -51,7 +51,7 @@
<string>SSID of the network to connect to. "any" means "arbitrary available network".</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>le_interface</cstring>
</property>
@@ -59,7 +59,7 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>cb_Autodetect</cstring>
</property>
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>226</width>
<height>20</height>
@@ -89,15 +89,15 @@
</spacer>
</hbox>
</widget>
- <widget class="QLayoutWidget" row="4" column="0">
+ <widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
- <cstring>layout13</cstring>
+ <cstring>tqlayout13</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>lb_connectScript</cstring>
</property>
@@ -126,7 +126,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>196</width>
<height>20</height>
@@ -135,15 +135,15 @@
</spacer>
</hbox>
</widget>
- <widget class="QLayoutWidget" row="5" column="0">
+ <widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>layout11</cstring>
+ <cstring>tqlayout11</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>cb_pmEnabled</cstring>
</property>
@@ -154,7 +154,7 @@
<string>Enables advanced power management settings.</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>pb_setupPower</cstring>
</property>
@@ -178,7 +178,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>285</width>
<height>20</height>
@@ -187,15 +187,15 @@
</spacer>
</hbox>
</widget>
- <widget class="QLayoutWidget" row="2" column="0">
+ <widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -206,7 +206,7 @@
<string>Sets the connection speed. Not all cards support this.</string>
</property>
</widget>
- <widget class="QComboBox">
+ <widget class="TQComboBox">
<item>
<property name="text">
<string>Auto</string>
@@ -286,7 +286,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>190</width>
<height>20</height>
@@ -295,15 +295,15 @@
</spacer>
</hbox>
</widget>
- <widget class="QLayoutWidget" row="1" column="0">
+ <widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>lb_opMode</cstring>
</property>
@@ -314,7 +314,7 @@
<string>Operation mode of the card. For standard infrastructure networks, "Managed" is appropriate.</string>
</property>
</widget>
- <widget class="QComboBox">
+ <widget class="TQComboBox">
<item>
<property name="text">
<string>Ad-Hoc</string>
@@ -354,7 +354,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>413</width>
<height>20</height>
@@ -363,15 +363,15 @@
</spacer>
</hbox>
</widget>
- <widget class="QLayoutWidget" row="3" column="0">
+ <widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>layout14</cstring>
+ <cstring>tqlayout14</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>cb_runScript</cstring>
</property>
@@ -392,7 +392,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>131</width>
<height>20</height>
@@ -401,15 +401,15 @@
</spacer>
</hbox>
</widget>
- <widget class="QLayoutWidget" row="6" column="0">
+ <widget class="TQLayoutWidget" row="6" column="0">
<property name="name">
- <cstring>layout17</cstring>
+ <cstring>tqlayout17</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>cb_useCrypto</cstring>
</property>
@@ -420,7 +420,7 @@
<string>Enables WEP encryption.</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>pb_setupCrypto</cstring>
</property>
@@ -444,7 +444,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>396</width>
<height>20</height>
@@ -489,8 +489,8 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kurlrequester.h</includehint>
diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp
index 743f3d2e..8251afa0 100644
--- a/wifi/kcmwifi/kcmwifi.cpp
+++ b/wifi/kcmwifi/kcmwifi.cpp
@@ -42,8 +42,8 @@
typedef KGenericFactory < KCMWifi, TQWidget > KWiFiFactory;
K_EXPORT_COMPONENT_FACTORY (kcm_wifi, KWiFiFactory("kcmwifi") )
-KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &)
- : KCModule (parent, name)
+KCMWifi::KCMWifi(TQWidget * tqparent, const char *name, const TQStringList &)
+ : KCModule (tqparent, name)
{
tabs = new TQTabWidget (this, "tabs");
@@ -54,7 +54,7 @@ KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &)
for ( int i=0; i<config->m_numConfigs; ++i )
{
IfConfigPage *ifConfigPage = new IfConfigPage( i, tabs, "m_configPage" );
- tabs->addTab(ifConfigPage, i18n ("Config &%1").arg( i+1 ));
+ tabs->addTab(ifConfigPage, i18n ("Config &%1").tqarg( i+1 ));
connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) );
m_ifConfigPage[ i ] = ifConfigPage;
@@ -146,7 +146,7 @@ IfConfigPage* KCMWifi::addConfigTab( int count, bool vendor )
if (vendor)
{
IfConfigPage *ifConfigPage = new IfConfigPage( vendorBase + m_activeVendorCount, tabs, "m_configPage" );
- tabs->addTab(ifConfigPage, i18n ("Vendor %1").arg( m_activeVendorCount+1 ) );
+ tabs->addTab(ifConfigPage, i18n ("Vendor %1").tqarg( m_activeVendorCount+1 ) );
connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) );
m_ifConfigPage[ vendorBase+m_activeVendorCount ] = ifConfigPage;
m_mainConfig->registerConfig( vendorBase+m_activeVendorCount );
@@ -169,7 +169,7 @@ IfConfigPage* KCMWifi::addConfigTab( int count, bool vendor )
for ( int i=config->m_numConfigs; i<config->m_numConfigs+count; i++ )
{
IfConfigPage *ifConfigPage = new IfConfigPage( i, tabs, "m_configPage" );
- tabs->insertTab(ifConfigPage, i18n ("Config &%1").arg( i+1 ), i );
+ tabs->insertTab(ifConfigPage, i18n ("Config &%1").tqarg( i+1 ), i );
connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) );
m_ifConfigPage[ i ] = ifConfigPage;
m_mainConfig->registerConfig( i+1 );
@@ -295,8 +295,8 @@ void KCMWifi::activate()
if ( ifconfig.m_keys[ i ].isValid( ifconfig.m_keys[ i ].key() ) > INVALID )
{
proc << "key"
- << TQString( "[%1]").arg( i+1 )
- << TQString( "%1").arg( ifconfig.m_keys[ i ].rawKey() );
+ << TQString( "[%1]").tqarg( i+1 )
+ << TQString( "%1").tqarg( ifconfig.m_keys[ i ].rawKey() );
}
}
@@ -308,7 +308,7 @@ void KCMWifi::activate()
proc << "key"
<< ifconfig.cryptomodeAsString();
proc << "key"
- << TQString( "[%1]" ).arg( ifconfig.activeKeyId() );
+ << TQString( "[%1]" ).tqarg( ifconfig.activeKeyId() );
proc << "key"
<< "on";
}
@@ -334,10 +334,10 @@ void KCMWifi::activate()
{
proc << "power"
<< "period"
- << TQString( "%1" ).arg( ifconfig.m_wakeupPeriod );
+ << TQString( "%1" ).tqarg( ifconfig.m_wakeupPeriod );
proc << "power"
<< "timeout"
- << TQString( "%1" ).arg( ifconfig.m_sleepTimeout );
+ << TQString( "%1" ).tqarg( ifconfig.m_sleepTimeout );
proc << ifconfig.powermodeAsString();
}
diff --git a/wifi/kcmwifi/kcmwifi.h b/wifi/kcmwifi/kcmwifi.h
index 8fcd72db..ad90a00e 100644
--- a/wifi/kcmwifi/kcmwifi.h
+++ b/wifi/kcmwifi/kcmwifi.h
@@ -33,8 +33,9 @@ class KProcIO;
class KCMWifi : public KCModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- KCMWifi (TQWidget * parent, const char *name, const TQStringList &);
+ KCMWifi (TQWidget * tqparent, const char *name, const TQStringList &);
~KCMWifi ();
void load();
diff --git a/wifi/kcmwifi/mainconfig.cpp b/wifi/kcmwifi/mainconfig.cpp
index c740df69..6989316a 100644
--- a/wifi/kcmwifi/mainconfig.cpp
+++ b/wifi/kcmwifi/mainconfig.cpp
@@ -33,13 +33,13 @@
#include <tqcheckbox.h>
#include <tqfile.h>
-MainConfig::MainConfig( TQWidget *parent, const char *name )
- : MainConfigBase( parent, name )
+MainConfig::MainConfig( TQWidget *tqparent, const char *name )
+ : MainConfigBase( tqparent, name )
{
WifiConfig *config = WifiConfig::instance();
for (int i=1;i<=config->m_numConfigs;i++) {
- cmb_presetConfig->insertItem( i18n( "Config %1" ).arg( i ) );
+ cmb_presetConfig->insertItem( i18n( "Config %1" ).tqarg( i ) );
}
@@ -78,12 +78,12 @@ void MainConfig::slotChangeNumConfigs( int newnumber )
if ( config->m_numConfigs < newnumber ) // number of configs raised
{
int diff = newnumber - config->m_numConfigs;
- ( (KCMWifi*)parentWidget() )->addConfigTab( diff, false );
+ ( (KCMWifi*)tqparentWidget() )->addConfigTab( diff, false );
}
else // number of configs lowered
{
int diff = config->m_numConfigs - newnumber;
- ( (KCMWifi*)parentWidget() )->delConfigTab( diff );
+ ( (KCMWifi*)tqparentWidget() )->delConfigTab( diff );
}
}
@@ -91,12 +91,12 @@ void MainConfig::registerConfig( int number )
{
if ( number >= KCMWifi::vendorBase )
{
- cmb_presetConfig->insertItem( i18n( "Vendor %1" ).arg( number-KCMWifi::vendorBase+1 ) );
+ cmb_presetConfig->insertItem( i18n( "Vendor %1" ).tqarg( number-KCMWifi::vendorBase+1 ) );
}
else
{
WifiConfig* config = WifiConfig::instance();
- cmb_presetConfig->insertItem( i18n( "Config %1" ).arg( number ), number-1 );
+ cmb_presetConfig->insertItem( i18n( "Config %1" ).tqarg( number ), number-1 );
}
}
diff --git a/wifi/kcmwifi/mainconfig.h b/wifi/kcmwifi/mainconfig.h
index edc09560..d485b524 100644
--- a/wifi/kcmwifi/mainconfig.h
+++ b/wifi/kcmwifi/mainconfig.h
@@ -28,9 +28,10 @@ class KProcIO;
class MainConfig : public MainConfigBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- MainConfig( TQWidget *parent, const char *name=0 );
+ MainConfig( TQWidget *tqparent, const char *name=0 );
~MainConfig() {}
void load();
diff --git a/wifi/kcmwifi/mainconfigbase.ui b/wifi/kcmwifi/mainconfigbase.ui
index f7ecef24..b47161ee 100644
--- a/wifi/kcmwifi/mainconfigbase.ui
+++ b/wifi/kcmwifi/mainconfigbase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>MainConfigBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="geometry">
<rect>
<x>0</x>
@@ -16,7 +16,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>grpGeneralSettings</cstring>
</property>
@@ -48,14 +48,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>146</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>lb_numConfig</cstring>
</property>
@@ -96,7 +96,7 @@
<number>10</number>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>lb_config</cstring>
</property>
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>106</width>
<height>20</height>
@@ -134,14 +134,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>66</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3">
+ <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>cb_usePreset</cstring>
</property>
@@ -156,7 +156,7 @@
</widget>
</vbox>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kcombobox.h</includehint>
diff --git a/wifi/kcmwifi/vendorconfig.cpp b/wifi/kcmwifi/vendorconfig.cpp
index e415c276..01936667 100644
--- a/wifi/kcmwifi/vendorconfig.cpp
+++ b/wifi/kcmwifi/vendorconfig.cpp
@@ -89,7 +89,7 @@ VendorConfig::initSuSE_92plus ( )
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";
+ kdDebug ( ) << "Variable " << var << " tqcontains " << value << ".\n";
// evaluate the meaningful lines
if ( var == "WIRELESS_ESSID" )
{
@@ -182,16 +182,16 @@ is incremented _after_ successful setup of each given config. */
// lines look like wireless-defaultkey bla, so split it into wireless-defaultkey and bla
TQString var = buffer.section ( ' ', 0, 0 );
TQString value = buffer.section ( ' ', 1, 1 );
- kdDebug ( ) << "Variable " << var << " contains " << value << ".\n";
+ kdDebug ( ) << "Variable " << var << " tqcontains " << value << ".\n";
// evaluate the meaningful lines
- if ( var.startsWith ( "wireless", false ) )
+ if ( var.tqstartsWith ( "wireless", false ) )
{
if ( var.endsWith ( "essid" ) )
{
newtab->le_networkName->setText ( value );
}
- else if ( var.endsWith ( "mode" ) && !var.contains ( "key" ) )
+ else if ( var.endsWith ( "mode" ) && !var.tqcontains ( "key" ) )
{
newtab->cmb_wifiMode->setCurrentItem ( IfConfig::convertToWifiModeFromString ( value ) );
@@ -203,15 +203,15 @@ is incremented _after_ successful setup of each given config. */
newtab->cmb_speed->setCurrentItem ( IfConfig::convertToSpeedFromString ( value ) );
}
- else if ( var.contains ( "key" ) )
+ else if ( var.tqcontains ( "key" ) )
{
// Could be any of key, key1, key2, ..., or defaultkey
- if ( var.contains ( "default" ) )
+ if ( var.tqcontains ( "default" ) )
{
crypto->cmb_activeKey->setCurrentItem ( value.toInt ( ) );
}
- else if ( var.contains ( "mode" ) )
+ else if ( var.tqcontains ( "mode" ) )
{
if ( value == "shared" || value == "sharedkey" || value == "restricted" )
{
diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp
index 1cd6b3f2..1f3087ba 100644
--- a/wifi/kcmwifi/wificonfig.cpp
+++ b/wifi/kcmwifi/wificonfig.cpp
@@ -119,7 +119,7 @@ void IfConfig::load( KConfig *config, int i )
{
TQString entry;
- TQString group = TQString( "Configuration %1" ).arg( i+1 );
+ TQString group = TQString( "Configuration %1" ).tqarg( i+1 );
config->setGroup( group );
m_networkName = config->readEntry( "NetworkName" );
@@ -150,7 +150,7 @@ void IfConfig::load( KConfig *config, int i )
void IfConfig::save( KConfig *config, int i )
{
- TQString group = TQString( "Configuration %1" ).arg( i+1 );
+ TQString group = TQString( "Configuration %1" ).tqarg( i+1 );
config->setGroup( group );
config->writeEntry( "NetworkName", m_networkName );
@@ -246,9 +246,9 @@ TQString WifiConfig::autoDetectInterface()
while ( !procFile.atEnd() )
{
procFile.readLine( line, 9999 );
- if ( line.find( ":" ) > 0 )
+ if ( line.tqfind( ":" ) > 0 )
{
- line.truncate ( line.find( ":" ) );
+ line.truncate ( line.tqfind( ":" ) );
list.append( line.stripWhiteSpace() );
}
}
@@ -264,7 +264,7 @@ TQString WifiConfig::autoDetectInterface()
for ( TQStringList::Iterator it = list.begin (); it != list.end (); ++it )
{
- if ( ((*it).contains("wifi"))==0 ) { // if the name is wifiX, ignore
+ if ( ((*it).tqcontains("wifi"))==0 ) { // if the name is wifiX, ignore
KProcIO test;
test << "iwconfig";
test << *it;
@@ -288,9 +288,9 @@ void WifiConfig::slotTestInterface( KProcIO *proc )
{
TQString output;
proc->readln( output );
- if ( output.find ( "no wireless extensions" ) == -1 )
+ if ( output.tqfind ( "no wireless extensions" ) == -1 )
{
- output.truncate( output.find ( " " ) );
+ output.truncate( output.tqfind ( " " ) );
m_detectedInterface = output.stripWhiteSpace();
printf("[kcontrol wificonfig] Wireless extensions not available on specified interface\n\r");
}
@@ -328,7 +328,7 @@ Key IfConfig::activeKey()
IfConfig::Speed IfConfig::convertToSpeedFromString( const TQString &s )
{
- return ( IfConfig::Speed )speedList.findIndex( s );
+ return ( IfConfig::Speed )speedList.tqfindIndex( s );
}
void IfConfig::speedFromString( const TQString &s )
@@ -338,7 +338,7 @@ void IfConfig::speedFromString( const TQString &s )
IfConfig::WifiMode IfConfig::convertToWifiModeFromString( const TQString &s )
{
- return ( IfConfig::WifiMode )wifiModeList.findIndex( s );
+ return ( IfConfig::WifiMode )wifiModeList.tqfindIndex( s );
}
void IfConfig::wifimodeFromString( const TQString &s )
@@ -348,7 +348,7 @@ void IfConfig::wifimodeFromString( const TQString &s )
IfConfig::CryptoMode IfConfig::convertToCryptoModeFromString( const TQString &s )
{
- return ( IfConfig::CryptoMode )cryptoModeList.findIndex( s );
+ return ( IfConfig::CryptoMode )cryptoModeList.tqfindIndex( s );
}
void IfConfig::cryptomodeFromString( const TQString &s )
@@ -358,7 +358,7 @@ void IfConfig::cryptomodeFromString( const TQString &s )
IfConfig::PowerMode IfConfig::convertToPowerModeFromString( const TQString &s )
{
- return ( IfConfig::PowerMode )powerModeList.findIndex( s );
+ return ( IfConfig::PowerMode )powerModeList.tqfindIndex( s );
}
void IfConfig::powermodeFromString( const TQString &s )
diff --git a/wifi/kcmwifi/wificonfig.h b/wifi/kcmwifi/wificonfig.h
index b78e32f6..25b8b88a 100644
--- a/wifi/kcmwifi/wificonfig.h
+++ b/wifi/kcmwifi/wificonfig.h
@@ -96,9 +96,10 @@ class IfConfig
int m_wakeupPeriod;
};
-class WifiConfig : QObject
+class WifiConfig : TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
static WifiConfig *instance();
TQString autoDetectInterface();
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 4267b7ed..8cc88943 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -163,9 +163,9 @@ KWiFiManagerApp::init_whois_db ()
while (datei.readLine (content, 255) != -1)
{
TQString temp (content);
- content.truncate (content.find (' '));
+ content.truncate (content.tqfind (' '));
content = content.upper ();
- content2 = temp.right (temp.length () - temp.find (' ') - 1);
+ content2 = temp.right (temp.length () - temp.tqfind (' ') - 1);
content2.truncate (content2.length () - 1);
APs << content << content2;
}
@@ -184,7 +184,7 @@ KWiFiManagerApp::slotLogESSID (TQString essid)
if (!log_file.open (IO_WriteOnly | IO_Append))
kdDebug () << "Logging failed!" << endl;
TQTextStream stream (&log_file);
- stream << TQDateTime::currentDateTime().toString ().latin1 ();
+ stream << TQDateTime::tqcurrentDateTime().toString ().latin1 ();
stream << " Entering network: " << essid.latin1() << endl;
log_file.close ();
}
@@ -262,7 +262,7 @@ KWiFiManagerApp::slotChangeTrayIcon ()
}
else if (((str == 0) && (mode == 2)) || (!validdata))
{
- sstrength2.setText( TQString::fromLatin1("0") );
+ sstrength2.setText( TQString::tqfromLatin1("0") );
ICON = strength->OOR_DOWN;
if (led->state == true)
led->Off ();
@@ -286,7 +286,7 @@ KWiFiManagerApp::slotChangeTrayIcon ()
labelfont.setStretch( TQFont::Condensed );
labelfont.setBold( true );
sstrength2.setFont( labelfont );
- sstrength2.setFixedSize( sstrength2.sizeHint() );
+ sstrength2.setFixedSize( sstrength2.tqsizeHint() );
}
TQPixmap labeltemp = TQPixmap::grabWidget( &sstrength2 );
labeltemp.setMask( labeltemp.createHeuristicMask() );
@@ -304,43 +304,43 @@ KWiFiManagerApp::initActions ()
KConfig* config = kapp->config();
if (config->hasGroup("General"))
config->setGroup("General");
- fileDisableRadio = new KToggleAction (i18n ("&Disable Radio"), 0, this,
+ fileDisableRadio = new KToggleAction (i18n ("&Disable Radio"), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotDisableRadio ()), actionCollection (), "disable_radio");
fileDisableRadio->setChecked( false );
settingsUseAlternateCalc =
- new KToggleAction (i18n ("&Use Alternate Strength Calculation"), 0, this,
+ new KToggleAction (i18n ("&Use Alternate Strength Calculation"), 0, TQT_TQOBJECT(this),
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,
+ new KToggleAction (i18n ("Show &Noise Graph in Statistics Window"), 0, TQT_TQOBJECT(this),
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,
+ settingsShowStrengthNumber = new KToggleAction (i18n ("&Show Strength Number in System Tray"), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotToggleShowStrengthNumber ()), actionCollection (), "show_strength_number_in_tray");
settingsShowStrengthNumber->setChecked( config->readBoolEntry("showStrengthNumberInTray") );
slotToggleShowStrengthNumber (); //set to value saved by KConfig
- KStdAction::quit (this, TQT_SLOT (slotFileQuit ()), actionCollection ());
+ KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT (slotFileQuit ()), actionCollection ());
- new KAction (i18n ("Configuration &Editor..."), 0, this,
+ new KAction (i18n ("Configuration &Editor..."), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotStartConfigEditor ()), actionCollection (), "configuration_editor");
- new KAction (i18n ("Connection &Statistics"), 0, this,
+ new KAction (i18n ("Connection &Statistics"), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotStartStatViewer ()), actionCollection (), "connection_statistics");
- settingsAcousticScanning = new KToggleAction (i18n ("&Acoustic Scanning"), 0, this,
+ settingsAcousticScanning = new KToggleAction (i18n ("&Acoustic Scanning"), 0, TQT_TQOBJECT(this),
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,
+ settingsStayInSystrayOnClose = new KToggleAction (i18n ("Stay in System &Tray on Close"), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotToggleStayInSystray()),
actionCollection (), "stay_in_systray_on_close");
settingsStayInSystrayOnClose->setChecked( config->readBoolEntry("stayInSystrayOnClose") );
@@ -360,10 +360,10 @@ KWiFiManagerApp::initView ()
view = new TQWidget (this, "mainwidget");
view->setBackgroundMode (PaletteBackground);
setCentralWidget (view);
- TQGridLayout *zentrallayout = new TQGridLayout (view);
- zentrallayout->setMargin( KDialog::marginHint() );
+ TQGridLayout *zentraltqlayout = new TQGridLayout (view);
+ zentraltqlayout->setMargin( KDialog::marginHint() );
speedmeter = new Speed (view, device);
- status = new Status (view, device);
+ status = new tqStatus (view, device);
location = new Locator (view, device);
strength = new Strength (view, device);
pictogram = new Picture (view, device);
@@ -377,25 +377,25 @@ KWiFiManagerApp::initView ()
strength->setMinimumSize (strength->mySizeHint());
speedmeter->setMinimumHeight (60);
status->setMinimumHeight (60);
- zentrallayout->addWidget (pictogram, 0, 0);
- zentrallayout->addWidget (strength, 1, 0);
- zentrallayout->addWidget (speedmeter, 0, 1);
- zentrallayout->addMultiCellWidget (status, 1, 2, 1, 1);
- zentrallayout->addWidget (scan, 2, 0);
- zentrallayout->addMultiCellWidget (location, 3, 3, 0, 1, Qt::AlignLeft);
+ zentraltqlayout->addWidget (pictogram, 0, 0);
+ zentraltqlayout->addWidget (strength, 1, 0);
+ zentraltqlayout->addWidget (speedmeter, 0, 1);
+ zentraltqlayout->addMultiCellWidget (status, 1, 2, 1, 1);
+ zentraltqlayout->addWidget (scan, 2, 0);
+ zentraltqlayout->addMultiCellWidget (location, 3, 3, 0, 1, TQt::AlignLeft);
connect (device, TQT_SIGNAL (interfaceChanged ()), this, TQT_SLOT (slotChangeWindowCaption ()));
connect (device, TQT_SIGNAL (strengthChanged ()), this, TQT_SLOT (slotChangeTrayIcon ()));
- connect (device, TQT_SIGNAL (strengthChanged ()), strength, TQT_SLOT (repaint ()));
- connect (device, TQT_SIGNAL (statusChanged ()), status, TQT_SLOT (repaint ()));
- connect (device, TQT_SIGNAL (speedChanged ()), speedmeter, TQT_SLOT (repaint ()));
- connect (device, TQT_SIGNAL (modeChanged ()), pictogram, TQT_SLOT (repaint ()));
+ connect (device, TQT_SIGNAL (strengthChanged ()), strength, TQT_SLOT (tqrepaint ()));
+ connect (device, TQT_SIGNAL (statusChanged ()), status, TQT_SLOT (tqrepaint ()));
+ connect (device, TQT_SIGNAL (speedChanged ()), speedmeter, TQT_SLOT (tqrepaint ()));
+ connect (device, TQT_SIGNAL (modeChanged ()), pictogram, TQT_SLOT (tqrepaint ()));
connect (device, TQT_SIGNAL (essidChanged (TQString)), this, TQT_SLOT (slotLogESSID (TQString)));
- connect (device, TQT_SIGNAL (essidChanged (TQString)), location, TQT_SLOT (repaint ()));
- connect (device, TQT_SIGNAL (statusChanged ()), location, TQT_SLOT (repaint ()));
+ connect (device, TQT_SIGNAL (essidChanged (TQString)), location, TQT_SLOT (tqrepaint ()));
+ connect (device, TQT_SIGNAL (statusChanged ()), location, TQT_SLOT (tqrepaint ()));
connect (device, TQT_SIGNAL (txPowerChanged ()), this, TQT_SLOT (slotTXPowerChanged ()));
connect (device, TQT_SIGNAL (txPowerChanged ()), this, TQT_SLOT (slotChangeTrayIcon ()));
- connect (device, TQT_SIGNAL (txPowerChanged ()), pictogram, TQT_SLOT (repaint ()));
- connect (device, TQT_SIGNAL (txPowerChanged ()), strength, TQT_SLOT (repaint ()));
+ connect (device, TQT_SIGNAL (txPowerChanged ()), pictogram, TQT_SLOT (tqrepaint ()));
+ connect (device, TQT_SIGNAL (txPowerChanged ()), strength, TQT_SLOT (tqrepaint ()));
connect (scan, TQT_SIGNAL (clicked()), this, TQT_SLOT (slotNetworkScan()));
}
@@ -427,7 +427,7 @@ KWiFiManagerApp::slotStartStatViewer ()
delete statistik;
statistik = new Statistics (device, showStatsNoise);
statistik->setFixedSize (590, 300);
- connect(device,TQT_SIGNAL(statsUpdated()),statistik,TQT_SLOT(repaint()));
+ connect(device,TQT_SIGNAL(statsUpdated()),statistik,TQT_SLOT(tqrepaint()));
statistik->show ();
}
@@ -618,7 +618,7 @@ TQStringList usedInterfacesList()
for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it )
{
TQCString &clientId = *it;
- if ( qstrncmp(clientId, "kwifimanager", 12) != 0 )
+ if ( tqstrncmp(clientId, "kwifimanager", 12) != 0 )
continue;
DCOPRef ask( clientId, "dcop_interface" );
diff --git a/wifi/kwifimanager.h b/wifi/kwifimanager.h
index e89c8d88..0a91605b 100644
--- a/wifi/kwifimanager.h
+++ b/wifi/kwifimanager.h
@@ -22,7 +22,7 @@
#include <config.h>
#endif
-// include files for Qt
+// include files for TQt
class TQLabel;
class TQTimer;
class TQPixmap;
@@ -39,7 +39,7 @@ class KProcess;
#include "interface_wireless.h"
#include "interface_dcop.h"
class Strength;
-class Status;
+class tqStatus;
class Picture;
class Locator;
class Speed;
@@ -79,10 +79,13 @@ struct configuration_data
class KWiFiManagerApp:public KMainWindow, virtual public dcop_interface
{
-Q_OBJECT public:
- KWiFiManagerApp (TQWidget * parent = 0, const char * name = 0);
+ Q_OBJECT
+ TQ_OBJECT
+
+public:
+ KWiFiManagerApp (TQWidget * tqparent = 0, const char * name = 0);
~KWiFiManagerApp ();
- TQString interface () const { return device ? device->get_interface_name() : TQString::null; };
+ TQString interface () const { return device ? device->get_interface_name() : TQString(); };
public:
bool startDocked() { return m_startDocked; }
public slots:
@@ -112,7 +115,7 @@ private:
Speed *speedmeter;
TQBoxLayout *bla;
TQLabel *profil;
- Status *status;
+ tqStatus *status;
Strength *strength;
Picture *pictogram;
Locator *location;
diff --git a/wifi/kwireless/kwireless.cpp b/wifi/kwireless/kwireless.cpp
index 39b66a76..6fe1df9b 100644
--- a/wifi/kwireless/kwireless.cpp
+++ b/wifi/kwireless/kwireless.cpp
@@ -18,8 +18,8 @@
KWireLess::KWireLess(const TQString& configFile, Type type,
- int actions, TQWidget *parent, const char *name)
- : KPanelApplet(configFile, type, actions, parent, name)
+ int actions, TQWidget *tqparent, const char *name)
+ : KPanelApplet(configFile, type, actions, tqparent, name)
{
ksConfig = config();
@@ -76,13 +76,13 @@ void KWireLess::resizeEvent(TQResizeEvent *)
extern "C"
{
- KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
+ KDE_EXPORT KPanelApplet* init( TQWidget *tqparent, const TQString configFile)
{
KGlobal::locale()->insertCatalogue("kwireless");
return new KWireLess(configFile, KPanelApplet::Normal,
KPanelApplet::About,
// | KPanelApplet::Help | KPanelApplet::Preferences,
- parent, "kwireless");
+ tqparent, "kwireless");
}
}
diff --git a/wifi/kwireless/kwireless.h b/wifi/kwireless/kwireless.h
index 828ad184..3d4b7545 100644
--- a/wifi/kwireless/kwireless.h
+++ b/wifi/kwireless/kwireless.h
@@ -23,10 +23,11 @@ class KWireLessWidget;
class KWireLess : public KPanelApplet
{
Q_OBJECT
+ TQ_OBJECT
public:
KWireLess(const TQString& configFile, Type t = Normal, int actions = 0,
- TQWidget *parent = 0, const char *name = 0);
+ TQWidget *tqparent = 0, const char *name = 0);
~KWireLess();
virtual int widthForHeight(int height) const;
diff --git a/wifi/kwireless/kwirelesswidget.cpp b/wifi/kwireless/kwirelesswidget.cpp
index 08f4336b..b43e0a02 100644
--- a/wifi/kwireless/kwirelesswidget.cpp
+++ b/wifi/kwireless/kwirelesswidget.cpp
@@ -50,7 +50,7 @@ float DeviceInfo::quality()
TQString DeviceInfo::qualityString()
{
- return i18n("%1%").arg(TQString::number(m_quality*100, 'f', 0));
+ return i18n("%1%").tqarg(TQString::number(m_quality*100, 'f', 0));
}
float DeviceInfo::signal()
@@ -60,7 +60,7 @@ float DeviceInfo::signal()
TQString DeviceInfo::signalString()
{
- return i18n("%1%").arg(TQString::number(m_signal*100, 'f', 0));
+ return i18n("%1%").tqarg(TQString::number(m_signal*100, 'f', 0));
}
float DeviceInfo::noise()
@@ -70,7 +70,7 @@ float DeviceInfo::noise()
TQString DeviceInfo::noiseString()
{
- return i18n("%1%").arg(TQString::number(m_noise*100, 'f', 0));
+ return i18n("%1%").tqarg(TQString::number(m_noise*100, 'f', 0));
}
const TQString& DeviceInfo::device()
@@ -135,8 +135,8 @@ TQString DeviceInfo::encrString()
}
}
-KWireLessWidget::KWireLessWidget(TQWidget *parent, const char* name)
- : TQWidget(parent, name),
+KWireLessWidget::KWireLessWidget(TQWidget *tqparent, const char* name)
+ : TQWidget(tqparent, name),
mode(Horizontal),
frameWidth(1),
qualityBarWidth(6),
@@ -183,7 +183,7 @@ void KWireLessWidget::setMode(KWireLessWidget::Mode _mode)
void KWireLessWidget::mousePressEvent(TQMouseEvent *e)
{
- if( e->button() == TQMouseEvent::LeftButton)
+ if( e->button() == Qt::LeftButton)
{
PropertiesDialog dialog(this);
connect(this, TQT_SIGNAL(updateDeviceInfo(TQPtrList<DeviceInfo> *)),
@@ -195,7 +195,7 @@ void KWireLessWidget::mousePressEvent(TQMouseEvent *e)
void KWireLessWidget::paintEvent(TQPaintEvent*)
{
// WORK_TO_DO: paint other devices, too:
- // for quick repaints, we need a buffered painter!
+ // for quick tqrepaints, we need a buffered painter!
int w, h, space;
const int bevel = qualityBarWidth/2;
TQPainter painter(this);
@@ -206,26 +206,26 @@ void KWireLessWidget::paintEvent(TQPaintEvent*)
// non-nil):
space = 3 * frameWidth + qualityBarWidth + signalBarWidth + noiseBarWidth+1;
- if(mode == Horizontal)
+ if(mode ==Qt::Horizontal)
{
h = space;
w = width();
} else {
- // Vertical
+ //Qt::Vertical
h = height();
w = space;
}
- painter.setPen(TQPen(Qt::black, frameWidth));
+ painter.setPen(TQPen(TQt::black, frameWidth));
painter.setBrush(KGlobalSettings::baseColor());
painter.drawRect(0, 0, w, h);
int x = qualityBarWidth + frameWidth;
- mode == Vertical
+ mode ==Qt::Vertical
? painter.drawLine(x, frameWidth, x, h-frameWidth)
: painter.drawLine(frameWidth, x, w-frameWidth, x);
x += signalBarWidth + frameWidth;
- mode == Vertical
+ mode ==Qt::Vertical
? painter.drawLine(x, frameWidth, x, h-frameWidth)
: painter.drawLine(frameWidth, x, w-frameWidth, x);
@@ -236,18 +236,18 @@ void KWireLessWidget::paintEvent(TQPaintEvent*)
switch((int)(device->quality()*3))
{
case 0:
- color = Qt::darkRed;
- brush = Qt::red;
+ color = TQt::darkRed;
+ brush = TQt::red;
break;
case 1:
- color = Qt::darkYellow;
- brush = Qt::yellow;
+ color = TQt::darkYellow;
+ brush = TQt::yellow;
break;
default:
- color = Qt::darkGreen;
- brush = Qt::green;
+ color = TQt::darkGreen;
+ brush = TQt::green;
};
- if(mode == Vertical)
+ if(mode ==Qt::Vertical)
{
int position = (int)(((float)(h-2*frameWidth))*(1-device->quality())+0.5);
@@ -255,7 +255,7 @@ void KWireLessWidget::paintEvent(TQPaintEvent*)
(0, 4,
frameWidth, h - 2*frameWidth,
frameWidth, position + bevel/2,
- qualityBarWidth, QMAX(position - bevel/2, frameWidth),
+ qualityBarWidth, TQMAX(position - bevel/2, frameWidth),
qualityBarWidth, h - 2*frameWidth);
} else {
int position = (int)(((float)(w-2*frameWidth))*device->quality()+0.5);
@@ -263,8 +263,8 @@ void KWireLessWidget::paintEvent(TQPaintEvent*)
points.putPoints
(0, 4,
frameWidth, frameWidth,
- QMIN(position - bevel/2, w-frameWidth), frameWidth,
- QMIN(position + bevel/2, w-frameWidth), frameWidth+qualityBarWidth-1,
+ TQMIN(position - bevel/2, w-frameWidth), frameWidth,
+ TQMIN(position + bevel/2, w-frameWidth), frameWidth+qualityBarWidth-1,
frameWidth, frameWidth+qualityBarWidth-1);
}
painter.setPen(TQPen(color));
@@ -272,10 +272,10 @@ void KWireLessWidget::paintEvent(TQPaintEvent*)
painter.drawPolygon(points);
// draw the signal bar:
- painter.setPen(TQPen(Qt::darkRed));
- painter.setBrush(Qt::red);
+ painter.setPen(TQPen(TQt::darkRed));
+ painter.setBrush(TQt::red);
- if(mode == Vertical)
+ if(mode ==Qt::Vertical)
{
int x = 2 * frameWidth + qualityBarWidth;
int h1 = (int)(((float)(h-2*frameWidth))*(1-device->signal())+0.5);
@@ -289,10 +289,10 @@ void KWireLessWidget::paintEvent(TQPaintEvent*)
painter.drawRect(x, y, w1, signalBarWidth);
}
// draw the noise bar:
- painter.setPen(TQPen(Qt::gray));
- painter.setBrush(Qt::lightGray);
+ painter.setPen(TQPen(TQt::gray));
+ painter.setBrush(TQt::lightGray);
- if(mode == Vertical)
+ if(mode ==Qt::Vertical)
{
int x = 3 * frameWidth + qualityBarWidth + signalBarWidth;
int h1 = (int)(((float)(h-2*frameWidth))*(1-device->noise())+0.5);
@@ -308,17 +308,17 @@ void KWireLessWidget::paintEvent(TQPaintEvent*)
}
}
-KWireLessWidget* KWireLessWidget::makeWireLessWidget(TQWidget *parent,
+KWireLessWidget* KWireLessWidget::makeWireLessWidget(TQWidget *tqparent,
const char *name)
{
#if 1
// defined linuxwirelesswidget
- return new LinuxWireLessWidget(parent, name);
+ return new LinuxWireLessWidget(tqparent, name);
#else
#error KWireLess is not available for your OS
#endif
// just to shut the compiler up:
- parent = parent; name = name; return 0;
+ tqparent = tqparent; name = name; return 0;
}
#include "kwirelesswidget.moc"
diff --git a/wifi/kwireless/kwirelesswidget.h b/wifi/kwireless/kwirelesswidget.h
index 3321b583..534c16c4 100644
--- a/wifi/kwireless/kwirelesswidget.h
+++ b/wifi/kwireless/kwirelesswidget.h
@@ -18,8 +18,8 @@
class DeviceInfo
{
public:
- DeviceInfo(TQString _device=TQString::null, TQString _essid=TQString::null,
- TQString _encr=TQString::null,
+ DeviceInfo(TQString _device=TQString(), TQString _essid=TQString(),
+ TQString _encr=TQString(),
float _quality=0, float _signal=0, float _noise=0,
int _bitrate=0);
TQString bitrateString();
@@ -50,18 +50,19 @@ protected:
It is supposed to "look good" at about any resolution (to enable
it to be used in the panel). */
-class KWireLessWidget : public QWidget
+class KWireLessWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
enum Mode {
Horizontal,
Vertical
};
- static KWireLessWidget* makeWireLessWidget(TQWidget *parent = 0,
+ static KWireLessWidget* makeWireLessWidget(TQWidget *tqparent = 0,
const char *name = 0);
protected:
- KWireLessWidget(TQWidget *parent=0, const char* name=0);
+ KWireLessWidget(TQWidget *tqparent=0, const char* name=0);
public:
~KWireLessWidget();
void setMode(Mode);
diff --git a/wifi/kwireless/linuxwirelesswidget.cpp b/wifi/kwireless/linuxwirelesswidget.cpp
index 3efdbf98..b7aa31b4 100644
--- a/wifi/kwireless/linuxwirelesswidget.cpp
+++ b/wifi/kwireless/linuxwirelesswidget.cpp
@@ -23,8 +23,8 @@ extern "C" {
int LinuxWireLessWidget::socketFD;
TQStringList LinuxWireLessWidget::deviceNames;
-LinuxWireLessWidget::LinuxWireLessWidget(TQWidget *parent, const char* name)
- : KWireLessWidget(parent, name),
+LinuxWireLessWidget::LinuxWireLessWidget(TQWidget *tqparent, const char* name)
+ : KWireLessWidget(tqparent, name),
m_number (-1)
{
}
@@ -187,7 +187,7 @@ void LinuxWireLessWidget::poll()
if(updateNeeded)
{
emit(updateDeviceInfo(&deviceInfo));
- repaint(false);
+ tqrepaint(false);
}
if(updateToolTip)
{
@@ -199,9 +199,9 @@ void LinuxWireLessWidget::poll()
if (!text.isEmpty())
text.append('\n');
text += i18n("%1: Link Quality %2, Bitrate: %3")
- .arg(info->device())
- .arg(info->qualityString())
- .arg(info->bitrateString());
+ .tqarg(info->device())
+ .tqarg(info->qualityString())
+ .tqarg(info->bitrateString());
}
TQToolTip::add(this, text);
diff --git a/wifi/kwireless/linuxwirelesswidget.h b/wifi/kwireless/linuxwirelesswidget.h
index fe695d68..0d4513ca 100644
--- a/wifi/kwireless/linuxwirelesswidget.h
+++ b/wifi/kwireless/linuxwirelesswidget.h
@@ -15,8 +15,9 @@
class LinuxWireLessWidget : public KWireLessWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- LinuxWireLessWidget(TQWidget *parent=0, const char* name=0);
+ LinuxWireLessWidget(TQWidget *tqparent=0, const char* name=0);
~LinuxWireLessWidget();
protected:
/** poll() is supposed to read the information from
diff --git a/wifi/kwireless/propertytable.cpp b/wifi/kwireless/propertytable.cpp
index 7c73b1c2..4b0bea14 100644
--- a/wifi/kwireless/propertytable.cpp
+++ b/wifi/kwireless/propertytable.cpp
@@ -21,8 +21,8 @@ extern "C" {
#include <math.h>
}
-PropertyTable::PropertyTable(TQWidget *parent, const char* name)
- : PropertyTableBase(parent, name)
+PropertyTable::PropertyTable(TQWidget *tqparent, const char* name)
+ : PropertyTableBase(tqparent, name)
{
}
@@ -30,8 +30,8 @@ PropertyTable::~PropertyTable()
{
}
-PropertiesDialog::PropertiesDialog(TQWidget *parent, const char *name)
- : KDialogBase(parent, name, true,
+PropertiesDialog::PropertiesDialog(TQWidget *tqparent, const char *name)
+ : KDialogBase(tqparent, name, true,
i18n("Wireless Network Device Properties"),
KDialogBase::Ok, KDialogBase::Ok, true),
wait(false)
diff --git a/wifi/kwireless/propertytable.h b/wifi/kwireless/propertytable.h
index 3b95dacf..f71f9f6b 100644
--- a/wifi/kwireless/propertytable.h
+++ b/wifi/kwireless/propertytable.h
@@ -20,8 +20,9 @@ class TQTimer;
class PropertyTable : public PropertyTableBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- PropertyTable(TQWidget *parent = 0, const char* name = 0);
+ PropertyTable(TQWidget *tqparent = 0, const char* name = 0);
~PropertyTable();
};
@@ -29,8 +30,9 @@ public:
class PropertiesDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- PropertiesDialog(TQWidget *parent = 0, const char *name = 0);
+ PropertiesDialog(TQWidget *tqparent = 0, const char *name = 0);
protected:
PropertyTable *table;
TQPtrList<DeviceInfo> *info;
diff --git a/wifi/kwireless/propertytablebase.ui b/wifi/kwireless/propertytablebase.ui
index 8f52c58b..19e97b2a 100644
--- a/wifi/kwireless/propertytablebase.ui
+++ b/wifi/kwireless/propertytablebase.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>PropertyTableBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>PropertyTableBase</cstring>
</property>
@@ -22,7 +22,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QTable" row="1" column="0" rowspan="1" colspan="2">
+ <widget class="TQTable" row="1" column="0" rowspan="1" colspan="2">
<column>
<property name="text">
<string>Property</string>
@@ -49,12 +49,12 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QComboBox" row="0" column="1">
+ <widget class="TQComboBox" row="0" column="1">
<property name="name">
<cstring>cbDeviceSelector</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>tlDevice</cstring>
</property>
@@ -64,5 +64,5 @@
</widget>
</grid>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/wifi/locator.cpp b/wifi/locator.cpp
index ad4e7945..859b7d73 100644
--- a/wifi/locator.cpp
+++ b/wifi/locator.cpp
@@ -21,7 +21,7 @@
extern TQStringList APs;
-Locator::Locator (TQWidget * parent, Interface_wireless * device):TQWidget (parent,
+Locator::Locator (TQWidget * tqparent, Interface_wireless * device):TQWidget (tqparent,
"KwiFiManager")
{
this->device = device;
@@ -34,13 +34,13 @@ Locator::generateLocWidget ()
device->get_AP_info (mac, ip);
sentence =
new TQLabel (i18n ("AccessPoint: ") + whois (mac.local8Bit (), APs), this);
- setFixedSize (QSize
- (sentence->sizeHint ().width () + 2,
- sentence->sizeHint ().height ()));
+ setFixedSize (TQSize
+ (sentence->tqsizeHint ().width () + 2,
+ sentence->tqsizeHint ().height ()));
sentence->
- setFixedSize (QSize
- (sentence->sizeHint ().width () + 2,
- sentence->sizeHint ().height ()));
+ setFixedSize (TQSize
+ (sentence->tqsizeHint ().width () + 2,
+ sentence->tqsizeHint ().height ()));
sentence->show ();
widgetbild = TQPixmap::grabWidget (sentence);
delete sentence;
diff --git a/wifi/locator.h b/wifi/locator.h
index 54f2c683..8f0335d4 100644
--- a/wifi/locator.h
+++ b/wifi/locator.h
@@ -26,10 +26,10 @@
class Interface_wireless;
-class Locator:public QWidget
+class Locator:public TQWidget
{
public:
- Locator (TQWidget * parent, Interface_wireless * device);
+ Locator (TQWidget * tqparent, Interface_wireless * device);
private:
void paintEvent (TQPaintEvent *);
void generateLocWidget ();
diff --git a/wifi/networkscanning.cpp b/wifi/networkscanning.cpp
index 7e2a0e12..f8cc710a 100644
--- a/wifi/networkscanning.cpp
+++ b/wifi/networkscanning.cpp
@@ -32,7 +32,7 @@
#include "networkscanning.h"
#include "interface_wireless.h"
-NetworkScanning::NetworkScanning (Interface_wireless * dev, TQWidget * parent, const char * name ) : TQWidget ( parent, name ) {
+NetworkScanning::NetworkScanning (Interface_wireless * dev, TQWidget * tqparent, const char * name ) : TQWidget ( tqparent, name ) {
device = dev;
networkScan();
}
@@ -115,30 +115,30 @@ NetworkScanning::switchToNetwork()
TQString cmdline;
- KTempFile* tempfile = new KTempFile( TQString::null, TQString::null, 0700 );
+ KTempFile* tempfile = new KTempFile( TQString(), TQString(), 0700 );
TQString tempfilename = tempfile->name();
cmdline = (TQString)"ifconfig %1 down\n";
- cmdline = cmdline.arg( device->get_interface_name() );
+ cmdline = cmdline.tqarg( device->get_interface_name() );
write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) );
cmdline = (TQString)"iwconfig %1 essid %2 mode %3 enc %4\n";
- cmdline = cmdline.arg( device->get_interface_name() );
- cmdline = cmdline.arg( KProcess::quote( networks->text( networks->currentRow(), 0 ) ) );
+ cmdline = cmdline.tqarg( device->get_interface_name() );
+ cmdline = cmdline.tqarg( KProcess::quote( networks->text( networks->currentRow(), 0 ) ) );
TQString modetemp;
if (networks->text( networks->currentRow(), 1 ) == i18n("Managed") ) modetemp = "Managed"; else modetemp = "Ad-Hoc";
- cmdline = cmdline.arg( modetemp );
+ cmdline = cmdline.tqarg( modetemp );
if ( encryption != NONE ) {
- cmdline = cmdline.arg( (encryption == VALID_STRING ? "s:" : "" ) + KProcess::quote( networks->text( networks->currentRow(), 3 ) ) );
+ cmdline = cmdline.tqarg( (encryption == VALID_STRING ? "s:" : "" ) + KProcess::quote( networks->text( networks->currentRow(), 3 ) ) );
} else {
- cmdline = cmdline.arg("off");
+ cmdline = cmdline.tqarg("off");
}
write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) );
cmdline = (TQString)"ifconfig %1 up\n";
- cmdline = cmdline.arg( device->get_interface_name() );
+ cmdline = cmdline.tqarg( device->get_interface_name() );
write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) );
delete tempfile; // autoDeletion off, so the file remains on disk
diff --git a/wifi/networkscanning.h b/wifi/networkscanning.h
index b69652e3..1abfa9b5 100644
--- a/wifi/networkscanning.h
+++ b/wifi/networkscanning.h
@@ -27,14 +27,15 @@ class Interface_wireless;
enum WEP_KEY { NONE, VALID_HEX, VALID_STRING, INVALID };
-class NetworkScanning : public QWidget
+class NetworkScanning : public TQWidget
{
- Q_OBJECT
+ Q_OBJECT
+ TQ_OBJECT
public:
- NetworkScanning (Interface_wireless * dev, TQWidget * parent = 0, const char * name = 0 );
+ NetworkScanning (Interface_wireless * dev, TQWidget * tqparent = 0, const char * name = 0 );
protected:
void networkScan ();
diff --git a/wifi/picture.cpp b/wifi/picture.cpp
index 5e4d28c5..010a4225 100644
--- a/wifi/picture.cpp
+++ b/wifi/picture.cpp
@@ -25,7 +25,7 @@
#define X_OFFSET 20
#define Y_OFFSET 10
-Picture::Picture (TQWidget * parent, Interface_wireless * device):TQWidget (parent,
+Picture::Picture (TQWidget * tqparent, Interface_wireless * device):TQWidget (tqparent,
"picture")
{
this->device = device;
@@ -64,7 +64,7 @@ Picture::~Picture ()
void
Picture::paintEvent (TQPaintEvent *)
{
- TQPainter *picturepainter = new TQPainter (this);
+ TQPainter *pictutqrepainter = new TQPainter (this);
double freq;
int mode;
device->get_mode (mode);
@@ -72,21 +72,21 @@ Picture::paintEvent (TQPaintEvent *)
device->get_current_quality (sig, noise, qual);
if (!device->get_device_freq (freq) || device->get_txpower_disabled())
{
- picturepainter->drawPixmap (X_OFFSET, Y_OFFSET, *NO_CARD);
+ pictutqrepainter->drawPixmap (X_OFFSET, Y_OFFSET, *NO_CARD);
}
else if (mode == 1)
{
- picturepainter->drawPixmap (X_OFFSET, Y_OFFSET, *AD_HOC);
+ pictutqrepainter->drawPixmap (X_OFFSET, Y_OFFSET, *AD_HOC);
}
else if (qual == 0)
{
- picturepainter->drawPixmap (X_OFFSET, Y_OFFSET, *ALL_ALONE);
+ pictutqrepainter->drawPixmap (X_OFFSET, Y_OFFSET, *ALL_ALONE);
}
else if (qual > 0)
{
- picturepainter->drawPixmap (X_OFFSET, Y_OFFSET, *AP_CONNECT);
+ pictutqrepainter->drawPixmap (X_OFFSET, Y_OFFSET, *AP_CONNECT);
}
else
- picturepainter->drawPixmap (X_OFFSET, Y_OFFSET, *NO_CARD);
- delete picturepainter;
+ pictutqrepainter->drawPixmap (X_OFFSET, Y_OFFSET, *NO_CARD);
+ delete pictutqrepainter;
}
diff --git a/wifi/picture.h b/wifi/picture.h
index 25d82e8c..8ac7f05f 100644
--- a/wifi/picture.h
+++ b/wifi/picture.h
@@ -21,10 +21,10 @@
class Interface_wireless;
class TQSize;
-class Picture:public QWidget
+class Picture:public TQWidget
{
public:
- Picture (TQWidget * parent, Interface_wireless * device);
+ Picture (TQWidget * tqparent, Interface_wireless * device);
TQSize mySizeHint();
~Picture ();
private:
diff --git a/wifi/speed.cpp b/wifi/speed.cpp
index ae199d90..c09dbb54 100644
--- a/wifi/speed.cpp
+++ b/wifi/speed.cpp
@@ -21,7 +21,7 @@
#include "speed.h"
#include "interface_wireless.h"
-Speed::Speed (TQWidget * parent, Interface_wireless * device):TQWidget (parent,
+Speed::Speed (TQWidget * tqparent, Interface_wireless * device):TQWidget (tqparent,
"KWiFiManager")
{
this->device = device;
@@ -45,20 +45,20 @@ Speed::paintEvent (TQPaintEvent *)
{
speedpainter.fillRect (20, 30, (int) device->get_bitrate () / 50000,
10, farbe);
- speedpainter.drawText (16, 52, "0");
- speedpainter.drawText (35, 52, "1");
- speedpainter.drawText (55, 52, "2");
- speedpainter.drawText (120, 52, "5.5");
- speedpainter.drawText (230, 52, "11");
+ speedpainter.drawText (16, 52, TQString("0"));
+ speedpainter.drawText (35, 52, TQString("1"));
+ speedpainter.drawText (55, 52, TQString("2"));
+ speedpainter.drawText (120, 52, TQString("5.5"));
+ speedpainter.drawText (230, 52, TQString("11"));
}
else
{
speedpainter.fillRect (20, 30, (int) device->get_bitrate () / 500000,
10, farbe);
- speedpainter.drawText (16, 52, "0");
- speedpainter.drawText (33, 52, "11");
- speedpainter.drawText (56, 52, "22");
- speedpainter.drawText (120, 52, "54");
- speedpainter.drawText (220, 52, "108");
+ speedpainter.drawText (16, 52, TQString("0"));
+ speedpainter.drawText (33, 52, TQString("11"));
+ speedpainter.drawText (56, 52, TQString("22"));
+ speedpainter.drawText (120, 52, TQString("54"));
+ speedpainter.drawText (220, 52, TQString("108"));
};
}
diff --git a/wifi/speed.h b/wifi/speed.h
index 48b949b3..b79526bc 100644
--- a/wifi/speed.h
+++ b/wifi/speed.h
@@ -22,10 +22,10 @@
class Interface_wireless;
-class Speed:public QWidget
+class Speed:public TQWidget
{
public:
- Speed (TQWidget * parent, Interface_wireless * device);
+ Speed (TQWidget * tqparent, Interface_wireless * device);
private:
void paintEvent (TQPaintEvent *);
Interface_wireless *device;
diff --git a/wifi/statistics.cpp b/wifi/statistics.cpp
index a7716de1..7dfe88b6 100644
--- a/wifi/statistics.cpp
+++ b/wifi/statistics.cpp
@@ -59,8 +59,8 @@ Statistics::paintEvent (TQPaintEvent *)
// if values are all below 0, this indicates proper dBm values
if (top < 0) {
- statpainter->drawText (2,65, "dBm");
- statpainter->drawText (2,255, "dBm");
+ statpainter->drawText (2,65, TQString("dBm"));
+ statpainter->drawText (2,255, TQString("dBm"));
}
double scaleRatio;
@@ -102,10 +102,10 @@ Statistics::paintEvent (TQPaintEvent *)
{
if (showStatsNoise) {
statpainter->setPen (red);
- statpainter->drawPolyline (datensatz2, 1);
+ statpainter->tqdrawPolyline (datensatz2, 1);
}
statpainter->setPen (blue);
- statpainter->drawPolyline (datensatz, 1);
+ statpainter->tqdrawPolyline (datensatz, 1);
}
delete statpainter;
}
diff --git a/wifi/statistics.h b/wifi/statistics.h
index dc43ef41..73ef8d9d 100644
--- a/wifi/statistics.h
+++ b/wifi/statistics.h
@@ -19,7 +19,7 @@
class Interface_wireless;
-class Statistics:public QWidget
+class Statistics:public TQWidget
{
public:
Statistics (Interface_wireless * device, bool showStatsNoise);
diff --git a/wifi/status.cpp b/wifi/status.cpp
index e7ace893..c6072c4f 100644
--- a/wifi/status.cpp
+++ b/wifi/status.cpp
@@ -22,13 +22,13 @@
#include <unistd.h>
#include <sys/types.h>
-Status::Status (TQWidget * parent, Interface_wireless * device)
- : TQWidget (parent, "KWiFiManager status")
+tqStatus::tqStatus (TQWidget * tqparent, Interface_wireless * device)
+ : TQWidget (tqparent, "KWiFiManager status")
{
this->device = device;
}
-bool Status::generateStatsWidget ()
+bool tqStatus::generateStatsWidget ()
{
double
freq = 0.;
@@ -38,7 +38,7 @@ bool Status::generateStatsWidget ()
qual = 0;
device->get_current_quality (sig, noi, qual);
content =
- new TQGroupBox (2, Qt::Horizontal, i18n ("Status of Active Connection"),
+ new TQGroupBox (2, Qt::Horizontal, i18n ("tqStatus of Active Connection"),
this);
bool has_freq = device->get_device_freq (freq);
if ((!has_freq) || (qual == 0))
@@ -49,7 +49,7 @@ bool Status::generateStatsWidget ()
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
+ TQString
mac,
ip;
device->get_AP_info (mac, ip);
@@ -61,87 +61,87 @@ bool Status::generateStatsWidget ()
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
+ TQString
temp3 = "%1";
- QString
+ TQString
temp2 = "%1";
if (freq >= 1000000000)
{
if (freq / 1000000. > 5690.)
{
- temp3 = temp3.arg(140);
+ temp3 = temp3.tqarg(140);
}
else if (freq / 1000000. > 5670.)
{
- temp3 = temp3.arg(136);
+ temp3 = temp3.tqarg(136);
}
else if (freq / 1000000. > 5650.)
{
- temp3 = temp3.arg(132);
+ temp3 = temp3.tqarg(132);
}
else if (freq / 1000000. > 5630.)
{
- temp3 = temp3.arg(128);
+ temp3 = temp3.tqarg(128);
}
else if (freq / 1000000. > 5610.)
{
- temp3 = temp3.arg(124);
+ temp3 = temp3.tqarg(124);
}
else if (freq / 1000000. > 5590.)
{
- temp3 = temp3.arg(120);
+ temp3 = temp3.tqarg(120);
}
else if (freq / 1000000. > 5570.)
{
- temp3 = temp3.arg(116);
+ temp3 = temp3.tqarg(116);
}
else if (freq / 1000000. > 5550.)
{
- temp3 = temp3.arg(112);
+ temp3 = temp3.tqarg(112);
}
else if (freq / 1000000. > 5530.)
{
- temp3 = temp3.arg(108);
+ temp3 = temp3.tqarg(108);
}
else if (freq / 1000000. > 5510.)
{
- temp3 = temp3.arg(104);
+ temp3 = temp3.tqarg(104);
}
else if (freq / 1000000. > 5490.)
{
- temp3 = temp3.arg(100);
+ temp3 = temp3.tqarg(100);
}
else if (freq / 1000000. > 5310.)
{
- temp3 = temp3.arg(64);
+ temp3 = temp3.tqarg(64);
}
else if (freq / 1000000. > 5290.)
{
- temp3 = temp3.arg(60);
+ temp3 = temp3.tqarg(60);
}
else if (freq / 1000000. > 5270.)
{
- temp3 = temp3.arg(56);
+ temp3 = temp3.tqarg(56);
}
else if (freq / 1000000. > 5250.)
{
- temp3 = temp3.arg(52);
+ temp3 = temp3.tqarg(52);
}
else if (freq / 1000000. > 5230.)
{
- temp3 = temp3.arg(48);
+ temp3 = temp3.tqarg(48);
}
else if (freq / 1000000. > 5210.)
{
- temp3 = temp3.arg(44);
+ temp3 = temp3.tqarg(44);
}
else if (freq / 1000000. > 5190.)
{
- temp3 = temp3.arg(40);
+ temp3 = temp3.tqarg(40);
}
else if (freq / 1000000. > 5170.)
{
- temp3 = temp3.arg(36);
+ temp3 = temp3.tqarg(36);
}
else if (freq / 1000000. > 2474.)
{
@@ -346,7 +346,7 @@ bool Status::generateStatsWidget ()
if (geteuid () == 0)
{
enc_str = new TQLabel (i18n ("Encryption: "), content);
- QString
+ TQString
key;
int
size = 0,
@@ -361,10 +361,10 @@ bool Status::generateStatsWidget ()
else
enc = new TQLabel (i18n ("active"), content);
}
- // content->setFixedSize (content->sizeHint ());
- content->setMinimumSize(content->sizeHint());
+ // content->setFixedSize (content->tqsizeHint ());
+ content->setMinimumSize(content->tqsizeHint());
if ( content->minimumWidth() < 280 ) content->setMinimumWidth( 280 );
- setFixedSize (content->minimumSize());
+ setFixedSize (content->tqminimumSize());
content->show ();
widgetbild = TQPixmap::grabWidget (content);
delete
@@ -373,7 +373,7 @@ bool Status::generateStatsWidget ()
}
void
-Status::paintEvent (TQPaintEvent *)
+tqStatus::paintEvent (TQPaintEvent *)
{
TQPainter *paintArea = new TQPainter (this);
generateStatsWidget ();
diff --git a/wifi/status.h b/wifi/status.h
index 9b8aed52..3cc6fe75 100644
--- a/wifi/status.h
+++ b/wifi/status.h
@@ -26,10 +26,10 @@
class Interface_wireless;
-class Status:public QWidget
+class tqStatus:public TQWidget
{
public:
- Status (TQWidget * parent, Interface_wireless * device);
+ tqStatus (TQWidget * tqparent, Interface_wireless * device);
private:
void paintEvent (TQPaintEvent *);
bool generateStatsWidget ();
diff --git a/wifi/strength.cpp b/wifi/strength.cpp
index ad4314c0..a5146c14 100644
--- a/wifi/strength.cpp
+++ b/wifi/strength.cpp
@@ -27,7 +27,7 @@
extern bool useAlternateStrengthCalc;
-Strength::Strength (TQWidget * parent, Interface_wireless * device):TQWidget (parent,
+Strength::Strength (TQWidget * tqparent, Interface_wireless * device):TQWidget (tqparent,
"strength")
{
this->device = device;
@@ -61,9 +61,9 @@ TQSize Strength::mySizeHint ()
// add a little more y-space: we need 10 pixels above and 20 pixels below the icon
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
+ // now determine height of TQLabels to calculate the extra needed height
TQLabel heightTest( "ABC", 0 );
- temp->setHeight( temp->height() + 2 * heightTest.sizeHint().height() + 10 );
+ temp->setHeight( temp->height() + 2 * heightTest.tqsizeHint().height() + 10 );
return *temp;
}
@@ -149,7 +149,7 @@ Strength::updateInfo (TQPaintEvent *)
else if (((strength == 0) && (mode == 2)) || (!validdata))
{
sstrength1 = i18n("OUT OF RANGE");
- sstrength2 = TQString::fromLatin1("0");
+ sstrength2 = TQString::tqfromLatin1("0");
strengthpainter->drawPixmap (50, 10, *OOR_DOWN);
}
else
diff --git a/wifi/strength.h b/wifi/strength.h
index 1f66df6f..e4cdd210 100644
--- a/wifi/strength.h
+++ b/wifi/strength.h
@@ -22,11 +22,13 @@
class Interface_wireless;
class TQSize;
-class Strength:public QWidget
+class Strength:public TQWidget
{
-Q_OBJECT
+ Q_OBJECT
+ TQ_OBJECT
+
public:
- Strength (TQWidget * parent, Interface_wireless * device);
+ Strength (TQWidget * tqparent, Interface_wireless * device);
TQSize mySizeHint();
~Strength ();
TQPixmap *NOT_CON_OFFLINE_ADHOC, *OOR_DOWN, *OOR_MINIMUM, *MARGINAL, *GOOD, *EXCELLENT;