diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2013-01-28 13:29:09 +0800 |
|---|---|---|
| committer | Stephen Kelly <stephen.kelly@kdab.com> | 2013-02-10 23:47:27 +0100 |
| commit | aebfc4134f72865c3c676612c3f8e358ef102656 (patch) | |
| tree | 3df83b0574dba7a90c4a14dee141554140a22713 /src | |
| parent | a6c0789b1240a13b534f5ba5b4e3d57e3e504e01 (diff) | |
| download | qtlocation-aebfc4134f72865c3c676612c3f8e358ef102656.tar.gz | |
Enable the "#include <QLocation>" camel-case header
Rename qtlocation.h/cpp -> qlocation.h/cpp, and use #pragma qt_class()
to generate the camel-case header during compilation.
Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)
Change-Id: I2899c9ca0969c37365bd7e1da5d5a15e9632f5f0
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/location/location.pro | 4 | ||||
| -rw-r--r-- | src/location/places/qplacecategory.h | 2 | ||||
| -rw-r--r-- | src/location/places/qplacecategory_p.h | 2 | ||||
| -rw-r--r-- | src/location/places/qplacemanagerengine_p.h | 2 | ||||
| -rw-r--r-- | src/location/places/qplacesearchrequest.h | 2 | ||||
| -rw-r--r-- | src/location/qlocation.cpp (renamed from src/location/qtlocation.cpp) | 2 | ||||
| -rw-r--r-- | src/location/qlocation.h (renamed from src/location/qtlocation.h) | 10 |
7 files changed, 14 insertions, 10 deletions
diff --git a/src/location/location.pro b/src/location/location.pro index ca99bb61..20448a1f 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -24,7 +24,7 @@ PUBLIC_HEADERS += \ qgeosatelliteinfosource.h \ qnmeapositioninfosource.h \ qgeopositioninfosourcefactory.h \ - qtlocation.h \ + qlocation.h \ qlocationglobal.h PRIVATE_HEADERS += \ @@ -57,4 +57,4 @@ SOURCES += \ qnmeapositioninfosource.cpp \ qgeoareamonitor_polling.cpp \ qgeopositioninfosourcefactory.cpp \ - qtlocation.cpp + qlocation.cpp diff --git a/src/location/places/qplacecategory.h b/src/location/places/qplacecategory.h index c2c97d8c..27bc293c 100644 --- a/src/location/places/qplacecategory.h +++ b/src/location/places/qplacecategory.h @@ -47,7 +47,7 @@ #include <QtCore/QSharedDataPointer> #include <QtCore/QString> #include <QtCore/QMetaType> -#include <QtLocation/qtlocation.h> +#include <QtLocation/QLocation> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacecategory_p.h b/src/location/places/qplacecategory_p.h index 6b13ce30..8a2ceeff 100644 --- a/src/location/places/qplacecategory_p.h +++ b/src/location/places/qplacecategory_p.h @@ -44,7 +44,7 @@ #include <QtCore/QSharedData> #include <QtCore/QString> -#include <QtLocation/qtlocation.h> +#include <QtLocation/QLocation> #include "qplaceicon.h" diff --git a/src/location/places/qplacemanagerengine_p.h b/src/location/places/qplacemanagerengine_p.h index f91e1034..e06faffa 100644 --- a/src/location/places/qplacemanagerengine_p.h +++ b/src/location/places/qplacemanagerengine_p.h @@ -54,7 +54,7 @@ // #include <QtCore/QString> -#include <QtLocation/qtlocation.h> +#include <QtLocation/QLocation> QT_BEGIN_NAMESPACE diff --git a/src/location/places/qplacesearchrequest.h b/src/location/places/qplacesearchrequest.h index c7c5c22b..5fe93179 100644 --- a/src/location/places/qplacesearchrequest.h +++ b/src/location/places/qplacesearchrequest.h @@ -45,7 +45,7 @@ #include <QtCore/QSharedDataPointer> #include <QtLocation/placemacro.h> #include <QtLocation/QPlaceCategory> -#include <QtLocation/qtlocation.h> +#include <QtLocation/QLocation> QT_BEGIN_NAMESPACE diff --git a/src/location/qtlocation.cpp b/src/location/qlocation.cpp index 221a76a2..6f6118a4 100644 --- a/src/location/qtlocation.cpp +++ b/src/location/qlocation.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtLocation/qtlocation.h> +#include <QtLocation/QLocation> QT_BEGIN_NAMESPACE diff --git a/src/location/qtlocation.h b/src/location/qlocation.h index 288e1b76..6e6c71ec 100644 --- a/src/location/qtlocation.h +++ b/src/location/qlocation.h @@ -39,8 +39,12 @@ ** ****************************************************************************/ -#ifndef QTLOCATION_H -#define QTLOCATION_H +#ifndef QLOCATION_H +#define QLOCATION_H + +#if 0 +#pragma qt_class(QLocation) +#endif #include <QtLocation/qlocationglobal.h> @@ -63,4 +67,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QLocation::VisibilityScope) QT_END_NAMESPACE -#endif // QTLOCATION_H +#endif // QLOCATION_H |