diff options
151 files changed, 269 insertions, 271 deletions
diff --git a/src/imports/location/declarativeplaces/qdeclarativealternativevalue.cpp b/src/imports/location/declarativeplaces/qdeclarativealternativevalue.cpp index 52797536..bac8159f 100644 --- a/src/imports/location/declarativeplaces/qdeclarativealternativevalue.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativealternativevalue.cpp @@ -1,6 +1,6 @@ #include "qdeclarativealternativevalue_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass AlternativeValue diff --git a/src/imports/location/declarativeplaces/qdeclarativealternativevalue_p.h b/src/imports/location/declarativeplaces/qdeclarativealternativevalue_p.h index 1cb16608..753dcedc 100644 --- a/src/imports/location/declarativeplaces/qdeclarativealternativevalue_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativealternativevalue_p.h @@ -6,7 +6,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeAlternativeValue : public QObject { @@ -69,8 +69,8 @@ private: QPlaceAlternativeValue m_value; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeAlternativeValue)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeAlternativeValue)); #endif // QDECLARATIVEALTERNATIVEVALUE_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativebusinessfeature.cpp b/src/imports/location/declarativeplaces/qdeclarativebusinessfeature.cpp index 8bb1fe02..6e773043 100644 --- a/src/imports/location/declarativeplaces/qdeclarativebusinessfeature.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativebusinessfeature.cpp @@ -1,6 +1,6 @@ #include "qdeclarativebusinessfeature_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass BusinessFeature diff --git a/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h b/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h index f58405c9..36f35a41 100644 --- a/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h @@ -6,7 +6,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeBusinessFeature : public QObject { @@ -43,8 +43,8 @@ private: QPlaceBusinessFeature m_value; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeBusinessFeature)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeBusinessFeature)); #endif // QDECLARATIVEBUSINESSFEATURE_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativebusinessinformation.cpp b/src/imports/location/declarativeplaces/qdeclarativebusinessinformation.cpp index 3a941f01..bb501f2d 100644 --- a/src/imports/location/declarativeplaces/qdeclarativebusinessinformation.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativebusinessinformation.cpp @@ -1,6 +1,6 @@ #include "qdeclarativebusinessinformation_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass BusinessInformation diff --git a/src/imports/location/declarativeplaces/qdeclarativebusinessinformation_p.h b/src/imports/location/declarativeplaces/qdeclarativebusinessinformation_p.h index c7ce8563..eacff759 100644 --- a/src/imports/location/declarativeplaces/qdeclarativebusinessinformation_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativebusinessinformation_p.h @@ -8,7 +8,7 @@ #include "qdeclarativeperiod_p.h" #include "qdeclarativeweekdayhours_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeBusinessInformation : public QObject { @@ -80,8 +80,8 @@ private: QPlaceBusinessInformation m_src; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeBusinessInformation)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeBusinessInformation)); #endif // QDECLARATIVEBUSINESSINFORMATION_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp b/src/imports/location/declarativeplaces/qdeclarativecategory.cpp index f65ef252..6dcbcc1f 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativecategory.cpp @@ -1,6 +1,6 @@ #include "qdeclarativecategory_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass Category diff --git a/src/imports/location/declarativeplaces/qdeclarativecategory_p.h b/src/imports/location/declarativeplaces/qdeclarativecategory_p.h index d40da1fb..d0b9a516 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecategory_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativecategory_p.h @@ -7,7 +7,7 @@ #include <qplacecategory.h> #include "qdeclarativealternativevalue_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeCategory : public QObject { @@ -54,8 +54,8 @@ private: QPlaceCategory m_category; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeCategory)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCategory)); #endif // QDECLARATIVECATEGORY_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativecontact.cpp b/src/imports/location/declarativeplaces/qdeclarativecontact.cpp index 9053f3a3..2ad1a0f2 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecontact.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativecontact.cpp @@ -1,6 +1,6 @@ #include "qdeclarativecontact_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass Contact diff --git a/src/imports/location/declarativeplaces/qdeclarativecontact_p.h b/src/imports/location/declarativeplaces/qdeclarativecontact_p.h index 6a713e76..5dab8a49 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecontact_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativecontact_p.h @@ -6,7 +6,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeContact : public QObject { @@ -51,8 +51,8 @@ private: QPlaceContact m_value; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeContact)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeContact)); #endif // QDECLARATIVECONTACT_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativedescription.cpp b/src/imports/location/declarativeplaces/qdeclarativedescription.cpp index a109f40e..115dbb61 100644 --- a/src/imports/location/declarativeplaces/qdeclarativedescription.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativedescription.cpp @@ -1,6 +1,6 @@ #include "qdeclarativedescription_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass Description diff --git a/src/imports/location/declarativeplaces/qdeclarativedescription_p.h b/src/imports/location/declarativeplaces/qdeclarativedescription_p.h index 4111f27f..2c50204a 100644 --- a/src/imports/location/declarativeplaces/qdeclarativedescription_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativedescription_p.h @@ -6,7 +6,7 @@ #include <qplacedescription.h> #include "qdeclarativesupplier_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeDescription : public QObject { @@ -53,8 +53,8 @@ private: QPlaceDescription m_src; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeDescription)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeDescription)); #endif // QDECLARATIVEDESCRIPTION_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativemediaobject.cpp b/src/imports/location/declarativeplaces/qdeclarativemediaobject.cpp index 50e1052e..90841957 100644 --- a/src/imports/location/declarativeplaces/qdeclarativemediaobject.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativemediaobject.cpp @@ -1,6 +1,6 @@ #include "qdeclarativemediaobject_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass MediaObject diff --git a/src/imports/location/declarativeplaces/qdeclarativemediaobject_p.h b/src/imports/location/declarativeplaces/qdeclarativemediaobject_p.h index 7cd367b5..6455b523 100644 --- a/src/imports/location/declarativeplaces/qdeclarativemediaobject_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativemediaobject_p.h @@ -6,7 +6,7 @@ #include <qplacemediaobject.h> #include "qdeclarativesupplier_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeMediaObject : public QObject { @@ -53,8 +53,8 @@ private: QPlaceMediaObject m_src; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeMediaObject)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeMediaObject)); #endif // QDECLARATIVEMEDIAOBJECT_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativemediapaginationlist.cpp b/src/imports/location/declarativeplaces/qdeclarativemediapaginationlist.cpp index ea9097e4..11505b35 100644 --- a/src/imports/location/declarativeplaces/qdeclarativemediapaginationlist.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativemediapaginationlist.cpp @@ -1,6 +1,6 @@ #include "qdeclarativemediapaginationlist_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass MediaPaginationList diff --git a/src/imports/location/declarativeplaces/qdeclarativemediapaginationlist_p.h b/src/imports/location/declarativeplaces/qdeclarativemediapaginationlist_p.h index f7705706..4f90bf33 100644 --- a/src/imports/location/declarativeplaces/qdeclarativemediapaginationlist_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativemediapaginationlist_p.h @@ -6,7 +6,7 @@ #include <qplacepaginationlist.h> #include "qdeclarativemediaobject_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeMediaPaginationList : public QObject { @@ -51,8 +51,8 @@ private: QPlacePaginationList<QPlaceMediaObject> m_src; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeMediaPaginationList)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeMediaPaginationList)); #endif // QDECLARATIVEMEDIAPAGINATIONLIST_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativeperiod.cpp b/src/imports/location/declarativeplaces/qdeclarativeperiod.cpp index 9ff24ac1..2c54fc06 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeperiod.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeperiod.cpp @@ -1,6 +1,6 @@ #include "qdeclarativeperiod_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass Period diff --git a/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h b/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h index 59bdb2c1..b965f585 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h @@ -6,7 +6,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativePeriod : public QObject { @@ -44,8 +44,8 @@ private: QPlacePeriod m_period; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativePeriod)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativePeriod)); #endif // QDECLARATIVEPERIOD_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp index d43c4dd4..096e7994 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp @@ -1,6 +1,6 @@ #include "qdeclarativeplace_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass Place diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h index 55a8269b..06879d59 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h @@ -15,7 +15,7 @@ #include "qdeclarativemediapaginationlist_p.h" #include "qdeclarativereviewpaginationlist_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativePlace : public QObject { @@ -161,8 +161,8 @@ private: QGeoPlace m_src; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativePlace)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativePlace)); #endif // QDECLARATIVEPLACE_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativeplacemanager.cpp b/src/imports/location/declarativeplaces/qdeclarativeplacemanager.cpp index d5c6eb4e..482064e3 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplacemanager.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplacemanager.cpp @@ -1,6 +1,6 @@ #include "qdeclarativeplacemanager_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass PlaceManager QDeclarativePlaceManager diff --git a/src/imports/location/declarativeplaces/qdeclarativeplacemanager_p.h b/src/imports/location/declarativeplaces/qdeclarativeplacemanager_p.h index 0415fbcc..cc1f5bdf 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplacemanager_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplacemanager_p.h @@ -8,7 +8,7 @@ #include "qdeclarativeplace_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativePlaceManager : public QObject { @@ -51,8 +51,8 @@ private: QPlaceReply *m_response; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativePlaceManager)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativePlaceManager)); #endif // QDECLARATIVETEXTPREDICTIONMODEL_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativerating.cpp b/src/imports/location/declarativeplaces/qdeclarativerating.cpp index ee8c3b96..685ca29a 100644 --- a/src/imports/location/declarativeplaces/qdeclarativerating.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativerating.cpp @@ -1,6 +1,6 @@ #include "qdeclarativerating_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass Rating diff --git a/src/imports/location/declarativeplaces/qdeclarativerating_p.h b/src/imports/location/declarativeplaces/qdeclarativerating_p.h index 7f5db79b..fe6f739a 100644 --- a/src/imports/location/declarativeplaces/qdeclarativerating_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativerating_p.h @@ -6,7 +6,7 @@ #include <QObject> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeRating : public QObject { @@ -36,8 +36,8 @@ private: QPlaceRating m_rating; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeRating)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeRating)); #endif // QDECLARATIVERATING_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp index 88a73dfb..3d865ae3 100644 --- a/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp @@ -1,6 +1,6 @@ #include "qdeclarativerecommendationmodel_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass RecommenadationModel QDeclarativeRecommenadationModel diff --git a/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel_p.h index cc1964c6..87152684 100644 --- a/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel_p.h @@ -11,7 +11,7 @@ #include "qdeclarativegeoboundingbox_p.h" #include "qdeclarativesearchresult_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeRecommendationModel : public QAbstractListModel { @@ -86,8 +86,8 @@ private: QPlaceSearchReply *m_response; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeRecommendationModel)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeRecommendationModel)); #endif // QDECLARATIVERECOMMENDATIONMODEL_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativereview.cpp b/src/imports/location/declarativeplaces/qdeclarativereview.cpp index 3ab91980..e2a67dfe 100644 --- a/src/imports/location/declarativeplaces/qdeclarativereview.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativereview.cpp @@ -1,6 +1,6 @@ #include "qdeclarativereview_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass Review diff --git a/src/imports/location/declarativeplaces/qdeclarativereview_p.h b/src/imports/location/declarativeplaces/qdeclarativereview_p.h index aefa1509..11f9721d 100644 --- a/src/imports/location/declarativeplaces/qdeclarativereview_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativereview_p.h @@ -6,7 +6,7 @@ #include <qplacereview.h> #include "qdeclarativesupplier_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeReview : public QObject { @@ -81,8 +81,8 @@ private: QPlaceReview m_src; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeReview)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeReview)); #endif // QDECLARATIVEREVIEW_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativereviewpaginationlist.cpp b/src/imports/location/declarativeplaces/qdeclarativereviewpaginationlist.cpp index db09769a..39db9ad8 100644 --- a/src/imports/location/declarativeplaces/qdeclarativereviewpaginationlist.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativereviewpaginationlist.cpp @@ -1,6 +1,6 @@ #include "qdeclarativereviewpaginationlist_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass ReviewPaginationList diff --git a/src/imports/location/declarativeplaces/qdeclarativereviewpaginationlist_p.h b/src/imports/location/declarativeplaces/qdeclarativereviewpaginationlist_p.h index 708bfcac..7e65143d 100644 --- a/src/imports/location/declarativeplaces/qdeclarativereviewpaginationlist_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativereviewpaginationlist_p.h @@ -6,7 +6,7 @@ #include <qplacepaginationlist.h> #include "qdeclarativereview_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeReviewPaginationList : public QObject { @@ -51,8 +51,8 @@ private: QPlacePaginationList<QPlaceReview> m_src; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeReviewPaginationList)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeReviewPaginationList)); #endif // QDECLARATIVEREVIEWPAGINATIONLIST_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresult.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchresult.cpp index d549242a..c7cfd4dd 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchresult.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchresult.cpp @@ -1,6 +1,6 @@ #include "qdeclarativesearchresult_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass SearchResult diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresult_p.h b/src/imports/location/declarativeplaces/qdeclarativesearchresult_p.h index ea620929..94c95823 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchresult_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativesearchresult_p.h @@ -6,7 +6,7 @@ #include <qplacesearchresult.h> #include "qdeclarativeplace_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeSearchResult : public QObject { @@ -76,8 +76,8 @@ private: QPlaceSearchResult m_src; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeSearchResult)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeSearchResult)); #endif // QDECLARATIVESEARCHRESULT_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp index dbc3d50e..0c427692 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp @@ -1,6 +1,6 @@ #include "qdeclarativesearchresultmodel_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass SearchResultModel QDeclarativeSearchResultModel diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h index 288d2f20..4b017c83 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h @@ -11,7 +11,7 @@ #include "qdeclarativegeoboundingbox_p.h" #include "qdeclarativesearchresult_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeSearchResultModel : public QAbstractListModel { @@ -98,6 +98,6 @@ private: QPlaceSearchReply *m_response; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QDECLARATIVESEARCHRESULTMODEL_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp b/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp index 707c34e7..b9962c93 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp @@ -1,6 +1,6 @@ #include "qdeclarativesupplier_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass Supplier diff --git a/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h b/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h index 0951250b..6cf7acc0 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h @@ -5,7 +5,7 @@ #include <QtDeclarative/qdeclarative.h> #include <qplacesupplier.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeSupplier : public QObject { @@ -43,8 +43,8 @@ private: QPlaceSupplier m_src; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeSupplier)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeSupplier)); #endif // QDECLARATIVESUPPLIER_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp index dbf450af..df4b958e 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp @@ -2,7 +2,7 @@ #include <qplacemanager.h> -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass SupportedCategoryModel QDeclarativeSupportedCategoriesModel diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h index 0c3f2de3..91e93c1e 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h @@ -11,7 +11,7 @@ #include "qdeclarativecategory_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeSupportedCategoriesModel : public QAbstractListModel { @@ -53,8 +53,8 @@ private: QMap<QString, QDeclarativeCategory*> m_categoryMap; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeSupportedCategoriesModel)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeSupportedCategoriesModel)); #endif // QDECLARATIVESUPPORTEDCATEGORIESMODEL_H diff --git a/src/imports/location/declarativeplaces/qdeclarativetextpredictionmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativetextpredictionmodel.cpp index a4789875..60909134 100644 --- a/src/imports/location/declarativeplaces/qdeclarativetextpredictionmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativetextpredictionmodel.cpp @@ -3,7 +3,7 @@ #include <qplacemanager.h> #include <qplacesearchquery.h> -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass TextPredictionModel QDeclarativeTextPredictionModel diff --git a/src/imports/location/declarativeplaces/qdeclarativetextpredictionmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativetextpredictionmodel_p.h index 14a6a838..d522748f 100644 --- a/src/imports/location/declarativeplaces/qdeclarativetextpredictionmodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativetextpredictionmodel_p.h @@ -11,7 +11,7 @@ #include "qdeclarativecoordinate_p.h" #include "qdeclarativegeoboundingbox_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeTextPredictionModel : public QAbstractListModel { @@ -82,8 +82,8 @@ private: QPlaceTextPredictionReply *m_response; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeTextPredictionModel)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeTextPredictionModel)); #endif // QDECLARATIVETEXTPREDICTIONMODEL_P_H diff --git a/src/imports/location/declarativeplaces/qdeclarativeweekdayhours.cpp b/src/imports/location/declarativeplaces/qdeclarativeweekdayhours.cpp index bcc9ab8e..ab674d5d 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeweekdayhours.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeweekdayhours.cpp @@ -1,6 +1,6 @@ #include "qdeclarativeweekdayhours_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass WeekdayHours diff --git a/src/imports/location/declarativeplaces/qdeclarativeweekdayhours_p.h b/src/imports/location/declarativeplaces/qdeclarativeweekdayhours_p.h index 0f65fe6f..630d1cb1 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeweekdayhours_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeweekdayhours_p.h @@ -7,7 +7,7 @@ #include "qdeclarativeperiod_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeWeekdayHours : public QObject { @@ -38,8 +38,8 @@ private: QPlaceWeekdayHours m_weekdayHours; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeWeekdayHours)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeWeekdayHours)); #endif // QDECLARATIVEWEEKDAYHOURS_P_H diff --git a/src/imports/location/qdeclarativegeoboundingarea_p.h b/src/imports/location/qdeclarativegeoboundingarea_p.h index 54229e72..824c90d1 100644 --- a/src/imports/location/qdeclarativegeoboundingarea_p.h +++ b/src/imports/location/qdeclarativegeoboundingarea_p.h @@ -48,7 +48,7 @@ #include <QPointer> #include <QtDeclarative/qdeclarative.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoBoundingArea : public QObject { @@ -58,7 +58,7 @@ public: QDeclarativeGeoBoundingArea(QObject *parent) :QObject(parent){} }; -QTM_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoBoundingArea)); +QT_END_NAMESPACE +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoBoundingArea)); #endif diff --git a/src/imports/location/qdeclarativegeolocation.cpp b/src/imports/location/qdeclarativegeolocation.cpp index c8db0a2d..04dcd20d 100644 --- a/src/imports/location/qdeclarativegeolocation.cpp +++ b/src/imports/location/qdeclarativegeolocation.cpp @@ -1,6 +1,6 @@ #include "qdeclarativegeolocation_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! \qmlclass Location diff --git a/src/imports/location/qdeclarativegeolocation_p.h b/src/imports/location/qdeclarativegeolocation_p.h index 6a75cbd5..6e103b11 100644 --- a/src/imports/location/qdeclarativegeolocation_p.h +++ b/src/imports/location/qdeclarativegeolocation_p.h @@ -9,7 +9,7 @@ #include "qdeclarativegeoaddress_p.h" #include "qdeclarativealternativevalue_p.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QDeclarativeGeoLocation : public QObject { @@ -84,8 +84,8 @@ private: QGeoLocation m_src; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -QML_DECLARE_TYPE(QTM_PREPEND_NAMESPACE(QDeclarativeGeoLocation)); +QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeGeoLocation)); #endif // QDECLARATIVELOCATION_P_H diff --git a/src/location/maps/qgeosearchmanager.h b/src/location/maps/qgeosearchmanager.h index ad53179a..8255afa7 100644 --- a/src/location/maps/qgeosearchmanager.h +++ b/src/location/maps/qgeosearchmanager.h @@ -95,8 +95,6 @@ private: friend class QGeoServiceProvider; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoSearchManager::SearchTypes) - QT_END_NAMESPACE #endif 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 diff --git a/src/location/qgeolocation.cpp b/src/location/qgeolocation.cpp index 1bab1192..b9822eab 100644 --- a/src/location/qgeolocation.cpp +++ b/src/location/qgeolocation.cpp @@ -42,7 +42,7 @@ #include "qgeolocation.h" #include "qgeolocation_p.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE QGeoLocationPrivate::QGeoLocationPrivate() : QSharedData(), diff --git a/src/location/qgeolocation.h b/src/location/qgeolocation.h index 141da311..c39ed94f 100644 --- a/src/location/qgeolocation.h +++ b/src/location/qgeolocation.h @@ -52,7 +52,7 @@ #include "qmobilityglobal.h" #include "qplacealternativevalue.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoLocationPrivate; @@ -94,6 +94,6 @@ private: QSharedDataPointer<QGeoLocationPrivate> d; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/location/qgeolocation_p.h b/src/location/qgeolocation_p.h index 120f1600..c395b077 100644 --- a/src/location/qgeolocation_p.h +++ b/src/location/qgeolocation_p.h @@ -46,7 +46,7 @@ #include "qgeolocation.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QGeoLocationPrivate : public QSharedData { @@ -69,6 +69,6 @@ public: QGeoBoundingBox viewport; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif diff --git a/src/plugins/places/nokia/placemanagerenginefactory_nokia.h b/src/plugins/places/nokia/placemanagerenginefactory_nokia.h index 23d0ad85..cf7a3a8b 100644 --- a/src/plugins/places/nokia/placemanagerenginefactory_nokia.h +++ b/src/plugins/places/nokia/placemanagerenginefactory_nokia.h @@ -52,7 +52,7 @@ #include <qplacemanagerenginefactory.h> #include <QObject> -QTM_USE_NAMESPACE +QT_USE_NAMESPACE class PlaceManagerEngineFactoryNokia : public QObject, public QPlaceManagerEngineFactory { diff --git a/src/plugins/places/nokia/qplacecategoriesrepository.cpp b/src/plugins/places/nokia/qplacecategoriesrepository.cpp index 04181386..e78ab519 100644 --- a/src/plugins/places/nokia/qplacecategoriesrepository.cpp +++ b/src/plugins/places/nokia/qplacecategoriesrepository.cpp @@ -51,7 +51,7 @@ #include "qplacerestmanager.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE static QMap<QString, QString> categoriesMap; static QPlaceCategory *secondSearchCenter = NULL; diff --git a/src/plugins/places/nokia/qplacecategoriesrepository.h b/src/plugins/places/nokia/qplacecategoriesrepository.h index a7e6fac1..e0a14725 100644 --- a/src/plugins/places/nokia/qplacecategoriesrepository.h +++ b/src/plugins/places/nokia/qplacecategoriesrepository.h @@ -59,7 +59,7 @@ #include "qplacejsoncategoriesparser.h" #include "qplacecategoriesreplyimpl.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceCategoriesRepository : public QObject { @@ -90,6 +90,6 @@ private: QPointer<QPlaceCategoriesReplyImpl> categoriesReply; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACECATEGORIESREPOSITORY_H diff --git a/src/plugins/places/nokia/qplacedetailsreplyimpl.cpp b/src/plugins/places/nokia/qplacedetailsreplyimpl.cpp index 09a5b0d0..ce8a7b2b 100644 --- a/src/plugins/places/nokia/qplacedetailsreplyimpl.cpp +++ b/src/plugins/places/nokia/qplacedetailsreplyimpl.cpp @@ -52,7 +52,7 @@ #include <QDebug> #endif -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! Constructor. diff --git a/src/plugins/places/nokia/qplacedetailsreplyimpl.h b/src/plugins/places/nokia/qplacedetailsreplyimpl.h index 879613c8..e08233e9 100644 --- a/src/plugins/places/nokia/qplacedetailsreplyimpl.h +++ b/src/plugins/places/nokia/qplacedetailsreplyimpl.h @@ -56,7 +56,7 @@ #include "qplacerestreply.h" #include "qplacejsondetailsparser.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceDetailsReplyImpl : public QPlaceDetailsReply { @@ -80,6 +80,6 @@ private: QPlaceJSonDetailsParser *parser; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACEDETAILSREPLYIMPL_H diff --git a/src/plugins/places/nokia/qplacejsoncategoriesparser.cpp b/src/plugins/places/nokia/qplacejsoncategoriesparser.cpp index 33f9be4e..f397c366 100644 --- a/src/plugins/places/nokia/qplacejsoncategoriesparser.cpp +++ b/src/plugins/places/nokia/qplacejsoncategoriesparser.cpp @@ -65,7 +65,7 @@ static const char *place_category_id_element = "name"; static const char *place_group_element = "group"; static const char *place_groupingcategory_element = "groupingCategory"; -QTM_USE_NAMESPACE +QT_USE_NAMESPACE QPlaceJSonCategoriesParser::QPlaceJSonCategoriesParser(QObject *parent) : QPlaceJSonParser(parent) diff --git a/src/plugins/places/nokia/qplacejsoncategoriesparser.h b/src/plugins/places/nokia/qplacejsoncategoriesparser.h index 6b7fb021..c6c95717 100644 --- a/src/plugins/places/nokia/qplacejsoncategoriesparser.h +++ b/src/plugins/places/nokia/qplacejsoncategoriesparser.h @@ -59,7 +59,7 @@ class QScriptEngine; class QScriptValue; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceJSonCategoriesParser : public QPlaceJSonParser { @@ -81,6 +81,6 @@ private: QList<QPlaceCategory> allCategories; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACEJSONCATEGORIESPARSER_H diff --git a/src/plugins/places/nokia/qplacejsondetailsparser.cpp b/src/plugins/places/nokia/qplacejsondetailsparser.cpp index daa1cb0a..758653e6 100644 --- a/src/plugins/places/nokia/qplacejsondetailsparser.cpp +++ b/src/plugins/places/nokia/qplacejsondetailsparser.cpp @@ -187,7 +187,7 @@ static const char *place_premiumcontent_content_friday = "FRI"; static const char *place_premiumcontent_content_saturday = "SAT"; static const char *place_premiumcontent_content_sunday = "SUN"; -QTM_USE_NAMESPACE +QT_USE_NAMESPACE QPlaceJSonDetailsParser::QPlaceJSonDetailsParser(QObject *parent) : QPlaceJSonParser(parent) diff --git a/src/plugins/places/nokia/qplacejsondetailsparser.h b/src/plugins/places/nokia/qplacejsondetailsparser.h index 4c2e7fb9..e63363d6 100644 --- a/src/plugins/places/nokia/qplacejsondetailsparser.h +++ b/src/plugins/places/nokia/qplacejsondetailsparser.h @@ -58,7 +58,7 @@ class QScriptEngine; class QScriptValue; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceJSonDetailsParser : public QPlaceJSonParser { @@ -115,6 +115,6 @@ private: QGeoPlace place; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACEJSONDETAILSPARSER_H diff --git a/src/plugins/places/nokia/qplacejsonmediaparser.cpp b/src/plugins/places/nokia/qplacejsonmediaparser.cpp index eb0c7856..6ab7f960 100644 --- a/src/plugins/places/nokia/qplacejsonmediaparser.cpp +++ b/src/plugins/places/nokia/qplacejsonmediaparser.cpp @@ -67,7 +67,7 @@ static const char *media_url = "url"; static const char *media_provider_id = "provider"; static const char *media_provider_name = "providerDisplayName"; -QTM_USE_NAMESPACE +QT_USE_NAMESPACE QPlaceJSonMediaParser::QPlaceJSonMediaParser(QObject *parent) : QPlaceJSonParser(parent), diff --git a/src/plugins/places/nokia/qplacejsonmediaparser.h b/src/plugins/places/nokia/qplacejsonmediaparser.h index 8b16fe62..28265994 100644 --- a/src/plugins/places/nokia/qplacejsonmediaparser.h +++ b/src/plugins/places/nokia/qplacejsonmediaparser.h @@ -58,7 +58,7 @@ class QScriptEngine; class QScriptValue; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceJSonMediaParser : public QPlaceJSonParser { @@ -80,6 +80,6 @@ private: int allMedia; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACEJSONMEDIAPARSER_H diff --git a/src/plugins/places/nokia/qplacejsonrecommendationparser.cpp b/src/plugins/places/nokia/qplacejsonrecommendationparser.cpp index 9293b4e9..c596fe59 100644 --- a/src/plugins/places/nokia/qplacejsonrecommendationparser.cpp +++ b/src/plugins/places/nokia/qplacejsonrecommendationparser.cpp @@ -64,7 +64,7 @@ static const char *recommendations_nearby_element = "nearby"; static const char *recommendations_distance_element = "distance"; static const char *recommendations_place_element = "place"; -QTM_USE_NAMESPACE +QT_USE_NAMESPACE QPlaceJSonRecommendationParser::QPlaceJSonRecommendationParser(QObject *parent) : QPlaceJSonParser(parent) diff --git a/src/plugins/places/nokia/qplacejsonrecommendationparser.h b/src/plugins/places/nokia/qplacejsonrecommendationparser.h index 0106c269..09f6d783 100644 --- a/src/plugins/places/nokia/qplacejsonrecommendationparser.h +++ b/src/plugins/places/nokia/qplacejsonrecommendationparser.h @@ -58,7 +58,7 @@ class QScriptEngine; class QScriptValue; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceJSonRecommendationParser : public QPlaceJSonParser { @@ -77,6 +77,6 @@ private: QList<QPlaceSearchResult> searchResults; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACEJSONRECOMENDATIONPARSER_H diff --git a/src/plugins/places/nokia/qplacejsonreviewparser.cpp b/src/plugins/places/nokia/qplacejsonreviewparser.cpp index 9f6a4b3c..447536a8 100644 --- a/src/plugins/places/nokia/qplacejsonreviewparser.cpp +++ b/src/plugins/places/nokia/qplacejsonreviewparser.cpp @@ -77,7 +77,7 @@ static const char *review_vendor_element = "vendor"; static const char *review_vendorname_element = "vendorDisplayName"; static const char *review_vendoricon_element = "vendorIconUrl"; -QTM_USE_NAMESPACE +QT_USE_NAMESPACE QPlaceJSonReviewParser::QPlaceJSonReviewParser(QObject *parent) : QPlaceJSonParser(parent), diff --git a/src/plugins/places/nokia/qplacejsonreviewparser.h b/src/plugins/places/nokia/qplacejsonreviewparser.h index dbd1d028..a72dac1b 100644 --- a/src/plugins/places/nokia/qplacejsonreviewparser.h +++ b/src/plugins/places/nokia/qplacejsonreviewparser.h @@ -58,7 +58,7 @@ class QScriptEngine; class QScriptValue; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceJSonReviewParser : public QPlaceJSonParser { @@ -80,6 +80,6 @@ private: int allReviews; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACEJSONREVIEWPARSER_H diff --git a/src/plugins/places/nokia/qplacejsonsearchparser.cpp b/src/plugins/places/nokia/qplacejsonsearchparser.cpp index 4064ea1a..307f3325 100644 --- a/src/plugins/places/nokia/qplacejsonsearchparser.cpp +++ b/src/plugins/places/nokia/qplacejsonsearchparser.cpp @@ -105,7 +105,7 @@ static const char *search_properties_address_district = "addrDistrictName"; static const char *search_properties_address_street = "addrStreetName"; static const char *search_properties_address_house_number = "addrHouseNumber"; -QTM_USE_NAMESPACE +QT_USE_NAMESPACE QPlaceJSonSearchParser::QPlaceJSonSearchParser(QObject *parent) : QPlaceJSonParser(parent) diff --git a/src/plugins/places/nokia/qplacejsonsearchparser.h b/src/plugins/places/nokia/qplacejsonsearchparser.h index f14f664c..866c49eb 100644 --- a/src/plugins/places/nokia/qplacejsonsearchparser.h +++ b/src/plugins/places/nokia/qplacejsonsearchparser.h @@ -60,7 +60,7 @@ class QScriptEngine; class QScriptValue; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceJSonSearchParser : public QPlaceJSonParser { @@ -84,6 +84,6 @@ private: QList<QPlaceSearchResult> searchResultsList; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACEJSONSEARCHPARSER_H diff --git a/src/plugins/places/nokia/qplacejsontextpredictionparser.cpp b/src/plugins/places/nokia/qplacejsontextpredictionparser.cpp index acc19895..1b4e64b4 100644 --- a/src/plugins/places/nokia/qplacejsontextpredictionparser.cpp +++ b/src/plugins/places/nokia/qplacejsontextpredictionparser.cpp @@ -54,7 +54,7 @@ #include <QDebug> #endif -QTM_USE_NAMESPACE +QT_USE_NAMESPACE QPlaceJSonTextPredictionParser::QPlaceJSonTextPredictionParser(QObject *parent) : QPlaceJSonParser(parent) diff --git a/src/plugins/places/nokia/qplacejsontextpredictionparser.h b/src/plugins/places/nokia/qplacejsontextpredictionparser.h index 5137817b..d12b087a 100644 --- a/src/plugins/places/nokia/qplacejsontextpredictionparser.h +++ b/src/plugins/places/nokia/qplacejsontextpredictionparser.h @@ -57,7 +57,7 @@ class QScriptEngine; -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceJSonTextPredictionParser : public QPlaceJSonParser { @@ -72,6 +72,6 @@ private: QStringList suggestions; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACEJSONTEXTPREDICTIONPARSER_H diff --git a/src/plugins/places/nokia/qplacemanagerengineimpl.cpp b/src/plugins/places/nokia/qplacemanagerengineimpl.cpp index f3604bd4..5cc08ad0 100644 --- a/src/plugins/places/nokia/qplacemanagerengineimpl.cpp +++ b/src/plugins/places/nokia/qplacemanagerengineimpl.cpp @@ -59,7 +59,7 @@ #include "qplacerestmanager.h" #include "qplacerestreply.h" -QTM_USE_NAMESPACE +QT_USE_NAMESPACE const char *MANAGER_NAME = "com.nokia.places/0.9"; diff --git a/src/plugins/places/nokia/qplacemanagerengineimpl.h b/src/plugins/places/nokia/qplacemanagerengineimpl.h index 1d8d425e..cc1abf0e 100644 --- a/src/plugins/places/nokia/qplacemanagerengineimpl.h +++ b/src/plugins/places/nokia/qplacemanagerengineimpl.h @@ -51,7 +51,7 @@ #include <qplacemanagerengine.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceManagerEngineImpl : public QPlaceManagerEngine { @@ -94,6 +94,6 @@ private slots: void processingFinished(QPlaceReply *reply); }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACEMANAGERENGINEIMPL_H diff --git a/src/plugins/places/nokia/qplacemediareplyimpl.cpp b/src/plugins/places/nokia/qplacemediareplyimpl.cpp index 154fa968..e013d472 100644 --- a/src/plugins/places/nokia/qplacemediareplyimpl.cpp +++ b/src/plugins/places/nokia/qplacemediareplyimpl.cpp @@ -52,7 +52,7 @@ #include <QDebug> #endif -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! Constructor. diff --git a/src/plugins/places/nokia/qplacemediareplyimpl.h b/src/plugins/places/nokia/qplacemediareplyimpl.h index bc9a7237..80b78bc2 100644 --- a/src/plugins/places/nokia/qplacemediareplyimpl.h +++ b/src/plugins/places/nokia/qplacemediareplyimpl.h @@ -56,7 +56,7 @@ #include "qplacerestreply.h" #include "qplacejsonmediaparser.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceMediaReplyImpl : public QPlaceMediaReply { @@ -81,6 +81,6 @@ private: QPlaceJSonMediaParser *parser; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACEMEDIAREPLYIMPL_H diff --git a/src/plugins/places/nokia/qplaceratingreplyimpl.cpp b/src/plugins/places/nokia/qplaceratingreplyimpl.cpp index 64a7cbc8..b71b6c38 100644 --- a/src/plugins/places/nokia/qplaceratingreplyimpl.cpp +++ b/src/plugins/places/nokia/qplaceratingreplyimpl.cpp @@ -54,7 +54,7 @@ #include <QDebug> #endif -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! Constructor. diff --git a/src/plugins/places/nokia/qplaceratingreplyimpl.h b/src/plugins/places/nokia/qplaceratingreplyimpl.h index 799b33b3..b9e9b080 100644 --- a/src/plugins/places/nokia/qplaceratingreplyimpl.h +++ b/src/plugins/places/nokia/qplaceratingreplyimpl.h @@ -55,7 +55,7 @@ #include <qplacereply.h> #include "qplacerestreply.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceRatingReplyImpl : public QPlaceReply { @@ -77,6 +77,6 @@ private: QPlaceRestReply *restReply; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACERATINGREPLYIMPL_H diff --git a/src/plugins/places/nokia/qplacerecommendationreplyimpl.cpp b/src/plugins/places/nokia/qplacerecommendationreplyimpl.cpp index 59a39bea..98bfddab 100644 --- a/src/plugins/places/nokia/qplacerecommendationreplyimpl.cpp +++ b/src/plugins/places/nokia/qplacerecommendationreplyimpl.cpp @@ -52,7 +52,7 @@ #include <QDebug> #endif -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! Constructor. diff --git a/src/plugins/places/nokia/qplacerecommendationreplyimpl.h b/src/plugins/places/nokia/qplacerecommendationreplyimpl.h index a18f0d32..ff689769 100644 --- a/src/plugins/places/nokia/qplacerecommendationreplyimpl.h +++ b/src/plugins/places/nokia/qplacerecommendationreplyimpl.h @@ -56,7 +56,7 @@ #include "qplacerestreply.h" #include "qplacejsonrecommendationparser.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceRecommendationReplyImpl : public QPlaceSearchReply { @@ -80,6 +80,6 @@ private: QPlaceJSonRecommendationParser *parser; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACERECOMMENDATIONREPLYIMPL_H diff --git a/src/plugins/places/nokia/qplacerestmanager.cpp b/src/plugins/places/nokia/qplacerestmanager.cpp index 3213c612..085aa723 100644 --- a/src/plugins/places/nokia/qplacerestmanager.cpp +++ b/src/plugins/places/nokia/qplacerestmanager.cpp @@ -58,7 +58,7 @@ #include <QDebug> #endif -QTM_USE_NAMESPACE +QT_USE_NAMESPACE const char *placesServerUrl = "http://places.maps.ovi.com/rest/v1/places/"; const char *searchServerUrl = "http://where.desktop.mos.svc.ovi.com/NOSe/json"; diff --git a/src/plugins/places/nokia/qplacerestmanager.h b/src/plugins/places/nokia/qplacerestmanager.h index a8f32cab..72162e35 100644 --- a/src/plugins/places/nokia/qplacerestmanager.h +++ b/src/plugins/places/nokia/qplacerestmanager.h @@ -59,7 +59,7 @@ #include <qplacesearchquery.h> #include "qplacerestreply.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceRestManager : public QObject { @@ -94,6 +94,6 @@ private: static QPlaceRestManager *mInstance; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACERESTMANAGER_H diff --git a/src/plugins/places/nokia/qplacerestreply.cpp b/src/plugins/places/nokia/qplacerestreply.cpp index b3c57d81..f08e57f4 100644 --- a/src/plugins/places/nokia/qplacerestreply.cpp +++ b/src/plugins/places/nokia/qplacerestreply.cpp @@ -55,7 +55,7 @@ #include <QDebug> #endif -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! Constructor. diff --git a/src/plugins/places/nokia/qplacerestreply.h b/src/plugins/places/nokia/qplacerestreply.h index ed569c4f..a2ba604a 100644 --- a/src/plugins/places/nokia/qplacerestreply.h +++ b/src/plugins/places/nokia/qplacerestreply.h @@ -57,7 +57,7 @@ #include <qmobilityglobal.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceRestReply : public QObject { @@ -89,6 +89,6 @@ private: friend class QRestManager; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACERESTREPLY_H diff --git a/src/plugins/places/nokia/qplacereviewreplyimpl.cpp b/src/plugins/places/nokia/qplacereviewreplyimpl.cpp index f53b21e7..16588dcc 100644 --- a/src/plugins/places/nokia/qplacereviewreplyimpl.cpp +++ b/src/plugins/places/nokia/qplacereviewreplyimpl.cpp @@ -52,7 +52,7 @@ #include <QDebug> #endif -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! Constructor. diff --git a/src/plugins/places/nokia/qplacereviewreplyimpl.h b/src/plugins/places/nokia/qplacereviewreplyimpl.h index c6adc2e1..fd374074 100644 --- a/src/plugins/places/nokia/qplacereviewreplyimpl.h +++ b/src/plugins/places/nokia/qplacereviewreplyimpl.h @@ -56,7 +56,7 @@ #include "qplacerestreply.h" #include "qplacejsonreviewparser.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceReviewReplyImpl : public QPlaceReviewReply { @@ -81,6 +81,6 @@ private: QPlaceJSonReviewParser *parser; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACEREVIEWREPLYIMPL_H diff --git a/src/plugins/places/nokia/qplacesearchreplyimpl.cpp b/src/plugins/places/nokia/qplacesearchreplyimpl.cpp index 6bb21f20..c0875e5d 100644 --- a/src/plugins/places/nokia/qplacesearchreplyimpl.cpp +++ b/src/plugins/places/nokia/qplacesearchreplyimpl.cpp @@ -52,7 +52,7 @@ #include <QDebug> #endif -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! Constructor. diff --git a/src/plugins/places/nokia/qplacesearchreplyimpl.h b/src/plugins/places/nokia/qplacesearchreplyimpl.h index a28d5b7b..d55973f0 100644 --- a/src/plugins/places/nokia/qplacesearchreplyimpl.h +++ b/src/plugins/places/nokia/qplacesearchreplyimpl.h @@ -56,7 +56,7 @@ #include "qplacerestreply.h" #include "qplacejsonsearchparser.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceSearchReplyImpl : public QPlaceSearchReply { @@ -81,6 +81,6 @@ private: QPlaceJSonSearchParser *parser; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACESEARCHREPLYIMPL_H diff --git a/src/plugins/places/nokia/qplacesuppliersrepository.cpp b/src/plugins/places/nokia/qplacesuppliersrepository.cpp index b08bd372..e60b7b4a 100644 --- a/src/plugins/places/nokia/qplacesuppliersrepository.cpp +++ b/src/plugins/places/nokia/qplacesuppliersrepository.cpp @@ -50,7 +50,7 @@ #include <qplacesupplier.h> -QTM_USE_NAMESPACE +QT_USE_NAMESPACE QPlaceSuppliersRepository *QPlaceSuppliersRepository::instance() { diff --git a/src/plugins/places/nokia/qplacesuppliersrepository.h b/src/plugins/places/nokia/qplacesuppliersrepository.h index 55aad92e..99d21bd8 100644 --- a/src/plugins/places/nokia/qplacesuppliersrepository.h +++ b/src/plugins/places/nokia/qplacesuppliersrepository.h @@ -55,7 +55,7 @@ #include <qplacesupplier.h> #include <qmobilityglobal.h> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceSuppliersRepository : public QObject { @@ -73,6 +73,6 @@ private: QList<QPlaceSupplier> suppliers; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACESUPPLIERSREPOSITORY_H diff --git a/src/plugins/places/nokia/qplacetextpredictionreplyimpl.cpp b/src/plugins/places/nokia/qplacetextpredictionreplyimpl.cpp index 26f22608..49ce4fd2 100644 --- a/src/plugins/places/nokia/qplacetextpredictionreplyimpl.cpp +++ b/src/plugins/places/nokia/qplacetextpredictionreplyimpl.cpp @@ -54,7 +54,7 @@ #include <QDebug> #endif -QTM_USE_NAMESPACE +QT_USE_NAMESPACE /*! Constructor. diff --git a/src/plugins/places/nokia/qplacetextpredictionreplyimpl.h b/src/plugins/places/nokia/qplacetextpredictionreplyimpl.h index cf8878dd..ed6e8e31 100644 --- a/src/plugins/places/nokia/qplacetextpredictionreplyimpl.h +++ b/src/plugins/places/nokia/qplacetextpredictionreplyimpl.h @@ -56,7 +56,7 @@ #include "qplacerestreply.h" #include "qplacejsontextpredictionparser.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QPlaceTextPreditionReplyImpl : public QPlaceTextPredictionReply { @@ -81,6 +81,6 @@ private: QPlaceJSonTextPredictionParser *parser; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QPLACETEXTPREDICTIONREPLYIMPL_H |