1 files changed, 16 insertions, 16 deletions
diff --git a/src/devices/pic/base/pic.cpp b/src/devices/pic/base/pic.cpp
index fd8622b..e9df77e 100644
--- a/src/devices/pic/base/pic.cpp
+++ b/src/devices/pic/base/pic.cpp
@@ -149,11 +149,11 @@ TQString Pic::Data::fname(Device::Special special) const
       break;
     case Device::Special::LowVoltage:
       // assume name is of form "NNXN..."
-      s.tqreplace(2, 1, "LV");
+      s.replace(2, 1, "LV");
       break;
     case Device::Special::HighVoltage:
       // assume name is of form "NNXN..."
-      s.tqreplace(2, 1, "HV");
+      s.replace(2, 1, "HV");
       break;
     case Device::Special::Nb_Types: Q_ASSERT(false); break;
   }
@@ -261,21 +261,21 @@ bool Pic::Data::hasFeature(Feature feature, bool *unknown) const
   if (unknown) *unknown = !ok;
   if (!ok) return false;
   switch (feature.type()) {
-    case Feature::CCP: return registersData().sfrs.tqcontains("CCP1CON");
-    case Feature::ADC: return registersData().sfrs.tqcontains("ADCON0");
-    case Feature::SSP: return registersData().sfrs.tqcontains("SSPCON");
-    case Feature::LVD: return registersData().sfrs.tqcontains("LVDCON");
-    case Feature::USB: return registersData().sfrs.tqcontains("UCON");
+    case Feature::CCP: return registersData().sfrs.contains("CCP1CON");
+    case Feature::ADC: return registersData().sfrs.contains("ADCON0");
+    case Feature::SSP: return registersData().sfrs.contains("SSPCON");
+    case Feature::LVD: return registersData().sfrs.contains("LVDCON");
+    case Feature::USB: return registersData().sfrs.contains("UCON");
     case Feature::USART:
-      return ( registersData().sfrs.tqcontains("TXSTA")        // 16F
-               || registersData().sfrs.tqcontains("TXSTA1")    // 18F
-               || registersData().sfrs.tqcontains("U1MODE") ); // 30F
-    case Feature::CAN: return registersData().sfrs.tqcontains("CANCON") && !registersData().sfrs.tqcontains("ECANCON");
-    case Feature::ECAN: return registersData().sfrs.tqcontains("ECANCON");
-    case Feature::Ethernet: return registersData().sfrs.tqcontains("ETHCON1");
-    case Feature::LCD: return registersData().sfrs.tqcontains("LCDCON");
-    case Feature::MotorControl: return registersData().sfrs.tqcontains("PWMCON0");
-    case Feature::MotionFeedback: return registersData().sfrs.tqcontains("CAP1CON");
+      return ( registersData().sfrs.contains("TXSTA")        // 16F
+               || registersData().sfrs.contains("TXSTA1")    // 18F
+               || registersData().sfrs.contains("U1MODE") ); // 30F
+    case Feature::CAN: return registersData().sfrs.contains("CANCON") && !registersData().sfrs.contains("ECANCON");
+    case Feature::ECAN: return registersData().sfrs.contains("ECANCON");
+    case Feature::Ethernet: return registersData().sfrs.contains("ETHCON1");
+    case Feature::LCD: return registersData().sfrs.contains("LCDCON");
+    case Feature::MotorControl: return registersData().sfrs.contains("PWMCON0");
+    case Feature::MotionFeedback: return registersData().sfrs.contains("CAP1CON");
     case Feature::SelfWrite: return _selfWrite==SelfWrite::Yes;
     case Feature::Nb_Types: Q_ASSERT(false); break;
   }