Allow places branch to work when Qt is built in a namespace.

Change QTM_* to QT_*.

Change-Id: I8d0d0a53458ffb2f3ecc26d70a3542fb2cb1bf74
Reviewed-on: http://codereview.qt.nokia.com/1613
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: abcd <qt_abcd1@ovi.com>

63 files changed, 116 insertions, 116 deletions

diff --git a/src/location/places/qplacealternativevalue.cpp b/src/location/places/qplacealternativevalue.cpp
index faf1dc9d..86df9df1 100644
--- a/src/location/places/qplacealternativevalue.cpp
+++ b/src/location/places/qplacealternativevalue.cpp
@@ -42,7 +42,7 @@
 #include "qplacealternativevalue.h"
 #include "qplacealternativevalue_p.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceAlternativeValuePrivate::QPlaceAlternativeValuePrivate()
     : QSharedData(),
diff --git a/src/location/places/qplacealternativevalue.h b/src/location/places/qplacealternativevalue.h
index fbfa9a17..7e17ca10 100644
--- a/src/location/places/qplacealternativevalue.h
+++ b/src/location/places/qplacealternativevalue.h
@@ -46,7 +46,7 @@
 #include <QString>
 #include "qmobilityglobal.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceAlternativeValuePrivate;
 
@@ -92,6 +92,6 @@ private:
     QSharedDataPointer<QPlaceAlternativeValuePrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEALTERNATIVEVALUE_H
diff --git a/src/location/places/qplacealternativevalue_p.h b/src/location/places/qplacealternativevalue_p.h
index 3d7ee0f5..2d51e70b 100644
--- a/src/location/places/qplacealternativevalue_p.h
+++ b/src/location/places/qplacealternativevalue_p.h
@@ -47,7 +47,7 @@
 
 #include "qplacealternativevalue.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceAlternativeValuePrivate : public QSharedData
 {
@@ -66,6 +66,6 @@ public:
     QString value;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEALTERNATIVEVALUE_P_H
diff --git a/src/location/places/qplacebusinessfeature.cpp b/src/location/places/qplacebusinessfeature.cpp
index dc6f3bf1..c82d5a48 100644
--- a/src/location/places/qplacebusinessfeature.cpp
+++ b/src/location/places/qplacebusinessfeature.cpp
@@ -42,7 +42,7 @@
 #include "qplacebusinessfeature.h"
 #include "qplacebusinessfeature_p.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceBusinessFeaturePrivate::QPlaceBusinessFeaturePrivate() : QSharedData()
 {
diff --git a/src/location/places/qplacebusinessfeature.h b/src/location/places/qplacebusinessfeature.h
index d3035920..78da218e 100644
--- a/src/location/places/qplacebusinessfeature.h
+++ b/src/location/places/qplacebusinessfeature.h
@@ -76,6 +76,6 @@ private:
     QSharedDataPointer<QPlaceBusinessFeaturePrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEBUSINESSFEATURE_H
diff --git a/src/location/places/qplacebusinessfeature_p.h b/src/location/places/qplacebusinessfeature_p.h
index f0ecf371..008a58bb 100644
--- a/src/location/places/qplacebusinessfeature_p.h
+++ b/src/location/places/qplacebusinessfeature_p.h
@@ -47,7 +47,7 @@
 
 #include "qplacebusinessfeature.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceBusinessFeaturePrivate : public QSharedData
 {
@@ -64,6 +64,6 @@ public:
     QString value;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEBUSINESSFEATURE_P_H
diff --git a/src/location/places/qplacebusinessinformation.cpp b/src/location/places/qplacebusinessinformation.cpp
index e46db5d2..c6d2a1ce 100644
--- a/src/location/places/qplacebusinessinformation.cpp
+++ b/src/location/places/qplacebusinessinformation.cpp
@@ -42,7 +42,7 @@
 #include "qplacebusinessinformation.h"
 #include "qplacebusinessinformation_p.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceBusinessInformationPrivate::QPlaceBusinessInformationPrivate() : QSharedData()
 {
diff --git a/src/location/places/qplacebusinessinformation.h b/src/location/places/qplacebusinessinformation.h
index 625e92cd..a6cf853b 100644
--- a/src/location/places/qplacebusinessinformation.h
+++ b/src/location/places/qplacebusinessinformation.h
@@ -52,7 +52,7 @@
 #include "qplaceperiod.h"
 #include "qplaceweekdayhours.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceBusinessInformationPrivate;
 
@@ -90,7 +90,7 @@ private:
     QSharedDataPointer<QPlaceBusinessInformationPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
 #endif // QPLACEBUSINESSINFORMATION_H
diff --git a/src/location/places/qplacebusinessinformation_p.h b/src/location/places/qplacebusinessinformation_p.h
index 6fce1864..8baee002 100644
--- a/src/location/places/qplacebusinessinformation_p.h
+++ b/src/location/places/qplacebusinessinformation_p.h
@@ -46,7 +46,7 @@
 
 #include "qplacebusinessinformation.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceBusinessInformationPrivate : public QSharedData
 {
@@ -67,6 +67,6 @@ public:
     QStringList paymentMethods;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEBUSINESSINFORMATION_P_H
diff --git a/src/location/places/qplacecategory.cpp b/src/location/places/qplacecategory.cpp
index 6ffcb4bd..d74aff7b 100644
--- a/src/location/places/qplacecategory.cpp
+++ b/src/location/places/qplacecategory.cpp
@@ -44,7 +44,7 @@
 
 #include "qplacemanagerengine.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceCategoryPrivate::QPlaceCategoryPrivate()
     : QSharedData()
diff --git a/src/location/places/qplacecategory.h b/src/location/places/qplacecategory.h
index 0059d61a..892b5ac5 100644
--- a/src/location/places/qplacecategory.h
+++ b/src/location/places/qplacecategory.h
@@ -48,7 +48,7 @@
 #include <QList>
 #include "qplacealternativevalue.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceManagerEngine;
 
@@ -81,6 +81,6 @@ private:
     QSharedDataPointer<QPlaceCategoryPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACECATEGORY_H
diff --git a/src/location/places/qplacecategory_p.h b/src/location/places/qplacecategory_p.h
index e4d111a3..22c0ab35 100644
--- a/src/location/places/qplacecategory_p.h
+++ b/src/location/places/qplacecategory_p.h
@@ -46,7 +46,7 @@
 
 #include "qplacecategory.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceCategoryPrivate : public QSharedData
 {
@@ -64,6 +64,6 @@ public:
     QString name;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACECATEGORY_P_H
diff --git a/src/location/places/qplacecontact.cpp b/src/location/places/qplacecontact.cpp
index 147a1647..05eb13c9 100644
--- a/src/location/places/qplacecontact.cpp
+++ b/src/location/places/qplacecontact.cpp
@@ -42,7 +42,7 @@
 #include "qplacecontact.h"
 #include "qplacecontact_p.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceContactPrivate::QPlaceContactPrivate() : QSharedData()
 {
diff --git a/src/location/places/qplacecontact.h b/src/location/places/qplacecontact.h
index 03e4d737..bec6d580 100644
--- a/src/location/places/qplacecontact.h
+++ b/src/location/places/qplacecontact.h
@@ -46,7 +46,7 @@
 #include <QString>
 #include "qmobilityglobal.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceContactPrivate;
 
@@ -85,6 +85,6 @@ private:
     QSharedDataPointer<QPlaceContactPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACECONTACT_H
diff --git a/src/location/places/qplacecontact_p.h b/src/location/places/qplacecontact_p.h
index 3c53e24b..8ef9228b 100644
--- a/src/location/places/qplacecontact_p.h
+++ b/src/location/places/qplacecontact_p.h
@@ -46,7 +46,7 @@
 
 #include "qplacecontact.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceContactPrivate : public QSharedData
 {
@@ -63,6 +63,6 @@ public:
     QString value;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACECONTACT_P_H
diff --git a/src/location/places/qplacedescription.cpp b/src/location/places/qplacedescription.cpp
index ccb054cf..1996089d 100644
--- a/src/location/places/qplacedescription.cpp
+++ b/src/location/places/qplacedescription.cpp
@@ -42,7 +42,7 @@
 #include "qplacedescription.h"
 #include "qplacedescription_p.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceDescriptionPrivate::QPlaceDescriptionPrivate() : QSharedData()
 {
diff --git a/src/location/places/qplacedescription.h b/src/location/places/qplacedescription.h
index 599c46ea..0a386d78 100644
--- a/src/location/places/qplacedescription.h
+++ b/src/location/places/qplacedescription.h
@@ -47,7 +47,7 @@
 #include "qmobilityglobal.h"
 #include "qplacesupplier.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceDescriptionPrivate;
 
@@ -83,6 +83,6 @@ private:
     QSharedDataPointer<QPlaceDescriptionPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEDESCRIPTION_H
diff --git a/src/location/places/qplacedescription_p.h b/src/location/places/qplacedescription_p.h
index 32691bb3..1ecabbdc 100644
--- a/src/location/places/qplacedescription_p.h
+++ b/src/location/places/qplacedescription_p.h
@@ -46,7 +46,7 @@
 
 #include "qplacedescription.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceDescriptionPrivate : public QSharedData
 {
@@ -66,6 +66,6 @@ public:
     QString language;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEDESCRIPTION_P_H
diff --git a/src/location/places/qplacedetailsreply.cpp b/src/location/places/qplacedetailsreply.cpp
index f1ad72ac..f83ae53b 100644
--- a/src/location/places/qplacedetailsreply.cpp
+++ b/src/location/places/qplacedetailsreply.cpp
@@ -42,7 +42,7 @@
 #include "qplacedetailsreply.h"
 #include "qplacereply_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QPlaceDetailsReplyPrivate : public QPlaceReplyPrivate
 {
 public:
@@ -51,9 +51,9 @@ public:
     QGeoPlace result;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 /*!
     \class QPlaceDetailsReply
diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h
index fce97f79..1eb3c4f7 100644
--- a/src/location/places/qplacedetailsreply.h
+++ b/src/location/places/qplacedetailsreply.h
@@ -45,7 +45,7 @@
 #include "qplacereply.h"
 #include "qgeoplace.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceDetailsReplyPrivate;
 class Q_LOCATION_EXPORT QPlaceDetailsReply : public QPlaceReply
@@ -66,6 +66,6 @@ private:
     Q_DECLARE_PRIVATE(QPlaceDetailsReply)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEDETAILSREPLY_H
diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index fa00a150..a2198402 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -56,7 +56,7 @@
 #include <QString>
 #include <QObject>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceManagerEngine;
 
@@ -146,6 +146,6 @@ private:
 Q_DECLARE_OPERATORS_FOR_FLAGS(QPlaceManager::VisibilityScopes);
 Q_DECLARE_OPERATORS_FOR_FLAGS(QPlaceManager::ConnectivityModes);
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEMANAGER_H
diff --git a/src/location/places/qplacemanager_p.cpp b/src/location/places/qplacemanager_p.cpp
index f5e0a75a..6049ab07 100644
--- a/src/location/places/qplacemanager_p.cpp
+++ b/src/location/places/qplacemanager_p.cpp
@@ -52,7 +52,7 @@
 
 #include "qmobilitypluginsearch.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceManagerPrivate::QPlaceManagerPrivate()
         : engine(0),
diff --git a/src/location/places/qplacemanager_p.h b/src/location/places/qplacemanager_p.h
index 0f047eb5..a4fe5ed2 100644
--- a/src/location/places/qplacemanager_p.h
+++ b/src/location/places/qplacemanager_p.h
@@ -59,7 +59,7 @@
 #include <QString>
 #include <QMap>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceManagerEngine;
 class QPlaceManagerEngineFactory;
@@ -85,6 +85,6 @@ public:
     Q_DECLARE_PUBLIC(QPlaceManager)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEMANAGER_P_H
diff --git a/src/location/places/qplacemanagerengine.cpp b/src/location/places/qplacemanagerengine.cpp
index 78e8a859..3c28ae44 100644
--- a/src/location/places/qplacemanagerengine.cpp
+++ b/src/location/places/qplacemanagerengine.cpp
@@ -43,7 +43,7 @@
 
 #include "qplacecategory_p.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceManagerEngine::QPlaceManagerEngine(QObject *parent)
     : QObject(parent)
diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h
index b2ed8bf9..4d6536b6 100644
--- a/src/location/places/qplacemanagerengine.h
+++ b/src/location/places/qplacemanagerengine.h
@@ -44,7 +44,7 @@
 
 #include "qplacemanager.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_LOCATION_EXPORT QPlaceManagerEngine : public QObject
 {
@@ -88,6 +88,6 @@ Q_SIGNALS:
 
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/places/qplacemanagerenginefactory.h b/src/location/places/qplacemanagerenginefactory.h
index 3c2fec86..ca2f2742 100644
--- a/src/location/places/qplacemanagerenginefactory.h
+++ b/src/location/places/qplacemanagerenginefactory.h
@@ -47,7 +47,7 @@
 #include "qplacemanagerengine.h"
 #include <QList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceManagerEngine;
 class Q_LOCATION_EXPORT QPlaceManagerEngineFactory
@@ -60,7 +60,7 @@ public:
     virtual QString managerName() const = 0;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 #define QT_PLACES_BACKEND_INTERFACE "com.nokia.qt.places.enginefactory/1.0"
diff --git a/src/location/places/qplacemediaobject.cpp b/src/location/places/qplacemediaobject.cpp
index 6feb636b..773268f0 100644
--- a/src/location/places/qplacemediaobject.cpp
+++ b/src/location/places/qplacemediaobject.cpp
@@ -42,7 +42,7 @@
 #include "qplacemediaobject.h"
 #include "qplacemediaobject_p.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceMediaObjectPrivate::QPlaceMediaObjectPrivate() : QSharedData()
 {
diff --git a/src/location/places/qplacemediaobject.h b/src/location/places/qplacemediaobject.h
index 48a57298..06178024 100644
--- a/src/location/places/qplacemediaobject.h
+++ b/src/location/places/qplacemediaobject.h
@@ -47,7 +47,7 @@
 #include "qmobilityglobal.h"
 #include "qplacesupplier.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceMediaObjectPrivate;
 
@@ -83,6 +83,6 @@ private:
     QSharedDataPointer<QPlaceMediaObjectPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEMEDIAOBJECT_H
diff --git a/src/location/places/qplacemediaobject_p.h b/src/location/places/qplacemediaobject_p.h
index 508de18c..7e61769c 100644
--- a/src/location/places/qplacemediaobject_p.h
+++ b/src/location/places/qplacemediaobject_p.h
@@ -46,7 +46,7 @@
 
 #include "qplacemediaobject.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceMediaObjectPrivate : public QSharedData
 {
@@ -66,6 +66,6 @@ public:
     QPlaceSupplier supplier;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEMEDIAOBJECT_P_H
diff --git a/src/location/places/qplacemediareply.cpp b/src/location/places/qplacemediareply.cpp
index eb1df567..eda783b1 100644
--- a/src/location/places/qplacemediareply.cpp
+++ b/src/location/places/qplacemediareply.cpp
@@ -43,7 +43,7 @@
 #include "qplacereply_p.h"
 #include "qplacepaginationlist.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QPlaceMediaReplyPrivate : public QPlaceReplyPrivate
 {
 public:
@@ -52,9 +52,9 @@ public:
     int totalCount;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 /*!
     \class QPlaceMediaReply
diff --git a/src/location/places/qplacemediareply.h b/src/location/places/qplacemediareply.h
index 8dd52218..6115766d 100644
--- a/src/location/places/qplacemediareply.h
+++ b/src/location/places/qplacemediareply.h
@@ -48,7 +48,7 @@
 
 #include <QStringList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceMediaReplyPrivate;
 class Q_LOCATION_EXPORT QPlaceMediaReply : public QPlaceReply
@@ -74,6 +74,6 @@ private:
     Q_DECLARE_PRIVATE(QPlaceMediaReply)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/places/qplacepaginationlist.h b/src/location/places/qplacepaginationlist.h
index 2d0f0e0d..107dd349 100644
--- a/src/location/places/qplacepaginationlist.h
+++ b/src/location/places/qplacepaginationlist.h
@@ -47,7 +47,7 @@
 #include "qmobilityglobal.h"
 #include "qplacesupplier.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QPlacePaginationList
@@ -121,6 +121,6 @@ private:
     QList<T> dataList;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEPAGINATIONLIST_H
diff --git a/src/location/places/qplaceperiod.cpp b/src/location/places/qplaceperiod.cpp
index a9b1ef6c..dcd76a38 100644
--- a/src/location/places/qplaceperiod.cpp
+++ b/src/location/places/qplaceperiod.cpp
@@ -42,7 +42,7 @@
 #include "qplaceperiod.h"
 #include "qplaceperiod_p.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlacePeriodPrivate::QPlacePeriodPrivate()
     : QSharedData()
diff --git a/src/location/places/qplaceperiod.h b/src/location/places/qplaceperiod.h
index 919c3bcb..826a06b0 100644
--- a/src/location/places/qplaceperiod.h
+++ b/src/location/places/qplaceperiod.h
@@ -46,7 +46,7 @@
 #include <QSharedDataPointer>
 #include "qmobilityglobal.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlacePeriodPrivate;
 
@@ -78,6 +78,6 @@ private:
     QSharedDataPointer<QPlacePeriodPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEPERIOD_H
diff --git a/src/location/places/qplaceperiod_p.h b/src/location/places/qplaceperiod_p.h
index df8aaefa..7194a6c8 100644
--- a/src/location/places/qplaceperiod_p.h
+++ b/src/location/places/qplaceperiod_p.h
@@ -46,7 +46,7 @@
 
 #include "qplaceperiod.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlacePeriodPrivate : public QSharedData
 {
@@ -62,6 +62,6 @@ public:
     QDateTime end;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEPERIOD_P_H
diff --git a/src/location/places/qplacequery.cpp b/src/location/places/qplacequery.cpp
index b466e845..1d35ca19 100644
--- a/src/location/places/qplacequery.cpp
+++ b/src/location/places/qplacequery.cpp
@@ -41,7 +41,7 @@
 
 #include "qplacequery.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceQueryPrivate : public QSharedData
 {
@@ -57,9 +57,9 @@ public:
     int limit;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceQueryPrivate::QPlaceQueryPrivate()
     : QSharedData(),
diff --git a/src/location/places/qplacequery.h b/src/location/places/qplacequery.h
index 02f0d6de..257388e3 100644
--- a/src/location/places/qplacequery.h
+++ b/src/location/places/qplacequery.h
@@ -45,7 +45,7 @@
 #include <QSharedDataPointer>
 #include "qmobilityglobal.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceQueryPrivate;
 
@@ -75,6 +75,6 @@ private:
     QSharedDataPointer<QPlaceQueryPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/places/qplacerating.cpp b/src/location/places/qplacerating.cpp
index 281fd50d..a708b653 100644
--- a/src/location/places/qplacerating.cpp
+++ b/src/location/places/qplacerating.cpp
@@ -42,7 +42,7 @@
 #include "qplacerating.h"
 #include "qplacerating_p.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceRatingPrivate::QPlaceRatingPrivate()
     : QSharedData(),
diff --git a/src/location/places/qplacerating.h b/src/location/places/qplacerating.h
index 52da2086..618b6da1 100644
--- a/src/location/places/qplacerating.h
+++ b/src/location/places/qplacerating.h
@@ -45,7 +45,7 @@
 #include <QSharedDataPointer>
 #include "qmobilityglobal.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceRatingPrivate;
 
@@ -73,6 +73,6 @@ private:
     QSharedDataPointer<QPlaceRatingPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACERATING_H
diff --git a/src/location/places/qplacerating_p.h b/src/location/places/qplacerating_p.h
index 0a5d0970..8e4a9272 100644
--- a/src/location/places/qplacerating_p.h
+++ b/src/location/places/qplacerating_p.h
@@ -46,7 +46,7 @@
 
 #include "qplacerating.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceRatingPrivate : public QSharedData
 {
@@ -62,6 +62,6 @@ public:
     int count;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACERATING_P_H
diff --git a/src/location/places/qplacereply.cpp b/src/location/places/qplacereply.cpp
index 6a2f4d0e..f8ced920 100644
--- a/src/location/places/qplacereply.cpp
+++ b/src/location/places/qplacereply.cpp
@@ -42,7 +42,7 @@
 #include "qplacereply.h"
 #include "qplacereply_p.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 /*!
     \class QPlaceReply
diff --git a/src/location/places/qplacereply.h b/src/location/places/qplacereply.h
index 9ba95bdb..0cf59025 100644
--- a/src/location/places/qplacereply.h
+++ b/src/location/places/qplacereply.h
@@ -45,7 +45,7 @@
 #include "qmobilityglobal.h"
 #include <QObject>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceReplyPrivate;
 class Q_LOCATION_EXPORT QPlaceReply : public QObject
@@ -100,6 +100,6 @@ private:
     Q_DISABLE_COPY(QPlaceReply)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEREPLY_H
diff --git a/src/location/places/qplacereply_p.h b/src/location/places/qplacereply_p.h
index 43d42319..149b4f08 100644
--- a/src/location/places/qplacereply_p.h
+++ b/src/location/places/qplacereply_p.h
@@ -55,7 +55,7 @@
 
 #include "qplacereply.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceReplyPrivate
 {
@@ -69,6 +69,6 @@ public:
     QString errorString;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/places/qplacereview.cpp b/src/location/places/qplacereview.cpp
index 9a4f30db..8deef663 100644
--- a/src/location/places/qplacereview.cpp
+++ b/src/location/places/qplacereview.cpp
@@ -42,7 +42,7 @@
 #include "qplacereview.h"
 #include "qplacereview_p.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceReviewPrivate::QPlaceReviewPrivate()
     : QSharedData(),
diff --git a/src/location/places/qplacereview.h b/src/location/places/qplacereview.h
index 616257b1..2fc75924 100644
--- a/src/location/places/qplacereview.h
+++ b/src/location/places/qplacereview.h
@@ -47,7 +47,7 @@
 #include "qmobilityglobal.h"
 #include "qplacesupplier.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceReviewPrivate;
 
@@ -97,6 +97,6 @@ private:
     QSharedDataPointer<QPlaceReviewPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEREVIEW_H
diff --git a/src/location/places/qplacereview_p.h b/src/location/places/qplacereview_p.h
index 197f8215..a5e7a8cc 100644
--- a/src/location/places/qplacereview_p.h
+++ b/src/location/places/qplacereview_p.h
@@ -46,7 +46,7 @@
 
 #include "qplacereview.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceReviewPrivate : public QSharedData
 {
@@ -73,6 +73,6 @@ public:
     QString originatorUrl;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEREVIEW_P_H
diff --git a/src/location/places/qplacereviewreply.cpp b/src/location/places/qplacereviewreply.cpp
index 19315996..8fc0353d 100644
--- a/src/location/places/qplacereviewreply.cpp
+++ b/src/location/places/qplacereviewreply.cpp
@@ -44,7 +44,7 @@
 
 #include "qgeoplace.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QPlaceReviewReplyPrivate : public QPlaceReplyPrivate
 {
 public:
@@ -53,9 +53,9 @@ public:
     int totalCount;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 /*!
     \class QPlaceReviewReply
diff --git a/src/location/places/qplacereviewreply.h b/src/location/places/qplacereviewreply.h
index 0a9b6542..714885c3 100644
--- a/src/location/places/qplacereviewreply.h
+++ b/src/location/places/qplacereviewreply.h
@@ -48,7 +48,7 @@
 
 #include <QStringList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceReviewReplyPrivate;
 class Q_LOCATION_EXPORT QPlaceReviewReply : public QPlaceReply
@@ -73,6 +73,6 @@ private:
     Q_DECLARE_PRIVATE(QPlaceReviewReply)
 };
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 #endif
diff --git a/src/location/places/qplacesearchquery.cpp b/src/location/places/qplacesearchquery.cpp
index bf4989e0..bf79ebdc 100644
--- a/src/location/places/qplacesearchquery.cpp
+++ b/src/location/places/qplacesearchquery.cpp
@@ -42,7 +42,7 @@
 #include "qplacesearchquery.h"
 #include "qgeocoordinate.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceSearchQueryPrivate : public QSharedData
 {
@@ -61,9 +61,9 @@ public:
     int dymNumber;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceSearchQueryPrivate::QPlaceSearchQueryPrivate()
     : QSharedData(),
diff --git a/src/location/places/qplacesearchquery.h b/src/location/places/qplacesearchquery.h
index 45ac7a4b..4a8c5c81 100644
--- a/src/location/places/qplacesearchquery.h
+++ b/src/location/places/qplacesearchquery.h
@@ -50,7 +50,7 @@
 
 #include <QString>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceSearchQueryPrivate;
 
@@ -96,6 +96,6 @@ private:
     QSharedDataPointer<QPlaceSearchQueryPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACESEARCHQUERY_H
diff --git a/src/location/places/qplacesearchreply.cpp b/src/location/places/qplacesearchreply.cpp
index 8656c34b..cd3ef2ef 100644
--- a/src/location/places/qplacesearchreply.cpp
+++ b/src/location/places/qplacesearchreply.cpp
@@ -43,7 +43,7 @@
 #include "qplacereply_p.h"
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QPlaceSearchReplyPrivate : public QPlaceReplyPrivate
 {
 public:
@@ -51,9 +51,9 @@ public:
     QList<QPlaceSearchResult> results;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 /*!
     \class QPlaceSearchReply
diff --git a/src/location/places/qplacesearchreply.h b/src/location/places/qplacesearchreply.h
index 5bc62cb7..5a83eb5a 100644
--- a/src/location/places/qplacesearchreply.h
+++ b/src/location/places/qplacesearchreply.h
@@ -45,7 +45,7 @@
 #include "qplacereply.h"
 #include "qplacesearchresult.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceSearchReplyPrivate;
 class Q_LOCATION_EXPORT QPlaceSearchReply : public QPlaceReply
@@ -66,6 +66,6 @@ private:
     Q_DECLARE_PRIVATE(QPlaceSearchReply)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/places/qplacesearchresult.cpp b/src/location/places/qplacesearchresult.cpp
index 46bb8534..9092f1a9 100644
--- a/src/location/places/qplacesearchresult.cpp
+++ b/src/location/places/qplacesearchresult.cpp
@@ -42,7 +42,7 @@
 #include "qplacesearchresult.h"
 #include "qplacesearchresult_p.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceSearchResultPrivate::QPlaceSearchResultPrivate()
     : QSharedData(),
diff --git a/src/location/places/qplacesearchresult.h b/src/location/places/qplacesearchresult.h
index 0af4a3cf..2cda4a65 100644
--- a/src/location/places/qplacesearchresult.h
+++ b/src/location/places/qplacesearchresult.h
@@ -49,7 +49,7 @@
 #include <QString>
 #include "qgeoplace.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceSearchResultPrivate;
 
@@ -108,6 +108,6 @@ private:
     QSharedDataPointer<QPlaceSearchResultPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACESEARCHRESULT_H
diff --git a/src/location/places/qplacesearchresult_p.h b/src/location/places/qplacesearchresult_p.h
index 20ac4fad..be709cf6 100644
--- a/src/location/places/qplacesearchresult_p.h
+++ b/src/location/places/qplacesearchresult_p.h
@@ -46,7 +46,7 @@
 
 #include <QSharedData>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceSearchResultPrivate : public QSharedData
 {
@@ -68,6 +68,6 @@ public:
     QString dymString;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACESEARCHRESULT_P_H
diff --git a/src/location/places/qplacesupplier.cpp b/src/location/places/qplacesupplier.cpp
index 5fbc0564..f7318da6 100644
--- a/src/location/places/qplacesupplier.cpp
+++ b/src/location/places/qplacesupplier.cpp
@@ -42,7 +42,7 @@
 #include "qplacesupplier.h"
 #include "qplacesupplier_p.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceSupplierPrivate::QPlaceSupplierPrivate() : QSharedData()
 {
diff --git a/src/location/places/qplacesupplier.h b/src/location/places/qplacesupplier.h
index 0bd52ef0..19b5df40 100644
--- a/src/location/places/qplacesupplier.h
+++ b/src/location/places/qplacesupplier.h
@@ -45,7 +45,7 @@
 #include <QSharedDataPointer>
 #include "qmobilityglobal.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceSupplierPrivate;
 
@@ -77,6 +77,6 @@ private:
     QSharedDataPointer<QPlaceSupplierPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACESUPPLIER_H
diff --git a/src/location/places/qplacesupplier_p.h b/src/location/places/qplacesupplier_p.h
index f35536e3..c18e9f01 100644
--- a/src/location/places/qplacesupplier_p.h
+++ b/src/location/places/qplacesupplier_p.h
@@ -47,7 +47,7 @@
 
 #include "qplacesupplier.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceSupplierPrivate : public QSharedData
 {
@@ -65,6 +65,6 @@ public:
     QString supplierIconUrl;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACESUPPLIER_P_H
diff --git a/src/location/places/qplacetextpredictionreply.cpp b/src/location/places/qplacetextpredictionreply.cpp
index 4315bb56..88197c42 100644
--- a/src/location/places/qplacetextpredictionreply.cpp
+++ b/src/location/places/qplacetextpredictionreply.cpp
@@ -42,7 +42,7 @@
 #include "qplacetextpredictionreply.h"
 #include "qplacereply_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceTextPredictionReplyPrivate : public QPlaceReplyPrivate
 {
@@ -51,9 +51,9 @@ public:
     QStringList textPredictions;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 /*!
     \class QPlaceTextPredictionReply
diff --git a/src/location/places/qplacetextpredictionreply.h b/src/location/places/qplacetextpredictionreply.h
index 805268c3..9764cdea 100644
--- a/src/location/places/qplacetextpredictionreply.h
+++ b/src/location/places/qplacetextpredictionreply.h
@@ -46,7 +46,7 @@
 
 #include <QStringList>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceTextPredictionReplyPrivate;
 
@@ -68,6 +68,6 @@ private:
     Q_DECLARE_PRIVATE(QPlaceTextPredictionReply)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/location/places/qplaceweekdayhours.cpp b/src/location/places/qplaceweekdayhours.cpp
index 2b949442..2662d91f 100644
--- a/src/location/places/qplaceweekdayhours.cpp
+++ b/src/location/places/qplaceweekdayhours.cpp
@@ -42,7 +42,7 @@
 #include "qplaceweekdayhours.h"
 #include "qplaceweekdayhours_p.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QPlaceWeekdayHoursPrivate::QPlaceWeekdayHoursPrivate()
     : QSharedData(),
diff --git a/src/location/places/qplaceweekdayhours.h b/src/location/places/qplaceweekdayhours.h
index 6cafdc9f..d7ece673 100644
--- a/src/location/places/qplaceweekdayhours.h
+++ b/src/location/places/qplaceweekdayhours.h
@@ -46,7 +46,7 @@
 #include "qmobilityglobal.h"
 #include "qplaceperiod.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceWeekdayHoursPrivate;
 
@@ -74,6 +74,6 @@ private:
     QSharedDataPointer<QPlaceWeekdayHoursPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEWEEKDAYHOURS_H
diff --git a/src/location/places/qplaceweekdayhours_p.h b/src/location/places/qplaceweekdayhours_p.h
index e888faa4..cfde2a1b 100644
--- a/src/location/places/qplaceweekdayhours_p.h
+++ b/src/location/places/qplaceweekdayhours_p.h
@@ -46,7 +46,7 @@
 
 #include "qplaceweekdayhours.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QPlaceWeekdayHoursPrivate : public QSharedData
 {
@@ -62,6 +62,6 @@ public:
     Qt::DayOfWeek weekday;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QPLACEWEEKDAYHOURS_P_H