diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-05-04 14:36:25 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-05-04 22:34:16 +0200 |
commit | 5f85b9265bf0d10ea683eb7d3ab29b48ba3fb536 (patch) | |
tree | bf0384a485ee3d421bd0d8782a7403acb139ee6d | |
parent | 2664b1988f031366c2616581e65b0e02e37e3ff1 (diff) |
QtQuickNativeStyle: add missing QT_{BEGIN,END}_NAMESPACE
Detected by the includemoc script reporting them as missing (it uses
QT_END_NAMESPACE as a marker to insert the moc-file include).
Despite the headers not being _p.h and not containing the We Mean Itâ„¢
warning, these sources are private (it's a plugin).
Task-number: QTBUG-102948
Pick-to: 6.3 6.2 5.15
Change-Id: Ifa3ddb4212c02eb5cbe26195bdd2d4d3674aeaa1
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
26 files changed, 104 insertions, 0 deletions
diff --git a/src/quicknativestyle/items/qquickstyleitembutton.cpp b/src/quicknativestyle/items/qquickstyleitembutton.cpp index 17625e42a6..1b0ebac989 100644 --- a/src/quicknativestyle/items/qquickstyleitembutton.cpp +++ b/src/quicknativestyle/items/qquickstyleitembutton.cpp @@ -39,6 +39,8 @@ #include "qquickstyleitembutton.h" +QT_BEGIN_NAMESPACE + QFont QQuickStyleItemButton::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_PushButtonLabel, controlSize(control)); @@ -90,3 +92,5 @@ void QQuickStyleItemButton::initStyleOption(QStyleOptionButton &styleOption) con if (button->isFlat()) styleOption.features |= QStyleOptionButton::Flat; } + +QT_END_NAMESPACE diff --git a/src/quicknativestyle/items/qquickstyleitembutton.h b/src/quicknativestyle/items/qquickstyleitembutton.h index a8f86c5825..f03fa0baca 100644 --- a/src/quicknativestyle/items/qquickstyleitembutton.h +++ b/src/quicknativestyle/items/qquickstyleitembutton.h @@ -43,6 +43,8 @@ #include "qquickstyleitem.h" #include <QtQuickTemplates2/private/qquickbutton_p.h> +QT_BEGIN_NAMESPACE + class QQuickStyleItemButton : public QQuickStyleItem { Q_OBJECT @@ -60,4 +62,6 @@ private: void initStyleOption(QStyleOptionButton &styleOption) const; }; +QT_END_NAMESPACE + #endif // QQUICKSTYLEITEMBUTTON_H diff --git a/src/quicknativestyle/items/qquickstyleitemcheckbox.cpp b/src/quicknativestyle/items/qquickstyleitemcheckbox.cpp index 8468428b26..4825eca298 100644 --- a/src/quicknativestyle/items/qquickstyleitemcheckbox.cpp +++ b/src/quicknativestyle/items/qquickstyleitemcheckbox.cpp @@ -39,6 +39,8 @@ #include "qquickstyleitemcheckbox.h" +QT_BEGIN_NAMESPACE + QFont QQuickStyleItemCheckBox::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_RadioButtonLabel, controlSize(control)); @@ -90,3 +92,5 @@ void QQuickStyleItemCheckBox::initStyleOption(QStyleOptionButton &styleOption) c else styleOption.state |= checkbox->isChecked() ? QStyle::State_On : QStyle::State_Off; } + +QT_END_NAMESPACE diff --git a/src/quicknativestyle/items/qquickstyleitemcheckbox.h b/src/quicknativestyle/items/qquickstyleitemcheckbox.h index 3ce3101ac2..1f14002ee0 100644 --- a/src/quicknativestyle/items/qquickstyleitemcheckbox.h +++ b/src/quicknativestyle/items/qquickstyleitemcheckbox.h @@ -43,6 +43,8 @@ #include "qquickstyleitem.h" #include <QtQuickTemplates2/private/qquickcheckbox_p.h> +QT_BEGIN_NAMESPACE + class QQuickStyleItemCheckBox : public QQuickStyleItem { Q_OBJECT @@ -60,4 +62,6 @@ private: void initStyleOption(QStyleOptionButton &styleOption) const; }; +QT_END_NAMESPACE + #endif // QQUICKSTYLEITEMCHECKBOX_H diff --git a/src/quicknativestyle/items/qquickstyleitemcombobox.cpp b/src/quicknativestyle/items/qquickstyleitemcombobox.cpp index 73ffaf7859..6f4a215fd0 100644 --- a/src/quicknativestyle/items/qquickstyleitemcombobox.cpp +++ b/src/quicknativestyle/items/qquickstyleitemcombobox.cpp @@ -39,6 +39,8 @@ #include "qquickstyleitemcombobox.h" +QT_BEGIN_NAMESPACE + QFont QQuickStyleItemComboBox::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_PushButtonLabel, controlSize(control)); @@ -90,3 +92,5 @@ void QQuickStyleItemComboBox::initStyleOption(QStyleOptionComboBox &styleOption) if (!comboBox->isFlat() && !comboBox->isDown()) styleOption.state |= QStyle::State_Raised; } + +QT_END_NAMESPACE diff --git a/src/quicknativestyle/items/qquickstyleitemcombobox.h b/src/quicknativestyle/items/qquickstyleitemcombobox.h index 0535ac6175..60d769af07 100644 --- a/src/quicknativestyle/items/qquickstyleitemcombobox.h +++ b/src/quicknativestyle/items/qquickstyleitemcombobox.h @@ -43,6 +43,8 @@ #include "qquickstyleitem.h" #include <QtQuickTemplates2/private/qquickcombobox_p.h> +QT_BEGIN_NAMESPACE + class QQuickStyleItemComboBox : public QQuickStyleItem { Q_OBJECT @@ -60,4 +62,6 @@ private: void initStyleOption(QStyleOptionComboBox &styleOption) const; }; +QT_END_NAMESPACE + #endif // QQUICKSTYLEITEMCOMBOBOX_H diff --git a/src/quicknativestyle/items/qquickstyleitemdial.cpp b/src/quicknativestyle/items/qquickstyleitemdial.cpp index 739bd3435e..bb564baefc 100644 --- a/src/quicknativestyle/items/qquickstyleitemdial.cpp +++ b/src/quicknativestyle/items/qquickstyleitemdial.cpp @@ -39,6 +39,8 @@ #include "qquickstyleitemdial.h" +QT_BEGIN_NAMESPACE + QFont QQuickStyleItemDial::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_ProgressBarLabel, controlSize(control)); @@ -112,3 +114,5 @@ void QQuickStyleItemDial::initStyleOption(QStyleOptionSlider &styleOption) const } } + +QT_END_NAMESPACE diff --git a/src/quicknativestyle/items/qquickstyleitemdial.h b/src/quicknativestyle/items/qquickstyleitemdial.h index 734587b865..4f0ee91c8d 100644 --- a/src/quicknativestyle/items/qquickstyleitemdial.h +++ b/src/quicknativestyle/items/qquickstyleitemdial.h @@ -43,6 +43,8 @@ #include "qquickstyleitem.h" #include <QtQuickTemplates2/private/qquickdial_p.h> +QT_BEGIN_NAMESPACE + class QQuickStyleItemDial : public QQuickStyleItem { Q_OBJECT @@ -60,4 +62,6 @@ private: void initStyleOption(QStyleOptionSlider &styleOption) const; }; +QT_END_NAMESPACE + #endif // QQUICKSTYLEITEMDIAL_H diff --git a/src/quicknativestyle/items/qquickstyleitemframe.cpp b/src/quicknativestyle/items/qquickstyleitemframe.cpp index c8ffb19f18..3246fb5f06 100644 --- a/src/quicknativestyle/items/qquickstyleitemframe.cpp +++ b/src/quicknativestyle/items/qquickstyleitemframe.cpp @@ -39,6 +39,8 @@ #include "qquickstyleitemframe.h" +QT_BEGIN_NAMESPACE + StyleItemGeometry QQuickStyleItemFrame::calculateGeometry() { QStyleOptionFrame styleOption; @@ -68,3 +70,5 @@ void QQuickStyleItemFrame::initStyleOption(QStyleOptionFrame &styleOption) const styleOption.frameShape = QStyleOptionFrame::StyledPanel; styleOption.features = QStyleOptionFrame::Flat; } + +QT_END_NAMESPACE diff --git a/src/quicknativestyle/items/qquickstyleitemframe.h b/src/quicknativestyle/items/qquickstyleitemframe.h index cfd7f6a43b..0acedadd9f 100644 --- a/src/quicknativestyle/items/qquickstyleitemframe.h +++ b/src/quicknativestyle/items/qquickstyleitemframe.h @@ -43,6 +43,8 @@ #include "qquickstyleitem.h" #include <QtQuickTemplates2/private/qquickframe_p.h> +QT_BEGIN_NAMESPACE + class QQuickStyleItemFrame : public QQuickStyleItem { Q_OBJECT @@ -56,4 +58,6 @@ private: void initStyleOption(QStyleOptionFrame &styleOption) const; }; +QT_END_NAMESPACE + #endif // QQUICKSTYLEITEMFRAME_H diff --git a/src/quicknativestyle/items/qquickstyleitemgroupbox.cpp b/src/quicknativestyle/items/qquickstyleitemgroupbox.cpp index 0126ee54b2..4172926409 100644 --- a/src/quicknativestyle/items/qquickstyleitemgroupbox.cpp +++ b/src/quicknativestyle/items/qquickstyleitemgroupbox.cpp @@ -39,6 +39,8 @@ #include "qquickstyleitemgroupbox.h" +QT_BEGIN_NAMESPACE + QFont QQuickStyleItemGroupBox::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_HeaderLabel, controlSize(control)); @@ -101,3 +103,5 @@ QPointF QQuickStyleItemGroupBox::labelPos() const { return m_labelPos; } + +QT_END_NAMESPACE diff --git a/src/quicknativestyle/items/qquickstyleitemgroupbox.h b/src/quicknativestyle/items/qquickstyleitemgroupbox.h index 8ccd44900b..d11210a3f5 100644 --- a/src/quicknativestyle/items/qquickstyleitemgroupbox.h +++ b/src/quicknativestyle/items/qquickstyleitemgroupbox.h @@ -43,6 +43,8 @@ #include "qquickstyleitem.h" #include <QtQuickTemplates2/private/qquickgroupbox_p.h> +QT_BEGIN_NAMESPACE + class QQuickStyleItemGroupBox : public QQuickStyleItem { Q_OBJECT @@ -70,4 +72,6 @@ private: void initStyleOption(QStyleOptionGroupBox &styleOption) const; }; +QT_END_NAMESPACE + #endif // QQUICKSTYLEITEMGROUPBOX_H diff --git a/src/quicknativestyle/items/qquickstyleitemprogressbar.cpp b/src/quicknativestyle/items/qquickstyleitemprogressbar.cpp index 58e8b827d8..c8738d579a 100644 --- a/src/quicknativestyle/items/qquickstyleitemprogressbar.cpp +++ b/src/quicknativestyle/items/qquickstyleitemprogressbar.cpp @@ -39,6 +39,8 @@ #include "qquickstyleitemprogressbar.h" +QT_BEGIN_NAMESPACE + QFont QQuickStyleItemProgressBar::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_ProgressBarLabel, controlSize(control)); @@ -115,3 +117,5 @@ void QQuickStyleItemProgressBar::initStyleOption(QStyleOptionProgressBar &styleO styleOption.progress = progressBar->value(); } } + +QT_END_NAMESPACE diff --git a/src/quicknativestyle/items/qquickstyleitemprogressbar.h b/src/quicknativestyle/items/qquickstyleitemprogressbar.h index 9b46aa3f6c..334846c48a 100644 --- a/src/quicknativestyle/items/qquickstyleitemprogressbar.h +++ b/src/quicknativestyle/items/qquickstyleitemprogressbar.h @@ -43,6 +43,8 @@ #include "qquickstyleitem.h" #include <QtQuickTemplates2/private/qquickprogressbar_p.h> +QT_BEGIN_NAMESPACE + class QQuickStyleItemProgressBar : public QQuickStyleItem { Q_OBJECT @@ -61,4 +63,6 @@ private: void initStyleOption(QStyleOptionProgressBar &styleOption) const; }; +QT_END_NAMESPACE + #endif // QQUICKSTYLEITEMPROGRESSBAR_H diff --git a/src/quicknativestyle/items/qquickstyleitemradiobutton.cpp b/src/quicknativestyle/items/qquickstyleitemradiobutton.cpp index 9d7b0a6e54..6fee60a1b6 100644 --- a/src/quicknativestyle/items/qquickstyleitemradiobutton.cpp +++ b/src/quicknativestyle/items/qquickstyleitemradiobutton.cpp @@ -39,6 +39,8 @@ #include "qquickstyleitemradiobutton.h" +QT_BEGIN_NAMESPACE + QFont QQuickStyleItemRadioButton::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_RadioButtonLabel, controlSize(control)); @@ -84,3 +86,5 @@ void QQuickStyleItemRadioButton::initStyleOption(QStyleOptionButton &styleOption styleOption.state |= checkbox->isDown() ? QStyle::State_Sunken : QStyle::State_Raised; styleOption.state |= checkbox->isChecked() ? QStyle::State_On : QStyle::State_Off; } + +QT_END_NAMESPACE diff --git a/src/quicknativestyle/items/qquickstyleitemradiobutton.h b/src/quicknativestyle/items/qquickstyleitemradiobutton.h index b8aadeeb6b..40f82abe9d 100644 --- a/src/quicknativestyle/items/qquickstyleitemradiobutton.h +++ b/src/quicknativestyle/items/qquickstyleitemradiobutton.h @@ -43,6 +43,8 @@ #include "qquickstyleitem.h" #include <QtQuickTemplates2/private/qquickradiobutton_p.h> +QT_BEGIN_NAMESPACE + class QQuickStyleItemRadioButton : public QQuickStyleItem { Q_OBJECT @@ -60,4 +62,6 @@ private: void initStyleOption(QStyleOptionButton &styleOption) const; }; +QT_END_NAMESPACE + #endif // QQUICKSTYLEITEMRADIOBUTTON_H diff --git a/src/quicknativestyle/items/qquickstyleitemscrollbar.cpp b/src/quicknativestyle/items/qquickstyleitemscrollbar.cpp index b3ce36ce32..10ddb35fa8 100644 --- a/src/quicknativestyle/items/qquickstyleitemscrollbar.cpp +++ b/src/quicknativestyle/items/qquickstyleitemscrollbar.cpp @@ -39,6 +39,8 @@ #include "qquickstyleitemscrollbar.h" +QT_BEGIN_NAMESPACE + QFont QQuickStyleItemScrollBar::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_ProgressBarLabel, controlSize(control)); @@ -152,3 +154,5 @@ void QQuickStyleItemScrollBar::initStyleOption(QStyleOptionSlider &styleOption) styleOption.maximum = 1; styleOption.sliderValue = 0; } + +QT_END_NAMESPACE diff --git a/src/quicknativestyle/items/qquickstyleitemscrollbar.h b/src/quicknativestyle/items/qquickstyleitemscrollbar.h index 1cd9d9fc93..a78c8cbd01 100644 --- a/src/quicknativestyle/items/qquickstyleitemscrollbar.h +++ b/src/quicknativestyle/items/qquickstyleitemscrollbar.h @@ -43,6 +43,8 @@ #include "qquickstyleitem.h" #include <QtQuickTemplates2/private/qquickscrollbar_p.h> +QT_BEGIN_NAMESPACE + class QQuickStyleItemScrollBar : public QQuickStyleItem { Q_OBJECT @@ -74,4 +76,6 @@ private: SubControl m_subControl = Groove; }; +QT_END_NAMESPACE + #endif // QQUICKSTYLEITEMSCROLLBAR_H diff --git a/src/quicknativestyle/items/qquickstyleitemslider.cpp b/src/quicknativestyle/items/qquickstyleitemslider.cpp index 9e6cf79997..7a11fd90f7 100644 --- a/src/quicknativestyle/items/qquickstyleitemslider.cpp +++ b/src/quicknativestyle/items/qquickstyleitemslider.cpp @@ -39,6 +39,8 @@ #include "qquickstyleitemslider.h" +QT_BEGIN_NAMESPACE + QFont QQuickStyleItemSlider::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_ProgressBarLabel, controlSize(control)); @@ -124,3 +126,5 @@ void QQuickStyleItemSlider::initStyleOption(QStyleOptionSlider &styleOption) con styleOption.sliderValue = int((slider->value() - min) * normalizeMultiplier); styleOption.sliderPosition = int(slider->position() * styleOption.maximum); } + +QT_END_NAMESPACE diff --git a/src/quicknativestyle/items/qquickstyleitemslider.h b/src/quicknativestyle/items/qquickstyleitemslider.h index 3cb85599de..a255f5c717 100644 --- a/src/quicknativestyle/items/qquickstyleitemslider.h +++ b/src/quicknativestyle/items/qquickstyleitemslider.h @@ -43,6 +43,8 @@ #include "qquickstyleitem.h" #include <QtQuickTemplates2/private/qquickslider_p.h> +QT_BEGIN_NAMESPACE + class QQuickStyleItemSlider : public QQuickStyleItem { Q_OBJECT @@ -72,4 +74,6 @@ private: SubControl m_subControl = Groove; }; +QT_END_NAMESPACE + #endif // QQUICKSTYLEITEMSLIDER_H diff --git a/src/quicknativestyle/items/qquickstyleitemspinbox.cpp b/src/quicknativestyle/items/qquickstyleitemspinbox.cpp index 0a0e05ee89..9cb9bbe7b1 100644 --- a/src/quicknativestyle/items/qquickstyleitemspinbox.cpp +++ b/src/quicknativestyle/items/qquickstyleitemspinbox.cpp @@ -40,6 +40,8 @@ #include "qquickstyleitemspinbox.h" #include <QtQuickTemplates2/private/qquickindicatorbutton_p.h> +QT_BEGIN_NAMESPACE + QFont QQuickStyleItemSpinBox::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_ComboBoxLabel, controlSize(control)); @@ -111,3 +113,5 @@ void QQuickStyleItemSpinBox::initStyleOption(QStyleOptionSpinBox &styleOption) c styleOption.buttonSymbols = QStyleOptionSpinBox::UpDownArrows; styleOption.stepEnabled = QStyleOptionSpinBox::StepEnabled; } + +QT_END_NAMESPACE diff --git a/src/quicknativestyle/items/qquickstyleitemspinbox.h b/src/quicknativestyle/items/qquickstyleitemspinbox.h index 0d773b86ab..63890da4f2 100644 --- a/src/quicknativestyle/items/qquickstyleitemspinbox.h +++ b/src/quicknativestyle/items/qquickstyleitemspinbox.h @@ -43,6 +43,8 @@ #include "qquickstyleitem.h" #include <QtQuickTemplates2/private/qquickspinbox_p.h> +QT_BEGIN_NAMESPACE + class QQuickStyleItemSpinBox : public QQuickStyleItem { Q_OBJECT @@ -73,4 +75,6 @@ private: SubControl m_subControl = Frame; }; +QT_END_NAMESPACE + #endif // QQUICKSTYLEITEMSPINBOX_H diff --git a/src/quicknativestyle/items/qquickstyleitemtextfield.cpp b/src/quicknativestyle/items/qquickstyleitemtextfield.cpp index 86075a379e..dd4e56f5b0 100644 --- a/src/quicknativestyle/items/qquickstyleitemtextfield.cpp +++ b/src/quicknativestyle/items/qquickstyleitemtextfield.cpp @@ -39,6 +39,8 @@ #include "qquickstyleitemtextfield.h" +QT_BEGIN_NAMESPACE + QFont QQuickStyleItemTextField::styleFont(QQuickItem *control) const { return style()->font(QStyle::CE_ComboBoxLabel, controlSize(control)); @@ -93,3 +95,5 @@ void QQuickStyleItemTextField::initStyleOption(QStyleOptionFrame &styleOption) c if (textField->isReadOnly()) styleOption.state |= QStyle::State_ReadOnly; } + +QT_END_NAMESPACE diff --git a/src/quicknativestyle/items/qquickstyleitemtextfield.h b/src/quicknativestyle/items/qquickstyleitemtextfield.h index 1db751dbbd..74b09f97ec 100644 --- a/src/quicknativestyle/items/qquickstyleitemtextfield.h +++ b/src/quicknativestyle/items/qquickstyleitemtextfield.h @@ -43,6 +43,8 @@ #include "qquickstyleitem.h" #include <QtQuickTemplates2/private/qquicktextfield_p.h> +QT_BEGIN_NAMESPACE + class QQuickStyleItemTextField : public QQuickStyleItem { Q_OBJECT @@ -60,4 +62,6 @@ private: void initStyleOption(QStyleOptionFrame &styleOption) const; }; +QT_END_NAMESPACE + #endif // QQUICKSTYLEITEMTEXTFIELD_H diff --git a/src/quicknativestyle/items/qquickstyleitemtreeindicator.cpp b/src/quicknativestyle/items/qquickstyleitemtreeindicator.cpp index 195e720086..365bbd40ce 100644 --- a/src/quicknativestyle/items/qquickstyleitemtreeindicator.cpp +++ b/src/quicknativestyle/items/qquickstyleitemtreeindicator.cpp @@ -39,6 +39,8 @@ #include "qquickstyleitemtreeindicator.h" +QT_BEGIN_NAMESPACE + void QQuickStyleItemTreeIndicator::connectToControl() const { QQuickStyleItem::connectToControl(); @@ -76,3 +78,5 @@ void QQuickStyleItemTreeIndicator::initStyleOption(QStyleOptionViewItem &styleOp if (delegate->expanded()) styleOption.state |= QStyle::State_Open; } + +QT_END_NAMESPACE diff --git a/src/quicknativestyle/items/qquickstyleitemtreeindicator.h b/src/quicknativestyle/items/qquickstyleitemtreeindicator.h index 7523c2e9fb..2d457a2986 100644 --- a/src/quicknativestyle/items/qquickstyleitemtreeindicator.h +++ b/src/quicknativestyle/items/qquickstyleitemtreeindicator.h @@ -43,6 +43,8 @@ #include "qquickstyleitem.h" #include <QtQuickTemplates2/private/qquicktreeviewdelegate_p.h> +QT_BEGIN_NAMESPACE + class QQuickStyleItemTreeIndicator : public QQuickStyleItem { Q_OBJECT @@ -57,4 +59,6 @@ private: void initStyleOption(QStyleOptionViewItem &styleOption) const; }; +QT_END_NAMESPACE + #endif // QQUICKSTYLEITEMTREEINDICATOR_H |