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

diff --git a/src/progs/base/prog_config.cpp b/src/progs/base/prog_config.cpp
index 8115ce7..9802fba 100644
--- a/src/progs/base/prog_config.cpp
+++ b/src/progs/base/prog_config.cpp
@@ -24,22 +24,22 @@ void Programmer::GroupConfig::writePortType(const Group &group, PortType type)
   config.writeEnumEntry<PortType>("port_group", type);
 }
 
-QString Programmer::GroupConfig::portDevice(const Group &group, PortType portType)
+TQString Programmer::GroupConfig::portDevice(const Group &group, PortType portType)
 {
   GenericConfig config(group.name());
-  QString device = config.readEntry(QString(portType.key()) + "_port_device" , QString::null);
+  TQString device = config.readEntry(TQString(portType.key()) + "_port_device" , TQString());
   if ( device.isNull() ) {
-    QStringList list = Port::probedDeviceList(portType);
-    if ( list.isEmpty() ) return QString::null;
+    TQStringList list = Port::probedDeviceList(portType);
+    if ( list.isEmpty() ) return TQString();
     return list[0];
   }
   return device;
 }
-void Programmer::GroupConfig::writePortDevice(const Group &group, PortType type, const QString &device)
+void Programmer::GroupConfig::writePortDevice(const Group &group, PortType type, const TQString &device)
 {
   if ( type==PortType::Nb_Types ) return;
   GenericConfig config(group.name());
-  config.writeEntry(QString(type.key()) + "_port_device", device);
+  config.writeEntry(TQString(type.key()) + "_port_device", device);
 }
 
 Port::Description Programmer::GroupConfig::portDescription(const Group &group)
@@ -53,12 +53,12 @@ void Programmer::GroupConfig::writePortDescription(const Group &group, const Por
   writePortDevice(group, dp.type, dp.device);
 }
 
-QString Programmer::GroupConfig::firmwareDirectory(const Group &group)
+TQString Programmer::GroupConfig::firmwareDirectory(const Group &group)
 {
   GenericConfig config(group.name());
-  return config.readEntry("firmware_directory", QString::null);
+  return config.readEntry("firmware_directory", TQString());
 }
-void Programmer::GroupConfig::writeFirmwareDirectory(const Group &group, const QString &path)
+void Programmer::GroupConfig::writeFirmwareDirectory(const Group &group, const TQString &path)
 {
   GenericConfig config(group.name());
   config.writeEntry("firmware_directory", path);
@@ -66,13 +66,13 @@ void Programmer::GroupConfig::writeFirmwareDirectory(const Group &group, const Q
 
 //----------------------------------------------------------------------------
 const Programmer::Config::Data Programmer::Config::DATA[Nb_Types] = {
-  { "only_program_non_mask", I18N_NOOP("Only program what is needed (faster)."), QVariant(true, 0) },
-  { "verify_after_program", I18N_NOOP("Verify device memory after programming."), QVariant(true, 0) },
-  { "only_verify_programmed", I18N_NOOP("Only verify programmed words in code memory (faster)."), QVariant(true, 0) },
-  { "power_down_after_programming", I18N_NOOP("Power down target after programming."), QVariant(true, 0) },
-  { "target_self_powered", I18N_NOOP("Target is self-powered (when possible)."), QVariant(true, 0) },
-  { "blank_check_after_erase", I18N_NOOP("Blank check after erase."), QVariant(false, 0) },
-  { "preserve_eeprom", I18N_NOOP("Preserve data EEPROM when programming."), QVariant(false, 0) },
-  { "program_eeprom", I18N_NOOP("Program data EEPROM."), QVariant(true, 0) },
-  { "run_after_program", I18N_NOOP("Run device after successful programming."), QVariant(false, 0) }
+  { "only_program_non_tqmask", I18N_NOOP("Only program what is needed (faster)."), TQVariant(true, 0) },
+  { "verify_after_program", I18N_NOOP("Verify device memory after programming."), TQVariant(true, 0) },
+  { "only_verify_programmed", I18N_NOOP("Only verify programmed words in code memory (faster)."), TQVariant(true, 0) },
+  { "power_down_after_programming", I18N_NOOP("Power down target after programming."), TQVariant(true, 0) },
+  { "target_self_powered", I18N_NOOP("Target is self-powered (when possible)."), TQVariant(true, 0) },
+  { "blank_check_after_erase", I18N_NOOP("Blank check after erase."), TQVariant(false, 0) },
+  { "preserve_eeprom", I18N_NOOP("Preserve data EEPROM when programming."), TQVariant(false, 0) },
+  { "program_eeprom", I18N_NOOP("Program data EEPROM."), TQVariant(true, 0) },
+  { "run_after_program", I18N_NOOP("Run device after successful programming."), TQVariant(false, 0) }
 };