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

src/coff/base/coff_archive.cpp

@@ -14,7 +14,7 @@ Coff::Member::Member(const TQByteArray &data, uint &offset, Log::Base &log)
   // parse header
   TQString s;
   if ( !getString(data, offset, 256, log, s) ) return;
-  int i = s.tqfind('/');
+  int i = s.find('/');
   if ( i==-1 ) {
     log.log(Log::LineType::Error, i18n("Member name not terminated by '/' (\"%1\").").tqarg(s));
     return;
@@ -22,7 +22,7 @@ Coff::Member::Member(const TQByteArray &data, uint &offset, Log::Base &log)
   _name = s.mid(0, i);
   if ( !getString(data, offset, 12, log, s) ) return; // mtime
   if ( !getString(data, offset, 10, log, s) ) return;
-  i = s.tqfind('l');
+  i = s.find('l');
   if ( i==-1 ) {
     log.log(Log::LineType::Error, i18n("File size not terminated by 'l' (\"%1\").").tqarg(s));
     return;
@@ -88,7 +88,7 @@ bool Coff::Archive::readSymbols(const TQByteArray &data, uint offset, Log::Base
   for (uint i=0; i<nb; i++) {
     TQ_UINT32 start;
     if ( !getULong(data, offset, 4, log, start) ) return false;
-    if ( !_offsets.tqcontains(start) ) {
+    if ( !_offsets.contains(start) ) {
       log.log(Log::LineType::Error, i18n("Unknown file member offset: %1").tqarg(toHexLabel(start, 8)));
       return false;
     }

src/coff/base/coff_object.cpp

@@ -504,7 +504,7 @@ bool Coff::Object::parse(Log::Base &log)
   for (uint i=0; i<_nbSymbols; i++) {
     if ( _symbols[i]==0 || _symbols[i]->isAuxSymbol() ) continue;
     TQString s = static_cast<const Symbol *>(_symbols[i])->filename();
-    if ( s.isEmpty() || s=="fake" || _filenames.tqcontains(s) ) continue;
+    if ( s.isEmpty() || s=="fake" || _filenames.contains(s) ) continue;
     _filenames.append(s);
   }
 

src/coff/base/coff_object.h

@@ -266,7 +266,7 @@ public:
   uint optHeaderMagic() const { return _optHeaderMagic; }
   uint nbSymbols() const { return _symbols.count(); }
   const BaseSymbol *symbol(uint i) const { return _symbols[i]; }
-  const Symbol *symbol(const TQString &name) const { return (_msymbols.tqcontains(name) ? _msymbols[name] : 0); }
+  const Symbol *symbol(const TQString &name) const { return (_msymbols.contains(name) ? _msymbols[name] : 0); }
   uint nbSections() const { return _sections.count(); }
   const Section *section(uint i) const { return _sections[i]; }
   const TQStringList &filenames() const { return _filenames; }

src/coff/base/text_coff.cpp

@@ -48,11 +48,11 @@ PURL::Url Coff::TextObject::urlForFilename(const TQString &filename) const
 
 const Coff::Section *Coff::TextObject::section(const CodeLine &cline) const
 {
-  if ( cline.section().instructions().tqcontains(cline.address()) ) return &cline.section();
+  if ( cline.section().instructions().contains(cline.address()) ) return &cline.section();
   // possible for coff generated by picc...
   for (uint i=0; i<uint(_sections.count()); i++) {
     if ( _sections[i]->type()!=SectionType::Code ) continue;
-    if ( _sections[i]->instructions().tqcontains(cline.address()) ) return _sections[i];
+    if ( _sections[i]->instructions().contains(cline.address()) ) return _sections[i];
   }
   return 0;
 }
@@ -68,7 +68,7 @@ void Coff::TextObject::init() const
     if ( _sections[i]->type()!=SectionType::Code ) continue;
     for (uint k=0; k<uint(_sections[i]->lines().count()); k++) {
       TQString filename = _sections[i]->lines()[k]->filename();
-      if ( filename.isEmpty() || fd.tqcontains(filename) ) continue;
+      if ( filename.isEmpty() || fd.contains(filename) ) continue;
       _filenames.append(filename);
       FileData fdata;
       fdata.url = urlForFilename(filename);
@@ -103,7 +103,7 @@ void Coff::TextObject::init() const
           //qDebug("%s: %s", ldata.codes[k].address.latin1(), ldata.codes[k].opcode.latin1());
           opcodeWidth = qMax(opcodeWidth, uint(ldata.codes[k].opcode.length()));
           TQString s = sec->instructions()[address].disasm;
-          int j = s.tqfind('\t');
+          int j = s.find('\t');
           if ( j!=-1 ) {
             ldata.codes[k].disasm2 = s.mid(j+1);
             disasm2Width = qMax(disasm2Width, uint(ldata.codes[k].disasm2.length()));
@@ -178,7 +178,7 @@ TQValueVector<const Coff::CodeLine *> Coff::TextObject::findCodeLines(const TQSt
 int Coff::TextObject::lineForAddress(const PURL::Url &url, Address address) const
 {
   init();
-  if ( url==_url && _lines.tqcontains(address) ) return _lines[address]-1;
+  if ( url==_url && _lines.contains(address) ) return _lines[address]-1;
   for (uint i=0; i<uint(_sections.count()); i++) {
     if ( _sections[i]->type()!=SectionType::Code ) continue;
     for (uint k=0; k<uint(_sections[i]->lines().count()); k++) {
@@ -206,7 +206,7 @@ TQMap<PURL::Url, uint> Coff::TextObject::sourceLinesForAddress(Address address)
       slines[urlForFilename(filename)] = cl->line()-1;
     }
   }
-  if ( _lines.tqcontains(address) ) slines[_url] = _lines[address] - 1;
+  if ( _lines.contains(address) ) slines[_url] = _lines[address] - 1;
   return slines;
 }
 

src/coff/xml/xml_coff_parser.cpp

@@ -42,7 +42,7 @@ void Coff::XmlToData::parseData(TQDomElement element, Data &data)
       bool ok;
       data.ids[i] = fromHexLabel(list[i], 4, &ok);
       if ( !ok ) qFatal("Invalid id");
-      //if ( _ids.tqcontains(data.ids[i]) ) qFatal("Duplicated id");
+      //if ( _ids.contains(data.ids[i]) ) qFatal("Duplicated id");
       //_ids[data.ids[i]] = true;
     } else data.ids[i] = 0;
   }

src/common/common/lister.h

@@ -48,7 +48,7 @@ public:
   }
 
   const GroupType *group(const TQString &name) const {
-    if ( _groups.tqcontains(name) ) return _groups[name];
+    if ( _groups.contains(name) ) return _groups[name];
     return 0;
   }
 
@@ -58,7 +58,7 @@ protected:
     group->_gui = gui;
     if (gui) gui->_group = group;
     group->init();
-    Q_ASSERT( !_groups.tqcontains(group->name()) );
+    Q_ASSERT( !_groups.contains(group->name()) );
     _groups.insert(group->name(), group);
   }
 

src/common/common/range.h

@@ -18,7 +18,7 @@ class GenericRange
 public:
   virtual ~GenericRange() {}
   virtual bool isEmpty() const = 0;
-  bool tqcontains(Type v) const { return !isEmpty() && v>=start && v<=end; }
+  bool contains(Type v) const { return !isEmpty() && v>=start && v<=end; }
 
   Type start, end;
 };
@@ -49,9 +49,9 @@ public:
     for (uint i=0; i<nb; i++) if ( !this->at(i).isEmpty() ) return false;
     return true;
   }
-  bool tqcontains(Type v) const {
+  bool contains(Type v) const {
     uint nb = this->count();
-    for (uint i=0; i<nb; i++) if ( this->at(i).tqcontains(v) ) return true;
+    for (uint i=0; i<nb; i++) if ( this->at(i).contains(v) ) return true;
     return false;
   }
 };

src/common/global/purl.cpp

@@ -53,7 +53,7 @@ private:
 TQString PURL::Private::getWindowsDrivePath(char drive)
 {
 #if defined(Q_OS_UNIX)
-  if ( !_winDrives.tqcontains(drive) ) {
+  if ( !_winDrives.contains(drive) ) {
     TQStringList args;
     args += "-u";
     TQString s;
@@ -75,7 +75,7 @@ TQString PURL::Private::getWindowsDrivePath(char drive)
 
 bool PURL::Private::checkCachedPath(TQString &filepath) const
 {
-  if ( !_winPaths.tqcontains(filepath) ) return false;
+  if ( !_winPaths.contains(filepath) ) return false;
   filepath = _winPaths[filepath];
   return true;
 }
@@ -92,13 +92,13 @@ TQString PURL::Private::convertWindowsFilepath(const TQString &filepath)
   if ( filepath[0]=='\\' ) {
     TQString tmp = filepath;
     if ( checkCachedPath(tmp) ) return tmp;
-    return cachePath(filepath, convertWindowsShortFilepath(tmp.tqreplace('\\', "/")));
+    return cachePath(filepath, convertWindowsShortFilepath(tmp.replace('\\', "/")));
   }
   // appears to be a windows path with a drive
   if ( (filepath.length()>=2 && filepath[0].isLetter() && filepath[1]==':') ) {
     TQString tmp = filepath;
     if ( checkCachedPath(tmp) ) return tmp;
-    tmp = getWindowsDrivePath(filepath[0]) + tmp.mid(2).tqreplace('\\', "/");
+    tmp = getWindowsDrivePath(filepath[0]) + tmp.mid(2).replace('\\', "/");
     return cachePath(filepath, convertWindowsShortFilepath(tmp));
   }
   return filepath;

src/common/gui/editlistbox.cpp

@@ -205,7 +205,7 @@ void EditListBox::addItem(const TQString &text)
 {
     bool alreadyInList(false);
     //if we didn't check for dupes at the inserting we have to do it now
-    if ( _mode==DuplicatesDisallowed ) alreadyInList = _listView->tqfindItem(text, textColumn());
+    if ( _mode==DuplicatesDisallowed ) alreadyInList = _listView->findItem(text, textColumn());
 
     if (m_lineEdit) {
       bool block = m_lineEdit->signalsBlocked();
@@ -311,7 +311,7 @@ void EditListBox::updateButtons()
       TQString text = m_lineEdit->text();
       if ( _mode!=DuplicatesCheckedAtEntering ) _addButton->setEnabled(!text.isEmpty());
       else if ( text.isEmpty() ) _addButton->setEnabled(false);
-      else _addButton->setEnabled(!_listView->tqfindItem(text, textColumn()));
+      else _addButton->setEnabled(!_listView->findItem(text, textColumn()));
     }
   }
   if (_removeButton) _removeButton->setEnabled(item);

src/common/gui/key_gui.h

@@ -32,16 +32,16 @@ public:
   ConstIterator end() const { return _ids.end(); }
   uint count() const { return _ids.count(); }
   void appendItem(const KeyType &key, Type type) {
-    CRASH_ASSERT( !_ids.tqcontains(key) );
+    CRASH_ASSERT( !_ids.contains(key) );
     _ids[key] = append(type);
   }
   KeyType currentItem() const { return key(currentId()); }
   void setCurrentItem(const KeyType &key) {
-    if ( _ids.tqcontains(key) ) setCurrentId(_ids[key]);
+    if ( _ids.contains(key) ) setCurrentId(_ids[key]);
   }
-  bool tqcontains(const KeyType &key) const { return _ids.tqcontains(key); }
+  bool contains(const KeyType &key) const { return _ids.contains(key); }
   Type item(const KeyType &key) const {
-    CRASH_ASSERT( _ids.tqcontains(key) );
+    CRASH_ASSERT( _ids.contains(key) );
     return get(_ids[key]);
   }
   Type item(ConstIterator it) const {

src/common/gui/list_container.cpp

@@ -91,5 +91,5 @@ void ListViewItemContainer::appendItem(const TQPixmap &icon, const TQString &tit
 
 int ListViewItemContainer::id(const TQListViewItem *item) const
 {
-  return (_ids->tqcontains(item) ? int((*_ids)[item]) : -1);
+  return (_ids->contains(item) ? int((*_ids)[item]) : -1);
 }

src/common/gui/list_view.cpp

@@ -191,9 +191,9 @@ void EditListViewItem::removeEditBox()
 
 void EditListViewItem::editDone(int col, const TQWidget *edit)
 {
-  if ( edit->tqmetaObject()->tqfindProperty("text", true)!=-1 )
+  if ( edit->tqmetaObject()->findProperty("text", true)!=-1 )
     emit listView()->itemRenamed(this, col, edit->property("text").toString());
-  else if ( edit->tqmetaObject()->tqfindProperty("currentText", true)!=-1 )
+  else if ( edit->tqmetaObject()->findProperty("currentText", true)!=-1 )
     emit listView()->itemRenamed(this, col, edit->property("currentText").toString());
 }
 

src/common/nokde/nokde_kcmdlineargs.cpp

@@ -409,7 +409,7 @@ findOption(const KCmdLineOptions *options, TQCString &opt,
                   return result+0;
                TQCString nextOption = options->name;
 #  if [[[TQT_VERSION IS DEPRECATED]]]<0x040000
-               int p = nextOption.tqfind(' ');
+               int p = nextOption.find(' ');
 #else
                int p = TQString(nextOption).indexOf(' ');
 #endif
@@ -450,7 +450,7 @@ KCmdLineArgs::findOption(const char *_opt, TQCString opt, int &i, bool _enabled,
    const char *def;
    TQCString argument;
 #  if [[[TQT_VERSION IS DEPRECATED]]]<0x040000
-   int j = opt.tqfind('=');
+   int j = opt.find('=');
 #else
    int j = TQString(opt).indexOf('=');
 #endif
@@ -1107,9 +1107,9 @@ KCmdLineArgs::setOption(const TQCString &opt, bool enabled)
    }
 
    if (enabled)
-      parsedOptionList->tqreplace( opt, new TQCString("t") );
+      parsedOptionList->replace( opt, new TQCString("t") );
    else
-      parsedOptionList->tqreplace( opt, new TQCString("f") );
+      parsedOptionList->replace( opt, new TQCString("f") );
 }
 
 void
@@ -1145,7 +1145,7 @@ KCmdLineArgs::getOption(const char *_opt) const
    TQCString *value = 0;
    if (parsedOptionList)
    {
-      value = parsedOptionList->tqfind(_opt);
+      value = parsedOptionList->find(_opt);
    }
 
    if (value)
@@ -1225,7 +1225,7 @@ KCmdLineArgs::isSet(const char *_opt) const
    TQCString *value = 0;
    if (parsedOptionList)
    {
-      value = parsedOptionList->tqfind(opt);
+      value = parsedOptionList->find(opt);
    }
 
    if (value)

src/common/port/port.cpp

@@ -92,7 +92,7 @@ PortType Port::findType(const TQString &portDevice)
 {
   FOR_EACH(PortType, type) {
     if ( !type.data().withDevice ) continue;
-    if ( probedDeviceList(type).tqcontains(portDevice) ) return type;
+    if ( probedDeviceList(type).contains(portDevice) ) return type;
   }
   return PortType::Nb_Types;
 }

src/devices/base/register.cpp

@@ -83,7 +83,7 @@ void Register::List::init()
 void Register::List::setWatched(const TypeData &data, bool watched)
 {
   if (watched) {
-    if ( _watched.tqcontains(data) ) return;
+    if ( _watched.contains(data) ) return;
     _watched.append(data);
   } else _watched.remove(data);
   delayedChanged();
@@ -122,7 +122,7 @@ void Register::List::setPortData(uint index, const TQMap<uint, Device::PortBitDa
 BitValue Register::List::value(const TypeData &data) const
 {
   if ( !data.address().isValid() ) {
-    if ( !_specials.tqcontains(data.name()) ) return BitValue();
+    if ( !_specials.contains(data.name()) ) return BitValue();
     return _specials[data.name()].current;
   }
   Q_ASSERT( (data.nbChars()%2)==0 );
@@ -140,7 +140,7 @@ BitValue Register::List::value(const TypeData &data) const
 BitValue Register::List::oldValue(const TypeData &data) const
 {
   if ( !data.address().isValid() ) {
-    if ( !_specials.tqcontains(data.name()) ) return BitValue();
+    if ( !_specials.contains(data.name()) ) return BitValue();
     return _specials[data.name()].old;
   }
   Q_ASSERT( (data.nbChars()%2)==0 );

src/devices/base/register.h

@@ -103,7 +103,7 @@ public:
   void setWatched(const TypeData &data, bool watched);
   void clearWatched();
   const TQValueList<TypeData> &watched() const { return _watched; }
-  bool isWatched(const TypeData &data) const { return _watched.tqcontains(data); }
+  bool isWatched(const TypeData &data) const { return _watched.contains(data); }
   void setValue(const TypeData &data, BitValue value);
   BitValue value(const TypeData &data) const;
   BitValue oldValue(const TypeData &data) const;

src/devices/gui/memory_editor.cpp

@@ -167,7 +167,7 @@ void Device::MemoryRangeEditor::setIndex(int index)
 
 void Device::MemoryRangeEditor::moveNext()
 {
-  TQValueList<HexWordEditor *>::iterator it = _editors.tqfind((HexWordEditor *)sender());
+  TQValueList<HexWordEditor *>::iterator it = _editors.find((HexWordEditor *)sender());
   ++it;
   if ( it==_editors.end() || (*it)->offset()==-1 ) {
     if ( current()==uint(_scrollbar->maxValue()) ) return; // at end
@@ -178,7 +178,7 @@ void Device::MemoryRangeEditor::moveNext()
 
 void Device::MemoryRangeEditor::movePrev()
 {
-  TQValueList<HexWordEditor *>::iterator it = _editors.tqfind((HexWordEditor *)sender());
+  TQValueList<HexWordEditor *>::iterator it = _editors.find((HexWordEditor *)sender());
   if ( it==_editors.begin() ) {
     if ( current()==0 ) return; // at beginning
     setIndex(current()-1);
@@ -209,7 +209,7 @@ void Device::MemoryRangeEditor::moveLast()
 
 void Device::MemoryRangeEditor::moveUp()
 {
-  int i = _editors.tqfindIndex((HexWordEditor *)sender());
+  int i = _editors.findIndex((HexWordEditor *)sender());
   uint line = i / _nbCols;
   if ( line==0 ) {
     if ( current()==0 ) return; // on first line
@@ -220,7 +220,7 @@ void Device::MemoryRangeEditor::moveUp()
 
 void Device::MemoryRangeEditor::moveDown()
 {
-  int i = _editors.tqfindIndex((HexWordEditor *)sender());
+  int i = _editors.findIndex((HexWordEditor *)sender());
   uint line = i / _nbCols;
   if ( line+1==_nbLines ) {
     if ( current()==uint(_scrollbar->maxValue()) ) return; // on last line
@@ -232,7 +232,7 @@ void Device::MemoryRangeEditor::moveDown()
 
 void Device::MemoryRangeEditor::moveNextPage()
 {
-  int i = _editors.tqfindIndex((HexWordEditor *)sender());
+  int i = _editors.findIndex((HexWordEditor *)sender());
   if ( _nbLines>(uint(_scrollbar->maxValue()) - current()) ) i = (_nbLines-1) * _nbCols + (i % _nbCols);
   else setIndex(current()+_nbLines);
   if ( _editors[i]->offset()==-1 ) _editors[i-_nbCols]->setFocus();
@@ -241,7 +241,7 @@ void Device::MemoryRangeEditor::moveNextPage()
 
 void Device::MemoryRangeEditor::movePrevPage()
 {
-  int i = _editors.tqfindIndex((HexWordEditor *)sender());
+  int i = _editors.findIndex((HexWordEditor *)sender());
   if ( current()<_nbLines ) i = (i % _nbCols);
   else setIndex(current()-_nbLines);
   _editors[i]->setFocus();

src/devices/gui/register_view.cpp

@@ -102,9 +102,9 @@ TQString Register::ListViewItem::text() const
 int Register::ListViewItem::compare(TQListViewItem *item, int, bool) const
 {
   const TypeData &data = static_cast<ListViewItem *>(item)->data();
-  int i1 = list().watched().tqfindIndex(data);
+  int i1 = list().watched().findIndex(data);
   Q_ASSERT( i1!=-1 );
-  int i2 = list().watched().tqfindIndex(_data);
+  int i2 = list().watched().findIndex(_data);
   Q_ASSERT( i2!=-1 );
   return ( i1-i2 );
 }

src/devices/mem24/xml/mem24_xml_to_data.cpp

@@ -45,8 +45,8 @@ virtual void processDevice(TQDomElement device)
 
 virtual void checkPins(const TQMap<TQString, uint> &pinLabels) const
 {
-  if ( !pinLabels.tqcontains("VCC") ) qFatal("No VDD pin specified");
+  if ( !pinLabels.contains("VCC") ) qFatal("No VDD pin specified");
-  if ( !pinLabels.tqcontains("VSS") ) qFatal("No VSS pin specified");
+  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").tqarg(it.key()));

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::CCP: return registersData().sfrs.contains("CCP1CON");
-    case Feature::ADC: return registersData().sfrs.tqcontains("ADCON0");
+    case Feature::ADC: return registersData().sfrs.contains("ADCON0");
-    case Feature::SSP: return registersData().sfrs.tqcontains("SSPCON");
+    case Feature::SSP: return registersData().sfrs.contains("SSPCON");
-    case Feature::LVD: return registersData().sfrs.tqcontains("LVDCON");
+    case Feature::LVD: return registersData().sfrs.contains("LVDCON");
-    case Feature::USB: return registersData().sfrs.tqcontains("UCON");
+    case Feature::USB: return registersData().sfrs.contains("UCON");
     case Feature::USART:
-      return ( registersData().sfrs.tqcontains("TXSTA")        // 16F
+      return ( registersData().sfrs.contains("TXSTA")        // 16F
-               || registersData().sfrs.tqcontains("TXSTA1")    // 18F
+               || registersData().sfrs.contains("TXSTA1")    // 18F
-               || registersData().sfrs.tqcontains("U1MODE") ); // 30F
+               || registersData().sfrs.contains("U1MODE") ); // 30F
-    case Feature::CAN: return registersData().sfrs.tqcontains("CANCON") && !registersData().sfrs.tqcontains("ECANCON");
+    case Feature::CAN: return registersData().sfrs.contains("CANCON") && !registersData().sfrs.contains("ECANCON");
-    case Feature::ECAN: return registersData().sfrs.tqcontains("ECANCON");
+    case Feature::ECAN: return registersData().sfrs.contains("ECANCON");
-    case Feature::Ethernet: return registersData().sfrs.tqcontains("ETHCON1");
+    case Feature::Ethernet: return registersData().sfrs.contains("ETHCON1");
-    case Feature::LCD: return registersData().sfrs.tqcontains("LCDCON");
+    case Feature::LCD: return registersData().sfrs.contains("LCDCON");
-    case Feature::MotorControl: return registersData().sfrs.tqcontains("PWMCON0");
+    case Feature::MotorControl: return registersData().sfrs.contains("PWMCON0");
-    case Feature::MotionFeedback: return registersData().sfrs.tqcontains("CAP1CON");
+    case Feature::MotionFeedback: return registersData().sfrs.contains("CAP1CON");
     case Feature::SelfWrite: return _selfWrite==SelfWrite::Yes;
     case Feature::Nb_Types: Q_ASSERT(false); break;
   }

src/devices/pic/base/pic_config.cpp

@@ -298,7 +298,7 @@ TQMap<TQString, Pic::Config::MapData> &Pic::Config::masks()
 
 bool Pic::Config::hasMaskName(const TQString &tqmask)
 {
-  return masks().tqcontains(tqmask);
+  return masks().contains(tqmask);
 }
 
 TQString Pic::Config::maskLabel(const TQString &tqmask)

src/devices/pic/base/pic_register.cpp

@@ -84,8 +84,8 @@ TQString Pic::RegistersData::label(Address address) const
 bool Pic::RegistersData::hasPort(uint index) const
 {
   Q_ASSERT( index<Device::MAX_NB_PORTS );
-  if ( sfrs.tqcontains("GPIO") ) return ( index==0 );
+  if ( sfrs.contains("GPIO") ) return ( index==0 );
-  if ( !sfrs.tqcontains(portName(index)) ) return false;
+  if ( !sfrs.contains(portName(index)) ) return false;
   return true;
 }
 
@@ -109,7 +109,7 @@ bool Pic::RegistersData::hasPortBit(uint index, uint bit) const
 
 TQString Pic::RegistersData::portName(uint index) const
 {
-  if ( sfrs.tqcontains("GPIO") ) {
+  if ( sfrs.contains("GPIO") ) {
     if ( index!=0 ) return TQString();
     return "GPIO";
   }
@@ -118,7 +118,7 @@ TQString Pic::RegistersData::portName(uint index) const
 
 TQString Pic::RegistersData::trisName(uint index) const
 {
-  if ( sfrs.tqcontains("GPIO") ) {
+  if ( sfrs.contains("GPIO") ) {
     if ( index!=0 ) return TQString();
     return "TRISIO";
   }
@@ -133,7 +133,7 @@ bool Pic::RegistersData::hasTris(uint index) const
 {
   TQString name = trisName(index);
   if ( name.isEmpty() ) return false;
-  return sfrs.tqcontains(name);
+  return sfrs.contains(name);
 }
 
 TQString Pic::RegistersData::latchName(uint index) const
@@ -147,12 +147,12 @@ bool Pic::RegistersData::hasLatch(uint index) const
 {
   TQString name = latchName(index);
   if ( name.isEmpty() ) return false;
-  return sfrs.tqcontains(name);
+  return sfrs.contains(name);
 }
 
 TQString Pic::RegistersData::portBitName(uint index, uint bit) const
 {
-  if ( sfrs.tqcontains("GPIO") ) return TQString("GP") + TQString::number(bit);
+  if ( sfrs.contains("GPIO") ) return TQString("GP") + TQString::number(bit);
   return TQString("R") + char('A' + index) + TQString::number(bit);
 }
 

src/devices/pic/gui/pic_memory_editor.cpp

@@ -220,14 +220,14 @@ void Pic::MemoryRangeEditor::updateDisplay()
 
 void Pic::MemoryRangeEditor::updateAddressColor(uint i, Address address)
 {
-  if ( _codeProtected.tqcontains(address) )
+  if ( _codeProtected.contains(address) )
     _addresses[i]->setPaletteBackgroundColor(MemoryEditorLegend::protectedColor());
   else _addresses[i]->unsetPalette();
   _blocks[i]->unsetPalette();
   if ( type()==MemoryRangeType::Code ) {
-    if ( _bootRange.tqcontains(address) ) _blocks[i]->setPaletteBackgroundColor(MemoryEditorLegend::bootColor());
+    if ( _bootRange.contains(address) ) _blocks[i]->setPaletteBackgroundColor(MemoryEditorLegend::bootColor());
     else for (uint k=0; k<_blockRanges.count(); k++) {
-      if ( !_blockRanges[k].tqcontains(address) ) continue;
+      if ( !_blockRanges[k].contains(address) ) continue;
       _blocks[i]->setPaletteBackgroundColor(MemoryEditorLegend::blockColor(k));
       break;
     }

src/devices/pic/pic/pic_memory.cpp

@@ -348,7 +348,7 @@ BitValue Pic::Memory::checksum() const
     TQString maskName = protection.maskName(Protection::ProgramProtected, MemoryRangeType::Code);
     TQString valueName = findValue(maskName);
     const TQMap<TQString, Checksum::Data> &checksums = device().checksums();
-    if ( checksums.tqcontains(valueName) ) { // #### REMOVE ME !!
+    if ( checksums.contains(valueName) ) { // #### REMOVE ME !!
       algorithm = checksums[valueName].algorithm;
       cs = checksums[valueName].constant;
     }
@@ -356,14 +356,14 @@ BitValue Pic::Memory::checksum() const
   //qDebug("constant: %s", toHexLabelAbs(cs).data());
   //qDebug("algo: %s", Checksum::ALGORITHM_DATA[algorithm].name);
   for (uint i=0; i<device().nbWords(MemoryRangeType::Code); i++) {
-    if ( algorithm==Checksum::Algorithm::Normal && rv.tqcontains(inc*i) ) continue;
+    if ( algorithm==Checksum::Algorithm::Normal && rv.contains(inc*i) ) continue;
     BitValue v = word(MemoryRangeType::Code, i).maskWith(tqmask);
     //if ( i==0 || i==device().nbWords(MemoryRangeType::Code)-1 ) qDebug("%s %s", toHexLabel(i, 4).latin1(), toHexLabel(v, 4).latin1());
     switch (device().architecture().type()) {
       case Architecture::P10X:
       case Architecture::P16X:
       case Architecture::P17C:
-        if ( rv.tqcontains(i) ) {
+        if ( rv.contains(i) ) {
           switch (algorithm.type()) {
             case Checksum::Algorithm::Normal: cs += v;           break;
             case Checksum::Algorithm::XOR4:   cs += v.XORn(4);  break;

src/devices/pic/prog/pic_debug.cpp

@@ -16,7 +16,7 @@
 Register::TypeData Debugger::PicBase::registerTypeData(const TQString &name) const
 {
   const Pic::RegistersData &rdata = device()->registersData();
-  Q_ASSERT(rdata.sfrs.tqcontains(name));
+  Q_ASSERT(rdata.sfrs.contains(name));
   return Register::TypeData(rdata.sfrs[name].address, rdata.nbChars());
 }
 

src/devices/pic/prog/pic_prog.cpp

@@ -271,7 +271,7 @@ bool Programmer::PicBase::verifyDeviceId()
   TQString message;
   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());
   } else {
     log(Log::LineType::Warning, i18n("  Unknown or incorrect device (Read id is %1).").tqarg(toHexLabel(rawId, nbChars)));

src/devices/pic/prog/pic_prog_specific.cpp

@@ -109,7 +109,7 @@ bool Programmer::PicHardware::compareWords(Pic::MemoryRangeType type, uint index
 
 bool Programmer::PicHardware::verifyWord(uint i, BitValue word, Pic::MemoryRangeType type, const VerifyData &vdata)
 {
-  if ( !(vdata.actions & ::Programmer::IgnoreProtectedVerify) && vdata.protectedRanges.tqcontains(i) ) return true; // protected
+  if ( !(vdata.actions & ::Programmer::IgnoreProtectedVerify) && vdata.protectedRanges.contains(i) ) return true; // protected
   BitValue v = static_cast<const Pic::Memory &>(vdata.memory).normalizedWord(type, i);
   BitValue d = static_cast<const Pic::Memory &>(vdata.memory).normalizeWord(type, i, word);
   if ( type==Pic::MemoryRangeType::Config ) {

src/devices/pic/xml/pic_xml_to_data.cpp

@@ -154,7 +154,7 @@ Pic::Config::Mask toConfigMask(TQDomElement tqmask, BitValue ptqmask)
     if ( value.attribute("value")=="default" ) {
       if ( !defName.isEmpty() ) qFatal(TQString("Default value already defined for tqmask %1").tqarg(ctqmask.name));
       defName = value.attribute("name");
-      //if ( names.tqcontains(defName) ) qFatal(TQString("Value name duplicated in tqmask %1").tqarg(ctqmask.name));
+      //if ( names.contains(defName) ) qFatal(TQString("Value name duplicated in tqmask %1").tqarg(ctqmask.name));
       //names.append(defName);
       FOR_EACH(Pic::ConfigNameType, type) defConfigNames[type] = TQStringList::split(' ', value.attribute(type.data().key));
       continue;
@@ -163,7 +163,7 @@ Pic::Config::Mask toConfigMask(TQDomElement tqmask, BitValue ptqmask)
     cvalue.value = fromHexLabel(value.attribute("value"), nbChars, &ok);
     if ( !ok || !cvalue.value.isInside(ctqmask.value) ) qFatal(TQString("Malformed value in tqmask %1").tqarg(ctqmask.name));
     cvalue.name = value.attribute("name");
-    //if ( names.tqcontains(cvalue.name) ) qFatal(TQString("Value name duplicated in tqmask %1").tqarg(ctqmask.name));
+    //if ( names.contains(cvalue.name) ) qFatal(TQString("Value name duplicated in tqmask %1").tqarg(ctqmask.name));
     //names.append(cvalue.name);
     FOR_EACH(Pic::ConfigNameType, type) cvalue.configNames[type] = TQStringList::split(' ', value.attribute(type.data().key));
     processName(ctqmask, ptqmask, cvalue);
@@ -298,7 +298,7 @@ TQString getChecksumData(TQDomElement checksum)
     if ( protection.family()==Protection::NoProtection && !valueName.isEmpty() )
       qFatal("Checksum protected attribute for device with no code protection");
   }
-  if ( data()->_checksums.tqcontains(valueName) ) qFatal("Duplicate checksum protected range");
+  if ( data()->_checksums.contains(valueName) ) qFatal("Duplicate checksum protected range");
 
   TQString s = checksum.attribute("constant");
   if ( s.isEmpty() ) cdata.constant = 0x0000;
@@ -359,8 +359,8 @@ virtual void processDevice(TQDomElement device)
   TQString arch = device.attribute("architecture");
   data()->_architecture = Architecture::fromKey(arch);
   if ( data()->_architecture==Architecture::Nb_Types ) qFatal(TQString("Unrecognized architecture \"%1\"").tqarg(arch));
-  if ( (data()->_architecture==Architecture::P18F && data()->_name.tqcontains("C"))
+  if ( (data()->_architecture==Architecture::P18F && data()->_name.contains("C"))
-       || (data()->_architecture==Architecture::P18F && data()->_name.tqcontains("J")) ) qFatal("Not matching family");
+       || (data()->_architecture==Architecture::P18F && data()->_name.contains("J")) ) qFatal("Not matching family");
 
   bool ok;
   TQString pc = device.attribute("pc");
@@ -449,7 +449,7 @@ virtual void processDevice(TQDomElement device)
           const TQStringList &vcnames = tqmask.values[k].configNames[type];
           for (uint l=0; l<uint(vcnames.count()); l++) {
             if ( vcnames[l].startsWith("0x") ) continue;
-            if ( cnames.tqcontains(vcnames[l]) && cnames[vcnames[l]]!=tqmask.name )
+            if ( cnames.contains(vcnames[l]) && cnames[vcnames[l]]!=tqmask.name )
               qFatal(TQString("Duplicated config name for %1/%2").tqarg(tqmask.name).tqarg(tqmask.values[k].name));
             cnames[vcnames[l]] = word.masks[j].name;
           }
@@ -500,7 +500,7 @@ virtual void processDevice(TQDomElement device)
       if ( child.nodeName()!="checksum" ) qFatal("Childs of \"checksums\" should \"checksum\"");
       TQString valueName = getChecksumData(child.toElement());
       if ( protection.family()==Protection::BasicProtection ) {
-        if ( !valueNames.tqcontains(valueName) ) qFatal("Unknown protected attribute");
+        if ( !valueNames.contains(valueName) ) qFatal("Unknown protected attribute");
         valueNames[valueName] = true;
       }
       child = child.nextSibling();
@@ -548,7 +548,7 @@ void processSfr(TQDomElement e)
 {
   TQString name = e.attribute("name");
   if ( name.isEmpty() ) qFatal("SFR cannot have empty name");
-  if ( data()->registersData().sfrs.tqcontains(name) || data()->registersData().combined.tqcontains(name) )
+  if ( data()->registersData().sfrs.contains(name) || data()->registersData().combined.contains(name) )
     qFatal("SFR name is duplicated");
   bool ok;
   uint address = fromHexLabel(e.attribute("address"), &ok);
@@ -582,7 +582,7 @@ void processCombined(TQDomElement e)
 {
   TQString name = e.attribute("name");
   if ( name.isEmpty() ) qFatal("Combined register cannot have empty name");
-  if ( data()->registersData().sfrs.tqcontains(name) || data()->registersData().combined.tqcontains(name) )
+  if ( data()->registersData().sfrs.contains(name) || data()->registersData().combined.contains(name) )
     qFatal("Combined register name is duplicated");
   bool ok;
   CombinedData rdata;
@@ -601,7 +601,7 @@ void processDeviceRegisters(TQDomElement element)
 {
   TQString s = element.attribute("same_as");
   if ( !s.isEmpty() ) {
-    if ( !_map.tqcontains(s) ) qFatal(TQString("Registers same as unknown device %1").tqarg(s));
+    if ( !_map.contains(s) ) qFatal(TQString("Registers same as unknown device %1").tqarg(s));
     const Pic::Data *d = static_cast<const Pic::Data *>(_map[s]);
     data()->_registersData = d->_registersData;
     return;
@@ -636,14 +636,14 @@ void processDeviceRegisters(TQDomElement element)
   for (uint i=0; i<Device::MAX_NB_PORTS; i++) {
     TQString portname = rdata.portName(i);
     if ( portname.isEmpty() ) break;
-    bool hasPort = rdata.sfrs.tqcontains(portname);
+    bool hasPort = rdata.sfrs.contains(portname);
     TQString trisname = rdata.trisName(i);
     if ( trisname.isEmpty() ) continue;
-    bool hasTris = rdata.sfrs.tqcontains(trisname);
+    bool hasTris = rdata.sfrs.contains(trisname);
     if ( !hasPort && hasTris ) qFatal(TQString("%1 needs %2 to be present").tqarg(trisname).tqarg(portname));
     TQString latchname = rdata.latchName(i);
     if ( latchname.isEmpty() ) continue;
-    bool hasLatch = rdata.sfrs.tqcontains(latchname);
+    bool hasLatch = rdata.sfrs.contains(latchname);
     if ( !hasPort && hasLatch ) qFatal(TQString("%1 needs %2 to be present").tqarg(latchname).tqarg(portname));
   }
 }
@@ -660,8 +660,8 @@ void processRegistersFile(const TQString &filename, TQStringList &devices)
       if ( child.nodeName()!="device" ) qFatal("Device node should be named \"device\"");
       TQDomElement device = child.toElement();
       TQString name = device.attribute("name");
-      if ( devices.tqcontains(name) ) qFatal(TQString("Registers already defined for %1").tqarg(name));
+      if ( devices.contains(name) ) qFatal(TQString("Registers already defined for %1").tqarg(name));
-      if ( _map.tqcontains(name) ) {
+      if ( _map.contains(name) ) {
         _data = _map[name];
         processDeviceRegisters(device);
         devices.append(name);
@@ -680,14 +680,14 @@ void processRegisters()
   TQMap<TQString, Device::Data *>::const_iterator it = _map.begin();
   for (; it!=_map.end(); ++it) {
     _data = it.data();
-    if ( !devices.tqcontains(it.key()) ) qWarning("Register description not found for %s", it.key().latin1());
+    if ( !devices.contains(it.key()) ) qWarning("Register description not found for %s", it.key().latin1());
   }
 }
 
 virtual void checkPins(const TQMap<TQString, uint> &pinLabels) const
 {
-  if ( !pinLabels.tqcontains("VDD") ) qFatal("No VDD pin specified");
+  if ( !pinLabels.contains("VDD") ) qFatal("No VDD pin specified");
-  if ( !pinLabels.tqcontains("VSS") ) qFatal("No VSS pin specified");
+  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.key()=="VDD" || it.key()=="VSS" || it.key().startsWith("CCP") ) continue;
@@ -699,7 +699,7 @@ virtual void checkPins(const TQMap<TQString, uint> &pinLabels) const
     for (uint k=0; k<Device::MAX_NB_PORT_BITS; k++) {
       if ( !rdata.hasPortBit(i, k) ) continue;
       TQString name = rdata.portBitName(i, k);
-      if ( !pinLabels.tqcontains(name) ) qFatal(TQString("Pin \"%1\" not present").tqarg(name));
+      if ( !pinLabels.contains(name) ) qFatal(TQString("Pin \"%1\" not present").tqarg(name));
     }
   }
 }

src/libgui/breakpoint_view.cpp

@@ -20,7 +20,7 @@
 //----------------------------------------------------------------------------
 void Breakpoint::updateActions(const Data *data)
 {
-  bool hasBreakpoint = (data ? Breakpoint::list().tqcontains(*data) : false);
+  bool hasBreakpoint = (data ? Breakpoint::list().contains(*data) : false);
   Main::action("toggle_breakpoint")->setText(hasBreakpoint ? i18n("Remove breakpoint") : i18n("Set breakpoint"));
   Main::action("toggle_breakpoint")->setEnabled(data);
   bool isActive = (hasBreakpoint ? Breakpoint::list().state(*data)==Breakpoint::Active : false);

src/libgui/console.cpp

@@ -27,7 +27,7 @@ void ConsoleView::showEvent(TQShowEvent *e)
     KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
     TQVBoxLayout *top = new TQVBoxLayout(this, 0, 10);
     if ( factory==0 ) {
-      TQLabel *label = new TQLabel(i18n("Could not tqfind \"konsolepart\"; please install kdebase."), this);
+      TQLabel *label = new TQLabel(i18n("Could not find \"konsolepart\"; please install kdebase."), this);
       label->show();
       top->addWidget(label);
       return;

src/libgui/device_gui.cpp

@@ -283,7 +283,7 @@ void DeviceChooser::Dialog::updateList(const TQString &device)
     switch (_listTypeCombo->value().type()) {
       case ListType::FamilyTree: {
         TQString gname = data->listViewGroup();
-        if ( !groups.tqcontains(gname) )
+        if ( !groups.contains(gname) )
           groups[gname] = new ListItem(_listView, gname, false, false);
         item = new ListItem(groups[gname], list[i]);
         break;

src/libgui/gui_debug_manager.cpp

@@ -25,7 +25,7 @@
 
 bool Debugger::GuiManager::addEditor(Editor &editor)
 {
-  if ( _editors.tqfind(&editor)!=_editors.end() ) return false;
+  if ( _editors.find(&editor)!=_editors.end() ) return false;
   connect(&editor, TQT_SIGNAL(destroyed()), TQT_SLOT(editorDestroyed()));
   _editors.append(&editor);
   return true;
@@ -74,7 +74,7 @@ PURL::Url Debugger::GuiManager::coffUrl() const
 bool Debugger::GuiManager::internalInit()
 {
   if ( !Manager::internalInit() ) return false;
-  if ( !Main::projectManager().tqcontains(coffUrl()) )
+  if ( !Main::projectManager().contains(coffUrl()) )
     Main::projectManager().addExternalFile(coffUrl(), ProjectManager::Generated);
   Main::watchView().init(true);
   if ( registerView() ) registerView()->view()->updateView();
@@ -105,7 +105,7 @@ void Debugger::GuiManager::toggleBreakpoint()
     return;
   }
   Breakpoint::Data data = currentBreakpointData();
-  if ( Breakpoint::list().tqcontains(data) ) {
+  if ( Breakpoint::list().contains(data) ) {
     Breakpoint::list().remove(data);
     return;
   }
@@ -148,7 +148,7 @@ void Debugger::GuiManager::updateEditorMarks(TextEditor &editor) const
   }
   // update pc
   if ( _coff && programmer() && programmer()->isActive() && pc().isInitialized() && !reached
-        && _currentSourceLines.tqcontains(editor.url()) ) {
+        && _currentSourceLines.contains(editor.url()) ) {
     int pcline = _currentSourceLines[editor.url()];
     if ( programmer()->state()==Programmer::Halted ) editor.setMark(pcline, Breakpoint::ProgramCounterActive);
     else editor.setMark(pcline, Breakpoint::ProgramCounterDisabled);
@@ -186,7 +186,7 @@ void Debugger::GuiManager::updateView(bool gotoPC)
     TextEditor *e = ::tqqt_cast<TextEditor *>(*ite);
     if ( e==0 ) continue;
     updateEditorMarks(*e);
-    if ( !_currentSourceLines.tqcontains(e->url()) ) continue;
+    if ( !_currentSourceLines.contains(e->url()) ) continue;
     if (gotoPC) e->setCursor(_currentSourceLines[e->url()], 0);
     if ( e==Main::currentEditor() ) currentHasPC = true;
   }
@@ -198,8 +198,8 @@ void Debugger::GuiManager::updateView(bool gotoPC)
     TQMap<PURL::Url, uint>::const_iterator it;
     for (it=_currentSourceLines.begin(); it!=_currentSourceLines.end(); ++it) {
       switch (i) {
-        case 0: if ( !Main::projectManager().tqcontains(it.key()) || Main::projectManager().isExternalFile(it.key()) ) continue; break;
+        case 0: if ( !Main::projectManager().contains(it.key()) || Main::projectManager().isExternalFile(it.key()) ) continue; break;
-        case 1: if ( !Main::projectManager().tqcontains(it.key()) ) continue; break;
+        case 1: if ( !Main::projectManager().contains(it.key()) ) continue; break;
         case 2: if ( !it.key().exists() ) continue; break;
       }
       TextEditor *e = ::tqqt_cast<TextEditor *>(Main::editorManager().findEditor(it.key()));
@@ -229,7 +229,7 @@ Register::MainView *Debugger::GuiManager::registerView() const
 
 bool Debugger::GuiManager::isProjectSource(const PURL::Url &url) const
 {
-  return ( Main::projectManager().tqcontains(url) && !Main::projectManager().isExternalFile(url) );
+  return ( Main::projectManager().contains(url) && !Main::projectManager().isExternalFile(url) );
 }
 
 void Debugger::GuiManager::showDisassemblyLocation()

src/libgui/likeback.cpp

@@ -408,11 +408,11 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
 {
         TQString theVersion = (version.isEmpty() ? s_about->version() : version);
 
-        return theVersion.tqfind("alpha", /*index=*/0, /*caseSensitive=*/false) != -1 ||
+        return theVersion.find("alpha", /*index=*/0, /*caseSensitive=*/false) != -1 ||
-               theVersion.tqfind("beta",  /*index=*/0, /*caseSensitive=*/false) != -1 ||
+               theVersion.find("beta",  /*index=*/0, /*caseSensitive=*/false) != -1 ||
-               theVersion.tqfind("rc",    /*index=*/0, /*caseSensitive=*/false) != -1 ||
+               theVersion.find("rc",    /*index=*/0, /*caseSensitive=*/false) != -1 ||
-               theVersion.tqfind("svn",   /*index=*/0, /*caseSensitive=*/false) != -1 ||
+               theVersion.find("svn",   /*index=*/0, /*caseSensitive=*/false) != -1 ||
-               theVersion.tqfind("cvs",   /*index=*/0, /*caseSensitive=*/false) != -1;
+               theVersion.find("cvs",   /*index=*/0, /*caseSensitive=*/false) != -1;
 }
 
 void LikeBack::init(KConfig* config, KAboutData* about, Button buttons)

src/libgui/project_manager.cpp

@@ -189,7 +189,7 @@ void ProjectManager::View::contextMenu(TQListViewItem *item, const TQPoint &p, i
     } else {
       pop.insertTitle(i18n("Project"));
       pop.insertItem("configure", i18n("Options..."), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(configureProject()));
-      pop.insertItem("tqfind", i18n("Find Files..."),   TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(runKtqfind()));
+      pop.insertItem("find", i18n("Find Files..."),   TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(runKfind()));
       pop.insertSeparator();
       pop.insertItem("piklab_compile", i18n("Build Project"), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(buildProject()));
       pop.insertItem("trashcan_empty", i18n("Clean Project"), TQT_TQOBJECT(&Main::toplevel()), TQT_SLOT(cleanBuild()));
@@ -274,7 +274,7 @@ PURL::Url ProjectManager::View::standaloneGenerator(const PURL::Url &url, PURL::
 {
   TQMap<PURL::Url, ProjectData>::const_iterator it;
   for (it=_standaloneData.begin(); it!=_standaloneData.end(); ++it) {
-    if ( !it.data().externals.tqcontains(url) ) continue;
+    if ( !it.data().externals.contains(url) ) continue;
     if ( !it.key().exists() ) continue;
     type = it.data().type;
     return it.key();
@@ -315,7 +315,7 @@ void ProjectManager::View::insertFile(const PURL::Url &url)
     if ( copy==MessageBox::Cancel ) return;
     if ( copy==MessageBox::Yes ) purl = PURL::Url(_project->directory(), url.filename());
   }
-  if ( _project->absoluteFiles().tqcontains(purl) ) {
+  if ( _project->absoluteFiles().contains(purl) ) {
     MessageBox::detailedSorry(i18n("File is already in the project."), i18n("File: %1").tqarg(purl.pretty()), Log::Show);
     return;
   }
@@ -356,7 +356,7 @@ ProjectManager::View::ProjectData &ProjectManager::View::projectData()
 
 void ProjectManager::View::addFile(const PURL::Url &url, PURL::FileType type, FileOrigin origin)
 {
-  if ( tqcontains(url) ) return;
+  if ( contains(url) ) return;
   TQMap<PURL::Url, FileOrigin> &ext = projectData().externals;
   if ( type.data().group==PURL::LinkerScript && _linkerScriptItem ) {
     _linkerScriptItem->set(url);
@@ -551,7 +551,7 @@ bool ProjectManager::View::openProject(const PURL::Url &url)
 bool ProjectManager::View::isExternalFile(const PURL::Url &url) const
 {
   if ( projectUrl().isEmpty() ) return false;
-  return projectData().externals.tqcontains(url);
+  return projectData().externals.contains(url);
 }
 
 void ProjectManager::View::modified(const PURL::Url &url)

src/libgui/project_manager.h

@@ -44,7 +44,7 @@ public:
   void removeFile(const PURL::Url &url);
   void select(const Editor *e);
   void insertFile(const PURL::Url &url);
-  bool tqcontains(const PURL::Url &url) const { return findFileItem(url); }
+  bool contains(const PURL::Url &url) const { return findFileItem(url); }
   void addExternalFile(const PURL::Url &url, FileOrigin fileOrigin);
   bool isExternalFile(const PURL::Url &url) const;
   void removeExternalFiles();

src/libgui/toplevel.cpp

@@ -307,8 +307,8 @@ MainWindow::MainWindow()
     // tools
     (void)new KAction(i18n("&Pikloops..."), 0, 0,
                       TQT_TQOBJECT(this), TQT_SLOT(runPikloops()), actionCollection(), "tools_pikloops");
-    (void)new KAction(i18n("&Find Files..."), "tqfind", 0,
+    (void)new KAction(i18n("&Find Files..."), "find", 0,
-                      TQT_TQOBJECT(this), TQT_SLOT(runKtqfind()), actionCollection(), "tools_ktqfind");
+                      TQT_TQOBJECT(this), TQT_SLOT(runKfind()), actionCollection(), "tools_kfind");
     (void)new KAction(i18n("&Device Information..."), "info", 0,
                       TQT_TQOBJECT(this), TQT_SLOT(showDeviceInfo()), actionCollection(), "tools_device_information");
     (void)new KAction(i18n("&Config Generator..."), 0, 0,
@@ -595,7 +595,7 @@ void MainWindow::updateGUI()
   Main::action("show_disassembly_location")->setEnabled(Debugger::manager->coff()!=0 && (isSource || isHeader));
 
   // update project
-  bool inProject = ( Main::currentEditor() && (currentType==PURL::Nb_FileTypes || Main::currentEditor()->url().isEmpty() || Main::_projectManager->tqcontains(Main::currentEditor()->url())) );
+  bool inProject = ( Main::currentEditor() && (currentType==PURL::Nb_FileTypes || Main::currentEditor()->url().isEmpty() || Main::_projectManager->contains(Main::currentEditor()->url())) );
   if ( Main::project()==0 && !inProject ) {
     if ( Main::currentEditor()==0 ) Main::_projectManager->closeProject();
     else if ( isSource ) Main::_projectManager->setStandalone(Main::currentEditor()->url(), currentType);
@@ -637,7 +637,7 @@ void MainWindow::updateGUI()
   _programmertqStatus->widget()->setFont(f);
   bool isProgrammer = ( Main::programmerGroup().properties() & ::Programmer::Programmer );
   PURL::Url purl = Main::_projectManager->projectUrl();
-  bool hasHex = ( currentType==PURL::Hex || Main::_projectManager->tqcontains(purl.toFileType(PURL::Hex)) );
+  bool hasHex = ( currentType==PURL::Hex || Main::_projectManager->contains(purl.toFileType(PURL::Hex)) );
   Main::action("prog_connect")->setEnabled(isProgrammer && idle);
   Main::action("prog_read")->setEnabled(isProgrammer && idle);
   Main::action("prog_program")->setEnabled(isProgrammer && hasHex && idle);
@@ -702,17 +702,17 @@ void MainWindow::toggleToolView(TQWidget *widget)
   static_cast<KDockWidget *>(widget)->changeHideShowState();
 }
 
-void MainWindow::runKtqfind()
+void MainWindow::runKfind()
 {
   if (_kfindProcess) return;
   _kfindProcess = new ::Process::StringOutput;
   TQString path;
   PURL::Url url = Main::projectManager().projectUrl();
   if ( !url.isEmpty() ) path = url.path();
-  _kfindProcess->setup("ktqfind", path, false);
+  _kfindProcess->setup("kfind", path, false);
   connect(_kfindProcess, TQT_SIGNAL(done(int)), TQT_SLOT(kfindDone()));
   if ( !_kfindProcess->start(0) )
-    MessageBox::sorry(i18n("Could not run \"ktqfind\""), Log::Show);
+    MessageBox::sorry(i18n("Could not run \"kfind\""), Log::Show);
 }
 
 void MainWindow::kfindDone()
@@ -934,7 +934,7 @@ void MainWindow::program()
 {
   HexEditor *editor = getHexEditor();
   if ( editor==0 ) return;
-  if ( Main::programmerGroup().isDebugger() && !Main::_projectManager->tqcontains(editor->url()) ) {
+  if ( Main::programmerGroup().isDebugger() && !Main::_projectManager->contains(editor->url()) ) {
     MessageBox::sorry(i18n("It is not possible to start a debugging session with an hex file not generated with the current project."), Log::Show);
     return;
   }

src/libgui/toplevel.h

@@ -42,7 +42,7 @@ public slots:
   void configureProject();
   void showDeviceInfo();
   void runPikloops();
-  void runKtqfind();
+  void runKfind();
   void configGenerator();
   void templateGenerator();
   void updateGUI();

src/piklab-prog/cli_interactive.cpp

@@ -158,7 +158,7 @@ CLI::ExitCode CLI::Interactive::processLine(const TQString &s)
         if ( !ok ) return errorExit(i18n("Number format not recognized."), ARG_ERROR);
         PURL::Url dummy;
         Breakpoint::Data data(dummy, address);
-        if ( Breakpoint::list().tqcontains(data) ) return okExit(i18n("Breakpoint already set at %1.").tqarg(toHexLabel(address, nbChars(NumberBase::Hex, address))));
+        if ( Breakpoint::list().contains(data) ) return okExit(i18n("Breakpoint already set at %1.").tqarg(toHexLabel(address, nbChars(NumberBase::Hex, address))));
         Breakpoint::list().append(data);
         Breakpoint::list().setAddress(data, address);
         Breakpoint::list().setState(data, Breakpoint::Active);
@@ -279,7 +279,7 @@ Address CLI::Interactive::findRegisterAddress(const TQString &name)
   for (uint i=0; i<uint(sfrs.count()); i++) if ( name.lower()==sfrs[i].label().lower() ) return sfrs[i].data().address();
   if ( coff==0 ) return Address();
   TQMap<TQString, Address> variables = coff->variables();
-  if ( variables.tqcontains(name) ) return variables[name];
+  if ( variables.contains(name) ) return variables[name];
   return Address();
 }
 

src/piklab-prog/cmdline.cpp

@@ -332,7 +332,7 @@ CLI::ExitCode CLI::Main::checkProgrammer()
   if ( !_hardware.isEmpty() ) {
     ::Hardware::Config *config = _progGroup->hardwareConfig();
     Port::Description pd = static_cast<Programmer::CliManager *>(Programmer::manager)->portDescription();
-    bool ok = (config==0 || config->hardwareNames(pd.type).tqcontains(_hardware));
+    bool ok = (config==0 || config->hardwareNames(pd.type).contains(_hardware));
     delete config;
     if ( !ok ) return errorExit(i18n("The selected programmer does not supported the specified hardware configuration (\"%1\").").tqarg(_hardware), NOT_SUPPORTED_ERROR);
   }

src/piklab-test/base/generator_check.h

@@ -25,7 +25,7 @@ public:
   virtual void initSupported() = 0;
   virtual bool init(const Device::Data &data) = 0;
   void cleanup();
-  bool isSupported(const Device::Data &data) const { return _supported.tqcontains(&data); }
+  bool isSupported(const Device::Data &data) const { return _supported.contains(&data); }
   virtual PURL::FileType sourceFileType() const = 0;
   const Tool::SourceGenerator *generator() const { return _generator; }
   virtual SourceLine::List configEndLines() const = 0;

src/piklab-test/checksum/checksum_check.cpp

@@ -56,7 +56,7 @@ bool ChecksumCheck::checkChecksum(BitValue checksum, const TQString &label)
 
 void ChecksumCheck::checkChecksum(const Pic::Data &pdata, const TQString &maskName, const TQString &valueName, bool &ok)
 {
-  if ( !pdata.checksums().tqcontains(valueName) ) {
+  if ( !pdata.checksums().contains(valueName) ) {
     const Pic::Config::Mask *tqmask = pdata.config().findMask(maskName);
     TQString label = valueName + (tqmask ? "/" + tqmask->name : TQString());
     printf("Missing checksum for \"%s\"", label.latin1());

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);
   }

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());
 }

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()));

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;

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) );
+  Q_ASSERT( contains(data) );
-  _list.remove(tqfind(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) );
+  Q_ASSERT( contains(data) );
-  (*tqfind(data)).state = state;
+  (*find(data)).state = state;
   delayedChanged();
 }
 
 void Breakpoint::List::setAddress(const Data &data, Address address)
 {
-  Q_ASSERT( tqcontains(data) );
+  Q_ASSERT( contains(data) );
-  (*tqfind(data)).address = address;
+  (*find(data)).address = address;
   delayedChanged();
 }

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(); }
+  bool contains(const Data &data) const { return find(data)!=_list.end(); }
-  State state(const Data &data) const { return (*tqfind(data)).state; }
+  State state(const Data &data) const { return (*find(data)).state; }
-  Address address(const Data &data) const { return (*tqfind(data)).address; }
+  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>::const_iterator find(const Data &data) const;
-  TQValueList<StateData>::iterator tqfind(const Data &data);
+  TQValueList<StateData>::iterator find(const Data &data);
 };
 
 } // namespace

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);

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;
     }

src/tools/ccsc/ccsc.cpp

@@ -100,7 +100,7 @@ VersionData CCSC::Group::getToolchainVersion()
 {
   if ( !Compile::Config::withWine(*this) ) {
     TQStringList lines;
-    if ( checkExecutable(Tool::Category::Compiler, lines) && lines.count()>=1 && lines[0].tqcontains("3.") ) return VersionData(3, 0, 0);
+    if ( checkExecutable(Tool::Category::Compiler, lines) && lines.count()>=1 && lines[0].contains("3.") ) return VersionData(3, 0, 0);
   }
   return VersionData(4, 0, 0); // default
 }

src/tools/gui/toolchain_config_center.cpp

@@ -57,7 +57,7 @@ ToolchainsConfigCenter::ToolchainsConfigCenter(const Tool::Group &sgroup, TQWidg
 
 void ToolchainsConfigCenter::aboutToShowPageSlot(TQWidget *page)
 {
-  if ( !_pages.tqcontains(page) ) _infoButton->hide();
+  if ( !_pages.contains(page) ) _infoButton->hide();
   else {
     _infoButton->show();
     TQTimer::singleShot(0, _pages[page], TQT_SLOT(detect()));

src/tools/jal/jal.cpp

@@ -20,7 +20,7 @@ bool JAL::Base::checkExecutableResult(bool, TQStringList &lines) const
 {
   TQStringList tmp;
   for (uint i=0; i<lines.count(); i++)
-    if ( !lines[i].tqcontains('\r') ) tmp += lines[i]; // ??
+    if ( !lines[i].contains('\r') ) tmp += lines[i]; // ??
   lines = tmp;
   return ( lines.count()>0 && lines[0].startsWith("jal") );
 }

src/tools/jal/jal_compile.cpp

@@ -10,7 +10,7 @@
 
 void JAL::CompileFile::logStderrLine(const TQString &line)
 {
-  if ( line.tqcontains('\r') ) return; // what are those lines ?
+  if ( line.contains('\r') ) return; // what are those lines ?
   // #### TODO
   doLog(Log::LineType::Normal, line, TQString(), 0); // unrecognized
 }

src/tools/jalv2/jalv2.cpp

@@ -20,7 +20,7 @@ bool JALV2::Base::checkExecutableResult(bool, TQStringList &lines) const
 {
   TQStringList tmp;
   for (uint i=0; i<lines.count(); i++)
-    if ( !lines[i].tqcontains('\r') ) tmp += lines[i]; // ??
+    if ( !lines[i].contains('\r') ) tmp += lines[i]; // ??
   lines = tmp;
   return ( lines.count()>0 && lines[0].startsWith("jal") );
 }

src/tools/list/compile_process.cpp

@@ -93,7 +93,7 @@ void Compile::LogWidget::appendLine(Log::DebugLevel level, const TQString &messa
 
 void Compile::LogWidget::lineClicked(int line)
 {
-  if ( !_map.tqcontains(line) ) return;
+  if ( !_map.contains(line) ) return;
   PURL::Url url = PURL::Url::fromPathOrUrl(_map[line].filepath);
   TextEditor *e = ::tqqt_cast<TextEditor *>(Main::editorManager().openEditor(url));
   if ( e==0 ) return;
@@ -230,7 +230,7 @@ Compile::FileData::List Compile::Process::files(bool *ok) const
 
 bool Compile::Process::checkIs(const TQString &s, const TQString &key)
 {
-  if ( !s.tqcontains(key) ) return false;
+  if ( !s.contains(key) ) return false;
   if ( s!=key ) qWarning("Argument should be only %s, the rest will be ignored...", key.latin1());
   return true;
 }
@@ -250,9 +250,9 @@ TQStringList Compile::Process::arguments() const
   PURL::Url lkr = Main::toolGroup().linkerScript(_data.project, _data.linkType);
   TQStringList nargs;
   for (uint i=0; i<args.count(); i++) {
-    if ( args[i].tqcontains("$(SRCPATH)") ) {
+    if ( args[i].contains("$(SRCPATH)") ) {
-      args[i].tqreplace("$(SRCPATH)", directory().path());
+      args[i].replace("$(SRCPATH)", directory().path());
-      args[i].tqreplace("//", "/");
+      args[i].replace("//", "/");
     }
     args[i] = replaceIf(args[i], "WINE", withWine);
     args[i] = replaceIf(args[i], "LKR", hasLinkerScript());
@@ -270,19 +270,19 @@ TQStringList Compile::Process::arguments() const
       if (_data.project) nargs += _data.project->librariesForLinker(TQString(), withWine);
       continue;
     }
-    args[i].tqreplace("%OBJECT", filepath(PURL::Object)); // before %O
+    args[i].replace("%OBJECT", filepath(PURL::Object)); // before %O
-    args[i].tqreplace("%O", outputFilepath());
+    args[i].replace("%O", outputFilepath());
-    args[i].tqreplace("%COFF", filepath(PURL::Coff));
+    args[i].replace("%COFF", filepath(PURL::Coff));
-    if (_data.project) args[i].tqreplace("%PROJECT", _data.project->name());
+    if (_data.project) args[i].replace("%PROJECT", _data.project->name());
-    else  args[i].tqreplace("%PROJECT", url().basename());
+    else  args[i].replace("%PROJECT", url().basename());
-    args[i].tqreplace("%MAP", filepath(PURL::Map));
+    args[i].replace("%MAP", filepath(PURL::Map));
-    args[i].tqreplace("%SYM", url().toExtension("sym").relativeTo(directory(), withWine ? PURL::WindowsSeparator : PURL::UnixSeparator));
+    args[i].replace("%SYM", url().toExtension("sym").relativeTo(directory(), withWine ? PURL::WindowsSeparator : PURL::UnixSeparator));
-    args[i].tqreplace("%LIST", filepath(PURL::Lst));
+    args[i].replace("%LIST", filepath(PURL::Lst));
-    args[i].tqreplace("%DEVICE", deviceName());
+    args[i].replace("%DEVICE", deviceName());
-    args[i].tqreplace("%FAMILY", familyName());
+    args[i].replace("%FAMILY", familyName());
-    args[i].tqreplace("%LKR_PATH", lkr.path()); // before %LKR
+    args[i].replace("%LKR_PATH", lkr.path()); // before %LKR
-    args[i].tqreplace("%LKR_NAME", lkr.filename()); // before LKR
+    args[i].replace("%LKR_NAME", lkr.filename()); // before LKR
-    args[i].tqreplace("%LKR", lkr.filepath());
+    args[i].replace("%LKR", lkr.filepath());
     if ( checkIs(args[i], "%I") ) {
       for (uint k=0; k<nbFiles(); k++) nargs += inputFilepath(k);
       continue;

src/tools/list/tools_config_widget.cpp

@@ -97,7 +97,7 @@ void ToolsConfigWidget::toolChanged()
     FOR_EACH(Tool::Category, k) {
       _tabWidget->removePage(_stacks[k]->widget());
       _stacks[k]->widget()->hide();
-      if ( _stacks[k]->tqcontains(name) ) {
+      if ( _stacks[k]->contains(name) ) {
         _stacks[k]->setCurrentItem(name);
         _stacks[k]->widget()->show();
         _tabWidget->addTab(_stacks[k]->widget(), i18n(k.data().title));
@@ -131,7 +131,7 @@ void ToolsConfigWidget::saveConfig()
   _project->setOutputType(_output->currentItem());
   Compile::Config::setCustomCommands(_project, _commandsEditor->texts());
   FOR_EACH(Tool::Category, k) {
-    if ( !_stacks[k]->tqcontains(name) ) continue;
+    if ( !_stacks[k]->contains(name) ) continue;
     TQWidget *w = _stacks[k]->item(name);
     static_cast<ToolConfigWidget *>(w)->saveConfig();
   }

src/tools/pic30/pic30.cpp

@@ -49,7 +49,7 @@ bool PIC30::Base::checkExecutableResult(bool, TQStringList &lines) const
     case Tool::Category::Compiler:  return lines[0].startsWith("pic30");
     case Tool::Category::Assembler: return lines[0].startsWith("GNU assembler");
     case Tool::Category::Linker:    return lines[0].startsWith("GNU ld");
-    case Tool::Category::BinToHex:  return lines.join(" ").tqcontains("Microchip ");
+    case Tool::Category::BinToHex:  return lines.join(" ").contains("Microchip ");
     case Tool::Category::Librarian: return lines[0].startsWith("GNU ar");
     case Tool::Category::Nb_Types:  break;
   }

src/tools/picc/picc.cpp

@@ -19,7 +19,7 @@
 //----------------------------------------------------------------------------
 bool PICC::Base::checkExecutableResult(bool, TQStringList &lines) const
 {
-  return lines.join(" ").tqcontains("HI-TECH");
+  return lines.join(" ").contains("HI-TECH");
 }
 
 TQString PICC::BaseLite::baseExecutable(bool, Tool::OutputExecutableType) const

src/xml_to_data/device_xml_to_data.cpp

@@ -84,7 +84,7 @@ void Device::XmlToDataBase::processDevice(TQDomElement device)
 {
   TQString name = device.attribute("name").upper();
   if ( name.isEmpty() ) qFatal("Device has no name");
-  if ( _map.tqcontains(name) ) qFatal(TQString("Device \"%1\" already defined").tqarg(name));
+  if ( _map.contains(name) ) qFatal(TQString("Device \"%1\" already defined").tqarg(name));
   _data = createData();
   _map[name] = _data;
   _data->_name = name;
@@ -137,7 +137,7 @@ void Device::XmlToDataBase::processDevice(TQDomElement device)
   else {
     TQRegExp rexp("\\d{6}");
     if ( !rexp.exactMatch(_data->_documents.webpage) ) qFatal(TQString("Malformed webpage \"%1\" (6 digits)").tqarg(_data->_documents.webpage));
-    if ( _documents.tqcontains(_data->_documents.webpage) )
+    if ( _documents.contains(_data->_documents.webpage) )
       qFatal(TQString("webpage duplicated (already used for %1)").tqarg(_documents[_data->_documents.webpage]));
     _documents[_data->_documents.webpage] = name;
   }
@@ -165,7 +165,7 @@ void Device::XmlToDataBase::processDevice(TQDomElement device)
       if ( p.pins[i].isEmpty() || p.pins[i]=="N/C" ) continue;
       TQStringList labels = TQStringList::split("/", p.pins[i]);
       for(uint k=0; k<uint(labels.count()); k++) {
-        if ( pinLabels.tqcontains(labels[k]) ) pinLabels[labels[k]]++;
+        if ( pinLabels.contains(labels[k]) ) pinLabels[labels[k]]++;
         else pinLabels[labels[k]] = 1;
       }
     }
@@ -225,7 +225,7 @@ Device::Package Device::XmlToDataBase::processPackage(TQDomElement element)
       TQString name = pin.attribute("name");
       if ( !name.isEmpty() && name!="N/C" ) {
         TQStringList labels = TQStringList::split("/", name);
-        if ( name.tqcontains(" ") || labels.count()==0 ) qFatal("Malformed pin name");
+        if ( name.contains(" ") || labels.count()==0 ) qFatal("Malformed pin name");
         if ( name!=name.upper() ) qFatal("Pin name should be uppercase");
       }
       package.pins[i-1] = name;
@@ -255,6 +255,6 @@ void Device::XmlToDataBase::parse()
   for (; ait!=_alternatives.end(); ++ait) {
     TQStringList::const_iterator lit = ait.data().begin();
     for (; lit!=ait.data().end(); ++lit)
-      if ( !_map.tqcontains(*lit) ) qFatal(TQString("Unknown alternative %1 for device %2").tqarg((*lit)).tqarg(ait.key()));
+      if ( !_map.contains(*lit) ) qFatal(TQString("Unknown alternative %1 for device %2").tqarg((*lit)).tqarg(ait.key()));
   }
 }

src/xml_to_data/prog_xml_to_data.h

@@ -28,7 +28,7 @@ protected:
   TQString _basename, _namespace;
   virtual bool hasFamilies() const { return true; }
   const TQStringList &families() const { return _families; }
-  virtual uint familyIndex(const TQString &family) const { return _families.tqfindIndex(family); }
+  virtual uint familyIndex(const TQString &family) const { return _families.findIndex(family); }
   virtual void parseData(TQDomElement, Data &) = 0;
   virtual void includes(TQTextStream &) const {}
   virtual void outputData(const Data &, TQTextStream &) const {}
@@ -36,7 +36,7 @@ protected:
   virtual TQString currentDevice() const { return _current; }
   virtual void parseDevice(TQDomElement element);
   ::Group::Support extractSupport(const TQString &s) const;
-  bool hasDevice(const TQString &device) const { return _map.tqcontains(device); }
+  bool hasDevice(const TQString &device) const { return _map.contains(device); }
   virtual void parse();
 
 protected:
@@ -69,12 +69,12 @@ void ExtXmlToData<Data>::parseDevice(TQDomElement element)
   if ( element.nodeName()!="device" ) qFatal("Root node child should be named \"device\"");
   _current = element.attribute("name").upper();
   if ( Device::lister().data(_current)==0 ) qFatal(TQString("Device name \"%1\" unknown").tqarg(_current));
-  if ( _map.tqcontains(_current) ) qFatal(TQString("Device \"%1\" already parsed").tqarg(_current));
+  if ( _map.contains(_current) ) qFatal(TQString("Device \"%1\" already parsed").tqarg(_current));
   PData data;
   if ( hasFamilies() ) {
     TQString family = element.attribute("family");
     if ( family.isEmpty() ) qFatal(TQString("Family is empty").tqarg(family));
-    if ( _families.tqfind(family)==_families.end() ) _families.append(family);
+    if ( _families.find(family)==_families.end() ) _families.append(family);
     data.family = familyIndex(family);
   }
   data.support = extractSupport(element.attribute("support_type"));

src/xml_to_data/xml_to_data.cpp

@@ -34,7 +34,7 @@ void XmlToData::checkTagNames(TQDomElement element, const TQString &tag,
   for (uint i=0; i<uint(list.count()); i++) {
     if ( !list.item(i).isElement() ) continue;
     TQString name = list.item(i).toElement().attribute("name");
-    if ( names.tqfind(name)==names.end() ) qFatal(TQString("Illegal name %1 for %2 element").tqarg(name).tqarg(tag));
+    if ( names.find(name)==names.end() ) qFatal(TQString("Illegal name %1 for %2 element").tqarg(name).tqarg(tag));
   }
 }
 

test/pic30/standalone_test.s

@@ -9,7 +9,7 @@ hello:
          .text
          .global __reset
 __reset:
-         ; set PSVPAG to page that tqcontains 'hello'
+         ; set PSVPAG to page that contains 'hello'
          mov     #psvpage(hello),w0
          mov     w0,PSVPAG
          ; enable Program Space Visibility

test/pic30/test.s

@@ -9,7 +9,7 @@ hello:
          .text
          .global __reset
 __reset:
-         ; set PSVPAG to page that tqcontains 'hello'
+         ; set PSVPAG to page that contains 'hello'
          mov     #psvpage(hello),w0
          mov     w0,PSVPAG
          ; enable Program Space Visibility