4 files changed, 13 insertions, 13 deletions
diff --git a/src/devices/pic/base/pic.cpp b/src/devices/pic/base/pic.cpp
index 94267e2..75e6bf4 100644
--- a/src/devices/pic/base/pic.cpp
+++ b/src/devices/pic/base/pic.cpp
@@ -212,17 +212,17 @@ TQStringList Pic::Data::idNames(const TQMap<TQString, Device::IdData> &ids) cons
       case Architecture::P18C:
       case Architecture::P18F:
       case Architecture::P18J:
-        list += i18n("%1 (rev. %2)").tqarg(it.key()).tqarg(toLabel(it.data().revision));
+        list += i18n("%1 (rev. %2)").arg(it.key()).arg(toLabel(it.data().revision));
         break;
       case Architecture::P24F:
-        list += i18n("%1 (rev. %2.%3)").tqarg(it.key()).tqarg(toLabel(it.data().revision)).tqarg(toLabel(it.data().minorRevision));
+        list += i18n("%1 (rev. %2.%3)").arg(it.key()).arg(toLabel(it.data().revision)).arg(toLabel(it.data().minorRevision));
         break;
       case Architecture::P30F:
-        list += i18n("%1 (proc. %2; rev. %3.%4)").tqarg(it.key()).tqarg(toLabel(it.data().process)).tqarg(toLabel(it.data().revision)).tqarg(toLabel(it.data().minorRevision));
+        list += i18n("%1 (proc. %2; rev. %3.%4)").arg(it.key()).arg(toLabel(it.data().process)).arg(toLabel(it.data().revision)).arg(toLabel(it.data().minorRevision));
         break;
       case Architecture::P24H:
       case Architecture::P33F:
-        list += i18n("%1 (rev. %2)").tqarg(it.key()).tqarg(toLabel(it.data().revision));
+        list += i18n("%1 (rev. %2)").arg(it.key()).arg(toLabel(it.data().revision));
         break;
       case Architecture::Nb_Types: Q_ASSERT(false); break;
     }
@@ -236,14 +236,14 @@ bool Pic::Data::checkCalibration(const Device::Array &data, TQString *message) c
   for (uint i=0; i<data.count(); i++) {
     TQString address = toHexLabel(range(MemoryRangeType::Cal).start + i*addressIncrement(MemoryRangeType::Cal), nbCharsAddress());
     if ( data[i]==mask(MemoryRangeType::Cal) ) {
-      if (message) *message = i18n("Calibration word at address %1 is blank.").tqarg(address);
+      if (message) *message = i18n("Calibration word at address %1 is blank.").arg(address);
       return false;
     }
   }
   if ( data.count()==1 ) {
     if ( data[0].maskWith(_calibration.opcodeMask)!=_calibration.opcode ) {
       if (message) *message = i18n("Calibration word is not a compatible opcode (%2).")
-                              .tqarg(toHexLabel(_calibration.opcode, nbCharsWord(MemoryRangeType::Code)));
+                              .arg(toHexLabel(_calibration.opcode, nbCharsWord(MemoryRangeType::Code)));
       return false;
     }
   }
diff --git a/src/devices/pic/base/pic_config.cpp b/src/devices/pic/base/pic_config.cpp
index 39c865f..f18955d 100644
--- a/src/devices/pic/base/pic_config.cpp
+++ b/src/devices/pic/base/pic_config.cpp
@@ -289,7 +289,7 @@ TQMap<TQString, Pic::Config::MapData> &Pic::Config::masks()
       (*_masks)[DATA[i].mask.name] = MapData(i, -1);
       if ( DATA[i].type==MemoryRange ) {
         for (uint k=0; k<Protection::MAX_NB_BLOCKS; k++)
-          (*_masks)[TQString("%1_%2").tqarg(DATA[i].mask.name).tqarg(k)] = MapData(i, k);
+          (*_masks)[TQString("%1_%2").arg(DATA[i].mask.name).arg(k)] = MapData(i, k);
       }
     }
   }
@@ -305,7 +305,7 @@ TQString Pic::Config::maskLabel(const TQString &mask)
 {
   const MapData &mp = masks()[mask];
   TQString s = i18n(DATA[mp.index].mask.label);
-  if ( mp.block>=0 ) return i18n("%1 for block %2").tqarg(s).tqarg(mp.block);
+  if ( mp.block>=0 ) return i18n("%1 for block %2").arg(s).arg(mp.block);
   return s;
 }
 
diff --git a/src/devices/pic/base/pic_protection.cpp b/src/devices/pic/base/pic_protection.cpp
index d91f1f7..8fac920 100644
--- a/src/devices/pic/base/pic_protection.cpp
+++ b/src/devices/pic/base/pic_protection.cpp
@@ -30,7 +30,7 @@ Pic::Protection::Family Pic::Protection::family() const
 {
   if ( _config.findMask("WRTBS") ) return CodeGuard;
   TQString mask = maskName(ProgramProtected, MemoryRangeType::Code);
-  if ( _config.findMask(TQString("%1_%2").tqarg(mask).tqarg(0)) ) return BlockProtection;
+  if ( _config.findMask(TQString("%1_%2").arg(mask).arg(0)) ) return BlockProtection;
   if ( _config.findMask(mask) ) return BasicProtection;
   return NoProtection;
 }
@@ -79,7 +79,7 @@ TQString Pic::Protection::blockMaskName(Type type, uint block) const
     if ( type==StandardSecurity || type==HighSecurity ) return (block==0 ? "SSSEC" : "GSSEC");
     return TQString();
   }
-  return TQString("%1_%2").tqarg(maskName(type, MemoryRangeType::Code)).tqarg(block);
+  return TQString("%1_%2").arg(maskName(type, MemoryRangeType::Code)).arg(block);
 }
 
 TQString Pic::Protection::maskName(Type type, MemoryRangeType mtype) const
@@ -341,7 +341,7 @@ uint Pic::Protection::nbBlocks() const
 {
   if ( family()==CodeGuard ) return 2; // codeguard : secure segment + general segment
   for (uint i=0; i<MAX_NB_BLOCKS; i++)
-    if ( _config.findMask(TQString("CP_%1").tqarg(i))==0 ) return i;
+    if ( _config.findMask(TQString("CP_%1").arg(i))==0 ) return i;
   return MAX_NB_BLOCKS;
 }
 
@@ -357,5 +357,5 @@ TQString Pic::Protection::blockLabel(uint i) const
     if ( i==0 ) return i18n("Secure Segment");
     return i18n("General Segment");
   }
-  return i18n("Block #%1").tqarg(i);
+  return i18n("Block #%1").arg(i);
 }
diff --git a/src/devices/pic/base/pic_register.cpp b/src/devices/pic/base/pic_register.cpp
index 8316805..97ff6c5 100644
--- a/src/devices/pic/base/pic_register.cpp
+++ b/src/devices/pic/base/pic_register.cpp
@@ -73,7 +73,7 @@ TQString Pic::RegistersData::label(Address address) const
 {
   switch ( type(address) ) {
     case UnusedRegister: return "---";
-    case Mirrored: return i18n("Mirror of %1").tqarg(toHexLabel(mirroredAddress(address), nbCharsAddress()));
+    case Mirrored: return i18n("Mirror of %1").arg(toHexLabel(mirroredAddress(address), nbCharsAddress()));
     case Gpr: return "<GPR>";
     case Sfr: return sfrNames[address];
   }