diff options
author | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-04-10 15:37:31 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-04-30 07:29:01 +0000 |
commit | a1bab0f633e4a1ce28fedee3b8d12c2936b1b9e0 (patch) | |
tree | 057ca7d714f59344a29fa305897ea7d21d8d37f7 | |
parent | 11d0b20757a66db0108e368499dca0a0856b7da5 (diff) | |
download | qtlocation-a1bab0f633e4a1ce28fedee3b8d12c2936b1b9e0.tar.gz |
Cleanup QGeoMap code.v5.5.0-beta1
This commit:
* renames class members to use m_ naming convention
* removes not required includes
* removes not required forward declarations
Change-Id: If1132ecf0413022ecfe4e781cb412bf8f8d6740e
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
-rw-r--r-- | src/location/maps/qgeomap.cpp | 69 | ||||
-rw-r--r-- | src/location/maps/qgeomap_p.h | 18 |
2 files changed, 29 insertions, 58 deletions
diff --git a/src/location/maps/qgeomap.cpp b/src/location/maps/qgeomap.cpp index 9cde4412..48f20487 100644 --- a/src/location/maps/qgeomap.cpp +++ b/src/location/maps/qgeomap.cpp @@ -36,122 +36,101 @@ #include "qgeomap_p.h" #include "qgeomapdata_p.h" - -#include "qgeotilecache_p.h" -#include "qgeotilespec_p.h" - #include "qgeocameracapabilities_p.h" -#include "qgeomapcontroller_p.h" - -#include <QtPositioning/private/qgeoprojection_p.h> -#include <QtPositioning/private/qdoublevector3d_p.h> - -#include "qgeocameratiles_p.h" -#include "qgeotilerequestmanager_p.h" -#include "qgeomapscene_p.h" - -#include "qgeomappingmanager_p.h" - -#include <QMutex> -#include <QMap> - -#include <qnumeric.h> - -#include <QtQuick/QSGNode> - -#include <cmath> QT_BEGIN_NAMESPACE QGeoMap::QGeoMap(QGeoMapData *mapData, QObject *parent) : QObject(parent), - mapData_(mapData) + m_mapData(mapData) { - connect(mapData_, SIGNAL(cameraDataChanged(QGeoCameraData)), this, SIGNAL(cameraDataChanged(QGeoCameraData))); - connect(mapData_, SIGNAL(updateRequired()), this, SIGNAL(updateRequired())); - connect(mapData_, SIGNAL(activeMapTypeChanged()), this, SIGNAL(activeMapTypeChanged())); - connect(mapData_, SIGNAL(copyrightsChanged(QImage)), this, SIGNAL(copyrightsChanged(QImage))); - connect(mapData_, SIGNAL(copyrightsChanged(QString)), this, SIGNAL(copyrightsChanged(QString))); + connect(m_mapData, SIGNAL(cameraDataChanged(QGeoCameraData)), this, SIGNAL(cameraDataChanged(QGeoCameraData))); + connect(m_mapData, SIGNAL(updateRequired()), this, SIGNAL(updateRequired())); + connect(m_mapData, SIGNAL(activeMapTypeChanged()), this, SIGNAL(activeMapTypeChanged())); + connect(m_mapData, SIGNAL(copyrightsChanged(QImage)), this, SIGNAL(copyrightsChanged(QImage))); + connect(m_mapData, SIGNAL(copyrightsChanged(QString)), this, SIGNAL(copyrightsChanged(QString))); } QGeoMap::~QGeoMap() { - delete mapData_; + delete m_mapData; } QGeoMapController *QGeoMap::mapController() { - return mapData_->mapController(); + return m_mapData->mapController(); } QSGNode *QGeoMap::updateSceneGraph(QSGNode *oldNode, QQuickWindow *window) { - return mapData_->updateSceneGraph(oldNode, window); + return m_mapData->updateSceneGraph(oldNode, window); } void QGeoMap::resize(int width, int height) { - mapData_->resize(width, height); + m_mapData->resize(width, height); } int QGeoMap::width() const { - return mapData_->width(); + return m_mapData->width(); } int QGeoMap::height() const { - return mapData_->height(); + return m_mapData->height(); } QGeoCameraCapabilities QGeoMap::cameraCapabilities() const { - return mapData_->cameraCapabilities(); + return m_mapData->cameraCapabilities(); } void QGeoMap::setCameraData(const QGeoCameraData &cameraData) { - mapData_->setCameraData(cameraData); + m_mapData->setCameraData(cameraData); } void QGeoMap::cameraStopped() { - mapData_->prefetchData(); + m_mapData->prefetchData(); } QGeoCameraData QGeoMap::cameraData() const { - return mapData_->cameraData(); + return m_mapData->cameraData(); } QGeoCoordinate QGeoMap::itemPositionToCoordinate(const QDoubleVector2D &pos, bool clipToViewport) const { - return mapData_->itemPositionToCoordinate(pos, clipToViewport); + return m_mapData->itemPositionToCoordinate(pos, clipToViewport); } QDoubleVector2D QGeoMap::coordinateToItemPosition(const QGeoCoordinate &coordinate, bool clipToViewport) const { - return mapData_->coordinateToItemPosition(coordinate, clipToViewport); + return m_mapData->coordinateToItemPosition(coordinate, clipToViewport); } void QGeoMap::update() { - emit mapData_->update(); + emit m_mapData->update(); } void QGeoMap::setActiveMapType(const QGeoMapType type) { - mapData_->setActiveMapType(type); + m_mapData->setActiveMapType(type); } const QGeoMapType QGeoMap::activeMapType() const { - return mapData_->activeMapType(); + return m_mapData->activeMapType(); } QString QGeoMap::pluginString() { - return mapData_->pluginString(); + return m_mapData->pluginString(); } +#include "moc_qgeomap_p.cpp" + QT_END_NAMESPACE diff --git a/src/location/maps/qgeomap_p.h b/src/location/maps/qgeomap_p.h index 3febc0cd..d6ebbfe3 100644 --- a/src/location/maps/qgeomap_p.h +++ b/src/location/maps/qgeomap_p.h @@ -47,28 +47,20 @@ // We mean it. // -#include <QObject> - -#include "qgeocameradata_p.h" #include "qgeomaptype_p.h" +#include <QtCore/QObject> #include <QtPositioning/private/qdoublevector2d_p.h> QT_BEGIN_NAMESPACE -class QGeoCoordinate; - -class QGeoMappingManager; - +class QGeoCameraData; class QGeoMapController; -class QGeoCameraCapabilities; - class QGeoMapData; - +class QGeoCameraCapabilities; +class QGeoCoordinate; class QSGNode; class QQuickWindow; -class QPointF; - class Q_LOCATION_EXPORT QGeoMap : public QObject { Q_OBJECT @@ -112,7 +104,7 @@ Q_SIGNALS: void copyrightsChanged(const QString ©rights); private: - QGeoMapData *mapData_; + QGeoMapData *m_mapData; }; QT_END_NAMESPACE |