diff options
| author | Alex <qt-info@nokia.com> | 2011-06-21 16:48:56 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2011-06-21 16:48:56 +1000 |
| commit | 8bef1911cf8834cb58d0558611365b0d5ae4e443 (patch) | |
| tree | 938e646f30e158ed02f26503e1d897b84e17f964 | |
| parent | 8481a67b62c40d801696e788dc43c659b235defa (diff) | |
make QtLocation work while Qt is compiled with namespace
Task-number: QTBUG-19972
372 files changed, 881 insertions, 821 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index 8751e5df..89b8d085 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -78,7 +78,6 @@ #include <QDebug> QT_BEGIN_NAMESPACE -QTM_USE_NAMESPACE class QLocationDeclarativeModule: public QDeclarativeExtensionPlugin { diff --git a/src/imports/location/qdeclarativecoordinate.cpp b/src/imports/location/qdeclarativecoordinate.cpp index 31aec957..2a77d32b 100644 --- a/src/imports/location/qdeclarativecoordinate.cpp +++ b/src/imports/location/qdeclarativecoordinate.cpp @@ -43,7 +43,7 @@ #include <qnumeric.h> #include "qdeclarative.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Coordinate @@ -176,5 +176,5 @@ qreal QDeclarativeCoordinate::distanceTo(QObject* coordinate) #include "moc_qdeclarativecoordinate_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativecoordinate_p.h b/src/imports/location/qdeclarativecoordinate_p.h index c1bf61d9..e1655086 100644 --- a/src/imports/location/qdeclarativecoordinate_p.h +++ b/src/imports/location/qdeclarativecoordinate_p.h @@ -47,7 +47,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeCoordinate : public QObject { @@ -85,8 +85,8 @@ private: QGeoCoordinate m_coordinate; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeCoordinate)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCoordinate)); #endif diff --git a/src/imports/location/qdeclarativegeoaddress.cpp b/src/imports/location/qdeclarativegeoaddress.cpp index 621a101c..ab15ea04 100644 --- a/src/imports/location/qdeclarativegeoaddress.cpp +++ b/src/imports/location/qdeclarativegeoaddress.cpp @@ -41,7 +41,7 @@ #include "qdeclarativegeoaddress_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Address QDeclarativeGeoAddress @@ -245,4 +245,4 @@ void QDeclarativeGeoAddress::setPostcode(const QString& postcode) #include "moc_qdeclarativegeoaddress_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoaddress_p.h b/src/imports/location/qdeclarativegeoaddress_p.h index b750fb3c..1be9fddd 100644 --- a/src/imports/location/qdeclarativegeoaddress_p.h +++ b/src/imports/location/qdeclarativegeoaddress_p.h @@ -46,7 +46,7 @@ #include <QtCore> #include <QtDeclarative/qdeclarative.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoAddress : public QObject { @@ -97,7 +97,7 @@ private: QGeoAddress m_address; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoAddress)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoAddress)); #endif // QDECLARATIVEGEOADDRESS_P_H diff --git a/src/imports/location/qdeclarativegeoboundingbox.cpp b/src/imports/location/qdeclarativegeoboundingbox.cpp index f454877d..aab4a78d 100644 --- a/src/imports/location/qdeclarativegeoboundingbox.cpp +++ b/src/imports/location/qdeclarativegeoboundingbox.cpp @@ -42,7 +42,7 @@ #include <qnumeric.h> #include "qdeclarativegeoboundingbox_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass BoundingBox QDeclarativeGeoBoundingBox @@ -277,4 +277,4 @@ void QDeclarativeGeoBoundingBox::synchronizeDeclarative() #include "moc_qdeclarativegeoboundingbox_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoboundingbox_p.h b/src/imports/location/qdeclarativegeoboundingbox_p.h index 39ea80dc..f7689dcc 100644 --- a/src/imports/location/qdeclarativegeoboundingbox_p.h +++ b/src/imports/location/qdeclarativegeoboundingbox_p.h @@ -48,7 +48,7 @@ #include <QtCore> #include <QtDeclarative/qdeclarative.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoBoundingBox : public QObject { @@ -106,7 +106,7 @@ private: double m_width; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoBoundingBox)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoBoundingBox)); #endif // QDECLARATIVEGEOBOUNDINGBOX_P_H diff --git a/src/imports/location/qdeclarativegeoboundingcircle.cpp b/src/imports/location/qdeclarativegeoboundingcircle.cpp index 2ef547b7..901b5f3c 100644 --- a/src/imports/location/qdeclarativegeoboundingcircle.cpp +++ b/src/imports/location/qdeclarativegeoboundingcircle.cpp @@ -42,7 +42,7 @@ #include <qnumeric.h> #include "qdeclarativegeoboundingcircle_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Yippiaiee! TODO @@ -109,4 +109,4 @@ void QDeclarativeGeoBoundingCircle::setRadius(const qreal radius) #include "moc_qdeclarativegeoboundingcircle_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoboundingcircle_p.h b/src/imports/location/qdeclarativegeoboundingcircle_p.h index 0dcb625d..b5b372c4 100644 --- a/src/imports/location/qdeclarativegeoboundingcircle_p.h +++ b/src/imports/location/qdeclarativegeoboundingcircle_p.h @@ -49,7 +49,7 @@ #include <QPointer> #include <QtDeclarative/qdeclarative.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoBoundingCircle : public QObject { @@ -78,7 +78,7 @@ private: QGeoBoundingCircle circle_; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoBoundingCircle)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoBoundingCircle)); #endif diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp index 5cb579e8..e2a90b01 100644 --- a/src/imports/location/qdeclarativegeocodemodel.cpp +++ b/src/imports/location/qdeclarativegeocodemodel.cpp @@ -47,7 +47,7 @@ #include <qgeoserviceprovider.h> #include <qgeosearchmanager.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeocodeModel::QDeclarativeGeocodeModel(QObject* parent) : QAbstractListModel(parent), @@ -380,4 +380,4 @@ void QDeclarativeGeocodeModel::setAutoUpdate(bool update) #include "moc_qdeclarativegeocodemodel_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeocodemodel_p.h b/src/imports/location/qdeclarativegeocodemodel_p.h index 09f4f53b..2f1fd231 100644 --- a/src/imports/location/qdeclarativegeocodemodel_p.h +++ b/src/imports/location/qdeclarativegeocodemodel_p.h @@ -53,7 +53,7 @@ #include <QAbstractListModel> #include <QPointer> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoServiceProvider; class QGeoSearchManager; @@ -165,6 +165,6 @@ private: QDeclarativeGeoAddress* address_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/location/qdeclarativegeomaneuver.cpp b/src/imports/location/qdeclarativegeomaneuver.cpp index 63d08ae8..756479b2 100644 --- a/src/imports/location/qdeclarativegeomaneuver.cpp +++ b/src/imports/location/qdeclarativegeomaneuver.cpp @@ -41,7 +41,7 @@ #include "qdeclarativegeomaneuver_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoManeuver::QDeclarativeGeoManeuver(QObject *parent) : QObject(parent) @@ -97,4 +97,4 @@ QDeclarativeCoordinate* QDeclarativeGeoManeuver::waypoint() const #include "moc_qdeclarativegeomaneuver_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomaneuver_p.h b/src/imports/location/qdeclarativegeomaneuver_p.h index b97016c0..4d7bbefd 100644 --- a/src/imports/location/qdeclarativegeomaneuver_p.h +++ b/src/imports/location/qdeclarativegeomaneuver_p.h @@ -48,7 +48,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoManeuver : public QObject { @@ -98,6 +98,6 @@ private: QDeclarativeCoordinate* waypoint_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/location/qdeclarativegeomapcircleobject.cpp b/src/imports/location/qdeclarativegeomapcircleobject.cpp index 59b64e06..33d40516 100644 --- a/src/imports/location/qdeclarativegeomapcircleobject.cpp +++ b/src/imports/location/qdeclarativegeomapcircleobject.cpp @@ -44,7 +44,7 @@ #include <QColor> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapCircle @@ -239,5 +239,5 @@ void QDeclarativeGeoMapCircleObject::borderWidthChanged(int width) #include "moc_qdeclarativegeomapcircleobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapcircleobject_p.h b/src/imports/location/qdeclarativegeomapcircleobject_p.h index 57027232..a233ba7c 100644 --- a/src/imports/location/qdeclarativegeomapcircleobject_p.h +++ b/src/imports/location/qdeclarativegeomapcircleobject_p.h @@ -50,7 +50,7 @@ class QColor; class QBrush; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapCircleObject : public QDeclarativeGeoMapObject { @@ -95,8 +95,8 @@ private: QDeclarativeGeoMapObjectBorder border_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapCircleObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapCircleObject)); #endif diff --git a/src/imports/location/qdeclarativegeomapgroupobject.cpp b/src/imports/location/qdeclarativegeomapgroupobject.cpp index 29cbb0c8..583eb6ce 100644 --- a/src/imports/location/qdeclarativegeomapgroupobject.cpp +++ b/src/imports/location/qdeclarativegeomapgroupobject.cpp @@ -41,7 +41,7 @@ #include "qdeclarativegeomapgroupobject_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapGroup @@ -241,5 +241,5 @@ void QDeclarativeGeoMapGroupObject::moveEvent(QDeclarativeGeoMapMouseEvent *even #include "moc_qdeclarativegeomapgroupobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapgroupobject_p.h b/src/imports/location/qdeclarativegeomapgroupobject_p.h index 3ccf4db8..0621bf16 100644 --- a/src/imports/location/qdeclarativegeomapgroupobject_p.h +++ b/src/imports/location/qdeclarativegeomapgroupobject_p.h @@ -48,7 +48,7 @@ #include <QtDeclarative/qdeclarative.h> #include <QDeclarativeListProperty> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; @@ -85,8 +85,8 @@ private: QList<QDeclarativeGeoMapObject*> objects_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapGroupObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapGroupObject)); #endif diff --git a/src/imports/location/qdeclarativegeomapmousearea.cpp b/src/imports/location/qdeclarativegeomapmousearea.cpp index eb3c4d21..52dc48ed 100644 --- a/src/imports/location/qdeclarativegeomapmousearea.cpp +++ b/src/imports/location/qdeclarativegeomapmousearea.cpp @@ -45,7 +45,7 @@ #include "qdeclarativegeomapobject_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapMouseArea QDeclarativeGeoMapMouseArea @@ -425,4 +425,4 @@ void QDeclarativeGeoMapMouseArea::moveEvent(QDeclarativeGeoMapMouseEvent *event) #include "moc_qdeclarativegeomapmousearea_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapmousearea_p.h b/src/imports/location/qdeclarativegeomapmousearea_p.h index d7c386c8..7591c076 100644 --- a/src/imports/location/qdeclarativegeomapmousearea_p.h +++ b/src/imports/location/qdeclarativegeomapmousearea_p.h @@ -48,7 +48,7 @@ #include <QtDeclarative/qdeclarativeitem.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapMouseArea : public QDeclarativeItem { @@ -139,8 +139,8 @@ private: QDeclarativeGraphicsGeoMap* map_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapMouseArea)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapMouseArea)); #endif diff --git a/src/imports/location/qdeclarativegeomapmouseevent.cpp b/src/imports/location/qdeclarativegeomapmouseevent.cpp index 51d717f7..dae077d9 100644 --- a/src/imports/location/qdeclarativegeomapmouseevent.cpp +++ b/src/imports/location/qdeclarativegeomapmouseevent.cpp @@ -41,7 +41,7 @@ #include "qdeclarativegeomapmouseevent_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapMouseEvent QDeclarativeGeoMapMouseEvent @@ -199,4 +199,4 @@ QDeclarativeCoordinate* QDeclarativeGeoMapMouseEvent::coordinate() #include "moc_qdeclarativegeomapmouseevent_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapmouseevent_p.h b/src/imports/location/qdeclarativegeomapmouseevent_p.h index 5949e280..c2be2f65 100644 --- a/src/imports/location/qdeclarativegeomapmouseevent_p.h +++ b/src/imports/location/qdeclarativegeomapmouseevent_p.h @@ -46,7 +46,7 @@ #include <QtDeclarative/qdeclarative.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapMouseEvent : public QObject { @@ -95,8 +95,8 @@ private: QDeclarativeCoordinate *coordinate_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapMouseEvent)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapMouseEvent)); #endif diff --git a/src/imports/location/qdeclarativegeomapobject.cpp b/src/imports/location/qdeclarativegeomapobject.cpp index 7ecb0c92..07911e47 100644 --- a/src/imports/location/qdeclarativegeomapobject.cpp +++ b/src/imports/location/qdeclarativegeomapobject.cpp @@ -48,7 +48,7 @@ #include <QAbstractItemModel> #include <QDeclarativeContext> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoMapObject::QDeclarativeGeoMapObject(QDeclarativeItem *parent) : QDeclarativeItem(parent), @@ -481,4 +481,4 @@ qreal QDeclarativeGeoMapObjectView::zValue() #include "moc_qdeclarativegeomapobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapobject_p.h b/src/imports/location/qdeclarativegeomapobject_p.h index e17619ca..933ea792 100644 --- a/src/imports/location/qdeclarativegeomapobject_p.h +++ b/src/imports/location/qdeclarativegeomapobject_p.h @@ -50,7 +50,7 @@ #include <QtDeclarative/qdeclarativeitem.h> class QAbstractItemModel; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGraphicsGeoMap; class QDeclarativeGeoMapMouseArea; @@ -152,8 +152,8 @@ private: QList<QDeclarativeGeoMapObject*> declarativeObjectList_; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapObject)); -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapObjectView)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapObjectView)); #endif diff --git a/src/imports/location/qdeclarativegeomapobjectborder.cpp b/src/imports/location/qdeclarativegeomapobjectborder.cpp index aadb51ec..f40e0e56 100644 --- a/src/imports/location/qdeclarativegeomapobjectborder.cpp +++ b/src/imports/location/qdeclarativegeomapobjectborder.cpp @@ -44,7 +44,7 @@ #include <QColor> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoMapObjectBorder::QDeclarativeGeoMapObjectBorder(QObject *parent) : QObject(parent), @@ -82,5 +82,5 @@ int QDeclarativeGeoMapObjectBorder::width() const #include "moc_qdeclarativegeomapobjectborder_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapobjectborder_p.h b/src/imports/location/qdeclarativegeomapobjectborder_p.h index 75f34a08..ac415cc9 100644 --- a/src/imports/location/qdeclarativegeomapobjectborder_p.h +++ b/src/imports/location/qdeclarativegeomapobjectborder_p.h @@ -48,7 +48,7 @@ #include <QObject> #include <QColor> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapObjectBorder : public QObject { @@ -77,8 +77,8 @@ private: Q_DISABLE_COPY(QDeclarativeGeoMapObjectBorder) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapObjectBorder)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapObjectBorder)); #endif diff --git a/src/imports/location/qdeclarativegeomappixmapobject.cpp b/src/imports/location/qdeclarativegeomappixmapobject.cpp index 4533fe8f..cbcad10a 100644 --- a/src/imports/location/qdeclarativegeomappixmapobject.cpp +++ b/src/imports/location/qdeclarativegeomappixmapobject.cpp @@ -53,7 +53,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapImage @@ -349,5 +349,5 @@ void QDeclarativeGeoMapPixmapObject::error(QNetworkReply::NetworkError error) #include "moc_qdeclarativegeomappixmapobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomappixmapobject_p.h b/src/imports/location/qdeclarativegeomappixmapobject_p.h index bf869efb..bfcee234 100644 --- a/src/imports/location/qdeclarativegeomappixmapobject_p.h +++ b/src/imports/location/qdeclarativegeomappixmapobject_p.h @@ -50,7 +50,7 @@ #include <QUrl> #include <QNetworkReply> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapPixmapObject : public QDeclarativeGeoMapObject { @@ -110,8 +110,8 @@ private: Q_DISABLE_COPY(QDeclarativeGeoMapPixmapObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapPixmapObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapPixmapObject)); #endif diff --git a/src/imports/location/qdeclarativegeomappolygonobject.cpp b/src/imports/location/qdeclarativegeomappolygonobject.cpp index dfea44ef..67ef8c3a 100644 --- a/src/imports/location/qdeclarativegeomappolygonobject.cpp +++ b/src/imports/location/qdeclarativegeomappolygonobject.cpp @@ -47,7 +47,7 @@ #include <QtDeclarative/qdeclarativeinfo.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapPolygon @@ -323,5 +323,5 @@ Q_INVOKABLE void QDeclarativeGeoMapPolygonObject::clearCoordinates() #include "moc_qdeclarativegeomappolygonobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomappolygonobject_p.h b/src/imports/location/qdeclarativegeomappolygonobject_p.h index 700693d5..bd639fc5 100644 --- a/src/imports/location/qdeclarativegeomappolygonobject_p.h +++ b/src/imports/location/qdeclarativegeomappolygonobject_p.h @@ -52,7 +52,7 @@ class QColor; class QBrush; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapPolygonObject : public QDeclarativeGeoMapObject { @@ -103,8 +103,8 @@ private: bool componentCompleted_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapPolygonObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapPolygonObject)); #endif diff --git a/src/imports/location/qdeclarativegeomappolylineobject.cpp b/src/imports/location/qdeclarativegeomappolylineobject.cpp index b10aed43..245f1785 100644 --- a/src/imports/location/qdeclarativegeomappolylineobject.cpp +++ b/src/imports/location/qdeclarativegeomappolylineobject.cpp @@ -47,7 +47,7 @@ #include <QtDeclarative/qdeclarativeinfo.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapPolyline @@ -297,5 +297,5 @@ void QDeclarativeGeoMapPolylineObject::removeCoordinate(QDeclarativeCoordinate* #include "moc_qdeclarativegeomappolylineobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomappolylineobject_p.h b/src/imports/location/qdeclarativegeomappolylineobject_p.h index 7bd63129..2e8f114a 100644 --- a/src/imports/location/qdeclarativegeomappolylineobject_p.h +++ b/src/imports/location/qdeclarativegeomappolylineobject_p.h @@ -52,7 +52,7 @@ class QColor; class QBrush; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapPolylineObject : public QDeclarativeGeoMapObject { @@ -96,8 +96,8 @@ private: bool componentCompleted_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapPolylineObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapPolylineObject)); #endif diff --git a/src/imports/location/qdeclarativegeomaprectangleobject.cpp b/src/imports/location/qdeclarativegeomaprectangleobject.cpp index c49ea49e..393422aa 100644 --- a/src/imports/location/qdeclarativegeomaprectangleobject.cpp +++ b/src/imports/location/qdeclarativegeomaprectangleobject.cpp @@ -47,7 +47,7 @@ #include <QColor> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapRectangle @@ -274,5 +274,5 @@ void QDeclarativeGeoMapRectangleObject::borderWidthChanged(int width) #include "moc_qdeclarativegeomaprectangleobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomaprectangleobject_p.h b/src/imports/location/qdeclarativegeomaprectangleobject_p.h index ccd5a4f3..b9eabf0d 100644 --- a/src/imports/location/qdeclarativegeomaprectangleobject_p.h +++ b/src/imports/location/qdeclarativegeomaprectangleobject_p.h @@ -50,7 +50,7 @@ class QColor; class QBrush; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapRectangleObject : public QDeclarativeGeoMapObject { @@ -101,8 +101,8 @@ private: QDeclarativeGeoMapObjectBorder border_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapRectangleObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapRectangleObject)); #endif diff --git a/src/imports/location/qdeclarativegeomaprouteobject.cpp b/src/imports/location/qdeclarativegeomaprouteobject.cpp index 8739a2cf..e5e00d6c 100644 --- a/src/imports/location/qdeclarativegeomaprouteobject.cpp +++ b/src/imports/location/qdeclarativegeomaprouteobject.cpp @@ -42,7 +42,7 @@ #include <QPen> #include "qdeclarativegeomaprouteobject_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoMapRouteObject::QDeclarativeGeoMapRouteObject(QDeclarativeItem *parent) : QDeclarativeGeoMapObject(parent), route_(0) @@ -104,4 +104,4 @@ quint32 QDeclarativeGeoMapRouteObject::detailLevel() const #include "moc_qdeclarativegeomaprouteobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomaprouteobject_p.h b/src/imports/location/qdeclarativegeomaprouteobject_p.h index 04df9930..e170b9ea 100644 --- a/src/imports/location/qdeclarativegeomaprouteobject_p.h +++ b/src/imports/location/qdeclarativegeomaprouteobject_p.h @@ -47,7 +47,7 @@ #include "qdeclarativegeoroute_p.h" #include "qgeomaprouteobject.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapRouteObject : public QDeclarativeGeoMapObject { @@ -83,8 +83,8 @@ private: QColor color_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapRouteObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapRouteObject)); #endif diff --git a/src/imports/location/qdeclarativegeomaptextobject.cpp b/src/imports/location/qdeclarativegeomaptextobject.cpp index b54943ca..6f609ca2 100644 --- a/src/imports/location/qdeclarativegeomaptextobject.cpp +++ b/src/imports/location/qdeclarativegeomaptextobject.cpp @@ -45,7 +45,7 @@ #include <QPen> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass MapText @@ -402,5 +402,5 @@ void QDeclarativeGeoMapTextObject::setVerticalAlignment(QDeclarativeGeoMapTextOb #include "moc_qdeclarativegeomaptextobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomaptextobject_p.h b/src/imports/location/qdeclarativegeomaptextobject_p.h index 3f54b106..d927b950 100644 --- a/src/imports/location/qdeclarativegeomaptextobject_p.h +++ b/src/imports/location/qdeclarativegeomaptextobject_p.h @@ -48,7 +48,7 @@ #include <QColor> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoMapTextObject : public QDeclarativeGeoMapObject { @@ -123,8 +123,8 @@ private: VerticalAlignment vAlignment_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoMapTextObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoMapTextObject)); #endif diff --git a/src/imports/location/qdeclarativegeoplace.cpp b/src/imports/location/qdeclarativegeoplace.cpp index 7e607207..e09c353f 100644 --- a/src/imports/location/qdeclarativegeoplace.cpp +++ b/src/imports/location/qdeclarativegeoplace.cpp @@ -41,7 +41,7 @@ #include "qdeclarativegeoplace_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Place QDeclarativeGeoPlace @@ -155,4 +155,4 @@ void QDeclarativeGeoPlace::setAddress(QDeclarativeGeoAddress* address) #include "moc_qdeclarativegeoplace_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoplace_p.h b/src/imports/location/qdeclarativegeoplace_p.h index fb638514..1e4de063 100644 --- a/src/imports/location/qdeclarativegeoplace_p.h +++ b/src/imports/location/qdeclarativegeoplace_p.h @@ -50,7 +50,7 @@ #include <QVariant> #include <QtDeclarative/qdeclarative.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoPlace : public QObject { @@ -85,10 +85,10 @@ private: QDeclarativeGeoAddress m_declarativeAddress; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QGeoPlace)) +Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QGeoPlace)) -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoPlace)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoPlace)); #endif // QDECLARATIVEGEOPLACE_P_H diff --git a/src/imports/location/qdeclarativegeoroute.cpp b/src/imports/location/qdeclarativegeoroute.cpp index 3b4e89aa..a211d84a 100644 --- a/src/imports/location/qdeclarativegeoroute.cpp +++ b/src/imports/location/qdeclarativegeoroute.cpp @@ -41,7 +41,7 @@ #include "qdeclarativegeoroute_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoRoute::QDeclarativeGeoRoute(QObject *parent) : QObject(parent) @@ -150,4 +150,4 @@ void QDeclarativeGeoRoute::segments_clear(QDeclarativeListProperty<QDeclarativeG #include "moc_qdeclarativegeoroute_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoroute_p.h b/src/imports/location/qdeclarativegeoroute_p.h index 0f090ccf..f2124b04 100644 --- a/src/imports/location/qdeclarativegeoroute_p.h +++ b/src/imports/location/qdeclarativegeoroute_p.h @@ -50,7 +50,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoRoute : public QObject { @@ -93,6 +93,6 @@ private: friend class QDeclarativeGeoMapRouteObject; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/location/qdeclarativegeoroutemodel.cpp b/src/imports/location/qdeclarativegeoroutemodel.cpp index 45ba1b72..b709b78a 100644 --- a/src/imports/location/qdeclarativegeoroutemodel.cpp +++ b/src/imports/location/qdeclarativegeoroutemodel.cpp @@ -46,7 +46,7 @@ #include <qgeoroutingmanager.h> #include <QtDeclarative/qdeclarativeinfo.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoRouteModel::QDeclarativeGeoRouteModel(QObject *parent) : QAbstractListModel(parent), @@ -697,4 +697,4 @@ QGeoRouteRequest& QDeclarativeGeoRouteQuery::routeRequest() #include "moc_qdeclarativegeoroutemodel_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoroutemodel_p.h b/src/imports/location/qdeclarativegeoroutemodel_p.h index 96143f9e..caff16bf 100644 --- a/src/imports/location/qdeclarativegeoroutemodel_p.h +++ b/src/imports/location/qdeclarativegeoroutemodel_p.h @@ -56,7 +56,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoServiceProvider; class QGeoRoutingManager; @@ -310,6 +310,6 @@ private: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/location/qdeclarativegeoroutesegment.cpp b/src/imports/location/qdeclarativegeoroutesegment.cpp index a88a3239..31c4e0bc 100644 --- a/src/imports/location/qdeclarativegeoroutesegment.cpp +++ b/src/imports/location/qdeclarativegeoroutesegment.cpp @@ -41,7 +41,7 @@ #include "qdeclarativegeoroutesegment_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoRouteSegment::QDeclarativeGeoRouteSegment(QObject *parent) : QObject(parent) @@ -111,4 +111,4 @@ void QDeclarativeGeoRouteSegment::path_clear(QDeclarativeListProperty<QDeclarati #include "moc_qdeclarativegeoroutesegment_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoroutesegment_p.h b/src/imports/location/qdeclarativegeoroutesegment_p.h index bbabd654..810c6e4c 100644 --- a/src/imports/location/qdeclarativegeoroutesegment_p.h +++ b/src/imports/location/qdeclarativegeoroutesegment_p.h @@ -48,7 +48,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoRouteSegment : public QObject { @@ -79,6 +79,6 @@ private: QList<QDeclarativeCoordinate*> path_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/location/qdeclarativegeoroutingmodel.cpp b/src/imports/location/qdeclarativegeoroutingmodel.cpp index 7ec49bf3..288ab1c8 100644 --- a/src/imports/location/qdeclarativegeoroutingmodel.cpp +++ b/src/imports/location/qdeclarativegeoroutingmodel.cpp @@ -45,7 +45,7 @@ #include <qgeoserviceprovider.h> #include <qgeoroutingmanager.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoRoutingModel::QDeclarativeGeoRoutingModel(QObject *parent) : QAbstractListModel(parent), @@ -387,4 +387,4 @@ void QDeclarativeGeoRoutingModel::routingError(QGeoRouteReply *reply, #include "moc_qdeclarativegeoroutingmodel_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoroutingmodel_p.h b/src/imports/location/qdeclarativegeoroutingmodel_p.h index dc233ca8..a3c2a784 100644 --- a/src/imports/location/qdeclarativegeoroutingmodel_p.h +++ b/src/imports/location/qdeclarativegeoroutingmodel_p.h @@ -56,7 +56,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoServiceProvider; class QGeoRoutingManager; @@ -213,6 +213,6 @@ private: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/location/qdeclarativegeosearchmodel.cpp b/src/imports/location/qdeclarativegeosearchmodel.cpp index 476472eb..220fffca 100644 --- a/src/imports/location/qdeclarativegeosearchmodel.cpp +++ b/src/imports/location/qdeclarativegeosearchmodel.cpp @@ -47,7 +47,7 @@ #include <qgeoserviceprovider.h> #include <qgeosearchmanager.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeGeoSearchModel::QDeclarativeGeoSearchModel(QObject* parent) : QAbstractListModel(parent), @@ -218,4 +218,4 @@ void QDeclarativeGeoSearchModel::setPlaces(const QList<QGeoPlace> &places) #include "moc_qdeclarativegeosearchmodel_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeosearchmodel_p.h b/src/imports/location/qdeclarativegeosearchmodel_p.h index d3be1bfb..175a5721 100644 --- a/src/imports/location/qdeclarativegeosearchmodel_p.h +++ b/src/imports/location/qdeclarativegeosearchmodel_p.h @@ -50,7 +50,7 @@ #include <QDeclarativeParserStatus> #include <QAbstractListModel> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoServiceProvider; class QGeoSearchManager; @@ -132,6 +132,6 @@ private: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/imports/location/qdeclarativegeoserviceprovider.cpp b/src/imports/location/qdeclarativegeoserviceprovider.cpp index 91abe887..52321bb8 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider.cpp +++ b/src/imports/location/qdeclarativegeoserviceprovider.cpp @@ -47,7 +47,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Plugin @@ -328,5 +328,5 @@ QVariant QDeclarativeGeoServiceProviderParameter::value() const #include "moc_qdeclarativegeoserviceprovider_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoserviceprovider_p.h b/src/imports/location/qdeclarativegeoserviceprovider_p.h index d88b3b60..1ddcdd24 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider_p.h +++ b/src/imports/location/qdeclarativegeoserviceprovider_p.h @@ -49,7 +49,7 @@ #include <QString> #include <QVariant> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoServiceProviderParameter : public QObject { @@ -138,9 +138,9 @@ private: Q_DISABLE_COPY(QDeclarativeGeoServiceProvider) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoServiceProviderParameter)); -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoServiceProvider)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoServiceProviderParameter)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoServiceProvider)); #endif diff --git a/src/imports/location/qdeclarativegraphicsgeomap.cpp b/src/imports/location/qdeclarativegraphicsgeomap.cpp index ed72cc53..464b0f54 100644 --- a/src/imports/location/qdeclarativegraphicsgeomap.cpp +++ b/src/imports/location/qdeclarativegraphicsgeomap.cpp @@ -58,7 +58,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Map @@ -912,4 +912,4 @@ int QDeclarativeGraphicsGeoMap::testGetDeclarativeMapObjectCount() #include "moc_qdeclarativegraphicsgeomap_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativegraphicsgeomap_p.h b/src/imports/location/qdeclarativegraphicsgeomap_p.h index 6b73b15c..d19b6f49 100644 --- a/src/imports/location/qdeclarativegraphicsgeomap_p.h +++ b/src/imports/location/qdeclarativegraphicsgeomap_p.h @@ -48,7 +48,7 @@ #include "qdeclarativegeomapobject_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoMapObject; @@ -207,8 +207,8 @@ private: Q_DISABLE_COPY(QDeclarativeGraphicsGeoMap) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGraphicsGeoMap)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGraphicsGeoMap)); #endif diff --git a/src/imports/location/qdeclarativelandmark.cpp b/src/imports/location/qdeclarativelandmark.cpp index 1e1527ba..805e279f 100644 --- a/src/imports/location/qdeclarativelandmark.cpp +++ b/src/imports/location/qdeclarativelandmark.cpp @@ -41,7 +41,7 @@ #include "qdeclarativelandmark_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Landmark QDeclarativeLandmark @@ -222,4 +222,4 @@ QLandmark QDeclarativeLandmark::landmark() #include "moc_qdeclarativelandmark_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativelandmark_p.h b/src/imports/location/qdeclarativelandmark_p.h index 177a5831..47efd576 100644 --- a/src/imports/location/qdeclarativelandmark_p.h +++ b/src/imports/location/qdeclarativelandmark_p.h @@ -57,7 +57,7 @@ #include <QDebug> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeLandmark : public QDeclarativeGeoPlace { @@ -108,7 +108,7 @@ private: QLandmark m_landmark; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmark)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmark)); #endif // QDECLARATIVELANDMARK_P_H diff --git a/src/imports/location/qdeclarativelandmarkcategory.cpp b/src/imports/location/qdeclarativelandmarkcategory.cpp index 78d480f7..87fa3c1c 100644 --- a/src/imports/location/qdeclarativelandmarkcategory.cpp +++ b/src/imports/location/qdeclarativelandmarkcategory.cpp @@ -41,7 +41,7 @@ #include "qdeclarativelandmarkcategory_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass LandmarkCategory QDeclarativeLandmarkCategory @@ -121,4 +121,4 @@ void QDeclarativeLandmarkCategory::setCategory(const QLandmarkCategory& category #include "moc_qdeclarativelandmarkcategory_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativelandmarkcategory_p.h b/src/imports/location/qdeclarativelandmarkcategory_p.h index 9d890b46..db0d7fb8 100644 --- a/src/imports/location/qdeclarativelandmarkcategory_p.h +++ b/src/imports/location/qdeclarativelandmarkcategory_p.h @@ -48,7 +48,7 @@ #include <QAbstractListModel> #include <QtCore> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeLandmarkCategory : public QObject { @@ -79,7 +79,7 @@ private: void setCategory(const QLandmarkCategory& category); }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkCategory)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkCategory)); #endif // QDECLARATIVELANDMARKCATEGORY_P_H diff --git a/src/imports/location/qdeclarativelandmarkcategorymodel.cpp b/src/imports/location/qdeclarativelandmarkcategorymodel.cpp index 9255cae8..28c8cd71 100644 --- a/src/imports/location/qdeclarativelandmarkcategorymodel.cpp +++ b/src/imports/location/qdeclarativelandmarkcategorymodel.cpp @@ -48,7 +48,7 @@ #include <QDebug> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass LandmarkCategoryModel QDeclarativeLandmarkCategoryModel @@ -340,4 +340,4 @@ void QDeclarativeLandmarkCategoryModel::categories_clear(QDeclarativeListPropert #include "moc_qdeclarativelandmarkcategorymodel_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativelandmarkcategorymodel_p.h b/src/imports/location/qdeclarativelandmarkcategorymodel_p.h index 9d21e337..997eaac8 100644 --- a/src/imports/location/qdeclarativelandmarkcategorymodel_p.h +++ b/src/imports/location/qdeclarativelandmarkcategorymodel_p.h @@ -54,7 +54,7 @@ #include <QtDeclarative/qdeclarative.h> #include <QAbstractListModel> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeLandmarkCategoryModel: public QDeclarativeLandmarkAbstractModel { @@ -112,7 +112,7 @@ private: QDeclarativeLandmark* m_landmark; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkCategoryModel)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkCategoryModel)); #endif // QDECLARATIVELANDMARKCATEGORYMODEL_P_H diff --git a/src/imports/location/qdeclarativelandmarkfilters.cpp b/src/imports/location/qdeclarativelandmarkfilters.cpp index 798698b6..d0224a13 100644 --- a/src/imports/location/qdeclarativelandmarkfilters.cpp +++ b/src/imports/location/qdeclarativelandmarkfilters.cpp @@ -42,7 +42,7 @@ #include "qdeclarativelandmarkfilters_p.h" #include "qdeclarativeposition_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass LandmarkNameFilter QDeclarativeLandmarkNameFilter @@ -442,4 +442,4 @@ QLandmarkFilter* QDeclarativeLandmarkIntersectionFilter::filter() #include "moc_qdeclarativelandmarkfilters_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativelandmarkfilters_p.h b/src/imports/location/qdeclarativelandmarkfilters_p.h index bd000ed2..7eba5a32 100644 --- a/src/imports/location/qdeclarativelandmarkfilters_p.h +++ b/src/imports/location/qdeclarativelandmarkfilters_p.h @@ -56,7 +56,7 @@ #include <QDeclarativeListProperty> #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeLandmarkFilterBase : public QObject { @@ -229,12 +229,12 @@ private: QLandmarkIntersectionFilter m_filter; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkNameFilter)); -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkCategoryFilter)); -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkBoxFilter)); -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkProximityFilter)); -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkUnionFilter)); -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkIntersectionFilter)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkNameFilter)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkCategoryFilter)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkBoxFilter)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkProximityFilter)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkUnionFilter)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkIntersectionFilter)); #endif // QDECLARATIVELANDMARKFILTERS_P_H diff --git a/src/imports/location/qdeclarativelandmarkmodel.cpp b/src/imports/location/qdeclarativelandmarkmodel.cpp index 969c0b7a..ea38e69a 100644 --- a/src/imports/location/qdeclarativelandmarkmodel.cpp +++ b/src/imports/location/qdeclarativelandmarkmodel.cpp @@ -47,7 +47,7 @@ #include <QDebug> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! @@ -823,4 +823,4 @@ void QDeclarativeLandmarkModel::fetchRequestStateChanged(QLandmarkAbstractReques #include "moc_qdeclarativelandmarkmodel_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativelandmarkmodel_p.h b/src/imports/location/qdeclarativelandmarkmodel_p.h index 86cb24ff..b314e612 100644 --- a/src/imports/location/qdeclarativelandmarkmodel_p.h +++ b/src/imports/location/qdeclarativelandmarkmodel_p.h @@ -55,7 +55,7 @@ #include <QDeclarativeParserStatus> #include <QAbstractListModel> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeLandmarkAbstractModel : public QAbstractListModel, public QDeclarativeParserStatus @@ -225,7 +225,7 @@ private: QSet<QString> m_landmarkIdSet; // For faster lookups when updating items }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeLandmarkModel)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeLandmarkModel)); #endif // QDECLARATIVELANDMARKMODEL_P_H diff --git a/src/imports/location/qdeclarativeposition.cpp b/src/imports/location/qdeclarativeposition.cpp index 2619be69..21e41fda 100644 --- a/src/imports/location/qdeclarativeposition.cpp +++ b/src/imports/location/qdeclarativeposition.cpp @@ -45,7 +45,7 @@ #include <QFile> #include <QApplication> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass Position @@ -361,4 +361,4 @@ void QDeclarativePosition::invalidate() #include "moc_qdeclarativeposition_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativeposition_p.h b/src/imports/location/qdeclarativeposition_p.h index d851af33..ebc8c77b 100644 --- a/src/imports/location/qdeclarativeposition_p.h +++ b/src/imports/location/qdeclarativeposition_p.h @@ -56,7 +56,7 @@ #include <QDebug> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativePosition : public QObject { @@ -126,7 +126,7 @@ private: QDeclarativeCoordinate m_coordinate; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativePosition)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativePosition)); #endif diff --git a/src/imports/location/qdeclarativepositionsource.cpp b/src/imports/location/qdeclarativepositionsource.cpp index 86a194b9..fa434305 100644 --- a/src/imports/location/qdeclarativepositionsource.cpp +++ b/src/imports/location/qdeclarativepositionsource.cpp @@ -51,7 +51,7 @@ #include <e32std.h> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass PositionSource @@ -417,4 +417,4 @@ void QDeclarativePositionSource::positionUpdateReceived(const QGeoPositionInfo& #include "moc_qdeclarativepositionsource_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativepositionsource_p.h b/src/imports/location/qdeclarativepositionsource_p.h index edfe310f..ab63a678 100644 --- a/src/imports/location/qdeclarativepositionsource_p.h +++ b/src/imports/location/qdeclarativepositionsource_p.h @@ -51,7 +51,7 @@ class QFile; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativePositionSource : public QObject { @@ -111,7 +111,7 @@ private: int m_updateInterval; }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativePositionSource)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativePositionSource)); #endif diff --git a/src/imports/location/qdeclarativereversegeocodemodel.cpp b/src/imports/location/qdeclarativereversegeocodemodel.cpp index f019cafd..ecd46014 100644 --- a/src/imports/location/qdeclarativereversegeocodemodel.cpp +++ b/src/imports/location/qdeclarativereversegeocodemodel.cpp @@ -43,7 +43,7 @@ #include <qgeosearchmanager.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QDeclarativeReverseGeocodeModel::QDeclarativeReverseGeocodeModel(QObject *parent) : QDeclarativeGeoSearchModel(parent), @@ -141,4 +141,4 @@ QVariant QDeclarativeReverseGeocodeModel::headerData(int section, Qt::Orientatio #include "moc_qdeclarativereversegeocodemodel_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/imports/location/qdeclarativereversegeocodemodel_p.h b/src/imports/location/qdeclarativereversegeocodemodel_p.h index 9d0a1748..fd58e7b6 100644 --- a/src/imports/location/qdeclarativereversegeocodemodel_p.h +++ b/src/imports/location/qdeclarativereversegeocodemodel_p.h @@ -46,7 +46,7 @@ #include "qdeclarativecoordinate_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeReverseGeocodeModel : public QDeclarativeGeoSearchModel { @@ -79,6 +79,6 @@ private: QDeclarativeCoordinate coordinate_; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/dbuscomm_maemo.cpp b/src/location/dbuscomm_maemo.cpp index e86655db..9912b36c 100644 --- a/src/location/dbuscomm_maemo.cpp +++ b/src/location/dbuscomm_maemo.cpp @@ -44,7 +44,7 @@ #include <iostream> using namespace std; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE const QString DBusComm::positioningdService = QString("com.nokia.positioningd.client"); const QString DBusComm::positioningdPath = QString("/com/nokia/positioningd/client"); @@ -253,5 +253,5 @@ bool DBusComm::createUniqueName() } #include "moc_dbuscomm_maemo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/dbuscomm_maemo_p.h b/src/location/dbuscomm_maemo_p.h index b08df739..90d21567 100644 --- a/src/location/dbuscomm_maemo_p.h +++ b/src/location/dbuscomm_maemo_p.h @@ -63,7 +63,7 @@ #include "qgeosatelliteinfosource.h" #include "dbusserver_maemo_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class DBusComm: public QObject, DBusServerIF { @@ -123,6 +123,6 @@ private Q_SLOTS: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/dbusserver_maemo.cpp b/src/location/dbusserver_maemo.cpp index cddccd0b..184cbb6c 100644 --- a/src/location/dbusserver_maemo.cpp +++ b/src/location/dbusserver_maemo.cpp @@ -41,7 +41,7 @@ #include "dbusserver_maemo_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE DBusServer::DBusServer(QObject *obj, DBusServerIF *iface) : QDBusAbstractAdaptor(obj), interface(iface) @@ -86,5 +86,5 @@ Q_NOREPLY void DBusServer::satellitesInUseUpdate(const QByteArray &message) } #include "moc_dbusserver_maemo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/dbusserver_maemo_p.h b/src/location/dbusserver_maemo_p.h index 41e26951..854f449c 100644 --- a/src/location/dbusserver_maemo_p.h +++ b/src/location/dbusserver_maemo_p.h @@ -58,7 +58,7 @@ #include "qgeopositioninfosource.h" #include "qgeosatelliteinfo.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class DBusServerIF { public: @@ -88,6 +88,6 @@ private: DBusServerIF *interface; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/gconfitem.cpp b/src/location/gconfitem.cpp index 508d7664..5a90b15b 100644 --- a/src/location/gconfitem.cpp +++ b/src/location/gconfitem.cpp @@ -51,6 +51,8 @@ #include <gconf/gconf-value.h> #include <gconf/gconf-client.h> +QT_BEGIN_NAMESPACE + struct GConfItemPrivate { QString key; QVariant value; @@ -362,3 +364,5 @@ GConfItem::~GConfItem() } delete priv; } + +QT_END_NAMESPACE diff --git a/src/location/gconfitem_p.h b/src/location/gconfitem_p.h index ba4c8d63..0f7581af 100644 --- a/src/location/gconfitem_p.h +++ b/src/location/gconfitem_p.h @@ -46,6 +46,8 @@ #include <QStringList> #include <QObject> +QT_BEGIN_NAMESPACE + /*! \brief GConfItem is a simple C++ wrapper for GConf. @@ -163,4 +165,6 @@ private: void update_value(bool emit_signal); }; +QT_END_NAMESPACE + #endif // GCONFITEM_H diff --git a/src/location/landmarks/qlandmark.cpp b/src/location/landmarks/qlandmark.cpp index 27a060d8..f1b42402 100644 --- a/src/location/landmarks/qlandmark.cpp +++ b/src/location/landmarks/qlandmark.cpp @@ -62,13 +62,12 @@ #include <QDebug> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE uint qHash(const QLandmarkCategoryId& key) { return qHash(key.localId()) + qHash(key.managerUri()); } -QTM_END_NAMESPACE -QTM_USE_NAMESPACE + // ----- QLandmarkPrivate ----- @@ -522,3 +521,4 @@ void QLandmark::clear() d->id = QLandmarkId(); } +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmark.h b/src/location/landmarks/qlandmark.h index b0ef9593..08adcb22 100644 --- a/src/location/landmarks/qlandmark.h +++ b/src/location/landmarks/qlandmark.h @@ -55,7 +55,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkPrivate; class Q_LOCATION_EXPORT QLandmark : public QGeoPlace @@ -104,11 +104,11 @@ private: const QLandmarkPrivate* d_func() const; }; -QTM_END_NAMESPACE +Q_DECLARE_TYPEINFO(QLandmark, Q_MOVABLE_TYPE); -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmark)) +QT_END_NAMESPACE -Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmark), Q_MOVABLE_TYPE); +Q_DECLARE_METATYPE(QLandmark) QT_END_HEADER diff --git a/src/location/landmarks/qlandmark_p.h b/src/location/landmarks/qlandmark_p.h index 68fd4809..f989d8dc 100644 --- a/src/location/landmarks/qlandmark_p.h +++ b/src/location/landmarks/qlandmark_p.h @@ -60,7 +60,7 @@ #include <QSharedData> #include <QUrl> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkPrivate : public QGeoPlacePrivate { @@ -86,6 +86,6 @@ public: static QStringList commonKeys; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkabstractrequest.cpp b/src/location/landmarks/qlandmarkabstractrequest.cpp index e8a0e131..e3cad813 100644 --- a/src/location/landmarks/qlandmarkabstractrequest.cpp +++ b/src/location/landmarks/qlandmarkabstractrequest.cpp @@ -45,7 +45,8 @@ #include <QDebug> #include <QMutexLocker> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE + QLandmarkAbstractRequestPrivate::QLandmarkAbstractRequestPrivate(QLandmarkManager *mgr) : type(QLandmarkAbstractRequest::InvalidRequest), @@ -437,6 +438,8 @@ bool QLandmarkAbstractRequest::waitForFinished(int msecs) #include "moc_qlandmarkabstractrequest.cpp" +QT_END_NAMESPACE + diff --git a/src/location/landmarks/qlandmarkabstractrequest.h b/src/location/landmarks/qlandmarkabstractrequest.h index 9ecc90a5..4c1f88d1 100644 --- a/src/location/landmarks/qlandmarkabstractrequest.h +++ b/src/location/landmarks/qlandmarkabstractrequest.h @@ -45,7 +45,7 @@ #include "qlandmarkmanager.h" #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkAbstractRequestPrivate; class Q_LOCATION_EXPORT QLandmarkAbstractRequest : public QObject @@ -108,6 +108,6 @@ private: friend class QLandmarkAbstractRequestPrivate; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkabstractrequest_p.h b/src/location/landmarks/qlandmarkabstractrequest_p.h index 1f79ae2c..79fd36e0 100644 --- a/src/location/landmarks/qlandmarkabstractrequest_p.h +++ b/src/location/landmarks/qlandmarkabstractrequest_p.h @@ -58,7 +58,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkAbstractRequestPrivate { @@ -76,6 +76,6 @@ public: mutable QMutex mutex; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkattributefilter.cpp b/src/location/landmarks/qlandmarkattributefilter.cpp index 8131730a..f2bda00c 100644 --- a/src/location/landmarks/qlandmarkattributefilter.cpp +++ b/src/location/landmarks/qlandmarkattributefilter.cpp @@ -43,7 +43,7 @@ #include "qlandmarkfilter_p.h" #include <QHash> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkAttributeFilterPrivate : public QLandmarkFilterPrivate { @@ -277,4 +277,4 @@ QLandmarkFilter::MatchFlags QLandmarkAttributeFilter::matchFlags(const QString & return d->flags.value(key); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkattributefilter.h b/src/location/landmarks/qlandmarkattributefilter.h index cb4d0917..4bbadf64 100644 --- a/src/location/landmarks/qlandmarkattributefilter.h +++ b/src/location/landmarks/qlandmarkattributefilter.h @@ -47,7 +47,7 @@ #include <QString> #include <QStringList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmark; class QLandmarkAttributeFilterPrivate; @@ -76,6 +76,6 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkAttributeFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkboxfilter.cpp b/src/location/landmarks/qlandmarkboxfilter.cpp index ce9a3c88..6c32b8a2 100644 --- a/src/location/landmarks/qlandmarkboxfilter.cpp +++ b/src/location/landmarks/qlandmarkboxfilter.cpp @@ -43,7 +43,7 @@ #include "qlandmarkboxfilter_p.h" #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkBoxFilter @@ -170,4 +170,4 @@ QLandmarkBoxFilterPrivate::QLandmarkBoxFilterPrivate(const QLandmarkBoxFilterPri QLandmarkBoxFilterPrivate::~QLandmarkBoxFilterPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkboxfilter.h b/src/location/landmarks/qlandmarkboxfilter.h index cefd788f..6f524c4e 100644 --- a/src/location/landmarks/qlandmarkboxfilter.h +++ b/src/location/landmarks/qlandmarkboxfilter.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkBoxFilterPrivate; class Q_LOCATION_EXPORT QLandmarkBoxFilter : public QLandmarkFilter @@ -74,7 +74,7 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkBoxFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/landmarks/qlandmarkboxfilter_p.h b/src/location/landmarks/qlandmarkboxfilter_p.h index 8e94b43f..851202f9 100644 --- a/src/location/landmarks/qlandmarkboxfilter_p.h +++ b/src/location/landmarks/qlandmarkboxfilter_p.h @@ -56,7 +56,7 @@ #include "qlandmarkfilter_p.h" #include "qgeoboundingbox.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; @@ -78,6 +78,6 @@ public: QGeoBoundingBox boundingBox; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategory.cpp b/src/location/landmarks/qlandmarkcategory.cpp index bb5d1662..dc3e2870 100644 --- a/src/location/landmarks/qlandmarkcategory.cpp +++ b/src/location/landmarks/qlandmarkcategory.cpp @@ -50,7 +50,7 @@ #include <QDebug> #endif -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE // ----- QLandmarkCategoryPrivate ----- @@ -255,3 +255,5 @@ void QLandmarkCategory::clear() d->iconUrl.clear(); d->id = QLandmarkCategoryId(); } + +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkcategory.h b/src/location/landmarks/qlandmarkcategory.h index 00edcb01..9f1a7cfc 100644 --- a/src/location/landmarks/qlandmarkcategory.h +++ b/src/location/landmarks/qlandmarkcategory.h @@ -46,13 +46,12 @@ #include <QVariant> #include <QSharedDataPointer> +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE class QStringList; class QUrl; - -QT_BEGIN_HEADER - -QTM_BEGIN_NAMESPACE class QLandmarkCategoryId; class QLandmarkCategoryPrivate; @@ -82,11 +81,11 @@ private: QSharedDataPointer<QLandmarkCategoryPrivate> d; }; -QTM_END_NAMESPACE +Q_DECLARE_TYPEINFO(QLandmarkCategory, Q_MOVABLE_TYPE); -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkCategory)) +QT_END_NAMESPACE -Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkCategory), Q_MOVABLE_TYPE); +Q_DECLARE_METATYPE(QLandmarkCategory) QT_END_HEADER diff --git a/src/location/landmarks/qlandmarkcategory_p.h b/src/location/landmarks/qlandmarkcategory_p.h index bba844b6..87c90b7c 100644 --- a/src/location/landmarks/qlandmarkcategory_p.h +++ b/src/location/landmarks/qlandmarkcategory_p.h @@ -58,7 +58,7 @@ #include <QUrl> #include <QSharedData> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryPrivate : public QSharedData { @@ -79,6 +79,6 @@ public: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp b/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp index 0d0df7b1..7fdf9a60 100644 --- a/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp +++ b/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.cpp @@ -43,7 +43,7 @@ #include "qlandmarkrequests_p.h" #include "qlandmarkcategory.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkCategoryFetchByIdRequest @@ -146,4 +146,4 @@ QMap<int, QLandmarkManager::Error> QLandmarkCategoryFetchByIdRequest::errorMap() #include "moc_qlandmarkcategoryfetchbyidrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.h b/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.h index 9ebc9647..3e01b91b 100644 --- a/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.h +++ b/src/location/landmarks/qlandmarkcategoryfetchbyidrequest.h @@ -45,7 +45,7 @@ #include "qlandmarkabstractrequest.h" #include "qlandmarkcategoryid.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryFetchByIdRequestPrivate; class Q_LOCATION_EXPORT QLandmarkCategoryFetchByIdRequest : public QLandmarkAbstractRequest @@ -68,6 +68,6 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp b/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp index 20f739d7..7632f250 100644 --- a/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp +++ b/src/location/landmarks/qlandmarkcategoryfetchrequest.cpp @@ -43,7 +43,7 @@ #include "qlandmarkrequests_p.h" #include "qlandmarkcategory.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkCategoryFetchRequest @@ -170,4 +170,4 @@ void QLandmarkCategoryFetchRequest::setOffset(int offset) { #include "moc_qlandmarkcategoryfetchrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkcategoryfetchrequest.h b/src/location/landmarks/qlandmarkcategoryfetchrequest.h index 262e4e8b..92dbbb78 100644 --- a/src/location/landmarks/qlandmarkcategoryfetchrequest.h +++ b/src/location/landmarks/qlandmarkcategoryfetchrequest.h @@ -46,7 +46,7 @@ #include "qlandmarkcategoryid.h" #include "qlandmarknamesort.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryFetchRequestPrivate; class Q_LOCATION_EXPORT QLandmarkCategoryFetchRequest : public QLandmarkAbstractRequest @@ -73,6 +73,6 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategoryfilter.cpp b/src/location/landmarks/qlandmarkcategoryfilter.cpp index 77462b01..852bd216 100644 --- a/src/location/landmarks/qlandmarkcategoryfilter.cpp +++ b/src/location/landmarks/qlandmarkcategoryfilter.cpp @@ -43,7 +43,7 @@ #include "qlandmarkcategoryfilter_p.h" #include "qlandmarkcategoryid.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkCategoryFilter @@ -129,4 +129,4 @@ QLandmarkCategoryFilterPrivate::QLandmarkCategoryFilterPrivate(const QLandmarkCa QLandmarkCategoryFilterPrivate::~QLandmarkCategoryFilterPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkcategoryfilter.h b/src/location/landmarks/qlandmarkcategoryfilter.h index bef2b6a3..cb9e3edb 100644 --- a/src/location/landmarks/qlandmarkcategoryfilter.h +++ b/src/location/landmarks/qlandmarkcategoryfilter.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryId; @@ -68,7 +68,7 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkCategoryFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/landmarks/qlandmarkcategoryfilter_p.h b/src/location/landmarks/qlandmarkcategoryfilter_p.h index 0cbf37ac..f3142b6f 100644 --- a/src/location/landmarks/qlandmarkcategoryfilter_p.h +++ b/src/location/landmarks/qlandmarkcategoryfilter_p.h @@ -55,7 +55,7 @@ #include "qlandmarkfilter_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryId; @@ -77,6 +77,6 @@ public: Q_IMPLEMENT_LANDMARKFILTER_VIRTUALCTORS(QLandmarkCategoryFilter, QLandmarkFilter::CategoryFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategoryid.cpp b/src/location/landmarks/qlandmarkcategoryid.cpp index 920000f3..2056aac0 100644 --- a/src/location/landmarks/qlandmarkcategoryid.cpp +++ b/src/location/landmarks/qlandmarkcategoryid.cpp @@ -43,7 +43,7 @@ #include "qlandmarkcategoryid_p.h" #include <QString> -QTM_USE_NAMESPACE + /*! \class QLandmarkCategoryId diff --git a/src/location/landmarks/qlandmarkcategoryid.h b/src/location/landmarks/qlandmarkcategoryid.h index 962bd1b9..4dbed695 100644 --- a/src/location/landmarks/qlandmarkcategoryid.h +++ b/src/location/landmarks/qlandmarkcategoryid.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryIdPrivate; class Q_LOCATION_EXPORT QLandmarkCategoryId @@ -73,11 +73,12 @@ private: QSharedDataPointer<QLandmarkCategoryIdPrivate> d; }; -QTM_END_NAMESPACE +Q_DECLARE_TYPEINFO(QLandmarkCategoryId, Q_MOVABLE_TYPE); -QT_END_HEADER +QT_END_NAMESPACE + +Q_DECLARE_METATYPE(QLandmarkCategoryId) -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkCategoryId)) +QT_END_HEADER -Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkCategoryId), Q_MOVABLE_TYPE); #endif diff --git a/src/location/landmarks/qlandmarkcategoryid_p.h b/src/location/landmarks/qlandmarkcategoryid_p.h index 243612c9..aa380643 100644 --- a/src/location/landmarks/qlandmarkcategoryid_p.h +++ b/src/location/landmarks/qlandmarkcategoryid_p.h @@ -57,7 +57,7 @@ #include <QSharedData> #include <QString> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryIdPrivate : public QSharedData { @@ -79,6 +79,6 @@ public: QString m_uri; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp b/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp index 0bbbd191..62d9bec0 100644 --- a/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp +++ b/src/location/landmarks/qlandmarkcategoryidfetchrequest.cpp @@ -43,7 +43,7 @@ #include "qlandmarkrequests_p.h" #include "qlandmarkcategoryid.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkCategoryIdFetchRequest @@ -172,7 +172,7 @@ void QLandmarkCategoryIdFetchRequest::setOffset(int offset) { #include "moc_qlandmarkcategoryidfetchrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkcategoryidfetchrequest.h b/src/location/landmarks/qlandmarkcategoryidfetchrequest.h index ab643b4a..ec25746e 100644 --- a/src/location/landmarks/qlandmarkcategoryidfetchrequest.h +++ b/src/location/landmarks/qlandmarkcategoryidfetchrequest.h @@ -45,7 +45,7 @@ #include "qlandmarkabstractrequest.h" #include "qlandmarknamesort.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryIdFetchRequestPrivate; class Q_LOCATION_EXPORT QLandmarkCategoryIdFetchRequest : public QLandmarkAbstractRequest @@ -72,6 +72,6 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategoryremoverequest.cpp b/src/location/landmarks/qlandmarkcategoryremoverequest.cpp index cf29ae13..741599a8 100644 --- a/src/location/landmarks/qlandmarkcategoryremoverequest.cpp +++ b/src/location/landmarks/qlandmarkcategoryremoverequest.cpp @@ -45,7 +45,7 @@ #include <QMap> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkCategoryRemoveRequest @@ -167,6 +167,6 @@ QMap<int, QLandmarkManager::Error> QLandmarkCategoryRemoveRequest::errorMap() co #include "moc_qlandmarkcategoryremoverequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkcategoryremoverequest.h b/src/location/landmarks/qlandmarkcategoryremoverequest.h index 84d3d686..40551e0d 100644 --- a/src/location/landmarks/qlandmarkcategoryremoverequest.h +++ b/src/location/landmarks/qlandmarkcategoryremoverequest.h @@ -44,7 +44,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategoryRemoveRequestPrivate; class Q_LOCATION_EXPORT QLandmarkCategoryRemoveRequest : public QLandmarkAbstractRequest @@ -68,7 +68,7 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkcategorysaverequest.cpp b/src/location/landmarks/qlandmarkcategorysaverequest.cpp index c61f0c87..440315d5 100644 --- a/src/location/landmarks/qlandmarkcategorysaverequest.cpp +++ b/src/location/landmarks/qlandmarkcategorysaverequest.cpp @@ -43,7 +43,7 @@ #include "qlandmarkrequests_p.h" #include "qlandmarkcategory.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkCategorySaveRequest @@ -134,6 +134,6 @@ QMap<int, QLandmarkManager::Error> QLandmarkCategorySaveRequest::errorMap() cons #include "moc_qlandmarkcategorysaverequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkcategorysaverequest.h b/src/location/landmarks/qlandmarkcategorysaverequest.h index d327c148..a07b7f01 100644 --- a/src/location/landmarks/qlandmarkcategorysaverequest.h +++ b/src/location/landmarks/qlandmarkcategorysaverequest.h @@ -44,7 +44,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkCategory; @@ -67,7 +67,7 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkexportrequest.cpp b/src/location/landmarks/qlandmarkexportrequest.cpp index 55ab24e6..999dcd34 100644 --- a/src/location/landmarks/qlandmarkexportrequest.cpp +++ b/src/location/landmarks/qlandmarkexportrequest.cpp @@ -45,7 +45,7 @@ #include <QFile> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkExportRequest @@ -213,6 +213,6 @@ void QLandmarkExportRequest::setLandmarkIds(const QList<QLandmarkId> &landmarkId #include "moc_qlandmarkexportrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkexportrequest.h b/src/location/landmarks/qlandmarkexportrequest.h index cc2fb7c4..304b8f3b 100644 --- a/src/location/landmarks/qlandmarkexportrequest.h +++ b/src/location/landmarks/qlandmarkexportrequest.h @@ -43,9 +43,9 @@ #define QLANDMARKEXPORTREQUEST_H #include "qlandmarkabstractrequest.h" -class QIODevice; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QIODevice; class QLandmarkExportRequestPrivate; class Q_LOCATION_EXPORT QLandmarkExportRequest : public QLandmarkAbstractRequest { @@ -74,7 +74,7 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkfetchbyidrequest.cpp b/src/location/landmarks/qlandmarkfetchbyidrequest.cpp index b7f870ef..72ffb103 100644 --- a/src/location/landmarks/qlandmarkfetchbyidrequest.cpp +++ b/src/location/landmarks/qlandmarkfetchbyidrequest.cpp @@ -43,7 +43,7 @@ #include "qlandmarkrequests_p.h" #include "qlandmark.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkFetchByIdRequest @@ -142,4 +142,4 @@ QMap<int, QLandmarkManager::Error> QLandmarkFetchByIdRequest::errorMap() const #include "moc_qlandmarkfetchbyidrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkfetchbyidrequest.h b/src/location/landmarks/qlandmarkfetchbyidrequest.h index 1e700ca9..aa28ecbd 100644 --- a/src/location/landmarks/qlandmarkfetchbyidrequest.h +++ b/src/location/landmarks/qlandmarkfetchbyidrequest.h @@ -44,7 +44,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkFetchByIdRequestPrivate; class Q_LOCATION_EXPORT QLandmarkFetchByIdRequest : public QLandmarkAbstractRequest @@ -66,6 +66,6 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkfetchrequest.cpp b/src/location/landmarks/qlandmarkfetchrequest.cpp index 0bb5f712..9732db69 100644 --- a/src/location/landmarks/qlandmarkfetchrequest.cpp +++ b/src/location/landmarks/qlandmarkfetchrequest.cpp @@ -46,7 +46,7 @@ #include "qlandmarksortorder.h" #include "qlandmark.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkFetchRequest @@ -213,4 +213,4 @@ QList<QLandmark> QLandmarkFetchRequest::landmarks() const #include "moc_qlandmarkfetchrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkfetchrequest.h b/src/location/landmarks/qlandmarkfetchrequest.h index 64c630b2..b7b253ad 100644 --- a/src/location/landmarks/qlandmarkfetchrequest.h +++ b/src/location/landmarks/qlandmarkfetchrequest.h @@ -44,7 +44,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkFetchRequestPrivate; class Q_LOCATION_EXPORT QLandmarkFetchRequest : public QLandmarkAbstractRequest @@ -74,6 +74,6 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkfilter.cpp b/src/location/landmarks/qlandmarkfilter.cpp index dd98f8c3..ce2f7816 100644 --- a/src/location/landmarks/qlandmarkfilter.cpp +++ b/src/location/landmarks/qlandmarkfilter.cpp @@ -50,13 +50,13 @@ #include "qgeocoordinate.h" #if !defined(Q_CC_MWERKS) -template<> QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone() +template<> QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone() { return d->clone(); } #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QLandmarkFilterPrivate::QLandmarkFilterPrivate() : QSharedData(), @@ -231,4 +231,4 @@ const QLandmarkFilter operator|(const QLandmarkFilter &left, const QLandmarkFilt return nuf; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkfilter.h b/src/location/landmarks/qlandmarkfilter.h index d2ab2922..94ecdf56 100644 --- a/src/location/landmarks/qlandmarkfilter.h +++ b/src/location/landmarks/qlandmarkfilter.h @@ -46,7 +46,7 @@ #include <QSharedData> #include <Qt> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE #define Q_DECLARE_LANDMARKFILTER_PRIVATE(Class) \ inline Class##Private* d_func(); \ @@ -100,9 +100,10 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QLandmarkFilter::MatchFlags); const Q_LOCATION_EXPORT QLandmarkFilter operator&(const QLandmarkFilter &left, const QLandmarkFilter &right); const Q_LOCATION_EXPORT QLandmarkFilter operator|(const QLandmarkFilter &left, const QLandmarkFilter &right); -QTM_END_NAMESPACE +Q_DECLARE_TYPEINFO(QLandmarkFilter, Q_MOVABLE_TYPE); + +QT_END_NAMESPACE -Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkFilter), Q_MOVABLE_TYPE); #endif diff --git a/src/location/landmarks/qlandmarkfilter_p.h b/src/location/landmarks/qlandmarkfilter_p.h index ad9b8949..a47711f3 100644 --- a/src/location/landmarks/qlandmarkfilter_p.h +++ b/src/location/landmarks/qlandmarkfilter_p.h @@ -71,7 +71,7 @@ d_ptr = new Class##Private(); \ } -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkFilterPrivate : public QSharedData { public: @@ -91,19 +91,19 @@ public: QLandmarkFilter::FilterType type; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_BEGIN_NAMESPACE #if defined(Q_CC_MWERKS) // This results in multiple symbol definition errors on all other compilers // but not having a definition here results in an attempt to use the unspecialized // clone (which fails because of the pure virtuals above) -template<> QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone() +template<> QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone() { return d->clone(); } #else -template<> QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone(); +template<> QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QLandmarkFilterPrivate)>::clone(); #endif QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkid.cpp b/src/location/landmarks/qlandmarkid.cpp index ebf16b43..f9efcd98 100644 --- a/src/location/landmarks/qlandmarkid.cpp +++ b/src/location/landmarks/qlandmarkid.cpp @@ -43,7 +43,8 @@ #include "qlandmarkid_p.h" #include <QString> -QTM_USE_NAMESPACE + +QT_BEGIN_NAMESPACE /*! \class QLandmarkId @@ -181,3 +182,4 @@ bool QLandmarkId::operator!=(const QLandmarkId &other) const } +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkid.h b/src/location/landmarks/qlandmarkid.h index 75aba4f8..a42e3e85 100644 --- a/src/location/landmarks/qlandmarkid.h +++ b/src/location/landmarks/qlandmarkid.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIdPrivate; class Q_LOCATION_EXPORT QLandmarkId @@ -72,12 +72,12 @@ private: QSharedDataPointer<QLandmarkIdPrivate> d; }; -QTM_END_NAMESPACE +Q_DECLARE_TYPEINFO(QLandmarkId, Q_MOVABLE_TYPE); -QT_END_HEADER +QT_END_NAMESPACE -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QLandmarkId)) +Q_DECLARE_METATYPE(QLandmarkId) -Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QLandmarkId), Q_MOVABLE_TYPE); +QT_END_HEADER #endif diff --git a/src/location/landmarks/qlandmarkid_p.h b/src/location/landmarks/qlandmarkid_p.h index 7f5c1fff..4baa5240 100644 --- a/src/location/landmarks/qlandmarkid_p.h +++ b/src/location/landmarks/qlandmarkid_p.h @@ -56,7 +56,7 @@ #include "qmobilityglobal.h" #include <QSharedData> #include <QString> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIdPrivate : public QSharedData { @@ -81,6 +81,6 @@ public: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkidfetchrequest.cpp b/src/location/landmarks/qlandmarkidfetchrequest.cpp index 23ec0e9e..0a1040d4 100644 --- a/src/location/landmarks/qlandmarkidfetchrequest.cpp +++ b/src/location/landmarks/qlandmarkidfetchrequest.cpp @@ -45,7 +45,7 @@ #include "qlandmarkrequests_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkIdFetchRequest @@ -214,7 +214,7 @@ QList<QLandmarkId> QLandmarkIdFetchRequest::landmarkIds() const #include "moc_qlandmarkidfetchrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkidfetchrequest.h b/src/location/landmarks/qlandmarkidfetchrequest.h index 91f380ac..d76b66c0 100644 --- a/src/location/landmarks/qlandmarkidfetchrequest.h +++ b/src/location/landmarks/qlandmarkidfetchrequest.h @@ -44,7 +44,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIdFetchRequestPrivate; class Q_LOCATION_EXPORT QLandmarkIdFetchRequest : public QLandmarkAbstractRequest @@ -75,6 +75,6 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkidfilter.cpp b/src/location/landmarks/qlandmarkidfilter.cpp index cce5f559..b93c0cc7 100644 --- a/src/location/landmarks/qlandmarkidfilter.cpp +++ b/src/location/landmarks/qlandmarkidfilter.cpp @@ -42,7 +42,7 @@ #include "qlandmarkidfilter.h" #include "qlandmarkidfilter_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkIdFilter @@ -158,4 +158,4 @@ QLandmarkIdFilterPrivate::QLandmarkIdFilterPrivate(const QLandmarkIdFilterPrivat QLandmarkIdFilterPrivate::~QLandmarkIdFilterPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkidfilter.h b/src/location/landmarks/qlandmarkidfilter.h index 9e1ab8fa..c7f8e978 100644 --- a/src/location/landmarks/qlandmarkidfilter.h +++ b/src/location/landmarks/qlandmarkidfilter.h @@ -46,7 +46,7 @@ #include "qlandmarkfilter.h" #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIdFilterPrivate; class Q_LOCATION_EXPORT QLandmarkIdFilter : public QLandmarkFilter @@ -68,6 +68,6 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkIdFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkidfilter_p.h b/src/location/landmarks/qlandmarkidfilter_p.h index c96c2d0c..190e366a 100644 --- a/src/location/landmarks/qlandmarkidfilter_p.h +++ b/src/location/landmarks/qlandmarkidfilter_p.h @@ -57,7 +57,7 @@ #include "qlandmarkid.h" #include "qlandmarkidfilter.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIdFilterPrivate : public QLandmarkFilterPrivate { @@ -77,6 +77,6 @@ public: QList<QLandmarkId> landmarkIds; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkimportrequest.cpp b/src/location/landmarks/qlandmarkimportrequest.cpp index bf22944a..6dd51b0c 100644 --- a/src/location/landmarks/qlandmarkimportrequest.cpp +++ b/src/location/landmarks/qlandmarkimportrequest.cpp @@ -43,7 +43,7 @@ #include "qlandmarkrequests_p.h" #include <QFile> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkImportRequest @@ -228,6 +228,6 @@ QList<QLandmarkId> QLandmarkImportRequest::landmarkIds() const #include "moc_qlandmarkimportrequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkimportrequest.h b/src/location/landmarks/qlandmarkimportrequest.h index a2efd704..b4cb7058 100644 --- a/src/location/landmarks/qlandmarkimportrequest.h +++ b/src/location/landmarks/qlandmarkimportrequest.h @@ -43,9 +43,9 @@ #define QLANDMARKIMPORTREQUEST_H #include "qlandmarkabstractrequest.h" -class QIODevice; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QIODevice; class QLandmarkImportRequestPrivate; class Q_LOCATION_EXPORT QLandmarkImportRequest : public QLandmarkAbstractRequest { @@ -76,7 +76,7 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkintersectionfilter.cpp b/src/location/landmarks/qlandmarkintersectionfilter.cpp index dfd2979a..7e03790d 100644 --- a/src/location/landmarks/qlandmarkintersectionfilter.cpp +++ b/src/location/landmarks/qlandmarkintersectionfilter.cpp @@ -42,7 +42,7 @@ #include "qlandmarkintersectionfilter.h" #include "qlandmarkintersectionfilter_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkIntersectionFilter @@ -181,4 +181,4 @@ QLandmarkIntersectionFilterPrivate::QLandmarkIntersectionFilterPrivate(const QLa QLandmarkIntersectionFilterPrivate::~QLandmarkIntersectionFilterPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkintersectionfilter.h b/src/location/landmarks/qlandmarkintersectionfilter.h index bdb3b288..f57fb7af 100644 --- a/src/location/landmarks/qlandmarkintersectionfilter.h +++ b/src/location/landmarks/qlandmarkintersectionfilter.h @@ -45,7 +45,7 @@ #include "qlandmarkfilter.h" #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIntersectionFilterPrivate; class Q_LOCATION_EXPORT QLandmarkIntersectionFilter : public QLandmarkFilter @@ -69,6 +69,6 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkIntersectionFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkintersectionfilter_p.h b/src/location/landmarks/qlandmarkintersectionfilter_p.h index 95a6690d..f6659921 100644 --- a/src/location/landmarks/qlandmarkintersectionfilter_p.h +++ b/src/location/landmarks/qlandmarkintersectionfilter_p.h @@ -57,7 +57,7 @@ #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIntersectionFilterPrivate : public QLandmarkFilterPrivate { @@ -77,6 +77,6 @@ public: QList<QLandmarkFilter> filters; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkmanager.cpp b/src/location/landmarks/qlandmarkmanager.cpp index ca64261e..e97b7463 100644 --- a/src/location/landmarks/qlandmarkmanager.cpp +++ b/src/location/landmarks/qlandmarkmanager.cpp @@ -56,7 +56,8 @@ #include "qlandmarkmanagerenginefactory.h" #include "qlandmarkidfilter.h" -QTM_USE_NAMESPACE + +QT_BEGIN_NAMESPACE /*! \variable QLandmarkManager::Gpx @@ -1524,3 +1525,5 @@ QLandmarkManagerEngine *QLandmarkManager::engine() */ #include "moc_qlandmarkmanager.cpp" + +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkmanager.h b/src/location/landmarks/qlandmarkmanager.h index 2df37b27..6668546c 100644 --- a/src/location/landmarks/qlandmarkmanager.h +++ b/src/location/landmarks/qlandmarkmanager.h @@ -55,10 +55,10 @@ #include <qlatin1constant.h> #include <QObject> #include <QMap> + +QT_BEGIN_NAMESPACE class QIODevice; class QStringList; - -QTM_BEGIN_NAMESPACE class QLandmarkManagerPrivate; class QLandmarkManagerEngine; @@ -215,6 +215,6 @@ private: QLandmarkManagerEngine *engine(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkmanager_p.cpp b/src/location/landmarks/qlandmarkmanager_p.cpp index 343b88da..0405a9fa 100644 --- a/src/location/landmarks/qlandmarkmanager_p.cpp +++ b/src/location/landmarks/qlandmarkmanager_p.cpp @@ -52,7 +52,7 @@ #include "qmobilitypluginsearch.h" -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE QLandmarkManagerPrivate::QLandmarkManagerPrivate() : engine(0), @@ -169,3 +169,5 @@ void QLandmarkManagerPrivate::loadStaticFactories(QHash<QString, QLandmarkManage } } + +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkmanager_p.h b/src/location/landmarks/qlandmarkmanager_p.h index fbdf4042..e6feb7ab 100644 --- a/src/location/landmarks/qlandmarkmanager_p.h +++ b/src/location/landmarks/qlandmarkmanager_p.h @@ -61,7 +61,7 @@ #define QTLANDMARKS_IMPLEMENTATION_VERSION_NAME "com.nokia.qtmobility.landmarks.implementation.version" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkManagerEngine; class QLandmarkManagerEngineFactory; @@ -87,6 +87,6 @@ public: Q_DECLARE_PUBLIC(QLandmarkManager) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QLANDMARKMANAGER_P_H diff --git a/src/location/landmarks/qlandmarkmanagerengine.cpp b/src/location/landmarks/qlandmarkmanagerengine.cpp index b96dc099..1a6d54f7 100644 --- a/src/location/landmarks/qlandmarkmanagerengine.cpp +++ b/src/location/landmarks/qlandmarkmanagerengine.cpp @@ -78,7 +78,7 @@ #include <QWeakPointer> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE bool matchString(const QString &sourceString, const QString &matchString, QLandmarkFilter::MatchFlags matchFlags ) { @@ -1446,4 +1446,4 @@ QList<QLandmarkId> QLandmarkManagerEngine::sortLandmarks(const QList<QLandmark>& #include "moc_qlandmarkmanagerengine.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkmanagerengine.h b/src/location/landmarks/qlandmarkmanagerengine.h index 36501cbc..fd856ccb 100644 --- a/src/location/landmarks/qlandmarkmanagerengine.h +++ b/src/location/landmarks/qlandmarkmanagerengine.h @@ -49,9 +49,9 @@ #include "qlandmarkabstractrequest.h" -class QIODevice; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QIODevice; class QLandmarkCategory; class QLandmarkCategoryId; class QLandmark; @@ -194,6 +194,6 @@ public: static QList<QLandmarkId> sortLandmarks(const QList<QLandmark>& landmarks, const QList<QLandmarkSortOrder>& sortOrders); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkmanagerenginefactory.cpp b/src/location/landmarks/qlandmarkmanagerenginefactory.cpp index 1bcdebe2..da183b7e 100644 --- a/src/location/landmarks/qlandmarkmanagerenginefactory.cpp +++ b/src/location/landmarks/qlandmarkmanagerenginefactory.cpp @@ -42,7 +42,7 @@ #include "qlandmarkmanagerenginefactory.h" #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkManagerEngineFactory @@ -103,6 +103,6 @@ QList<int> QLandmarkManagerEngineFactory::supportedImplementationVersions() cons \since 1.1 */ -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkmanagerenginefactory.h b/src/location/landmarks/qlandmarkmanagerenginefactory.h index 861ec78e..c8be6381 100644 --- a/src/location/landmarks/qlandmarkmanagerenginefactory.h +++ b/src/location/landmarks/qlandmarkmanagerenginefactory.h @@ -46,7 +46,7 @@ #include "qlandmarkmanager.h" #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkManagerEngine; class Q_LOCATION_EXPORT QLandmarkManagerEngineFactory @@ -60,7 +60,7 @@ public: virtual QString managerName() const = 0; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_BEGIN_NAMESPACE #define QT_LANDMARKS_BACKEND_INTERFACE "com.nokia.qt.mobility.landmarks.enginefactory/1.0" diff --git a/src/location/landmarks/qlandmarknamefilter.cpp b/src/location/landmarks/qlandmarknamefilter.cpp index 2cb37d2d..44fce816 100644 --- a/src/location/landmarks/qlandmarknamefilter.cpp +++ b/src/location/landmarks/qlandmarknamefilter.cpp @@ -42,7 +42,7 @@ #include "qlandmarknamefilter.h" #include "qlandmarknamefilter_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkNameFilter @@ -140,4 +140,4 @@ QLandmarkNameFilterPrivate::QLandmarkNameFilterPrivate(const QLandmarkNameFilter QLandmarkNameFilterPrivate::~QLandmarkNameFilterPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarknamefilter.h b/src/location/landmarks/qlandmarknamefilter.h index bbe81c36..3b4e5662 100644 --- a/src/location/landmarks/qlandmarknamefilter.h +++ b/src/location/landmarks/qlandmarknamefilter.h @@ -47,7 +47,7 @@ #include <QString> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkNameFilterPrivate; class Q_LOCATION_EXPORT QLandmarkNameFilter : public QLandmarkFilter @@ -67,6 +67,6 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkNameFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarknamefilter_p.h b/src/location/landmarks/qlandmarknamefilter_p.h index 3ec8d2d8..a8ecb114 100644 --- a/src/location/landmarks/qlandmarknamefilter_p.h +++ b/src/location/landmarks/qlandmarknamefilter_p.h @@ -58,7 +58,7 @@ #include "qnamespace.h" #include <QString> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkNameFilterPrivate : public QLandmarkFilterPrivate { @@ -80,6 +80,6 @@ public: QLandmarkFilter::MatchFlags flags; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarknamesort.cpp b/src/location/landmarks/qlandmarknamesort.cpp index 698c3c93..c6f57663 100644 --- a/src/location/landmarks/qlandmarknamesort.cpp +++ b/src/location/landmarks/qlandmarknamesort.cpp @@ -42,7 +42,7 @@ #include "qlandmarknamesort.h" #include "qlandmarknamesort_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkNameSort @@ -120,4 +120,4 @@ QLandmarkNameSortPrivate::QLandmarkNameSortPrivate(const QLandmarkNameSortPrivat QLandmarkNameSortPrivate::~QLandmarkNameSortPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarknamesort.h b/src/location/landmarks/qlandmarknamesort.h index 4f40c03d..55ab535a 100644 --- a/src/location/landmarks/qlandmarknamesort.h +++ b/src/location/landmarks/qlandmarknamesort.h @@ -46,7 +46,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkNameSortPrivate; class Q_LOCATION_EXPORT QLandmarkNameSort : public QLandmarkSortOrder @@ -62,7 +62,7 @@ private: Q_DECLARE_LANDMARKSORTORDER_PRIVATE(QLandmarkNameSort) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/landmarks/qlandmarknamesort_p.h b/src/location/landmarks/qlandmarknamesort_p.h index e61b6a55..e3bed470 100644 --- a/src/location/landmarks/qlandmarknamesort_p.h +++ b/src/location/landmarks/qlandmarknamesort_p.h @@ -55,7 +55,7 @@ #include "qlandmarksortorder_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkNameSortPrivate : public QLandmarkSortOrderPrivate { @@ -76,6 +76,6 @@ public: Qt::CaseSensitivity sensitivity; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkproximityfilter.cpp b/src/location/landmarks/qlandmarkproximityfilter.cpp index bb64c141..d6672078 100644 --- a/src/location/landmarks/qlandmarkproximityfilter.cpp +++ b/src/location/landmarks/qlandmarkproximityfilter.cpp @@ -43,7 +43,7 @@ #include "qlandmarkproximityfilter_p.h" #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkProximityFilter @@ -177,4 +177,4 @@ QLandmarkProximityFilterPrivate::QLandmarkProximityFilterPrivate(const QLandmark QLandmarkProximityFilterPrivate::~QLandmarkProximityFilterPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkproximityfilter.h b/src/location/landmarks/qlandmarkproximityfilter.h index 0f480730..f937df1b 100644 --- a/src/location/landmarks/qlandmarkproximityfilter.h +++ b/src/location/landmarks/qlandmarkproximityfilter.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkProximityFilterPrivate; class Q_LOCATION_EXPORT QLandmarkProximityFilter : public QLandmarkFilter @@ -72,7 +72,7 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkProximityFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/landmarks/qlandmarkproximityfilter_p.h b/src/location/landmarks/qlandmarkproximityfilter_p.h index 8024b899..6c1f1586 100644 --- a/src/location/landmarks/qlandmarkproximityfilter_p.h +++ b/src/location/landmarks/qlandmarkproximityfilter_p.h @@ -56,7 +56,7 @@ #include "qlandmarkfilter_p.h" #include "qlandmarkproximityfilter.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; @@ -79,6 +79,6 @@ public: QGeoBoundingCircle circle; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkremoverequest.cpp b/src/location/landmarks/qlandmarkremoverequest.cpp index 57a40bf3..8606c211 100644 --- a/src/location/landmarks/qlandmarkremoverequest.cpp +++ b/src/location/landmarks/qlandmarkremoverequest.cpp @@ -43,7 +43,7 @@ #include "qlandmarkrequests_p.h" #include <QMap> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkRemoveRequest @@ -164,6 +164,6 @@ QMap<int, QLandmarkManager::Error> QLandmarkRemoveRequest::errorMap() const #include "moc_qlandmarkremoverequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkremoverequest.h b/src/location/landmarks/qlandmarkremoverequest.h index f24ae8b5..c31a3915 100644 --- a/src/location/landmarks/qlandmarkremoverequest.h +++ b/src/location/landmarks/qlandmarkremoverequest.h @@ -44,7 +44,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkRemoveRequestPrivate; class Q_LOCATION_EXPORT QLandmarkRemoveRequest : public QLandmarkAbstractRequest @@ -68,7 +68,7 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkrequests_p.h b/src/location/landmarks/qlandmarkrequests_p.h index f2022953..354cbd4d 100644 --- a/src/location/landmarks/qlandmarkrequests_p.h +++ b/src/location/landmarks/qlandmarkrequests_p.h @@ -59,7 +59,7 @@ #include "qlandmarkcategoryfetchrequest.h" #include "qlandmarknamesort.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkIdFetchRequestPrivate : public QLandmarkAbstractRequestPrivate { @@ -252,6 +252,6 @@ public: QList<QLandmarkId> landmarkIds; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarksaverequest.cpp b/src/location/landmarks/qlandmarksaverequest.cpp index 115da613..0e61da46 100644 --- a/src/location/landmarks/qlandmarksaverequest.cpp +++ b/src/location/landmarks/qlandmarksaverequest.cpp @@ -44,7 +44,7 @@ #include "qlandmark.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkSaveRequest @@ -136,6 +136,6 @@ QMap<int, QLandmarkManager::Error> QLandmarkSaveRequest::errorMap() const #include "moc_qlandmarksaverequest.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarksaverequest.h b/src/location/landmarks/qlandmarksaverequest.h index 73f45d8a..556590c4 100644 --- a/src/location/landmarks/qlandmarksaverequest.h +++ b/src/location/landmarks/qlandmarksaverequest.h @@ -44,7 +44,7 @@ #include "qlandmarkabstractrequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkSaveRequestPrivate; class Q_LOCATION_EXPORT QLandmarkSaveRequest : public QLandmarkAbstractRequest @@ -65,7 +65,7 @@ private: friend class QLandmarkManagerEngine; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarksortorder.cpp b/src/location/landmarks/qlandmarksortorder.cpp index 2b7d2704..ac297875 100644 --- a/src/location/landmarks/qlandmarksortorder.cpp +++ b/src/location/landmarks/qlandmarksortorder.cpp @@ -44,13 +44,13 @@ #include "qlandmarkid.h" #if !defined(Q_CC_MWERKS) -template<> QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate)>::clone() +template<> QT_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate)>::clone() { return d->clone(); } #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkSortOrder @@ -196,4 +196,4 @@ QLandmarkSortOrderPrivate::~QLandmarkSortOrderPrivate() { } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarksortorder.h b/src/location/landmarks/qlandmarksortorder.h index 0e26f022..48bd6f83 100644 --- a/src/location/landmarks/qlandmarksortorder.h +++ b/src/location/landmarks/qlandmarksortorder.h @@ -50,7 +50,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE #define Q_DECLARE_LANDMARKSORTORDER_PRIVATE(Class) \ inline Class##Private* d_func(); \ @@ -87,7 +87,7 @@ protected: QSharedDataPointer<QLandmarkSortOrderPrivate> d_ptr; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/landmarks/qlandmarksortorder_p.h b/src/location/landmarks/qlandmarksortorder_p.h index 2b441b6e..68dd8bd7 100644 --- a/src/location/landmarks/qlandmarksortorder_p.h +++ b/src/location/landmarks/qlandmarksortorder_p.h @@ -56,7 +56,7 @@ #include "qlandmarksortorder.h" #include <QSharedData> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE #define Q_IMPLEMENT_LANDMARKSORTORDER_PRIVATE(Class) \ Class##Private* Class::d_func() { return reinterpret_cast<Class##Private *>(d_ptr.data()); } \ @@ -93,18 +93,17 @@ public: Qt::SortOrder order; }; -QTM_END_NAMESPACE #if defined(Q_CC_MWERKS) // This results in multiple symbol definition errors on all other compilers // but not having a definition here results in an attempt to use the unspecialized // clone (which fails because of the pure virtuals above) -template<> QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate)>::clone() +template<> QLandmarkSortOrderPrivate *QSharedDataPointer<QLandmarkSortOrderPrivate>::clone() { return d->clone(); } #else -template<> QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QLandmarkSortOrderPrivate)>::clone(); +template<> QLandmarkSortOrderPrivate *QSharedDataPointer<QLandmarkSortOrderPrivate>::clone(); #endif QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkunionfilter.cpp b/src/location/landmarks/qlandmarkunionfilter.cpp index 272e4545..63deb357 100644 --- a/src/location/landmarks/qlandmarkunionfilter.cpp +++ b/src/location/landmarks/qlandmarkunionfilter.cpp @@ -42,7 +42,7 @@ #include "qlandmarkunionfilter.h" #include "qlandmarkunionfilter_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QLandmarkUnionFilter @@ -183,4 +183,4 @@ QLandmarkUnionFilterPrivate::QLandmarkUnionFilterPrivate(const QLandmarkUnionFil QLandmarkUnionFilterPrivate::~QLandmarkUnionFilterPrivate() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/landmarks/qlandmarkunionfilter.h b/src/location/landmarks/qlandmarkunionfilter.h index 3ecf29cd..a0e17753 100644 --- a/src/location/landmarks/qlandmarkunionfilter.h +++ b/src/location/landmarks/qlandmarkunionfilter.h @@ -45,7 +45,7 @@ #include "qlandmarkfilter.h" #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkUnionFilterPrivate; class Q_LOCATION_EXPORT QLandmarkUnionFilter : public QLandmarkFilter @@ -69,7 +69,7 @@ private: Q_DECLARE_LANDMARKFILTER_PRIVATE(QLandmarkUnionFilter) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/landmarks/qlandmarkunionfilter_p.h b/src/location/landmarks/qlandmarkunionfilter_p.h index e9419d56..32b8705d 100644 --- a/src/location/landmarks/qlandmarkunionfilter_p.h +++ b/src/location/landmarks/qlandmarkunionfilter_p.h @@ -57,7 +57,7 @@ #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkUnionFilterPrivate : public QLandmarkFilterPrivate { @@ -78,6 +78,6 @@ public: QList<QLandmarkFilter> filters; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/location.pro b/src/location/location.pro index 20fea7d4..68bd8c20 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -1,4 +1,5 @@ load(qt_module) +load(qt_module_config) TARGET = QtLocation QPRO_PWD = $$PWD @@ -10,7 +11,7 @@ QT = core gui network DEFINES += QT_BUILD_LOCATION_LIB QT_MAKEDLL -load(qt_module_config) +INCLUDEPATH += $$QT.location.private_includes/QtLocation HEADERS += qtlocationversion.h diff --git a/src/location/maps/qgeomaneuver.cpp b/src/location/maps/qgeomaneuver.cpp index 1a1767ca..94b44873 100644 --- a/src/location/maps/qgeomaneuver.cpp +++ b/src/location/maps/qgeomaneuver.cpp @@ -44,7 +44,7 @@ #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoManeuver @@ -318,4 +318,4 @@ bool QGeoManeuverPrivate::operator ==(const QGeoManeuverPrivate &other) const && (waypoint == other.waypoint)); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h index a50af961..83245ede 100644 --- a/src/location/maps/qgeomaneuver.h +++ b/src/location/maps/qgeomaneuver.h @@ -46,11 +46,11 @@ #include <QExplicitlySharedDataPointer> -class QString; QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QString; class QGeoCoordinate; class QGeoManeuverPrivate; @@ -107,7 +107,7 @@ private: QExplicitlySharedDataPointer<QGeoManeuverPrivate> d_ptr; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/maps/qgeomaneuver_p.h b/src/location/maps/qgeomaneuver_p.h index ae8bc043..2e176e0c 100644 --- a/src/location/maps/qgeomaneuver_p.h +++ b/src/location/maps/qgeomaneuver_p.h @@ -59,7 +59,7 @@ #include <QSharedData> #include <QString> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoManeuverPrivate : public QSharedData { @@ -80,6 +80,6 @@ public: QGeoCoordinate waypoint; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapcircleobject.cpp b/src/location/maps/qgeomapcircleobject.cpp index c8767cab..9da75184 100644 --- a/src/location/maps/qgeomapcircleobject.cpp +++ b/src/location/maps/qgeomapcircleobject.cpp @@ -46,7 +46,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapCircleObject @@ -336,5 +336,5 @@ QGeoMapCircleObjectPrivate::~QGeoMapCircleObjectPrivate() #include "moc_qgeomapcircleobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapcircleobject.h b/src/location/maps/qgeomapcircleobject.h index b253ed8b..5fce4504 100644 --- a/src/location/maps/qgeomapcircleobject.h +++ b/src/location/maps/qgeomapcircleobject.h @@ -48,7 +48,7 @@ #include <QPen> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingCircle; @@ -103,7 +103,7 @@ private: Q_DISABLE_COPY(QGeoMapCircleObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE Q_DECLARE_METATYPE(qreal) diff --git a/src/location/maps/qgeomapcircleobject_p.h b/src/location/maps/qgeomapcircleobject_p.h index 66ba98f5..565f6b3c 100644 --- a/src/location/maps/qgeomapcircleobject_p.h +++ b/src/location/maps/qgeomapcircleobject_p.h @@ -47,7 +47,7 @@ #include "qgeoboundingcircle.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapCircleObjectPrivate { @@ -61,6 +61,6 @@ public: quint32 pointCount; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapcustomobject.cpp b/src/location/maps/qgeomapcustomobject.cpp index 9a92fbfd..77203818 100644 --- a/src/location/maps/qgeomapcustomobject.cpp +++ b/src/location/maps/qgeomapcustomobject.cpp @@ -45,7 +45,7 @@ #include <QGraphicsItem> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapCustomObject @@ -290,5 +290,5 @@ QGeoMapCustomObjectPrivate::~QGeoMapCustomObjectPrivate() #include "moc_qgeomapcustomobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapcustomobject.h b/src/location/maps/qgeomapcustomobject.h index 66ae0a9a..a79e5b89 100644 --- a/src/location/maps/qgeomapcustomobject.h +++ b/src/location/maps/qgeomapcustomobject.h @@ -49,7 +49,7 @@ #include <QGraphicsItem> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapCustomObjectPrivate; @@ -89,6 +89,6 @@ private: Q_DISABLE_COPY(QGeoMapCustomObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapcustomobject_p.h b/src/location/maps/qgeomapcustomobject_p.h index fe292066..5387f193 100644 --- a/src/location/maps/qgeomapcustomobject_p.h +++ b/src/location/maps/qgeomapcustomobject_p.h @@ -46,10 +46,10 @@ #include <QPoint> -class QGraphicsItem; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QGraphicsItem; class QGeoMapCustomObjectPrivate { public: @@ -60,6 +60,6 @@ public: QPoint offset; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapdata.cpp b/src/location/maps/qgeomapdata.cpp index c4e0fdf1..795daa63 100644 --- a/src/location/maps/qgeomapdata.cpp +++ b/src/location/maps/qgeomapdata.cpp @@ -63,7 +63,7 @@ #include "qgeomapobject_p.h" #include <private/projwrapper_p.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapData @@ -833,4 +833,4 @@ void QGeoMapDataPrivate::emitUpdateMapDisplay(const QRectF &target) #include "moc_qgeomapdata.cpp" #include "moc_qgeomapdata_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapdata.h b/src/location/maps/qgeomapdata.h index 5747fc57..20a22a24 100644 --- a/src/location/maps/qgeomapdata.h +++ b/src/location/maps/qgeomapdata.h @@ -50,7 +50,7 @@ #include <QPainter> #include <QStyleOptionGraphicsItem> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingBox; @@ -166,6 +166,6 @@ private: friend class QGeoMapGroupObject; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapdata_p.h b/src/location/maps/qgeomapdata_p.h index 3189799d..1bd1ccc5 100644 --- a/src/location/maps/qgeomapdata_p.h +++ b/src/location/maps/qgeomapdata_p.h @@ -62,7 +62,7 @@ #include <private/projwrapper_p.h> #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMappingManagerEngine; class QGeoMapObjectEngine; @@ -105,6 +105,6 @@ private: Q_DISABLE_COPY(QGeoMapDataPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapgroupobject.cpp b/src/location/maps/qgeomapgroupobject.cpp index 32101096..07b19441 100644 --- a/src/location/maps/qgeomapgroupobject.cpp +++ b/src/location/maps/qgeomapgroupobject.cpp @@ -51,7 +51,7 @@ #include "qgeomapdata.h" #include "qgeomapdata_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapGroupObject @@ -312,5 +312,5 @@ void QGeoMapGroupObjectPrivate::childChangedZValue(int zValue) #include "moc_qgeomapgroupobject.cpp" #include "moc_qgeomapgroupobject_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapgroupobject.h b/src/location/maps/qgeomapgroupobject.h index 5329deec..364e01fd 100644 --- a/src/location/maps/qgeomapgroupobject.h +++ b/src/location/maps/qgeomapgroupobject.h @@ -44,7 +44,7 @@ #include "qgeomapobject.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingBox; @@ -82,6 +82,6 @@ private: Q_DISABLE_COPY(QGeoMapGroupObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapgroupobject_p.h b/src/location/maps/qgeomapgroupobject_p.h index 40d67fa6..9971b533 100644 --- a/src/location/maps/qgeomapgroupobject_p.h +++ b/src/location/maps/qgeomapgroupobject_p.h @@ -47,7 +47,7 @@ #include <QObject> #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapGroupObject; @@ -68,6 +68,6 @@ private: QGeoMapGroupObject *q_ptr; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapobject.cpp b/src/location/maps/qgeomapobject.cpp index 257dbc07..3f0b3993 100644 --- a/src/location/maps/qgeomapobject.cpp +++ b/src/location/maps/qgeomapobject.cpp @@ -51,7 +51,7 @@ #include <QtAlgorithms> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapObject @@ -531,4 +531,4 @@ QGeoMapObjectPrivate::~QGeoMapObjectPrivate() #include "moc_qgeomapobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapobject.h b/src/location/maps/qgeomapobject.h index a8b76969..11e40b25 100644 --- a/src/location/maps/qgeomapobject.h +++ b/src/location/maps/qgeomapobject.h @@ -47,11 +47,11 @@ #include <QList> #include <QObject> +QT_BEGIN_NAMESPACE class QPainter; class QRectF; class QGraphicsItem; -QTM_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingBox; @@ -149,6 +149,6 @@ private: friend class QGeoMapGroupObject; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapobject_p.h b/src/location/maps/qgeomapobject_p.h index b67931c3..0d0c160a 100644 --- a/src/location/maps/qgeomapobject_p.h +++ b/src/location/maps/qgeomapobject_p.h @@ -57,10 +57,10 @@ #include "qgeomapobjectinfo.h" #include "qgeocoordinate.h" -class QGraphicsItem; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QGraphicsItem; class QGeoMapObject; class QGeoMapData; @@ -85,6 +85,6 @@ public: Q_DISABLE_COPY(QGeoMapObjectPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapobjectengine_p.cpp b/src/location/maps/qgeomapobjectengine_p.cpp index e21ee6d9..e40f07f4 100644 --- a/src/location/maps/qgeomapobjectengine_p.cpp +++ b/src/location/maps/qgeomapobjectengine_p.cpp @@ -58,7 +58,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /* A quick note about how the transforms are set up: @@ -1176,4 +1176,4 @@ QGraphicsItem* QGeoMapObjectEngine::graphicsItemFromMapObject(QGeoMapObject *obj #include "moc_qgeomapobjectengine_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapobjectengine_p.h b/src/location/maps/qgeomapobjectengine_p.h index 6b60081a..91d0bc97 100644 --- a/src/location/maps/qgeomapobjectengine_p.h +++ b/src/location/maps/qgeomapobjectengine_p.h @@ -62,11 +62,11 @@ #include <QHash> #include <QList> +QT_BEGIN_NAMESPACE class QTransform; class QGraphicsItem; class QGraphicsScene; -QTM_BEGIN_NAMESPACE class QGeoMapObjectEngine : public QObject { @@ -170,6 +170,6 @@ private: Q_DISABLE_COPY(QGeoMapObjectEngine) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QGEOMAPOBJECTENGINE_P_H diff --git a/src/location/maps/qgeomapobjectinfo.cpp b/src/location/maps/qgeomapobjectinfo.cpp index 26484e3c..eeefcb8a 100644 --- a/src/location/maps/qgeomapobjectinfo.cpp +++ b/src/location/maps/qgeomapobjectinfo.cpp @@ -48,7 +48,7 @@ #include "qgeomapobject_p.h" #include "qgeoboundingbox.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapObjectInfo @@ -261,4 +261,4 @@ QGeoMapObjectInfoPrivate::~QGeoMapObjectInfoPrivate() {} #include "moc_qgeomapobjectinfo.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapobjectinfo.h b/src/location/maps/qgeomapobjectinfo.h index 7e034923..f9fafa7c 100644 --- a/src/location/maps/qgeomapobjectinfo.h +++ b/src/location/maps/qgeomapobjectinfo.h @@ -48,7 +48,7 @@ #include <QObject> #include <QSizeF> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingBox; @@ -92,6 +92,6 @@ private: Q_DISABLE_COPY(QGeoMapObjectInfo) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapobjectinfo_p.h b/src/location/maps/qgeomapobjectinfo_p.h index 88272495..646f6355 100644 --- a/src/location/maps/qgeomapobjectinfo_p.h +++ b/src/location/maps/qgeomapobjectinfo_p.h @@ -55,7 +55,7 @@ #include "qmobilityglobal.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapObject; class QGeoMapData; @@ -73,6 +73,6 @@ private: Q_DISABLE_COPY(QGeoMapObjectInfoPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapoverlay.cpp b/src/location/maps/qgeomapoverlay.cpp index 6d3f5a04..8ee2e80d 100644 --- a/src/location/maps/qgeomapoverlay.cpp +++ b/src/location/maps/qgeomapoverlay.cpp @@ -44,7 +44,7 @@ #include "qgeomapdata.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapOverlay @@ -111,4 +111,4 @@ QGeoMapOverlayPrivate::~QGeoMapOverlayPrivate() {} /******************************************************************************* *******************************************************************************/ -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomapoverlay.h b/src/location/maps/qgeomapoverlay.h index 0d807ad6..2e887282 100644 --- a/src/location/maps/qgeomapoverlay.h +++ b/src/location/maps/qgeomapoverlay.h @@ -47,11 +47,11 @@ #include <QList> #include <QObject> +QT_BEGIN_NAMESPACE + class QPainter; class QStyleOptionGraphicsItem; -QTM_BEGIN_NAMESPACE - class QGeoMapData; class QGeoMapOverlayPrivate; @@ -76,6 +76,6 @@ private: friend class QGeoMapData; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomapoverlay_p.h b/src/location/maps/qgeomapoverlay_p.h index 585a4b81..491006b1 100644 --- a/src/location/maps/qgeomapoverlay_p.h +++ b/src/location/maps/qgeomapoverlay_p.h @@ -55,7 +55,7 @@ #include "qmobilityglobal.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapData; @@ -71,6 +71,6 @@ private: Q_DISABLE_COPY(QGeoMapOverlayPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappingmanager.cpp b/src/location/maps/qgeomappingmanager.cpp index 874095bf..23027fa8 100644 --- a/src/location/maps/qgeomappingmanager.cpp +++ b/src/location/maps/qgeomappingmanager.cpp @@ -46,7 +46,7 @@ #include <QNetworkProxy> #include <QLocale> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMappingManager @@ -261,4 +261,4 @@ QGeoMappingManagerPrivate::~QGeoMappingManagerPrivate() #include "moc_qgeomappingmanager.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomappingmanager.h b/src/location/maps/qgeomappingmanager.h index 9baae007..d2e51b32 100644 --- a/src/location/maps/qgeomappingmanager.h +++ b/src/location/maps/qgeomappingmanager.h @@ -48,9 +48,9 @@ #include <QSize> #include <QPair> -class QLocale; +QT_BEGIN_NAMESPACE -QTM_BEGIN_NAMESPACE +class QLocale; class QGeoBoundingBox; class QGeoCoordinate; @@ -98,6 +98,6 @@ private: friend class QGeoServiceProvider; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappingmanager_p.h b/src/location/maps/qgeomappingmanager_p.h index a542f255..fa0cbbca 100644 --- a/src/location/maps/qgeomappingmanager_p.h +++ b/src/location/maps/qgeomappingmanager_p.h @@ -58,7 +58,7 @@ #include <QSize> #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMappingManagerEngine; @@ -74,6 +74,6 @@ private: Q_DISABLE_COPY(QGeoMappingManagerPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappingmanagerengine.cpp b/src/location/maps/qgeomappingmanagerengine.cpp index d063205e..fd6c8c47 100644 --- a/src/location/maps/qgeomappingmanagerengine.cpp +++ b/src/location/maps/qgeomappingmanagerengine.cpp @@ -44,7 +44,7 @@ #include <QNetworkProxy> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMappingManagerEngine @@ -428,4 +428,4 @@ QGeoMappingManagerEnginePrivate::~QGeoMappingManagerEnginePrivate() {} #include "moc_qgeomappingmanagerengine.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomappingmanagerengine.h b/src/location/maps/qgeomappingmanagerengine.h index faba70be..f8dd9872 100644 --- a/src/location/maps/qgeomappingmanagerengine.h +++ b/src/location/maps/qgeomappingmanagerengine.h @@ -48,9 +48,9 @@ #include <QSize> #include <QPair> -class QLocale; +QT_BEGIN_NAMESPACE -QTM_BEGIN_NAMESPACE +class QLocale; class QGeoBoundingBox; class QGeoCoordinate; @@ -119,6 +119,6 @@ private: friend class QGeoServiceProvider; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappingmanagerengine_p.h b/src/location/maps/qgeomappingmanagerengine_p.h index 0129a565..95decae5 100644 --- a/src/location/maps/qgeomappingmanagerengine_p.h +++ b/src/location/maps/qgeomappingmanagerengine_p.h @@ -59,7 +59,7 @@ #include <QList> #include <QLocale> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMappingManagerEnginePrivate { @@ -86,6 +86,6 @@ private: Q_DISABLE_COPY(QGeoMappingManagerEnginePrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappixmapobject.cpp b/src/location/maps/qgeomappixmapobject.cpp index 80577752..3b5a6a74 100644 --- a/src/location/maps/qgeomappixmapobject.cpp +++ b/src/location/maps/qgeomappixmapobject.cpp @@ -43,7 +43,7 @@ #include "qgeomappixmapobject_p.h" #include "qgeoboundingbox.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapPixmapObject @@ -218,5 +218,5 @@ QGeoMapPixmapObjectPrivate::~QGeoMapPixmapObjectPrivate() {} #include "moc_qgeomappixmapobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomappixmapobject.h b/src/location/maps/qgeomappixmapobject.h index 5d2562a8..6a3ac825 100644 --- a/src/location/maps/qgeomappixmapobject.h +++ b/src/location/maps/qgeomappixmapobject.h @@ -48,7 +48,7 @@ #include <QPixmap> #include <QPoint> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapPixmapObjectPrivate; @@ -86,6 +86,6 @@ private: Q_DISABLE_COPY(QGeoMapPixmapObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappixmapobject_p.h b/src/location/maps/qgeomappixmapobject_p.h index d1b90cc1..9f6166fd 100644 --- a/src/location/maps/qgeomappixmapobject_p.h +++ b/src/location/maps/qgeomappixmapobject_p.h @@ -47,7 +47,7 @@ #include <QPixmap> #include <QPoint> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapPixmapObjectPrivate { @@ -59,6 +59,6 @@ public: QPoint offset; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappolygonobject.cpp b/src/location/maps/qgeomappolygonobject.cpp index 48293016..d82aba18 100644 --- a/src/location/maps/qgeomappolygonobject.cpp +++ b/src/location/maps/qgeomappolygonobject.cpp @@ -44,7 +44,7 @@ #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapPolygonObject @@ -208,5 +208,5 @@ QGeoMapPolygonObjectPrivate::~QGeoMapPolygonObjectPrivate() {} #include "moc_qgeomappolygonobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomappolygonobject.h b/src/location/maps/qgeomappolygonobject.h index 23ef5d62..a293f0af 100644 --- a/src/location/maps/qgeomappolygonobject.h +++ b/src/location/maps/qgeomappolygonobject.h @@ -48,7 +48,7 @@ #include <QPen> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapPolygonObjectPrivate; @@ -85,6 +85,6 @@ private: Q_DISABLE_COPY(QGeoMapPolygonObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappolygonobject_p.h b/src/location/maps/qgeomappolygonobject_p.h index 48f6273a..c8bf4509 100644 --- a/src/location/maps/qgeomappolygonobject_p.h +++ b/src/location/maps/qgeomappolygonobject_p.h @@ -48,7 +48,7 @@ #include <QPen> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapPolygonObjectPrivate { @@ -61,6 +61,6 @@ public: QBrush brush; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappolylineobject.cpp b/src/location/maps/qgeomappolylineobject.cpp index 8dabe004..bb3c501c 100644 --- a/src/location/maps/qgeomappolylineobject.cpp +++ b/src/location/maps/qgeomappolylineobject.cpp @@ -44,7 +44,7 @@ #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapPolylineObject @@ -174,5 +174,5 @@ QGeoMapPolylineObjectPrivate::~QGeoMapPolylineObjectPrivate() {} #include "moc_qgeomappolylineobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomappolylineobject.h b/src/location/maps/qgeomappolylineobject.h index bfaef47c..ec343841 100644 --- a/src/location/maps/qgeomappolylineobject.h +++ b/src/location/maps/qgeomappolylineobject.h @@ -47,7 +47,7 @@ #include <QList> #include <QPen> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; @@ -81,6 +81,6 @@ private: Q_DISABLE_COPY(QGeoMapPolylineObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomappolylineobject_p.h b/src/location/maps/qgeomappolylineobject_p.h index c27afbfd..845b7953 100644 --- a/src/location/maps/qgeomappolylineobject_p.h +++ b/src/location/maps/qgeomappolylineobject_p.h @@ -47,7 +47,7 @@ #include <QList> #include <QPen> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapPolylineObjectPrivate { @@ -59,6 +59,6 @@ public: QPen pen; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomaprectangleobject.cpp b/src/location/maps/qgeomaprectangleobject.cpp index ef336f57..4712ce8b 100644 --- a/src/location/maps/qgeomaprectangleobject.cpp +++ b/src/location/maps/qgeomaprectangleobject.cpp @@ -45,7 +45,7 @@ #include "qgeocoordinate.h" #include "qgeoboundingbox.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapRectangleObject @@ -295,5 +295,5 @@ QGeoMapRectangleObjectPrivate::~QGeoMapRectangleObjectPrivate() {} #include "moc_qgeomaprectangleobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomaprectangleobject.h b/src/location/maps/qgeomaprectangleobject.h index 7c096a56..6f24450f 100644 --- a/src/location/maps/qgeomaprectangleobject.h +++ b/src/location/maps/qgeomaprectangleobject.h @@ -47,7 +47,7 @@ #include <QPen> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapRectangleObjectPrivate; class QGeoBoundingBox; @@ -96,6 +96,6 @@ private: Q_DISABLE_COPY(QGeoMapRectangleObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomaprectangleobject_p.h b/src/location/maps/qgeomaprectangleobject_p.h index fc30de02..814dc2fb 100644 --- a/src/location/maps/qgeomaprectangleobject_p.h +++ b/src/location/maps/qgeomaprectangleobject_p.h @@ -47,7 +47,7 @@ #include <QPen> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapRectangleObjectPrivate { @@ -60,6 +60,6 @@ public: QBrush brush; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomaprouteobject.cpp b/src/location/maps/qgeomaprouteobject.cpp index 08e038fb..462d98f0 100644 --- a/src/location/maps/qgeomaprouteobject.cpp +++ b/src/location/maps/qgeomaprouteobject.cpp @@ -46,7 +46,7 @@ #define DEFAULT_ROUTE_DETAIL_LEVEL 6 -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapRouteObject @@ -220,5 +220,5 @@ QGeoMapRouteObjectPrivate::~QGeoMapRouteObjectPrivate() {} #include "moc_qgeomaprouteobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomaprouteobject.h b/src/location/maps/qgeomaprouteobject.h index bc649742..7ea74723 100644 --- a/src/location/maps/qgeomaprouteobject.h +++ b/src/location/maps/qgeomaprouteobject.h @@ -47,7 +47,7 @@ #include <QPen> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapRouteObjectPrivate; class QGeoRoute; @@ -87,6 +87,6 @@ private: Q_DISABLE_COPY(QGeoMapRouteObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomaprouteobject_p.h b/src/location/maps/qgeomaprouteobject_p.h index 01fc0047..4d5fca57 100644 --- a/src/location/maps/qgeomaprouteobject_p.h +++ b/src/location/maps/qgeomaprouteobject_p.h @@ -46,7 +46,7 @@ #include <QPen> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapRouteObjectPrivate { @@ -59,6 +59,6 @@ public: quint32 detailLevel; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomaptextobject.cpp b/src/location/maps/qgeomaptextobject.cpp index ca56da9e..68cbc154 100644 --- a/src/location/maps/qgeomaptextobject.cpp +++ b/src/location/maps/qgeomaptextobject.cpp @@ -42,7 +42,7 @@ #include "qgeomaptextobject.h" #include "qgeomaptextobject_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapTextObject @@ -371,5 +371,5 @@ QGeoMapTextObjectPrivate::~QGeoMapTextObjectPrivate() {} #include "moc_qgeomaptextobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeomaptextobject.h b/src/location/maps/qgeomaptextobject.h index 3d14bb0e..0447aea4 100644 --- a/src/location/maps/qgeomaptextobject.h +++ b/src/location/maps/qgeomaptextobject.h @@ -48,7 +48,7 @@ #include <QFont> #include <QPoint> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapTextObjectPrivate; @@ -110,6 +110,6 @@ private: Q_DISABLE_COPY(QGeoMapTextObject) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeomaptextobject_p.h b/src/location/maps/qgeomaptextobject_p.h index e312b1a5..4c1a7101 100644 --- a/src/location/maps/qgeomaptextobject_p.h +++ b/src/location/maps/qgeomaptextobject_p.h @@ -49,7 +49,7 @@ #include <QPen> #include <QBrush> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapTextObjectPrivate { @@ -65,6 +65,6 @@ public: Qt::Alignment alignment; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoroute.cpp b/src/location/maps/qgeoroute.cpp index 8fb2e1b9..933a840b 100644 --- a/src/location/maps/qgeoroute.cpp +++ b/src/location/maps/qgeoroute.cpp @@ -47,7 +47,7 @@ #include <QDateTime> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoRoute @@ -320,4 +320,4 @@ bool QGeoRoutePrivate::operator ==(const QGeoRoutePrivate &other) const && (path == other.path)); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h index 151fbc86..eca734dd 100644 --- a/src/location/maps/qgeoroute.h +++ b/src/location/maps/qgeoroute.h @@ -51,7 +51,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoBoundingBox; class QGeoRouteSegment; @@ -98,7 +98,7 @@ private: QExplicitlySharedDataPointer<QGeoRoutePrivate> d_ptr; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/maps/qgeoroute_p.h b/src/location/maps/qgeoroute_p.h index 0c382ebd..c039c1d1 100644 --- a/src/location/maps/qgeoroute_p.h +++ b/src/location/maps/qgeoroute_p.h @@ -60,7 +60,7 @@ #include <QSharedData> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; @@ -89,6 +89,6 @@ public: QGeoRouteSegment firstSegment; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoroutereply.cpp b/src/location/maps/qgeoroutereply.cpp index af3a10d6..f4c0e840 100644 --- a/src/location/maps/qgeoroutereply.cpp +++ b/src/location/maps/qgeoroutereply.cpp @@ -42,7 +42,7 @@ #include "qgeoroutereply.h" #include "qgeoroutereply_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoRouteReply @@ -268,4 +268,4 @@ QGeoRouteReplyPrivate::~QGeoRouteReplyPrivate() {} #include "moc_qgeoroutereply.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h index 1dfc3188..f331c766 100644 --- a/src/location/maps/qgeoroutereply.h +++ b/src/location/maps/qgeoroutereply.h @@ -49,7 +49,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoRouteRequest; class QGeoRouteReplyPrivate; @@ -96,7 +96,7 @@ private: Q_DISABLE_COPY(QGeoRouteReply) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/maps/qgeoroutereply_p.h b/src/location/maps/qgeoroutereply_p.h index 1eb9dfe8..b489fdd8 100644 --- a/src/location/maps/qgeoroutereply_p.h +++ b/src/location/maps/qgeoroutereply_p.h @@ -58,7 +58,7 @@ #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoRoute; @@ -80,6 +80,6 @@ private: Q_DISABLE_COPY(QGeoRouteReplyPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeorouterequest.cpp b/src/location/maps/qgeorouterequest.cpp index 955c54e7..55e454bb 100644 --- a/src/location/maps/qgeorouterequest.cpp +++ b/src/location/maps/qgeorouterequest.cpp @@ -45,7 +45,7 @@ #include "qgeocoordinate.h" #include "qgeoboundingbox.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoRouteRequest @@ -485,4 +485,4 @@ bool QGeoRouteRequestPrivate::operator ==(const QGeoRouteRequestPrivate &other) && (maneuverDetail == other.maneuverDetail)); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h index 8fe9f1bf..cdca8989 100644 --- a/src/location/maps/qgeorouterequest.h +++ b/src/location/maps/qgeorouterequest.h @@ -50,7 +50,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingBox; @@ -163,7 +163,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoRouteRequest::RouteOptimizations) Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoRouteRequest::SegmentDetails) Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoRouteRequest::ManeuverDetails) -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/maps/qgeorouterequest_p.h b/src/location/maps/qgeorouterequest_p.h index 4152255d..d06d458e 100644 --- a/src/location/maps/qgeorouterequest_p.h +++ b/src/location/maps/qgeorouterequest_p.h @@ -60,7 +60,7 @@ #include <QDateTime> #include <QMap> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoRouteRequestPrivate : public QSharedData { @@ -82,6 +82,6 @@ public: QGeoRouteRequest::ManeuverDetail maneuverDetail; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoroutesegment.cpp b/src/location/maps/qgeoroutesegment.cpp index ab24e854..ff6f5257 100644 --- a/src/location/maps/qgeoroutesegment.cpp +++ b/src/location/maps/qgeoroutesegment.cpp @@ -45,7 +45,7 @@ #include "qgeocoordinate.h" #include <QDateTime> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoRouteSegment @@ -273,5 +273,5 @@ bool QGeoRouteSegmentPrivate::operator ==(const QGeoRouteSegmentPrivate &other) /******************************************************************************* *******************************************************************************/ -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeoroutesegment.h b/src/location/maps/qgeoroutesegment.h index 6b910d20..2396f28c 100644 --- a/src/location/maps/qgeoroutesegment.h +++ b/src/location/maps/qgeoroutesegment.h @@ -49,7 +49,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoManeuver; @@ -92,7 +92,7 @@ private: QExplicitlySharedDataPointer<QGeoRouteSegmentPrivate> d_ptr; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/maps/qgeoroutesegment_p.h b/src/location/maps/qgeoroutesegment_p.h index 4d150e91..c4e45ff4 100644 --- a/src/location/maps/qgeoroutesegment_p.h +++ b/src/location/maps/qgeoroutesegment_p.h @@ -59,7 +59,7 @@ #include <QList> #include <QString> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; @@ -82,6 +82,6 @@ public: QExplicitlySharedDataPointer<QGeoRouteSegmentPrivate> nextSegment; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoroutingmanager.cpp b/src/location/maps/qgeoroutingmanager.cpp index a9dcd56d..27ebd904 100644 --- a/src/location/maps/qgeoroutingmanager.cpp +++ b/src/location/maps/qgeoroutingmanager.cpp @@ -45,7 +45,7 @@ #include <QLocale> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoRoutingManager @@ -416,4 +416,4 @@ QGeoRoutingManagerPrivate::~QGeoRoutingManagerPrivate() #include "moc_qgeoroutingmanager.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h index 15d3c762..66bafeaa 100644 --- a/src/location/maps/qgeoroutingmanager.h +++ b/src/location/maps/qgeoroutingmanager.h @@ -48,9 +48,9 @@ #include <QObject> #include <QMap> -class QLocale; +QT_BEGIN_NAMESPACE -QTM_BEGIN_NAMESPACE +class QLocale; class QGeoRoutingManagerEngine; class QGeoRoutingManagerPrivate; @@ -93,6 +93,6 @@ private: friend class QGeoServiceProvider; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoroutingmanager_p.h b/src/location/maps/qgeoroutingmanager_p.h index c35fb440..393b335b 100644 --- a/src/location/maps/qgeoroutingmanager_p.h +++ b/src/location/maps/qgeoroutingmanager_p.h @@ -55,7 +55,7 @@ #include "qmobilityglobal.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoRoutingManagerEngine; @@ -71,6 +71,6 @@ private: Q_DISABLE_COPY(QGeoRoutingManagerPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoroutingmanagerengine.cpp b/src/location/maps/qgeoroutingmanagerengine.cpp index ac6d0316..beac9604 100644 --- a/src/location/maps/qgeoroutingmanagerengine.cpp +++ b/src/location/maps/qgeoroutingmanagerengine.cpp @@ -42,7 +42,7 @@ #include "qgeoroutingmanagerengine.h" #include "qgeoroutingmanagerengine_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoRoutingManagerEngine @@ -465,4 +465,4 @@ QGeoRoutingManagerEnginePrivate::~QGeoRoutingManagerEnginePrivate() {} #include "moc_qgeoroutingmanagerengine.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h index 7ebc77bb..a38d3f08 100644 --- a/src/location/maps/qgeoroutingmanagerengine.h +++ b/src/location/maps/qgeoroutingmanagerengine.h @@ -48,9 +48,9 @@ #include <QObject> #include <QMap> -class QLocale; +QT_BEGIN_NAMESPACE -QTM_BEGIN_NAMESPACE +class QLocale; class QGeoRoutingManagerEnginePrivate; @@ -105,6 +105,6 @@ private: friend class QGeoServiceProvider; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoroutingmanagerengine_p.h b/src/location/maps/qgeoroutingmanagerengine_p.h index 63afc8dc..1b26aa0b 100644 --- a/src/location/maps/qgeoroutingmanagerengine_p.h +++ b/src/location/maps/qgeoroutingmanagerengine_p.h @@ -58,7 +58,7 @@ #include <QMap> #include <QLocale> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoRoutingManagerEnginePrivate { @@ -85,6 +85,6 @@ private: Q_DISABLE_COPY(QGeoRoutingManagerEnginePrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeosearchmanager.cpp b/src/location/maps/qgeosearchmanager.cpp index 8427e2cd..f3818123 100644 --- a/src/location/maps/qgeosearchmanager.cpp +++ b/src/location/maps/qgeosearchmanager.cpp @@ -56,7 +56,7 @@ #include <QLocale> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoSearchManager @@ -679,4 +679,4 @@ void QGeoCombiningSearchReply::landmarkFetchStateChanged(QLandmarkAbstractReques #include "moc_qgeosearchmanager.cpp" #include "moc_qgeosearchmanager_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeosearchmanager.h b/src/location/maps/qgeosearchmanager.h index 5e8ed924..a4a024a8 100644 --- a/src/location/maps/qgeosearchmanager.h +++ b/src/location/maps/qgeosearchmanager.h @@ -49,10 +49,9 @@ #include <QList> #include <QMap> +QT_BEGIN_NAMESPACE class QLocale; -QTM_BEGIN_NAMESPACE - class QLandmarkManager; class QGeoSearchManagerEngine; @@ -114,6 +113,6 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoSearchManager::SearchTypes) -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeosearchmanager_p.h b/src/location/maps/qgeosearchmanager_p.h index c946cbb8..946e1dbc 100644 --- a/src/location/maps/qgeosearchmanager_p.h +++ b/src/location/maps/qgeosearchmanager_p.h @@ -60,7 +60,7 @@ #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkManager; class QGeoSearchManagerEngine; @@ -95,7 +95,7 @@ private: QList<QLandmarkFetchRequest*> fetchRequests; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeosearchmanagerengine.cpp b/src/location/maps/qgeosearchmanagerengine.cpp index 74af9b8f..5a6a8a47 100644 --- a/src/location/maps/qgeosearchmanagerengine.cpp +++ b/src/location/maps/qgeosearchmanagerengine.cpp @@ -46,7 +46,7 @@ #include "qgeocoordinate.h" #include "qlandmarkmanager.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoSearchManagerEngine @@ -512,4 +512,4 @@ QGeoSearchManagerEnginePrivate::~QGeoSearchManagerEnginePrivate() #include "moc_qgeosearchmanagerengine.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeosearchmanagerengine.h b/src/location/maps/qgeosearchmanagerengine.h index 7cdf38fb..86b14165 100644 --- a/src/location/maps/qgeosearchmanagerengine.h +++ b/src/location/maps/qgeosearchmanagerengine.h @@ -49,7 +49,7 @@ #include <QObject> #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkManager; @@ -109,6 +109,6 @@ private: friend class QGeoServiceProvider; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeosearchmanagerengine_p.h b/src/location/maps/qgeosearchmanagerengine_p.h index cb4fe592..488c9a35 100644 --- a/src/location/maps/qgeosearchmanagerengine_p.h +++ b/src/location/maps/qgeosearchmanagerengine_p.h @@ -58,7 +58,7 @@ #include <QList> #include <QLocale> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QLandmarkManager; @@ -84,6 +84,6 @@ private: Q_DISABLE_COPY(QGeoSearchManagerEnginePrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeosearchreply.cpp b/src/location/maps/qgeosearchreply.cpp index 371123b1..42fc0d11 100644 --- a/src/location/maps/qgeosearchreply.cpp +++ b/src/location/maps/qgeosearchreply.cpp @@ -42,7 +42,7 @@ #include "qgeosearchreply.h" #include "qgeosearchreply_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoSearchReply @@ -341,4 +341,4 @@ QGeoSearchReplyPrivate::~QGeoSearchReplyPrivate() {} #include "moc_qgeosearchreply.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeosearchreply.h b/src/location/maps/qgeosearchreply.h index 0bf53864..4da0f0f7 100644 --- a/src/location/maps/qgeosearchreply.h +++ b/src/location/maps/qgeosearchreply.h @@ -47,7 +47,7 @@ #include <QObject> #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSearchReplyPrivate; @@ -103,6 +103,6 @@ private: Q_DISABLE_COPY(QGeoSearchReply) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeosearchreply_p.h b/src/location/maps/qgeosearchreply_p.h index 50bf9d6d..95656bf6 100644 --- a/src/location/maps/qgeosearchreply_p.h +++ b/src/location/maps/qgeosearchreply_p.h @@ -59,7 +59,7 @@ #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoPlace; @@ -83,6 +83,6 @@ private: Q_DISABLE_COPY(QGeoSearchReplyPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp index e372a4b4..bb9f3c9f 100644 --- a/src/location/maps/qgeoserviceprovider.cpp +++ b/src/location/maps/qgeoserviceprovider.cpp @@ -64,7 +64,7 @@ #include "qmobilitypluginsearch.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoServiceProvider @@ -426,5 +426,5 @@ void QGeoServiceProviderPrivate::loadStaticPlugins(QHash<QString, QGeoServicePro } } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h index 825e4c03..8fbe8ee6 100644 --- a/src/location/maps/qgeoserviceprovider.h +++ b/src/location/maps/qgeoserviceprovider.h @@ -48,12 +48,12 @@ #include <QVariant> #include <QString> -class QStringList; QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QStringList; class QGeoSearchManager; class QGeoMappingManager; class QGeoRoutingManager; @@ -89,7 +89,7 @@ private: QGeoServiceProviderPrivate* d_ptr; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/maps/qgeoserviceprovider_p.h b/src/location/maps/qgeoserviceprovider_p.h index 5b2038dd..3d564481 100644 --- a/src/location/maps/qgeoserviceprovider_p.h +++ b/src/location/maps/qgeoserviceprovider_p.h @@ -57,7 +57,7 @@ #include <QHash> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSearchManager; class QGeoRoutingManager; @@ -97,6 +97,6 @@ public: static void loadStaticPlugins(QHash<QString, QGeoServiceProviderFactory*> *plugins); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgeoserviceproviderfactory.cpp b/src/location/maps/qgeoserviceproviderfactory.cpp index 83827517..74b76e6b 100644 --- a/src/location/maps/qgeoserviceproviderfactory.cpp +++ b/src/location/maps/qgeoserviceproviderfactory.cpp @@ -41,7 +41,7 @@ #include "qgeoserviceproviderfactory.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoServiceProviderFactory @@ -163,4 +163,4 @@ QGeoRoutingManagerEngine* QGeoServiceProviderFactory::createRoutingManagerEngine return 0; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h index a6ddc725..1e457d7f 100644 --- a/src/location/maps/qgeoserviceproviderfactory.h +++ b/src/location/maps/qgeoserviceproviderfactory.h @@ -49,7 +49,7 @@ #include <QMap> #include <QString> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class Q_LOCATION_EXPORT QGeoServiceProviderFactory { @@ -70,7 +70,7 @@ public: QString *errorString) const; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_BEGIN_NAMESPACE #define QT_GEOSERVICE_BACKEND_INTERFACE "com.nokia.qt.mobility.geoservice.serviceproviderfactory/1.0" diff --git a/src/location/maps/qgraphicsgeomap.cpp b/src/location/maps/qgraphicsgeomap.cpp index 09484aa6..5ccad8a6 100644 --- a/src/location/maps/qgraphicsgeomap.cpp +++ b/src/location/maps/qgraphicsgeomap.cpp @@ -58,7 +58,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGraphicsGeoMap @@ -818,4 +818,4 @@ QGraphicsGeoMapPrivate::~QGraphicsGeoMapPrivate() #include "moc_qgraphicsgeomap.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/qgraphicsgeomap.h b/src/location/maps/qgraphicsgeomap.h index 03e013a7..00a47d8c 100644 --- a/src/location/maps/qgraphicsgeomap.h +++ b/src/location/maps/qgraphicsgeomap.h @@ -46,7 +46,7 @@ #include <QGraphicsWidget> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoMappingManager; @@ -167,6 +167,6 @@ private: Q_DISABLE_COPY(QGraphicsGeoMap) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/qgraphicsgeomap_p.h b/src/location/maps/qgraphicsgeomap_p.h index 614dfb7b..c3818c99 100644 --- a/src/location/maps/qgraphicsgeomap_p.h +++ b/src/location/maps/qgraphicsgeomap_p.h @@ -55,7 +55,7 @@ #include "qmobilityglobal.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoServiceProvider; class QGeoMappingManager; @@ -75,6 +75,6 @@ private: Q_DISABLE_COPY(QGraphicsGeoMapPrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/makepoly_p.h b/src/location/maps/tiled/makepoly_p.h index a5389931..d8b3a852 100644 --- a/src/location/maps/tiled/makepoly_p.h +++ b/src/location/maps/tiled/makepoly_p.h @@ -61,7 +61,7 @@ #include <QPolygonF> #include <QGraphicsPolygonItem> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE // TODO: replace boolean parameter by enum static inline void makepoly(QPolygonF &points, const QList<QGeoCoordinate> & path, const QGeoTiledMapDataPrivate * mapData, bool closedPath, qreal ypole = -100) @@ -133,6 +133,6 @@ static inline void makepoly(QPolygonF &points, const QList<QGeoCoordinate> & pat } } -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //MAKEPOLY_P_H diff --git a/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.cpp index 04a5d7df..2d726b2b 100644 --- a/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.cpp @@ -50,7 +50,7 @@ #include <QGraphicsItem> #include <QGraphicsEllipseItem> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapCircleObjectInfo::QGeoTiledMapCircleObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -103,4 +103,4 @@ void QGeoTiledMapCircleObjectInfo::brushChanged(const QBrush &brush) #include "moc_qgeotiledmapcircleobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.h index 7ea9b3c2..c6f07383 100644 --- a/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmapcircleobjectinfo_p.h @@ -59,10 +59,9 @@ #include <QPen> #include <QBrush> -class QGraphicsEllipseItem; - -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QGraphicsEllipseItem; class QGeoMapCircleObject; class QGeoTiledMapCircleObjectInfo : public QGeoTiledMapObjectInfo @@ -81,6 +80,6 @@ public slots: void brushChanged(const QBrush &brush); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPCIRCLEOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.cpp index 8ce1b5c9..080df3e7 100644 --- a/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.cpp @@ -46,7 +46,7 @@ #include "qgeomapcustomobject.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapCustomObjectInfo::QGeoTiledMapCustomObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -97,5 +97,5 @@ void QGeoTiledMapCustomObjectInfo::offsetChanged(const QPoint &/*offset*/) #include "moc_qgeotiledmapcustomobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.h index 09d56f7f..cdf2c81c 100644 --- a/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmapcustomobjectinfo_p.h @@ -60,7 +60,7 @@ class QGraphicsPixmapItem; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapCustomObject; @@ -79,7 +79,7 @@ public slots: void offsetChanged(const QPoint &offset); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPCUSTOMOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmapdata.cpp b/src/location/maps/tiled/qgeotiledmapdata.cpp index c421c4fb..c2eb4159 100644 --- a/src/location/maps/tiled/qgeotiledmapdata.cpp +++ b/src/location/maps/tiled/qgeotiledmapdata.cpp @@ -80,6 +80,8 @@ #include <math.h> +QT_BEGIN_NAMESPACE + uint qHash(const QRectF& key) { uint result = qHash(qRound(key.x())); @@ -89,7 +91,6 @@ uint qHash(const QRectF& key) return result; } -QTM_BEGIN_NAMESPACE /*! \class QGeoTiledMapData @@ -1427,4 +1428,4 @@ QGeoTiledMapRequest QGeoTileIterator::next() #include "moc_qgeotiledmapdata.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmapdata.h b/src/location/maps/tiled/qgeotiledmapdata.h index ca454b7e..5926f085 100644 --- a/src/location/maps/tiled/qgeotiledmapdata.h +++ b/src/location/maps/tiled/qgeotiledmapdata.h @@ -47,7 +47,7 @@ #include <QRectF> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoTiledMapDataPrivate; @@ -110,6 +110,6 @@ private: friend class QGeoTiledMapObjectInfo; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/qgeotiledmapdata_p.h b/src/location/maps/tiled/qgeotiledmapdata_p.h index 3ff60f3a..5df38012 100644 --- a/src/location/maps/tiled/qgeotiledmapdata_p.h +++ b/src/location/maps/tiled/qgeotiledmapdata_p.h @@ -66,7 +66,7 @@ class QGraphicsScene; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoTiledMapData; class QGeoTiledMapRequest; @@ -163,6 +163,6 @@ private: QRect tileRect; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.cpp index 9782bb25..0bac17f8 100644 --- a/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.cpp @@ -54,7 +54,7 @@ #include <QGraphicsScene> #include <QGraphicsPathItem> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapGroupObjectInfo::QGeoTiledMapGroupObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -134,4 +134,4 @@ void QGeoTiledMapGroupObjectInfo::childRemoved(QGeoMapObject *childObject) #include "moc_qgeotiledmapgroupobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.h index 447fdba6..7ea3de33 100644 --- a/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmapgroupobjectinfo_p.h @@ -55,10 +55,9 @@ #include "qgeotiledmapobjectinfo_p.h" +QT_BEGIN_NAMESPACE class QGraphicsPathItem; -QTM_BEGIN_NAMESPACE - class QGeoMapGroupObject; class QGeoTiledMapGroupObjectInfo : public QGeoTiledMapObjectInfo @@ -77,6 +76,6 @@ public slots: void childRemoved(QGeoMapObject *childObject); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPGROUPOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp index d989183f..510413d8 100644 --- a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.cpp @@ -52,7 +52,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapObjectInfo::QGeoTiledMapObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoMapObjectInfo(mapData, mapObject), @@ -118,19 +118,19 @@ void QGeoTiledMapObjectInfo::selectedChanged(bool /*selected*/) // } } -void QGeoTiledMapObjectInfo::originChanged(const QGeoCoordinate &origin) +void QGeoTiledMapObjectInfo::originChanged(const QGeoCoordinate &/*origin*/) { if (graphicsItem) updateItem(); } -void QGeoTiledMapObjectInfo::unitsChanged(QGeoMapObject::CoordinateUnit units) +void QGeoTiledMapObjectInfo::unitsChanged(QGeoMapObject::CoordinateUnit /*units*/) { if (graphicsItem) updateItem(); } -void QGeoTiledMapObjectInfo::transformTypeChanged(QGeoMapObject::TransformType transformType) +void QGeoTiledMapObjectInfo::transformTypeChanged(QGeoMapObject::TransformType /*transformType*/) { if (graphicsItem) updateItem(); @@ -255,5 +255,5 @@ void QGeoTiledMapObjectInfo::updateItem(const QRectF& target) #include "moc_qgeotiledmapobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.h index 65fe3792..ea1fb559 100644 --- a/src/location/maps/tiled/qgeotiledmapobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmapobjectinfo_p.h @@ -57,12 +57,12 @@ #include <QRectF> +QT_BEGIN_NAMESPACE + class QGraphicsItem; class QRect; class QPolygonF; -QTM_BEGIN_NAMESPACE - class QGeoTiledMapData; class QGeoBoundingBox; class QGeoCoordinate; @@ -103,7 +103,7 @@ protected: QGeoTiledMapDataPrivate *tiledMapDataPrivate; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp b/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp index 03ba0490..aedff2b6 100644 --- a/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp +++ b/src/location/maps/tiled/qgeotiledmappingmanagerengine.cpp @@ -42,7 +42,7 @@ #include "qgeotiledmappingmanagerengine.h" #include "qgeotiledmappingmanagerengine_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoTiledMappingManagerEngine @@ -185,4 +185,4 @@ QGeoTiledMappingManagerEnginePrivate::~QGeoTiledMappingManagerEnginePrivate() {} #include "moc_qgeotiledmappingmanagerengine.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmappingmanagerengine.h b/src/location/maps/tiled/qgeotiledmappingmanagerengine.h index aacf2d0c..975fd02a 100644 --- a/src/location/maps/tiled/qgeotiledmappingmanagerengine.h +++ b/src/location/maps/tiled/qgeotiledmappingmanagerengine.h @@ -51,7 +51,7 @@ #include <QMap> #include <QVariant> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoTiledMappingManagerEnginePrivate; @@ -76,8 +76,8 @@ private: Q_DISABLE_COPY(QGeoTiledMappingManagerEngine) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QGeoTiledMapReply::Error)) +Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QGeoTiledMapReply::Error)) #endif diff --git a/src/location/maps/tiled/qgeotiledmappingmanagerengine_p.h b/src/location/maps/tiled/qgeotiledmappingmanagerengine_p.h index cc76f793..fc0f89b3 100644 --- a/src/location/maps/tiled/qgeotiledmappingmanagerengine_p.h +++ b/src/location/maps/tiled/qgeotiledmappingmanagerengine_p.h @@ -58,7 +58,7 @@ #include <QSize> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoTiledMappingManagerEngine; class QGeoTiledMapRequestHandler; @@ -77,6 +77,6 @@ private: Q_DISABLE_COPY(QGeoTiledMappingManagerEnginePrivate) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.cpp index a9722196..405af88e 100644 --- a/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.cpp @@ -46,7 +46,7 @@ #include "qgeomappixmapobject.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapPixmapObjectInfo::QGeoTiledMapPixmapObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -92,5 +92,5 @@ void QGeoTiledMapPixmapObjectInfo::offsetChanged(const QPoint &/*offset*/) #include "moc_qgeotiledmappixmapobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.h index c71fda03..580346f9 100644 --- a/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmappixmapobjectinfo_p.h @@ -58,10 +58,9 @@ #include <QPixmap> -class QGraphicsPixmapItem; - -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QGraphicsPixmapItem; class QGeoMapPixmapObject; class QGeoTiledMapPixmapObjectInfo : public QGeoTiledMapObjectInfo @@ -79,7 +78,7 @@ public slots: void offsetChanged(const QPoint &offset); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPPIXMAPOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp index 76ba710a..02279ade 100644 --- a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.cpp @@ -46,7 +46,7 @@ #include "qgeomappolygonobject.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapPolygonObjectInfo::QGeoTiledMapPolygonObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -134,5 +134,5 @@ void QGeoTiledMapPolygonObjectInfo::genPoly() #include "moc_qgeotiledmappolygonobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.h index 22768064..1dec8a55 100644 --- a/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmappolygonobjectinfo_p.h @@ -59,10 +59,10 @@ #include <QBrush> #include <QPolygonF> -class QGraphicsPolygonItem; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QGraphicsPolygonItem; class QGeoMapPolygonObject; class QGeoTiledMapPolygonObjectInfo : public QGeoTiledMapObjectInfo @@ -84,7 +84,7 @@ private: void genPoly(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPPOLYGONOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp index b51b340f..3e76ce90 100644 --- a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.cpp @@ -49,7 +49,7 @@ #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapPolylineObjectInfo::QGeoTiledMapPolylineObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -126,5 +126,5 @@ void QGeoTiledMapPolylineObjectInfo::genPath() #include "moc_qgeotiledmappolylineobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.h index 966dfa1d..23e33b76 100644 --- a/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmappolylineobjectinfo_p.h @@ -58,11 +58,11 @@ #include <QPen> #include <QPolygonF> +QT_BEGIN_NAMESPACE + class QGraphicsPathItem; class QPointF; -QTM_BEGIN_NAMESPACE - class QGeoMapPolylineObject; class QGeoTiledMapPolylineObjectInfo : public QGeoTiledMapObjectInfo @@ -83,6 +83,6 @@ private: void genPath(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPPOLYLINEOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.cpp index 8622a273..7f20bab4 100644 --- a/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.cpp @@ -50,7 +50,7 @@ #include "qgeomaprectangleobject.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapRectangleObjectInfo::QGeoTiledMapRectangleObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -142,6 +142,6 @@ void QGeoTiledMapRectangleObjectInfo::regenPolygon() #include "moc_qgeotiledmaprectangleobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.h index 065dda1f..b55b8479 100644 --- a/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmaprectangleobjectinfo_p.h @@ -58,9 +58,9 @@ #include <QPen> #include <QBrush> -class QGraphicsPolygonItem; +QT_BEGIN_NAMESPACE -QTM_BEGIN_NAMESPACE +class QGraphicsPolygonItem; class QGeoMapRectangleObject; @@ -84,7 +84,7 @@ private: void regenPolygon(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPRECTANGLEOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmapreply.cpp b/src/location/maps/tiled/qgeotiledmapreply.cpp index 1fc9b944..fc145a98 100644 --- a/src/location/maps/tiled/qgeotiledmapreply.cpp +++ b/src/location/maps/tiled/qgeotiledmapreply.cpp @@ -46,7 +46,7 @@ #include <qdebug.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoTiledMapReply @@ -326,4 +326,4 @@ QGeoTiledMapReplyPrivate::~QGeoTiledMapReplyPrivate() {} #include "moc_qgeotiledmapreply.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmapreply.h b/src/location/maps/tiled/qgeotiledmapreply.h index 3064b511..9b3bea4f 100644 --- a/src/location/maps/tiled/qgeotiledmapreply.h +++ b/src/location/maps/tiled/qgeotiledmapreply.h @@ -46,7 +46,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoTiledMapRequest; class QGeoTiledMapReplyPrivate; @@ -98,6 +98,6 @@ private: Q_DISABLE_COPY(QGeoTiledMapReply) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/qgeotiledmapreply_p.h b/src/location/maps/tiled/qgeotiledmapreply_p.h index 23cf0247..537a23b7 100644 --- a/src/location/maps/tiled/qgeotiledmapreply_p.h +++ b/src/location/maps/tiled/qgeotiledmapreply_p.h @@ -56,7 +56,7 @@ #include "qgeotiledmapreply.h" #include "qgeotiledmaprequest.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoTiledMapReplyPrivate { @@ -75,6 +75,6 @@ public: QString mapImageFormat; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/qgeotiledmaprequest.cpp b/src/location/maps/tiled/qgeotiledmaprequest.cpp index 0694dafb..cad5a7f2 100644 --- a/src/location/maps/tiled/qgeotiledmaprequest.cpp +++ b/src/location/maps/tiled/qgeotiledmaprequest.cpp @@ -44,7 +44,7 @@ #include "qgeotiledmapdata.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoTiledMapRequest @@ -262,5 +262,5 @@ QGeoTiledMapRequestPrivate& QGeoTiledMapRequestPrivate::operator= (const QGeoTil return *this; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmaprequest.h b/src/location/maps/tiled/qgeotiledmaprequest.h index 9b048c01..bf00f4fb 100644 --- a/src/location/maps/tiled/qgeotiledmaprequest.h +++ b/src/location/maps/tiled/qgeotiledmaprequest.h @@ -47,7 +47,7 @@ #include <QRect> #include <QExplicitlySharedDataPointer> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoTiledMapData; class QGeoTiledMapRequestPrivate; @@ -85,6 +85,6 @@ private: Q_LOCATION_EXPORT uint qHash(const QGeoTiledMapRequest &key); -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/qgeotiledmaprequest_p.h b/src/location/maps/tiled/qgeotiledmaprequest_p.h index 4f379ff6..5c0a474a 100644 --- a/src/location/maps/tiled/qgeotiledmaprequest_p.h +++ b/src/location/maps/tiled/qgeotiledmaprequest_p.h @@ -57,7 +57,7 @@ #include <QSharedData> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE //class QGeoTiledMapData; @@ -79,6 +79,6 @@ public: QRect tileRect; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp index 3a663dbe..e6ae4553 100644 --- a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.cpp @@ -50,7 +50,7 @@ #include <QPointF> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapRouteObjectInfo::QGeoTiledMapRouteObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -140,5 +140,5 @@ void QGeoTiledMapRouteObjectInfo::regenPath() #include "moc_qgeotiledmaprouteobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.h index 49cada24..e275ab56 100644 --- a/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmaprouteobjectinfo_p.h @@ -59,10 +59,8 @@ #include <QPen> +QT_BEGIN_NAMESPACE class QGraphicsPathItem; - -QTM_BEGIN_NAMESPACE - class QGeoMapRouteObject; class QGeoTiledMapRouteObjectInfo : public QGeoTiledMapObjectInfo @@ -84,7 +82,7 @@ private: void regenPath(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPROUTEOBJECT_INFO_P_H diff --git a/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.cpp b/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.cpp index a51f9127..576eff82 100644 --- a/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.cpp +++ b/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.cpp @@ -48,7 +48,7 @@ #include <QFontMetrics> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoTiledMapTextObjectInfo::QGeoTiledMapTextObjectInfo(QGeoTiledMapData *mapData, QGeoMapObject *mapObject) : QGeoTiledMapObjectInfo(mapData, mapObject) @@ -165,5 +165,5 @@ void QGeoTiledMapTextObjectInfo::doAlignment() #include "moc_qgeotiledmaptextobjectinfo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.h b/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.h index e11aa73a..7e4ce9f8 100644 --- a/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.h +++ b/src/location/maps/tiled/qgeotiledmaptextobjectinfo_p.h @@ -60,9 +60,9 @@ #include <QPen> #include <QBrush> -class QGraphicsSimpleTextItem; +QT_BEGIN_NAMESPACE -QTM_BEGIN_NAMESPACE +class QGraphicsSimpleTextItem; class QGeoMapTextObject; @@ -88,7 +88,7 @@ private: void doAlignment(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif //QGEOTILEDMAPTEXTOBJECT_INFO_P_H diff --git a/src/location/notificationcallback_s60_p.h b/src/location/notificationcallback_s60_p.h index d95c5008..9936d10e 100644 --- a/src/location/notificationcallback_s60_p.h +++ b/src/location/notificationcallback_s60_p.h @@ -58,7 +58,7 @@ #include <lbs.h> #include <lbscommon.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class INotificationCallback { @@ -69,6 +69,6 @@ public: virtual void updatePosition(HPositionGenericInfo *mPosInfo, int error) = 0 ; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // NOTIFICATIONCALLBACK_H diff --git a/src/location/notificationmonitorcallback_s60_p.h b/src/location/notificationmonitorcallback_s60_p.h index a842797b..42dc8b59 100644 --- a/src/location/notificationmonitorcallback_s60_p.h +++ b/src/location/notificationmonitorcallback_s60_p.h @@ -58,7 +58,7 @@ #include <e32base.h> // For CActive, link against: euser.lib #include <lbs.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class INotificationMonitorCallback { @@ -68,6 +68,6 @@ public: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* NOTIFICATIONMONITORCALLBACK_H_ */ diff --git a/src/location/notificationsatellitecallback_s60_p.h b/src/location/notificationsatellitecallback_s60_p.h index 9c76459e..fddd2ba1 100644 --- a/src/location/notificationsatellitecallback_s60_p.h +++ b/src/location/notificationsatellitecallback_s60_p.h @@ -59,7 +59,7 @@ #include <lbscommon.h> #include <lbssatellite.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class INotificationSatelliteCallback { @@ -70,6 +70,6 @@ public: virtual void updatePosition(TPositionSatelliteInfo &aSatInfo, int error, bool isStartUpdate) = 0 ; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* NOTIFICATIONSATELLITECALLBACK_H_ */ diff --git a/src/location/projwrapper_p.cpp b/src/location/projwrapper_p.cpp index 1c615e21..463cc735 100644 --- a/src/location/projwrapper_p.cpp +++ b/src/location/projwrapper_p.cpp @@ -47,7 +47,7 @@ #include <QPointF> #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class ProjCoordinateSystemPrivate : public QSharedData { @@ -264,4 +264,4 @@ QPolygonF ProjPolygon::toPolygonF(double scale) const return poly; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/projwrapper_p.h b/src/location/projwrapper_p.h index 395f3f5f..5bbae41e 100644 --- a/src/location/projwrapper_p.h +++ b/src/location/projwrapper_p.h @@ -60,7 +60,7 @@ #include <QList> #include <QPolygonF> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class ProjCoordinate; class QGeoCoordinate; @@ -124,6 +124,6 @@ private: ProjPolygonPrivate *d; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // PROJWRAPPER_P_H diff --git a/src/location/qgeoaddress.cpp b/src/location/qgeoaddress.cpp index 3d747c4b..4c73815c 100644 --- a/src/location/qgeoaddress.cpp +++ b/src/location/qgeoaddress.cpp @@ -47,7 +47,7 @@ #include <QDebug> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoAddressPrivate::QGeoAddressPrivate() : QSharedData() @@ -340,5 +340,5 @@ void QGeoAddress::clear() d->sPostCode.clear(); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoaddress.h b/src/location/qgeoaddress.h index 06d411bb..2e542fca 100644 --- a/src/location/qgeoaddress.h +++ b/src/location/qgeoaddress.h @@ -45,10 +45,10 @@ #include "qmobilityglobal.h" #include <QSharedDataPointer> -class QString; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QString; class QGeoAddressPrivate; class Q_LOCATION_EXPORT QGeoAddress { @@ -94,6 +94,6 @@ private: QSharedDataPointer<QGeoAddressPrivate> d; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeoaddress_p.h b/src/location/qgeoaddress_p.h index c6a0c63a..ca656de9 100644 --- a/src/location/qgeoaddress_p.h +++ b/src/location/qgeoaddress_p.h @@ -58,7 +58,7 @@ #include "qmobilityglobal.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoAddressPrivate : public QSharedData { @@ -77,6 +77,6 @@ public: QString sPostCode; //!< post code field }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeoareamonitor.cpp b/src/location/qgeoareamonitor.cpp index 8c373807..cac668b9 100644 --- a/src/location/qgeoareamonitor.cpp +++ b/src/location/qgeoareamonitor.cpp @@ -90,7 +90,7 @@ \endcode */ -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoAreaMonitorPrivate { @@ -216,4 +216,4 @@ QGeoAreaMonitor *QGeoAreaMonitor::createDefaultMonitor(QObject *parent) \since 1.0 */ -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoareamonitor.h b/src/location/qgeoareamonitor.h index 7eb00c84..98bcf486 100644 --- a/src/location/qgeoareamonitor.h +++ b/src/location/qgeoareamonitor.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoPositionInfo; class QGeoAreaMonitorPrivate; @@ -80,7 +80,7 @@ private: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeoareamonitor_polling.cpp b/src/location/qgeoareamonitor_polling.cpp index bea552c8..e3c871ec 100644 --- a/src/location/qgeoareamonitor_polling.cpp +++ b/src/location/qgeoareamonitor_polling.cpp @@ -42,7 +42,7 @@ #include "qgeoareamonitor_polling_p.h" #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE #define UPDATE_INTERVAL_5S 5000 @@ -120,4 +120,4 @@ void QGeoAreaMonitorPolling::positionUpdated(const QGeoPositionInfo &info) } #include "moc_qgeoareamonitor_polling_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoareamonitor_polling_p.h b/src/location/qgeoareamonitor_polling_p.h index d0e1fb2f..2ac729d0 100644 --- a/src/location/qgeoareamonitor_polling_p.h +++ b/src/location/qgeoareamonitor_polling_p.h @@ -56,7 +56,7 @@ #include "qgeoareamonitor.h" #include "qgeopositioninfosource.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /** * QGeoAreaMonitorPolling @@ -87,5 +87,5 @@ private: void checkStartStop(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QGEOAREAMONITORPOLLING_H diff --git a/src/location/qgeoareamonitor_s60.cpp b/src/location/qgeoareamonitor_s60.cpp index 76095a5a..e5cbcccf 100644 --- a/src/location/qgeoareamonitor_s60.cpp +++ b/src/location/qgeoareamonitor_s60.cpp @@ -45,7 +45,7 @@ #include "qmlbackendmonitorinfo_s60_p.h" #include "qmlbackendmonitorcreatetriggerao_s60_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE TInt QGeoAreaMonitorS60::refCount = 0; @@ -285,5 +285,5 @@ void QGeoAreaMonitorS60::disconnectNotify(const char* signal) } } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoareamonitor_s60_p.h b/src/location/qgeoareamonitor_s60_p.h index 15a1de34..7cc61ac1 100644 --- a/src/location/qgeoareamonitor_s60_p.h +++ b/src/location/qgeoareamonitor_s60_p.h @@ -64,7 +64,7 @@ #include <lbttriggerconditionarea.h> #include <lbtgeocircle.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /** * QGeoAreaMonitorS60 @@ -114,6 +114,6 @@ private: static TInt refCount; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* QGEOAREAMONITORS60_H_ */ diff --git a/src/location/qgeoboundingarea.cpp b/src/location/qgeoboundingarea.cpp index 8caf5156..252f1095 100644 --- a/src/location/qgeoboundingarea.cpp +++ b/src/location/qgeoboundingarea.cpp @@ -41,7 +41,7 @@ #include "qgeoboundingarea.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoBoundingArea @@ -110,4 +110,4 @@ area. \since 1.1 */ -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoboundingarea.h b/src/location/qgeoboundingarea.h index ff016f96..652acf19 100644 --- a/src/location/qgeoboundingarea.h +++ b/src/location/qgeoboundingarea.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; @@ -69,7 +69,7 @@ public: virtual bool contains(const QGeoCoordinate &coordinate) const = 0; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeoboundingbox.cpp b/src/location/qgeoboundingbox.cpp index 36406d1f..637a0bf8 100644 --- a/src/location/qgeoboundingbox.cpp +++ b/src/location/qgeoboundingbox.cpp @@ -45,7 +45,7 @@ #include "qgeocoordinate.h" #include "qnumeric.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoBoundingBox @@ -860,5 +860,5 @@ bool QGeoBoundingBoxPrivate::operator== (const QGeoBoundingBoxPrivate &other) co return ((topLeft == other.topLeft) && (bottomRight == other.bottomRight)); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoboundingbox.h b/src/location/qgeoboundingbox.h index 941010af..fc1547df 100644 --- a/src/location/qgeoboundingbox.h +++ b/src/location/qgeoboundingbox.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingBoxPrivate; @@ -114,7 +114,7 @@ inline QGeoBoundingBox QGeoBoundingBox::operator | (const QGeoBoundingBox &bound return united(boundingBox); } -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeoboundingbox_p.h b/src/location/qgeoboundingbox_p.h index 154abdb2..7c1553b5 100644 --- a/src/location/qgeoboundingbox_p.h +++ b/src/location/qgeoboundingbox_p.h @@ -57,7 +57,7 @@ #include <QSharedData> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoBoundingBoxPrivate : public QSharedData { @@ -75,6 +75,6 @@ public: QGeoCoordinate bottomRight; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeoboundingcircle.cpp b/src/location/qgeoboundingcircle.cpp index 686137e8..ec5d158c 100644 --- a/src/location/qgeoboundingcircle.cpp +++ b/src/location/qgeoboundingcircle.cpp @@ -47,7 +47,7 @@ #include <QDebug> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoBoundingCircle @@ -305,5 +305,5 @@ bool QGeoBoundingCirclePrivate::operator== (const QGeoBoundingCirclePrivate &oth return ((center == other.center) && (radius == other.radius)); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoboundingcircle.h b/src/location/qgeoboundingcircle.h index a1fcaa1b..4eb57151 100644 --- a/src/location/qgeoboundingcircle.h +++ b/src/location/qgeoboundingcircle.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoBoundingCirclePrivate; @@ -86,7 +86,7 @@ private: QSharedDataPointer<QGeoBoundingCirclePrivate> d_ptr; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeoboundingcircle_p.h b/src/location/qgeoboundingcircle_p.h index 13fb235e..826a5601 100644 --- a/src/location/qgeoboundingcircle_p.h +++ b/src/location/qgeoboundingcircle_p.h @@ -57,7 +57,7 @@ #include <QSharedData> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoBoundingCirclePrivate : public QSharedData { @@ -75,6 +75,6 @@ public: qreal radius; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeocoordinate.cpp b/src/location/qgeocoordinate.cpp index 0c030c99..2fd0f8e0 100644 --- a/src/location/qgeocoordinate.cpp +++ b/src/location/qgeocoordinate.cpp @@ -56,7 +56,7 @@ #define M_PI 3.14159265358979323846 #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE static const double qgeocoordinate_EARTH_MEAN_RADIUS = 6371.0072; @@ -654,4 +654,4 @@ QDataStream &operator>>(QDataStream &stream, QGeoCoordinate &coordinate) } #endif -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeocoordinate.h b/src/location/qgeocoordinate.h index 67848cb5..ac530e2e 100644 --- a/src/location/qgeocoordinate.h +++ b/src/location/qgeocoordinate.h @@ -45,14 +45,11 @@ #include <QString> +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE + class QDebug; class QDataStream; -QT_END_NAMESPACE - -QT_BEGIN_HEADER - -QTM_BEGIN_NAMESPACE class QGeoCoordinatePrivate; class Q_LOCATION_EXPORT QGeoCoordinate @@ -120,7 +117,7 @@ Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoCoordin Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoCoordinate &coordinate); #endif -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeocoordinate_p.h b/src/location/qgeocoordinate_p.h index 70baf777..7a859c82 100644 --- a/src/location/qgeocoordinate_p.h +++ b/src/location/qgeocoordinate_p.h @@ -56,7 +56,7 @@ #include "qmobilityglobal.h" #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoCoordinatePrivate { @@ -72,6 +72,6 @@ public: double *lon, double *lat); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QGEOCOORDINATE_P_H diff --git a/src/location/qgeoplace.cpp b/src/location/qgeoplace.cpp index 63b285b2..d58fbd05 100644 --- a/src/location/qgeoplace.cpp +++ b/src/location/qgeoplace.cpp @@ -48,13 +48,13 @@ #endif #if !defined(Q_CC_MWERKS) -template<> QTM_PREPEND_NAMESPACE(QGeoPlacePrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QGeoPlacePrivate)>::clone() +template<> QT_PREPEND_NAMESPACE(QGeoPlacePrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QGeoPlacePrivate)>::clone() { return d->clone(); } #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoPlace @@ -276,5 +276,5 @@ bool QGeoPlacePrivate::operator== (const QGeoPlacePrivate &other) const && (address == other.address)); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeoplace.h b/src/location/qgeoplace.h index 5ebc6f1a..a2cafd9e 100644 --- a/src/location/qgeoplace.h +++ b/src/location/qgeoplace.h @@ -49,10 +49,10 @@ #include "qgeoboundingbox.h" #include "qgeocoordinate.h" -class QString; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE +class QString; class QLandmark; class QGeoPlacePrivate; @@ -91,6 +91,6 @@ private: friend class QLandmark; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeoplace_p.h b/src/location/qgeoplace_p.h index 7ee33e84..cad6c185 100644 --- a/src/location/qgeoplace_p.h +++ b/src/location/qgeoplace_p.h @@ -61,7 +61,7 @@ #include "qgeoboundingbox.h" #include "qgeocoordinate.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoPlacePrivate : public QSharedData { @@ -86,19 +86,19 @@ public: QGeoAddress address; }; -QTM_END_NAMESPACE #if defined(Q_CC_MWERKS) // This results in multiple symbol definition errors on all other compilers // but not having a definition here results in an attempt to use the unspecialized // clone (which fails because of the pure virtuals above) -template<> QTM_PREPEND_NAMESPACE(QGeoPlacePrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QGeoPlacePrivate)>::clone() +template<> QGeoPlacePrivate *QSharedDataPointer<QGeoPlacePrivate>::clone() { return d->clone(); } #else -template<> QTM_PREPEND_NAMESPACE(QGeoPlacePrivate) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QGeoPlacePrivate)>::clone(); +template<> QGeoPlacePrivate *QSharedDataPointer<QGeoPlacePrivate>::clone(); #endif +QT_END_NAMESPACE #endif diff --git a/src/location/qgeopositioninfo.cpp b/src/location/qgeopositioninfo.cpp index 19495ad4..25584b11 100644 --- a/src/location/qgeopositioninfo.cpp +++ b/src/location/qgeopositioninfo.cpp @@ -44,7 +44,7 @@ #include <QDebug> #include <QDataStream> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoPositionInfoPrivate { @@ -345,4 +345,4 @@ QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info) } #endif -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfo.h b/src/location/qgeopositioninfo.h index c71646cd..37840755 100644 --- a/src/location/qgeopositioninfo.h +++ b/src/location/qgeopositioninfo.h @@ -46,14 +46,11 @@ #include <QDateTime> +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE + class QDebug; class QDataStream; -QT_END_NAMESPACE - -QT_BEGIN_HEADER - -QTM_BEGIN_NAMESPACE class QGeoPositionInfoPrivate; class Q_LOCATION_EXPORT QGeoPositionInfo @@ -113,7 +110,7 @@ Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoPositio Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info); #endif -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeopositioninfosource.cpp b/src/location/qgeopositioninfosource.cpp index b11b8f7d..4e1219b1 100644 --- a/src/location/qgeopositioninfosource.cpp +++ b/src/location/qgeopositioninfosource.cpp @@ -66,7 +66,7 @@ #endif #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoPositionInfoSource @@ -560,4 +560,4 @@ QStringList QGeoPositionInfoSource::availableSources() #include "moc_qgeopositioninfosource.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfosource.h b/src/location/qgeopositioninfosource.h index b11124d0..3d4eacd9 100644 --- a/src/location/qgeopositioninfosource.h +++ b/src/location/qgeopositioninfosource.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoPositionInfoSourcePrivate; class Q_LOCATION_EXPORT QGeoPositionInfoSource : public QObject @@ -100,7 +100,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoPositionInfoSource::PositioningMethods) -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeopositioninfosource_geocluemaster.cpp b/src/location/qgeopositioninfosource_geocluemaster.cpp index 334a4fcd..a3331e58 100644 --- a/src/location/qgeopositioninfosource_geocluemaster.cpp +++ b/src/location/qgeopositioninfosource_geocluemaster.cpp @@ -48,7 +48,7 @@ #include "qgeopositioninfosource_geocluemaster_p.h" #include <gconf/gconf-client.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE #define MINIMUM_UPDATE_INTERVAL 1000 #define UPDATE_TIMEOUT_COLD_START 120000 @@ -553,4 +553,4 @@ QGeoPositionInfo QGeoPositionInfoSourceGeoclueMaster::geoclueToPositionInfo( } #include "moc_qgeopositioninfosource_geocluemaster_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfosource_geocluemaster_p.h b/src/location/qgeopositioninfosource_geocluemaster_p.h index fba906a4..bac50355 100644 --- a/src/location/qgeopositioninfosource_geocluemaster_p.h +++ b/src/location/qgeopositioninfosource_geocluemaster_p.h @@ -60,7 +60,7 @@ //#define Q_LOCATION_GEOCLUE_DEBUG -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoPositionInfoSourceGeoclueMaster : public QGeoPositionInfoSource { @@ -136,6 +136,6 @@ private: PositioningMethods m_methods; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QGEOPOSITIONINFOSOURCE_GEOCLUEMASTER_H diff --git a/src/location/qgeopositioninfosource_maemo.cpp b/src/location/qgeopositioninfosource_maemo.cpp index e0461ad0..e8b6ea91 100644 --- a/src/location/qgeopositioninfosource_maemo.cpp +++ b/src/location/qgeopositioninfosource_maemo.cpp @@ -45,7 +45,7 @@ using namespace std; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoPositionInfoSourceMaemo::QGeoPositionInfoSourceMaemo(QObject *parent): QGeoPositionInfoSource(parent) { @@ -202,5 +202,5 @@ void QGeoPositionInfoSourceMaemo::shutdownRequestSession() } #include "moc_qgeopositioninfosource_maemo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfosource_maemo_p.h b/src/location/qgeopositioninfosource_maemo_p.h index 8493cbf4..95bf1186 100644 --- a/src/location/qgeopositioninfosource_maemo_p.h +++ b/src/location/qgeopositioninfosource_maemo_p.h @@ -69,7 +69,7 @@ extern "C" } #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class DBusComm; class QGeoPositionInfoSourceMaemo : public QGeoPositionInfoSource @@ -105,6 +105,6 @@ private Q_SLOTS: void requestTimerExpired(); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeopositioninfosource_s60.cpp b/src/location/qgeopositioninfosource_s60.cpp index ce0fdb60..179953fd 100644 --- a/src/location/qgeopositioninfosource_s60.cpp +++ b/src/location/qgeopositioninfosource_s60.cpp @@ -49,7 +49,7 @@ -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE // constructor CQGeoPositionInfoSourceS60::CQGeoPositionInfoSourceS60(QObject* aParent) : QGeoPositionInfoSource(aParent), @@ -960,4 +960,4 @@ void CQGeoPositionInfoSourceS60::disconnectNotify(const char *aSignal) } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfosource_s60_p.h b/src/location/qgeopositioninfosource_s60_p.h index 5d1639ef..4b595804 100644 --- a/src/location/qgeopositioninfosource_s60_p.h +++ b/src/location/qgeopositioninfosource_s60_p.h @@ -64,7 +64,7 @@ #define MAX_SIZE 25 -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE // CLASS DECLARATION //forward declaration @@ -308,6 +308,6 @@ private: TUint8 mModuleFlags; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // CQGEOPOSITIONINFOSOURCES60_H diff --git a/src/location/qgeopositioninfosource_simulator.cpp b/src/location/qgeopositioninfosource_simulator.cpp index 9a9ea92c..82e4cd3d 100644 --- a/src/location/qgeopositioninfosource_simulator.cpp +++ b/src/location/qgeopositioninfosource_simulator.cpp @@ -52,7 +52,7 @@ #include <QtNetwork/QLocalSocket> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE using namespace QtSimulatorPrivate; @@ -163,4 +163,4 @@ void QGeoPositionInfoSourceSimulator::updatePosition() #include "moc_qgeopositioninfosource_simulator_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfosource_simulator_p.h b/src/location/qgeopositioninfosource_simulator_p.h index 774887d8..a208bf99 100644 --- a/src/location/qgeopositioninfosource_simulator_p.h +++ b/src/location/qgeopositioninfosource_simulator_p.h @@ -48,10 +48,9 @@ QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE class QTimer; -QTM_BEGIN_NAMESPACE - class QGeoPositionInfoSourceSimulator : public QGeoPositionInfoSource { Q_OBJECT @@ -80,6 +79,6 @@ private: QGeoPositionInfo lastPosition; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QGEOPOSITIONINFOSOURCESIMULATOR_H diff --git a/src/location/qgeopositioninfosourcefactory.cpp b/src/location/qgeopositioninfosourcefactory.cpp index 92f005ed..317ea473 100644 --- a/src/location/qgeopositioninfosourcefactory.cpp +++ b/src/location/qgeopositioninfosourcefactory.cpp @@ -41,7 +41,7 @@ #include "qgeopositioninfosourcefactory.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoPositionInfoSourceFactory @@ -128,4 +128,4 @@ int QGeoPositionInfoSourceFactory::sourcePriority() const QGeoPositionInfoSourceFactory::~QGeoPositionInfoSourceFactory() {} -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfosourcefactory.h b/src/location/qgeopositioninfosourcefactory.h index ca1b53ca..fb01e9c5 100644 --- a/src/location/qgeopositioninfosourcefactory.h +++ b/src/location/qgeopositioninfosourcefactory.h @@ -47,7 +47,7 @@ #include "qgeosatelliteinfosource.h" #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class Q_LOCATION_EXPORT QGeoPositionInfoSourceFactory { @@ -62,7 +62,7 @@ public: virtual QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent) = 0; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_BEGIN_NAMESPACE #define QT_POSITION_SOURCE_INTERFACE "com.nokia.qt.mobility.position.sourcefactory/1.0" diff --git a/src/location/qgeosatelliteinfo.cpp b/src/location/qgeosatelliteinfo.cpp index d29f70a3..a9a594a0 100644 --- a/src/location/qgeosatelliteinfo.cpp +++ b/src/location/qgeosatelliteinfo.cpp @@ -44,7 +44,7 @@ #include <QDebug> #include <QDataStream> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSatelliteInfoPrivate { @@ -288,4 +288,4 @@ QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info) } #endif -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeosatelliteinfo.h b/src/location/qgeosatelliteinfo.h index bfa6d641..61047fc6 100644 --- a/src/location/qgeosatelliteinfo.h +++ b/src/location/qgeosatelliteinfo.h @@ -44,13 +44,10 @@ #include "qmobilityglobal.h" QT_BEGIN_NAMESPACE +QT_BEGIN_HEADER class QDebug; class QDataStream; -QT_END_NAMESPACE -QT_BEGIN_HEADER - -QTM_BEGIN_NAMESPACE class QGeoSatelliteInfoPrivate; class Q_LOCATION_EXPORT QGeoSatelliteInfo @@ -104,7 +101,7 @@ Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoSatelli Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info); #endif -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeosatelliteinfosource.cpp b/src/location/qgeosatelliteinfosource.cpp index 95a5935e..c14805f3 100644 --- a/src/location/qgeosatelliteinfosource.cpp +++ b/src/location/qgeosatelliteinfosource.cpp @@ -65,7 +65,7 @@ #endif #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSatelliteInfoSourcePrivate { @@ -417,4 +417,4 @@ QStringList QGeoSatelliteInfoSource::availableSources() #include "moc_qgeosatelliteinfosource.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeosatelliteinfosource.h b/src/location/qgeosatelliteinfosource.h index f7b007dc..9b9a4cc3 100644 --- a/src/location/qgeosatelliteinfosource.h +++ b/src/location/qgeosatelliteinfosource.h @@ -50,7 +50,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSatelliteInfoSourcePrivate; class Q_LOCATION_EXPORT QGeoSatelliteInfoSource : public QObject @@ -79,7 +79,7 @@ private: QGeoSatelliteInfoSourcePrivate *d; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qgeosatelliteinfosource_gypsy.cpp b/src/location/qgeosatelliteinfosource_gypsy.cpp index 8b91688f..4f6de5d4 100644 --- a/src/location/qgeosatelliteinfosource_gypsy.cpp +++ b/src/location/qgeosatelliteinfosource_gypsy.cpp @@ -46,7 +46,7 @@ #endif #include <QFile> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE #define UPDATE_TIMEOUT_COLD_START 120000 @@ -366,4 +366,4 @@ void QGeoSatelliteInfoSourceGypsy::requestUpdateTimeout() } #include "moc_qgeosatelliteinfosource_gypsy_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeosatelliteinfosource_gypsy_p.h b/src/location/qgeosatelliteinfosource_gypsy_p.h index 631d0cf7..e7165882 100644 --- a/src/location/qgeosatelliteinfosource_gypsy_p.h +++ b/src/location/qgeosatelliteinfosource_gypsy_p.h @@ -63,7 +63,7 @@ // #define Q_LOCATION_GYPSY_DEBUG -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE // An engine that encapsulates all symbols we want // to be able to mock (for unit/autotest purposes). @@ -135,6 +135,6 @@ private: bool m_requestOngoing; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QGEOSATELLITEINFOSOURCE_GYPSY_H diff --git a/src/location/qgeosatelliteinfosource_maemo.cpp b/src/location/qgeosatelliteinfosource_maemo.cpp index 7a3c7dad..f9d205ff 100644 --- a/src/location/qgeosatelliteinfosource_maemo.cpp +++ b/src/location/qgeosatelliteinfosource_maemo.cpp @@ -41,7 +41,7 @@ #include "qgeosatelliteinfosource_maemo_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoSatelliteInfoSourceMaemo::QGeoSatelliteInfoSourceMaemo(QObject *parent) : QGeoSatelliteInfoSource(parent), running(false), satInViewSeen(false) @@ -149,5 +149,5 @@ void QGeoSatelliteInfoSourceMaemo::onServiceConnect() #include "moc_qgeosatelliteinfosource_maemo_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeosatelliteinfosource_maemo_p.h b/src/location/qgeosatelliteinfosource_maemo_p.h index 8ac7898b..a0376782 100644 --- a/src/location/qgeosatelliteinfosource_maemo_p.h +++ b/src/location/qgeosatelliteinfosource_maemo_p.h @@ -57,7 +57,7 @@ #include "qgeosatelliteinfo.h" #include "dbuscomm_maemo_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSatelliteInfoSourceMaemo : public QGeoSatelliteInfoSource { @@ -91,7 +91,7 @@ private: Q_DISABLE_COPY(QGeoSatelliteInfoSourceMaemo) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeosatelliteinfosource_s60.cpp b/src/location/qgeosatelliteinfosource_s60.cpp index 5d383016..6d57d458 100644 --- a/src/location/qgeosatelliteinfosource_s60.cpp +++ b/src/location/qgeosatelliteinfosource_s60.cpp @@ -51,7 +51,7 @@ #include <QList> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE // constructor CQGeoSatelliteInfoSourceS60::CQGeoSatelliteInfoSourceS60(QObject* aParent) : QGeoSatelliteInfoSource(aParent), @@ -704,5 +704,5 @@ void CQGeoSatelliteInfoSourceS60::disconnectNotify(const char *aSignal) } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeosatelliteinfosource_s60_p.h b/src/location/qgeosatelliteinfosource_s60_p.h index 7c02c5ea..bf0efee3 100644 --- a/src/location/qgeosatelliteinfosource_s60_p.h +++ b/src/location/qgeosatelliteinfosource_s60_p.h @@ -63,7 +63,7 @@ #define MAX_SIZE 25 -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE // CLASS DECLARATION //forward declaration @@ -275,6 +275,6 @@ private: TUint8 mModuleFlags; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* QGEOSATELLITEINFOSOURCE60_H_ */ diff --git a/src/location/qgeosatelliteinfosource_simulator.cpp b/src/location/qgeosatelliteinfosource_simulator.cpp index 0b35190d..86a38447 100644 --- a/src/location/qgeosatelliteinfosource_simulator.cpp +++ b/src/location/qgeosatelliteinfosource_simulator.cpp @@ -43,7 +43,7 @@ #include "qlocationconnection_simulator_p.h" #include "qlocationdata_simulator_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QGeoSatelliteInfoSourceSimulator::QGeoSatelliteInfoSourceSimulator(QObject *parent) : QGeoSatelliteInfoSource(parent) @@ -102,5 +102,5 @@ void QGeoSatelliteInfoSourceSimulator::updateData() } #include "moc_qgeosatelliteinfosource_simulator_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qgeosatelliteinfosource_simulator_p.h b/src/location/qgeosatelliteinfosource_simulator_p.h index 7d4d934c..18bcab01 100644 --- a/src/location/qgeosatelliteinfosource_simulator_p.h +++ b/src/location/qgeosatelliteinfosource_simulator_p.h @@ -51,7 +51,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSatelliteInfoSourceSimulator : public QGeoSatelliteInfoSource { @@ -74,7 +74,7 @@ private: QTimer *requestTimer; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QGEOSATELLITEINFOSOURCE_SIMULATOR_H diff --git a/src/location/qlatin1constant.h b/src/location/qlatin1constant.h index d5485507..a8746498 100644 --- a/src/location/qlatin1constant.h +++ b/src/location/qlatin1constant.h @@ -45,7 +45,7 @@ #include <QString> #include <QVariant> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /* * QLatin1Constant @@ -158,6 +158,6 @@ template<int N> bool operator!=(const QString& b, const QLatin1Constant<N>& a) #define Q_DECLARE_LATIN1_CONSTANT(varname, str) static const QLatin1Constant<sizeof(str)> varname #define Q_DEFINE_LATIN1_CONSTANT(varname, str) const QLatin1Constant<sizeof(str)> varname = {str} -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qlocationconnection_simulator.cpp b/src/location/qlocationconnection_simulator.cpp index 50f47ccd..f147bce6 100644 --- a/src/location/qlocationconnection_simulator.cpp +++ b/src/location/qlocationconnection_simulator.cpp @@ -51,7 +51,7 @@ #include <QtNetwork/QLocalSocket> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE using namespace QtSimulatorPrivate; @@ -132,4 +132,4 @@ QGeoSatelliteInfoData *qtSatelliteInfo() } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qlocationconnection_simulator_p.h b/src/location/qlocationconnection_simulator_p.h index e9d5121a..029cc6f0 100644 --- a/src/location/qlocationconnection_simulator_p.h +++ b/src/location/qlocationconnection_simulator_p.h @@ -47,7 +47,7 @@ QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE namespace Simulator { @@ -75,6 +75,6 @@ void ensureSimulatorConnection(); QGeoPositionInfoData *qtPositionInfo(); QGeoSatelliteInfoData *qtSatelliteInfo(); -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QLOCATIONCONNECTION_H diff --git a/src/location/qlocationdata_simulator.cpp b/src/location/qlocationdata_simulator.cpp index f68a835f..49e04a06 100644 --- a/src/location/qlocationdata_simulator.cpp +++ b/src/location/qlocationdata_simulator.cpp @@ -43,7 +43,7 @@ #include <QtCore/QDataStream> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE void qt_registerLocationTypes() { @@ -94,4 +94,4 @@ QDataStream &operator>>(QDataStream &in, QGeoSatelliteInfoData::SatelliteInfo &s return in; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qlocationdata_simulator_p.h b/src/location/qlocationdata_simulator_p.h index 420acba9..4bfe4885 100644 --- a/src/location/qlocationdata_simulator_p.h +++ b/src/location/qlocationdata_simulator_p.h @@ -59,7 +59,7 @@ #include <QtCore/QList> QT_BEGIN_HEADER -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE struct QGeoPositionInfoData { @@ -100,7 +100,7 @@ struct QGeoSatelliteInfoData void qt_registerLocationTypes(); -QTM_END_NAMESPACE +QT_END_NAMESPACE Q_DECLARE_METATYPE(QtMobility::QGeoPositionInfoData) Q_DECLARE_METATYPE(QtMobility::QGeoSatelliteInfoData) diff --git a/src/location/qlocationutils.cpp b/src/location/qlocationutils.cpp index 97d604f7..c13781d4 100644 --- a/src/location/qlocationutils.cpp +++ b/src/location/qlocationutils.cpp @@ -48,7 +48,7 @@ #include <math.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE // converts e.g. 15306.0235 from NMEA sentence to 153.100392 static double qlocationutils_nmeaDegreesToDecimal(double nmeaDegrees) @@ -350,5 +350,5 @@ bool QLocationUtils::getNmeaLatLong(const QByteArray &latString, char latDirecti return false; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qlocationutils_p.h b/src/location/qlocationutils_p.h index 2ceb3d9e..73e52de7 100644 --- a/src/location/qlocationutils_p.h +++ b/src/location/qlocationutils_p.h @@ -57,9 +57,6 @@ QT_BEGIN_NAMESPACE class QTime; class QByteArray; -QT_END_NAMESPACE - -QTM_BEGIN_NAMESPACE class QGeoPositionInfo; class QLocationUtils @@ -100,6 +97,6 @@ public: Q_AUTOTEST_EXPORT static bool getNmeaLatLong(const QByteArray &latString, char latDirection, const QByteArray &lngString, char lngDirection, double *lat, double *lon); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qmlbackendao_s60.cpp b/src/location/qmlbackendao_s60.cpp index 876e5465..e948fea4 100644 --- a/src/location/qmlbackendao_s60.cpp +++ b/src/location/qmlbackendao_s60.cpp @@ -43,7 +43,7 @@ #include "qgeosatelliteinfosource_s60_p.h" #include "qmlbackendao_s60_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE //The name of the requestor //Added by PM //_LIT(KRequestor,"QTMobility Location"); @@ -475,4 +475,4 @@ void CQMLBackendAO::startUpdates() } } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qmlbackendao_s60_p.h b/src/location/qmlbackendao_s60_p.h index 6152f7b2..e3aa591a 100644 --- a/src/location/qmlbackendao_s60_p.h +++ b/src/location/qmlbackendao_s60_p.h @@ -61,7 +61,7 @@ #include "qgeopositioninfosource.h" //#include "qgeopositioninfosources60.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class CQGeoPositionInfoSourceS60 ; class CQGeoSatelliteInfoSourceS60; @@ -158,6 +158,6 @@ private: TPositionSatelliteInfo mPosSatInfo; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QMLBACKENDAO_H diff --git a/src/location/qmlbackendmonitorao_s60.cpp b/src/location/qmlbackendmonitorao_s60.cpp index f5c763fc..91075f4c 100644 --- a/src/location/qmlbackendmonitorao_s60.cpp +++ b/src/location/qmlbackendmonitorao_s60.cpp @@ -48,7 +48,7 @@ #include <lbttriggerconditionarea.h> #include <lbttriggerentry.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE //static member of the QMLBackendMonitorAO object holding the address of the object @@ -153,5 +153,5 @@ QMLBackendMonitorAO::QMLBackendMonitorAO() CActiveScheduler::Add(this); } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qmlbackendmonitorao_s60_p.h b/src/location/qmlbackendmonitorao_s60_p.h index b42c248f..80ca6c82 100644 --- a/src/location/qmlbackendmonitorao_s60_p.h +++ b/src/location/qmlbackendmonitorao_s60_p.h @@ -61,7 +61,7 @@ #include "qgeoareamonitor.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class CBackendMonitorInfo; @@ -114,6 +114,6 @@ private: RLbt iLbt; //subsession }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* QMLBACKENDMONITORAO_H_ */ diff --git a/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp b/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp index 2b8d42d6..c4029db0 100644 --- a/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp +++ b/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp @@ -44,7 +44,7 @@ #include "qmlbackendmonitorinfo_s60_p.h" #include "qmlbackendmonitorcreatetriggerao_s60_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE //Sets the radius of the monitoring area, to aRadius.If the Radius is less than the MinimumTriggerAreaSize(), //then aRadius will be set to MinimumTriggerAreaSize() supported by the LBT implementation.If the aRadius is @@ -401,4 +401,4 @@ bool QMLBackendMonitorCreateTriggerAO::isTriggerInitialized(QGeoAreaMonitorS60* return (triggerInfo != NULL) ? TRUE : FALSE; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h b/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h index b6c7e90f..7b61635a 100644 --- a/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h +++ b/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h @@ -62,7 +62,7 @@ #include <lbttriggerconditionarea.h> #include <lbttriggerentry.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoAreaMonitorS60; @@ -108,6 +108,6 @@ private: }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* QMLBACKENDMONITORCREATETRIGGER_H_ */ diff --git a/src/location/qmlbackendmonitorinfo_s60.cpp b/src/location/qmlbackendmonitorinfo_s60.cpp index 4c42b135..13fc8c55 100644 --- a/src/location/qmlbackendmonitorinfo_s60.cpp +++ b/src/location/qmlbackendmonitorinfo_s60.cpp @@ -42,7 +42,7 @@ #include "qmlbackendmonitorinfo_s60_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE //singleton class object CBackendMonitorInfo* CBackendMonitorInfo::iBackendMonitorInfo = NULL; @@ -154,4 +154,4 @@ CBackendMonitorInfo::~CBackendMonitorInfo() iBackendMonitorInfo = NULL; } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qmlbackendmonitorinfo_s60_p.h b/src/location/qmlbackendmonitorinfo_s60_p.h index 118ddc81..831108b3 100644 --- a/src/location/qmlbackendmonitorinfo_s60_p.h +++ b/src/location/qmlbackendmonitorinfo_s60_p.h @@ -55,7 +55,7 @@ #include "qmlbackendmonitorao_s60_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE //linked list information structure struct CMonitorTriggerInfo { @@ -103,6 +103,6 @@ private : static CBackendMonitorInfo* iBackendMonitorInfo; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* QMLBACKENDMONITORINFO_H_ */ diff --git a/src/location/qmlbackendtriggerchangeao_s60.cpp b/src/location/qmlbackendtriggerchangeao_s60.cpp index 60f8ccbf..9d990682 100644 --- a/src/location/qmlbackendtriggerchangeao_s60.cpp +++ b/src/location/qmlbackendtriggerchangeao_s60.cpp @@ -47,7 +47,7 @@ #include <lbtsessiontrigger.h> #include <lbttriggerentry.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE //Design chnages @@ -346,4 +346,4 @@ void QMLBackendTriggerChangeAO::ConstructL(RLbtServer& aLbtServ) } } -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qmlbackendtriggerchangeao_s60_p.h b/src/location/qmlbackendtriggerchangeao_s60_p.h index 4aaa396c..26dd1d40 100644 --- a/src/location/qmlbackendtriggerchangeao_s60_p.h +++ b/src/location/qmlbackendtriggerchangeao_s60_p.h @@ -62,7 +62,7 @@ #include <lbt.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QMLBackendTriggerChangeAO : public CActive { @@ -91,6 +91,6 @@ private : }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif /* QMLBACKENDMONITORAO_H_ */ diff --git a/src/location/qmobilityglobal.h b/src/location/qmobilityglobal.h index 19701476..b2311120 100644 --- a/src/location/qmobilityglobal.h +++ b/src/location/qmobilityglobal.h @@ -48,20 +48,20 @@ //#define QTM_NAMESPACE QtMobility //#define QTM_NAMESPACE -#ifdef QTM_NAMESPACE +/*#ifdef QTM_NAMESPACE # define QTM_PREPEND_NAMESPACE(name) ::QTM_NAMESPACE::name -# define QTM_BEGIN_NAMESPACE namespace QTM_NAMESPACE { -# define QTM_END_NAMESPACE } +# 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 QTM_BEGIN_NAMESPACE -# define QTM_END_NAMESPACE +# define QT_BEGIN_NAMESPACE +# define QT_END_NAMESPACE # define QTM_USE_NAMESPACE -#endif +#endif*/ //in case Qt is in namespace -QT_USE_NAMESPACE +//QT_USE_NAMESPACE #endif // QMOBILITYGLOBAL_H diff --git a/src/location/qmobilitypluginsearch.h b/src/location/qmobilitypluginsearch.h index ee5a56e6..9c14751d 100644 --- a/src/location/qmobilitypluginsearch.h +++ b/src/location/qmobilitypluginsearch.h @@ -50,7 +50,7 @@ # include <f32file.h> #endif -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE #if defined(Q_OS_SYMBIAN) static inline bool qSymbian_CheckDir(const QDir& dir, RFs& rfs) @@ -167,6 +167,6 @@ inline QStringList mobilityPlugins(const QString& plugintype) return plugins; } -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qnmeapositioninfosource.cpp b/src/location/qnmeapositioninfosource.cpp index db07e82c..55ec396c 100644 --- a/src/location/qnmeapositioninfosource.cpp +++ b/src/location/qnmeapositioninfosource.cpp @@ -47,7 +47,7 @@ #include <QTimer> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE QNmeaRealTimeReader::QNmeaRealTimeReader(QNmeaPositionInfoSourcePrivate *sourcePrivate) : QNmeaReader(sourcePrivate) @@ -620,4 +620,4 @@ int QNmeaPositionInfoSource::minimumUpdateInterval() const #include "moc_qnmeapositioninfosource.cpp" #include "moc_qnmeapositioninfosource_p.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE diff --git a/src/location/qnmeapositioninfosource.h b/src/location/qnmeapositioninfosource.h index 5c315dc9..7d7966b3 100644 --- a/src/location/qnmeapositioninfosource.h +++ b/src/location/qnmeapositioninfosource.h @@ -44,13 +44,10 @@ #include "qmobilityglobal.h" #include "qgeopositioninfosource.h" -QT_BEGIN_NAMESPACE -class QIODevice; -QT_END_NAMESPACE - QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE -QTM_BEGIN_NAMESPACE +class QIODevice; class QNmeaPositionInfoSourcePrivate; class Q_LOCATION_EXPORT QNmeaPositionInfoSource : public QGeoPositionInfoSource @@ -93,7 +90,7 @@ private: QNmeaPositionInfoSourcePrivate *d; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/location/qnmeapositioninfosource_p.h b/src/location/qnmeapositioninfosource_p.h index b1360db9..b37682ac 100644 --- a/src/location/qnmeapositioninfosource_p.h +++ b/src/location/qnmeapositioninfosource_p.h @@ -59,15 +59,12 @@ #include <QQueue> #include <QPointer> +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE + class QBasicTimer; class QTimerEvent; class QTimer; -QT_END_NAMESPACE - -QT_BEGIN_HEADER - -QTM_BEGIN_NAMESPACE class QNmeaReader; struct QPendingGeoPositionInfo { @@ -173,7 +170,7 @@ private: bool m_hasValidDateTime; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/plugins/geoservices/nokia/jsonparser.h b/src/plugins/geoservices/nokia/jsonparser.h index 5ea0a690..d39f4771 100644 --- a/src/plugins/geoservices/nokia/jsonparser.h +++ b/src/plugins/geoservices/nokia/jsonparser.h @@ -53,6 +53,8 @@ #include <QString> #include <QRegExp> +QT_BEGIN_NAMESPACE + class JSONParser { public: @@ -238,4 +240,6 @@ public: } }; +QT_END_NAMESPACE + #endif // JSONPARSER_H diff --git a/src/plugins/geoservices/nokia/marclanguagecodes.h b/src/plugins/geoservices/nokia/marclanguagecodes.h index 5f2accac..57bc57cd 100644 --- a/src/plugins/geoservices/nokia/marclanguagecodes.h +++ b/src/plugins/geoservices/nokia/marclanguagecodes.h @@ -53,6 +53,8 @@ // http://www.loc.gov/marc/languages/language_code.html // Order matches QLocale::Language +QT_BEGIN_NAMESPACE + static const unsigned char marc_language_code_list[] = "\0\0\0" // Unused "\0\0\0" // C @@ -271,5 +273,6 @@ static const unsigned char marc_language_code_list[] = "\0\0\0" // Shambala ; +QT_END_NAMESPACE #endif /* MARCLANGUAGECODES_H_ */ diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp index 900ee479..e4cc33d3 100644 --- a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp @@ -51,6 +51,8 @@ #include <QXmlStreamReader> #include <QIODevice> +QT_BEGIN_NAMESPACE + QGeoCodeXmlParser::QGeoCodeXmlParser() : m_reader(0) { @@ -574,3 +576,4 @@ bool QGeoCodeXmlParser::parseCoordinate(QGeoCoordinate *coordinate, const QStrin return true; } +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.h b/src/plugins/geoservices/nokia/qgeocodexmlparser.h index c866d93f..d82965aa 100644 --- a/src/plugins/geoservices/nokia/qgeocodexmlparser.h +++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.h @@ -53,15 +53,15 @@ #include <QList> #include <QXmlStreamReader> -class QIODevice; #include <qgeocoordinate.h> #include <qgeoboundingbox.h> #include <qgeoplace.h> #include <qgeoaddress.h> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE +class QIODevice; class QGeoCodeXmlParser { public: @@ -87,4 +87,6 @@ private: QString m_errorString; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp index 80b907c2..3bd6b708 100644 --- a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp @@ -69,8 +69,12 @@ #define DISK_CACHE_ENABLED 1 #endif +QT_BEGIN_NAMESPACE + #if defined(Q_OS_SYMBIAN) #include <f32file.h> + + QChar QGeoMappingManagerEngineNokia::findFirstInternalFlashDrive() { QChar flashDrive; @@ -300,3 +304,4 @@ QString QGeoMappingManagerEngineNokia::mapTypeToStr(QGraphicsGeoMap::MapType typ return "normal.day"; } +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h index 89f145dc..70c6cfe1 100644 --- a/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h @@ -54,11 +54,11 @@ #include <qgeoserviceprovider.h> #include <qgeotiledmappingmanagerengine.h> +QT_BEGIN_NAMESPACE + class QNetworkAccessManager; class QNetworkDiskCache; -QTM_USE_NAMESPACE - class QGeoMappingManagerEngineNokia : public QGeoTiledMappingManagerEngine { Q_OBJECT @@ -89,4 +89,6 @@ private: QString m_referer; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp index 30f583e3..1f11d72a 100644 --- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp @@ -51,6 +51,8 @@ #include <QNetworkCacheMetaData> #include <QDateTime> +QT_BEGIN_NAMESPACE + QGeoMapReplyNokia::QGeoMapReplyNokia(QNetworkReply *reply, const QGeoTiledMapRequest &request, QObject *parent) : QGeoTiledMapReply(request, parent), m_reply(reply) @@ -135,3 +137,5 @@ void QGeoMapReplyNokia::networkError(QNetworkReply::NetworkError error) m_reply->deleteLater(); m_reply = 0; } + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h index 6bc6e405..ee0195bb 100644 --- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h +++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h @@ -52,7 +52,7 @@ #include <qgeotiledmapreply.h> #include <QNetworkReply> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMapReplyNokia : public QGeoTiledMapReply { @@ -75,4 +75,6 @@ private: QNetworkReply *m_reply; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp index 1a61f878..c2ea29c5 100644 --- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp @@ -51,6 +51,8 @@ #include <qgeorouterequest.h> +QT_BEGIN_NAMESPACE + QGeoRouteReplyNokia::QGeoRouteReplyNokia(const QGeoRouteRequest &request, QNetworkReply *reply, QObject *parent) : QGeoRouteReply(request, parent), m_reply(reply) @@ -120,3 +122,5 @@ void QGeoRouteReplyNokia::networkError(QNetworkReply::NetworkError error) m_reply->deleteLater(); m_reply = 0; } + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h index 0fcd11a4..38b4e534 100644 --- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h +++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.h @@ -52,7 +52,7 @@ #include <qgeoroutereply.h> #include <QNetworkReply> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoRouteReplyNokia : public QGeoRouteReply { @@ -71,4 +71,6 @@ private: QNetworkReply *m_reply; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp index ba6e5227..e8d2f328 100644 --- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp @@ -53,6 +53,8 @@ #include <QStringList> #include <QString> +QT_BEGIN_NAMESPACE + QGeoRouteXmlParser::QGeoRouteXmlParser(const QGeoRouteRequest &request) : m_request(request), m_reader(0) @@ -558,3 +560,5 @@ bool QGeoRouteXmlParser::parseBoundingBox(QGeoBoundingBox &bounds) return false; } + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h index d6269358..02ef640b 100644 --- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h +++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h @@ -54,8 +54,6 @@ #include <QString> #include <QXmlStreamReader> -class QIODevice; - #include <qgeoroute.h> #include <qgeoroutesegment.h> #include <qgeocoordinate.h> @@ -63,7 +61,9 @@ class QIODevice; #include <qgeorouterequest.h> #include <qgeomaneuver.h> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE +class QIODevice; + class QGeoManeuverContainer { @@ -114,4 +114,5 @@ private: QList<QGeoRouteSegmentContainer> segments; }; +QT_END_NAMESPACE #endif diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp index 4590f38b..f92e20ac 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp @@ -54,6 +54,8 @@ #include <QUrl> #include <qgeoboundingbox.h> +QT_BEGIN_NAMESPACE + QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia(const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) : QGeoRoutingManagerEngine(parameters), m_host("prd.lbsp.navteq.com"), @@ -475,3 +477,5 @@ void QGeoRoutingManagerEngineNokia::routeError(QGeoRouteReply::Error error, cons emit this->error(reply, error, errorString); } + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h index f0e4a173..0dd17b0c 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h @@ -55,7 +55,7 @@ #include <qgeoroutingmanagerengine.h> #include <QNetworkAccessManager> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoRoutingManagerEngineNokia : public QGeoRoutingManagerEngine { @@ -89,4 +89,6 @@ private: QString m_referer; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp index 388283be..91db792a 100644 --- a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp @@ -56,6 +56,8 @@ #include <QUrl> #include <QMap> +QT_BEGIN_NAMESPACE + QGeoSearchManagerEngineNokia::QGeoSearchManagerEngineNokia(const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, QString *errorString) : QGeoSearchManagerEngine(parameters), m_host("loc.desktop.maps.svc.ovi.com"), @@ -315,3 +317,5 @@ QString QGeoSearchManagerEngineNokia::languageToMarc(QLocale::Language language) return code; } + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h index f0b112e1..0ca23e61 100644 --- a/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h @@ -58,7 +58,7 @@ #include <QLocale> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSearchManagerEngineNokia : public QGeoSearchManagerEngine { @@ -95,4 +95,6 @@ private: QString m_referer; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp index fd43c5bc..c3f157c4 100644 --- a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.cpp @@ -49,6 +49,8 @@ #include "qgeosearchreply_nokia.h" #include "qgeocodexmlparser.h" +QT_BEGIN_NAMESPACE + QGeoSearchReplyNokia::QGeoSearchReplyNokia(QNetworkReply *reply, int limit, int offset, QGeoBoundingArea *viewport, QObject *parent) : QGeoSearchReply(parent), m_reply(reply) @@ -129,3 +131,5 @@ void QGeoSearchReplyNokia::networkError(QNetworkReply::NetworkError error) m_reply->deleteLater(); m_reply = 0; } + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h index f97ec55d..9c47dd6b 100644 --- a/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h +++ b/src/plugins/geoservices/nokia/qgeosearchreply_nokia.h @@ -52,7 +52,7 @@ #include <qgeosearchreply.h> #include <QNetworkReply> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoSearchReplyNokia : public QGeoSearchReply { @@ -71,4 +71,6 @@ private: QNetworkReply *m_reply; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp index 5b8e65d3..ae6d9a1a 100644 --- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp @@ -55,6 +55,8 @@ #include <QtPlugin> #include <QNetworkProxy> +QT_BEGIN_NAMESPACE + QGeoServiceProviderFactoryNokia::QGeoServiceProviderFactoryNokia() {} QGeoServiceProviderFactoryNokia::~QGeoServiceProviderFactoryNokia() {} @@ -94,3 +96,5 @@ const QString QGeoServiceProviderFactoryNokia::defaultToken("152022572f0e44e0748 const QString QGeoServiceProviderFactoryNokia::defaultReferer("qtlocationapi"); Q_EXPORT_PLUGIN2(qtgeoservices_nokia, QGeoServiceProviderFactoryNokia) + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h index c0117302..0013f40d 100644 --- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h +++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h @@ -52,7 +52,7 @@ #include <qgeoserviceproviderfactory.h> #include <QObject> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoServiceProviderFactoryNokia : public QObject, public QGeoServiceProviderFactory { @@ -79,4 +79,6 @@ public: static const QString defaultReferer; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp index 9a3d06be..72918f25 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp @@ -55,7 +55,7 @@ #include <QNetworkAccessManager> #include <QNetworkProxy> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE /*! Constructs a new tiled map data object, which stores the map data required by @@ -185,7 +185,7 @@ QString QGeoTiledMapDataNokia::getViewCopyright() /*! \reimp */ -void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyleOptionGraphicsItem *option) +void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/) { QRect viewport = painter->combinedTransform().inverted().mapRect(painter->viewport()); @@ -234,3 +234,5 @@ void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyle lastCopyright ); } + +QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h index 38d6004f..8fd01c00 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h +++ b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h @@ -52,7 +52,7 @@ #include <QPixmap> #include <QNetworkReply> -QTM_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoMappingManagerEngineNokia; @@ -92,4 +92,6 @@ private slots: void copyrightReplyFinished(QNetworkReply*); }; +QT_END_NAMESPACE + #endif // QGEOMAPDATA_NOKIA_H |