From 0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 30 Jun 2011 00:15:53 +0000 Subject: TQt4 port piklab This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1238822 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/devices/mem24/xml/mem24_xml_to_data.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/devices/mem24/xml') diff --git a/src/devices/mem24/xml/mem24_xml_to_data.cpp b/src/devices/mem24/xml/mem24_xml_to_data.cpp index 734ebca..d38d669 100644 --- a/src/devices/mem24/xml/mem24_xml_to_data.cpp +++ b/src/devices/mem24/xml/mem24_xml_to_data.cpp @@ -6,8 +6,8 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ -#include -#include +#include +#include #include "xml_to_data/device_xml_to_data.h" #include "common/common/misc.h" @@ -21,13 +21,13 @@ class XmlToData : public Device::XmlToData private: virtual uint nbOutputFiles(uint) const { return 1; } virtual bool isIncluded(uint, uint) const { return true; } - virtual QString namespaceName() const { return "Mem24"; } + virtual TQString namespaceName() const { return "Mem24"; } -virtual void processDevice(QDomElement device) +virtual void processDevice(TQDomElement device) { Device::XmlToDataBase::processDevice(device); - QDomElement e = findUniqueElement(device, "memory", "name", QString::null); + TQDomElement e = findUniqueElement(device, "memory", "name", TQString()); bool ok; data()->_nbBytes = fromHexLabel(e.attribute("size"), &ok); if ( !ok ) qFatal("Missing or invalid size"); @@ -38,18 +38,18 @@ virtual void processDevice(QDomElement device) data()->_nbBytesPage = e.attribute("page_size").toUInt(&ok); if ( !ok || data()->_nbBytesPage==0 ) qFatal("Missing, zero, or invalid page_size"); if ( ((data()->_nbBytes/data()->_nbBlocks) % data()->_nbBytesPage)!=0 ) qFatal("page_size should divide size/nb_blocks"); - QStringList names; - names.append(QString::null); + TQStringList names; + names.append(TQString()); checkTagNames(device, "memory", names); } -virtual void checkPins(const QMap &pinLabels) const +virtual void checkPins(const TQMap &pinLabels) const { - if ( !pinLabels.contains("VCC") ) qFatal("No VDD pin specified"); - if ( !pinLabels.contains("VSS") ) qFatal("No VSS pin specified"); - QMap::const_iterator it; + if ( !pinLabels.tqcontains("VCC") ) qFatal("No VDD pin specified"); + if ( !pinLabels.tqcontains("VSS") ) qFatal("No VSS pin specified"); + TQMap::const_iterator it; for (it=pinLabels.begin(); it!=pinLabels.end(); ++it) - if ( it.data()!=1 ) qFatal(QString("Duplicated pin %1").arg(it.key())); + if ( it.data()!=1 ) qFatal(TQString("Duplicated pin %1").tqarg(it.key())); } }; // class -- cgit v1.2.1