diff options
| author | Xizhi Zhu <xizhi.zhu@nokia.com> | 2011-10-17 11:13:07 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-19 09:02:39 +0200 |
| commit | 9825975ced4228b3d27e41e4713688e115e1a5d5 (patch) | |
| tree | 2bb5239081386a60d2328e840bde5fd867823941 /src/contacts/qcontactfilter_p.h | |
| parent | 673ca792f514ab2589761fa23514a1dc3de9bf32 (diff) | |
Finalize namespace.
Change-Id: I2b54571b2befa8120049422aa8034e8ba1e98ea8
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
Diffstat (limited to 'src/contacts/qcontactfilter_p.h')
| -rw-r--r-- | src/contacts/qcontactfilter_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/contacts/qcontactfilter_p.h b/src/contacts/qcontactfilter_p.h index e431e576f..aef85809d 100644 --- a/src/contacts/qcontactfilter_p.h +++ b/src/contacts/qcontactfilter_p.h @@ -78,7 +78,7 @@ d_ptr = new Class##Private; \ } -QTPIM_BEGIN_NAMESPACE +QTCONTACTS_BEGIN_NAMESPACE class QContactFilterPrivate : public QSharedData { public: @@ -103,19 +103,19 @@ public: /* Helper functions for C++ protection rules */ static const QSharedDataPointer<QContactFilterPrivate>& extract_d(const QContactFilter& other) {return other.d_ptr;} }; -QTPIM_END_NAMESPACE +QTCONTACTS_END_NAMESPACE QT_BEGIN_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<> QTPIM_PREPEND_NAMESPACE(QContactFilterPrivate) *QSharedDataPointer<QTPIM_PREPEND_NAMESPACE(QContactFilterPrivate)>::clone() +template<> QTCONTACTS_PREPEND_NAMESPACE(QContactFilterPrivate) *QSharedDataPointer<QTCONTACTS_PREPEND_NAMESPACE(QContactFilterPrivate)>::clone() { return d->clone(); } #else -template<> QTPIM_PREPEND_NAMESPACE(QContactFilterPrivate) *QSharedDataPointer<QTPIM_PREPEND_NAMESPACE(QContactFilterPrivate)>::clone(); +template<> QTCONTACTS_PREPEND_NAMESPACE(QContactFilterPrivate) *QSharedDataPointer<QTCONTACTS_PREPEND_NAMESPACE(QContactFilterPrivate)>::clone(); #endif QT_END_NAMESPACE |