TQt4 port piklab

This enables compilation under both Qt3 and Qt4


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

1 files changed, 14 insertions, 12 deletions

diff --git a/src/progs/direct/gui/direct_config_widget.h b/src/progs/direct/gui/direct_config_widget.h
index 4a5e4c6..093e9fa 100644
--- a/src/progs/direct/gui/direct_config_widget.h
+++ b/src/progs/direct/gui/direct_config_widget.h
@@ -22,17 +22,18 @@ namespace Direct
 class GroupUI : public ::Programmer::GroupUI
 {
 public:
-  virtual ::Programmer::ConfigWidget *createConfigWidget(QWidget *parent) const;
+  virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const;
   virtual bool hasAdvancedDialog() const { return false; }
-  virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &, QWidget *) const { return 0; }
+  virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &, TQWidget *) const { return 0; }
 };
 
 //-----------------------------------------------------------------------------
 class HConfigWidget : public ::Hardware::HConfigWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  HConfigWidget(::Programmer::Base &base, QWidget *parent, bool edit);
+  HConfigWidget(::Programmer::Base &base, TQWidget *tqparent, bool edit);
   virtual bool set(const Port::Description &pd, const ::Hardware::Data &data);
   virtual ::Hardware::Data *data() const;
 
@@ -44,17 +45,17 @@ private slots:
   void slotSendBits();
 
 private:
-  QComboBox    *_combos[Nb_PinTypes];
-  QCheckBox    *_invcbs[Nb_PinTypes];
-  QCheckBox    *_testcbs[Nb_PinTypes];
-  QLabel       *_testLabels[Nb_PinTypes];
+  TQComboBox    *_combos[Nb_PinTypes];
+  TQCheckBox    *_invcbs[Nb_PinTypes];
+  TQCheckBox    *_testcbs[Nb_PinTypes];
+  TQLabel       *_testLabels[Nb_PinTypes];
   KIntNumInput *_delay;
-  QPushButton  *_sendBitsButton;
-  QTimer       *_timerSendBits, *_timerPollDataOut;
+  TQPushButton  *_sendBitsButton;
+  TQTimer       *_timerSendBits, *_timerPollDataOut;
 
   void sendBits(uint d, int nbb);
   void updateTestPin(PinType ptype);
-  void updateTestStatus(PinType ptype, bool on);
+  void updateTesttqStatus(PinType ptype, bool on);
   uint pin(PinType ptype) const;
   void updatePin(PinType ptype);
   Hardware *hardware() { return static_cast<Hardware *>(_hardware); }
@@ -64,9 +65,10 @@ private:
 class ConfigWidget : public ::Hardware::ConfigWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  ConfigWidget(const ::Programmer::Group &group, QWidget *parent);
-  virtual ::Hardware::HConfigWidget *createHardwareConfigWidget(QWidget *parent, bool edit) const;
+  ConfigWidget(const ::Programmer::Group &group, TQWidget *tqparent);
+  virtual ::Hardware::HConfigWidget *createHardwareConfigWidget(TQWidget *tqparent, bool edit) const;
 };
 
 } // namespace