diff options
Diffstat (limited to 'src/location/places')
21 files changed, 123 insertions, 10 deletions
diff --git a/src/location/places/placemacro.h b/src/location/places/placemacro.h index 6db8e2af..28e60914 100644 --- a/src/location/places/placemacro.h +++ b/src/location/places/placemacro.h @@ -42,6 +42,14 @@ #ifndef PLACE_MACRO_H #define PLACE_MACRO_H +#include <QtCore/QtGlobal> + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Location) + #define Q_DECLARE_D_FUNC(Class) \ inline Class##Private* d_func(); \ inline const Class##Private* d_func() const;\ @@ -69,3 +77,7 @@ } #endif + +QT_END_NAMESPACE + +QT_END_HEADER diff --git a/src/location/places/qplaceattribute.h b/src/location/places/qplaceattribute.h index 6419d464..785a3319 100644 --- a/src/location/places/qplaceattribute.h +++ b/src/location/places/qplaceattribute.h @@ -52,6 +52,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceAttributePrivate; class Q_LOCATION_EXPORT QPlaceAttribute { diff --git a/src/location/places/qplacecategory.h b/src/location/places/qplacecategory.h index d7b9f30b..f15d7339 100644 --- a/src/location/places/qplacecategory.h +++ b/src/location/places/qplacecategory.h @@ -47,8 +47,12 @@ #include <QVariant> #include <QList> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceManagerEngine; class QPlaceCategoryPrivate; @@ -78,4 +82,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // QPLACECATEGORY_H diff --git a/src/location/places/qplacecontent.h b/src/location/places/qplacecontent.h index c1e23a46..d7d598b6 100644 --- a/src/location/places/qplacecontent.h +++ b/src/location/places/qplacecontent.h @@ -49,6 +49,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + #define Q_DECLARE_CONTENT_D_FUNC(Class) \ inline Class##Private* d_func(); \ inline const Class##Private* d_func() const;\ diff --git a/src/location/places/qplacecontentreply.h b/src/location/places/qplacecontentreply.h index a93f0626..c549a8e7 100644 --- a/src/location/places/qplacecontentreply.h +++ b/src/location/places/qplacecontentreply.h @@ -45,9 +45,12 @@ #include "qplacereply.h" #include "qplacecontent.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceContentReplyPrivate; class Q_LOCATION_EXPORT QPlaceContentReply : public QPlaceReply { @@ -74,4 +77,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/places/qplacecontentrequest.h b/src/location/places/qplacecontentrequest.h index ec4dd7a9..ea12ee84 100644 --- a/src/location/places/qplacecontentrequest.h +++ b/src/location/places/qplacecontentrequest.h @@ -48,8 +48,12 @@ #include "qplacerequest.h" #include "placemacro.h" +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceContentRequestPrivate; class Q_LOCATION_EXPORT QPlaceContentRequest : public QPlaceRequest @@ -69,4 +73,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h index 2fbe1508..eed7b618 100644 --- a/src/location/places/qplacedetailsreply.h +++ b/src/location/places/qplacedetailsreply.h @@ -45,8 +45,12 @@ #include "qplacereply.h" #include "qplace.h" +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceDetailsReplyPrivate; class Q_LOCATION_EXPORT QPlaceDetailsReply : public QPlaceReply { @@ -68,4 +72,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // QPLACEDETAILSREPLY_H diff --git a/src/location/places/qplaceeditorial.h b/src/location/places/qplaceeditorial.h index bbd005dd..28d66f71 100644 --- a/src/location/places/qplaceeditorial.h +++ b/src/location/places/qplaceeditorial.h @@ -44,8 +44,12 @@ #include <QtLocation/QPlaceContent> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceEditorialPrivate; class Q_LOCATION_EXPORT QPlaceEditorial : public QPlaceContent @@ -73,4 +77,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // QPLACEEDITORIAL_H diff --git a/src/location/places/qplaceidreply.h b/src/location/places/qplaceidreply.h index 1571f438..f3512f48 100644 --- a/src/location/places/qplaceidreply.h +++ b/src/location/places/qplaceidreply.h @@ -45,8 +45,12 @@ #include "qplacereply.h" #include "qplace.h" +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceIdReplyPrivate; class Q_LOCATION_EXPORT QPlaceIdReply : public QPlaceReply { @@ -78,4 +82,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/places/qplaceimage.h b/src/location/places/qplaceimage.h index 19613aa1..3ca25756 100644 --- a/src/location/places/qplaceimage.h +++ b/src/location/places/qplaceimage.h @@ -44,13 +44,15 @@ #include <QSharedDataPointer> #include <QString> -#include <qlatin1constant.h> -#include "qmobilityglobal.h" #include "qplacesupplier.h" #include "qplacecontent.h" +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceImagePrivate; class QUrl; @@ -79,4 +81,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h index 5df5a92c..5da4b0e2 100644 --- a/src/location/places/qplacemanager.h +++ b/src/location/places/qplacemanager.h @@ -42,7 +42,6 @@ #ifndef QPLACEMANAGER_H #define QPLACEMANAGER_H -#include "qmobilityglobal.h" #include "qplacecontentreply.h" #include "qplacecontentrequest.h" #include "qplacerequest.h" @@ -57,8 +56,12 @@ #include <QObject> #include <QAuthenticator> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceManagerEngine; class QPlaceSearchRequest; class QPlaceSearchReply; @@ -156,4 +159,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QPlaceManager::ConnectivityModes); QT_END_NAMESPACE +QT_END_HEADER + #endif // QPLACEMANAGER_H diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h index f0429840..ed5b807f 100644 --- a/src/location/places/qplacemanagerengine.h +++ b/src/location/places/qplacemanagerengine.h @@ -44,8 +44,12 @@ #include "qplacemanager.h" +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceManagerEnginePrivate; class Q_LOCATION_EXPORT QPlaceManagerEngine : public QObject @@ -106,4 +110,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/places/qplacerating.h b/src/location/places/qplacerating.h index ad1c8846..cbd72f29 100644 --- a/src/location/places/qplacerating.h +++ b/src/location/places/qplacerating.h @@ -43,10 +43,13 @@ #define QPLACERATING_H #include <QSharedDataPointer> -#include "qmobilityglobal.h" + +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceRatingPrivate; class Q_LOCATION_EXPORT QPlaceRating @@ -75,4 +78,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // QPLACERATING_H diff --git a/src/location/places/qplacereply.h b/src/location/places/qplacereply.h index acacac73..a138579f 100644 --- a/src/location/places/qplacereply.h +++ b/src/location/places/qplacereply.h @@ -42,11 +42,14 @@ #ifndef QPLACEREPLY_H #define QPLACEREPLY_H -#include "qmobilityglobal.h" #include <QObject> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceReplyPrivate; class Q_LOCATION_EXPORT QPlaceReply : public QObject { @@ -104,4 +107,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // QPLACEREPLY_H diff --git a/src/location/places/qplacerequest.h b/src/location/places/qplacerequest.h index e2649adb..d96ef711 100644 --- a/src/location/places/qplacerequest.h +++ b/src/location/places/qplacerequest.h @@ -45,8 +45,12 @@ #include <QMetaType> #include <QSharedDataPointer> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceRequestPrivate; class Q_LOCATION_EXPORT QPlaceRequest @@ -89,4 +93,6 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QPlaceRequest)) +QT_END_HEADER + #endif diff --git a/src/location/places/qplacereview.h b/src/location/places/qplacereview.h index c279d722..b4546182 100644 --- a/src/location/places/qplacereview.h +++ b/src/location/places/qplacereview.h @@ -44,12 +44,15 @@ #include <QSharedDataPointer> #include <QStringList> -#include "qmobilityglobal.h" #include "qplacesupplier.h" #include "qplacecontent.h" +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceReviewPrivate; class Q_LOCATION_EXPORT QPlaceReview : public QPlaceContent @@ -91,4 +94,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // QPLACEREVIEW_H diff --git a/src/location/places/qplacesearchreply.h b/src/location/places/qplacesearchreply.h index 100c78a1..b44159ce 100644 --- a/src/location/places/qplacesearchreply.h +++ b/src/location/places/qplacesearchreply.h @@ -46,8 +46,12 @@ #include "qplacesearchresult.h" #include "qplacesearchrequest.h" +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceSearchReplyPrivate; class Q_LOCATION_EXPORT QPlaceSearchReply : public QPlaceReply { @@ -71,4 +75,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/places/qplacesearchrequest.h b/src/location/places/qplacesearchrequest.h index 2ff1d17f..62f22055 100644 --- a/src/location/places/qplacesearchrequest.h +++ b/src/location/places/qplacesearchrequest.h @@ -44,15 +44,18 @@ #include <QSharedDataPointer> #include "qgeoboundingarea.h" -#include "qmobilityglobal.h" #include "qplacecategory.h" #include "qplacerequest.h" #include "qplacemanager.h" #include <QString> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceSearchRequestPrivate; class Q_LOCATION_EXPORT QPlaceSearchRequest : public QPlaceRequest @@ -91,4 +94,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // QPLACESEARCHQUERY_H diff --git a/src/location/places/qplacesearchresult.h b/src/location/places/qplacesearchresult.h index a51b6cca..050f7b01 100644 --- a/src/location/places/qplacesearchresult.h +++ b/src/location/places/qplacesearchresult.h @@ -42,15 +42,17 @@ #ifndef QPLACESEARCHRESULT_H #define QPLACESEARCHRESULT_H -#include "qmobilityglobal.h" - #include <QSharedDataPointer> #include <QVariant> #include <QString> #include <QtLocation/QPlace> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceSearchResultPrivate; class Q_LOCATION_EXPORT QPlaceSearchResult @@ -101,4 +103,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // QPLACESEARCHRESULT_H diff --git a/src/location/places/qplacesupplier.h b/src/location/places/qplacesupplier.h index 340e7559..d6476527 100644 --- a/src/location/places/qplacesupplier.h +++ b/src/location/places/qplacesupplier.h @@ -43,10 +43,13 @@ #define QPLACESUPPLIER_H #include <QSharedDataPointer> -#include "qmobilityglobal.h" + +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QUrl; class QPlaceSupplierPrivate; @@ -80,4 +83,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // QPLACESUPPLIER_H diff --git a/src/location/places/qplacetextpredictionreply.h b/src/location/places/qplacetextpredictionreply.h index f457999c..053fc5f8 100644 --- a/src/location/places/qplacetextpredictionreply.h +++ b/src/location/places/qplacetextpredictionreply.h @@ -46,8 +46,12 @@ #include <QStringList> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceTextPredictionReplyPrivate; class Q_LOCATION_EXPORT QPlaceTextPredictionReply : public QPlaceReply @@ -70,4 +74,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif |