6 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/mem24/gui/mem24_hex_view.cpp b/src/devices/mem24/gui/mem24_hex_view.cpp
index c732731..349e2fc 100644
--- a/src/devices/mem24/gui/mem24_hex_view.cpp
+++ b/src/devices/mem24/gui/mem24_hex_view.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "mem24_hex_view.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 
diff --git a/src/devices/mem24/gui/mem24_memory_editor.cpp b/src/devices/mem24/gui/mem24_memory_editor.cpp
index 27ed4a7..c395b17 100644
--- a/src/devices/mem24/gui/mem24_memory_editor.cpp
+++ b/src/devices/mem24/gui/mem24_memory_editor.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "mem24_memory_editor.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 
diff --git a/src/devices/mem24/mem24/mem24_group.cpp b/src/devices/mem24/mem24/mem24_group.cpp
index 00ca072..f396027 100644
--- a/src/devices/mem24/mem24/mem24_group.cpp
+++ b/src/devices/mem24/mem24/mem24_group.cpp
@@ -18,7 +18,7 @@ Device::Memory *Mem24::Group::createMemory(const Device::Data &data) const
 TQString Mem24::Group::informationHtml(const Device::Data &data) const
 {
   const Mem24::Data &mdata = static_cast<const Mem24::Data &>(data);
-  TQString tmp = i18n("%1 bytes").arg(formatNumber(mdata.nbBytes()));
+  TQString tmp = i18n("%1 bytes").tqarg(formatNumber(mdata.nbBytes()));
   return htmlTableRow(i18n("Memory Size"), tmp);
 }
 
@@ -35,7 +35,7 @@ TQPixmap Mem24::Group::memoryGraph(const Device::Data &data) const
     data.endAddress = offset - 1;
     data.start = toHexLabel(data.startAddress, mdata.nbCharsAddress());
     data.end = toHexLabel(data.endAddress, mdata.nbCharsAddress());
-    data.label = i18n("Block #%1").arg(i+1);
+    data.label = i18n("Block #%1").tqarg(i+1);
     ranges.append(data);
   }
   return Device::memoryGraph(ranges);
diff --git a/src/devices/mem24/mem24/mem24_memory.cpp b/src/devices/mem24/mem24/mem24_memory.cpp
index aba1cbf..f3ce758 100644
--- a/src/devices/mem24/mem24/mem24_memory.cpp
+++ b/src/devices/mem24/mem24/mem24_memory.cpp
@@ -84,7 +84,7 @@ void Mem24::Memory::fromHexBuffer(const HexBuffer &hb, WarningTypes &result,
       if ( !(result & ValueTooLarge) && !_data[k].isInside(mask) ) {
         result |= ValueTooLarge;
         warnings += i18n("At least one word (at offset %1) is larger (%2) than the corresponding mask (%3).")
-                    .arg(toHexLabel(k, 8)).arg(toHexLabel(_data[k], 8)).arg(toHexLabel(mask, 8));
+                    .tqarg(toHexLabel(k, 8)).tqarg(toHexLabel(_data[k], 8)).tqarg(toHexLabel(mask, 8));
       }
       _data[k] = _data[k].maskWith(mask);
     }
diff --git a/src/devices/mem24/prog/mem24_prog.cpp b/src/devices/mem24/prog/mem24_prog.cpp
index 4c4b201..82c596c 100644
--- a/src/devices/mem24/prog/mem24_prog.cpp
+++ b/src/devices/mem24/prog/mem24_prog.cpp
@@ -38,9 +38,9 @@ bool Programmer::Mem24DeviceSpecific::verifyByte(uint index, BitValue d, const V
   Address address = index;
   if ( vdata.actions & BlankCheckVerify )
     log(Log::LineType::Error, i18n("Device memory is not blank (at address %1: reading %2 and expecting %3).")
-                    .arg(toHexLabel(address, device().nbCharsAddress())).arg(toHexLabel(d, 2)).arg(toHexLabel(v, 2)));
+                    .tqarg(toHexLabel(address, device().nbCharsAddress())).tqarg(toHexLabel(d, 2)).tqarg(toHexLabel(v, 2)));
   else log(Log::LineType::Error, i18n("Device memory doesn't match hex file (at address %1: reading %2 and expecting %3).")
-                       .arg(toHexLabel(address, device().nbCharsAddress())).arg(toHexLabel(d, 2)).arg(toHexLabel(v, 2)));
+                       .tqarg(toHexLabel(address, device().nbCharsAddress())).tqarg(toHexLabel(d, 2)).tqarg(toHexLabel(v, 2)));
   return false;
 }
 
diff --git a/src/devices/mem24/xml/mem24_xml_to_data.cpp b/src/devices/mem24/xml/mem24_xml_to_data.cpp
index e73d7bb..81fd7bb 100644
--- a/src/devices/mem24/xml/mem24_xml_to_data.cpp
+++ b/src/devices/mem24/xml/mem24_xml_to_data.cpp
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "xml_to_data/device_xml_to_data.h"
 #include "common/common/misc.h"
@@ -49,7 +49,7 @@ virtual void checkPins(const TQMap<TQString, uint> &pinLabels) const
   if ( !pinLabels.contains("VSS") ) qFatal("No VSS pin specified");
   TQMap<TQString, uint>::const_iterator it;
   for (it=pinLabels.begin(); it!=pinLabels.end(); ++it)
-    if ( it.data()!=1 ) qFatal(TQString("Duplicated pin %1").arg(it.key()));
+    if ( it.data()!=1 ) qFatal(TQString("Duplicated pin %1").tqarg(it.key()));
 }
 
 }; // class