From 65868b28cc98fa89af4251f489741bcd6fe8a9e3 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Mon, 4 Jul 2016 15:33:29 +0300 Subject: [Qt] Janitor private headers --- platform/qt/src/async_task_impl.hpp | 6 +++--- platform/qt/src/http_file_source.hpp | 8 ++++---- platform/qt/src/http_request.hpp | 4 ++-- platform/qt/src/qmapboxgl.cpp | 1 - platform/qt/src/qmapboxgl_p.hpp | 15 ++++++--------- platform/qt/src/qquickmapboxglrenderer.hpp | 11 ++++------- platform/qt/src/run_loop_impl.hpp | 4 ++-- platform/qt/src/timer_impl.hpp | 6 +++--- 8 files changed, 24 insertions(+), 31 deletions(-) (limited to 'platform/qt') diff --git a/platform/qt/src/async_task_impl.hpp b/platform/qt/src/async_task_impl.hpp index 171990b15c..ea86079a90 100644 --- a/platform/qt/src/async_task_impl.hpp +++ b/platform/qt/src/async_task_impl.hpp @@ -16,7 +16,7 @@ class AsyncTask::Impl : public QObject { Q_OBJECT public: - Impl(std::function&& fn); + Impl(std::function &&); void maySend(); @@ -34,5 +34,5 @@ private: }; -} -} +} // namespace util +} // namespace mbgl diff --git a/platform/qt/src/http_file_source.hpp b/platform/qt/src/http_file_source.hpp index 274b464026..777228d191 100644 --- a/platform/qt/src/http_file_source.hpp +++ b/platform/qt/src/http_file_source.hpp @@ -24,14 +24,14 @@ public: Impl(); virtual ~Impl() = default; - void request(HTTPRequest*); - void cancel(HTTPRequest*); + void request(HTTPRequest *); + void cancel(HTTPRequest *); public slots: - void replyFinish(QNetworkReply* reply); + void replyFinish(QNetworkReply *); private: - QMap>> m_pending; + QMap>> m_pending; QNetworkAccessManager *m_manager; QSslConfiguration m_ssl; }; diff --git a/platform/qt/src/http_request.hpp b/platform/qt/src/http_request.hpp index 9af219f3c9..29a10467b3 100644 --- a/platform/qt/src/http_request.hpp +++ b/platform/qt/src/http_request.hpp @@ -15,13 +15,13 @@ class Response; class HTTPRequest : public AsyncRequest { public: - HTTPRequest(HTTPFileSource::Impl*, const Resource&, FileSource::Callback); + HTTPRequest(HTTPFileSource::Impl *, const Resource&, FileSource::Callback); virtual ~HTTPRequest(); QUrl requestUrl() const; QNetworkRequest networkRequest() const; - void handleNetworkReply(QNetworkReply *reply); + void handleNetworkReply(QNetworkReply *); private: HTTPFileSource::Impl* m_context; diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index efa53a3c6b..e370343df5 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -609,7 +609,6 @@ void QMapboxGL::connectionEstablished() QMapboxGLPrivate::QMapboxGLPrivate(QMapboxGL *q, const QMapboxGLSettings &settings) : QObject(q) - , size(0, 0) , q_ptr(q) , fileSourceObj(std::make_unique( settings.cacheDatabasePath().toStdString(), diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp index fdbfb7f2c1..fb8a5df4e7 100644 --- a/platform/qt/src/qmapboxgl_p.hpp +++ b/platform/qt/src/qmapboxgl_p.hpp @@ -1,5 +1,4 @@ -#ifndef QMAPBOXGL_P_H -#define QMAPBOXGL_P_H +#pragma once #include #include @@ -15,7 +14,7 @@ class QMapboxGLPrivate : public QObject, public mbgl::View Q_OBJECT public: - explicit QMapboxGLPrivate(QMapboxGL *q, const QMapboxGLSettings &); + explicit QMapboxGLPrivate(QMapboxGL *, const QMapboxGLSettings &); virtual ~QMapboxGLPrivate(); // mbgl::View implementation. @@ -26,17 +25,17 @@ public: void activate() final {} void deactivate() final {} void invalidate() final; - void notifyMapChange(mbgl::MapChange change) final; + void notifyMapChange(mbgl::MapChange) final; mbgl::EdgeInsets margins; - QSize size; + QSize size { 0, 0 }; - QMapboxGL *q_ptr = nullptr; + QMapboxGL *q_ptr { nullptr }; std::unique_ptr fileSourceObj; std::unique_ptr mapObj; - bool dirty = false; + bool dirty { false }; public slots: void connectionEstablished(); @@ -45,5 +44,3 @@ signals: void needsRendering(); void mapChanged(QMapboxGL::MapChange); }; - -#endif // QMAPBOXGL_P_H diff --git a/platform/qt/src/qquickmapboxglrenderer.hpp b/platform/qt/src/qquickmapboxglrenderer.hpp index 80a5cb3278..d367e17f78 100644 --- a/platform/qt/src/qquickmapboxglrenderer.hpp +++ b/platform/qt/src/qquickmapboxglrenderer.hpp @@ -1,5 +1,4 @@ -#ifndef QQUICKMAPBOXGLRENDERER_H -#define QQUICKMAPBOXGLRENDERER_H +#pragma once #include #include @@ -18,18 +17,16 @@ public: QQuickMapboxGLRenderer(); virtual ~QQuickMapboxGLRenderer(); - virtual QOpenGLFramebufferObject* createFramebufferObject(const QSize& size); + virtual QOpenGLFramebufferObject * createFramebufferObject(const QSize &); virtual void render(); - virtual void synchronize(QQuickFramebufferObject *item); + virtual void synchronize(QQuickFramebufferObject *); signals: - void centerChanged(const QGeoCoordinate &coordinate); + void centerChanged(const QGeoCoordinate &); private: bool m_initialized = false; QScopedPointer m_map; }; - -#endif // QQUICKMAPBOXGLRENDERER_H diff --git a/platform/qt/src/run_loop_impl.hpp b/platform/qt/src/run_loop_impl.hpp index 6cabbbb425..ea64e4b977 100644 --- a/platform/qt/src/run_loop_impl.hpp +++ b/platform/qt/src/run_loop_impl.hpp @@ -35,5 +35,5 @@ public slots: void onWriteEvent(int fd); }; -} -} +} // namespace util +} // namespace mbgl diff --git a/platform/qt/src/timer_impl.hpp b/platform/qt/src/timer_impl.hpp index a54abfd8b5..ea22b20974 100644 --- a/platform/qt/src/timer_impl.hpp +++ b/platform/qt/src/timer_impl.hpp @@ -14,7 +14,7 @@ class Timer::Impl : public QObject { public: Impl(); - void start(uint64_t timeout, uint64_t repeat, std::function&& cb); + void start(uint64_t timeout, uint64_t repeat, std::function &&); void stop(); public slots: @@ -27,5 +27,5 @@ private: QTimer timer; }; -} -} +} // namespace util +} // namespace mbgl -- cgit v1.2.1