diff options
Diffstat (limited to 'src/xml_to_data/prog_xml_to_data.h')
-rw-r--r-- | src/xml_to_data/prog_xml_to_data.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xml_to_data/prog_xml_to_data.h b/src/xml_to_data/prog_xml_to_data.h index 6eea337..e45e6e1 100644 --- a/src/xml_to_data/prog_xml_to_data.h +++ b/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")); |