diff options
Diffstat (limited to 'wifi')
-rw-r--r-- | wifi/kcmwifi/configadvanced.ui | 2 | ||||
-rw-r--r-- | wifi/kcmwifi/configcrypto.ui | 18 | ||||
-rw-r--r-- | wifi/kcmwifi/configcrypto.ui.h | 8 | ||||
-rw-r--r-- | wifi/kcmwifi/ifconfigpagebase.ui | 14 | ||||
-rw-r--r-- | wifi/kcmwifi/mainconfigbase.ui | 6 | ||||
-rw-r--r-- | wifi/kcmwifi/vendorconfig.cpp | 2 | ||||
-rw-r--r-- | wifi/kwifimanager.cpp | 8 | ||||
-rw-r--r-- | wifi/kwifimanager.h | 4 | ||||
-rw-r--r-- | wifi/locator.cpp | 8 | ||||
-rw-r--r-- | wifi/statistics.cpp | 4 | ||||
-rw-r--r-- | wifi/status.cpp | 12 | ||||
-rw-r--r-- | wifi/status.h | 4 | ||||
-rw-r--r-- | wifi/strength.cpp | 4 |
13 files changed, 47 insertions, 47 deletions
diff --git a/wifi/kcmwifi/configadvanced.ui b/wifi/kcmwifi/configadvanced.ui index 3eda59d7..1e54d280 100644 --- a/wifi/kcmwifi/configadvanced.ui +++ b/wifi/kcmwifi/configadvanced.ui @@ -96,7 +96,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/wifi/kcmwifi/configcrypto.ui b/wifi/kcmwifi/configcrypto.ui index 76736675..41cfdf33 100644 --- a/wifi/kcmwifi/configcrypto.ui +++ b/wifi/kcmwifi/configcrypto.ui @@ -260,7 +260,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -310,25 +310,25 @@ <sender>le_key1</sender> <signal>textChanged(const TQString&)</signal> <receiver>ConfigCrypto</receiver> - <slot>slotUpdateKey1tqStatus(const TQString&)</slot> + <slot>slotUpdateKey1Status(const TQString&)</slot> </connection> <connection> <sender>le_key2</sender> <signal>textChanged(const TQString&)</signal> <receiver>ConfigCrypto</receiver> - <slot>slotUpdateKey2tqStatus(const TQString&)</slot> + <slot>slotUpdateKey2Status(const TQString&)</slot> </connection> <connection> <sender>le_key3</sender> <signal>textChanged(const TQString&)</signal> <receiver>ConfigCrypto</receiver> - <slot>slotUpdateKey3tqStatus(const TQString&)</slot> + <slot>slotUpdateKey3Status(const TQString&)</slot> </connection> <connection> <sender>le_key4</sender> <signal>textChanged(const TQString&)</signal> <receiver>ConfigCrypto</receiver> - <slot>slotUpdateKey4tqStatus(const TQString&)</slot> + <slot>slotUpdateKey4Status(const TQString&)</slot> </connection> </connections> <tabstops> @@ -345,10 +345,10 @@ <include location="local" impldecl="in implementation">configcrypto.ui.h</include> </includes> <Q_SLOTS> - <slot>slotUpdateKey1tqStatus( const TQString & key )</slot> - <slot>slotUpdateKey2tqStatus( const TQString & key )</slot> - <slot>slotUpdateKey3tqStatus( const TQString & key )</slot> - <slot>slotUpdateKey4tqStatus( const TQString & key )</slot> + <slot>slotUpdateKey1Status( const TQString & key )</slot> + <slot>slotUpdateKey2Status( const TQString & key )</slot> + <slot>slotUpdateKey3Status( const TQString & key )</slot> + <slot>slotUpdateKey4Status( const TQString & key )</slot> </Q_SLOTS> <functions> <function specifier="non virtual">load( const IfConfig & ifconfig )</function> diff --git a/wifi/kcmwifi/configcrypto.ui.h b/wifi/kcmwifi/configcrypto.ui.h index be561bff..acb98974 100644 --- a/wifi/kcmwifi/configcrypto.ui.h +++ b/wifi/kcmwifi/configcrypto.ui.h @@ -32,7 +32,7 @@ void ConfigCrypto::save( IfConfig &ifconfig ) } -void ConfigCrypto::slotUpdateKey1tqStatus(const TQString& key) +void ConfigCrypto::slotUpdateKey1Status(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { @@ -63,7 +63,7 @@ void ConfigCrypto::slotUpdateKey1tqStatus(const TQString& key) } } -void ConfigCrypto::slotUpdateKey2tqStatus(const TQString& key) +void ConfigCrypto::slotUpdateKey2Status(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { @@ -94,7 +94,7 @@ void ConfigCrypto::slotUpdateKey2tqStatus(const TQString& key) } } -void ConfigCrypto::slotUpdateKey3tqStatus(const TQString& key) +void ConfigCrypto::slotUpdateKey3Status(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { @@ -125,7 +125,7 @@ void ConfigCrypto::slotUpdateKey3tqStatus(const TQString& key) } } -void ConfigCrypto::slotUpdateKey4tqStatus(const TQString& key) +void ConfigCrypto::slotUpdateKey4Status(const TQString& key) { KeyStates status = ::Key::isValid( key ); switch (status) { diff --git a/wifi/kcmwifi/ifconfigpagebase.ui b/wifi/kcmwifi/ifconfigpagebase.ui index 089284aa..f2e3df7d 100644 --- a/wifi/kcmwifi/ifconfigpagebase.ui +++ b/wifi/kcmwifi/ifconfigpagebase.ui @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>226</width> <height>20</height> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>196</width> <height>20</height> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>285</width> <height>20</height> @@ -286,7 +286,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>190</width> <height>20</height> @@ -354,7 +354,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>413</width> <height>20</height> @@ -392,7 +392,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>20</height> @@ -444,7 +444,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>396</width> <height>20</height> diff --git a/wifi/kcmwifi/mainconfigbase.ui b/wifi/kcmwifi/mainconfigbase.ui index 77e168c1..5fcb1dab 100644 --- a/wifi/kcmwifi/mainconfigbase.ui +++ b/wifi/kcmwifi/mainconfigbase.ui @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>146</width> <height>20</height> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>106</width> <height>20</height> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>66</width> <height>20</height> diff --git a/wifi/kcmwifi/vendorconfig.cpp b/wifi/kcmwifi/vendorconfig.cpp index 395cbc58..e415c276 100644 --- a/wifi/kcmwifi/vendorconfig.cpp +++ b/wifi/kcmwifi/vendorconfig.cpp @@ -184,7 +184,7 @@ is incremented _after_ successful setup of each given config. */ TQString value = buffer.section ( ' ', 1, 1 ); kdDebug ( ) << "Variable " << var << " contains " << value << ".\n"; // evaluate the meaningful lines - if ( var.tqstartsWith ( "wireless", false ) ) + if ( var.startsWith ( "wireless", false ) ) { if ( var.endsWith ( "essid" ) ) { diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp index 67b9378e..78728de1 100644 --- a/wifi/kwifimanager.cpp +++ b/wifi/kwifimanager.cpp @@ -184,7 +184,7 @@ KWiFiManagerApp::slotLogESSID (TQString essid) if (!log_file.open (IO_WriteOnly | IO_Append)) kdDebug () << "Logging failed!" << endl; TQTextStream stream (&log_file); - stream << TQDateTime::tqcurrentDateTime().toString ().latin1 (); + stream << TQDateTime::currentDateTime().toString ().latin1 (); stream << " Entering network: " << essid.latin1() << endl; log_file.close (); } @@ -262,7 +262,7 @@ KWiFiManagerApp::slotChangeTrayIcon () } else if (((str == 0) && (mode == 2)) || (!validdata)) { - sstrength2.setText( TQString::tqfromLatin1("0") ); + sstrength2.setText( TQString::fromLatin1("0") ); ICON = strength->OOR_DOWN; if (led->state == true) led->Off (); @@ -286,7 +286,7 @@ KWiFiManagerApp::slotChangeTrayIcon () labelfont.setStretch( TQFont::Condensed ); labelfont.setBold( true ); sstrength2.setFont( labelfont ); - sstrength2.setFixedSize( sstrength2.tqsizeHint() ); + sstrength2.setFixedSize( sstrength2.sizeHint() ); } TQPixmap labeltemp = TQPixmap::grabWidget( &sstrength2 ); labeltemp.setMask( labeltemp.createHeuristicMask() ); @@ -363,7 +363,7 @@ KWiFiManagerApp::initView () TQGridLayout *zentraltqlayout = new TQGridLayout (view); zentraltqlayout->setMargin( KDialog::marginHint() ); speedmeter = new Speed (view, device); - status = new tqStatus (view, device); + status = new Status (view, device); location = new Locator (view, device); strength = new Strength (view, device); pictogram = new Picture (view, device); diff --git a/wifi/kwifimanager.h b/wifi/kwifimanager.h index c52969ac..6a58de44 100644 --- a/wifi/kwifimanager.h +++ b/wifi/kwifimanager.h @@ -39,7 +39,7 @@ class KProcess; #include "interface_wireless.h" #include "interface_dcop.h" class Strength; -class tqStatus; +class Status; class Picture; class Locator; class Speed; @@ -115,7 +115,7 @@ private: Speed *speedmeter; TQBoxLayout *bla; TQLabel *profil; - tqStatus *status; + Status *status; Strength *strength; Picture *pictogram; Locator *location; diff --git a/wifi/locator.cpp b/wifi/locator.cpp index 6bb0cd62..2ca40398 100644 --- a/wifi/locator.cpp +++ b/wifi/locator.cpp @@ -35,12 +35,12 @@ Locator::generateLocWidget () sentence = new TQLabel (i18n ("AccessPoint: ") + whois (mac.local8Bit (), APs), this); setFixedSize (TQSize - (sentence->tqsizeHint ().width () + 2, - sentence->tqsizeHint ().height ())); + (sentence->sizeHint ().width () + 2, + sentence->sizeHint ().height ())); sentence-> setFixedSize (TQSize - (sentence->tqsizeHint ().width () + 2, - sentence->tqsizeHint ().height ())); + (sentence->sizeHint ().width () + 2, + sentence->sizeHint ().height ())); sentence->show (); widgetbild = TQPixmap::grabWidget (sentence); delete sentence; diff --git a/wifi/statistics.cpp b/wifi/statistics.cpp index 7dfe88b6..15295180 100644 --- a/wifi/statistics.cpp +++ b/wifi/statistics.cpp @@ -102,10 +102,10 @@ Statistics::paintEvent (TQPaintEvent *) { if (showStatsNoise) { statpainter->setPen (red); - statpainter->tqdrawPolyline (datensatz2, 1); + statpainter->drawPolyline (datensatz2, 1); } statpainter->setPen (blue); - statpainter->tqdrawPolyline (datensatz, 1); + statpainter->drawPolyline (datensatz, 1); } delete statpainter; } diff --git a/wifi/status.cpp b/wifi/status.cpp index 0bd45b3a..3d344800 100644 --- a/wifi/status.cpp +++ b/wifi/status.cpp @@ -22,13 +22,13 @@ #include <unistd.h> #include <sys/types.h> -tqStatus::tqStatus (TQWidget * parent, Interface_wireless * device) +Status::Status (TQWidget * parent, Interface_wireless * device) : TQWidget (parent, "KWiFiManager status") { this->device = device; } -bool tqStatus::generateStatsWidget () +bool Status::generateStatsWidget () { double freq = 0.; @@ -361,10 +361,10 @@ bool tqStatus::generateStatsWidget () else enc = new TQLabel (i18n ("active"), content); } - // content->setFixedSize (content->tqsizeHint ()); - content->setMinimumSize(content->tqsizeHint()); + // content->setFixedSize (content->sizeHint ()); + content->setMinimumSize(content->sizeHint()); if ( content->minimumWidth() < 280 ) content->setMinimumWidth( 280 ); - setFixedSize (content->tqminimumSize()); + setFixedSize (content->minimumSize()); content->show (); widgetbild = TQPixmap::grabWidget (content); delete @@ -373,7 +373,7 @@ bool tqStatus::generateStatsWidget () } void -tqStatus::paintEvent (TQPaintEvent *) +Status::paintEvent (TQPaintEvent *) { TQPainter *paintArea = new TQPainter (this); generateStatsWidget (); diff --git a/wifi/status.h b/wifi/status.h index dfdfd81d..59efff87 100644 --- a/wifi/status.h +++ b/wifi/status.h @@ -26,10 +26,10 @@ class Interface_wireless; -class tqStatus:public TQWidget +class Status:public TQWidget { public: - tqStatus (TQWidget * parent, Interface_wireless * device); + Status (TQWidget * parent, Interface_wireless * device); private: void paintEvent (TQPaintEvent *); bool generateStatsWidget (); diff --git a/wifi/strength.cpp b/wifi/strength.cpp index e33a6155..a448cfdb 100644 --- a/wifi/strength.cpp +++ b/wifi/strength.cpp @@ -63,7 +63,7 @@ TQSize Strength::mySizeHint () // up to now: this is the height required to get a decent logo display // now determine height of TQLabels to calculate the extra needed height TQLabel heightTest( "ABC", 0 ); - temp->setHeight( temp->height() + 2 * heightTest.tqsizeHint().height() + 10 ); + temp->setHeight( temp->height() + 2 * heightTest.sizeHint().height() + 10 ); return *temp; } @@ -149,7 +149,7 @@ Strength::updateInfo (TQPaintEvent *) else if (((strength == 0) && (mode == 2)) || (!validdata)) { sstrength1 = i18n("OUT OF RANGE"); - sstrength2 = TQString::tqfromLatin1("0"); + sstrength2 = TQString::fromLatin1("0"); strengthpainter->drawPixmap (50, 10, *OOR_DOWN); } else |