diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-19 12:03:49 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-21 13:21:22 (GMT) |
commit | 9317e521f0b0f689c87b95b927102dbf55edb89f (patch) | |
tree | a49c2aa5eda50f84796e327db0416654832c9a5d /src | |
parent | 4278109e1f6cca83e687977db55b193ef4f7fcd7 (diff) | |
download | Qt-9317e521f0b0f689c87b95b927102dbf55edb89f.zip Qt-9317e521f0b0f689c87b95b927102dbf55edb89f.tar.gz Qt-9317e521f0b0f689c87b95b927102dbf55edb89f.tar.bz2 |
Fix compilation with xlC 7: the compiler tries to expand qIsForwardIteratorEnd with QString
This is used in other places too, so move the definition to the
header.
Reviewed-By: Trust Me
Diffstat (limited to 'src')
-rw-r--r-- | src/xmlpatterns/api/qabstractxmlforwarditerator_p.h | 15 | ||||
-rw-r--r-- | src/xmlpatterns/functions/qsequencegeneratingfns.cpp | 13 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h index d3188d3..b4eefeb 100644 --- a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h +++ b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h @@ -55,7 +55,7 @@ #include <QtCore/QList> #include <QtCore/QVector> #include <QtCore/QSharedData> - +#include <QtCore/QString> QT_BEGIN_HEADER @@ -74,6 +74,19 @@ inline bool qIsForwardIteratorEnd(const T &unit) return !unit; } +/** + * @short Helper class for StringSplitter + * + * Needed by the QAbstractXmlForwardIterator sub-class. + * + * @relates StringSplitter + */ +template<> +inline bool qIsForwardIteratorEnd(const QString &unit) +{ + return unit.isNull(); +} + template<typename T> class QAbstractXmlForwardIterator; class QAbstractXmlForwardIteratorPrivate; diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp index 81724f8..e3f30c5 100644 --- a/src/xmlpatterns/functions/qsequencegeneratingfns.cpp +++ b/src/xmlpatterns/functions/qsequencegeneratingfns.cpp @@ -69,19 +69,6 @@ Item IdFN::mapToItem(const QString &id, } /** - * @short Helper class for StringSplitter - * - * Needed by the QAbstractXmlForwardIterator sub-class. - * - * @relates StringSplitter - */ -template<> -bool qIsForwardIteratorEnd(const QString &unit) -{ - return unit.isNull(); -} - -/** * @short Helper class for IdFN. * * StringSplitter takes an Iterator which delivers strings of this kind: |