diff options
Diffstat (limited to 'src/coff')
| -rw-r--r-- | src/coff/base/coff_archive.cpp | 6 | ||||
| -rw-r--r-- | src/coff/base/coff_object.cpp | 2 | ||||
| -rw-r--r-- | src/coff/base/coff_object.h | 2 | ||||
| -rw-r--r-- | src/coff/base/text_coff.cpp | 12 | ||||
| -rw-r--r-- | src/coff/xml/xml_coff_parser.cpp | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/coff/base/coff_archive.cpp b/src/coff/base/coff_archive.cpp index ea9a2b9..abf48af 100644 --- a/src/coff/base/coff_archive.cpp +++ b/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; } diff --git a/src/coff/base/coff_object.cpp b/src/coff/base/coff_object.cpp index 6a1a17a..6a9a182 100644 --- a/src/coff/base/coff_object.cpp +++ b/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); } diff --git a/src/coff/base/coff_object.h b/src/coff/base/coff_object.h index fccb744..f6c23bf 100644 --- a/src/coff/base/coff_object.h +++ b/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; } diff --git a/src/coff/base/text_coff.cpp b/src/coff/base/text_coff.cpp index 1a749fe..52dd503 100644 --- a/src/coff/base/text_coff.cpp +++ b/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; } diff --git a/src/coff/xml/xml_coff_parser.cpp b/src/coff/xml/xml_coff_parser.cpp index 460df7d..556cdb0 100644 --- a/src/coff/xml/xml_coff_parser.cpp +++ b/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; } |