diff options
author | Rainer Keller <rainer.keller@digia.com> | 2013-01-16 12:48:14 +0100 |
---|---|---|
committer | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2013-01-17 12:33:55 +0100 |
commit | a316b25f4b4e0743e361031f2e6f1ba8072e704c (patch) | |
tree | 67e3a9bc60f11eb7fcfdff98ceb69d0be09fa389 /src/location | |
parent | 87b2e3a9686948f691b054a39cb6c5d4a4696157 (diff) | |
download | qtlocation-a316b25f4b4e0743e361031f2e6f1ba8072e704c.tar.gz |
Fix qmake warnings
Change-Id: I17265b37a557472fc55fec7e25cd2bf2b3a6dc9d
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'src/location')
27 files changed, 68 insertions, 61 deletions
diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h index c1f467ff..e5da9092 100644 --- a/src/location/maps/qgeocodingmanager.h +++ b/src/location/maps/qgeocodingmanager.h @@ -42,8 +42,8 @@ #ifndef QGEOCODINGMANAGER_H #define QGEOCODINGMANAGER_H -#include "qgeocodereply.h" -#include "qgeorectangle.h" +#include <QtLocation/QGeocodeReply> +#include <QtLocation/QGeoRectangle> #include <QObject> #include <QList> diff --git a/src/location/maps/qgeoprojection_p.h b/src/location/maps/qgeoprojection_p.h index 1b4d069c..1a15c6c9 100644 --- a/src/location/maps/qgeoprojection_p.h +++ b/src/location/maps/qgeoprojection_p.h @@ -57,7 +57,7 @@ #endif #include "qglobal.h" -#include "QtLocation/qlocationglobal.h" +#include <QtLocation/QLocationGlobal> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h index bbdd8ae3..4eacadc3 100644 --- a/src/location/maps/qgeoroute.h +++ b/src/location/maps/qgeoroute.h @@ -42,8 +42,8 @@ #ifndef QGEOROUTE_H #define QGEOROUTE_H -#include "qgeocoordinate.h" -#include "qgeorouterequest.h" +#include <QtLocation/QGeoCoordinate> +#include <QtLocation/QGeoRouteRequest> #include <QExplicitlySharedDataPointer> #include <QList> diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h index 831467ea..c8c0be2b 100644 --- a/src/location/maps/qgeoroutereply.h +++ b/src/location/maps/qgeoroutereply.h @@ -42,7 +42,7 @@ #ifndef QGEOROUTEREPLY_H #define QGEOROUTEREPLY_H -#include "qgeoroute.h" +#include <QtLocation/QGeoRoute> #include <QList> #include <QObject> diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h index aece8acd..f3144de4 100644 --- a/src/location/maps/qgeoroutingmanager.h +++ b/src/location/maps/qgeoroutingmanager.h @@ -42,8 +42,8 @@ #ifndef QGEOROUTINGMANAGER_H #define QGEOROUTINGMANAGER_H -#include "qgeorouterequest.h" -#include "qgeoroutereply.h" +#include <QtLocation/QGeoRouteRequest> +#include <QtLocation/QGeoRouteReply> #include <QObject> #include <QMap> diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h index 6c966f2d..bb4171ed 100644 --- a/src/location/maps/qgeoroutingmanagerengine.h +++ b/src/location/maps/qgeoroutingmanagerengine.h @@ -42,8 +42,8 @@ #ifndef QGEOROUTINGMANAGERENGINE_H #define QGEOROUTINGMANAGERENGINE_H -#include "qgeorouterequest.h" -#include "qgeoroutereply.h" +#include <QtLocation/QGeoRouteRequest> +#include <QtLocation/QGeoRouteReply> #include <QObject> #include <QMap> diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h index 24bfcc56..216946da 100644 --- a/src/location/maps/qgeoserviceproviderfactory.h +++ b/src/location/maps/qgeoserviceproviderfactory.h @@ -42,7 +42,7 @@ #ifndef QGEOSERVICEPROVIDERFACTORY_H #define QGEOSERVICEPROVIDERFACTORY_H -#include "qgeoserviceprovider.h" +#include <QtLocation/QGeoServiceProvider> #include <QtPlugin> #include <QMap> diff --git a/src/location/places/qplace.h b/src/location/places/qplace.h index 45b0d327..23c67ae6 100644 --- a/src/location/places/qplace.h +++ b/src/location/places/qplace.h @@ -43,18 +43,16 @@ #define QPLACE_H #include <QtCore/QSharedDataPointer> -#include <QtLocation/qtlocation.h> - -#include "qgeoaddress.h" -#include "qgeorectangle.h" -#include "qgeocoordinate.h" -#include "qgeolocation.h" -#include "qplacecategory.h" -#include "qplacecontent.h" -#include "qplaceratings.h" -#include "qplacereview.h" -#include "qplaceattribute.h" -#include "qplacecontactdetail.h" +#include <QtLocation/QGeoAddress> +#include <QtLocation/QGeoRectangle> +#include <QtLocation/QGeoCoordinate> +#include <QtLocation/QGeoLocation> +#include <QtLocation/QPlaceCategory> +#include <QtLocation/QPlaceContent> +#include <QtLocation/QPlaceRatings> +#include <QtLocation/QPlaceReview> +#include <QtLocation/QPlaceAttribute> +#include <QtLocation/QPlaceContactDetail> QT_BEGIN_HEADER diff --git a/src/location/places/qplacecontentreply.h b/src/location/places/qplacecontentreply.h index 263473d6..e14e3c32 100644 --- a/src/location/places/qplacecontentreply.h +++ b/src/location/places/qplacecontentreply.h @@ -42,9 +42,9 @@ #ifndef QPLACECONTENTREPLY_H #define QPLACECONTENTREPLY_H -#include "qplacereply.h" -#include "qplacecontent.h" -#include "qplacecontentrequest.h" +#include <QtLocation/QPlaceReply> +#include <QtLocation/QPlaceContent> +#include <QtLocation/QPlaceContentRequest> QT_BEGIN_HEADER diff --git a/src/location/places/qplacecontentrequest.h b/src/location/places/qplacecontentrequest.h index 7d76989b..0ed5d630 100644 --- a/src/location/places/qplacecontentrequest.h +++ b/src/location/places/qplacecontentrequest.h @@ -44,7 +44,7 @@ #include <QSharedDataPointer> -#include "qplacecontent.h" +#include <QtLocation/QPlaceContent> QT_BEGIN_HEADER diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h index 1cca8bb6..8950b689 100644 --- a/src/location/places/qplacedetailsreply.h +++ b/src/location/places/qplacedetailsreply.h @@ -42,8 +42,8 @@ #ifndef QPLACEDETAILSREPLY_H #define QPLACEDETAILSREPLY_H -#include "qplacereply.h" -#include "qplace.h" +#include <QtLocation/QPlaceReply> +#include <QtLocation/QPlace> QT_BEGIN_HEADER diff --git a/src/location/places/qplaceidreply.h b/src/location/places/qplaceidreply.h index 6967b6a8..a28d805b 100644 --- a/src/location/places/qplaceidreply.h +++ b/src/location/places/qplaceidreply.h @@ -42,8 +42,8 @@ #ifndef QPLACEIDREPLY_H #define QPLACEIDREPLY_H -#include "qplacereply.h" -#include "qplace.h" +#include <QtLocation/QPlaceReply> +#include <QtLocation/QPlace> QT_BEGIN_HEADER diff --git a/src/location/places/qplaceimage.h b/src/location/places/qplaceimage.h index 5e6a5770..d8be3123 100644 --- a/src/location/places/qplaceimage.h +++ b/src/location/places/qplaceimage.h @@ -44,8 +44,8 @@ #include <QSharedDataPointer> #include <QString> -#include "qplacesupplier.h" -#include "qplacecontent.h" +#include <QtLocation/QPlaceSupplier> +#include <QtLocation/QPlaceContent> QT_BEGIN_HEADER diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h index 414f807f..efd22ccd 100644 --- a/src/location/places/qplacemanager.h +++ b/src/location/places/qplacemanager.h @@ -42,16 +42,16 @@ #ifndef QPLACEMANAGER_H #define QPLACEMANAGER_H -#include "qplacecontentreply.h" -#include "qplacecontentrequest.h" -#include "qplaceidreply.h" -#include "qplacereply.h" -#include "qplacedetailsreply.h" -#include "qplacematchreply.h" -#include "qplacematchrequest.h" -#include "qplacesearchsuggestionreply.h" -#include "qplacesearchrequest.h" -#include "qplacesearchresult.h" +#include <QtLocation/QPlaceContentReply> +#include <QtLocation/QPlaceContentRequest> +#include <QtLocation/QPlaceIdReply> +#include <QtLocation/QPlaceReply> +#include <QtLocation/QPlaceDetailsReply> +#include <QtLocation/QPlaceMatchReply> +#include <QtLocation/QPlaceMatchRequest> +#include <QtLocation/QPlaceSearchSuggestionReply> +#include <QtLocation/QPlaceSearchRequest> +#include <QtLocation/QPlaceSearchResult> #include <QLocale> #include <QVector> diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h index 508d2e5f..d9e66e61 100644 --- a/src/location/places/qplacemanagerengine.h +++ b/src/location/places/qplacemanagerengine.h @@ -42,13 +42,18 @@ #ifndef QPLACEMANAGERENGINE_H #define QPLACEMANAGERENGINE_H -#include "qplacemanager.h" +#include <QtLocation/QPlaceManager> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QPlaceManagerEnginePrivate; +class QPlaceMatchReply; +class QPlaceMatchRequest; +class QPlaceSearchReply; +class QPlaceSearchRequest; +class QPlaceSearchSuggestionReply; class Q_LOCATION_EXPORT QPlaceManagerEngine : public QObject { diff --git a/src/location/places/qplacematchreply.h b/src/location/places/qplacematchreply.h index fbea1cd4..2dc126f4 100644 --- a/src/location/places/qplacematchreply.h +++ b/src/location/places/qplacematchreply.h @@ -42,8 +42,8 @@ #ifndef QPLACEMATCHREPLY_H #define QPLACEMATCHREPLY_H -#include "qplacereply.h" -#include "qplacematchrequest.h" +#include <QtLocation/QPlaceReply> +#include <QtLocation/QPlaceMatchRequest> QT_BEGIN_HEADER diff --git a/src/location/places/qplacematchrequest.h b/src/location/places/qplacematchrequest.h index 3443307d..41fb12e2 100644 --- a/src/location/places/qplacematchrequest.h +++ b/src/location/places/qplacematchrequest.h @@ -43,9 +43,7 @@ #define QPLACEMATCHREQUEST_H #include <QtCore/QSharedDataPointer> -#include <QtLocation/qtlocation.h> - -#include "qplacesearchresult.h" +#include <QtLocation/QPlaceSearchResult> QT_BEGIN_HEADER diff --git a/src/location/places/qplacereview.h b/src/location/places/qplacereview.h index 65d7246f..09e9d493 100644 --- a/src/location/places/qplacereview.h +++ b/src/location/places/qplacereview.h @@ -42,7 +42,7 @@ #ifndef QPLACEREVIEW_H #define QPLACEREVIEW_H -#include "qplacecontent.h" +#include <QtLocation/QPlaceContent> QT_BEGIN_HEADER diff --git a/src/location/places/qplacesearchreply.h b/src/location/places/qplacesearchreply.h index c9bb63b8..2f062859 100644 --- a/src/location/places/qplacesearchreply.h +++ b/src/location/places/qplacesearchreply.h @@ -42,9 +42,9 @@ #ifndef QPLACESEARCHREPLY_H #define QPLACESEARCHREPLY_H -#include "qplacereply.h" -#include "qplacesearchresult.h" -#include "qplacesearchrequest.h" +#include <QtLocation/QPlaceReply> +#include <QtLocation/QPlaceSearchResult> +#include <QtLocation/QPlaceSearchRequest> QT_BEGIN_HEADER diff --git a/src/location/places/qplacesearchsuggestionreply.h b/src/location/places/qplacesearchsuggestionreply.h index 21ed2c82..a39798d7 100644 --- a/src/location/places/qplacesearchsuggestionreply.h +++ b/src/location/places/qplacesearchsuggestionreply.h @@ -42,7 +42,7 @@ #ifndef QPLACESEARCHSUGGESTIONREPLY_H #define QPLACESEARCHSUGGESTIONREPLY_H -#include "qplacereply.h" +#include <QtLocation/QPlaceReply> #include <QStringList> diff --git a/src/location/qgeoareamonitor.h b/src/location/qgeoareamonitor.h index 35a9ef7c..04bba8d1 100644 --- a/src/location/qgeoareamonitor.h +++ b/src/location/qgeoareamonitor.h @@ -41,7 +41,7 @@ #ifndef QGEOAREAMONITOR_H #define QGEOAREAMONITOR_H -#include "qgeocoordinate.h" +#include <QtLocation/QGeoCoordinate> #include <QObject> diff --git a/src/location/qgeopositioninfo.h b/src/location/qgeopositioninfo.h index aba8585e..9a7f4c8f 100644 --- a/src/location/qgeopositioninfo.h +++ b/src/location/qgeopositioninfo.h @@ -41,7 +41,7 @@ #ifndef QGEOPOSITIONINFO_H #define QGEOPOSITIONINFO_H -#include "qgeocoordinate.h" +#include <QtLocation/QGeoCoordinate> #include <QDateTime> diff --git a/src/location/qgeopositioninfosource.h b/src/location/qgeopositioninfosource.h index 63817a1b..574bee21 100644 --- a/src/location/qgeopositioninfosource.h +++ b/src/location/qgeopositioninfosource.h @@ -41,7 +41,7 @@ #ifndef QGEOPOSITIONINFOSOURCE_H #define QGEOPOSITIONINFOSOURCE_H -#include "qgeopositioninfo.h" +#include <QtLocation/QGeoPositionInfo> #include <QObject> diff --git a/src/location/qgeopositioninfosourcefactory.h b/src/location/qgeopositioninfosourcefactory.h index 48ae717f..69a94922 100644 --- a/src/location/qgeopositioninfosourcefactory.h +++ b/src/location/qgeopositioninfosourcefactory.h @@ -42,8 +42,8 @@ #ifndef QGEOPOSITIONINFOSOURCEFACTORY_H #define QGEOPOSITIONINFOSOURCEFACTORY_H -#include "qgeopositioninfosource.h" -#include "qgeosatelliteinfosource.h" +#include <QtLocation/QGeoPositionInfoSource> +#include <QtLocation/QGeoSatelliteInfoSource> #include <QList> QT_BEGIN_HEADER diff --git a/src/location/qgeosatelliteinfosource.h b/src/location/qgeosatelliteinfosource.h index 0b11ff34..bba84f1c 100644 --- a/src/location/qgeosatelliteinfosource.h +++ b/src/location/qgeosatelliteinfosource.h @@ -41,7 +41,7 @@ #ifndef QGEOSATELLITEINFOSOURCE_H #define QGEOSATELLITEINFOSOURCE_H -#include "qgeosatelliteinfo.h" +#include <QtLocation/QGeoSatelliteInfo> #include <QObject> #include <QList> diff --git a/src/location/qlocationglobal.h b/src/location/qlocationglobal.h index a2723cb1..57d95820 100644 --- a/src/location/qlocationglobal.h +++ b/src/location/qlocationglobal.h @@ -43,6 +43,9 @@ #include <QtCore/qglobal.h> +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + #ifndef QT_STATIC # if defined(QT_BUILD_LOCATION_LIB) # define Q_LOCATION_EXPORT Q_DECL_EXPORT @@ -53,5 +56,8 @@ # define Q_LOCATION_EXPORT #endif +QT_END_NAMESPACE +QT_END_HEADER + #endif // QLOCATIONGLOBAL_H diff --git a/src/location/qnmeapositioninfosource.h b/src/location/qnmeapositioninfosource.h index 606cbbde..f51e706a 100644 --- a/src/location/qnmeapositioninfosource.h +++ b/src/location/qnmeapositioninfosource.h @@ -41,7 +41,7 @@ #ifndef QNMEAPOSITIONINFOSOURCE_H #define QNMEAPOSITIONINFOSOURCE_H -#include "qgeopositioninfosource.h" +#include <QtLocation/QGeoPositionInfoSource> QT_BEGIN_HEADER |