diff options
| author | Xizhi Zhu <xizhi.zhu@nokia.com> | 2011-08-17 10:36:42 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-17 11:56:56 +0200 |
| commit | 7c5a4838133e0d5a748d8e6f7d6a6a3bc98c7687 (patch) | |
| tree | 9130ba17035fb0945974ba59badae6f3647d4da7 | |
| parent | e44e36fade228c4945ead5deea7a98e4866925a3 (diff) | |
Gallery is a QtAddOn module.
Change-Id: If01febc4a69aed060cd8caf6ccb80171d92fb9b0
Reviewed-on: http://codereview.qt.nokia.com/3071
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
96 files changed, 275 insertions, 228 deletions
@@ -123,7 +123,7 @@ translations/*.qm translations/*_untranslated.ts qrc_*.cpp -src/gallery/qtgalleryversion.h +src/gallery/qtaddongalleryversion.h # Test generated files QObject.log diff --git a/modules/qt_gallery.pri b/modules/qt_gallery.pri index b64e44c..274502d 100644 --- a/modules/qt_gallery.pri +++ b/modules/qt_gallery.pri @@ -3,15 +3,15 @@ QT.gallery.MAJOR_VERSION = 5 QT.gallery.MINOR_VERSION = 0 QT.gallery.PATCH_VERSION = 0 -QT.gallery.name = QtGallery +QT.gallery.name = QtAddOnGallery QT.gallery.bins = $$QT_MODULE_BIN_BASE -QT.gallery.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtGallery -QT.gallery.private_includes = $$QT_MODULE_INCLUDE_BASE/QtGallery/$$QT.gallery.VERSION +QT.gallery.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtAddOnGallery +QT.gallery.private_includes = $$QT_MODULE_INCLUDE_BASE/QtAddOnGallery/$$QT.gallery.VERSION QT.gallery.sources = $$QT_MODULE_BASE/src/gallery QT.gallery.libs = $$QT_MODULE_LIB_BASE QT.gallery.plugins = $$QT_MODULE_PLUGIN_BASE QT.gallery.imports = $$QT_MODULE_IMPORT_BASE QT.gallery.depends = core -QT.gallery.DEFINES = QT_GALLERY_LIB +QT.gallery.DEFINES = QT_ADDON_GALLERY_LIB QT_CONFIG += gallery diff --git a/src/gallery/gallery.pro b/src/gallery/gallery.pro index b8bb7f0..60c44a7 100644 --- a/src/gallery/gallery.pro +++ b/src/gallery/gallery.pro @@ -1,6 +1,6 @@ load(qt_module) -TARGET = QtGallery +TARGET = QtAddOnGallery QPRO_PWD = $PWD CONFIG += module @@ -8,7 +8,7 @@ MODULE_PRI = ../../modules/qt_gallery.pri QT = core -DEFINES += QT_BUILD_GALLERY_LIB QT_MAKEDLL +DEFINES += QT_MAKEDLL load(qt_module_config) @@ -62,4 +62,4 @@ simulator: { DEFINES += QT_DOCUMENT_GALLERY_NULL } -HEADERS = qtgalleryversion.h $$PUBLIC_HEADERS $$PRIVATE_HEADERS +HEADERS = qtaddongalleryversion.h $$PUBLIC_HEADERS $$PRIVATE_HEADERS diff --git a/src/gallery/qabstractgallery.cpp b/src/gallery/qabstractgallery.cpp index 0c5761c..728e408 100644 --- a/src/gallery/qabstractgallery.cpp +++ b/src/gallery/qabstractgallery.cpp @@ -42,7 +42,7 @@ #include "qabstractgallery.h" #include "qabstractgallery_p.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE /*! \class QAbstractGallery @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \ingroup gallery \ingroup gallery-galleries - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QAbstractGallery class provides a base class for gallery implementations. @@ -122,4 +122,6 @@ QAbstractGallery::~QAbstractGallery() Creates a response to a gallery \a request. */ -QT_END_NAMESPACE +#include "moc_qabstractgallery.cpp" + +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/qabstractgallery.h b/src/gallery/qabstractgallery.h index 30c3acb..00210c0 100644 --- a/src/gallery/qabstractgallery.h +++ b/src/gallery/qabstractgallery.h @@ -44,7 +44,7 @@ #include <qgalleryabstractrequest.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QAbstractGalleryPrivate; @@ -67,6 +67,6 @@ protected: friend class QGalleryAbstractRequest; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qabstractgallery_p.h b/src/gallery/qabstractgallery_p.h index b78e7fa..fa00a0f 100644 --- a/src/gallery/qabstractgallery_p.h +++ b/src/gallery/qabstractgallery_p.h @@ -53,7 +53,7 @@ #ifndef QABSTRACTGALLERY_P_H #define QABSTRACTGALLERY_P_H -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QAbstractGallery; @@ -72,6 +72,6 @@ public: QAbstractGallery *q_ptr; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qdocumentgallery.cpp b/src/gallery/qdocumentgallery.cpp index 433c2f7..b5eecae 100644 --- a/src/gallery/qdocumentgallery.cpp +++ b/src/gallery/qdocumentgallery.cpp @@ -44,7 +44,7 @@ #include <QtCore/qstringlist.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE /*! \class QDocumentGallery @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE \ingroup gallery \ingroup gallery-galleries - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QDocumentGallery class provides access to a gallery of documents and media present on a device. @@ -985,13 +985,10 @@ Q_DEFINE_GALLERY_PROPERTY(QDocumentGallery, count) QDocumentGallery::QDocumentGallery(QObject *parent) : QAbstractGallery(parent) { - } - QDocumentGallery::~QDocumentGallery() { - } bool QDocumentGallery::isRequestSupported(QGalleryAbstractRequest::RequestType) const @@ -1014,7 +1011,8 @@ QGalleryAbstractResponse *QDocumentGallery::createResponse(QGalleryAbstractReque return 0; } -#endif +#include "moc_qdocumentgallery.cpp" -QT_END_NAMESPACE +#endif // QT_DOCUMENT_GALLERY_NULL +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/qdocumentgallery.h b/src/gallery/qdocumentgallery.h index aa09579..a6a29d3 100644 --- a/src/gallery/qdocumentgallery.h +++ b/src/gallery/qdocumentgallery.h @@ -46,7 +46,7 @@ #include <qgalleryproperty.h> #include <qgallerytype.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QDocumentGalleryPrivate; @@ -175,6 +175,6 @@ private: Q_DECLARE_PRIVATE(QDocumentGallery) }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qgallery_p.h b/src/gallery/qgallery_p.h index 5f73830..dceb484 100644 --- a/src/gallery/qgallery_p.h +++ b/src/gallery/qgallery_p.h @@ -63,7 +63,7 @@ # if defined(QT_DLL) # undef QT_DLL # endif -# if defined(QT_BUILD_GALLERY_LIB) +# if defined(QT_ADDON_GALLERY_LIB) # define Q_GALLERY_EXPORT Q_DECL_EXPORT # else # define Q_GALLERY_EXPORT Q_DECL_IMPORT @@ -81,5 +81,10 @@ # endif #endif +#define QT_ADDON_GALLERY_BEGIN_NAMESPACE namespace QtAddOn { namespace Gallery { +#define QT_ADDON_GALLERY_END_NAMESPACE } } +#define QT_ADDON_USE_GALLERY_NAMESPACE using namespace QtAddOn::Gallery; +#define QT_ADDON_GELLERY_PREPEND_NAMESPACE(name) ::QtAddOn::Gallery::name + #endif // QGALLERY_P_H diff --git a/src/gallery/qgalleryabstractrequest.cpp b/src/gallery/qgalleryabstractrequest.cpp index 8c19d57..18a2935 100644 --- a/src/gallery/qgalleryabstractrequest.cpp +++ b/src/gallery/qgalleryabstractrequest.cpp @@ -43,7 +43,7 @@ #include "qgalleryabstractrequest_p.h" #include <qabstractgallery.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE void QGalleryAbstractRequestPrivate::_q_finished() { @@ -123,7 +123,7 @@ void QGalleryAbstractRequestPrivate::_q_progressChanged(int current, int maximum \ingroup gallery \ingroup gallery-requests - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QGalleryAbstractRequest class provides a base class for gallery requests. @@ -577,6 +577,6 @@ void QGalleryAbstractRequest::clear() Sets the \a response to an executed request. */ -QT_END_NAMESPACE - #include "moc_qgalleryabstractrequest.cpp" + +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/qgalleryabstractrequest.h b/src/gallery/qgalleryabstractrequest.h index d3bc579..cbbe826 100644 --- a/src/gallery/qgalleryabstractrequest.h +++ b/src/gallery/qgalleryabstractrequest.h @@ -48,7 +48,7 @@ #include <QtCore/qstringlist.h> QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QAbstractGallery; class QGalleryAbstractResponse; @@ -143,7 +143,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_progressChanged(int, int)) }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE QT_END_HEADER #endif diff --git a/src/gallery/qgalleryabstractrequest_p.h b/src/gallery/qgalleryabstractrequest_p.h index 0e85ab2..41cac2c 100644 --- a/src/gallery/qgalleryabstractrequest_p.h +++ b/src/gallery/qgalleryabstractrequest_p.h @@ -60,7 +60,7 @@ #include <QtCore/qsharedpointer.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryAbstractRequestPrivate { @@ -99,6 +99,6 @@ public: QString errorString; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qgalleryabstractresponse.cpp b/src/gallery/qgalleryabstractresponse.cpp index 1f9933b..470a1bb 100644 --- a/src/gallery/qgalleryabstractresponse.cpp +++ b/src/gallery/qgalleryabstractresponse.cpp @@ -44,14 +44,14 @@ #include <QtCore/qcoreapplication.h> #include <QtCore/qtimer.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE /*! \class QGalleryAbstractResponse \ingroup gallery - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QGalleryAbstractResponse class provides a base class for responses to gallery requests. @@ -328,4 +328,6 @@ void QGalleryAbstractResponse::error(int error, const QString &errorString) Signals that a response was canceled. */ -QT_END_NAMESPACE +#include "moc_qgalleryabstractresponse.cpp" + +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/qgalleryabstractresponse.h b/src/gallery/qgalleryabstractresponse.h index 2ee1069..64b7d36 100644 --- a/src/gallery/qgalleryabstractresponse.h +++ b/src/gallery/qgalleryabstractresponse.h @@ -46,7 +46,7 @@ #include <QtCore/qstringlist.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryAbstractResponsePrivate; @@ -86,6 +86,6 @@ protected: QScopedPointer<QGalleryAbstractResponsePrivate> d_ptr; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qgalleryabstractresponse_p.h b/src/gallery/qgalleryabstractresponse_p.h index d630d5b..b4d8468 100644 --- a/src/gallery/qgalleryabstractresponse_p.h +++ b/src/gallery/qgalleryabstractresponse_p.h @@ -56,8 +56,10 @@ #include "qgalleryabstractresponse.h" QT_BEGIN_NAMESPACE - class QEventLoop; +QT_END_NAMESPACE + +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryAbstractResponsePrivate { @@ -79,6 +81,6 @@ public: QString errorString; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qgalleryfilter.cpp b/src/gallery/qgalleryfilter.cpp index 24b0184..200f66a 100644 --- a/src/gallery/qgalleryfilter.cpp +++ b/src/gallery/qgalleryfilter.cpp @@ -45,7 +45,7 @@ #include <QtCore/qstringlist.h> #include <QtCore/qurl.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryFilterPrivate : public QSharedData { @@ -220,7 +220,7 @@ public: \ingroup gallery \ingroup gallery-filters - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QGalleryIntersectionFilter class provides a filter which matches the intersection of two or more meta-data filters. @@ -511,7 +511,7 @@ QGalleryIntersectionFilter operator &&( \ingroup gallery \ingroup gallery-filters - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QGalleryUnionFilter class provides a filter which matches the union of two or more meta-data filters. @@ -794,7 +794,7 @@ QGalleryUnionFilter operator ||( \ingroup gallery \ingroup gallery-filters - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QGalleryMetaDataFilter class provides a filter which accepts items with meta-data properties matching a specific value. @@ -988,7 +988,7 @@ QGalleryMetaDataFilter QGalleryMetaDataFilter::operator !() const \ingroup gallery \ingroup gallery-filters - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QGalleryFilter class provides filtering criteria for gallery requests. @@ -1195,4 +1195,4 @@ bool operator !=(const QGalleryFilter &filter1, const QGalleryFilter &filter2) return filter1.d != filter2.d && !filter1.d->isEqual(*filter2.d); } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/qgalleryfilter.h b/src/gallery/qgalleryfilter.h index 8d6bd38..e26d8ba 100644 --- a/src/gallery/qgalleryfilter.h +++ b/src/gallery/qgalleryfilter.h @@ -50,8 +50,11 @@ #include <QtCore/qvector.h> QT_BEGIN_NAMESPACE - class QDebug; +QT_END_NAMESPACE + +QT_ADDON_GALLERY_BEGIN_NAMESPACE + class QGalleryFilter; class QGalleryIntersectionFilter; class QGalleryMetaDataFilter; @@ -263,6 +266,6 @@ private: friend class QGalleryFilter; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qgalleryitemrequest.cpp b/src/gallery/qgalleryitemrequest.cpp index 26b642c..1793283 100644 --- a/src/gallery/qgalleryitemrequest.cpp +++ b/src/gallery/qgalleryitemrequest.cpp @@ -45,7 +45,7 @@ #include "qgallerynullresultset_p.h" #include "qgalleryresource.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryItemRequestPrivate : public QGalleryAbstractRequestPrivate { @@ -107,7 +107,7 @@ public: \ingroup gallery \ingroup gallery-requests - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QGalleryItemRequest class provides a request for the properties of a single item from a gallery. @@ -428,6 +428,6 @@ void QGalleryItemRequest::setResponse(QGalleryAbstractResponse *response) emit itemChanged(); } -QT_END_NAMESPACE - #include "moc_qgalleryitemrequest.cpp" + +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/qgalleryitemrequest.h b/src/gallery/qgalleryitemrequest.h index df1dd15..9e7d7c1 100644 --- a/src/gallery/qgalleryitemrequest.h +++ b/src/gallery/qgalleryitemrequest.h @@ -48,7 +48,7 @@ #include <QtCore/qurl.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryFilter; class QGalleryResultSet; @@ -119,6 +119,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_metaDataChanged(int, int, const QList<int> &)) }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qgallerynullresultset_p.h b/src/gallery/qgallerynullresultset_p.h index c526c85..3a988c6 100644 --- a/src/gallery/qgallerynullresultset_p.h +++ b/src/gallery/qgallerynullresultset_p.h @@ -55,7 +55,7 @@ #include "qgalleryresultset.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryNullResultSet : public QGalleryResultSet { @@ -79,6 +79,6 @@ public: bool fetch(int) { return false; } }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qgalleryproperty.h b/src/gallery/qgalleryproperty.h index dec7b68..baafe51 100644 --- a/src/gallery/qgalleryproperty.h +++ b/src/gallery/qgalleryproperty.h @@ -46,7 +46,7 @@ #include <QtCore/qstring.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE struct Q_GALLERY_EXPORT QGalleryProperty { @@ -97,9 +97,9 @@ struct Q_GALLERY_EXPORT QGalleryProperty const int m_length; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE -Q_DECLARE_OPERATORS_FOR_FLAGS(QT_PREPEND_NAMESPACE(QGalleryProperty::Attributes)) +Q_DECLARE_OPERATORS_FOR_FLAGS(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryProperty::Attributes)) #define Q_DEFINE_GALLERY_PROPERTY(scope, name) const QGalleryProperty scope::name = {#name, sizeof(#name) - 1}; diff --git a/src/gallery/qgalleryproperty.qdoc b/src/gallery/qgalleryproperty.qdoc index ea1d88f..6184341 100644 --- a/src/gallery/qgalleryproperty.qdoc +++ b/src/gallery/qgalleryproperty.qdoc @@ -28,7 +28,7 @@ /*! \class QGalleryProperty - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QGalleryProperty class provides a string constant identifying a gallery property. diff --git a/src/gallery/qgalleryquerymodel.cpp b/src/gallery/qgalleryquerymodel.cpp index 4888d03..4d88902 100644 --- a/src/gallery/qgalleryquerymodel.cpp +++ b/src/gallery/qgalleryquerymodel.cpp @@ -47,7 +47,7 @@ #include <QtCore/qstringlist.h> #include <QtCore/qpointer.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryQueryModelPrivate { @@ -280,7 +280,7 @@ void QGalleryQueryModelPrivate::_q_metaDataChanged(int index, int count, const Q \ingroup gallery - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QGalleryQueryModel class provides a model for the results of a gallery query. @@ -978,6 +978,6 @@ Qt::ItemFlags QGalleryQueryModel::flags(const QModelIndex &index) const return d_ptr->itemFlags.value(index.column()) ; } -QT_END_NAMESPACE - #include "moc_qgalleryquerymodel.cpp" + +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/qgalleryquerymodel.h b/src/gallery/qgalleryquerymodel.h index 2fce970..8dcdfbd 100644 --- a/src/gallery/qgalleryquerymodel.h +++ b/src/gallery/qgalleryquerymodel.h @@ -46,7 +46,7 @@ #include <QtCore/qabstractitemmodel.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryFilter; class QGalleryResultSet; @@ -167,6 +167,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_metaDataChanged(int, int, const QList<int> &)) }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qgalleryqueryrequest.cpp b/src/gallery/qgalleryqueryrequest.cpp index 65cd28e..aa1188c 100644 --- a/src/gallery/qgalleryqueryrequest.cpp +++ b/src/gallery/qgalleryqueryrequest.cpp @@ -45,7 +45,7 @@ #include "qgallerynullresultset_p.h" #include "qgalleryresource.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryQueryRequestPrivate : public QGalleryAbstractRequestPrivate { @@ -82,7 +82,7 @@ public: \ingroup gallery \ingroup gallery-requests - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QGalleryQueryRequest class provides a request for a set of items from a gallery. @@ -689,4 +689,6 @@ void QGalleryQueryRequest::setResponse(QGalleryAbstractResponse *response) emit resultSetChanged(d->resultSet); } -QT_END_NAMESPACE +#include "moc_qgalleryqueryrequest.cpp" + +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/qgalleryqueryrequest.h b/src/gallery/qgalleryqueryrequest.h index a7480fa..b90e12c 100644 --- a/src/gallery/qgalleryqueryrequest.h +++ b/src/gallery/qgalleryqueryrequest.h @@ -47,7 +47,7 @@ #include <qgalleryresource.h> #include <QtCore/qurl.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryFilter; class QGalleryResultSet; @@ -161,6 +161,6 @@ private: Q_DECLARE_PRIVATE(QGalleryQueryRequest) }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qgalleryresource.cpp b/src/gallery/qgalleryresource.cpp index b5da3fd..5087771 100644 --- a/src/gallery/qgalleryresource.cpp +++ b/src/gallery/qgalleryresource.cpp @@ -41,14 +41,14 @@ #include "qgalleryresource.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE /*! \class QGalleryResource \ingroup gallery - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QGalleryResource class provides a resource identifier for a gallery item. @@ -167,4 +167,4 @@ QVariant QGalleryResource::attribute(int key) const return m_attributes.value(key); } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/qgalleryresource.h b/src/gallery/qgalleryresource.h index fea0549..b275311 100644 --- a/src/gallery/qgalleryresource.h +++ b/src/gallery/qgalleryresource.h @@ -47,7 +47,7 @@ #include <QtCore/qurl.h> #include <QtCore/qvariant.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class Q_GALLERY_EXPORT QGalleryResource { @@ -73,6 +73,6 @@ private: QMap<int, QVariant> m_attributes; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qgalleryresultset.cpp b/src/gallery/qgalleryresultset.cpp index 18fc038..98578f4 100644 --- a/src/gallery/qgalleryresultset.cpp +++ b/src/gallery/qgalleryresultset.cpp @@ -43,14 +43,14 @@ #include "qgalleryresource.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE /*! \class QGalleryResultSet \ingroup gallery - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QGalleryResultSet class provides a gallery response which returns the results of a query. @@ -322,4 +322,6 @@ bool QGalleryResultSet::fetchLast() at \a index has changed. */ -QT_END_NAMESPACE +#include "moc_qgalleryresultset.cpp" + +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/qgalleryresultset.h b/src/gallery/qgalleryresultset.h index 259c4f1..e8bec06 100644 --- a/src/gallery/qgalleryresultset.h +++ b/src/gallery/qgalleryresultset.h @@ -50,7 +50,7 @@ #include <QtCore/qurl.h> #include <QtCore/qvariant.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryResource; @@ -100,6 +100,6 @@ protected: QGalleryResultSet(QGalleryResultSetPrivate &dd, QObject *parent); }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qgalleryresultset_p.h b/src/gallery/qgalleryresultset_p.h index 0def1dc..b14372d 100644 --- a/src/gallery/qgalleryresultset_p.h +++ b/src/gallery/qgalleryresultset_p.h @@ -57,7 +57,7 @@ #include "qgalleryabstractresponse_p.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryResultSetPrivate : public QGalleryAbstractResponsePrivate { @@ -69,6 +69,6 @@ public: virtual ~QGalleryResultSetPrivate() {} }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qgallerytype.h b/src/gallery/qgallerytype.h index 9b71b8b..446de16 100644 --- a/src/gallery/qgallerytype.h +++ b/src/gallery/qgallerytype.h @@ -46,7 +46,7 @@ #include <QtCore/qstring.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE struct Q_GALLERY_EXPORT QGalleryType { @@ -60,6 +60,6 @@ struct Q_GALLERY_EXPORT QGalleryType #define Q_DEFINE_GALLERY_TYPE(scope, name) const QGalleryType scope::name = {#name, sizeof(#name) - 1}; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/qgallerytype.qdoc b/src/gallery/qgallerytype.qdoc index fbf8127..cfa7e0a 100644 --- a/src/gallery/qgallerytype.qdoc +++ b/src/gallery/qgallerytype.qdoc @@ -30,7 +30,7 @@ \ingroup gallery - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QGalleryType class provides a string constant identifying a gallery item type. diff --git a/src/gallery/qgallerytyperequest.cpp b/src/gallery/qgallerytyperequest.cpp index 1e5e9b0..7231b0c 100644 --- a/src/gallery/qgallerytyperequest.cpp +++ b/src/gallery/qgallerytyperequest.cpp @@ -45,7 +45,7 @@ #include "qgallerynullresultset_p.h" #include "qgalleryresource.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryTypeRequestPrivate : public QGalleryAbstractRequestPrivate { @@ -107,7 +107,7 @@ public: \ingroup gallery \ingroup gallery-requests - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The QGalleryTypeRequest class provides an interface for requesting the properties of a type from a gallery. @@ -375,6 +375,6 @@ void QGalleryTypeRequest::setResponse(QGalleryAbstractResponse *response) emit typeChanged(); } -QT_END_NAMESPACE - #include "moc_qgallerytyperequest.cpp" + +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/qgallerytyperequest.h b/src/gallery/qgallerytyperequest.h index de2f0b8..ce7aaa1 100644 --- a/src/gallery/qgallerytyperequest.h +++ b/src/gallery/qgallerytyperequest.h @@ -46,7 +46,7 @@ #include <qgalleryproperty.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryFilter; class QGalleryResource; @@ -108,6 +108,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_metaDataChanged(int, int, const QList<int> &)) }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/simulator/docgalleryconnection_simulator.cpp b/src/gallery/simulator/docgalleryconnection_simulator.cpp index e3e7434..e8a3b8b 100644 --- a/src/gallery/simulator/docgalleryconnection_simulator.cpp +++ b/src/gallery/simulator/docgalleryconnection_simulator.cpp @@ -46,7 +46,7 @@ #include <QtNetwork/QLocalSocket> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE using namespace QtSimulatorPrivate; @@ -119,4 +119,4 @@ DocGallerySimulatorData DocGalleryConnection::galleryData() const #include "moc_docgalleryconnection_simulator.cpp" } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/simulator/docgalleryconnection_simulator.h b/src/gallery/simulator/docgalleryconnection_simulator.h index 0fd2622..833d162 100644 --- a/src/gallery/simulator/docgalleryconnection_simulator.h +++ b/src/gallery/simulator/docgalleryconnection_simulator.h @@ -62,7 +62,7 @@ QT_BEGIN_HEADER class QLocalSocket; -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE namespace Simulator { class MobilityConnection; @@ -92,7 +92,7 @@ private: }; } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE QT_END_HEADER #endif // DOCGALLERYCONNECTION_SIMULATOR_P_H diff --git a/src/gallery/simulator/docgallerysimulatordata.cpp b/src/gallery/simulator/docgallerysimulatordata.cpp index 0934254..1125f50 100644 --- a/src/gallery/simulator/docgallerysimulatordata.cpp +++ b/src/gallery/simulator/docgallerysimulatordata.cpp @@ -41,7 +41,7 @@ #include "docgallerysimulatordata.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE void qt_registerDocGalleryTypes() { @@ -84,4 +84,4 @@ QDataStream &operator>>(QDataStream &in, DocGalleryImageItem &i) return in; } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/simulator/docgallerysimulatordata.h b/src/gallery/simulator/docgallerysimulatordata.h index 4280f14..2995133 100644 --- a/src/gallery/simulator/docgallerysimulatordata.h +++ b/src/gallery/simulator/docgallerysimulatordata.h @@ -58,7 +58,7 @@ #include <QtCore/QString> #include <QtCore/QMetaType> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE struct DocGalleryImageItem { QString fileName; @@ -80,7 +80,7 @@ struct DocGallerySimulatorData }; void qt_registerDocGalleryTypes(); -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE Q_DECLARE_METATYPE(Qt::DocGallerySimulatorData) diff --git a/src/gallery/simulator/qdocumentgallery_simulator.cpp b/src/gallery/simulator/qdocumentgallery_simulator.cpp index 27682c8..c4500ab 100644 --- a/src/gallery/simulator/qdocumentgallery_simulator.cpp +++ b/src/gallery/simulator/qdocumentgallery_simulator.cpp @@ -56,7 +56,7 @@ Q_DECLARE_METATYPE(QVector<QStringList>) -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE using namespace Simulator; @@ -134,4 +134,4 @@ QGalleryAbstractResponse *QDocumentGallery::createResponse(QGalleryAbstractReque } } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/simulator/qsimulatorgalleryresultset.cpp b/src/gallery/simulator/qsimulatorgalleryresultset.cpp index 0000833..28dbc44 100644 --- a/src/gallery/simulator/qsimulatorgalleryresultset.cpp +++ b/src/gallery/simulator/qsimulatorgalleryresultset.cpp @@ -45,7 +45,7 @@ #include <QtCore/QDateTime> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE namespace Utility { enum PropertyKeys { @@ -261,4 +261,4 @@ QFileInfo QSimulatorGalleryResultSet::currentFileInfo() const return QFileInfo(filePath); } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/simulator/qsimulatorgalleryresultset_p.h b/src/gallery/simulator/qsimulatorgalleryresultset_p.h index 73dfe46..81288e0 100644 --- a/src/gallery/simulator/qsimulatorgalleryresultset_p.h +++ b/src/gallery/simulator/qsimulatorgalleryresultset_p.h @@ -62,7 +62,7 @@ #include <QtCore/QFileInfo> #include <QtGui/QImage> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QSimulatorGalleryResultSet : public QGalleryResultSet { @@ -107,6 +107,6 @@ private: int mCurrentIndex; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif // QSIMULATORGALLERYRESULTSET_H diff --git a/src/gallery/symbian/qdocumentgallery_symbian.cpp b/src/gallery/symbian/qdocumentgallery_symbian.cpp index 277ea7b..130355d 100644 --- a/src/gallery/symbian/qdocumentgallery_symbian.cpp +++ b/src/gallery/symbian/qdocumentgallery_symbian.cpp @@ -57,7 +57,7 @@ #include "qmdegallerycategoryresultset_p.h" #include "qmdesession_p.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QDocumentGalleryPrivate : public QAbstractGalleryPrivate { @@ -187,4 +187,4 @@ QGalleryAbstractResponse* QDocumentGallery::createResponse(QGalleryAbstractReque } } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/symbian/qgallerymdsutility.cpp b/src/gallery/symbian/qgallerymdsutility.cpp index 4821304..9d5a69e 100644 --- a/src/gallery/symbian/qgallerymdsutility.cpp +++ b/src/gallery/symbian/qgallerymdsutility.cpp @@ -54,7 +54,7 @@ #include <e32des8.h> #include <QFileInfo> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE QDocumentGalleryMDSUtility::QDocumentGalleryMDSUtility() { @@ -3738,4 +3738,4 @@ int QDocumentGalleryMDSUtility::AddMetadataFilter(CMdELogicCondition &rootCond, return conditionError; } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/symbian/qgallerymdsutility_p.h b/src/gallery/symbian/qgallerymdsutility_p.h index b6f5187..b5f0e50 100644 --- a/src/gallery/symbian/qgallerymdsutility_p.h +++ b/src/gallery/symbian/qgallerymdsutility_p.h @@ -64,7 +64,7 @@ #include <mdequery.h> #include <e32std.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QDocumentGalleryMDSUtility { @@ -209,6 +209,6 @@ private: }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif // QDOCUMENTGALLERYMDSUTILITY_H diff --git a/src/gallery/symbian/qmdegallerycategoryresultset.cpp b/src/gallery/symbian/qmdegallerycategoryresultset.cpp index 2bc6bc6..8f03591 100644 --- a/src/gallery/symbian/qmdegallerycategoryresultset.cpp +++ b/src/gallery/symbian/qmdegallerycategoryresultset.cpp @@ -50,7 +50,7 @@ #include <mdeconstants.h> #include <mdeobjectdef.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE namespace { @@ -728,4 +728,4 @@ void QMDEGalleryCategoryResultSet::HandleQueryCompleted(CMdEQuery &, TInt aError } } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/symbian/qmdegallerycategoryresultset_p.h b/src/gallery/symbian/qmdegallerycategoryresultset_p.h index 6185d0d..315164c 100644 --- a/src/gallery/symbian/qmdegallerycategoryresultset_p.h +++ b/src/gallery/symbian/qmdegallerycategoryresultset_p.h @@ -62,7 +62,7 @@ #include <mdeobjectquery.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QMdeSession; @@ -136,6 +136,6 @@ private: }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif diff --git a/src/gallery/symbian/qmdegalleryitemresultset.cpp b/src/gallery/symbian/qmdegalleryitemresultset.cpp index 5afdbfe..ce6c6d7 100644 --- a/src/gallery/symbian/qmdegalleryitemresultset.cpp +++ b/src/gallery/symbian/qmdegalleryitemresultset.cpp @@ -47,7 +47,7 @@ #include "qdocumentgallery.h" #include "qgalleryitemrequest.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE QMDEGalleryItemResultSet::QMDEGalleryItemResultSet(QMdeSession *session, QObject *parent) :QMDEGalleryResultSet(parent) @@ -180,4 +180,4 @@ void QMDEGalleryItemResultSet::cleanupResultSet() m_cleaned = true; } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/symbian/qmdegalleryitemresultset_p.h b/src/gallery/symbian/qmdegalleryitemresultset_p.h index d791332..3b573ff 100644 --- a/src/gallery/symbian/qmdegalleryitemresultset_p.h +++ b/src/gallery/symbian/qmdegalleryitemresultset_p.h @@ -57,7 +57,7 @@ #include <mdesession.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryItemRequest; @@ -103,6 +103,6 @@ private: RArray<TItemId> m_currentObjectIDs; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif // QMDEGALLERYITEMRESULTSET_H diff --git a/src/gallery/symbian/qmdegalleryqueryresultset.cpp b/src/gallery/symbian/qmdegalleryqueryresultset.cpp index 10a198e..6aa6bdf 100644 --- a/src/gallery/symbian/qmdegalleryqueryresultset.cpp +++ b/src/gallery/symbian/qmdegalleryqueryresultset.cpp @@ -47,7 +47,7 @@ #include "qdocumentgallery.h" #include "qgalleryqueryrequest.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE QMDEGalleryQueryResultSet::QMDEGalleryQueryResultSet(QMdeSession *session, QObject *parent) :QMDEGalleryResultSet(parent) @@ -356,4 +356,4 @@ void QMDEGalleryQueryResultSet::handleUpdatedResults() m_currentObjectIDs = m_updatedObjectIDs; } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/symbian/qmdegalleryqueryresultset_p.h b/src/gallery/symbian/qmdegalleryqueryresultset_p.h index ff77fb8..ff085a1 100644 --- a/src/gallery/symbian/qmdegalleryqueryresultset_p.h +++ b/src/gallery/symbian/qmdegalleryqueryresultset_p.h @@ -58,7 +58,7 @@ #include <mdequery.h> #include <mdesession.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryQueryRequest; @@ -122,6 +122,6 @@ private: bool m_query_running; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif // QMDEGALLERYQUERYRESULTSET_H diff --git a/src/gallery/symbian/qmdegalleryresultset.cpp b/src/gallery/symbian/qmdegalleryresultset.cpp index 74ad66b..392950c 100644 --- a/src/gallery/symbian/qmdegalleryresultset.cpp +++ b/src/gallery/symbian/qmdegalleryresultset.cpp @@ -49,7 +49,7 @@ #include <mdeobject.h> #include <mdeobjectdef.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE QMDEGalleryResultSet::QMDEGalleryResultSet(QObject *parent) : QGalleryResultSet(parent) @@ -219,4 +219,4 @@ bool QMDEGalleryResultSet::fetch(int index) return isValid; } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/symbian/qmdegalleryresultset_p.h b/src/gallery/symbian/qmdegalleryresultset_p.h index 087e7ad..62eb587 100644 --- a/src/gallery/symbian/qmdegalleryresultset_p.h +++ b/src/gallery/symbian/qmdegalleryresultset_p.h @@ -64,7 +64,7 @@ class CMdEObject; -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QMdeSession; @@ -126,5 +126,5 @@ protected: }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif // QMDEGALLERYRESULTSET_H diff --git a/src/gallery/symbian/qmdegallerytyperesultset.cpp b/src/gallery/symbian/qmdegallerytyperesultset.cpp index 7fa6333..bcdfc8f 100644 --- a/src/gallery/symbian/qmdegallerytyperesultset.cpp +++ b/src/gallery/symbian/qmdegallerytyperesultset.cpp @@ -47,7 +47,7 @@ //API #include "qgallerytyperequest.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE QMDEGalleryTypeResultSet::QMDEGalleryTypeResultSet(QMdeSession *session, QGalleryTypeRequest *request) @@ -214,4 +214,4 @@ void QMDEGalleryTypeResultSet::HandleQueryCompleted(CMdEQuery &aQuery, TInt aErr } } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/symbian/qmdegallerytyperesultset_p.h b/src/gallery/symbian/qmdegallerytyperesultset_p.h index fd90b5c..4c8dd51 100644 --- a/src/gallery/symbian/qmdegallerytyperesultset_p.h +++ b/src/gallery/symbian/qmdegallerytyperesultset_p.h @@ -59,7 +59,7 @@ #include <mdequery.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryTypeRequest; @@ -101,5 +101,5 @@ private: int m_currentIndex; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif // QMDEGALLERYTYPERESULTSET_H diff --git a/src/gallery/symbian/qmdesession.cpp b/src/gallery/symbian/qmdesession.cpp index beb253f..bd9e4fa 100644 --- a/src/gallery/symbian/qmdesession.cpp +++ b/src/gallery/symbian/qmdesession.cpp @@ -48,7 +48,7 @@ #include <mdeconstants.h> #include <e32base.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE QMdeSession::QMdeSession(QObject *parent) :QObject(parent) @@ -251,4 +251,4 @@ void QMdeSession::RemoveTrackedResultSet( QMDEGalleryResultSet* aResultSet ) } } -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/gallery/symbian/qmdesession_p.h b/src/gallery/symbian/qmdesession_p.h index 1ba4f4c..ac86b0a 100644 --- a/src/gallery/symbian/qmdesession_p.h +++ b/src/gallery/symbian/qmdesession_p.h @@ -64,7 +64,7 @@ #include <mdequery.h> #include <e32std.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryAbstractResponse; @@ -122,6 +122,6 @@ private: RPointerArray<QMDEGalleryResultSet> m_resultSetList; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE #endif // QMDESESSION_H 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 diff --git a/src/imports/gallery/gallery.pro b/src/imports/gallery/gallery.pro index 7ccbaba..b7fcd9e 100644 --- a/src/imports/gallery/gallery.pro +++ b/src/imports/gallery/gallery.pro @@ -1,5 +1,5 @@ TARGET = declarative_gallery -TARGETPATH = Qt/gallery +TARGETPATH = QtAddOn/gallery include(qgalleryimport.pri) target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH diff --git a/src/imports/gallery/qdeclarativedocumentgallery.cpp b/src/imports/gallery/qdeclarativedocumentgallery.cpp index 824a203..4f050d1 100644 --- a/src/imports/gallery/qdeclarativedocumentgallery.cpp +++ b/src/imports/gallery/qdeclarativedocumentgallery.cpp @@ -47,7 +47,7 @@ #include <QtDeclarative/qdeclarativecontext.h> #include <QtDeclarative/qdeclarativeengine.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE Q_GLOBAL_STATIC(QDocumentGallery, qt_declarativeDocumentGalleryInstance) @@ -83,4 +83,6 @@ QAbstractGallery *QDeclarativeDocumentGallery::gallery(QObject *object) return qt_declarativeDocumentGalleryInstance(); } -QT_END_NAMESPACE +#include "moc_qdeclarativedocumentgallery.cpp" + +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/imports/gallery/qdeclarativedocumentgallery.h b/src/imports/gallery/qdeclarativedocumentgallery.h index 9448173..e811998 100644 --- a/src/imports/gallery/qdeclarativedocumentgallery.h +++ b/src/imports/gallery/qdeclarativedocumentgallery.h @@ -57,7 +57,7 @@ #include <QtCore/qcoreevent.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QDeclarativeDocumentGallery : public QObject { @@ -88,8 +88,8 @@ public: static QAbstractGallery *gallery(QObject *object); }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QDeclarativeDocumentGallery::ItemType)) +Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeDocumentGallery::ItemType)) #endif diff --git a/src/imports/gallery/qdeclarativegallery.cpp b/src/imports/gallery/qdeclarativegallery.cpp index 42598c8..b04e509 100644 --- a/src/imports/gallery/qdeclarativegallery.cpp +++ b/src/imports/gallery/qdeclarativegallery.cpp @@ -50,7 +50,7 @@ #include "qdeclarativegalleryquerymodel.h" #include "qdeclarativegallerytype.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryDeclarativeModule : public QDeclarativeExtensionPlugin { @@ -85,6 +85,6 @@ public: #include "qdeclarativegallery.moc" -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE -Q_EXPORT_PLUGIN2(qgallerydeclarativemodule, QT_PREPEND_NAMESPACE(QGalleryDeclarativeModule)) +Q_EXPORT_PLUGIN2(qgallerydeclarativemodule, QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryDeclarativeModule)) diff --git a/src/imports/gallery/qdeclarativegalleryfilter.cpp b/src/imports/gallery/qdeclarativegalleryfilter.cpp index 0b16cbf..8745e1b 100644 --- a/src/imports/gallery/qdeclarativegalleryfilter.cpp +++ b/src/imports/gallery/qdeclarativegalleryfilter.cpp @@ -43,7 +43,7 @@ #include <qgalleryfilter.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE void QDeclarativeGalleryValueFilter::setValue(const QVariant &value) { @@ -611,4 +611,6 @@ QGalleryFilter QDeclarativeGalleryFilterIntersection::filter() const return intersectionFilter; } -QT_END_NAMESPACE +#include "moc_qdeclarativegalleryfilter.cpp" + +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/imports/gallery/qdeclarativegalleryfilter.h b/src/imports/gallery/qdeclarativegalleryfilter.h index 3b99f54..4550584 100644 --- a/src/imports/gallery/qdeclarativegalleryfilter.h +++ b/src/imports/gallery/qdeclarativegalleryfilter.h @@ -56,7 +56,7 @@ #include <qgalleryfilter.h> #include <QtDeclarative/qdeclarative.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QGalleryFilter; @@ -309,19 +309,19 @@ public: QGalleryFilter filter() const; }; -QT_END_NAMESPACE - -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGalleryFilterBase)) -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGalleryEqualsFilter)) -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGalleryLessThanFilter)) -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGalleryLessThanEqualsFilter)) -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGalleryGreaterThanFilter)) -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGalleryGreaterThanEqualsFilter)) -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGalleryContainsFilter)) -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGalleryStartsWithFilter)) -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGalleryEndsWithFilter)) -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGalleryWildcardFilter)) -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGalleryFilterUnion)) -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGalleryFilterIntersection)) +QT_ADDON_GALLERY_END_NAMESPACE + +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryFilterBase)) +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryEqualsFilter)) +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryLessThanFilter)) +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryLessThanEqualsFilter)) +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryGreaterThanFilter)) +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryGreaterThanEqualsFilter)) +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryContainsFilter)) +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryStartsWithFilter)) +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryEndsWithFilter)) +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryWildcardFilter)) +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryFilterUnion)) +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryFilterIntersection)) #endif diff --git a/src/imports/gallery/qdeclarativegalleryitem.cpp b/src/imports/gallery/qdeclarativegalleryitem.cpp index fb9fcaa..3f7e5bb 100644 --- a/src/imports/gallery/qdeclarativegalleryitem.cpp +++ b/src/imports/gallery/qdeclarativegalleryitem.cpp @@ -47,7 +47,7 @@ #include <QtDeclarative/qdeclarativeinfo.h> #include <QtDeclarative/qdeclarativepropertymap.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE QDeclarativeGalleryItem::QDeclarativeGalleryItem(QObject *parent) : QObject(parent) @@ -260,7 +260,7 @@ void QDeclarativeGalleryItem::_q_metaDataChanged(const QList<int> &keys) /*! \qmlclass DocumentGalleryItem QDeclarativeDocumentGalleryItem - \inmodule QtGallery + \inmodule QtAddOnGallery \ingroup qml-gallery \brief The DocumentGalleryItem element allows you to request information @@ -395,4 +395,6 @@ QDeclarativeDocumentGallery::ItemType QDeclarativeDocumentGalleryItem::itemType( Clears the results of a request. */ -QT_END_NAMESPACE +#include "moc_qdeclarativegalleryitem.cpp" + +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/imports/gallery/qdeclarativegalleryitem.h b/src/imports/gallery/qdeclarativegalleryitem.h index dc6b3b5..8037b8a 100644 --- a/src/imports/gallery/qdeclarativegalleryitem.h +++ b/src/imports/gallery/qdeclarativegalleryitem.h @@ -62,7 +62,7 @@ #include <QtDeclarative/qdeclarative.h> #include <QtDeclarative/qdeclarativepropertymap.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QDeclarativeGalleryItem : public QObject, public QDeclarativeParserStatus { @@ -173,8 +173,8 @@ Q_SIGNALS: void itemTypeChanged(); }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeDocumentGalleryItem)) +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeDocumentGalleryItem)) #endif diff --git a/src/imports/gallery/qdeclarativegalleryquerymodel.cpp b/src/imports/gallery/qdeclarativegalleryquerymodel.cpp index 7a3254b..4f2af0a 100644 --- a/src/imports/gallery/qdeclarativegalleryquerymodel.cpp +++ b/src/imports/gallery/qdeclarativegalleryquerymodel.cpp @@ -47,7 +47,7 @@ #include <QtDeclarative/qdeclarativeinfo.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE QDeclarativeGalleryQueryModel::QDeclarativeGalleryQueryModel(QObject *parent) : QAbstractListModel(parent) @@ -495,7 +495,7 @@ void QDeclarativeGalleryQueryModel::_q_itemsChanged(int index, int count) /*! \qmlclass DocumentGalleryModel QDeclarativeDocumentGalleryModel - \inmodule QtGallery + \inmodule QtAddOnGallery \brief The DocumentGalleryModel element is used to specify a model containing items from the document gallery. @@ -751,4 +751,6 @@ QVariant QDeclarativeDocumentGalleryModel::itemType(const QString &type) const return QVariant::fromValue(QDeclarativeDocumentGallery::itemTypeFromString(type)); } -QT_END_NAMESPACE +#include "moc_qdeclarativegalleryquerymodel.cpp" + +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/imports/gallery/qdeclarativegalleryquerymodel.h b/src/imports/gallery/qdeclarativegalleryquerymodel.h index 798eadc..caa080f 100644 --- a/src/imports/gallery/qdeclarativegalleryquerymodel.h +++ b/src/imports/gallery/qdeclarativegalleryquerymodel.h @@ -63,7 +63,7 @@ #include <QtDeclarative/qdeclarative.h> #include <QtScript/QtScript> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QDeclarativeGalleryFilterBase; @@ -229,9 +229,9 @@ protected: QVariant itemType(const QString &type) const; }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeDocumentGalleryModel)) +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeDocumentGalleryModel)) #endif diff --git a/src/imports/gallery/qdeclarativegallerytype.cpp b/src/imports/gallery/qdeclarativegallerytype.cpp index 10f135e..dbe52ae 100644 --- a/src/imports/gallery/qdeclarativegallerytype.cpp +++ b/src/imports/gallery/qdeclarativegallerytype.cpp @@ -48,7 +48,7 @@ #include <QtDeclarative/qdeclarativeinfo.h> #include <QtDeclarative/qdeclarativepropertymap.h> -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE QDeclarativeGalleryType::QDeclarativeGalleryType(QObject *parent) : QObject(parent) @@ -243,7 +243,7 @@ void QDeclarativeGalleryType::_q_metaDataChanged(const QList<int> &keys) /*! \qmlclass DocumentGalleryType QDeclarativeDocumentGalleryType - \inmodule QtGallery + \inmodule QtAddOnGallery \ingroup qml-gallery \brief The DocumentGalleryType element allows you to request information @@ -383,4 +383,6 @@ void QDeclarativeDocumentGalleryType::setItemType(QDeclarativeDocumentGallery::I Clears the results of a request. */ -QT_END_NAMESPACE +#include "moc_qdeclarativegallerytype.cpp" + +QT_ADDON_GALLERY_END_NAMESPACE diff --git a/src/imports/gallery/qdeclarativegallerytype.h b/src/imports/gallery/qdeclarativegallerytype.h index 14d6796..4994190 100644 --- a/src/imports/gallery/qdeclarativegallerytype.h +++ b/src/imports/gallery/qdeclarativegallerytype.h @@ -63,7 +63,7 @@ #include "qdeclarativedocumentgallery.h" #include "qdeclarativegalleryfilter.h" -QT_BEGIN_NAMESPACE +QT_ADDON_GALLERY_BEGIN_NAMESPACE class QDeclarativeGalleryType : public QObject, public QDeclarativeParserStatus { @@ -166,8 +166,8 @@ Q_SIGNALS: }; -QT_END_NAMESPACE +QT_ADDON_GALLERY_END_NAMESPACE -QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeDocumentGalleryType)) +QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeDocumentGalleryType)) #endif diff --git a/sync.profile b/sync.profile index 0b10584..3c96ccc 100644 --- a/sync.profile +++ b/sync.profile @@ -1,16 +1,16 @@ %modules = ( # path to module name map - "QtGallery" => "$basedir/src/gallery", + "QtAddOnGallery" => "$basedir/src/gallery", ); %moduleheaders = ( # restrict the module headers to those found in relative path ); %classnames = ( - "qtgalleryversion.h" => "QtGalleryVersion", + "qtaddongalleryversion.h" => "QtAddOnGalleryVersion", ); %mastercontent = ( - "gallery" => "#include <QtGallery/QtGallery>\n", + "gallery" => "#include <QtAddOnGallery/QtAddOnGallery>\n", ); %modulepris = ( - "QtGallery" => "$basedir/modules/qt_gallery.pri", + "QtAddOnGallery" => "$basedir/modules/qt_gallery.pri", ); # Module dependencies. # Every module that is required to build this module should have one entry. diff --git a/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp b/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp index 0a98e04..35de338 100644 --- a/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp +++ b/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp @@ -45,7 +45,9 @@ #include <QtTest/QtTest> -Q_DECLARE_METATYPE(QGalleryProperty::Attributes) +Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryProperty::Attributes)) + +QT_ADDON_USE_GALLERY_NAMESPACE class tst_QDocumentGallery : public QObject { diff --git a/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp b/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp index 5f2b51c..b1b2dd9 100644 --- a/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp +++ b/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp @@ -48,6 +48,8 @@ #include <QtTest/QtTest> +QT_ADDON_USE_GALLERY_NAMESPACE + Q_DECLARE_METATYPE(QGalleryAbstractRequest::State) class tst_QGalleryAbstractRequest : public QObject diff --git a/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp b/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp index 77f673c..84527fe 100644 --- a/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp +++ b/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp @@ -45,6 +45,8 @@ #include <QtTest/QtTest> +QT_ADDON_USE_GALLERY_NAMESPACE + class tst_QGalleryAbstractResponse : public QObject { Q_OBJECT diff --git a/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp b/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp index c192e1c..41b68b3 100644 --- a/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp +++ b/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp @@ -47,10 +47,12 @@ #include <QtTest/QtTest> -Q_DECLARE_METATYPE(QVariant) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QGalleryFilter)) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QGalleryFilter::Comparator)) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QGalleryMetaDataFilter)) +Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QVariant)) +Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryFilter)) +Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryFilter::Comparator)) +Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryMetaDataFilter)) + +QT_ADDON_USE_GALLERY_NAMESPACE class tst_QGalleryFilter : public QObject { diff --git a/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp b/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp index 761cbb8..7929c9d 100644 --- a/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp +++ b/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp @@ -52,6 +52,9 @@ #include <QtTest/QtTest> Q_DECLARE_METATYPE(QList<int>) + +QT_ADDON_USE_GALLERY_NAMESPACE + Q_DECLARE_METATYPE(QGalleryResultSet*) class tst_QGalleryItemRequest : public QObject diff --git a/tests/auto/qgalleryquerymodel/tst_qgalleryquerymodel.cpp b/tests/auto/qgalleryquerymodel/tst_qgalleryquerymodel.cpp index 13b5dda..9808ed8 100644 --- a/tests/auto/qgalleryquerymodel/tst_qgalleryquerymodel.cpp +++ b/tests/auto/qgalleryquerymodel/tst_qgalleryquerymodel.cpp @@ -52,6 +52,9 @@ #include <QtTest/QtTest> Q_DECLARE_METATYPE(QModelIndex) + +QT_ADDON_USE_GALLERY_NAMESPACE + Q_DECLARE_METATYPE(QGalleryAbstractRequest::State) class QtTestGallery; diff --git a/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp b/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp index 34acd36..84857d6 100644 --- a/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp +++ b/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp @@ -51,6 +51,8 @@ #include <QtTest/QtTest> +QT_ADDON_USE_GALLERY_NAMESPACE + Q_DECLARE_METATYPE(QGalleryResultSet*) class tst_QGalleryQueryRequest : public QObject diff --git a/tests/auto/qgalleryresource/tst_qgalleryresource.cpp b/tests/auto/qgalleryresource/tst_qgalleryresource.cpp index 8b71499..b7bd940 100644 --- a/tests/auto/qgalleryresource/tst_qgalleryresource.cpp +++ b/tests/auto/qgalleryresource/tst_qgalleryresource.cpp @@ -45,7 +45,9 @@ #include <QtTest/QtTest> -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QGalleryResource)) +Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryResource)) + +QT_ADDON_USE_GALLERY_NAMESPACE class tst_QGalleryResource : public QObject { diff --git a/tests/auto/qgallerytyperequest/tst_qgallerytyperequest.cpp b/tests/auto/qgallerytyperequest/tst_qgallerytyperequest.cpp index 4493e5e..565b00c 100644 --- a/tests/auto/qgallerytyperequest/tst_qgallerytyperequest.cpp +++ b/tests/auto/qgallerytyperequest/tst_qgallerytyperequest.cpp @@ -52,6 +52,9 @@ #include <QtTest/QtTest> Q_DECLARE_METATYPE(QList<int>) + +QT_ADDON_USE_GALLERY_NAMESPACE + Q_DECLARE_METATYPE(QGalleryResultSet*) class tst_QGalleryTypeRequest : public QObject |