TDE
/
wlassistant
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/wlassistant
0
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Rename a number of old tq methods that are no longer tq specific"

Browse Source 
This reverts commit 294cdc4efa.
pull/1/head
Timothy Pearson 13 years ago
parent 294cdc4efa
commit 5e82c5964c
12 changed files with 121 additions and 121 deletions
Show Stats Download Patch File Download Diff File

2
src/main.cpp
Unescape View File

@ -47,7 +47,7 @@ int main(int argc, char **argv)
KApplication app; KApplication app;
WirelessAssistant *mainWin = 0; WirelessAssistant *mainWin = 0;
mainWin = new WirelessAssistant(); mainWin = new WirelessAssistant();
mainWin->setCaption( TQString("%1 %2").arg(description).arg(version) ); mainWin->setCaption( TQString("%1 %2").tqarg(description).tqarg(version) );
app.setMainWidget( mainWin ); app.setMainWidget( mainWin );
mainWin->show(); mainWin->show();

4
src/netlistviewitem.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <kiconeffect.h> #include <kiconeffect.h>
#include <tdeversion.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); /// HACK fixes: higher item (connected) is drawn using regular height upon widget change (widgetStack);
if ( height()!=mHeight ) if ( height()!=mHeight )
@ -165,7 +165,7 @@ void NetListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column
} }
default: default:
KListViewItem::paintCell(p, cg, column, width, alignment); KListViewItem::paintCell(p, cg, column, width, tqalignment);
} //switch } //switch
} }

12
src/netlistviewitem.h
Unescape View File

@ -65,9 +65,9 @@ public:
void setChannel(const TQString& theValue) 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; mChannel = theValue;
repaint(); tqrepaint();
} }
} }
@ -111,7 +111,7 @@ public:
mHeight-=10; mHeight-=10;
} }
setHeight( mHeight ); setHeight( mHeight );
repaint(); tqrepaint();
} }
@ -122,9 +122,9 @@ public:
void setQuality(const int& theValue) 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; mQuality = theValue;
repaint(); tqrepaint();
} else } else
mQuality = theValue; mQuality = theValue;
} }
@ -150,7 +150,7 @@ public:
private: 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 int width(const TQFontMetrics &fm, const TQListView *lv, int column) const;
virtual TQString key( int column, bool ascending ) const; virtual TQString key( int column, bool ascending ) const;

2
src/netparams.h
Unescape View File

@ -79,7 +79,7 @@ public:
r = true; r = true;
} }
if ( (hiddenEssid) && (!wasHiddenEssid) ) 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; r = true;
wasHiddenEssid = hiddenEssid; wasHiddenEssid = hiddenEssid;

42
src/ui_NetParamsEdit.ui
Unescape View File

@ -74,7 +74,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -184,7 +184,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout3</cstring> <cstring>tqlayout3</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -327,7 +327,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>
@ -357,7 +357,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>40</height> <height>40</height>
@ -377,7 +377,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>layout33</cstring> <cstring>tqlayout33</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -419,7 +419,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>layout34</cstring> <cstring>tqlayout34</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -467,7 +467,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>131</width> <width>131</width>
<height>21</height> <height>21</height>
@ -502,7 +502,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="0"> <widget class="TQLayoutWidget" row="2" column="0">
<property name="name"> <property name="name">
<cstring>layout35</cstring> <cstring>tqlayout35</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -589,7 +589,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>layout6</cstring> <cstring>tqlayout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -605,7 +605,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>130</width> <width>130</width>
<height>20</height> <height>20</height>
@ -663,7 +663,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>layout7</cstring> <cstring>tqlayout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -699,7 +699,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>layout6_2</cstring> <cstring>tqlayout6_2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -715,7 +715,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>130</width> <width>130</width>
<height>20</height> <height>20</height>
@ -773,7 +773,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>layout7_2</cstring> <cstring>tqlayout7_2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -809,7 +809,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>layout6_3</cstring> <cstring>tqlayout6_3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -825,7 +825,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>130</width> <width>130</width>
<height>20</height> <height>20</height>
@ -883,7 +883,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>layout7_3</cstring> <cstring>tqlayout7_3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -919,7 +919,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>layout6_3_2</cstring> <cstring>tqlayout6_3_2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -935,7 +935,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>130</width> <width>130</width>
<height>20</height> <height>20</height>
@ -993,7 +993,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>layout7_3_2</cstring> <cstring>tqlayout7_3_2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -1026,7 +1026,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>20</height> <height>20</height>

68
src/ui_NetParamsWizard.ui
Unescape View File

@ -46,7 +46,7 @@
&lt;p&gt;You will be asked a few questions necessary to configure this connection.&lt;/p&gt; &lt;p&gt;You will be asked a few questions necessary to configure this connection.&lt;/p&gt;
&lt;p&gt;&lt;i&gt;Press Next to continue.&lt;/i&gt;&lt;/p&gt;</string> &lt;p&gt;&lt;i&gt;Press Next to continue.&lt;/i&gt;&lt;/p&gt;</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>
@ -85,7 +85,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>100</height> <height>100</height>
@ -99,7 +99,7 @@
<property name="text"> <property name="text">
<string>ESSID:</string> <string>ESSID:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -118,7 +118,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>101</width> <width>101</width>
<height>21</height> <height>21</height>
@ -135,7 +135,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>21</height> <height>21</height>
@ -168,7 +168,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>21</height> <height>21</height>
@ -185,7 +185,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>60</width> <width>60</width>
<height>31</height> <height>31</height>
@ -202,7 +202,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -283,7 +283,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="1" column="1"> <widget class="TQLayoutWidget" row="1" column="1">
<property name="name"> <property name="name">
<cstring>layout12</cstring> <cstring>tqlayout12</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -312,7 +312,7 @@
<property name="text"> <property name="text">
<string>Secondary DNS:</string> <string>Secondary DNS:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -339,7 +339,7 @@
<property name="text"> <property name="text">
<string>IP:</string> <string>IP:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -350,7 +350,7 @@
<property name="text"> <property name="text">
<string>Netmask:</string> <string>Netmask:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -369,7 +369,7 @@
<property name="text"> <property name="text">
<string>Primary DNS:</string> <string>Primary DNS:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -380,7 +380,7 @@
<property name="text"> <property name="text">
<string>Gateway:</string> <string>Gateway:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -404,7 +404,7 @@
<property name="text"> <property name="text">
<string>Domain:</string> <string>Domain:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -415,7 +415,7 @@
<property name="text"> <property name="text">
<string>Broadcast:</string> <string>Broadcast:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -431,7 +431,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>60</width> <width>60</width>
<height>31</height> <height>31</height>
@ -448,7 +448,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>21</height> <height>21</height>
@ -465,7 +465,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>16</height> <height>16</height>
@ -551,7 +551,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>122</width> <width>122</width>
<height>31</height> <height>31</height>
@ -568,7 +568,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>150</width> <width>150</width>
<height>21</height> <height>21</height>
@ -593,7 +593,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>16</height> <height>16</height>
@ -610,7 +610,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>21</height> <height>21</height>
@ -627,7 +627,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>21</height> <height>21</height>
@ -641,7 +641,7 @@
<property name="text"> <property name="text">
<string>WEP key:</string> <string>WEP key:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -649,7 +649,7 @@
<property name="name"> <property name="name">
<cstring>wepKey</cstring> <cstring>wepKey</cstring>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>140</width> <width>140</width>
<height>0</height> <height>0</height>
@ -690,7 +690,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>54</height> <height>54</height>
@ -707,7 +707,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>21</height> <height>21</height>
@ -724,7 +724,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>49</width> <width>49</width>
<height>21</height> <height>21</height>
@ -746,7 +746,7 @@
<property name="text"> <property name="text">
<string>WPA Key:</string> <string>WPA Key:</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -754,7 +754,7 @@
<property name="name"> <property name="name">
<cstring>wpaKey</cstring> <cstring>wpaKey</cstring>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>140</width> <width>140</width>
<height>0</height> <height>0</height>
@ -790,7 +790,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>21</height> <height>21</height>
@ -807,7 +807,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>60</width> <width>60</width>
<height>31</height> <height>31</height>
@ -868,7 +868,7 @@
&lt;p&gt;You have successfully finished configuring this connection.&lt;/p&gt; &lt;p&gt;You have successfully finished configuring this connection.&lt;/p&gt;
&lt;p&gt;&lt;b&gt;Press Finish to connect!&lt;/b&gt;&lt;/p&gt;</string> &lt;p&gt;&lt;b&gt;Press Finish to connect!&lt;/b&gt;&lt;/p&gt;</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>

46
src/ui_main.ui
Unescape View File

@ -23,7 +23,7 @@
<property name="name"> <property name="name">
<cstring>buttonOptions</cstring> <cstring>buttonOptions</cstring>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -75,7 +75,7 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>120</width> <width>120</width>
<height>0</height> <height>0</height>
@ -129,7 +129,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>120</height> <height>120</height>
@ -138,7 +138,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="5" colspan="1"> <widget class="TQLayoutWidget" row="0" column="0" rowspan="5" colspan="1">
<property name="name"> <property name="name">
<cstring>layout16</cstring> <cstring>tqlayout16</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -184,7 +184,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -209,7 +209,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>60</width> <width>60</width>
<height>0</height> <height>0</height>
@ -350,7 +350,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="tqminimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -362,11 +362,11 @@
<property name="text"> <property name="text">
<string>Ready</string> <string>Ready</string>
</property> </property>
<property name="alignment"> <property name="tqalignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
<property name="whatsThis" stdset="0"> <property name="whatsThis" stdset="0">
<string>&lt;p&gt;&lt;b&gt;Status Bar&lt;/b&gt;&lt;/p&gt; <string>&lt;p&gt;&lt;b&gt;tqStatus Bar&lt;/b&gt;&lt;/p&gt;
&lt;p&gt;Messages describing current process are shown in this area.&lt;/p&gt;</string> &lt;p&gt;Messages describing current process are shown in this area.&lt;/p&gt;</string>
</property> </property>
</widget> </widget>
@ -385,7 +385,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout20</cstring> <cstring>tqlayout20</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -455,7 +455,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout17</cstring> <cstring>tqlayout17</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -463,7 +463,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout12</cstring> <cstring>tqlayout12</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -505,7 +505,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout13</cstring> <cstring>tqlayout13</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -521,7 +521,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -538,7 +538,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -549,7 +549,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout14</cstring> <cstring>tqlayout14</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -609,7 +609,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout15</cstring> <cstring>tqlayout15</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -625,7 +625,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>101</width> <width>101</width>
<height>21</height> <height>21</height>
@ -642,7 +642,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>118</width> <width>118</width>
<height>21</height> <height>21</height>
@ -663,7 +663,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>layout19</cstring> <cstring>tqlayout19</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -679,7 +679,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>201</width> <width>201</width>
<height>21</height> <height>21</height>
@ -713,7 +713,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="sizeHint"> <property name="tqsizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>31</height> <height>31</height>
@ -745,7 +745,7 @@
<slot>setDeviceList()</slot> <slot>setDeviceList()</slot>
</Q_SLOTS> </Q_SLOTS>
<functions> <functions>
<function>updateStatus(char sts)</function> <function>updatetqStatus(char sts)</function>
</functions> </functions>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>

2
src/ui_netparamsedit.cpp
Unescape View File

@ -81,7 +81,7 @@ void ui_NetParamsEdit::setValues( const WANetParams & np )
} }
} }
if (np.wpa) { 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 if ( np.wpaKey.left(2)=="s:" ) { //ASCII key
checkWpaAscii->setChecked(true); checkWpaAscii->setChecked(true);
wpaKey->setText( np.wpaKey.right(np.wpaKey.length()-2) ); wpaKey->setText( np.wpaKey.right(np.wpaKey.length()-2) );

2
src/ui_netparamswizard.cpp
Unescape View File

@ -55,7 +55,7 @@ void ui_NetParamsWizard::setWepEnabled( bool w )
void ui_NetParamsWizard::setWpaEnabled( bool w, TQStringList settings ) void ui_NetParamsWizard::setWpaEnabled( bool w, TQStringList settings )
{ {
setAppropriate( page(5), w ); 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>") ) );
} }

2
src/waconfig.cpp
Unescape View File

@ -16,7 +16,7 @@ WAConfig *WAConfig::self()
} }
WAConfig::WAConfig( ) WAConfig::WAConfig( )
: KConfigSkeleton( TQString::fromLatin1( "wlassistantrc" ) ) : KConfigSkeleton( TQString::tqfromLatin1( "wlassistantrc" ) )
{ {
mSelf = this; mSelf = this;
} }

58
src/wlassistant.cpp
Unescape View File

@ -101,7 +101,7 @@ WirelessAssistant::~WirelessAssistant()
void WirelessAssistant::init() void WirelessAssistant::init()
{ {
statusLabel->setText(i18n("Initializing...")); statusLabel->setText(i18n("Initializing..."));
statusLabel->repaint(); statusLabel->tqrepaint();
//////////////////////////////////////// ////////////////////////////////////////
///// CHECK FOR SYSFS (KERNEL 2.6) ///// ///// CHECK FOR SYSFS (KERNEL 2.6) /////
@ -191,13 +191,13 @@ void WirelessAssistant::init()
timerGui = new TQTimer(); timerGui = new TQTimer();
timerConnectionCheck = new TQTimer(); timerConnectionCheck = new TQTimer();
connect( timerGui, TQT_SIGNAL(timeout()), TQT_SLOT(updateConnectedItem()) ); 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 ///// ///// DETECT & SET PATHS /////
if (!Commands.allFound) { //all ok or ONLY dhcpcd not found (i.e. dhclient present). 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; 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(); close();
return; return;
} }
@ -213,7 +213,7 @@ void WirelessAssistant::init()
TQTimer::singleShot( 0, this, TQT_SLOT(netScan()) ); TQTimer::singleShot( 0, this, TQT_SLOT(netScan()) );
} }
void WirelessAssistant::checkConnectionStatus() void WirelessAssistant::checkConnectiontqStatus()
{ {
TQListViewItem* lvi; TQListViewItem* lvi;
if (groupAPs) lvi = getItemByEssid( WATools::essid(NetParams.iface.ascii())); if (groupAPs) lvi = getItemByEssid( WATools::essid(NetParams.iface.ascii()));
@ -235,7 +235,7 @@ void WirelessAssistant::checkConnectionStatus()
} else if (connectedItem) { //connection LOST } else if (connectedItem) { //connection LOST
setConnectedItem(0); setConnectedItem(0);
timerConnectionCheck->stop(); 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 ); netDisconnect( true );
netConnect(); netConnect();
} }
@ -249,7 +249,7 @@ void WirelessAssistant::removeNetParams()
TQString ap = nvi->ap(); TQString essid = nvi->essid(); TQString ap = nvi->ap(); TQString essid = nvi->essid();
for (TQStringList::Iterator nps = NetParamsList.begin(); nps != NetParamsList.end(); nps++) { for (TQStringList::Iterator nps = NetParamsList.begin(); nps != NetParamsList.end(); nps++) {
if ( (*nps).section(",",2,2)==ap && (*nps).section(",",1,1)==essid) { 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 if (nvi->hidden()) // hiddenEssid = 1
nvi->setEssid("<hidden>"); nvi->setEssid("<hidden>");
NetParamsList.remove(nps); NetParamsList.remove(nps);
@ -282,7 +282,7 @@ void WirelessAssistant::setDNS( const WANetParams & np )
f.close(); f.close();
} else { } else {
std::cout << "dns setup error: " << f.name().ascii() << " is not writeable." << std::endl; 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. timerConnectionCheck->stop(); //stop while scanning.
netScan( NetParams ); netScan( NetParams );
if (netList->childCount() > 0) { if (netList->childCount() > 0) {
TQTimer::singleShot( 0, this, TQT_SLOT(checkConnectionStatus()) ); TQTimer::singleShot( 0, this, TQT_SLOT(checkConnectiontqStatus()) );
timerConnectionCheck->start(WA_CONNECTION_CHECK_INTERVAL); timerConnectionCheck->start(WA_CONNECTION_CHECK_INTERVAL);
} }
} }
@ -314,19 +314,19 @@ void WirelessAssistant::netScan( const WANetParams & np )
} }
if ( !WATools::isUp(np.iface.ascii()) ) { 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) ); //runCommand( Commands.cmd("ifup",np) );
WATools::setUp(true, np.iface.ascii()); WATools::setUp(true, np.iface.ascii());
if (DelayBeforeScanning>0) { if (DelayBeforeScanning>0) {
statusLabel->setText(i18n("Waiting before scanning...")); statusLabel->setText(i18n("Waiting before scanning..."));
statusLabel->repaint(); statusLabel->tqrepaint();
KApplication::eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); KApplication::eventLoop()->processEvents( TQEventLoop::ExcludeUserInput );
usleep(DelayBeforeScanning * 1000000); // delay * 1000ms usleep(DelayBeforeScanning * 1000000); // delay * 1000ms
} }
} }
statusLabel->setText(i18n("Scanning...")); statusLabel->setText(i18n("Scanning..."));
statusLabel->repaint(); statusLabel->tqrepaint();
netList->clear(); netList->clear();
@ -570,7 +570,7 @@ void WirelessAssistant::netConnect()
setNetParamsFromList( netList->selectedItem() ); setNetParamsFromList( netList->selectedItem() );
//can't connect if WPA needed, and wpa_supplicant and wpa_cli not available //can't connect if WPA needed, and wpa_supplicant and wpa_cli not available
if ( NetParams.wpa && !wpaAvailable ) { 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 timerConnectionCheck->start(WA_CONNECTION_CHECK_INTERVAL); //resume connection checking
return; return;
} }
@ -579,7 +579,7 @@ void WirelessAssistant::netConnect()
if ( (NetParams.essid=="<hidden>") || (!setNetParamsFromConfig( search )) ) { if ( (NetParams.essid=="<hidden>") || (!setNetParamsFromConfig( search )) ) {
ui_NetParamsWizard *netwiz = new ui_NetParamsWizard; ui_NetParamsWizard *netwiz = new ui_NetParamsWizard;
if (!NetParams.hiddenEssid) 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->setEssidEnabled( NetParams.hiddenEssid );
netwiz->setWepEnabled( NetParams.wep ); netwiz->setWepEnabled( NetParams.wep );
netwiz->setWpaEnabled( NetParams.wpa, NetParams.wpaSettings ); 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; std::cout << "No pre-connection command specified." << std::endl;
statusLabel->setText( i18n("Connecting to '%1'...").arg(np.essid) ); statusLabel->setText( i18n("Connecting to '%1'...").tqarg(np.essid) );
statusLabel->repaint(); statusLabel->tqrepaint();
if (!WATools::isUp(np.iface.ascii()) ) WATools::setUp( true, np.iface.ascii() ); if (!WATools::isUp(np.iface.ascii()) ) WATools::setUp( true, np.iface.ascii() );
//runCommand( Commands.cmd("ifup", np) ); //runCommand( Commands.cmd("ifup", np) );
if ( runCommand( Commands.cmd("iwconfig_set", np) ).find("8B04") > -1 ) { // error 8B04 - Request 'Set Frequency' not supported. 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) if (autoQuit)
this->close(); this->close();
groupAPs ? setConnectedItem( np.essid ) : setConnectedItem( np.ap ); 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); setUi(1);
} else { } else {
std::cout << "CONNECTION FAILED." << std::endl; std::cout << "CONNECTION FAILED." << std::endl;
@ -757,7 +757,7 @@ void WirelessAssistant::setConnectedItem( const TQString & netid )
void WirelessAssistant::netDisconnect( const bool & quiet ) 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. timerConnectionCheck->stop(); //stop while disconnecting.
if ( !NetParams.preDisconnectionCommand.isEmpty() ) { if ( !NetParams.preDisconnectionCommand.isEmpty() ) {
@ -769,13 +769,13 @@ void WirelessAssistant::netDisconnect( const bool & quiet )
statusLabel->setText( i18n("Disconnecting...") ); statusLabel->setText( i18n("Disconnecting...") );
statusLabel->repaint(); statusLabel->tqrepaint();
setConnectedItem( 0 ); setConnectedItem( 0 );
if ( NetParams.dhcp ) { if ( NetParams.dhcp ) {
if ( dhcpClientRunning() ) { if ( dhcpClientRunning() ) {
runCommand( Commands.cmd( "kill_dhcp", NetParams ) ); runCommand( Commands.cmd( "kill_dhcp", NetParams ) );
statusLabel->setText( i18n("Waiting for DHCP client to shut down...") ); statusLabel->setText( i18n("Waiting for DHCP client to shut down...") );
statusLabel->repaint(); statusLabel->tqrepaint();
TQTimer* tmr = new TQTimer(); TQTimer* tmr = new TQTimer();
tmr->start(1500, true); //wait 1.5sec for dhcp client to really shutdown, single shot. tmr->start(1500, true); //wait 1.5sec for dhcp client to really shutdown, single shot.
while ( tmr->isActive() ) { while ( tmr->isActive() ) {
@ -960,7 +960,7 @@ TQString WirelessAssistant::runCommand( const TQStringList & cmd, int timeout, b
TQToolTip::remove TQToolTip::remove
(buttonClose); (buttonClose);
TQToolTip::add 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++; i++;
} }
@ -1059,7 +1059,7 @@ void WirelessAssistant::editNetParams()
ui_NetParamsEdit *netedit = new ui_NetParamsEdit(); ui_NetParamsEdit *netedit = new ui_NetParamsEdit();
netedit->setValues( NetParams ); netedit->setValues( NetParams );
netedit->setCaption( i18n("%1 Settings").arg(NetParams.essid) ); netedit->setCaption( i18n("%1 Settings").tqarg(NetParams.essid) );
netedit->exec(); netedit->exec();
if (netedit->result() == TQDialog::Rejected) { if (netedit->result() == TQDialog::Rejected) {
delete netedit; delete netedit;
@ -1085,7 +1085,7 @@ bool WirelessAssistant::dhcpClientRunning()
TQString pidFile; TQString pidFile;
pidPaths << "/etc/" << "/etc/dhcpc/" << "/var/run/"; pidPaths << "/etc/" << "/etc/dhcpc/" << "/var/run/";
if ( Commands.dhcpClient=="dhcpcd" ) if ( Commands.dhcpClient=="dhcpcd" )
pidFile = TQString("dhcpcd-%1.pid").arg(NetParams.iface.ascii()); pidFile = TQString("dhcpcd-%1.pid").tqarg(NetParams.iface.ascii());
else else
pidFile = TQString("dhclient.pid"); 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 ) bool WirelessAssistant::setWpaClientEnabled( bool e, const TQString& iface, TQString driver )
{ {
if (!e) { 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(); TQFile( wpaConfigFile ).remove();
return 1; return 1;
} else } else
return 0; // wpa client was not running. 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; std::cout << "WPA client already running. Reconfiguring..." << std::endl;
runCommand( TQStringList(Commands.wpa_cli) << "reconfigure" ); runCommand( TQStringList(Commands.wpa_cli) << "reconfigure" );
} else { } else {
@ -1215,9 +1215,9 @@ bool WirelessAssistant::setWpaClientEnabled( bool e, const TQString& iface, TQSt
wp->clearArguments(); wp->clearArguments();
wp->addArgument( Commands.wpa_supplicant ); wp->addArgument( Commands.wpa_supplicant );
wp->addArgument( "-W" ); //wait for control interface wp->addArgument( "-W" ); //wait for control interface
wp->addArgument( TQString("-D%1").arg(driver) ); wp->addArgument( TQString("-D%1").tqarg(driver) );
wp->addArgument( TQString("-i%1").arg(iface) ); wp->addArgument( TQString("-i%1").tqarg(iface) );
wp->addArgument( TQString("-c%1").arg(wpaConfigFile) ); wp->addArgument( TQString("-c%1").tqarg(wpaConfigFile) );
//std::cout << "Starting WPA client: " << wp->arguments().join(" ").ascii() << std::endl; //std::cout << "Starting WPA client: " << wp->arguments().join(" ").ascii() << std::endl;
if ( !wp->start() ) { if ( !wp->start() ) {
std::cout << "Failed to start WPA client." << std::endl; std::cout << "Failed to start WPA client." << std::endl;
@ -1231,14 +1231,14 @@ bool WirelessAssistant::setWpaClientEnabled( bool e, const TQString& iface, TQSt
TQString o; TQString o;
int i = 0; 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++) { for (int c = 0; c < 15; c++) {
usleep(75*1000); //75msec usleep(75*1000); //75msec
KApplication::eventLoop()->processEvents( TQEventLoop::AllEvents ); KApplication::eventLoop()->processEvents( TQEventLoop::AllEvents );
i++; i++;
} }
if (i>400) { //more than 30sec have passed 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; return 0;
} }
if ( o.contains("wpa_state=COMPLETED") ) { if ( o.contains("wpa_state=COMPLETED") ) {

2
src/wlassistant.h
Unescape View File

@ -112,7 +112,7 @@ protected slots:
virtual void removeNetParams(); virtual void removeNetParams();
virtual void updateNetParams(); virtual void updateNetParams();
virtual void itemAction(); virtual void itemAction();
virtual void checkConnectionStatus(); virtual void checkConnectiontqStatus();
virtual void updateConnectButton(TQListViewItem* lvi); virtual void updateConnectButton(TQListViewItem* lvi);
virtual void setMouseBehaviour(); virtual void setMouseBehaviour();
virtual void togglePage(bool options ); virtual void togglePage(bool options );

Write Preview
Loading…
Cancel
Save