diff options
author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-05-26 11:38:26 -0500 |
---|---|---|
committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-05-26 11:38:26 -0500 |
commit | 323b91f4622ee53db7a2888addce471362a8cb87 (patch) | |
tree | 58f6f3d191f3976d3e02495ca7faa43a971ed859 | |
parent | b0ae24095376bf51916f1764a0d48a607bf8bdb2 (diff) | |
download | qtlocation-323b91f4622ee53db7a2888addce471362a8cb87.tar.gz |
Fix incorrect mix of private header includes
We only use local includes ("") when the private headers
are in our current projects relative path, and system includes
(<>) when the compiler should find the headers based on
projects include paths.
-rw-r--r-- | src/imports/location/qdeclarativelandmarkcategorymodel_p.h | 8 | ||||
-rw-r--r-- | src/imports/location/qdeclarativelandmarkfilters_p.h | 4 | ||||
-rw-r--r-- | src/imports/location/qdeclarativelandmarkmodel_p.h | 4 | ||||
-rw-r--r-- | src/imports/location/qdeclarativeposition_p.h | 2 | ||||
-rw-r--r-- | src/location/landmarks/qlandmark.cpp | 2 | ||||
-rw-r--r-- | src/location/landmarks/qlandmark_p.h | 2 | ||||
-rw-r--r-- | src/location/maps/qgeomapdata.cpp | 2 | ||||
-rw-r--r-- | src/location/maps/qgeomapdata_p.h | 2 | ||||
-rw-r--r-- | src/location/maps/qgeomapobject.cpp | 2 | ||||
-rw-r--r-- | src/location/maps/qgeomapobjectengine_p.cpp | 4 | ||||
-rw-r--r-- | src/location/maps/tiled/qgeotiledmapdata.cpp | 2 | ||||
-rw-r--r-- | src/location/maps/tiled/qgeotiledmapdata_p.h | 2 |
12 files changed, 18 insertions, 18 deletions
diff --git a/src/imports/location/qdeclarativelandmarkcategorymodel_p.h b/src/imports/location/qdeclarativelandmarkcategorymodel_p.h index fb0f0f20..7531bb16 100644 --- a/src/imports/location/qdeclarativelandmarkcategorymodel_p.h +++ b/src/imports/location/qdeclarativelandmarkcategorymodel_p.h @@ -42,10 +42,10 @@ #ifndef QDECLARATIVELANDMARKCATEGORYMODEL_P_H #define QDECLARATIVELANDMARKCATEGORYMODEL_P_H -#include <qdeclarativelandmark_p.h> -#include <qdeclarativelandmarkmodel_p.h> -#include <qdeclarativelandmarkcategory_p.h> -#include <qdeclarativelandmarkfilters_p.h> +#include "qdeclarativelandmark_p.h" +#include "qdeclarativelandmarkmodel_p.h" +#include "qdeclarativelandmarkcategory_p.h" +#include "qdeclarativelandmarkfilters_p.h" #include <qlandmarkcategory.h> #include <qlandmarkmanager.h> diff --git a/src/imports/location/qdeclarativelandmarkfilters_p.h b/src/imports/location/qdeclarativelandmarkfilters_p.h index e72599b0..4a9368af 100644 --- a/src/imports/location/qdeclarativelandmarkfilters_p.h +++ b/src/imports/location/qdeclarativelandmarkfilters_p.h @@ -44,13 +44,13 @@ #include <qlandmarkintersectionfilter.h> #include <qlandmarkproximityfilter.h> -#include <qdeclarativecoordinate_p.h> +#include "qdeclarativecoordinate_p.h" #include <qlandmarkunionfilter.h> #include <qlandmarknamefilter.h> #include <qlandmarkcategoryfilter.h> #include <qlandmarkboxfilter.h> #include <qlandmarkfilter.h> -#include <qdeclarativelandmarkcategory_p.h> +#include "qdeclarativelandmarkcategory_p.h" #include <QtDeclarative/qdeclarative.h> #include <QDeclarativeListProperty> diff --git a/src/imports/location/qdeclarativelandmarkmodel_p.h b/src/imports/location/qdeclarativelandmarkmodel_p.h index e2f8dd27..7c7e29d2 100644 --- a/src/imports/location/qdeclarativelandmarkmodel_p.h +++ b/src/imports/location/qdeclarativelandmarkmodel_p.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVELANDMARKMODEL_P_H #define QDECLARATIVELANDMARKMODEL_P_H -#include <qdeclarativelandmark_p.h> -#include <qdeclarativelandmarkfilters_p.h> +#include "qdeclarativelandmark_p.h" +#include "qdeclarativelandmarkfilters_p.h" #include <qlandmark.h> #include <qlandmarkmanager.h> diff --git a/src/imports/location/qdeclarativeposition_p.h b/src/imports/location/qdeclarativeposition_p.h index a27931ec..8ae1bf8c 100644 --- a/src/imports/location/qdeclarativeposition_p.h +++ b/src/imports/location/qdeclarativeposition_p.h @@ -46,7 +46,7 @@ #include <QDateTime> #include <qgeopositioninfosource.h> #include <qgeopositioninfo.h> -#include <qdeclarativecoordinate_p.h> +#include "qdeclarativecoordinate_p.h" #include <QtDeclarative/qdeclarative.h> // Define this to get qDebug messages diff --git a/src/location/landmarks/qlandmark.cpp b/src/location/landmarks/qlandmark.cpp index bfb36fba..87623c45 100644 --- a/src/location/landmarks/qlandmark.cpp +++ b/src/location/landmarks/qlandmark.cpp @@ -51,7 +51,7 @@ #include "qgeocoordinate.h" #include "qgeoplace.h" -#include "qgeoplace_p.h" +#include <private/qgeoplace_p.h> #include <QVariant> #include <QStringList> diff --git a/src/location/landmarks/qlandmark_p.h b/src/location/landmarks/qlandmark_p.h index 8c66f7bd..68fd4809 100644 --- a/src/location/landmarks/qlandmark_p.h +++ b/src/location/landmarks/qlandmark_p.h @@ -54,7 +54,7 @@ #include "qlandmark.h" #include "qlandmarkid.h" -#include "qgeoplace_p.h" +#include <private/qgeoplace_p.h> #include <QList> #include <QHash> #include <QSharedData> diff --git a/src/location/maps/qgeomapdata.cpp b/src/location/maps/qgeomapdata.cpp index 47caf1fe..c4e0fdf1 100644 --- a/src/location/maps/qgeomapdata.cpp +++ b/src/location/maps/qgeomapdata.cpp @@ -61,7 +61,7 @@ #include "qgeomapobjectengine_p.h" #include "qgeomapobject_p.h" -#include "projwrapper_p.h" +#include <private/projwrapper_p.h> QTM_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeomapdata_p.h b/src/location/maps/qgeomapdata_p.h index acd33890..3189799d 100644 --- a/src/location/maps/qgeomapdata_p.h +++ b/src/location/maps/qgeomapdata_p.h @@ -59,7 +59,7 @@ #include <QGraphicsItem> #include "qgeocoordinate.h" #include "qgraphicsgeomap.h" -#include "projwrapper_p.h" +#include <private/projwrapper_p.h> #include <QList> QTM_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeomapobject.cpp b/src/location/maps/qgeomapobject.cpp index 02df4cbe..257dbc07 100644 --- a/src/location/maps/qgeomapobject.cpp +++ b/src/location/maps/qgeomapobject.cpp @@ -47,7 +47,7 @@ #include "qgeomapdata_p.h" #include "qgeoboundingbox.h" #include "qgeocoordinate.h" -#include "projwrapper_p.h" +#include <private/projwrapper_p.h> #include <QtAlgorithms> diff --git a/src/location/maps/qgeomapobjectengine_p.cpp b/src/location/maps/qgeomapobjectengine_p.cpp index 333a173d..987651e0 100644 --- a/src/location/maps/qgeomapobjectengine_p.cpp +++ b/src/location/maps/qgeomapobjectengine_p.cpp @@ -42,9 +42,9 @@ #include "qgeomapobjectengine_p.h" #include "qgeomaprouteobject.h" #include "qgeomapcircleobject.h" -#include "qgeocoordinate_p.h" +#include <private/qgeocoordinate_p.h> #include "qgeoboundingbox.h" -#include "projwrapper_p.h" +#include <private/projwrapper_p.h> #include "qgeotiledmapobjectinfo_p.h" #include <QTransform> diff --git a/src/location/maps/tiled/qgeotiledmapdata.cpp b/src/location/maps/tiled/qgeotiledmapdata.cpp index 2532a2fd..fbe91b48 100644 --- a/src/location/maps/tiled/qgeotiledmapdata.cpp +++ b/src/location/maps/tiled/qgeotiledmapdata.cpp @@ -48,7 +48,7 @@ #include "qgeocoordinate.h" #include "qgeoboundingbox.h" #include "qgeomapoverlay.h" -#include "projwrapper_p.h" +#include <private/projwrapper_p.h> #include "qgeomapobjectengine_p.h" #include "qgeotiledmapobjectinfo_p.h" diff --git a/src/location/maps/tiled/qgeotiledmapdata_p.h b/src/location/maps/tiled/qgeotiledmapdata_p.h index 088b732a..3ff60f3a 100644 --- a/src/location/maps/tiled/qgeotiledmapdata_p.h +++ b/src/location/maps/tiled/qgeotiledmapdata_p.h @@ -56,7 +56,7 @@ #include "qgeomapdata_p.h" #include "qgeomapobject.h" #include "qgeomapobject_p.h" -#include "projwrapper_p.h" +#include <private/projwrapper_p.h> #include <QRectF> #include <QHash> |