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, 39 insertions, 39 deletions

diff --git a/src/knutvardata.h b/src/knutvardata.h
index 6f112d5..94faf9f 100755
--- a/src/knutvardata.h
+++ b/src/knutvardata.h
@@ -23,14 +23,14 @@
 /*    GLOBAL DEFINE            */
 /*******************************/
 
-#define DEFAULT_BG_COLOR Qt::lightGray
-#define DEFAULT_FINGER_COLOR Qt::black
-#define DEFAULT_OK_COLOR Qt::green
-#define DEFAULT_WARNNING_COLOR Qt::yellow
-#define DEFAULT_ERROR_COLOR Qt::red
-#define DEFAULT_SCALE_COLOR Qt::black
-#define DEFAULT_FONT_COLOR Qt::black
-#define DEFAULT_KICON_COLOR Qt::white
+#define DEFAULT_BG_COLOR TQt::lightGray
+#define DEFAULT_FINGER_COLOR TQt::black
+#define DEFAULT_OK_COLOR TQt::green
+#define DEFAULT_WARNNING_COLOR TQt::yellow
+#define DEFAULT_ERROR_COLOR TQt::red
+#define DEFAULT_SCALE_COLOR TQt::black
+#define DEFAULT_FONT_COLOR TQt::black
+#define DEFAULT_KICON_COLOR TQt::white
 
 #include <klocale.h>
 
@@ -38,9 +38,9 @@
 #include "knutupsdata.h"
 #include "knutconst.h"
 
-#include <qcolor.h>
-#include <qfont.h>
-#include <qstring.h>
+#include <tqcolor.h>
+#include <tqfont.h>
+#include <tqstring.h>
 
 
 //  const char *nameUpsVars1[] = {
@@ -68,9 +68,9 @@
   * @version 0.4
   **/
 
-class QString;
-class QColor;
-class QFont;
+class TQString;
+class TQColor;
+class TQFont;
 
 class KNutVarData {
 
@@ -94,15 +94,15 @@ struct SettingDataDef {
   int y;
   int width;
   int height;
-  QColor mainBackgroundColor;
-  QColor mPanelBackgroundColor;
-  QColor aPanelBackgroundColor;
-  QColor analogFingerColor;
-  QColor analogOKColor;
-  QColor analogWarnningColor;
-  QColor analogErrorColor;
-  QColor analogScaleColor;
-  QColor analogFontColor;
+  TQColor mainBackgroundColor;
+  TQColor mPanelBackgroundColor;
+  TQColor aPanelBackgroundColor;
+  TQColor analogFingerColor;
+  TQColor analogOKColor;
+  TQColor analogWarnningColor;
+  TQColor analogErrorColor;
+  TQColor analogScaleColor;
+  TQColor analogFontColor;
   unsigned int panelFlags;
   int inputVoltage;
   int inputFrequency;
@@ -114,14 +114,14 @@ struct SettingDataDef {
   bool customBPanelColor;
   bool customBAnalogColor;
   bool customOAnalogColor;
-  QFont mPanelFont; // main panel font
-  QFont aPanelFont; // analog panel font
-  QFont systemFont; // system font
+  TQFont mPanelFont; // main panel font
+  TQFont aPanelFont; // analog panel font
+  TQFont systemFont; // system font
   bool customFont; // use custom font
   bool useDescription;
   unsigned int toolTipFlags;
   bool customKIconColor;
-  QColor kIconBackgroundColor;
+  TQColor kIconBackgroundColor;
   int typeOfKIcon;
   int typeDigitalProcessing;
   bool activatedMainWindow;
@@ -135,22 +135,22 @@ struct upsInfoDef{  //include generally informations about active (selected) UPS
   // state of connection to usbd, this isn't state of knutnet
   knc::upsDriverConnection upsDriverState; // defined in knutconst.h
   int oldState; // code of lost state of UPS  kod posledniho stavu UPS
-  QString name;
-  QString password;
+  TQString name;
+  TQString password;
   int nutVariables;
   int nutProtocol;
-  QString runtimeVar;
-  QString lowxferVar;
-  QString highxferVar;
-  QString statusVar;
-  QString upsLoadVar;
+  TQString runtimeVar;
+  TQString lowxferVar;
+  TQString highxferVar;
+  TQString statusVar;
+  TQString upsLoadVar;
   bool reconnecting;  // is true when program is in reconnecting stage
   int reconnectCount; 
   };
 
 struct VarStrucDef {
-  QString nameAnalog; // jmeno promene v meraku  napr. UPS Load
-  QString nameUnit; // merna jednotka napr %
+  TQString nameAnalog; // jmeno promene v meraku  napr. UPS Load
+  TQString nameUnit; // merna jednotka napr %
   int typeAnalog; //typ meraku
   int numberItem; //pocet casti stupnice neni v souvislosti barvou
   int numberInItem; //pocet casti stupnice uvnitr dilku stupnice
@@ -223,7 +223,7 @@ void setXfer (const float lowXfer, const float highXfer);
   * @param seqNumber Kod typu merakuss.
   * @since  0.1
   **/
-QString getNameAnalogData (const int seqNumber);
+TQString getNameAnalogData (const int seqNumber);
 
 
 /**
@@ -231,7 +231,7 @@ QString getNameAnalogData (const int seqNumber);
  *
  * @since  0.2
  **/
-  static const QString errorToText (const int error);
+  static const TQString errorToText (const int error);
 
 
 /**
@@ -255,7 +255,7 @@ private:
   static const int F50HZ = 0;
   static const int F60HZ = 1;
 
-  QString m_upsVarNameAnalog[ knc::NumberOfTypes ];//array of strings - includes name of analog meters
+  TQString m_upsVarNameAnalog[ knc::NumberOfTypes ];//array of strings - includes name of analog meters
 };
 
 #endif