From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- wifi/kwifimanager.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'wifi/kwifimanager.h') diff --git a/wifi/kwifimanager.h b/wifi/kwifimanager.h index e89c8d88..0a91605b 100644 --- a/wifi/kwifimanager.h +++ b/wifi/kwifimanager.h @@ -22,7 +22,7 @@ #include #endif -// include files for Qt +// include files for TQt class TQLabel; class TQTimer; class TQPixmap; @@ -39,7 +39,7 @@ class KProcess; #include "interface_wireless.h" #include "interface_dcop.h" class Strength; -class Status; +class tqStatus; class Picture; class Locator; class Speed; @@ -79,10 +79,13 @@ struct configuration_data class KWiFiManagerApp:public KMainWindow, virtual public dcop_interface { -Q_OBJECT public: - KWiFiManagerApp (TQWidget * parent = 0, const char * name = 0); + Q_OBJECT + TQ_OBJECT + +public: + KWiFiManagerApp (TQWidget * tqparent = 0, const char * name = 0); ~KWiFiManagerApp (); - TQString interface () const { return device ? device->get_interface_name() : TQString::null; }; + TQString interface () const { return device ? device->get_interface_name() : TQString(); }; public: bool startDocked() { return m_startDocked; } public slots: @@ -112,7 +115,7 @@ private: Speed *speedmeter; TQBoxLayout *bla; TQLabel *profil; - Status *status; + tqStatus *status; Strength *strength; Picture *pictogram; Locator *location; -- cgit v1.2.1