diff options
author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-11-02 09:20:14 +0100 |
---|---|---|
committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-11-02 09:51:52 +0100 |
commit | cfaf1d576fd1f44ea3e424af85dfbaa641d2665d (patch) | |
tree | b09ead7cbb05bb2893c307b12c33ea6c3e901ff0 | |
parent | ed92e44b61544e522b8693ea4737f2726b229d10 (diff) |
nativestyle: refactor many functions to be const
Many of the virtual functions should be const, as
they should not modify the state of the item.
Change-Id: I94a7f9ae56204c8f8f737911e15d81f82d8add83
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
28 files changed, 102 insertions, 102 deletions
diff --git a/src/imports/nativestyle/items/qquickstyleitem.cpp b/src/imports/nativestyle/items/qquickstyleitem.cpp index 6ca05f29..902ccea9 100644 --- a/src/imports/nativestyle/items/qquickstyleitem.cpp +++ b/src/imports/nativestyle/items/qquickstyleitem.cpp @@ -89,7 +89,7 @@ QQuickStyleItem::~QQuickStyleItem() { } -void QQuickStyleItem::connectToControl() +void QQuickStyleItem::connectToControl() const { connect(m_control, &QQuickStyleItem::enabledChanged, this, &QQuickStyleItem::markImageDirty); connect(m_control, &QQuickItem::activeFocusChanged, this, &QQuickStyleItem::markImageDirty); @@ -171,7 +171,7 @@ QStyle::State QQuickStyleItem::controlSize(QQuickItem *item) return QStyle::State_None; } -void QQuickStyleItem::initStyleOptionBase(QStyleOption &styleOption) +void QQuickStyleItem::initStyleOptionBase(QStyleOption &styleOption) const { Q_ASSERT(m_control); @@ -478,7 +478,7 @@ qreal QQuickStyleItem::focusFrameRadius() const return m_styleItemGeometry.focusFrameRadius; } -QFont QQuickStyleItem::styleFont(QQuickItem *control) +QFont QQuickStyleItem::styleFont(QQuickItem *control) const { Q_ASSERT(control); // Note: This function should be treated as if it was static diff --git a/src/imports/nativestyle/items/qquickstyleitem.h b/src/imports/nativestyle/items/qquickstyleitem.h index 7fde3de9..5bb990f4 100644 --- a/src/imports/nativestyle/items/qquickstyleitem.h +++ b/src/imports/nativestyle/items/qquickstyleitem.h @@ -218,7 +218,7 @@ public: QSize imageSize() const; qreal focusFrameRadius() const; - Q_INVOKABLE virtual QFont styleFont(QQuickItem *control); + Q_INVOKABLE virtual QFont styleFont(QQuickItem *control) const; void markGeometryDirty(); void markImageDirty(); @@ -237,14 +237,14 @@ protected: void itemChange(ItemChange change, const ItemChangeData &data) override; void updatePolish() override; - virtual void connectToControl(); - virtual void paintEvent(QPainter *painter) = 0; + virtual void connectToControl() const; + virtual void paintEvent(QPainter *painter) const = 0; virtual StyleItemGeometry calculateGeometry() = 0; static QStyle::State controlSize(QQuickItem *item); - void initStyleOptionBase(QStyleOption &styleOption); + void initStyleOptionBase(QStyleOption &styleOption) const; - inline QSize contentSize() { return QSize(qCeil(m_contentSize.width()), qCeil(m_contentSize.height())); } + inline QSize contentSize() const { return QSize(qCeil(m_contentSize.width()), qCeil(m_contentSize.height())); } inline static QStyle *style() { return QQuickNativeStyle::style(); } template <class T> inline const T* control() const { diff --git a/src/imports/nativestyle/items/qquickstyleitembutton.cpp b/src/imports/nativestyle/items/qquickstyleitembutton.cpp index f3e2c3e1..5dfe060f 100644 --- a/src/imports/nativestyle/items/qquickstyleitembutton.cpp +++ b/src/imports/nativestyle/items/qquickstyleitembutton.cpp @@ -36,12 +36,12 @@ #include "qquickstyleitembutton.h" -QFont QQuickStyleItemButton::styleFont(QQuickItem *control) +QFont QQuickStyleItemButton::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_PushButtonLabel, controlSize(control)); } -void QQuickStyleItemButton::connectToControl() +void QQuickStyleItemButton::connectToControl() const { QQuickStyleItem::connectToControl(); auto button = control<QQuickButton>(); @@ -65,14 +65,14 @@ StyleItemGeometry QQuickStyleItemButton::calculateGeometry() return geometry; } -void QQuickStyleItemButton::paintEvent(QPainter *painter) +void QQuickStyleItemButton::paintEvent(QPainter *painter) const { QStyleOptionButton styleOption; initStyleOption(styleOption); style()->drawControl(QStyle::CE_PushButtonBevel, &styleOption, painter); } -void QQuickStyleItemButton::initStyleOption(QStyleOptionButton &styleOption) +void QQuickStyleItemButton::initStyleOption(QStyleOptionButton &styleOption) const { initStyleOptionBase(styleOption); auto button = control<QQuickButton>(); diff --git a/src/imports/nativestyle/items/qquickstyleitembutton.h b/src/imports/nativestyle/items/qquickstyleitembutton.h index e23601a7..41ca0cf1 100644 --- a/src/imports/nativestyle/items/qquickstyleitembutton.h +++ b/src/imports/nativestyle/items/qquickstyleitembutton.h @@ -46,15 +46,15 @@ class QQuickStyleItemButton : public QQuickStyleItem QML_NAMED_ELEMENT(Button) public: - QFont styleFont(QQuickItem *control) override; + QFont styleFont(QQuickItem *control) const override; protected: - void connectToControl() override; - void paintEvent(QPainter *painter) override; + void connectToControl() const override; + void paintEvent(QPainter *painter) const override; StyleItemGeometry calculateGeometry() override; private: - void initStyleOption(QStyleOptionButton &styleOption); + void initStyleOption(QStyleOptionButton &styleOption) const; }; #endif // QQUICKSTYLEITEMBUTTON_H diff --git a/src/imports/nativestyle/items/qquickstyleitemcheckbox.cpp b/src/imports/nativestyle/items/qquickstyleitemcheckbox.cpp index f947caf4..6c4ac8ea 100644 --- a/src/imports/nativestyle/items/qquickstyleitemcheckbox.cpp +++ b/src/imports/nativestyle/items/qquickstyleitemcheckbox.cpp @@ -36,12 +36,12 @@ #include "qquickstyleitemcheckbox.h" -QFont QQuickStyleItemCheckBox::styleFont(QQuickItem *control) +QFont QQuickStyleItemCheckBox::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_RadioButtonLabel, controlSize(control)); } -void QQuickStyleItemCheckBox::connectToControl() +void QQuickStyleItemCheckBox::connectToControl() const { QQuickStyleItem::connectToControl(); auto checkbox = control<QQuickCheckBox>(); @@ -69,14 +69,14 @@ StyleItemGeometry QQuickStyleItemCheckBox::calculateGeometry() return geometry; } -void QQuickStyleItemCheckBox::paintEvent(QPainter *painter) +void QQuickStyleItemCheckBox::paintEvent(QPainter *painter) const { QStyleOptionButton styleOption; initStyleOption(styleOption); style()->drawControl(QStyle::CE_CheckBox, &styleOption, painter); } -void QQuickStyleItemCheckBox::initStyleOption(QStyleOptionButton &styleOption) +void QQuickStyleItemCheckBox::initStyleOption(QStyleOptionButton &styleOption) const { initStyleOptionBase(styleOption); auto checkbox = control<QQuickCheckBox>(); diff --git a/src/imports/nativestyle/items/qquickstyleitemcheckbox.h b/src/imports/nativestyle/items/qquickstyleitemcheckbox.h index a8ccda2c..03bf34b9 100644 --- a/src/imports/nativestyle/items/qquickstyleitemcheckbox.h +++ b/src/imports/nativestyle/items/qquickstyleitemcheckbox.h @@ -46,15 +46,15 @@ class QQuickStyleItemCheckBox : public QQuickStyleItem QML_NAMED_ELEMENT(CheckBox) public: - QFont styleFont(QQuickItem *control) override; + QFont styleFont(QQuickItem *control) const override; protected: - void connectToControl() override; - void paintEvent(QPainter *painter) override; + void connectToControl() const override; + void paintEvent(QPainter *painter) const override; StyleItemGeometry calculateGeometry() override; private: - void initStyleOption(QStyleOptionButton &styleOption); + void initStyleOption(QStyleOptionButton &styleOption) const; }; #endif // QQUICKSTYLEITEMCHECKBOX_H diff --git a/src/imports/nativestyle/items/qquickstyleitemcombobox.cpp b/src/imports/nativestyle/items/qquickstyleitemcombobox.cpp index 7841d062..0ac3756e 100644 --- a/src/imports/nativestyle/items/qquickstyleitemcombobox.cpp +++ b/src/imports/nativestyle/items/qquickstyleitemcombobox.cpp @@ -36,12 +36,12 @@ #include "qquickstyleitemcombobox.h" -QFont QQuickStyleItemComboBox::styleFont(QQuickItem *control) +QFont QQuickStyleItemComboBox::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_PushButtonLabel, controlSize(control)); } -void QQuickStyleItemComboBox::connectToControl() +void QQuickStyleItemComboBox::connectToControl() const { QQuickStyleItem::connectToControl(); auto comboBox = control<QQuickComboBox>(); @@ -65,14 +65,14 @@ StyleItemGeometry QQuickStyleItemComboBox::calculateGeometry() return geometry; } -void QQuickStyleItemComboBox::paintEvent(QPainter *painter) +void QQuickStyleItemComboBox::paintEvent(QPainter *painter) const { QStyleOptionComboBox styleOption; initStyleOption(styleOption); style()->drawComplexControl(QStyle::CC_ComboBox, &styleOption, painter); } -void QQuickStyleItemComboBox::initStyleOption(QStyleOptionComboBox &styleOption) +void QQuickStyleItemComboBox::initStyleOption(QStyleOptionComboBox &styleOption) const { initStyleOptionBase(styleOption); auto comboBox = control<QQuickComboBox>(); diff --git a/src/imports/nativestyle/items/qquickstyleitemcombobox.h b/src/imports/nativestyle/items/qquickstyleitemcombobox.h index f446b191..79f1995e 100644 --- a/src/imports/nativestyle/items/qquickstyleitemcombobox.h +++ b/src/imports/nativestyle/items/qquickstyleitemcombobox.h @@ -46,15 +46,15 @@ class QQuickStyleItemComboBox : public QQuickStyleItem QML_NAMED_ELEMENT(ComboBox) public: - QFont styleFont(QQuickItem *control) override; + QFont styleFont(QQuickItem *control) const override; protected: - void connectToControl() override; - void paintEvent(QPainter *painter) override; + void connectToControl() const override; + void paintEvent(QPainter *painter) const override; StyleItemGeometry calculateGeometry() override; private: - void initStyleOption(QStyleOptionComboBox &styleOption); + void initStyleOption(QStyleOptionComboBox &styleOption) const; }; #endif // QQUICKSTYLEITEMCOMBOBOX_H diff --git a/src/imports/nativestyle/items/qquickstyleitemdial.cpp b/src/imports/nativestyle/items/qquickstyleitemdial.cpp index 56357a7c..bf5784e1 100644 --- a/src/imports/nativestyle/items/qquickstyleitemdial.cpp +++ b/src/imports/nativestyle/items/qquickstyleitemdial.cpp @@ -36,12 +36,12 @@ #include "qquickstyleitemdial.h" -QFont QQuickStyleItemDial::styleFont(QQuickItem *control) +QFont QQuickStyleItemDial::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_ProgressBarLabel, controlSize(control)); } -void QQuickStyleItemDial::connectToControl() +void QQuickStyleItemDial::connectToControl() const { QQuickStyleItem::connectToControl(); auto dial = control<QQuickDial>(); @@ -68,14 +68,14 @@ StyleItemGeometry QQuickStyleItemDial::calculateGeometry() return geometry; } -void QQuickStyleItemDial::paintEvent(QPainter *painter) +void QQuickStyleItemDial::paintEvent(QPainter *painter) const { QStyleOptionSlider styleOption; initStyleOption(styleOption); style()->drawComplexControl(QStyle::CC_Dial, &styleOption, painter); } -void QQuickStyleItemDial::initStyleOption(QStyleOptionSlider &styleOption) +void QQuickStyleItemDial::initStyleOption(QStyleOptionSlider &styleOption) const { initStyleOptionBase(styleOption); auto dial = control<QQuickDial>(); diff --git a/src/imports/nativestyle/items/qquickstyleitemdial.h b/src/imports/nativestyle/items/qquickstyleitemdial.h index 3eefa734..569820fe 100644 --- a/src/imports/nativestyle/items/qquickstyleitemdial.h +++ b/src/imports/nativestyle/items/qquickstyleitemdial.h @@ -46,15 +46,15 @@ class QQuickStyleItemDial : public QQuickStyleItem QML_NAMED_ELEMENT(Dial) public: - QFont styleFont(QQuickItem *control) override; + QFont styleFont(QQuickItem *control) const override; protected: - void connectToControl() override; - void paintEvent(QPainter *painter) override; + void connectToControl() const override; + void paintEvent(QPainter *painter) const override; StyleItemGeometry calculateGeometry() override; private: - void initStyleOption(QStyleOptionSlider &styleOption); + void initStyleOption(QStyleOptionSlider &styleOption) const; }; #endif // QQUICKSTYLEITEMDIAL_H diff --git a/src/imports/nativestyle/items/qquickstyleitemframe.cpp b/src/imports/nativestyle/items/qquickstyleitemframe.cpp index 42a6c231..cf060492 100644 --- a/src/imports/nativestyle/items/qquickstyleitemframe.cpp +++ b/src/imports/nativestyle/items/qquickstyleitemframe.cpp @@ -51,14 +51,14 @@ StyleItemGeometry QQuickStyleItemFrame::calculateGeometry() return geometry; } -void QQuickStyleItemFrame::paintEvent(QPainter *painter) +void QQuickStyleItemFrame::paintEvent(QPainter *painter) const { QStyleOptionFrame styleOption; initStyleOption(styleOption); style()->drawControl(QStyle::CE_ShapedFrame, &styleOption, painter); } -void QQuickStyleItemFrame::initStyleOption(QStyleOptionFrame &styleOption) +void QQuickStyleItemFrame::initStyleOption(QStyleOptionFrame &styleOption) const { initStyleOptionBase(styleOption); styleOption.lineWidth = 1; diff --git a/src/imports/nativestyle/items/qquickstyleitemframe.h b/src/imports/nativestyle/items/qquickstyleitemframe.h index 70063ed6..8e8da68b 100644 --- a/src/imports/nativestyle/items/qquickstyleitemframe.h +++ b/src/imports/nativestyle/items/qquickstyleitemframe.h @@ -46,11 +46,11 @@ class QQuickStyleItemFrame : public QQuickStyleItem QML_NAMED_ELEMENT(Frame) protected: - void paintEvent(QPainter *painter) override; + void paintEvent(QPainter *painter) const override; StyleItemGeometry calculateGeometry() override; private: - void initStyleOption(QStyleOptionFrame &styleOption); + void initStyleOption(QStyleOptionFrame &styleOption) const; }; #endif // QQUICKSTYLEITEMFRAME_H diff --git a/src/imports/nativestyle/items/qquickstyleitemgroupbox.cpp b/src/imports/nativestyle/items/qquickstyleitemgroupbox.cpp index d62b6f23..a828160d 100644 --- a/src/imports/nativestyle/items/qquickstyleitemgroupbox.cpp +++ b/src/imports/nativestyle/items/qquickstyleitemgroupbox.cpp @@ -36,7 +36,7 @@ #include "qquickstyleitemgroupbox.h" -QFont QQuickStyleItemGroupBox::styleFont(QQuickItem *control) +QFont QQuickStyleItemGroupBox::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_HeaderLabel, controlSize(control)); } @@ -75,14 +75,14 @@ StyleItemGeometry QQuickStyleItemGroupBox::calculateGeometry() return geometry; } -void QQuickStyleItemGroupBox::paintEvent(QPainter *painter) +void QQuickStyleItemGroupBox::paintEvent(QPainter *painter) const { QStyleOptionGroupBox styleOption; initStyleOption(styleOption); style()->drawComplexControl(QStyle::CC_GroupBox, &styleOption, painter); } -void QQuickStyleItemGroupBox::initStyleOption(QStyleOptionGroupBox &styleOption) +void QQuickStyleItemGroupBox::initStyleOption(QStyleOptionGroupBox &styleOption) const { initStyleOptionBase(styleOption); styleOption.subControls = QStyle::SC_GroupBoxFrame; diff --git a/src/imports/nativestyle/items/qquickstyleitemgroupbox.h b/src/imports/nativestyle/items/qquickstyleitemgroupbox.h index efb6d4f6..2b07287f 100644 --- a/src/imports/nativestyle/items/qquickstyleitemgroupbox.h +++ b/src/imports/nativestyle/items/qquickstyleitemgroupbox.h @@ -50,21 +50,21 @@ class QQuickStyleItemGroupBox : public QQuickStyleItem public: QQuickStyleMargins groupBoxPadding() const; QPointF labelPos() const; - QFont styleFont(QQuickItem *control) override; + QFont styleFont(QQuickItem *control) const override; signals: void groupBoxPaddingChanged(); void labelPosChanged(); protected: - void paintEvent(QPainter *painter) override; + void paintEvent(QPainter *painter) const override; StyleItemGeometry calculateGeometry() override; private: QQuickStyleMargins m_groupBoxPadding; QPointF m_labelPos; - void initStyleOption(QStyleOptionGroupBox &styleOption); + void initStyleOption(QStyleOptionGroupBox &styleOption) const; }; #endif // QQUICKSTYLEITEMGROUPBOX_H diff --git a/src/imports/nativestyle/items/qquickstyleitemprogressbar.cpp b/src/imports/nativestyle/items/qquickstyleitemprogressbar.cpp index 707b9c62..480e8981 100644 --- a/src/imports/nativestyle/items/qquickstyleitemprogressbar.cpp +++ b/src/imports/nativestyle/items/qquickstyleitemprogressbar.cpp @@ -36,12 +36,12 @@ #include "qquickstyleitemprogressbar.h" -QFont QQuickStyleItemProgressBar::styleFont(QQuickItem *control) +QFont QQuickStyleItemProgressBar::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_ProgressBarLabel, controlSize(control)); } -void QQuickStyleItemProgressBar::connectToControl() +void QQuickStyleItemProgressBar::connectToControl() const { QQuickStyleItem::connectToControl(); auto progressBar = control<QQuickProgressBar>(); @@ -74,7 +74,7 @@ StyleItemGeometry QQuickStyleItemProgressBar::calculateGeometry() return geometry; } -void QQuickStyleItemProgressBar::paintEvent(QPainter *painter) +void QQuickStyleItemProgressBar::paintEvent(QPainter *painter) const { QStyleOptionProgressBar styleOption; initStyleOption(styleOption); @@ -91,7 +91,7 @@ void QQuickStyleItemProgressBar::paintEvent(QPainter *painter) #endif } -void QQuickStyleItemProgressBar::initStyleOption(QStyleOptionProgressBar &styleOption) +void QQuickStyleItemProgressBar::initStyleOption(QStyleOptionProgressBar &styleOption) const { initStyleOptionBase(styleOption); auto progressBar = control<QQuickProgressBar>(); diff --git a/src/imports/nativestyle/items/qquickstyleitemprogressbar.h b/src/imports/nativestyle/items/qquickstyleitemprogressbar.h index 0a3d58c9..53692dbe 100644 --- a/src/imports/nativestyle/items/qquickstyleitemprogressbar.h +++ b/src/imports/nativestyle/items/qquickstyleitemprogressbar.h @@ -47,15 +47,15 @@ class QQuickStyleItemProgressBar : public QQuickStyleItem QML_NAMED_ELEMENT(ProgressBar) public: - QFont styleFont(QQuickItem *control) override; + QFont styleFont(QQuickItem *control) const override; protected: - void connectToControl() override; - void paintEvent(QPainter *painter) override; + void connectToControl() const override; + void paintEvent(QPainter *painter) const override; StyleItemGeometry calculateGeometry() override; private: - void initStyleOption(QStyleOptionProgressBar &styleOption); + void initStyleOption(QStyleOptionProgressBar &styleOption) const; }; #endif // QQUICKSTYLEITEMPROGRESSBAR_H diff --git a/src/imports/nativestyle/items/qquickstyleitemradiobutton.cpp b/src/imports/nativestyle/items/qquickstyleitemradiobutton.cpp index b889474b..655bb0b6 100644 --- a/src/imports/nativestyle/items/qquickstyleitemradiobutton.cpp +++ b/src/imports/nativestyle/items/qquickstyleitemradiobutton.cpp @@ -36,12 +36,12 @@ #include "qquickstyleitemradiobutton.h" -QFont QQuickStyleItemRadioButton::styleFont(QQuickItem *control) +QFont QQuickStyleItemRadioButton::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_RadioButtonLabel, controlSize(control)); } -void QQuickStyleItemRadioButton::connectToControl() +void QQuickStyleItemRadioButton::connectToControl() const { QQuickStyleItem::connectToControl(); auto checkbox = control<QQuickRadioButton>(); @@ -66,14 +66,14 @@ StyleItemGeometry QQuickStyleItemRadioButton::calculateGeometry() return geometry; } -void QQuickStyleItemRadioButton::paintEvent(QPainter *painter) +void QQuickStyleItemRadioButton::paintEvent(QPainter *painter) const { QStyleOptionButton styleOption; initStyleOption(styleOption); style()->drawControl(QStyle::CE_RadioButton, &styleOption, painter); } -void QQuickStyleItemRadioButton::initStyleOption(QStyleOptionButton &styleOption) +void QQuickStyleItemRadioButton::initStyleOption(QStyleOptionButton &styleOption) const { initStyleOptionBase(styleOption); auto checkbox = control<QQuickRadioButton>(); diff --git a/src/imports/nativestyle/items/qquickstyleitemradiobutton.h b/src/imports/nativestyle/items/qquickstyleitemradiobutton.h index 5ee9097b..56073d8f 100644 --- a/src/imports/nativestyle/items/qquickstyleitemradiobutton.h +++ b/src/imports/nativestyle/items/qquickstyleitemradiobutton.h @@ -46,15 +46,15 @@ class QQuickStyleItemRadioButton : public QQuickStyleItem QML_NAMED_ELEMENT(RadioButton) public: - QFont styleFont(QQuickItem *control) override; + QFont styleFont(QQuickItem *control) const override; protected: - void connectToControl() override; - void paintEvent(QPainter *painter) override; + void connectToControl() const override; + void paintEvent(QPainter *painter) const override; StyleItemGeometry calculateGeometry() override; private: - void initStyleOption(QStyleOptionButton &styleOption); + void initStyleOption(QStyleOptionButton &styleOption) const; }; #endif // QQUICKSTYLEITEMRADIOBUTTON_H diff --git a/src/imports/nativestyle/items/qquickstyleitemscrollbar.cpp b/src/imports/nativestyle/items/qquickstyleitemscrollbar.cpp index 364b9b62..1b94b22d 100644 --- a/src/imports/nativestyle/items/qquickstyleitemscrollbar.cpp +++ b/src/imports/nativestyle/items/qquickstyleitemscrollbar.cpp @@ -36,12 +36,12 @@ #include "qquickstyleitemscrollbar.h" -QFont QQuickStyleItemScrollBar::styleFont(QQuickItem *control) +QFont QQuickStyleItemScrollBar::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_ProgressBarLabel, controlSize(control)); } -void QQuickStyleItemScrollBar::connectToControl() +void QQuickStyleItemScrollBar::connectToControl() const { QQuickStyleItem::connectToControl(); auto scrollBar = control<QQuickScrollBar>(); @@ -64,14 +64,14 @@ StyleItemGeometry QQuickStyleItemScrollBar::calculateGeometry() return geometry; } -void QQuickStyleItemScrollBar::paintEvent(QPainter *painter) +void QQuickStyleItemScrollBar::paintEvent(QPainter *painter) const { QStyleOptionSlider styleOption; initStyleOption(styleOption); style()->drawComplexControl(QStyle::CC_ScrollBar, &styleOption, painter); } -void QQuickStyleItemScrollBar::initStyleOption(QStyleOptionSlider &styleOption) +void QQuickStyleItemScrollBar::initStyleOption(QStyleOptionSlider &styleOption) const { initStyleOptionBase(styleOption); auto scrollBar = control<QQuickScrollBar>(); diff --git a/src/imports/nativestyle/items/qquickstyleitemscrollbar.h b/src/imports/nativestyle/items/qquickstyleitemscrollbar.h index e181d4ec..9d86cb09 100644 --- a/src/imports/nativestyle/items/qquickstyleitemscrollbar.h +++ b/src/imports/nativestyle/items/qquickstyleitemscrollbar.h @@ -55,15 +55,15 @@ public: }; Q_ENUM(SubControl) - QFont styleFont(QQuickItem *control) override; + QFont styleFont(QQuickItem *control) const override; protected: - void connectToControl() override; - void paintEvent(QPainter *painter) override; + void connectToControl() const override; + void paintEvent(QPainter *painter) const override; StyleItemGeometry calculateGeometry() override; private: - void initStyleOption(QStyleOptionSlider &styleOption); + void initStyleOption(QStyleOptionSlider &styleOption) const; private: SubControl m_subControl = Groove; diff --git a/src/imports/nativestyle/items/qquickstyleitemscrollviewcorner.cpp b/src/imports/nativestyle/items/qquickstyleitemscrollviewcorner.cpp index 0c759d96..3a992f2d 100644 --- a/src/imports/nativestyle/items/qquickstyleitemscrollviewcorner.cpp +++ b/src/imports/nativestyle/items/qquickstyleitemscrollviewcorner.cpp @@ -56,7 +56,7 @@ StyleItemGeometry QQuickStyleItemScrollViewCorner::calculateGeometry() return geometry; } -void QQuickStyleItemScrollViewCorner::paintEvent(QPainter *painter) +void QQuickStyleItemScrollViewCorner::paintEvent(QPainter *painter) const { QStyleOptionSlider styleOption; initStyleOption(styleOption); @@ -106,7 +106,7 @@ void QQuickStyleItemScrollViewCorner::paintEvent(QPainter *painter) painter->restore(); } -void QQuickStyleItemScrollViewCorner::initStyleOption(QStyleOptionSlider &styleOption) +void QQuickStyleItemScrollViewCorner::initStyleOption(QStyleOptionSlider &styleOption) const { initStyleOptionBase(styleOption); diff --git a/src/imports/nativestyle/items/qquickstyleitemscrollviewcorner.h b/src/imports/nativestyle/items/qquickstyleitemscrollviewcorner.h index 3efc7032..637a8ea8 100644 --- a/src/imports/nativestyle/items/qquickstyleitemscrollviewcorner.h +++ b/src/imports/nativestyle/items/qquickstyleitemscrollviewcorner.h @@ -46,11 +46,11 @@ class QQuickStyleItemScrollViewCorner : public QQuickStyleItem QML_NAMED_ELEMENT(ScrollViewCorner) protected: - void paintEvent(QPainter *painter) override; + void paintEvent(QPainter *painter) const override; StyleItemGeometry calculateGeometry() override; private: - void initStyleOption(QStyleOptionSlider &styleOption); + void initStyleOption(QStyleOptionSlider &styleOption) const; }; #endif // QQUICKSTYLEITEMSCROLLVIEWCORNER_H diff --git a/src/imports/nativestyle/items/qquickstyleitemslider.cpp b/src/imports/nativestyle/items/qquickstyleitemslider.cpp index 0d226c02..67161ad3 100644 --- a/src/imports/nativestyle/items/qquickstyleitemslider.cpp +++ b/src/imports/nativestyle/items/qquickstyleitemslider.cpp @@ -36,12 +36,12 @@ #include "qquickstyleitemslider.h" -QFont QQuickStyleItemSlider::styleFont(QQuickItem *control) +QFont QQuickStyleItemSlider::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_ProgressBarLabel, controlSize(control)); } -void QQuickStyleItemSlider::connectToControl() +void QQuickStyleItemSlider::connectToControl() const { QQuickStyleItem::connectToControl(); auto slider = control<QQuickSlider>(); @@ -70,14 +70,14 @@ StyleItemGeometry QQuickStyleItemSlider::calculateGeometry() return geometry; } -void QQuickStyleItemSlider::paintEvent(QPainter *painter) +void QQuickStyleItemSlider::paintEvent(QPainter *painter) const { QStyleOptionSlider styleOption; initStyleOption(styleOption); style()->drawComplexControl(QStyle::CC_Slider, &styleOption, painter); } -void QQuickStyleItemSlider::initStyleOption(QStyleOptionSlider &styleOption) +void QQuickStyleItemSlider::initStyleOption(QStyleOptionSlider &styleOption) const { initStyleOptionBase(styleOption); auto slider = control<QQuickSlider>(); diff --git a/src/imports/nativestyle/items/qquickstyleitemslider.h b/src/imports/nativestyle/items/qquickstyleitemslider.h index 1108930b..9a514207 100644 --- a/src/imports/nativestyle/items/qquickstyleitemslider.h +++ b/src/imports/nativestyle/items/qquickstyleitemslider.h @@ -55,15 +55,15 @@ public: }; Q_ENUM(SubControl) - QFont styleFont(QQuickItem *control) override; + QFont styleFont(QQuickItem *control) const override; protected: - void connectToControl() override; - void paintEvent(QPainter *painter) override; + void connectToControl() const override; + void paintEvent(QPainter *painter) const override; StyleItemGeometry calculateGeometry() override; private: - void initStyleOption(QStyleOptionSlider &styleOption); + void initStyleOption(QStyleOptionSlider &styleOption) const; private: SubControl m_subControl = Groove; diff --git a/src/imports/nativestyle/items/qquickstyleitemspinbox.cpp b/src/imports/nativestyle/items/qquickstyleitemspinbox.cpp index 7bae2c8b..46097567 100644 --- a/src/imports/nativestyle/items/qquickstyleitemspinbox.cpp +++ b/src/imports/nativestyle/items/qquickstyleitemspinbox.cpp @@ -36,12 +36,12 @@ #include "qquickstyleitemspinbox.h" -QFont QQuickStyleItemSpinBox::styleFont(QQuickItem *control) +QFont QQuickStyleItemSpinBox::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_ComboBoxLabel, controlSize(control)); } -void QQuickStyleItemSpinBox::connectToControl() +void QQuickStyleItemSpinBox::connectToControl() const { QQuickStyleItem::connectToControl(); auto spinbox = control<QQuickSpinBox>(); @@ -71,14 +71,14 @@ StyleItemGeometry QQuickStyleItemSpinBox::calculateGeometry() return geometry; } -void QQuickStyleItemSpinBox::paintEvent(QPainter *painter) +void QQuickStyleItemSpinBox::paintEvent(QPainter *painter) const { QStyleOptionSpinBox styleOption; initStyleOption(styleOption); style()->drawComplexControl(QStyle::CC_SpinBox, &styleOption, painter); } -void QQuickStyleItemSpinBox::initStyleOption(QStyleOptionSpinBox &styleOption) +void QQuickStyleItemSpinBox::initStyleOption(QStyleOptionSpinBox &styleOption) const { initStyleOptionBase(styleOption); auto spinbox = control<QQuickSpinBox>(); diff --git a/src/imports/nativestyle/items/qquickstyleitemspinbox.h b/src/imports/nativestyle/items/qquickstyleitemspinbox.h index 101d4b2a..d4b9f9fa 100644 --- a/src/imports/nativestyle/items/qquickstyleitemspinbox.h +++ b/src/imports/nativestyle/items/qquickstyleitemspinbox.h @@ -56,15 +56,15 @@ public: }; Q_ENUM(SubControl) - QFont styleFont(QQuickItem *control) override; + QFont styleFont(QQuickItem *control) const override; protected: - void connectToControl() override; - void paintEvent(QPainter *painter) override; + void connectToControl() const override; + void paintEvent(QPainter *painter) const override; StyleItemGeometry calculateGeometry() override; private: - void initStyleOption(QStyleOptionSpinBox &styleOption); + void initStyleOption(QStyleOptionSpinBox &styleOption) const; private: SubControl m_subControl = Frame; diff --git a/src/imports/nativestyle/items/qquickstyleitemtextfield.cpp b/src/imports/nativestyle/items/qquickstyleitemtextfield.cpp index d4b4a9a1..cd7d35aa 100644 --- a/src/imports/nativestyle/items/qquickstyleitemtextfield.cpp +++ b/src/imports/nativestyle/items/qquickstyleitemtextfield.cpp @@ -36,12 +36,12 @@ #include "qquickstyleitemtextfield.h" -QFont QQuickStyleItemTextField::styleFont(QQuickItem *control) +QFont QQuickStyleItemTextField::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_ComboBoxLabel, controlSize(control)); } -void QQuickStyleItemTextField::connectToControl() +void QQuickStyleItemTextField::connectToControl() const { QQuickStyleItem::connectToControl(); auto textField = control<QQuickTextField>(); @@ -66,14 +66,14 @@ StyleItemGeometry QQuickStyleItemTextField::calculateGeometry() return geometry; } -void QQuickStyleItemTextField::paintEvent(QPainter *painter) +void QQuickStyleItemTextField::paintEvent(QPainter *painter) const { QStyleOptionFrame styleOption; initStyleOption(styleOption); style()->drawPrimitive(QStyle::PE_PanelLineEdit, &styleOption, painter); } -void QQuickStyleItemTextField::initStyleOption(QStyleOptionFrame &styleOption) +void QQuickStyleItemTextField::initStyleOption(QStyleOptionFrame &styleOption) const { initStyleOptionBase(styleOption); auto textField = control<QQuickTextField>(); diff --git a/src/imports/nativestyle/items/qquickstyleitemtextfield.h b/src/imports/nativestyle/items/qquickstyleitemtextfield.h index 57aa8885..35aaf753 100644 --- a/src/imports/nativestyle/items/qquickstyleitemtextfield.h +++ b/src/imports/nativestyle/items/qquickstyleitemtextfield.h @@ -46,15 +46,15 @@ class QQuickStyleItemTextField : public QQuickStyleItem QML_NAMED_ELEMENT(TextField) public: - QFont styleFont(QQuickItem *control) override; + QFont styleFont(QQuickItem *control) const override; protected: - void connectToControl() override; - void paintEvent(QPainter *painter) override; + void connectToControl() const override; + void paintEvent(QPainter *painter) const override; StyleItemGeometry calculateGeometry() override; private: - void initStyleOption(QStyleOptionFrame &styleOption); + void initStyleOption(QStyleOptionFrame &styleOption) const; }; #endif // QQUICKSTYLEITEMTEXTFIELD_H |