diff options
Diffstat (limited to 'src/gallery/tracker')
17 files changed, 38 insertions, 38 deletions
diff --git a/src/gallery/tracker/qdocumentgallery_tracker.cpp b/src/gallery/tracker/qdocumentgallery_tracker.cpp index 8d4d120..bcc4980 100644 --- a/src/gallery/tracker/qdocumentgallery_tracker.cpp +++ b/src/gallery/tracker/qdocumentgallery_tracker.cpp @@ -79,7 +79,7 @@ Q_DECLARE_METATYPE(QVector<QStringList>) Q_DECLARE_METATYPE(QGalleryTrackerGraphUpdate) Q_DECLARE_METATYPE(QVector<QGalleryTrackerGraphUpdate>) -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QDocumentGalleryPrivate : public QAbstractGalleryPrivate, public QGalleryDBusInterfaceFactory { @@ -368,4 +368,4 @@ QGalleryAbstractResponse *QDocumentGallery::createResponse(QGalleryAbstractReque } } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/tracker/qgallerydbusinterface_p.h b/src/gallery/tracker/qgallerydbusinterface_p.h index 76f276c..c143b0a 100644 --- a/src/gallery/tracker/qgallerydbusinterface_p.h +++ b/src/gallery/tracker/qgallerydbusinterface_p.h @@ -66,7 +66,7 @@ struct QGalleryTrackerGraphUpdate int object; }; -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryDBusInterface : public QDBusAbstractInterface, public QSharedData { @@ -112,6 +112,6 @@ public: virtual QGalleryDBusInterfacePointer statisticsInterface() = 0; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/tracker/qgallerytrackerchangenotifier.cpp b/src/gallery/tracker/qgallerytrackerchangenotifier.cpp index 0a48e56..460385e 100644 --- a/src/gallery/tracker/qgallerytrackerchangenotifier.cpp +++ b/src/gallery/tracker/qgallerytrackerchangenotifier.cpp @@ -44,7 +44,7 @@ #include "qgallerytrackerschema_p.h" #include <QtCore/qdebug.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE QGalleryTrackerChangeNotifier::QGalleryTrackerChangeNotifier( const QString &service, @@ -79,4 +79,4 @@ void QGalleryTrackerChangeNotifier::graphUpdated( } } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/tracker/qgallerytrackerchangenotifier_p.h b/src/gallery/tracker/qgallerytrackerchangenotifier_p.h index 9675915..459c403 100644 --- a/src/gallery/tracker/qgallerytrackerchangenotifier_p.h +++ b/src/gallery/tracker/qgallerytrackerchangenotifier_p.h @@ -57,7 +57,7 @@ #include <QtCore/qobject.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryTrackerChangeNotifier : public QObject { @@ -85,6 +85,6 @@ private: QString m_service; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/tracker/qgallerytrackereditableresultset.cpp b/src/gallery/tracker/qgallerytrackereditableresultset.cpp index 1021fc9..cb8a37c 100644 --- a/src/gallery/tracker/qgallerytrackereditableresultset.cpp +++ b/src/gallery/tracker/qgallerytrackereditableresultset.cpp @@ -49,7 +49,7 @@ Q_DECLARE_METATYPE(QVector<QStringList>) -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryTrackerEditableResultSetPrivate : public QGalleryTrackerResultSetPrivate { @@ -136,6 +136,6 @@ bool QGalleryTrackerEditableResultSet::setMetaData(int key, const QVariant &valu return true; } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #include "moc_qgallerytrackereditableresultset_p.cpp" diff --git a/src/gallery/tracker/qgallerytrackereditableresultset_p.h b/src/gallery/tracker/qgallerytrackereditableresultset_p.h index aefd877..d5afb2f 100644 --- a/src/gallery/tracker/qgallerytrackereditableresultset_p.h +++ b/src/gallery/tracker/qgallerytrackereditableresultset_p.h @@ -55,7 +55,7 @@ #include "qgallerytrackerresultset_p.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryTrackerMetaDataEdit; @@ -79,6 +79,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_editFinished(QGalleryTrackerMetaDataEdit *)) }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/tracker/qgallerytrackerlistcolumn.cpp b/src/gallery/tracker/qgallerytrackerlistcolumn.cpp index 46f63d7..7d5be97 100644 --- a/src/gallery/tracker/qgallerytrackerlistcolumn.cpp +++ b/src/gallery/tracker/qgallerytrackerlistcolumn.cpp @@ -48,7 +48,7 @@ #include <QtCore/qurl.h> #include <QtCore/qvariant.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE QVariant QGalleryTrackerStringColumn::toVariant(const QString &string) const { @@ -160,4 +160,4 @@ QGalleryTrackerCompositeColumn *QGalleryTrackerFileExtensionColumn::create(const return new QGalleryTrackerFileExtensionColumn(QGALLERYTRACKERFILEURLCOLUMN_DEFAULT_COL); } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/tracker/qgallerytrackerlistcolumn_p.h b/src/gallery/tracker/qgallerytrackerlistcolumn_p.h index 54a9b6e..a609090 100644 --- a/src/gallery/tracker/qgallerytrackerlistcolumn_p.h +++ b/src/gallery/tracker/qgallerytrackerlistcolumn_p.h @@ -60,7 +60,7 @@ #include <QtCore/qvector.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryTrackerValueColumn { @@ -198,6 +198,6 @@ private: const int m_column; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/tracker/qgallerytrackermetadataedit.cpp b/src/gallery/tracker/qgallerytrackermetadataedit.cpp index 88e98a6..c6cbcac 100644 --- a/src/gallery/tracker/qgallerytrackermetadataedit.cpp +++ b/src/gallery/tracker/qgallerytrackermetadataedit.cpp @@ -43,7 +43,7 @@ #include <QtDBus/qdbuspendingcall.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE QGalleryTrackerMetaDataEdit::QGalleryTrackerMetaDataEdit( const QGalleryDBusInterfacePointer &metaDataInterface, @@ -126,4 +126,4 @@ void QGalleryTrackerMetaDataEdit::itemsRemoved(int index, int count) m_index = -1; } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/tracker/qgallerytrackermetadataedit_p.h b/src/gallery/tracker/qgallerytrackermetadataedit_p.h index a3133c1..66009fb 100644 --- a/src/gallery/tracker/qgallerytrackermetadataedit_p.h +++ b/src/gallery/tracker/qgallerytrackermetadataedit_p.h @@ -58,7 +58,7 @@ #include <QtCore/qstringlist.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryTrackerMetaDataEdit : public QObject { @@ -103,6 +103,6 @@ private: QMap<QString, QString> m_oldValues; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/tracker/qgallerytrackerresultset.cpp b/src/gallery/tracker/qgallerytrackerresultset.cpp index c52d83d..e120c0f 100644 --- a/src/gallery/tracker/qgallerytrackerresultset.cpp +++ b/src/gallery/tracker/qgallerytrackerresultset.cpp @@ -51,7 +51,7 @@ Q_DECLARE_METATYPE(QVector<QStringList>) -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryTrackerResultSetParser { @@ -748,6 +748,6 @@ void QGalleryTrackerResultSet::refresh(int updateId) } } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #include "moc_qgallerytrackerresultset_p.cpp" diff --git a/src/gallery/tracker/qgallerytrackerresultset_p.h b/src/gallery/tracker/qgallerytrackerresultset_p.h index c988bbf..b9ae914 100644 --- a/src/gallery/tracker/qgallerytrackerresultset_p.h +++ b/src/gallery/tracker/qgallerytrackerresultset_p.h @@ -58,7 +58,7 @@ #include "qgallerydbusinterface_p.h" #include "qgallerytrackerlistcolumn_p.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QDBusPendingCallWatcher; class QGalleryDBusInterfaceFactory; @@ -163,6 +163,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_parseFinished()) }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/tracker/qgallerytrackerresultset_p_p.h b/src/gallery/tracker/qgallerytrackerresultset_p_p.h index e7e9ce6..1ebeed3 100644 --- a/src/gallery/tracker/qgallerytrackerresultset_p_p.h +++ b/src/gallery/tracker/qgallerytrackerresultset_p_p.h @@ -70,7 +70,7 @@ #include <QtCore/qwaitcondition.h> #include <QtDBus/qdbusargument.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryTrackerResultSetThread : public QThread { @@ -378,11 +378,11 @@ public: void _q_editFinished(QGalleryTrackerMetaDataEdit *edit); }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE -template <> inline void qSwap<QT_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Row)>( - QT_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Row) &row1, - QT_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Row) &row2) +template <> inline void qSwap<QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Row)>( + QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Row) &row1, + QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Row) &row2) { typedef QVector<QVariant>::iterator iterator; @@ -392,5 +392,5 @@ template <> inline void qSwap<QT_PREPEND_NAMESPACE(QGalleryTrackerResultSetPriva #endif -Q_DECLARE_OPERATORS_FOR_FLAGS(QT_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Flags)) +Q_DECLARE_OPERATORS_FOR_FLAGS(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Flags)) diff --git a/src/gallery/tracker/qgallerytrackerschema.cpp b/src/gallery/tracker/qgallerytrackerschema.cpp index 289a64c..7e075c3 100644 --- a/src/gallery/tracker/qgallerytrackerschema.cpp +++ b/src/gallery/tracker/qgallerytrackerschema.cpp @@ -57,7 +57,7 @@ #include <QtCore/qxmlstream.h> #include <QtCore/qdebug.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE namespace { @@ -1549,4 +1549,4 @@ QString QGalleryTrackerSchema::serviceForType( const QString &galleryType ) return QString(); } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/tracker/qgallerytrackerschema_p.h b/src/gallery/tracker/qgallerytrackerschema_p.h index 74ff8df..9fc2c5f 100644 --- a/src/gallery/tracker/qgallerytrackerschema_p.h +++ b/src/gallery/tracker/qgallerytrackerschema_p.h @@ -61,7 +61,7 @@ #include <QtCore/qstringlist.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryDBusInterfaceFactory; @@ -131,6 +131,6 @@ private: const int m_itemIndex; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/tracker/qgallerytrackertyperesultset.cpp b/src/gallery/tracker/qgallerytrackertyperesultset.cpp index 88f6873..a877665 100644 --- a/src/gallery/tracker/qgallerytrackertyperesultset.cpp +++ b/src/gallery/tracker/qgallerytrackertyperesultset.cpp @@ -53,7 +53,7 @@ Q_DECLARE_METATYPE(QVector<QStringList>) -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryTrackerTypeResultSetPrivate : public QGalleryResultSetPrivate { @@ -343,6 +343,6 @@ void QGalleryTrackerTypeResultSet::refresh(int serviceId) } } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #include "moc_qgallerytrackertyperesultset_p.cpp" diff --git a/src/gallery/tracker/qgallerytrackertyperesultset_p.h b/src/gallery/tracker/qgallerytrackertyperesultset_p.h index b0ca5bf..df0fc02 100644 --- a/src/gallery/tracker/qgallerytrackertyperesultset_p.h +++ b/src/gallery/tracker/qgallerytrackertyperesultset_p.h @@ -60,7 +60,7 @@ #include <QtDBus/qdbusinterface.h> #include <QtDBus/qdbuspendingcall.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE struct QGalleryTrackerTypeResultSetArguments { @@ -112,6 +112,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_queryFinished(QDBusPendingCallWatcher *)) }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif |