rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

8 files changed, 22 insertions, 22 deletions

diff --git a/src/progs/base/hardware_config.cpp b/src/progs/base/hardware_config.cpp
index a3022e5..9f67308 100644
--- a/src/progs/base/hardware_config.cpp
+++ b/src/progs/base/hardware_config.cpp
@@ -55,7 +55,7 @@ void Hardware::Config::writeCustomHardware(const TQString& name, const Hardware:
 {
   Q_ASSERT( !isStandardHardware(name) );
   TQStringList customNames = readListEntry("custom_hardware_names", TQStringList());
-  if ( !customNames.tqcontains(name) ) {
+  if ( !customNames.contains(name) ) {
     customNames += name;
     writeEntry("custom_hardware_names", customNames);
   }
diff --git a/src/progs/gui/hardware_config_widget.cpp b/src/progs/gui/hardware_config_widget.cpp
index 4dbaac6..999a188 100644
--- a/src/progs/gui/hardware_config_widget.cpp
+++ b/src/progs/gui/hardware_config_widget.cpp
@@ -72,7 +72,7 @@ void Hardware::EditDialog::slotOk()
     return;
   }
   TQStringList names = _cwidget->_config->hardwareNames(PortType::Nb_Types); // all hardwares
-  if ( names.tqcontains(_name->text()) ) {
+  if ( names.contains(_name->text()) ) {
     if ( !MessageBox::askContinue(i18n("Do you want to overwrite this custom hardware \"%1\"?").tqarg(_name->text()),
                                       KStdGuiItem::save()) ) return;
   }
@@ -163,7 +163,7 @@ bool Hardware::ConfigWidget::set(const Port::Description &pd, uint i)
 bool Hardware::ConfigWidget::setPort(const ::Programmer::HardwareDescription &hd)
 {
   updateList(hd.port.type);
-  int i = _names.tqfindIndex(_config->currentHardware(hd.port.type));
+  int i = _names.findIndex(_config->currentHardware(hd.port.type));
   if ( i!=-1 ) _configCombo->setCurrentItem(i);
   return set(hd.port, _configCombo->currentItem());
 }
@@ -188,7 +188,7 @@ void Hardware::ConfigWidget::editClicked()
   int res = hcd->exec();
   if ( res==TQDialog::Rejected ) return;
   updateList(pd.type);
-  int index = _names.tqfindIndex(hcd->savedName());
+  int index = _names.findIndex(hcd->savedName());
   _configCombo->setCurrentItem(index);
   configChanged(_configCombo->currentItem());
 }
diff --git a/src/progs/gui/port_selector.cpp b/src/progs/gui/port_selector.cpp
index 4bb4539..644caaf 100644
--- a/src/progs/gui/port_selector.cpp
+++ b/src/progs/gui/port_selector.cpp
@@ -93,7 +93,7 @@ void PortSelector::addPortType(const Port::Description &pd)
   if (pd.type.data().withDevice) {
     _combos[pd.type.type()] = new TQComboBox(true, _main);
     for (uint i=0; i<list.count(); i++) _combos[pd.type.type()]->insertItem(list[i]);
-    if ( !pd.device.isEmpty() && !list.tqcontains(pd.device) ) _combos[pd.type.type()]->insertItem(pd.device);
+    if ( !pd.device.isEmpty() && !list.contains(pd.device) ) _combos[pd.type.type()]->insertItem(pd.device);
     _combos[pd.type.type()]->setCurrentText(pd.device);
     connect(_combos[pd.type.type()], TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
     connect(_combos[pd.type.type()], TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged()));
diff --git a/src/progs/icd2/base/icd.cpp b/src/progs/icd2/base/icd.cpp
index d458981..3fd3de8 100644
--- a/src/progs/icd2/base/icd.cpp
+++ b/src/progs/icd2/base/icd.cpp
@@ -52,7 +52,7 @@ bool Icd::DeviceSpecific::doWrite(Pic::MemoryRangeType type, const Device::Array
   uint nb = device().nbWordsWriteAlignment(Pic::MemoryRangeType::Code);
   if ( device().architecture()==Pic::Architecture::P18J && type==Pic::MemoryRangeType::Config ) {
     Q_ASSERT( data.count()%2==0 );
-    int delta = nb - data.count()/2; // config memory words tqcontains 1 byte
+    int delta = nb - data.count()/2; // config memory words contains 1 byte
     Q_ASSERT( delta>=0 );
     Device::Array rdata(delta);
     uint wordOffset = device().nbWords(Pic::MemoryRangeType::Code) - delta;
diff --git a/src/progs/manager/breakpoint.cpp b/src/progs/manager/breakpoint.cpp
index dc7d836..3cda051 100644
--- a/src/progs/manager/breakpoint.cpp
+++ b/src/progs/manager/breakpoint.cpp
@@ -23,7 +23,7 @@ Breakpoint::List &Breakpoint::list()
 
 void Breakpoint::List::append(const Data &data)
 {
-  Q_ASSERT( !tqcontains(data) );
+  Q_ASSERT( !contains(data) );
   StateData sdata;
   sdata.data = data;
   _list.append(sdata);
@@ -32,8 +32,8 @@ void Breakpoint::List::append(const Data &data)
 
 void Breakpoint::List::remove(const Data &data)
 {
-  Q_ASSERT( tqcontains(data) );
-  _list.remove(tqfind(data));
+  Q_ASSERT( contains(data) );
+  _list.remove(find(data));
   delayedChanged();
 }
 
@@ -43,7 +43,7 @@ void Breakpoint::List::clear()
   delayedChanged();
 }
 
-TQValueList<Breakpoint::List::StateData>::iterator Breakpoint::List::tqfind(const Data &data)
+TQValueList<Breakpoint::List::StateData>::iterator Breakpoint::List::find(const Data &data)
 {
   TQValueList<StateData>::iterator it;
   for (it=_list.begin(); it!=_list.end(); ++it)
@@ -51,7 +51,7 @@ TQValueList<Breakpoint::List::StateData>::iterator Breakpoint::List::tqfind(cons
   return _list.end();
 }
 
-TQValueList<Breakpoint::List::StateData>::const_iterator Breakpoint::List::tqfind(const Data &data) const
+TQValueList<Breakpoint::List::StateData>::const_iterator Breakpoint::List::find(const Data &data) const
 {
   TQValueList<StateData>::const_iterator it;
   for (it=_list.begin(); it!=_list.end(); ++it)
@@ -61,14 +61,14 @@ TQValueList<Breakpoint::List::StateData>::const_iterator Breakpoint::List::tqfin
 
 void Breakpoint::List::setState(const Data &data, State state)
 {
-  Q_ASSERT( tqcontains(data) );
-  (*tqfind(data)).state = state;
+  Q_ASSERT( contains(data) );
+  (*find(data)).state = state;
   delayedChanged();
 }
 
 void Breakpoint::List::setAddress(const Data &data, Address address)
 {
-  Q_ASSERT( tqcontains(data) );
-  (*tqfind(data)).address = address;
+  Q_ASSERT( contains(data) );
+  (*find(data)).address = address;
   delayedChanged();
 }
diff --git a/src/progs/manager/breakpoint.h b/src/progs/manager/breakpoint.h
index 07f5263..f0f1a5b 100644
--- a/src/progs/manager/breakpoint.h
+++ b/src/progs/manager/breakpoint.h
@@ -47,9 +47,9 @@ public:
   void clear();
   uint count() const { return _list.count(); }
   const Data &data(uint i) const { return _list[i].data; }
-  bool tqcontains(const Data &data) const { return tqfind(data)!=_list.end(); }
-  State state(const Data &data) const { return (*tqfind(data)).state; }
-  Address address(const Data &data) const { return (*tqfind(data)).address; }
+  bool contains(const Data &data) const { return find(data)!=_list.end(); }
+  State state(const Data &data) const { return (*find(data)).state; }
+  Address address(const Data &data) const { return (*find(data)).address; }
   void setState(const Data &data, State state);
   void setAddress(const Data &data, Address address);
 
@@ -62,8 +62,8 @@ private:
     State   state;
   };
   TQValueList<StateData> _list;
-  TQValueList<StateData>::const_iterator tqfind(const Data &data) const;
-  TQValueList<StateData>::iterator tqfind(const Data &data);
+  TQValueList<StateData>::const_iterator find(const Data &data) const;
+  TQValueList<StateData>::iterator find(const Data &data);
 };
 
 } // namespace
diff --git a/src/progs/manager/debug_manager.cpp b/src/progs/manager/debug_manager.cpp
index 631a4bd..d8b88b2 100644
--- a/src/progs/manager/debug_manager.cpp
+++ b/src/progs/manager/debug_manager.cpp
@@ -331,7 +331,7 @@ void Debugger::Manager::setRegisterWatched(const Register::TypeData &data, bool
 bool Debugger::Manager::readRegister(const Register::TypeData &data)
 {
   Q_ASSERT( data.type()==Register::Regular || data.type()==Register::Special );
-  if ( _readRegisters.tqcontains(data) ) return true;
+  if ( _readRegisters.contains(data) ) return true;
   BitValue value;
   if ( !debugger()->readRegister(data, value) ) return false;
   Register::list().setValue(data, value);
diff --git a/src/progs/pickit2v2/base/pickit2v2_prog.cpp b/src/progs/pickit2v2/base/pickit2v2_prog.cpp
index b75cc56..67788e9 100644
--- a/src/progs/pickit2v2/base/pickit2v2_prog.cpp
+++ b/src/progs/pickit2v2/base/pickit2v2_prog.cpp
@@ -70,7 +70,7 @@ bool Pickit2V2::Base::identifyDevice()
     }
     if ( ids.count()!=0 ) {
       log(Log::LineType::Information, i18n("Read id: %1").tqarg(device()->idNames(ids).join("; ")));
-      if ( ids.tqcontains(device()->name()) ) return true;
+      if ( ids.contains(device()->name()) ) return true;
       message = i18n("Read id does not match the specified device name \"%1\".").tqarg(device()->name());
       break;
     }