diff options
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/netlistviewitem.cpp | 4 | ||||
| -rw-r--r-- | src/netlistviewitem.h | 12 | ||||
| -rw-r--r-- | src/netparams.h | 2 | ||||
| -rw-r--r-- | src/ui_NetParamsEdit.ui | 42 | ||||
| -rw-r--r-- | src/ui_NetParamsWizard.ui | 68 | ||||
| -rw-r--r-- | src/ui_main.ui | 46 | ||||
| -rw-r--r-- | src/ui_netparamsedit.cpp | 2 | ||||
| -rw-r--r-- | src/ui_netparamswizard.cpp | 2 | ||||
| -rw-r--r-- | src/waconfig.cpp | 2 | ||||
| -rw-r--r-- | src/wlassistant.cpp | 58 | ||||
| -rw-r--r-- | src/wlassistant.h | 2 |
12 files changed, 121 insertions, 121 deletions
diff --git a/src/main.cpp b/src/main.cpp index cdc8fc6..ec72c06 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char **argv) KApplication app; WirelessAssistant *mainWin = 0; mainWin = new WirelessAssistant(); - mainWin->setCaption( TQString("%1 %2").arg(description).arg(version) ); + mainWin->setCaption( TQString("%1 %2").tqarg(description).tqarg(version) ); app.setMainWidget( mainWin ); mainWin->show(); diff --git a/src/netlistviewitem.cpp b/src/netlistviewitem.cpp index 178b7e3..45a8968 100644 --- a/src/netlistviewitem.cpp +++ b/src/netlistviewitem.cpp @@ -26,7 +26,7 @@ #include <kiconeffect.h> #include <tdeversion.h> -void NetListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) +void NetListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { /// HACK fixes: higher item (connected) is drawn using regular height upon widget change (widgetStack); if ( height()!=mHeight ) @@ -165,7 +165,7 @@ void NetListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column } default: - KListViewItem::paintCell(p, cg, column, width, alignment); + KListViewItem::paintCell(p, cg, column, width, tqalignment); } //switch } diff --git a/src/netlistviewitem.h b/src/netlistviewitem.h index b3ca41c..5b55f0a 100644 --- a/src/netlistviewitem.h +++ b/src/netlistviewitem.h @@ -65,9 +65,9 @@ public: void setChannel(const TQString& theValue) { - if ( mChannel != theValue ) { //repaint only if difference visible in quality stars + if ( mChannel != theValue ) { //tqrepaint only if difference visible in quality stars mChannel = theValue; - repaint(); + tqrepaint(); } } @@ -111,7 +111,7 @@ public: mHeight-=10; } setHeight( mHeight ); - repaint(); + tqrepaint(); } @@ -122,9 +122,9 @@ public: void setQuality(const int& theValue) { - if ( int(mQuality/8) != int(theValue/8) ) { //repaint only if difference visible in quality stars + if ( int(mQuality/8) != int(theValue/8) ) { //tqrepaint only if difference visible in quality stars mQuality = theValue; - repaint(); + tqrepaint(); } else mQuality = theValue; } @@ -150,7 +150,7 @@ public: private: - virtual void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); + virtual void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); virtual int width(const TQFontMetrics &fm, const TQListView *lv, int column) const; virtual TQString key( int column, bool ascending ) const; diff --git a/src/netparams.h b/src/netparams.h index 966dd08..fbc2b7b 100644 --- a/src/netparams.h +++ b/src/netparams.h @@ -79,7 +79,7 @@ public: r = true; } if ( (hiddenEssid) && (!wasHiddenEssid) ) - if ( KMessageBox::questionYesNo(0, i18n("<qt><p>The network has stopped broadcasting its ESSID since the last time you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for this network?</p><p><i>NOTE: If you answer No, a dialog will appear where you will be able to specify a different ESSID.</i></p></qt>").arg(essid) ) != 3 ) // !=YES + if ( KMessageBox::questionYesNo(0, i18n("<qt><p>The network has stopped broadcasting its ESSID since the last time you were connected.</p><p>Would you like to use '<b>%1</b>' as an ESSID for this network?</p><p><i>NOTE: If you answer No, a dialog will appear where you will be able to specify a different ESSID.</i></p></qt>").tqarg(essid) ) != 3 ) // !=YES r = true; wasHiddenEssid = hiddenEssid; diff --git a/src/ui_NetParamsEdit.ui b/src/ui_NetParamsEdit.ui index 2a0778b..ea80838 100644 --- a/src/ui_NetParamsEdit.ui +++ b/src/ui_NetParamsEdit.ui @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -184,7 +184,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> -<cstring>layout3</cstring> +<cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> @@ -327,7 +327,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -357,7 +357,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>21</width> <height>40</height> @@ -377,7 +377,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> -<cstring>layout33</cstring> +<cstring>tqlayout33</cstring> </property> <hbox> <property name="name"> @@ -419,7 +419,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> -<cstring>layout34</cstring> +<cstring>tqlayout34</cstring> </property> <hbox> <property name="name"> @@ -467,7 +467,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -502,7 +502,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> -<cstring>layout35</cstring> +<cstring>tqlayout35</cstring> </property> <hbox> <property name="name"> @@ -589,7 +589,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> -<cstring>layout6</cstring> +<cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -605,7 +605,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>130</width> <height>20</height> @@ -663,7 +663,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> -<cstring>layout7</cstring> +<cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -699,7 +699,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> -<cstring>layout6_2</cstring> +<cstring>tqlayout6_2</cstring> </property> <hbox> <property name="name"> @@ -715,7 +715,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>130</width> <height>20</height> @@ -773,7 +773,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> -<cstring>layout7_2</cstring> +<cstring>tqlayout7_2</cstring> </property> <hbox> <property name="name"> @@ -809,7 +809,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> -<cstring>layout6_3</cstring> +<cstring>tqlayout6_3</cstring> </property> <hbox> <property name="name"> @@ -825,7 +825,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>130</width> <height>20</height> @@ -883,7 +883,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> -<cstring>layout7_3</cstring> +<cstring>tqlayout7_3</cstring> </property> <hbox> <property name="name"> @@ -919,7 +919,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> -<cstring>layout6_3_2</cstring> +<cstring>tqlayout6_3_2</cstring> </property> <hbox> <property name="name"> @@ -935,7 +935,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>130</width> <height>20</height> @@ -993,7 +993,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> -<cstring>layout7_3_2</cstring> +<cstring>tqlayout7_3_2</cstring> </property> <hbox> <property name="name"> @@ -1026,7 +1026,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>31</width> <height>20</height> diff --git a/src/ui_NetParamsWizard.ui b/src/ui_NetParamsWizard.ui index 0d1ec56..1c933c4 100644 --- a/src/ui_NetParamsWizard.ui +++ b/src/ui_NetParamsWizard.ui @@ -46,7 +46,7 @@ <p>You will be asked a few questions necessary to configure this connection.</p> <p><i>Press Next to continue.</i></p></string> </property> -<property name="alignment"> +<property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>21</width> <height>100</height> @@ -99,7 +99,7 @@ <property name="text"> <string>ESSID:</string> </property> -<property name="alignment"> +<property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>101</width> <height>21</height> @@ -135,7 +135,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>61</width> <height>21</height> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>80</width> <height>21</height> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>60</width> <height>31</height> @@ -202,7 +202,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -283,7 +283,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> -<cstring>layout12</cstring> +<cstring>tqlayout12</cstring> </property> <grid> <property name="name"> @@ -312,7 +312,7 @@ <property name="text"> <string>Secondary DNS:</string> </property> -<property name="alignment"> +<property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -339,7 +339,7 @@ <property name="text"> <string>IP:</string> </property> -<property name="alignment"> +<property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -350,7 +350,7 @@ <property name="text"> <string>Netmask:</string> </property> -<property name="alignment"> +<property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -369,7 +369,7 @@ <property name="text"> <string>Primary DNS:</string> </property> -<property name="alignment"> +<property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -380,7 +380,7 @@ <property name="text"> <string>Gateway:</string> </property> -<property name="alignment"> +<property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -404,7 +404,7 @@ <property name="text"> <string>Domain:</string> </property> -<property name="alignment"> +<property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -415,7 +415,7 @@ <property name="text"> <string>Broadcast:</string> </property> -<property name="alignment"> +<property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -431,7 +431,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>60</width> <height>31</height> @@ -448,7 +448,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>50</width> <height>21</height> @@ -465,7 +465,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>21</width> <height>16</height> @@ -551,7 +551,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>122</width> <height>31</height> @@ -568,7 +568,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>150</width> <height>21</height> @@ -593,7 +593,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>31</width> <height>16</height> @@ -610,7 +610,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>50</width> <height>21</height> @@ -627,7 +627,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>30</width> <height>21</height> @@ -641,7 +641,7 @@ <property name="text"> <string>WEP key:</string> </property> -<property name="alignment"> +<property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -649,7 +649,7 @@ <property name="name"> <cstring>wepKey</cstring> </property> -<property name="minimumSize"> +<property name="tqminimumSize"> <size> <width>140</width> <height>0</height> @@ -690,7 +690,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>31</width> <height>54</height> @@ -707,7 +707,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>80</width> <height>21</height> @@ -724,7 +724,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>49</width> <height>21</height> @@ -746,7 +746,7 @@ <property name="text"> <string>WPA Key:</string> </property> -<property name="alignment"> +<property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -754,7 +754,7 @@ <property name="name"> <cstring>wpaKey</cstring> </property> -<property name="minimumSize"> +<property name="tqminimumSize"> <size> <width>140</width> <height>0</height> @@ -790,7 +790,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>80</width> <height>21</height> @@ -807,7 +807,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>60</width> <height>31</height> @@ -868,7 +868,7 @@ <p>You have successfully finished configuring this connection.</p> <p><b>Press Finish to connect!</b></p></string> </property> -<property name="alignment"> +<property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> diff --git a/src/ui_main.ui b/src/ui_main.ui index 0c0083a..8db0707 100644 --- a/src/ui_main.ui +++ b/src/ui_main.ui @@ -23,7 +23,7 @@ <property name="name"> <cstring>buttonOptions</cstring> </property> -<property name="minimumSize"> +<property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -75,7 +75,7 @@ <property name="enabled"> <bool>false</bool> </property> -<property name="minimumSize"> +<property name="tqminimumSize"> <size> <width>120</width> <height>0</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>21</width> <height>120</height> @@ -138,7 +138,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0" rowspan="5" colspan="1"> <property name="name"> -<cstring>layout16</cstring> +<cstring>tqlayout16</cstring> </property> <vbox> <property name="name"> @@ -184,7 +184,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> -<property name="minimumSize"> +<property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -209,7 +209,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> -<property name="minimumSize"> +<property name="tqminimumSize"> <size> <width>60</width> <height>0</height> @@ -350,7 +350,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> -<property name="minimumSize"> +<property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -362,11 +362,11 @@ <property name="text"> <string>Ready</string> </property> -<property name="alignment"> +<property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> <property name="whatsThis" stdset="0"> -<string><p><b>Status Bar</b></p> +<string><p><b>tqStatus Bar</b></p> <p>Messages describing current process are shown in this area.</p></string> </property> </widget> @@ -385,7 +385,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> -<cstring>layout20</cstring> +<cstring>tqlayout20</cstring> </property> <vbox> <property name="name"> @@ -455,7 +455,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> -<cstring>layout17</cstring> +<cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> @@ -463,7 +463,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> -<cstring>layout12</cstring> +<cstring>tqlayout12</cstring> </property> <vbox> <property name="name"> @@ -505,7 +505,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> -<cstring>layout13</cstring> +<cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> @@ -521,7 +521,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -538,7 +538,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -549,7 +549,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> -<cstring>layout14</cstring> +<cstring>tqlayout14</cstring> </property> <vbox> <property name="name"> @@ -609,7 +609,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> -<cstring>layout15</cstring> +<cstring>tqlayout15</cstring> </property> <vbox> <property name="name"> @@ -625,7 +625,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>101</width> <height>21</height> @@ -642,7 +642,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>118</width> <height>21</height> @@ -663,7 +663,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> -<cstring>layout19</cstring> +<cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> @@ -679,7 +679,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>201</width> <height>21</height> @@ -713,7 +713,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="sizeHint"> +<property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -745,7 +745,7 @@ <slot>setDeviceList()</slot> </Q_SLOTS> <functions> -<function>updateStatus(char sts)</function> +<function>updatetqStatus(char sts)</function> </functions> <layoutdefaults spacing="6" margin="11"/> <includehints> diff --git a/src/ui_netparamsedit.cpp b/src/ui_netparamsedit.cpp index 757dde9..1b757a8 100644 --- a/src/ui_netparamsedit.cpp +++ b/src/ui_netparamsedit.cpp @@ -81,7 +81,7 @@ void ui_NetParamsEdit::setValues( const WANetParams & np ) } } if (np.wpa) { - labelWpaSettings->setText( TQString("<i>%1</i>").arg( np.wpaSettings.join("<br>") ) ); + labelWpaSettings->setText( TQString("<i>%1</i>").tqarg( np.wpaSettings.join("<br>") ) ); if ( np.wpaKey.left(2)=="s:" ) { //ASCII key checkWpaAscii->setChecked(true); wpaKey->setText( np.wpaKey.right(np.wpaKey.length()-2) ); diff --git a/src/ui_netparamswizard.cpp b/src/ui_netparamswizard.cpp index 42a93d2..de8c39f 100644 --- a/src/ui_netparamswizard.cpp +++ b/src/ui_netparamswizard.cpp @@ -55,7 +55,7 @@ void ui_NetParamsWizard::setWepEnabled( bool w ) void ui_NetParamsWizard::setWpaEnabled( bool w, TQStringList settings ) { setAppropriate( page(5), w ); - if (w) labelWpaSettings->setText( TQString("<i>%1</i>").arg( settings.join("<br>") ) ); + if (w) labelWpaSettings->setText( TQString("<i>%1</i>").tqarg( settings.join("<br>") ) ); } diff --git a/src/waconfig.cpp b/src/waconfig.cpp index 4dc5d41..bb8cc97 100644 --- a/src/waconfig.cpp +++ b/src/waconfig.cpp @@ -16,7 +16,7 @@ WAConfig *WAConfig::self() } WAConfig::WAConfig( ) - : KConfigSkeleton( TQString::fromLatin1( "wlassistantrc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "wlassistantrc" ) ) { mSelf = this; } diff --git a/src/wlassistant.cpp b/src/wlassistant.cpp index 5677de9..caafb37 100644 --- a/src/wlassistant.cpp +++ b/src/wlassistant.cpp @@ -101,7 +101,7 @@ WirelessAssistant::~WirelessAssistant() void WirelessAssistant::init() { statusLabel->setText(i18n("Initializing...")); - statusLabel->repaint(); + statusLabel->tqrepaint(); //////////////////////////////////////// ///// CHECK FOR SYSFS (KERNEL 2.6) ///// @@ -191,13 +191,13 @@ void WirelessAssistant::init() timerGui = new TQTimer(); timerConnectionCheck = new TQTimer(); connect( timerGui, TQT_SIGNAL(timeout()), TQT_SLOT(updateConnectedItem()) ); - connect( timerConnectionCheck, TQT_SIGNAL(timeout()), TQT_SLOT(checkConnectionStatus()) ); + connect( timerConnectionCheck, TQT_SIGNAL(timeout()), TQT_SLOT(checkConnectiontqStatus()) ); //////////////////////// ///// DETECT & SET PATHS ///// if (!Commands.allFound) { //all ok or ONLY dhcpcd not found (i.e. dhclient present). std::cout << "Missing executables (" << Commands.notFound.join("', '").ascii() << "). Exiting." << std::endl; - KMessageBox::error(0, i18n("Executable(s) '%1' could not be found.\nWireless Assistant will now quit.").arg(Commands.notFound.join("', '")) ); + KMessageBox::error(0, i18n("Executable(s) '%1' could not be found.\nWireless Assistant will now quit.").tqarg(Commands.notFound.join("', '")) ); close(); return; } @@ -213,7 +213,7 @@ void WirelessAssistant::init() TQTimer::singleShot( 0, this, TQT_SLOT(netScan()) ); } -void WirelessAssistant::checkConnectionStatus() +void WirelessAssistant::checkConnectiontqStatus() { TQListViewItem* lvi; if (groupAPs) lvi = getItemByEssid( WATools::essid(NetParams.iface.ascii())); @@ -235,7 +235,7 @@ void WirelessAssistant::checkConnectionStatus() } else if (connectedItem) { //connection LOST setConnectedItem(0); timerConnectionCheck->stop(); - if ( autoReconnect || KMessageBox::questionYesNo(0, i18n("Connection to '%1' has been lost!\nWould you like to reconnect?").arg(NetParams.essid), i18n("Connection Lost") , KStdGuiItem::yes(), KStdGuiItem::no() ) == KMessageBox::Yes ) { + if ( autoReconnect || KMessageBox::questionYesNo(0, i18n("Connection to '%1' has been lost!\nWould you like to reconnect?").tqarg(NetParams.essid), i18n("Connection Lost") , KStdGuiItem::yes(), KStdGuiItem::no() ) == KMessageBox::Yes ) { netDisconnect( true ); netConnect(); } @@ -249,7 +249,7 @@ void WirelessAssistant::removeNetParams() TQString ap = nvi->ap(); TQString essid = nvi->essid(); for (TQStringList::Iterator nps = NetParamsList.begin(); nps != NetParamsList.end(); nps++) { if ( (*nps).section(",",2,2)==ap && (*nps).section(",",1,1)==essid) { - if ( KMessageBox::warningContinueCancel(0, i18n("<qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would you like to continue?</p></qt>").arg(essid)) == KMessageBox::Continue ) { + if ( KMessageBox::warningContinueCancel(0, i18n("<qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would you like to continue?</p></qt>").tqarg(essid)) == KMessageBox::Continue ) { if (nvi->hidden()) // hiddenEssid = 1 nvi->setEssid("<hidden>"); NetParamsList.remove(nps); @@ -282,7 +282,7 @@ void WirelessAssistant::setDNS( const WANetParams & np ) f.close(); } else { std::cout << "dns setup error: " << f.name().ascii() << " is not writeable." << std::endl; - KMessageBox::error(0, i18n("<qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) and/or domain are not set.</p></qt>").arg(f.name()) ); + KMessageBox::error(0, i18n("<qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) and/or domain are not set.</p></qt>").tqarg(f.name()) ); } } @@ -291,7 +291,7 @@ void WirelessAssistant::netScan() timerConnectionCheck->stop(); //stop while scanning. netScan( NetParams ); if (netList->childCount() > 0) { - TQTimer::singleShot( 0, this, TQT_SLOT(checkConnectionStatus()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(checkConnectiontqStatus()) ); timerConnectionCheck->start(WA_CONNECTION_CHECK_INTERVAL); } } @@ -314,19 +314,19 @@ void WirelessAssistant::netScan( const WANetParams & np ) } if ( !WATools::isUp(np.iface.ascii()) ) { - statusLabel->setText(i18n("Bringing interface %1 up...").arg(np.iface.ascii())); + statusLabel->setText(i18n("Bringing interface %1 up...").tqarg(np.iface.ascii())); //runCommand( Commands.cmd("ifup",np) ); WATools::setUp(true, np.iface.ascii()); if (DelayBeforeScanning>0) { statusLabel->setText(i18n("Waiting before scanning...")); - statusLabel->repaint(); + statusLabel->tqrepaint(); KApplication::eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); usleep(DelayBeforeScanning * 1000000); // delay * 1000ms } } statusLabel->setText(i18n("Scanning...")); - statusLabel->repaint(); + statusLabel->tqrepaint(); netList->clear(); @@ -570,7 +570,7 @@ void WirelessAssistant::netConnect() setNetParamsFromList( netList->selectedItem() ); //can't connect if WPA needed, and wpa_supplicant and wpa_cli not available if ( NetParams.wpa && !wpaAvailable ) { - KMessageBox::error(0, i18n("<qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are trying to connect to requires WPA authentication. The necessary executables <i>wpa_supplicant</i> and <i>wpa_cli</i> could not be found. Install <i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt>").arg(NetParams.essid) ); + KMessageBox::error(0, i18n("<qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are trying to connect to requires WPA authentication. The necessary executables <i>wpa_supplicant</i> and <i>wpa_cli</i> could not be found. Install <i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt>").tqarg(NetParams.essid) ); timerConnectionCheck->start(WA_CONNECTION_CHECK_INTERVAL); //resume connection checking return; } @@ -579,7 +579,7 @@ void WirelessAssistant::netConnect() if ( (NetParams.essid=="<hidden>") || (!setNetParamsFromConfig( search )) ) { ui_NetParamsWizard *netwiz = new ui_NetParamsWizard; if (!NetParams.hiddenEssid) - netwiz->setCaption( i18n("%1 - First Connection Wizard").arg(NetParams.essid) ); + netwiz->setCaption( i18n("%1 - First Connection Wizard").tqarg(NetParams.essid) ); netwiz->setEssidEnabled( NetParams.hiddenEssid ); netwiz->setWepEnabled( NetParams.wep ); netwiz->setWpaEnabled( NetParams.wpa, NetParams.wpaSettings ); @@ -650,8 +650,8 @@ void WirelessAssistant::netConnect( const WANetParams & np ) std::cout << "No pre-connection command specified." << std::endl; - statusLabel->setText( i18n("Connecting to '%1'...").arg(np.essid) ); - statusLabel->repaint(); + statusLabel->setText( i18n("Connecting to '%1'...").tqarg(np.essid) ); + statusLabel->tqrepaint(); if (!WATools::isUp(np.iface.ascii()) ) WATools::setUp( true, np.iface.ascii() ); //runCommand( Commands.cmd("ifup", np) ); if ( runCommand( Commands.cmd("iwconfig_set", np) ).find("8B04") > -1 ) { // error 8B04 - Request 'Set Frequency' not supported. @@ -710,7 +710,7 @@ void WirelessAssistant::netConnect( const WANetParams & np ) if (autoQuit) this->close(); groupAPs ? setConnectedItem( np.essid ) : setConnectedItem( np.ap ); - statusLabel->setText( i18n("Successfully connected to '%1'.").arg(np.essid) ); + statusLabel->setText( i18n("Successfully connected to '%1'.").tqarg(np.essid) ); setUi(1); } else { std::cout << "CONNECTION FAILED." << std::endl; @@ -757,7 +757,7 @@ void WirelessAssistant::setConnectedItem( const TQString & netid ) void WirelessAssistant::netDisconnect( const bool & quiet ) { - if ( (quiet) || (KMessageBox::warningContinueCancel(0, i18n("<qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to continue?<p></qt>").arg(connectedItem->essid()) )== KMessageBox::Continue ) ) { + if ( (quiet) || (KMessageBox::warningContinueCancel(0, i18n("<qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to continue?<p></qt>").tqarg(connectedItem->essid()) )== KMessageBox::Continue ) ) { timerConnectionCheck->stop(); //stop while disconnecting. if ( !NetParams.preDisconnectionCommand.isEmpty() ) { @@ -769,13 +769,13 @@ void WirelessAssistant::netDisconnect( const bool & quiet ) statusLabel->setText( i18n("Disconnecting...") ); - statusLabel->repaint(); + statusLabel->tqrepaint(); setConnectedItem( 0 ); if ( NetParams.dhcp ) { if ( dhcpClientRunning() ) { runCommand( Commands.cmd( "kill_dhcp", NetParams ) ); statusLabel->setText( i18n("Waiting for DHCP client to shut down...") ); - statusLabel->repaint(); + statusLabel->tqrepaint(); TQTimer* tmr = new TQTimer(); tmr->start(1500, true); //wait 1.5sec for dhcp client to really shutdown, single shot. while ( tmr->isActive() ) { @@ -960,7 +960,7 @@ TQString WirelessAssistant::runCommand( const TQStringList & cmd, int timeout, b TQToolTip::remove (buttonClose); TQToolTip::add - ( buttonClose, i18n("Terminate current process\n(%1)").arg( p->arguments().join(" ") ) ); + ( buttonClose, i18n("Terminate current process\n(%1)").tqarg( p->arguments().join(" ") ) ); } i++; } @@ -1059,7 +1059,7 @@ void WirelessAssistant::editNetParams() ui_NetParamsEdit *netedit = new ui_NetParamsEdit(); netedit->setValues( NetParams ); - netedit->setCaption( i18n("%1 Settings").arg(NetParams.essid) ); + netedit->setCaption( i18n("%1 Settings").tqarg(NetParams.essid) ); netedit->exec(); if (netedit->result() == TQDialog::Rejected) { delete netedit; @@ -1085,7 +1085,7 @@ bool WirelessAssistant::dhcpClientRunning() TQString pidFile; pidPaths << "/etc/" << "/etc/dhcpc/" << "/var/run/"; if ( Commands.dhcpClient=="dhcpcd" ) - pidFile = TQString("dhcpcd-%1.pid").arg(NetParams.iface.ascii()); + pidFile = TQString("dhcpcd-%1.pid").tqarg(NetParams.iface.ascii()); else pidFile = TQString("dhclient.pid"); @@ -1185,14 +1185,14 @@ bool WirelessAssistant::generateWpaConfigFile( const TQString& essid, const TQSt bool WirelessAssistant::setWpaClientEnabled( bool e, const TQString& iface, TQString driver ) { if (!e) { - if ( runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").arg(NetParams.iface) << "terminate" ).contains("OK") ) { + if ( runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").tqarg(NetParams.iface) << "terminate" ).contains("OK") ) { TQFile( wpaConfigFile ).remove(); return 1; } else return 0; // wpa client was not running. } - if ( !runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").arg(NetParams.iface) << "status" ).contains("Failed to connect") ) { + if ( !runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").tqarg(NetParams.iface) << "status" ).contains("Failed to connect") ) { std::cout << "WPA client already running. Reconfiguring..." << std::endl; runCommand( TQStringList(Commands.wpa_cli) << "reconfigure" ); } else { @@ -1215,9 +1215,9 @@ bool WirelessAssistant::setWpaClientEnabled( bool e, const TQString& iface, TQSt wp->clearArguments(); wp->addArgument( Commands.wpa_supplicant ); wp->addArgument( "-W" ); //wait for control interface - wp->addArgument( TQString("-D%1").arg(driver) ); - wp->addArgument( TQString("-i%1").arg(iface) ); - wp->addArgument( TQString("-c%1").arg(wpaConfigFile) ); + wp->addArgument( TQString("-D%1").tqarg(driver) ); + wp->addArgument( TQString("-i%1").tqarg(iface) ); + wp->addArgument( TQString("-c%1").tqarg(wpaConfigFile) ); //std::cout << "Starting WPA client: " << wp->arguments().join(" ").ascii() << std::endl; if ( !wp->start() ) { std::cout << "Failed to start WPA client." << std::endl; @@ -1231,14 +1231,14 @@ bool WirelessAssistant::setWpaClientEnabled( bool e, const TQString& iface, TQSt TQString o; int i = 0; - while ( !(o =runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").arg(NetParams.iface) << "status" )).contains("Failed to connect") ) { + while ( !(o =runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").tqarg(NetParams.iface) << "status" )).contains("Failed to connect") ) { for (int c = 0; c < 15; c++) { usleep(75*1000); //75msec KApplication::eventLoop()->processEvents( TQEventLoop::AllEvents ); i++; } if (i>400) { //more than 30sec have passed - runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").arg(NetParams.iface) << "terminate" ); + runCommand( TQStringList(Commands.wpa_cli) << TQString("-i%1").tqarg(NetParams.iface) << "terminate" ); return 0; } if ( o.contains("wpa_state=COMPLETED") ) { diff --git a/src/wlassistant.h b/src/wlassistant.h index ec094e8..4951e8f 100644 --- a/src/wlassistant.h +++ b/src/wlassistant.h @@ -112,7 +112,7 @@ protected slots: virtual void removeNetParams(); virtual void updateNetParams(); virtual void itemAction(); - virtual void checkConnectionStatus(); + virtual void checkConnectiontqStatus(); virtual void updateConnectButton(TQListViewItem* lvi); virtual void setMouseBehaviour(); virtual void togglePage(bool options ); |