diff options
| author | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2013-02-01 12:53:04 +1000 |
|---|---|---|
| committer | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2013-02-03 12:17:12 +0100 |
| commit | 3a598fcfa09551f3476b19549f02251aa44fefb7 (patch) | |
| tree | ca0a5a79d281c5025a91f581619e51f12d88b25c /src/plugins/position/simulator | |
| parent | 7c875c46d43cf9eb06714b8218d4f79159935e2d (diff) | |
| download | qtlocation-3a598fcfa09551f3476b19549f02251aa44fefb7.tar.gz | |
Remove use of QT_{BEGIN,END}_HEADER macros.
These macros were removed from Qt Core and they are no longer defined
causing Qt Location to fail to build.
Change-Id: Ibed30daa1a802957cebe95a577dfe86f0f643970
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Diffstat (limited to 'src/plugins/position/simulator')
4 files changed, 1 insertions, 10 deletions
diff --git a/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h b/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h index b8299bef..7818176b 100644 --- a/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h +++ b/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h @@ -46,9 +46,8 @@ #include "qgeopositioninfo.h" #include "qlocationdata_simulator_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE + class QTimer; class QGeoPositionInfoSourceSimulator : public QGeoPositionInfoSource diff --git a/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h b/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h index 40c61250..58e414e9 100644 --- a/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h +++ b/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h @@ -49,8 +49,6 @@ #define MINIMUM_UPDATE_INTERVAL 1000 #define DEFAULT_UPDATE_INTERVAL 5000 -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QGeoSatelliteInfoSourceSimulator : public QGeoSatelliteInfoSource diff --git a/src/plugins/position/simulator/qlocationconnection_simulator_p.h b/src/plugins/position/simulator/qlocationconnection_simulator_p.h index 82898494..6cbc18dd 100644 --- a/src/plugins/position/simulator/qlocationconnection_simulator_p.h +++ b/src/plugins/position/simulator/qlocationconnection_simulator_p.h @@ -44,11 +44,8 @@ #include "qlocationdata_simulator_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE - namespace Simulator { class Connection; diff --git a/src/plugins/position/simulator/qlocationdata_simulator_p.h b/src/plugins/position/simulator/qlocationdata_simulator_p.h index a4f9795e..8ac7dcd7 100644 --- a/src/plugins/position/simulator/qlocationdata_simulator_p.h +++ b/src/plugins/position/simulator/qlocationdata_simulator_p.h @@ -57,7 +57,6 @@ #include <QtCore/QDateTime> #include <QtCore/QList> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE struct QGeoPositionInfoData @@ -119,6 +118,4 @@ Q_DECLARE_METATYPE(QGeoPositionInfoData) Q_DECLARE_METATYPE(QGeoSatelliteInfoData) Q_DECLARE_METATYPE(QGeoSatelliteInfoData::SatelliteInfo) -QT_END_HEADER - #endif // QGEOPOSITIONINFODATA_SIMULATOR_P_H |