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

diff --git a/src/progs/manager/prog_manager.cpp b/src/progs/manager/prog_manager.cpp
index bc824c9..c39d955 100644
--- a/src/progs/manager/prog_manager.cpp
+++ b/src/progs/manager/prog_manager.cpp
@@ -18,8 +18,8 @@
 //----------------------------------------------------------------------------
 Programmer::Manager *Programmer::manager = 0;
 
-Programmer::Manager::Manager(QObject *parent)
-  : QObject(parent, "programmer_manager"), _programmer(0)
+Programmer::Manager::Manager(TQObject *tqparent)
+  : TQObject(tqparent, "programmer_manager"), _programmer(0)
 {}
 
 Programmer::Manager::~Manager()
@@ -39,11 +39,11 @@ void Programmer::Manager::createProgrammer(const Device::Data *data, const Hardw
   delete _programmer;
   _programmer = group().createProgrammer(isTargetSelfPowered(), data, hd);
   _programmer->Log::Base::setParent(this);
-  connect(_programmer, SIGNAL(actionMessage(const QString &)), SIGNAL(actionMessage(const QString &)));
-  connect(&_programmer->progressMonitor(), SIGNAL(setLabel(const QString &)), SIGNAL(actionMessage(const QString &)));
-  connect(&_programmer->progressMonitor(), SIGNAL(setTotalProgress(uint)), SIGNAL(setTotalProgress(uint)));
-  connect(&_programmer->progressMonitor(), SIGNAL(setProgress(uint)), SIGNAL(setProgress(uint)));
-  connect(&_programmer->progressMonitor(), SIGNAL(showProgress(bool)), SIGNAL(showProgress(bool)));
+  connect(_programmer, TQT_SIGNAL(actionMessage(const TQString &)), TQT_SIGNAL(actionMessage(const TQString &)));
+  connect(&_programmer->progressMonitor(), TQT_SIGNAL(setLabel(const TQString &)), TQT_SIGNAL(actionMessage(const TQString &)));
+  connect(&_programmer->progressMonitor(), TQT_SIGNAL(setTotalProgress(uint)), TQT_SIGNAL(setTotalProgress(uint)));
+  connect(&_programmer->progressMonitor(), TQT_SIGNAL(setProgress(uint)), TQT_SIGNAL(setProgress(uint)));
+  connect(&_programmer->progressMonitor(), TQT_SIGNAL(showProgress(bool)), TQT_SIGNAL(showProgress(bool)));
 }
 
 bool Programmer::Manager::initProgramming(bool debugging)
@@ -61,8 +61,8 @@ bool Programmer::Manager::internalInitProgramming(bool)
   }
   if ( !group().isSupported(device()->name()) ) {
     if ( group().isSoftware() && group().supportedDevices().isEmpty() )
-      sorry(i18n("Could not detect supported devices for \"%1\". Please check installation.").arg(group().label()));
-    else sorry(i18n("The current programmer \"%1\" does not support device \"%2\".").arg(group().label()).arg(device()->name()));
+      sorry(i18n("Could not detect supported devices for \"%1\". Please check installation.").tqarg(group().label()));
+    else sorry(i18n("The current programmer \"%1\" does not support device \"%2\".").tqarg(group().label()).tqarg(device()->name()));
     return false;
   }
   createProgrammer(device());
@@ -135,7 +135,7 @@ bool Programmer::Manager::setDevicePower(bool on)
   if ( !initProgramming(false) ) return false;
   bool ok = true;
   if ( _programmer->isTargetSelfPowered() )
-    sorry(i18n("Cannot toggle target power since target is self-powered."), QString::null);
+    sorry(i18n("Cannot toggle target power since target is self-powered."), TQString());
   else {
     emit actionMessage(i18n("Toggle Device Power..."));
     ok = _programmer->setTargetPowerOn(on);