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

2 files changed, 20 insertions, 19 deletions

diff --git a/src/progs/icd2/gui/icd2_group_ui.cpp b/src/progs/icd2/gui/icd2_group_ui.cpp
index 6f00788..b8d71df 100644
--- a/src/progs/icd2/gui/icd2_group_ui.cpp
+++ b/src/progs/icd2/gui/icd2_group_ui.cpp
@@ -14,38 +14,38 @@
 #include "progs/icd2/base/icd2_debug.h"
 
 //----------------------------------------------------------------------------
-Icd2::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, QWidget *parent)
-  : ::Programmer::PicAdvancedDialog(base, parent, "icd2_advanced_dialog")
+Icd2::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, TQWidget *tqparent)
+  : ::Programmer::PicAdvancedDialog(base, tqparent, "icd2_advanced_dialog")
 {
   uint row = _firmwareContainer->numRows();
-  QLabel *label = new QLabel(i18n("Id:"), _firmwareContainer);
+  TQLabel *label = new TQLabel(i18n("Id:"), _firmwareContainer);
   _firmwareContainer->addWidget(label, row,row, 0,0);
-  _firmwareIdLabel = new QLabel(_firmwareContainer);
+  _firmwareIdLabel = new TQLabel(_firmwareContainer);
   _firmwareContainer->addWidget(_firmwareIdLabel, row,row, 1,1);
   row++;
 
   row = _programmerContainer->numRows();
   if ( base.group().properties() & ::Programmer::Debugger ) {
-    ButtonContainer *container = new ::Programmer::ButtonContainer(i18n("Debug Executive"), this, SLOT(updateDebugExecutive()), _programmerContainer);
+    ButtonContainer *container = new ::Programmer::ButtonContainer(i18n("Debug Executive"), TQT_TQOBJECT(this), TQT_SLOT(updateDebugExecutive()), _programmerContainer);
     _programmerContainer->addWidget(container, row,row, 0,1);
-    label = new QLabel(i18n("Version:"), container);
+    label = new TQLabel(i18n("Version:"), container);
     container->addWidget(label, 1,1, 0,0);
-    _debugExecLabel = new QLabel(container);
+    _debugExecLabel = new TQLabel(container);
     container->addWidget(_debugExecLabel, 1,1, 1,1);
     row++;
   } else _debugExecLabel = 0;
 
   for (uint i=0; i<TestData::Nb_VoltageTypes; i++) {
-    QLabel *label = new QLabel(i18n(TestData::VOLTAGE_LABELS[i]) + ":", _selfTestContainer);
+    TQLabel *label = new TQLabel(i18n(TestData::VOLTAGE_LABELS[i]) + ":", _selfTestContainer);
     _selfTestContainer->addWidget(label, 1+i,1+i, 0,0);
-    _tests[i] = new QLabel(_selfTestContainer);
+    _tests[i] = new TQLabel(_selfTestContainer);
     _selfTestContainer->addWidget(_tests[i], 1+i,1+i, 1,1);
   }
 }
 
 void Icd2::AdvancedDialog::updateDebugExecutive()
 {
-  ::BusyCursor bc;
+  ::PBusyCursor bc;
   if ( ensureConnected() ) {
     Pic::TargetMode mode;
     if ( !base().getTargetMode(mode) ) return;
@@ -70,12 +70,12 @@ void Icd2::AdvancedDialog::updateDisplay()
 }
 
 //----------------------------------------------------------------------------
-::Programmer::ConfigWidget *Icd2::GroupUI::createConfigWidget(QWidget *parent) const
+::Programmer::ConfigWidget *Icd2::GroupUI::createConfigWidget(TQWidget *tqparent) const
 {
-  return new ::Programmer::ConfigWidget(static_cast<const Group &>(group()), parent);
+  return new ::Programmer::ConfigWidget(static_cast<const Group &>(group()), tqparent);
 }
 
-::Programmer::AdvancedDialog *Icd2::GroupUI::createAdvancedDialog(::Programmer::Base &base, QWidget *parent) const
+::Programmer::AdvancedDialog *Icd2::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const
 {
-  return new AdvancedDialog(static_cast<ProgrammerBase &>(base), parent);
+  return new AdvancedDialog(static_cast<ProgrammerBase &>(base), tqparent);
 }
diff --git a/src/progs/icd2/gui/icd2_group_ui.h b/src/progs/icd2/gui/icd2_group_ui.h
index 93d66e7..14c0fdb 100644
--- a/src/progs/icd2/gui/icd2_group_ui.h
+++ b/src/progs/icd2/gui/icd2_group_ui.h
@@ -21,16 +21,17 @@ class Group;
 class AdvancedDialog : public ::Programmer::PicAdvancedDialog
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  AdvancedDialog(ProgrammerBase &base, QWidget *parent);
+  AdvancedDialog(ProgrammerBase &base, TQWidget *tqparent);
   virtual void updateDisplay();
 
 private slots:
   void updateDebugExecutive();
 
 private:
-  QLabel *_firmwareIdLabel, *_debugExecLabel;
-  QLabel *_tests[TestData::Nb_VoltageTypes];
+  TQLabel *_firmwareIdLabel, *_debugExecLabel;
+  TQLabel *_tests[TestData::Nb_VoltageTypes];
   ProgrammerBase &base() { return static_cast<ProgrammerBase &>(_base); }
 };
 
@@ -38,9 +39,9 @@ private:
 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 true; }
-  virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, QWidget *parent) const;
+  virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const;
 };
 
 } // namespace