diff options
author | Alex <qt-info@nokia.com> | 2009-11-18 13:50:37 +1000 |
---|---|---|
committer | Alex <qt-info@nokia.com> | 2009-11-18 13:50:37 +1000 |
commit | 9552f1de874a8fbc28f9370fa0c606da1a55cb67 (patch) | |
tree | 9e5f86d3e10ef2850692c608b37d360b4c2806bc /src/contacts/qcontactfilter_p.h | |
parent | 143a2148d95ecfa037739b9e19c6909e412779c0 (diff) |
adding QtMobility namespace (#1)
Diffstat (limited to 'src/contacts/qcontactfilter_p.h')
-rw-r--r-- | src/contacts/qcontactfilter_p.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/contacts/qcontactfilter_p.h b/src/contacts/qcontactfilter_p.h index 59965a7d0d..6a65f3aaa7 100644 --- a/src/contacts/qcontactfilter_p.h +++ b/src/contacts/qcontactfilter_p.h @@ -56,6 +56,7 @@ #include "qcontactfilter.h" #include <QSharedData> + /* Boiler plate code */ #define Q_IMPLEMENT_CONTACTFILTER_PRIVATE(Class) \ Class##Private* Class::d_func() { return reinterpret_cast<Class##Private *>(d_ptr.data()); } \ @@ -73,6 +74,7 @@ d_ptr = new Class##Private; \ } +QTM_BEGIN_NAMESPACE class QContactFilterPrivate : public QSharedData { public: @@ -91,17 +93,19 @@ public: /* Helper functions for C++ protection rules */ static const QSharedDataPointer<QContactFilterPrivate>& extract_d(const QContactFilter& other) {return other.d_ptr;} }; +QTM_END_NAMESPACE #if defined(Q_CC_MWERKS) // This results in multiple symbol definition errors on all other compilers // but not having a definition here results in an attempt to use the unspecialized // clone (which fails because of the pure virtuals above) -template<> QContactFilterPrivate *QSharedDataPointer<QContactFilterPrivate>::clone() +template<> QTM_PREPEND_NAMESPACE(QContactFilterPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QContactFilterPrivate)>::clone() { return d->clone(); } #else -template<> QContactFilterPrivate *QSharedDataPointer<QContactFilterPrivate>::clone(); +template<> QTM_PREPEND_NAMESPACE(QContactFilterPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QContactFilterPrivate)>::clone(); #endif + #endif |