diff options
| -rw-r--r-- | src/ui_NetParamsEdit.ui | 18 | ||||
| -rw-r--r-- | src/ui_NetParamsWizard.ui | 42 | ||||
| -rw-r--r-- | src/ui_main.ui | 28 | ||||
| -rw-r--r-- | src/waconfig.cpp | 2 | ||||
| -rw-r--r-- | src/wlassistant.cpp | 6 | ||||
| -rw-r--r-- | src/wlassistant.h | 2 |
6 files changed, 49 insertions, 49 deletions
diff --git a/src/ui_NetParamsEdit.ui b/src/ui_NetParamsEdit.ui index ea80838..b73ab0f 100644 --- a/src/ui_NetParamsEdit.ui +++ b/src/ui_NetParamsEdit.ui @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -327,7 +327,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -357,7 +357,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>21</width> <height>40</height> @@ -467,7 +467,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -605,7 +605,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>130</width> <height>20</height> @@ -715,7 +715,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>130</width> <height>20</height> @@ -825,7 +825,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>130</width> <height>20</height> @@ -935,7 +935,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>130</width> <height>20</height> @@ -1026,7 +1026,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>31</width> <height>20</height> diff --git a/src/ui_NetParamsWizard.ui b/src/ui_NetParamsWizard.ui index 1c933c4..9ee709a 100644 --- a/src/ui_NetParamsWizard.ui +++ b/src/ui_NetParamsWizard.ui @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>21</width> <height>100</height> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>101</width> <height>21</height> @@ -135,7 +135,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>80</width> <height>21</height> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>60</width> <height>31</height> @@ -202,7 +202,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -431,7 +431,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>60</width> <height>31</height> @@ -448,7 +448,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>50</width> <height>21</height> @@ -465,7 +465,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>21</width> <height>16</height> @@ -551,7 +551,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>122</width> <height>31</height> @@ -568,7 +568,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>150</width> <height>21</height> @@ -593,7 +593,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>31</width> <height>16</height> @@ -610,7 +610,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>50</width> <height>21</height> @@ -627,7 +627,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>30</width> <height>21</height> @@ -649,7 +649,7 @@ <property name="name"> <cstring>wepKey</cstring> </property> -<property name="tqminimumSize"> +<property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -690,7 +690,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>31</width> <height>54</height> @@ -707,7 +707,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>80</width> <height>21</height> @@ -724,7 +724,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>49</width> <height>21</height> @@ -754,7 +754,7 @@ <property name="name"> <cstring>wpaKey</cstring> </property> -<property name="tqminimumSize"> +<property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -790,7 +790,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>80</width> <height>21</height> @@ -807,7 +807,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>60</width> <height>31</height> diff --git a/src/ui_main.ui b/src/ui_main.ui index 8db0707..acdeb3e 100644 --- a/src/ui_main.ui +++ b/src/ui_main.ui @@ -23,7 +23,7 @@ <property name="name"> <cstring>buttonOptions</cstring> </property> -<property name="tqminimumSize"> +<property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -75,7 +75,7 @@ <property name="enabled"> <bool>false</bool> </property> -<property name="tqminimumSize"> +<property name="minimumSize"> <size> <width>120</width> <height>0</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>21</width> <height>120</height> @@ -184,7 +184,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> -<property name="tqminimumSize"> +<property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -209,7 +209,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> -<property name="tqminimumSize"> +<property name="minimumSize"> <size> <width>60</width> <height>0</height> @@ -350,7 +350,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> -<property name="tqminimumSize"> +<property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -366,7 +366,7 @@ <set>WordBreak|AlignVCenter</set> </property> <property name="whatsThis" stdset="0"> -<string><p><b>tqStatus Bar</b></p> +<string><p><b>Status Bar</b></p> <p>Messages describing current process are shown in this area.</p></string> </property> </widget> @@ -521,7 +521,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -538,7 +538,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -625,7 +625,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>101</width> <height>21</height> @@ -642,7 +642,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>118</width> <height>21</height> @@ -679,7 +679,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>201</width> <height>21</height> @@ -713,7 +713,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> -<property name="tqsizeHint"> +<property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -745,7 +745,7 @@ <slot>setDeviceList()</slot> </Q_SLOTS> <functions> -<function>updatetqStatus(char sts)</function> +<function>updateStatus(char sts)</function> </functions> <layoutdefaults spacing="6" margin="11"/> <includehints> diff --git a/src/waconfig.cpp b/src/waconfig.cpp index bb8cc97..4dc5d41 100644 --- a/src/waconfig.cpp +++ b/src/waconfig.cpp @@ -16,7 +16,7 @@ WAConfig *WAConfig::self() } WAConfig::WAConfig( ) - : KConfigSkeleton( TQString::tqfromLatin1( "wlassistantrc" ) ) + : KConfigSkeleton( TQString::fromLatin1( "wlassistantrc" ) ) { mSelf = this; } diff --git a/src/wlassistant.cpp b/src/wlassistant.cpp index caafb37..ef59019 100644 --- a/src/wlassistant.cpp +++ b/src/wlassistant.cpp @@ -191,7 +191,7 @@ void WirelessAssistant::init() timerGui = new TQTimer(); timerConnectionCheck = new TQTimer(); connect( timerGui, TQT_SIGNAL(timeout()), TQT_SLOT(updateConnectedItem()) ); - connect( timerConnectionCheck, TQT_SIGNAL(timeout()), TQT_SLOT(checkConnectiontqStatus()) ); + connect( timerConnectionCheck, TQT_SIGNAL(timeout()), TQT_SLOT(checkConnectionStatus()) ); //////////////////////// ///// DETECT & SET PATHS ///// @@ -213,7 +213,7 @@ void WirelessAssistant::init() TQTimer::singleShot( 0, this, TQT_SLOT(netScan()) ); } -void WirelessAssistant::checkConnectiontqStatus() +void WirelessAssistant::checkConnectionStatus() { TQListViewItem* lvi; if (groupAPs) lvi = getItemByEssid( WATools::essid(NetParams.iface.ascii())); @@ -291,7 +291,7 @@ void WirelessAssistant::netScan() timerConnectionCheck->stop(); //stop while scanning. netScan( NetParams ); if (netList->childCount() > 0) { - TQTimer::singleShot( 0, this, TQT_SLOT(checkConnectiontqStatus()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(checkConnectionStatus()) ); timerConnectionCheck->start(WA_CONNECTION_CHECK_INTERVAL); } } diff --git a/src/wlassistant.h b/src/wlassistant.h index 4951e8f..ec094e8 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 checkConnectiontqStatus(); + virtual void checkConnectionStatus(); virtual void updateConnectButton(TQListViewItem* lvi); virtual void setMouseBehaviour(); virtual void togglePage(bool options ); |