Fix qmake warnings

Change-Id: I17265b37a557472fc55fec7e25cd2bf2b3a6dc9d
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

13 files changed, 44 insertions, 43 deletions

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>