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

6 files changed, 21 insertions, 20 deletions

diff --git a/src/progs/pickit1/base/pickit1.cpp b/src/progs/pickit1/base/pickit1.cpp
index c5ab021..55d98e4 100644
--- a/src/progs/pickit1/base/pickit1.cpp
+++ b/src/progs/pickit1/base/pickit1.cpp
@@ -37,8 +37,8 @@ bool Pickit1::Baseline::incrementPC(uint nb)
   // work around bugs in firmware
   Array cmd;
   uint high = (nb >> 8) & 0xFF;
-  log(Log::DebugLevel::Extra, QString("work around bug in firmware (nb_inc=%1 high=%2)")
-                       .arg(toHexLabel(nb, 4)).arg(toHexLabel(high, 2)));
+  log(Log::DebugLevel::Extra, TQString("work around bug in firmware (nb_inc=%1 high=%2)")
+                       .tqarg(toHexLabel(nb, 4)).tqarg(toHexLabel(high, 2)));
   if ( high==1 ) {
       cmd[0] = 'I';
       cmd[1] = 0x40;
diff --git a/src/progs/pickit1/base/pickit1_data.h b/src/progs/pickit1/base/pickit1_data.h
index 767fc4b..75a65ea 100644
--- a/src/progs/pickit1/base/pickit1_data.h
+++ b/src/progs/pickit1/base/pickit1_data.h
@@ -9,7 +9,7 @@
 #ifndef PICKIT1_DATA_H
 #define PICKIT1_DATA_H
 
-#include <qstring.h>
+#include <tqstring.h>
 
 namespace Pickit1
 {
@@ -17,7 +17,7 @@ namespace Pickit1
     char entryMode;
     bool regenerateOsccal;
   };
-  extern const Data &data(const QString &device);
+  extern const Data &data(const TQString &device);
 } // namespace
 
 #endif
diff --git a/src/progs/pickit1/base/pickit1_prog.h b/src/progs/pickit1/base/pickit1_prog.h
index c0763b4..341e879 100644
--- a/src/progs/pickit1/base/pickit1_prog.h
+++ b/src/progs/pickit1/base/pickit1_prog.h
@@ -17,6 +17,7 @@ namespace Pickit1
 class Base : public Pickit::Base
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   Base(const Programmer::Group &group, const Pic::Data *data) : Pickit::Base(group, data) {}
   virtual bool deviceHasOsccalRegeneration() const;
@@ -31,8 +32,8 @@ private:
 class Group : public Pickit::Group
 {
 public:
-  virtual QString name() const { return "pickit1"; }
-  virtual QString label() const { return i18n("PICkit1"); }
+  virtual TQString name() const { return "pickit1"; }
+  virtual TQString label() const { return i18n("PICkit1"); }
   virtual Programmer::Properties properties() const { return ::Programmer::Programmer | ::Programmer::HasFirmware | ::Programmer::CanReadMemory | ::Programmer::HasConnectedState; }
 
 protected:
diff --git a/src/progs/pickit1/gui/pickit1_group_ui.cpp b/src/progs/pickit1/gui/pickit1_group_ui.cpp
index 2c862fb..795533e 100644
--- a/src/progs/pickit1/gui/pickit1_group_ui.cpp
+++ b/src/progs/pickit1/gui/pickit1_group_ui.cpp
@@ -12,12 +12,12 @@
 #include "progs/pickit2/gui/pickit2_group_ui.h"
 #include "progs/pickit1/base/pickit1_prog.h"
 
-::Programmer::ConfigWidget *Pickit1::GroupUI::createConfigWidget(QWidget *parent) const
+::Programmer::ConfigWidget *Pickit1::GroupUI::createConfigWidget(TQWidget *tqparent) const
 {
-  return new ::Programmer::ConfigWidget(static_cast<const ::Programmer::Group &>(group()), parent);
+  return new ::Programmer::ConfigWidget(static_cast<const ::Programmer::Group &>(group()), tqparent);
 }
 
-::Programmer::AdvancedDialog *Pickit1::GroupUI::createAdvancedDialog(::Programmer::Base &base, QWidget *parent) const
+::Programmer::AdvancedDialog *Pickit1::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const
 {
-  return new Pickit::AdvancedDialog(static_cast<Base &>(base), parent, "pickit1_advanced_dialog");
+  return new Pickit::AdvancedDialog(static_cast<Base &>(base), tqparent, "pickit1_advanced_dialog");
 }
diff --git a/src/progs/pickit1/gui/pickit1_group_ui.h b/src/progs/pickit1/gui/pickit1_group_ui.h
index 5fb8ad6..147f99c 100644
--- a/src/progs/pickit1/gui/pickit1_group_ui.h
+++ b/src/progs/pickit1/gui/pickit1_group_ui.h
@@ -17,9 +17,9 @@ namespace Pickit1
 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
diff --git a/src/progs/pickit1/xml/xml_pickit1_parser.cpp b/src/progs/pickit1/xml/xml_pickit1_parser.cpp
index e5d1b78..9fbfafc 100644
--- a/src/progs/pickit1/xml/xml_pickit1_parser.cpp
+++ b/src/progs/pickit1/xml/xml_pickit1_parser.cpp
@@ -18,14 +18,14 @@ public:
   XmlToData() : Programmer::XmlToData<Data>("pickit1", "Pickit1") {}
 
 private:
-  virtual void parseData(QDomElement element, Data &data);
-  virtual void outputData(const Data &data, QTextStream &s) const;
-  virtual void outputFunctions(QTextStream &s) const;
+  virtual void parseData(TQDomElement element, Data &data);
+  virtual void outputData(const Data &data, TQTextStream &s) const;
+  virtual void outputFunctions(TQTextStream &s) const;
 };
 
-void Pickit1::XmlToData::parseData(QDomElement element, Data &data)
+void Pickit1::XmlToData::parseData(TQDomElement element, Data &data)
 {
-  QString s = element.attribute("entry");
+  TQString s = element.attribute("entry");
   if ( s.length()!=1 || (s[0]!='O' && s[0]!='P') ) qFatal("Invalid or missing entry mode");
   data.entryMode = s[0].latin1();
   s = element.attribute("regen");
@@ -34,12 +34,12 @@ void Pickit1::XmlToData::parseData(QDomElement element, Data &data)
   else qFatal("Invalid regen value");
 }
 
-void Pickit1::XmlToData::outputData(const Data &data, QTextStream &s) const
+void Pickit1::XmlToData::outputData(const Data &data, TQTextStream &s) const
 {
   s << "'" << data.entryMode << "', " << (data.regenerateOsccal ? "true" : "false");
 }
 
-void Pickit1::XmlToData::outputFunctions(QTextStream &s) const
+void Pickit1::XmlToData::outputFunctions(TQTextStream &s) const
 {
   Programmer::XmlToData<Data>::outputFunctions(s);
   s << "::Programmer::DeviceSpecific *Group::createDeviceSpecific(Programmer::Base &base) const" << endl;
@@ -47,7 +47,7 @@ void Pickit1::XmlToData::outputFunctions(QTextStream &s) const
   s << "  uint i = family(static_cast< ::Pickit1::Base &>(base).device()->name());" << endl;
   s << "  switch(i) {" << endl;
   for (uint i=0; i<uint(families().count()); i++) {
-    s << "    case " + QString::number(i) + ": return new " + families()[i] + "(base);" << endl;
+    s << "    case " + TQString::number(i) + ": return new " + families()[i] + "(base);" << endl;
   }
   s << "  }" << endl;
   s << "  Q_ASSERT(false);" << endl;