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, 67 insertions, 66 deletions

diff --git a/src/knutprefdlg.h b/src/knutprefdlg.h
index 0628abd..f26f863 100644
--- a/src/knutprefdlg.h
+++ b/src/knutprefdlg.h
@@ -32,13 +32,13 @@
 #include <kcolorbtn.h>
 #include <kcombobox.h>
 
-#include <qwidget.h>
+#include <tqwidget.h>
 
-class QLabel;
-class QFont;
-class QCheckBox;
-class QRadioButton;
-class QSpinBox;
+class TQLabel;
+class TQFont;
+class TQCheckBox;
+class TQRadioButton;
+class TQSpinBox;
 
 
 /**
@@ -55,6 +55,7 @@ class QSpinBox;
 class KNutPrefDlg : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
 
 enum changePref {
@@ -114,7 +115,7 @@ enum changePref {
  *
  * @since  0.5
  **/
-  KNutPrefDlg(KNutUpsData* const upsData, KNutVarData* const analogData, KNutVarData::SettingDataDef* const settingData, const QString upsName, QWidget* parent = 0, const char* name = 0, const bool modal = true);
+  KNutPrefDlg(KNutUpsData* const upsData, KNutVarData* const analogData, KNutVarData::SettingDataDef* const settingData, const TQString upsName, TQWidget* tqparent = 0, const char* name = 0, const bool modal = true);
 
 /**
  * @since  0.3
@@ -263,7 +264,7 @@ void slotUseCustomBIconColor(bool enable);
 
 
 // Private values
-  QString m_activeUpsName; // name of UPS which is active
+  TQString m_activeUpsName; // name of UPS which is active
   KNutUpsData* m_myUpsData;
   KNutVarData* m_myAnalogData;
   KNutVarData::SettingDataDef* m_settingData;
@@ -274,56 +275,56 @@ void slotUseCustomBIconColor(bool enable);
   bool m_checked; //it's settted when, definition(parameters) of UPS were chaged // nastaveno kdyz doslo k zmene v definici UPS
   bool m_checkedActiveUps; //it's setted when, parameters of active UPS were changed // nastaveno pokud doslo ke zmene na aktivni UPS
 
-  QSpinBox *m_numberOfColumns;
+  TQSpinBox *m_numberOfColumns;
   KColorButton *m_BGButton;
-  QCheckBox *m_checkBoxCbc;
-  QCheckBox *m_checkBoxAys;
-//  QCheckBox *m_checkBoxMW;
-  QCheckBox *m_checkBoxMesW;
+  TQCheckBox *m_checkBoxCbc;
+  TQCheckBox *m_checkBoxAys;
+//  TQCheckBox *m_checkBoxMW;
+  TQCheckBox *m_checkBoxMesW;
   KComboBox *m_comboBoxMainWindow;
-  QCheckBox *m_xfer;
-
-  QCheckBox *m_checkBoxOver;
-  QCheckBox *m_checkBoxBL;
-  QCheckBox *m_checkBoxRB;
-  QCheckBox *m_checkBoxCal;
-  QCheckBox *m_checkBoxMFRM;
-  QCheckBox *m_checkBoxMFR;
-  QCheckBox *m_checkBoxModel;
-  QCheckBox *m_checkBoxSerial;
-  QCheckBox *m_checkBoxFirm;
-  QCheckBox *m_checkBoxRun;
-  QCheckBox *m_checkBoxCbpc;
-  QCheckBox* m_checkBoxCbac;
-  QCheckBox* m_checkBoxCoac;
-  QCheckBox *m_checkBoxCbi;
-  QCheckBox *m_checkBoxTTMFR;
-  QCheckBox *m_checkBoxTTModel;
-  QCheckBox *m_checkBoxTTSerial;
-  QCheckBox *m_checkBoxTTFirm;
-  QCheckBox *m_checkBoxTTRun;
-  QCheckBox *m_checkBoxTTCharge;
-  QCheckBox *m_checkBoxTTLoad;
-
-  QLabel *m_panelBackgroundColorLabel;
-  QLabel *m_mainBackgroundColorLabel;
-  QLabel *m_analogBackgroundColorLabel;
-  QLabel *m_dockBackgroundColorLabel;
-  QLabel *m_analogPointerColorLabel;
-  QLabel *m_analogOKColorLabel;
-  QLabel *m_analogWarningColorLabel;
-  QLabel *m_analogErrorColorLabel;
-  QLabel *m_analogScaleColorLabel;
-  QLabel *m_analogFontColorLabel;
-  QLabel *m_digitalProcessingLabel;
-  QLabel *m_iconDockLabel;
-
-  QRadioButton *m_vRadioButton1;
-  QRadioButton *m_vRadioButton2;
-  QRadioButton *m_fRadioButton1;
-  QRadioButton *m_fRadioButton2;
-  QRadioButton *m_iconRadioButton1;
-  QRadioButton *m_iconRadioButton2;
+  TQCheckBox *m_xfer;
+
+  TQCheckBox *m_checkBoxOver;
+  TQCheckBox *m_checkBoxBL;
+  TQCheckBox *m_checkBoxRB;
+  TQCheckBox *m_checkBoxCal;
+  TQCheckBox *m_checkBoxMFRM;
+  TQCheckBox *m_checkBoxMFR;
+  TQCheckBox *m_checkBoxModel;
+  TQCheckBox *m_checkBoxSerial;
+  TQCheckBox *m_checkBoxFirm;
+  TQCheckBox *m_checkBoxRun;
+  TQCheckBox *m_checkBoxCbpc;
+  TQCheckBox* m_checkBoxCbac;
+  TQCheckBox* m_checkBoxCoac;
+  TQCheckBox *m_checkBoxCbi;
+  TQCheckBox *m_checkBoxTTMFR;
+  TQCheckBox *m_checkBoxTTModel;
+  TQCheckBox *m_checkBoxTTSerial;
+  TQCheckBox *m_checkBoxTTFirm;
+  TQCheckBox *m_checkBoxTTRun;
+  TQCheckBox *m_checkBoxTTCharge;
+  TQCheckBox *m_checkBoxTTLoad;
+
+  TQLabel *m_panelBackgroundColorLabel;
+  TQLabel *m_mainBackgroundColorLabel;
+  TQLabel *m_analogBackgroundColorLabel;
+  TQLabel *m_dockBackgroundColorLabel;
+  TQLabel *m_analogPointerColorLabel;
+  TQLabel *m_analogOKColorLabel;
+  TQLabel *m_analogWarningColorLabel;
+  TQLabel *m_analogErrorColorLabel;
+  TQLabel *m_analogScaleColorLabel;
+  TQLabel *m_analogFontColorLabel;
+  TQLabel *m_digitalProcessingLabel;
+  TQLabel *m_iconDockLabel;
+
+  TQRadioButton *m_vRadioButton1;
+  TQRadioButton *m_vRadioButton2;
+  TQRadioButton *m_fRadioButton1;
+  TQRadioButton *m_fRadioButton2;
+  TQRadioButton *m_iconRadioButton1;
+  TQRadioButton *m_iconRadioButton2;
 
   KColorButton *m_BGPButton;
   KColorButton* m_BGAButton;
@@ -337,22 +338,22 @@ void slotUseCustomBIconColor(bool enable);
 
   KComboBox* m_digitalProcesingOfPointers;
 
-  QButtonGroup	*m_voltageGroup;
-  QButtonGroup	*m_frequencyGroup;
+  TQButtonGroup	*m_voltageGroup;
+  TQButtonGroup	*m_frequencyGroup;
 
-  QCheckBox* m_customFont; // User's font 
+  TQCheckBox* m_customFont; // User's font 
   KFontChooser *m_fontWidget;
 
-  QFont m_aPanelFont; // Analog panel font
-  QFont m_mPanelFont; // Main panel font
+  TQFont m_aPanelFont; // Analog panel font
+  TQFont m_mPanelFont; // Main panel font
 
   int m_settingFont; // which font is setted (selected)
 
-  QPixmap m_panelPix;
-  QPixmap m_mSetPix;
-  QPixmap m_upsesPix;
-  QPixmap m_analogPix;
-  QPixmap m_dockPix;
+  TQPixmap m_panelPix;
+  TQPixmap m_mSetPix;
+  TQPixmap m_upsesPix;
+  TQPixmap m_analogPix;
+  TQPixmap m_dockPix;
 
 };