TQt4 port wlassistant

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/wlassistant@1239055 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 30 insertions, 29 deletions

diff --git a/src/wlassistant.h b/src/wlassistant.h
index 64cd048..388935a 100644
--- a/src/wlassistant.h
+++ b/src/wlassistant.h
@@ -29,20 +29,21 @@
 
 #include "netparams.h"
 
-class QTimer;
-class QProcess;
+class TQTimer;
+class TQProcess;
 class NetListViewItem;
 
 class WirelessAssistant : public mainWindow
 {
         Q_OBJECT
+  TQ_OBJECT
 
 public:
         /*$PUBLIC_FUNCTIONS$*/
-        WirelessAssistant(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+        WirelessAssistant(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
         ~WirelessAssistant();
 
-        static QString getVal(const QString & str, const QString & rxs);
+        static TQString getVal(const TQString & str, const TQString & rxs);
 
 public slots:
         /*$PUBLIC_SLOTS$*/
@@ -58,24 +59,24 @@ private:
         void saveSettings();
         void setUi(int uiState);
         void setSingleClick(bool i);
-        QString runCommand( const QStringList & cmd, int timeout = 0, bool detached = 0 );
-        void setNetParamsFromList( QListViewItem* lvi );
-        bool setNetParamsFromConfig( const QString & s );
-        QString matchEssidForAp( const QString & ap );
+        TQString runCommand( const TQStringList & cmd, int timeout = 0, bool detached = 0 );
+        void setNetParamsFromList( TQListViewItem* lvi );
+        bool setNetParamsFromConfig( const TQString & s );
+        TQString matchEssidForAp( const TQString & ap );
 	bool radioEnabled();
-	QListViewItem* getItemByAp( const QString & ap );
-	QListViewItem* getItemByEssid( const QString & essid );
-	void setConnectedItem( const QString & netid );
-	QString getGateway();
+	TQListViewItem* getItemByAp( const TQString & ap );
+	TQListViewItem* getItemByEssid( const TQString & essid );
+	void setConnectedItem( const TQString & netid );
+	TQString getGateway();
 	bool dhcpClientRunning();
-	QStringList interfaceList();
-	bool generateWpaConfigFile( const QString& essid, const QStringList& wpaSettings, const QString& wpaKey );
-	bool setWpaClientEnabled( bool e, const QString& iface = 0, QString driver = 0 );
+	TQStringList interfaceList();
+	bool generateWpaConfigFile( const TQString& essid, const TQStringList& wpaSettings, const TQString& wpaKey );
+	bool setWpaClientEnabled( bool e, const TQString& iface = 0, TQString driver = 0 );
 	
-	QStringList NetParamsList;
-        QStringList execsNotFound;
+	TQStringList NetParamsList;
+        TQStringList execsNotFound;
         NetListViewItem* connectedItem;
-	QString wpaConfigFile;
+	TQString wpaConfigFile;
         /// settings saved in wlassistantrc
         bool autoQuit;
 	bool autoReconnect;
@@ -84,33 +85,33 @@ private:
 	bool wpaAvailable;
 	int DelayBeforeScanning;
         int DhcpTimeout;
-        /*QString dhcpcdInfoPath;
-        QString dhclientInfoPath;
-        QString dhcpcdPidPath;
-        QString dhclientPidPath;*/
+        /*TQString dhcpcdInfoPath;
+        TQString dhclientInfoPath;
+        TQString dhcpcdPidPath;
+        TQString dhclientPidPath;*/
         /// end settings.
 
         WACommands Commands;
         WANetParams NetParams;
-        QTimer* timerGui;
-        QTimer* timerConnectionCheck;
+        TQTimer* timerGui;
+        TQTimer* timerConnectionCheck;
 
 protected slots:
         /*$PROTECTED_SLOTS$*/
         virtual void init();
 	virtual void netAutoConnect();
-        virtual void parseScan( const QString & output );
-        virtual void setDev( const QString & ifname);
+        virtual void parseScan( const TQString & output );
+        virtual void setDev( const TQString & ifname);
         virtual void setNetListColumns();
         virtual void updateConfiguration(int category = -1);
         virtual void updateConnectedItem();
-        virtual void showItemContextMenu( QListViewItem* i, const QPoint& p, int c);
+        virtual void showItemContextMenu( TQListViewItem* i, const TQPoint& p, int c);
         virtual void editNetParams();
         virtual void removeNetParams();
         virtual void updateNetParams();
         virtual void itemAction();
-        virtual void checkConnectionStatus();
-        virtual void updateConnectButton(QListViewItem* lvi);
+        virtual void checkConnectiontqStatus();
+        virtual void updateConnectButton(TQListViewItem* lvi);
         virtual void setMouseBehaviour();
         virtual void togglePage(bool options );
         virtual void enableAllMessages();