5 files changed, 10 insertions, 10 deletions
diff --git a/src/devices/base/device_group.cpp b/src/devices/base/device_group.cpp
index fa26d19..db70264 100644
--- a/src/devices/base/device_group.cpp
+++ b/src/devices/base/device_group.cpp
@@ -232,8 +232,8 @@ TQString Device::htmlInfo(const Device::Data &data, const TQString &deviceHref,
       if ( i!=0 ) s += ", ";
       if ( deviceHref.isEmpty() ) s += data.alternatives()[i].upper();
       else {
-        TQString href = deviceHref.tqarg(data.alternatives()[i].upper());
-        s += TQString("<a href=\"%1\">%2</a>").tqarg(href).tqarg(data.alternatives()[i].upper());
+        TQString href = deviceHref.arg(data.alternatives()[i].upper());
+        s += TQString("<a href=\"%1\">%2</a>").arg(href).arg(data.alternatives()[i].upper());
       }
     }
     doc += htmlTableRow(i18n("Alternatives"), s);
@@ -247,7 +247,7 @@ TQString Device::htmlInfo(const Device::Data &data, const TQString &deviceHref,
   TQString s;
   for (uint i=0; i<data.packages().count(); i++)
     for (uint k=0; k<data.packages()[i].types.count(); k++)
-      s += i18n(Package::TYPE_DATA[data.packages()[i].types[k]].label) + TQString("[%1] ").tqarg(data.packages()[i].pins.count());
+      s += i18n(Package::TYPE_DATA[data.packages()[i].types[k]].label) + TQString("[%1] ").arg(data.packages()[i].pins.count());
   doc += htmlTableRow(i18n("Packaging"), s);
   doc += "</table>";
 
@@ -260,7 +260,7 @@ TQString Device::htmlPinDiagrams(const Device::Data &data, const TQString &image
   // pins
   const Package *package = 0;
   for (uint i=0; Package::TYPE_DATA[i].name; i++) {
-    if ( Package::TYPE_DATA[i].tqshape!=Package::Bar ) continue;
+    if ( Package::TYPE_DATA[i].shape!=Package::Bar ) continue;
     package = barPackage(Package::TYPE_DATA[i].name, data);
     if (package) break;
   }
diff --git a/src/devices/base/generic_device.h b/src/devices/base/generic_device.h
index 4b52060..373601c 100644
--- a/src/devices/base/generic_device.h
+++ b/src/devices/base/generic_device.h
@@ -70,7 +70,7 @@ public:
   enum { MAX_NB = 9 };
   struct TypeData {
     const char *name, *label;
-    Shape tqshape;
+    Shape shape;
     uint nbPins[MAX_NB];
   };
   static const TypeData TYPE_DATA[];
diff --git a/src/devices/base/generic_memory.cpp b/src/devices/base/generic_memory.cpp
index 54190f5..6430497 100644
--- a/src/devices/base/generic_memory.cpp
+++ b/src/devices/base/generic_memory.cpp
@@ -31,7 +31,7 @@ Device::Memory::WarningTypes Device::Memory::fromHexBuffer(const HexBuffer &hb,
     if ( !it.data().isInitialized() || inRange[it.key()] ) continue;
     if ( !(result & ValueOutsideRange) ) {
       result |= ValueOutsideRange;
-      warnings += i18n("At least one value (at address %1) is defined outside memory ranges.").tqarg(toHexLabel(it.key(), 8));
+      warnings += i18n("At least one value (at address %1) is defined outside memory ranges.").arg(toHexLabel(it.key(), 8));
     }
     break;
   }
diff --git a/src/devices/base/hex_buffer.cpp b/src/devices/base/hex_buffer.cpp
index f389c92..3307f79 100644
--- a/src/devices/base/hex_buffer.cpp
+++ b/src/devices/base/hex_buffer.cpp
@@ -136,10 +136,10 @@ bool HexBuffer::fetchNextBlock(const_iterator& it, const const_iterator &end, in
 TQString HexBuffer::ErrorData::message() const
 {
   switch (type) {
-    case UnrecognizedFormat: return i18n("Unrecognized format (line %1).").tqarg(line);
+    case UnrecognizedFormat: return i18n("Unrecognized format (line %1).").arg(line);
     case UnexpectedEOF: return i18n("Unexpected end-of-file.");
-    case UnexpectedEOL: return i18n("Unexpected end-of-line (line %1).").tqarg(line);
-    case WrongCRC: return i18n("CRC mismatch (line %1).").tqarg(line);
+    case UnexpectedEOL: return i18n("Unexpected end-of-line (line %1).").arg(line);
+    case WrongCRC: return i18n("CRC mismatch (line %1).").arg(line);
   }
   Q_ASSERT(false);
   return TQString();
diff --git a/src/devices/base/register.cpp b/src/devices/base/register.cpp
index 946f668..d6ff59c 100644
--- a/src/devices/base/register.cpp
+++ b/src/devices/base/register.cpp
@@ -48,7 +48,7 @@ Register::Type Register::TypeData::type() const
 
 TQString Register::TypeData::toString() const
 {
-  return TQString("%1 %2 %3").tqarg(toLabel(_address)).tqarg(_nbChars).tqarg(_name);
+  return TQString("%1 %2 %3").arg(toLabel(_address)).arg(_nbChars).arg(_name);
 }
 
 Register::TypeData Register::TypeData::fromString(const TQString &s)