diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-05-15 15:52:26 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-16 00:29:38 +0200 |
commit | bd307f397d2bc53f656e999da68c95917d714841 (patch) | |
tree | f5a5754228542a3d444447baccc7937900e49b53 /src/xmlpatterns/expr | |
parent | 1fe2de8ffff20c5ed037da73650fff546bd722e0 (diff) | |
download | qtxmlpatterns-bd307f397d2bc53f656e999da68c95917d714841.tar.gz |
Fixed -qtnamespace compilation issues.
Forward declaration of classes should come after QT_BEGIN_NAMESPACE, if
the declared classes are expected to be inside the qtnamespace.
Change-Id: Ifa7f2cbcd5ea9f5a0b2ade267c76d9e5e04d105a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'src/xmlpatterns/expr')
-rw-r--r-- | src/xmlpatterns/expr/qcalltargetdescription_p.h | 6 | ||||
-rw-r--r-- | src/xmlpatterns/expr/quserfunction_p.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/xmlpatterns/expr/qcalltargetdescription_p.h b/src/xmlpatterns/expr/qcalltargetdescription_p.h index 1922ea5..8cf03b3 100644 --- a/src/xmlpatterns/expr/qcalltargetdescription_p.h +++ b/src/xmlpatterns/expr/qcalltargetdescription_p.h @@ -52,9 +52,6 @@ #ifndef Patternist_CallTargetDescription_H #define Patternist_CallTargetDescription_H -template<typename Key, typename Value> class QHash; -template<typename T> class QList; - #include <QSharedData> #include <private/qexpression_p.h> @@ -63,6 +60,9 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +template<typename Key, typename Value> class QHash; +template<typename T> class QList; + namespace QPatternist { class CallSite; diff --git a/src/xmlpatterns/expr/quserfunction_p.h b/src/xmlpatterns/expr/quserfunction_p.h index c7281e4..eaa0895 100644 --- a/src/xmlpatterns/expr/quserfunction_p.h +++ b/src/xmlpatterns/expr/quserfunction_p.h @@ -52,8 +52,6 @@ #ifndef Patternist_UserFunction_H #define Patternist_UserFunction_H -template<typename T> class QList; - #include <QSharedData> #include <private/qexpression_p.h> @@ -64,6 +62,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +template<typename T> class QList; + namespace QPatternist { /** |