diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-09-23 13:27:10 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-26 10:16:07 +0200 |
commit | 7f41a59ee2a2584fbc1b1e4a53ae6d7cfbf7e97b (patch) | |
tree | 73b7c0fedd7e83d0bbfb24eb3c28de33e9cc1040 | |
parent | ea1eb7b2d3589fb8bb3f4bb929991928ba51ce5f (diff) | |
download | qtlocation-7f41a59ee2a2584fbc1b1e4a53ae6d7cfbf7e97b.tar.gz |
Fix public headers.
Add QT_{BEGIN,END}_HEADER
Add QT_{BEGIN,END}_NAMESPACE
Add QT_MODULE(Location)
Change-Id: Ib12682b847d9439c0e55e78fdf8a71ee8406c282
Reviewed-on: http://codereview.qt-project.org/5435
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
78 files changed, 327 insertions, 152 deletions
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.h b/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.h index 08e39d3b..a16ab1de 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.h @@ -44,8 +44,12 @@ #include "qdeclarativeplacecontentmodel.h" +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QDeclarativePlaceEditorialModel : public QDeclarativePlaceContentModel { Q_OBJECT @@ -65,4 +69,6 @@ public: QT_END_NAMESPACE +QT_END_HEADER + #endif // QDECLARATIVEPLACEEDITORIALMODEL_H diff --git a/src/location/location.pro b/src/location/location.pro index 9746cec2..2012769d 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -34,7 +34,9 @@ PUBLIC_HEADERS += \ qgeosatelliteinfo.h \ qgeosatelliteinfosource.h \ qnmeapositioninfosource.h \ - qgeopositioninfosourcefactory.h + qgeopositioninfosourcefactory.h \ + qlatin1constant.h \ + qmobilitypluginsearch.h PRIVATE_HEADERS += \ qgeoaddress_p.h \ diff --git a/src/location/maps/qgeocodereply.h b/src/location/maps/qgeocodereply.h index 75e1aa50..6a2c6d82 100644 --- a/src/location/maps/qgeocodereply.h +++ b/src/location/maps/qgeocodereply.h @@ -47,8 +47,12 @@ #include <QObject> #include <QList> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGeocodeReplyPrivate; class Q_LOCATION_EXPORT QGeocodeReply : public QObject @@ -105,4 +109,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h index 63a3227e..c043a6a7 100644 --- a/src/location/maps/qgeocodingmanager.h +++ b/src/location/maps/qgeocodingmanager.h @@ -49,7 +49,12 @@ #include <QList> #include <QMap> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE + +QT_MODULE(Location) + class QLocale; class QGeocodingManagerEngine; @@ -95,4 +100,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/maps/qgeocodingmanagerengine.h b/src/location/maps/qgeocodingmanagerengine.h index bbc3105c..2db024d4 100644 --- a/src/location/maps/qgeocodingmanagerengine.h +++ b/src/location/maps/qgeocodingmanagerengine.h @@ -49,8 +49,12 @@ #include <QObject> #include <QList> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGeocodingManagerEnginePrivate; class Q_LOCATION_EXPORT QGeocodingManagerEngine : public QObject @@ -100,4 +104,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h index 89d11fe1..dd9a9e67 100644 --- a/src/location/maps/qgeomaneuver.h +++ b/src/location/maps/qgeomaneuver.h @@ -42,14 +42,14 @@ #ifndef QGEOMANEUVER_H #define QGEOMANEUVER_H -#include "qmobilityglobal.h" - #include <QExplicitlySharedDataPointer> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE + +QT_MODULE(Location) + class QString; class QGeoCoordinate; diff --git a/src/location/maps/qgeomappingmanager.h b/src/location/maps/qgeomappingmanager.h index d52231f1..b72860ce 100644 --- a/src/location/maps/qgeomappingmanager.h +++ b/src/location/maps/qgeomappingmanager.h @@ -42,16 +42,16 @@ #ifndef QGEOMAPPINGMANAGER_H #define QGEOMAPPINGMANAGER_H -//#include "qgraphicsgeomap.h" - -#include "qmobilityglobal.h" - #include <QObject> #include <QSize> #include <QPair> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QLocale; class QGeoBoundingBox; @@ -101,7 +101,7 @@ public: void setLocale(const QLocale &locale); QLocale locale() const; -signals: +Q_SIGNALS: void tileFinished(const TileSpec &spec, const QByteArray &bytes); void tileError(const TileSpec &spec, const QString &errorString); void queueFinished(); @@ -117,4 +117,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/maps/qgeomappingmanager_p.h b/src/location/maps/qgeomappingmanager_p.h index 2502c31c..1e559b15 100644 --- a/src/location/maps/qgeomappingmanager_p.h +++ b/src/location/maps/qgeomappingmanager_p.h @@ -53,8 +53,6 @@ // We mean it. // -#include "qmobilityglobal.h" - #include <QSize> #include <QList> #include <QThread> diff --git a/src/location/maps/qgeomappingmanagerengine.h b/src/location/maps/qgeomappingmanagerengine.h index daf6a6cd..459feff1 100644 --- a/src/location/maps/qgeomappingmanagerengine.h +++ b/src/location/maps/qgeomappingmanagerengine.h @@ -42,16 +42,16 @@ #ifndef QGEOMAPPINGMANAGERENGINE_H #define QGEOMAPPINGMANAGERENGINE_H -//#include "qgraphicsgeomap.h" - -#include "qmobilityglobal.h" - #include <QObject> #include <QSize> #include <QPair> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QLocale; class QGeoBoundingBox; @@ -97,15 +97,15 @@ public: virtual void init(); -public slots: +public Q_SLOTS: void threadStarted(); void requestTiles(const QList<TileSpec> &tiles); -private slots: +private Q_SLOTS: void requestNextTile(); void finished(); -signals: +Q_SIGNALS: void tileFinished(const TileSpec &spec, const QByteArray &bytes); void tileError(const TileSpec &spec, const QString &errorString); void queueFinished(); @@ -145,4 +145,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h index 14eefdcc..670c4ce0 100644 --- a/src/location/maps/qgeoroute.h +++ b/src/location/maps/qgeoroute.h @@ -53,6 +53,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGeoBoundingBox; class QGeoRouteSegment; diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h index f69c6600..888f95d6 100644 --- a/src/location/maps/qgeoroutereply.h +++ b/src/location/maps/qgeoroutereply.h @@ -51,6 +51,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGeoRouteRequest; class QGeoRouteReplyPrivate; diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h index 798f09f7..dfcbde06 100644 --- a/src/location/maps/qgeorouterequest.h +++ b/src/location/maps/qgeorouterequest.h @@ -42,8 +42,6 @@ #ifndef QGEOROUTEREQUEST_H #define QGEOROUTEREQUEST_H -#include "qmobilityglobal.h" - #include <QList> #include <QExplicitlySharedDataPointer> #include <QDateTime> @@ -52,6 +50,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGeoCoordinate; class QGeoBoundingBox; class QGeoRouteRequestPrivate; diff --git a/src/location/maps/qgeoroutesegment.h b/src/location/maps/qgeoroutesegment.h index c9ebcc98..900563d9 100644 --- a/src/location/maps/qgeoroutesegment.h +++ b/src/location/maps/qgeoroutesegment.h @@ -42,8 +42,6 @@ #ifndef QGEOROUTESEGMENT_H #define QGEOROUTESEGMENT_H -#include "qmobilityglobal.h" - #include <QExplicitlySharedDataPointer> #include <QList> @@ -51,6 +49,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGeoCoordinate; class QGeoManeuver; class QGeoRouteSegmentPrivate; diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h index 7a908ed9..4ada532b 100644 --- a/src/location/maps/qgeoroutingmanager.h +++ b/src/location/maps/qgeoroutingmanager.h @@ -48,8 +48,12 @@ #include <QObject> #include <QMap> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QLocale; class QGeoRoutingManagerEngine; @@ -95,4 +99,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/maps/qgeoroutingmanager_p.h b/src/location/maps/qgeoroutingmanager_p.h index 9f947c72..a225a329 100644 --- a/src/location/maps/qgeoroutingmanager_p.h +++ b/src/location/maps/qgeoroutingmanager_p.h @@ -53,8 +53,6 @@ // We mean it. // -#include "qmobilityglobal.h" - QT_BEGIN_NAMESPACE class QGeoRoutingManagerEngine; diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h index 7e0c3ef0..3c028bed 100644 --- a/src/location/maps/qgeoroutingmanagerengine.h +++ b/src/location/maps/qgeoroutingmanagerengine.h @@ -48,8 +48,12 @@ #include <QObject> #include <QMap> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QLocale; class QGeoRoutingManagerEnginePrivate; @@ -107,4 +111,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h index 3298fa4d..d43b08a1 100644 --- a/src/location/maps/qgeoserviceprovider.h +++ b/src/location/maps/qgeoserviceprovider.h @@ -42,17 +42,16 @@ #ifndef QGEOSERVICEPROVIDER_H #define QGEOSERVICEPROVIDER_H -#include "qmobilityglobal.h" - #include <QMap> #include <QVariant> #include <QString> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QStringList; class QGeocodingManager; class QGeoMappingManager; diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h index a30be590..77b342a0 100644 --- a/src/location/maps/qgeoserviceproviderfactory.h +++ b/src/location/maps/qgeoserviceproviderfactory.h @@ -42,15 +42,18 @@ #ifndef QGEOSERVICEPROVIDERFACTORY_H #define QGEOSERVICEPROVIDERFACTORY_H -#include "qmobilityglobal.h" #include "qgeoserviceprovider.h" #include <QtPlugin> #include <QMap> #include <QString> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class Q_LOCATION_EXPORT QGeoServiceProviderFactory { public: @@ -73,11 +76,11 @@ public: QString *errorString) const; }; -QT_END_NAMESPACE - -QT_BEGIN_NAMESPACE #define QT_GEOSERVICE_BACKEND_INTERFACE "com.nokia.qt.mobility.geoservice.serviceproviderfactory/1.0" Q_DECLARE_INTERFACE(QGeoServiceProviderFactory, QT_GEOSERVICE_BACKEND_INTERFACE); + QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/maps/qgeotiledmapreply.h b/src/location/maps/qgeotiledmapreply.h index e55fa4ef..eae73cbc 100644 --- a/src/location/maps/qgeotiledmapreply.h +++ b/src/location/maps/qgeotiledmapreply.h @@ -46,8 +46,12 @@ #include <QObject> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class TileSpec; class QGeoTiledMapReplyPrivate; @@ -100,4 +104,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/mapsgl/cameradata.h b/src/location/mapsgl/cameradata.h index a47dea80..57d57e7c 100644 --- a/src/location/mapsgl/cameradata.h +++ b/src/location/mapsgl/cameradata.h @@ -41,8 +41,6 @@ #ifndef CAMERADATA_H #define CAMERADATA_H -#include "qmobilityglobal.h" - #include "qgeocoordinate.h" #include <QMetaType> @@ -50,8 +48,12 @@ #include <QSharedPointer> #include <QSharedDataPointer> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class Projection; class CameraDataPrivate; @@ -102,4 +104,6 @@ Q_DECLARE_METATYPE(CameraData) QT_END_NAMESPACE +QT_END_HEADER + #endif // CAMERADATA_H diff --git a/src/location/mapsgl/frustum_p.h b/src/location/mapsgl/frustum_p.h index ca091a11..7f778894 100644 --- a/src/location/mapsgl/frustum_p.h +++ b/src/location/mapsgl/frustum_p.h @@ -52,8 +52,6 @@ // We mean it. // -#include "qmobilityglobal.h" - #include <QVector3D> #include <QHash> diff --git a/src/location/mapsgl/map.h b/src/location/mapsgl/map.h index 8d2b9af9..f6e86146 100644 --- a/src/location/mapsgl/map.h +++ b/src/location/mapsgl/map.h @@ -45,8 +45,12 @@ #include "cameradata.h" +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGeoCoordinate; class QGeoMappingManager; @@ -93,11 +97,11 @@ public: QGeoCoordinate screenPositionToCoordinate(const QPointF &pos) const; QPointF coordinateToScreenPosition(const QGeoCoordinate &coordinate) const; -public slots: +public Q_SLOTS: void clearCache(); void update(); -signals: +Q_SIGNALS: void updateRequired(); void updatesFinished(); void cameraDataChanged(const CameraData &cameraData); @@ -108,4 +112,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // MAP_H diff --git a/src/location/mapsgl/mapitem.h b/src/location/mapsgl/mapitem.h index edb7f7a2..c9aa0da3 100644 --- a/src/location/mapsgl/mapitem.h +++ b/src/location/mapsgl/mapitem.h @@ -46,8 +46,12 @@ #include <QSizeF> #include <QtOpenGL/qgl.h> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGLTexture2D; class QGLMaterial; class QGLSceneNode; @@ -92,4 +96,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // MAPITEM_H diff --git a/src/location/mapsgl/tile.h b/src/location/mapsgl/tile.h index f259d2f7..8a3f38d6 100644 --- a/src/location/mapsgl/tile.h +++ b/src/location/mapsgl/tile.h @@ -45,8 +45,12 @@ #include "tilespec.h" +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGLTexture2D; class QGLSceneNode; @@ -80,4 +84,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // TILE_H diff --git a/src/location/mapsgl/tilecache.h b/src/location/mapsgl/tilecache.h index 059acc5c..02bb8e06 100644 --- a/src/location/mapsgl/tilecache.h +++ b/src/location/mapsgl/tilecache.h @@ -41,12 +41,16 @@ #ifndef TILECACHE_H #define TILECACHE_H -#include "qmobilityglobal.h" - #include <QObject> #include <QCache> #include <QSet> +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Location) + class QGeoMappingManager; class TileSpec; @@ -95,11 +99,11 @@ public: void evictFromMemoryCache(TileMemory *tm); void evictFromTextureCache(TileTexture *tt); -private slots: +private Q_SLOTS: void insert(const TileSpec &spec, const QByteArray &bytes); void handleError(const TileSpec &spec, const QString &errorString); -signals: +Q_SIGNALS: void beginPrefetch(const QList<TileSpec> &tiles); void tileFetched(const TileSpec &spec); void prefetchingFinished(); @@ -130,5 +134,8 @@ private: QGeoMappingManager *manager_; }; +QT_END_NAMESPACE + +QT_END_HEADER #endif // TILECACHE_H diff --git a/src/location/mapsgl/tilecamera.h b/src/location/mapsgl/tilecamera.h index 2211dcfb..20718793 100644 --- a/src/location/mapsgl/tilecamera.h +++ b/src/location/mapsgl/tilecamera.h @@ -38,13 +38,18 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #ifndef TILECAMERA_H #define TILECAMERA_H #include "qglobal.h" +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class SphereGeometry; class QGLCamera; class QGLSceneNode; @@ -93,4 +98,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // TILECAMERA_H diff --git a/src/location/mapsgl/tilespec.h b/src/location/mapsgl/tilespec.h index f9555540..2fbea28c 100644 --- a/src/location/mapsgl/tilespec.h +++ b/src/location/mapsgl/tilespec.h @@ -44,8 +44,12 @@ #include <QtCore/qglobal.h> #include <QtCore/QMetaType> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class Q_LOCATION_EXPORT TileSpec { public: @@ -74,8 +78,10 @@ unsigned int qHash(const TileSpec &spec); QDebug operator<<(QDebug, const TileSpec &); +Q_DECLARE_METATYPE(TileSpec) + QT_END_NAMESPACE -Q_DECLARE_METATYPE(TileSpec) +QT_END_HEADER #endif // TILESPEC_H diff --git a/src/location/notificationcallback_s60_p.h b/src/location/notificationcallback_s60_p.h index 79acc316..c75d1186 100644 --- a/src/location/notificationcallback_s60_p.h +++ b/src/location/notificationcallback_s60_p.h @@ -53,7 +53,6 @@ // We mean it. // -#include <qmobilityglobal.h> #include <e32base.h> // For CActive, link against: euser.lib #include <lbs.h> #include <lbscommon.h> diff --git a/src/location/notificationmonitorcallback_s60_p.h b/src/location/notificationmonitorcallback_s60_p.h index 64d3030c..d9b67899 100644 --- a/src/location/notificationmonitorcallback_s60_p.h +++ b/src/location/notificationmonitorcallback_s60_p.h @@ -54,7 +54,6 @@ // We mean it. // -#include <qmobilityglobal.h> #include <e32base.h> // For CActive, link against: euser.lib #include <lbs.h> diff --git a/src/location/notificationsatellitecallback_s60_p.h b/src/location/notificationsatellitecallback_s60_p.h index c0f1d690..1b5c1c54 100644 --- a/src/location/notificationsatellitecallback_s60_p.h +++ b/src/location/notificationsatellitecallback_s60_p.h @@ -53,7 +53,6 @@ // We mean it. // -#include "qmobilityglobal.h" #include <e32base.h> // For CActive, link against: euser.lib #include <lbs.h> #include <lbscommon.h> 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 diff --git a/src/location/qgeoaddress.h b/src/location/qgeoaddress.h index b7825f35..3b558ab8 100644 --- a/src/location/qgeoaddress.h +++ b/src/location/qgeoaddress.h @@ -42,12 +42,14 @@ #ifndef QGEOADDRESS_H #define QGEOADDRESS_H -#include "qmobilityglobal.h" #include <QSharedDataPointer> +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QString; class QGeoAddressPrivate; class Q_LOCATION_EXPORT QGeoAddress @@ -106,4 +108,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/qgeoaddress_p.h b/src/location/qgeoaddress_p.h index 5e5d0148..56f9bd81 100644 --- a/src/location/qgeoaddress_p.h +++ b/src/location/qgeoaddress_p.h @@ -56,8 +56,6 @@ #include <QString> #include <QSharedData> -#include "qmobilityglobal.h" - QT_BEGIN_NAMESPACE class QGeoAddressPrivate : public QSharedData diff --git a/src/location/qgeoareamonitor.h b/src/location/qgeoareamonitor.h index 8c509459..ad640452 100644 --- a/src/location/qgeoareamonitor.h +++ b/src/location/qgeoareamonitor.h @@ -41,7 +41,6 @@ #ifndef QGEOAREAMONITOR_H #define QGEOAREAMONITOR_H -#include "qmobilityglobal.h" #include "qgeocoordinate.h" #include <QObject> @@ -50,6 +49,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGeoPositionInfo; class QGeoAreaMonitorPrivate; class Q_LOCATION_EXPORT QGeoAreaMonitor : public QObject diff --git a/src/location/qgeoboundingarea.h b/src/location/qgeoboundingarea.h index dd581e65..1cfd158b 100644 --- a/src/location/qgeoboundingarea.h +++ b/src/location/qgeoboundingarea.h @@ -42,7 +42,6 @@ #ifndef QGEOBOUNDINGAREA_H #define QGEOBOUNDINGAREA_H -#include "qmobilityglobal.h" #include "qgeocoordinate.h" #include <QSharedDataPointer> @@ -51,6 +50,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGeoBoundingAreaPrivate; class Q_LOCATION_EXPORT QGeoBoundingArea { diff --git a/src/location/qgeoboundingbox.h b/src/location/qgeoboundingbox.h index 91a6ad0b..d0898c52 100644 --- a/src/location/qgeoboundingbox.h +++ b/src/location/qgeoboundingbox.h @@ -50,6 +50,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGeoCoordinate; class QGeoBoundingBoxPrivate; diff --git a/src/location/qgeoboundingcircle.h b/src/location/qgeoboundingcircle.h index 5686b016..6f014b5b 100644 --- a/src/location/qgeoboundingcircle.h +++ b/src/location/qgeoboundingcircle.h @@ -50,6 +50,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGeoCoordinate; class QGeoBoundingCirclePrivate; diff --git a/src/location/qgeocoordinate.h b/src/location/qgeocoordinate.h index 89075d43..1a0f6c97 100644 --- a/src/location/qgeocoordinate.h +++ b/src/location/qgeocoordinate.h @@ -38,16 +38,18 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #ifndef QGEOCOORDINATE_H #define QGEOCOORDINATE_H -#include "qmobilityglobal.h" - #include <QString> QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QDebug; class QDataStream; diff --git a/src/location/qgeocoordinate_p.h b/src/location/qgeocoordinate_p.h index 631605f0..ee47fa69 100644 --- a/src/location/qgeocoordinate_p.h +++ b/src/location/qgeocoordinate_p.h @@ -53,7 +53,6 @@ // We mean it. // -#include "qmobilityglobal.h" #include "qgeocoordinate.h" QT_BEGIN_NAMESPACE diff --git a/src/location/qgeolocation.h b/src/location/qgeolocation.h index 294b7975..d7fd0725 100644 --- a/src/location/qgeolocation.h +++ b/src/location/qgeolocation.h @@ -49,10 +49,13 @@ #include "qgeoaddress.h" #include "qgeocoordinate.h" #include "qgeoboundingbox.h" -#include "qmobilityglobal.h" + +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGeoLocationPrivate; class Q_LOCATION_EXPORT QGeoLocation @@ -85,4 +88,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/qgeopositioninfo.h b/src/location/qgeopositioninfo.h index 4fb5502b..0e237902 100644 --- a/src/location/qgeopositioninfo.h +++ b/src/location/qgeopositioninfo.h @@ -41,14 +41,16 @@ #ifndef QGEOPOSITIONINFO_H #define QGEOPOSITIONINFO_H -#include "qmobilityglobal.h" #include "qgeocoordinate.h" #include <QDateTime> QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QDebug; class QDataStream; diff --git a/src/location/qgeopositioninfosource.h b/src/location/qgeopositioninfosource.h index 00554293..7daa4908 100644 --- a/src/location/qgeopositioninfosource.h +++ b/src/location/qgeopositioninfosource.h @@ -41,7 +41,6 @@ #ifndef QGEOPOSITIONINFOSOURCE_H #define QGEOPOSITIONINFOSOURCE_H -#include "qmobilityglobal.h" #include "qgeopositioninfo.h" #include <QObject> @@ -50,6 +49,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGeoPositionInfoSourcePrivate; class Q_LOCATION_EXPORT QGeoPositionInfoSource : public QObject { diff --git a/src/location/qgeopositioninfosourcefactory.h b/src/location/qgeopositioninfosourcefactory.h index e2120367..57aa00c8 100644 --- a/src/location/qgeopositioninfosourcefactory.h +++ b/src/location/qgeopositioninfosourcefactory.h @@ -42,13 +42,16 @@ #ifndef QGEOPOSITIONINFOSOURCEFACTORY_H #define QGEOPOSITIONINFOSOURCEFACTORY_H -#include "qmobilityglobal.h" #include "qgeopositioninfosource.h" #include "qgeosatelliteinfosource.h" #include <QList> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class Q_LOCATION_EXPORT QGeoPositionInfoSourceFactory { public: @@ -62,11 +65,11 @@ public: virtual QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent) = 0; }; -QT_END_NAMESPACE - -QT_BEGIN_NAMESPACE #define QT_POSITION_SOURCE_INTERFACE "com.nokia.qt.mobility.position.sourcefactory/1.0" Q_DECLARE_INTERFACE(QGeoPositionInfoSourceFactory, QT_POSITION_SOURCE_INTERFACE); + QT_END_NAMESPACE +QT_END_HEADER + #endif // QGEOPOSITIONINFOSOURCEFACTORY_H diff --git a/src/location/qgeosatelliteinfo.h b/src/location/qgeosatelliteinfo.h index 061b9355..f3af4df3 100644 --- a/src/location/qgeosatelliteinfo.h +++ b/src/location/qgeosatelliteinfo.h @@ -41,14 +41,17 @@ #ifndef QGEOSATELLITEINFO_H #define QGEOSATELLITEINFO_H -#include "qmobilityglobal.h" +#include <QtCore/QtGlobal> -QT_BEGIN_NAMESPACE QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Location) + class QDebug; class QDataStream; - class QGeoSatelliteInfoPrivate; class Q_LOCATION_EXPORT QGeoSatelliteInfo { diff --git a/src/location/qgeosatelliteinfosource.h b/src/location/qgeosatelliteinfosource.h index aca4cea8..7bc2fab0 100644 --- a/src/location/qgeosatelliteinfosource.h +++ b/src/location/qgeosatelliteinfosource.h @@ -41,17 +41,17 @@ #ifndef QGEOSATELLITEINFOSOURCE_H #define QGEOSATELLITEINFOSOURCE_H -#include "qmobilityglobal.h" #include "qgeosatelliteinfo.h" #include <QObject> #include <QList> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QGeoSatelliteInfoSourcePrivate; class Q_LOCATION_EXPORT QGeoSatelliteInfoSource : public QObject { diff --git a/src/location/qlatin1constant.h b/src/location/qlatin1constant.h index f461b983..7b0562ef 100644 --- a/src/location/qlatin1constant.h +++ b/src/location/qlatin1constant.h @@ -45,8 +45,12 @@ #include <QString> #include <QVariant> +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + /* * QLatin1Constant * @@ -160,4 +164,6 @@ template<int N> bool operator!=(const QString& b, const QLatin1Constant<N>& a) QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/qlocationdata_simulator_p.h b/src/location/qlocationdata_simulator_p.h index 85156cf5..6d45ddd7 100644 --- a/src/location/qlocationdata_simulator_p.h +++ b/src/location/qlocationdata_simulator_p.h @@ -53,7 +53,6 @@ // We mean it. // -#include "qmobilityglobal.h" #include <QtCore/QMetaType> #include <QtCore/QDateTime> #include <QtCore/QList> diff --git a/src/location/qlocationutils_p.h b/src/location/qlocationutils_p.h index ff410846..dd949828 100644 --- a/src/location/qlocationutils_p.h +++ b/src/location/qlocationutils_p.h @@ -52,7 +52,7 @@ // We mean it. // -#include "qmobilityglobal.h" +#include <QtCore/QtGlobal> QT_BEGIN_NAMESPACE class QTime; diff --git a/src/location/qmobilityglobal.h b/src/location/qmobilityglobal.h deleted file mode 100644 index ab176c51..00000000 --- a/src/location/qmobilityglobal.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtLocation module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QMOBILITYGLOBAL_H -#define QMOBILITYGLOBAL_H - -#include <QtCore/qglobal.h> - -// The namespace is hardcoded as moc has issues resolving -// macros which would be a prerequisite for a dynmamic namespace -//#define QTM_NAMESPACE QtMobility -//#define QTM_NAMESPACE - -/*#ifdef QTM_NAMESPACE -# define QTM_PREPEND_NAMESPACE(name) ::QTM_NAMESPACE::name -# define QT_BEGIN_NAMESPACE namespace QTM_NAMESPACE { -# define QT_END_NAMESPACE } -# define QTM_USE_NAMESPACE using namespace QTM_NAMESPACE; -#else -# define QTM_PREPEND_NAMESPACE(name) ::name -# define QT_BEGIN_NAMESPACE -# define QT_END_NAMESPACE -# define QTM_USE_NAMESPACE -#endif*/ - -//in case Qt is in namespace -//QT_USE_NAMESPACE - -#endif // QMOBILITYGLOBAL_H - diff --git a/src/location/qmobilitypluginsearch.h b/src/location/qmobilitypluginsearch.h index 0fd2202b..0ccdf606 100644 --- a/src/location/qmobilitypluginsearch.h +++ b/src/location/qmobilitypluginsearch.h @@ -50,8 +50,12 @@ # include <f32file.h> #endif +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + #if defined(Q_OS_SYMBIAN) static inline bool qSymbian_CheckDir(const QDir& dir, RFs& rfs) { @@ -169,4 +173,6 @@ inline QStringList mobilityPlugins(const QString& plugintype) QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/location/qnmeapositioninfosource.h b/src/location/qnmeapositioninfosource.h index 6bb46ea0..79da9037 100644 --- a/src/location/qnmeapositioninfosource.h +++ b/src/location/qnmeapositioninfosource.h @@ -41,12 +41,14 @@ #ifndef QNMEAPOSITIONINFOSOURCE_H #define QNMEAPOSITIONINFOSOURCE_H -#include "qmobilityglobal.h" #include "qgeopositioninfosource.h" QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QIODevice; class QNmeaPositionInfoSourcePrivate; diff --git a/src/location/qplace.h b/src/location/qplace.h index 4affa799..7ba94b49 100644 --- a/src/location/qplace.h +++ b/src/location/qplace.h @@ -55,8 +55,12 @@ #include "qplacereview.h" #include "qplaceattribute.h" +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QString; class QPlacePrivate; @@ -124,4 +128,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/plugins/geoservices/nokia/places/qplacecategoriesrepository.h b/src/plugins/geoservices/nokia/places/qplacecategoriesrepository.h index 7ede83e3..6bd65dc1 100644 --- a/src/plugins/geoservices/nokia/places/qplacecategoriesrepository.h +++ b/src/plugins/geoservices/nokia/places/qplacecategoriesrepository.h @@ -53,14 +53,17 @@ #include <QWeakPointer> #include <QList> -#include <qmobilityglobal.h> #include <qplacecategory.h> #include <qplacereply.h> #include "qplacejsoncategoriesparser.h" #include "qplacecategoriesreplyimpl.h" +QT_BEGIN_HEADER + QT_BEGIN_NAMESPACE +QT_MODULE(Location) + class QPlaceCategoriesRepository : public QObject { Q_OBJECT @@ -92,4 +95,6 @@ private: QT_END_NAMESPACE +QT_END_HEADER + #endif // QPLACECATEGORIESREPOSITORY_H diff --git a/src/plugins/geoservices/nokia/places/qplacejsoncategoriesparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsoncategoriesparser.cpp index 4a994d97..691c8729 100644 --- a/src/plugins/geoservices/nokia/places/qplacejsoncategoriesparser.cpp +++ b/src/plugins/geoservices/nokia/places/qplacejsoncategoriesparser.cpp @@ -51,7 +51,6 @@ #include <QtScript/QScriptEngine> #include <QtScript/QScriptValue> #include <QtScript/QScriptValueIterator> -#include <qmobilityglobal.h> #if defined(QT_PLACES_LOGGING) #include <QDebug> diff --git a/src/plugins/geoservices/nokia/places/qplacejsontextpredictionparser.h b/src/plugins/geoservices/nokia/places/qplacejsontextpredictionparser.h index 1081631f..245c485f 100644 --- a/src/plugins/geoservices/nokia/places/qplacejsontextpredictionparser.h +++ b/src/plugins/geoservices/nokia/places/qplacejsontextpredictionparser.h @@ -52,7 +52,6 @@ #include <QObject> #include <QStringList> -#include <qmobilityglobal.h> #include "qplacejsonparser_p.h" class QScriptEngine; diff --git a/src/plugins/geoservices/nokia/places/qplacerestmanager.h b/src/plugins/geoservices/nokia/places/qplacerestmanager.h index 9da7b8f9..e8b1ab55 100644 --- a/src/plugins/geoservices/nokia/places/qplacerestmanager.h +++ b/src/plugins/geoservices/nokia/places/qplacerestmanager.h @@ -55,7 +55,6 @@ #include <QtNetwork/QNetworkAccessManager> #include <QtNetwork/QNetworkReply> -#include <qmobilityglobal.h> #include <qplacesearchrequest.h> #include "qplacerestreply.h" diff --git a/src/plugins/geoservices/nokia/places/qplacerestreply.h b/src/plugins/geoservices/nokia/places/qplacerestreply.h index 8318c8be..449d45bb 100644 --- a/src/plugins/geoservices/nokia/places/qplacerestreply.h +++ b/src/plugins/geoservices/nokia/places/qplacerestreply.h @@ -55,8 +55,6 @@ #include <QtNetwork/QNetworkAccessManager> #include <QtNetwork/QNetworkReply> -#include <qmobilityglobal.h> - QT_BEGIN_NAMESPACE class QPlaceRestReply : public QObject diff --git a/src/plugins/geoservices/nokia/places/qplacesuppliersrepository.h b/src/plugins/geoservices/nokia/places/qplacesuppliersrepository.h index 2fb720f7..6971e1ef 100644 --- a/src/plugins/geoservices/nokia/places/qplacesuppliersrepository.h +++ b/src/plugins/geoservices/nokia/places/qplacesuppliersrepository.h @@ -53,7 +53,6 @@ #include <QList> #include <qplacesupplier.h> -#include <qmobilityglobal.h> QT_BEGIN_NAMESPACE |