TQt4 port knutclient

This enables compilation under both Qt3 and Qt4


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

1 files changed, 21 insertions, 20 deletions

diff --git a/src/knutclient.h b/src/knutclient.h
index fab2295..9b3da33 100755
--- a/src/knutclient.h
+++ b/src/knutclient.h
@@ -33,20 +33,21 @@
 #include <kapplication.h>
 
 
-#include <qwidget.h>
-#include <qtimer.h>
-#include <qstringlist.h>
-#include <qmutex.h>
+#include <tqwidget.h>
+#include <tqtimer.h>
+#include <tqstringlist.h>
+#include <tqmutex.h>
 
   const int countNextConnDelay = 10;
   const int nextConnDelay[] = {
   5, 5, 20, 30, 60, 60, 120, 300, 600, 900 };
 
 
-class KNutClient : public QObject, public KSessionManaged {
+class KNutClient : public TQObject, public KSessionManaged {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KNutClient(bool noDock = false, QObject* parent=0,const char* name=0);
+    KNutClient(bool noDock = false, TQObject* tqparent=0,const char* name=0);
     ~KNutClient();
 
   private slots:
@@ -54,7 +55,7 @@ class KNutClient : public QObject, public KSessionManaged {
 
     void slotReconnectTimeout (void);
 
-    void slotSetNewUPS (QString name);
+    void slotSetNewUPS (TQString name);
 
     void slotPreferenceUps(void);
 
@@ -63,7 +64,7 @@ class KNutClient : public QObject, public KSessionManaged {
     void slotPrintUPSVars(void);
     void slotInstComms(void);
     void slotRWVars(void);
-    void slotChangeRWVars( QString );
+    void slotChangeRWVars( TQString );
 
     void slotSaveConf (void);
 
@@ -73,7 +74,7 @@ class KNutClient : public QObject, public KSessionManaged {
 
 /**
  * 
- * Calls function for repainting of icon in dock.
+ * Calls function for tqrepainting of icon in dock.
  * Vola funkci pro prekresleni icony v doku.
  * 
  * @since  0.1
@@ -84,7 +85,7 @@ class KNutClient : public QObject, public KSessionManaged {
 
 /**
  * This function is called when program repeats other connection;
- * Calls function for repainting of icon in dock.
+ * Calls function for tqrepainting of icon in dock.
  * Tata funkce je volana, kdyz program opakuje pokus o pripojeni.
  * Vola funkci pro prekresleni icony v doku.
  * 
@@ -95,7 +96,7 @@ class KNutClient : public QObject, public KSessionManaged {
 
 /**
  * Nastavi hodnoty po prvem pripojeni na UPS, zavola prekresleni docku a  nastartuje timer
- * Sets values after the first conection to UPS ,calls to repaint of dock and starts timer
+ * Sets values after the first conection to UPS ,calls to tqrepaint of dock and starts timer
  * 
  * @since  0.2
  **/
@@ -133,8 +134,8 @@ class KNutClient : public QObject, public KSessionManaged {
     void exitMainWindow (void);
     void slotActiveMainWindow (void);
 
-    virtual bool commitData (QSessionManager&);
-    virtual bool saveState (QSessionManager&);
+    virtual bool commitData (TQSessionManager&);
+    virtual bool saveState (TQSessionManager&);
 
   private:
 
@@ -165,9 +166,9 @@ class KNutClient : public QObject, public KSessionManaged {
 
     void getUpsData (void);
 
-    void setActiveUpsInfo (QString name);
+    void setActiveUpsInfo (TQString name);
 
-    void addEventString (const QString text, const QString UPSAddress = QString::null);
+    void addEventString (const TQString text, const TQString UPSAddress = TQString());
 
     void showStatusEvent(void);
 
@@ -190,10 +191,10 @@ class KNutClient : public QObject, public KSessionManaged {
     KNutUpsData* upsRecords;
     KNutVarData* analogRecords;
 
-    QTimer* m_upsTimer;
-    QTimer* m_reconnectTimer;
+    TQTimer* m_upsTimer;
+    TQTimer* m_reconnectTimer;
 
-    QStringList* m_listKNutEvent;
+    TQStringList* m_listKNutEvent;
 
     bool m_panelsAreZeroing; //   indikuje zda je panel nulovany // use if analog panels is setting to zero
     //  kod posledni chyby spojeni zjistene v timeoutu
@@ -203,8 +204,8 @@ class KNutClient : public QObject, public KSessionManaged {
     KNutMessageManager* m_myMessMan;
 
     // mutex for reconnect, only one reconnect at a time
-    QMutex m_reconnectMutex;
-    QMutex m_upsDeactivateMutex;
+    TQMutex m_reconnectMutex;
+    TQMutex m_upsDeactivateMutex;
 
   };
 #endif