[Qt] Janitor private headers

This commit is contained in:
Bruno de Oliveira Abinader
2016-07-04 15:33:29 +03:00
committed by Thiago Marcos P. Santos
parent 0878e09def
commit 65868b28cc
8 changed files with 24 additions and 31 deletions

View File

@@ -16,7 +16,7 @@ class AsyncTask::Impl : public QObject {
Q_OBJECT
public:
Impl(std::function<void()>&& fn);
Impl(std::function<void()> &&);
void maySend();
@@ -34,5 +34,5 @@ private:
};
}
}
} // namespace util
} // namespace mbgl

View File

@@ -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<QUrl, QPair<QNetworkReply*, QVector<HTTPRequest*>>> m_pending;
QMap<QUrl, QPair<QNetworkReply *, QVector<HTTPRequest *>>> m_pending;
QNetworkAccessManager *m_manager;
QSslConfiguration m_ssl;
};

View File

@@ -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;

View File

@@ -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<mbgl::DefaultFileSource>(
settings.cacheDatabasePath().toStdString(),

View File

@@ -1,5 +1,4 @@
#ifndef QMAPBOXGL_P_H
#define QMAPBOXGL_P_H
#pragma once
#include <mbgl/map/map.hpp>
#include <mbgl/map/view.hpp>
@@ -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<mbgl::DefaultFileSource> fileSourceObj;
std::unique_ptr<mbgl::Map> 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

View File

@@ -1,5 +1,4 @@
#ifndef QQUICKMAPBOXGLRENDERER_H
#define QQUICKMAPBOXGLRENDERER_H
#pragma once
#include <QObject>
#include <QQuickFramebufferObject>
@@ -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<QMapboxGL> m_map;
};
#endif // QQUICKMAPBOXGLRENDERER_H

View File

@@ -35,5 +35,5 @@ public slots:
void onWriteEvent(int fd);
};
}
}
} // namespace util
} // namespace mbgl

View File

@@ -14,7 +14,7 @@ class Timer::Impl : public QObject {
public:
Impl();
void start(uint64_t timeout, uint64_t repeat, std::function<void ()>&& cb);
void start(uint64_t timeout, uint64_t repeat, std::function<void ()> &&);
void stop();
public slots:
@@ -27,5 +27,5 @@ private:
QTimer timer;
};
}
}
} // namespace util
} // namespace mbgl