From 9b71eff21b212f7890df1e8114d1f483ed80c247 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 15 Oct 2021 22:57:19 +0200 Subject: [PATCH] Mark all renderer functions as const as they don't change the object --- iconengineplugin/iconengine.cpp | 2 +- iconengineplugin/iconengine.h | 4 ++-- iconengineplugin/main.cpp | 2 +- qtforkawesome/renderer.cpp | 6 +++--- qtforkawesome/renderer.h | 10 +++++----- qtquickforkawesome/imageprovider.cpp | 3 ++- qtquickforkawesome/imageprovider.h | 4 ++-- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/iconengineplugin/iconengine.cpp b/iconengineplugin/iconengine.cpp index ef32c1d..3a52e5f 100644 --- a/iconengineplugin/iconengine.cpp +++ b/iconengineplugin/iconengine.cpp @@ -19,7 +19,7 @@ namespace QtForkAwesome { -IconEngine::IconEngine(Renderer &renderer) +IconEngine::IconEngine(const Renderer &renderer) : m_renderer(renderer) , m_char(0) , m_color() diff --git a/iconengineplugin/iconengine.h b/iconengineplugin/iconengine.h index 7bad3d5..8a1ebb4 100644 --- a/iconengineplugin/iconengine.h +++ b/iconengineplugin/iconengine.h @@ -13,7 +13,7 @@ class Renderer; class QT_FORK_AWESOME_ICON_ENGINE_EXPORT IconEngine : public QIconEngine { public: - IconEngine(Renderer &renderer); + IconEngine(const Renderer &renderer); IconEngine(const IconEngine &other); ~IconEngine() override; @@ -24,7 +24,7 @@ public: QIconEngine *clone() const override; private: - Renderer &m_renderer; + const Renderer &m_renderer; IconBaseType m_char; QColor m_color; }; diff --git a/iconengineplugin/main.cpp b/iconengineplugin/main.cpp index bc57882..2ff2f5f 100644 --- a/iconengineplugin/main.cpp +++ b/iconengineplugin/main.cpp @@ -24,7 +24,7 @@ public: QIconEngine *create(const QString &filename = QString()) override; private: - Renderer m_renderer; + const Renderer m_renderer; }; QIconEngine *ForkAwesomeIconEnginePlugin::create(const QString &file) diff --git a/qtforkawesome/renderer.cpp b/qtforkawesome/renderer.cpp index 34d61e5..c98df14 100644 --- a/qtforkawesome/renderer.cpp +++ b/qtforkawesome/renderer.cpp @@ -72,7 +72,7 @@ Renderer::operator bool() const /*! * \brief Renders the specified \a icon using the specified \a painter. */ -void QtForkAwesome::Renderer::render(QChar character, QPainter *painter, const QRect &rect, const QColor &color) +void QtForkAwesome::Renderer::render(QChar character, QPainter *painter, const QRect &rect, const QColor &color) const { if (!*this) { return; @@ -89,7 +89,7 @@ void QtForkAwesome::Renderer::render(QChar character, QPainter *painter, const Q /*! * \brief Renders the specified \a character as pixmap of the specified \a size. */ -QPixmap QtForkAwesome::Renderer::pixmap(QChar icon, const QSize &size, const QColor &color) +QPixmap QtForkAwesome::Renderer::pixmap(QChar icon, const QSize &size, const QColor &color) const { const auto scaleFactor = #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) @@ -108,7 +108,7 @@ QPixmap QtForkAwesome::Renderer::pixmap(QChar icon, const QSize &size, const QCo /*! * \brief Renders the specified \a icon as pixmap of the specified \a size. */ -QPixmap Renderer::pixmap(Icon icon, const QSize &size, const QColor &color) +QPixmap Renderer::pixmap(Icon icon, const QSize &size, const QColor &color) const { return pixmap(QChar(static_cast(icon)), size, color); } diff --git a/qtforkawesome/renderer.h b/qtforkawesome/renderer.h index 1778770..9d4b100 100644 --- a/qtforkawesome/renderer.h +++ b/qtforkawesome/renderer.h @@ -27,11 +27,11 @@ public: ~Renderer(); operator bool() const; - void render(QChar character, QPainter *painter, const QRect &rect, const QColor &color); - void render(Icon icon, QPainter *painter, const QRect &rect, const QColor &color); + void render(QChar character, QPainter *painter, const QRect &rect, const QColor &color) const; + void render(Icon icon, QPainter *painter, const QRect &rect, const QColor &color) const; - QPixmap pixmap(QChar icon, const QSize &size, const QColor &color); - QPixmap pixmap(Icon icon, const QSize &size, const QColor &color); + QPixmap pixmap(QChar icon, const QSize &size, const QColor &color) const; + QPixmap pixmap(Icon icon, const QSize &size, const QColor &color) const; private: std::unique_ptr m_d; @@ -40,7 +40,7 @@ private: /*! * \brief Renders the specified \a icon using the specified \a painter. */ -inline void Renderer::render(Icon icon, QPainter *painter, const QRect &rect, const QColor &color) +inline void Renderer::render(Icon icon, QPainter *painter, const QRect &rect, const QColor &color) const { render(QChar(static_cast(icon)), painter, rect, color); } diff --git a/qtquickforkawesome/imageprovider.cpp b/qtquickforkawesome/imageprovider.cpp index f0caf49..be8c20f 100644 --- a/qtquickforkawesome/imageprovider.cpp +++ b/qtquickforkawesome/imageprovider.cpp @@ -11,7 +11,8 @@ /// \brief Contains classes provided by the QtForkAwesome library. namespace QtForkAwesome { -QuickImageProvider::QuickImageProvider(Renderer &renderer, const QColor &defaultColor, const QSize &defaultSize, QQuickImageProvider::ImageType type) +QuickImageProvider::QuickImageProvider( + const Renderer &renderer, const QColor &defaultColor, const QSize &defaultSize, QQuickImageProvider::ImageType type) : QQuickImageProvider(type) , m_renderer(renderer) , m_defaultColor(defaultColor) diff --git a/qtquickforkawesome/imageprovider.h b/qtquickforkawesome/imageprovider.h index 4ce378d..9731639 100644 --- a/qtquickforkawesome/imageprovider.h +++ b/qtquickforkawesome/imageprovider.h @@ -16,7 +16,7 @@ class Renderer; class QT_QUICK_FORK_AWESOME_EXPORT QuickImageProvider : public QQuickImageProvider { public: - QuickImageProvider(Renderer &renderer, const QColor &defaultColor = QColor(), const QSize &defaultSize = QSize(64, 64), + QuickImageProvider(const Renderer &renderer, const QColor &defaultColor = QColor(), const QSize &defaultSize = QSize(64, 64), QQuickImageProvider::ImageType type = QQuickImageProvider::Pixmap); #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize, const QQuickImageProviderOptions &options); @@ -27,7 +27,7 @@ public: #endif private: - Renderer &m_renderer; + const Renderer &m_renderer; QColor m_defaultColor; QSize m_defaultSize; };