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/xml_to_data/xml_to_data.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'src/xml_to_data/xml_to_data.h') diff --git a/src/xml_to_data/xml_to_data.h b/src/xml_to_data/xml_to_data.h index bd7e166..5ba4290 100644 --- a/src/xml_to_data/xml_to_data.h +++ b/src/xml_to_data/xml_to_data.h @@ -10,12 +10,8 @@ #define XML_TO_DATA_H #include "common/global/global.h" -#if QT_VERSION<0x040000 -# include -#else -# include -#endif -#include +# include +#include class XmlToData { @@ -27,13 +23,13 @@ public: protected: virtual void parse() = 0; virtual void output() = 0; - virtual QString currentDevice() const = 0; - virtual void warning(const QString &message) const; - virtual void qFatal(const QString &message) const; - QDomElement findUniqueElement(QDomElement parent, const QString &nodeName, - const QString &attribute, const QString &value) const; - void checkTagNames(QDomElement element, const QString &tag, const QStringList &names) const; - QDomDocument parseFile(const QString &filename) const; + virtual TQString currentDevice() const = 0; + virtual void warning(const TQString &message) const; + virtual void qFatal(const TQString &message) const; + TQDomElement findUniqueElement(TQDomElement tqparent, const TQString &nodeName, + const TQString &attribute, const TQString &value) const; + void checkTagNames(TQDomElement element, const TQString &tag, const TQStringList &names) const; + TQDomDocument parseFile(const TQString &filename) const; }; #define XML_MAIN(_type) \ -- cgit v1.2.3