From 5651ee3ed28cf260090272551a6fcb5fcd83b077 Mon Sep 17 00:00:00 2001 From: Achraf k Date: Thu, 17 Feb 2022 03:39:07 +0100 Subject: [PATCH] RadioButton moved to md. --- components/qtmaterialradiobutton.cpp | 26 +++++++++++++++----------- components/qtmaterialradiobutton.h | 16 +++++++++------- components/qtmaterialradiobutton_p.h | 20 +++++++++++--------- 3 files changed, 35 insertions(+), 27 deletions(-) diff --git a/components/qtmaterialradiobutton.cpp b/components/qtmaterialradiobutton.cpp index 86427c7..2eecd81 100644 --- a/components/qtmaterialradiobutton.cpp +++ b/components/qtmaterialradiobutton.cpp @@ -5,24 +5,27 @@ #include #include #include "lib/qtmaterialcheckable_internal.h" +namespace md +{ + /*! * \class QtMaterialRadioButtonPrivate * \internal */ -QtMaterialRadioButtonPrivate::QtMaterialRadioButtonPrivate(QtMaterialRadioButton *q) - : QtMaterialCheckablePrivate(q) +RadioButtonPrivate::RadioButtonPrivate(RadioButton *q) + : CheckablePrivate(q) { } -QtMaterialRadioButtonPrivate::~QtMaterialRadioButtonPrivate() +RadioButtonPrivate::~RadioButtonPrivate() { } -void QtMaterialRadioButtonPrivate::init() +void RadioButtonPrivate::init() { - Q_Q(QtMaterialRadioButton); + Q_Q(RadioButton); q->setAutoExclusive(true); @@ -78,23 +81,24 @@ void QtMaterialRadioButtonPrivate::init() * \class QtMaterialRadioButton */ -QtMaterialRadioButton::QtMaterialRadioButton(QWidget *parent) - : QtMaterialCheckable(*new QtMaterialRadioButtonPrivate(this), parent) +RadioButton::RadioButton(QWidget *parent) + : Checkable(*new RadioButtonPrivate(this), parent) { d_func()->init(); } -QtMaterialRadioButton::~QtMaterialRadioButton() +RadioButton::~RadioButton() { } -void QtMaterialRadioButton::setupProperties() +void RadioButton::setupProperties() { - QtMaterialCheckable::setupProperties(); + Checkable::setupProperties(); - Q_D(QtMaterialRadioButton); + Q_D(RadioButton); d->checkedState->assignProperty(d->checkedIcon, "color", checkedColor()); d->checkedState->assignProperty(d->uncheckedIcon, "color", uncheckedColor()); d->uncheckedState->assignProperty(d->uncheckedIcon, "color", uncheckedColor()); } +} diff --git a/components/qtmaterialradiobutton.h b/components/qtmaterialradiobutton.h index adc535c..4b737ea 100644 --- a/components/qtmaterialradiobutton.h +++ b/components/qtmaterialradiobutton.h @@ -2,23 +2,25 @@ #define QTMATERIALRADIOBUTTON_H #include "lib/qtmaterialcheckable.h" +namespace md +{ -class QtMaterialRadioButtonPrivate; +class RadioButtonPrivate; -class QtMaterialRadioButton : public QtMaterialCheckable +class RadioButton : public Checkable { Q_OBJECT public: - explicit QtMaterialRadioButton(QWidget *parent = 0); - ~QtMaterialRadioButton(); + explicit RadioButton(QWidget *parent = 0); + ~RadioButton(); protected: void setupProperties(); private: - Q_DISABLE_COPY(QtMaterialRadioButton) - Q_DECLARE_PRIVATE(QtMaterialRadioButton) + Q_DISABLE_COPY(RadioButton) + Q_DECLARE_PRIVATE(RadioButton) }; - +} #endif // QTMATERIALRADIOBUTTON_H diff --git a/components/qtmaterialradiobutton_p.h b/components/qtmaterialradiobutton_p.h index 6bb954a..6a25181 100644 --- a/components/qtmaterialradiobutton_p.h +++ b/components/qtmaterialradiobutton_p.h @@ -2,19 +2,21 @@ #define QTMATERIALRADIOBUTTON_P_H #include "lib/qtmaterialcheckable_p.h" - -class QtMaterialRadioButton; - -class QtMaterialRadioButtonPrivate : public QtMaterialCheckablePrivate +namespace md { - Q_DISABLE_COPY(QtMaterialRadioButtonPrivate) - Q_DECLARE_PUBLIC(QtMaterialRadioButton) + +class RadioButton; + +class RadioButtonPrivate : public CheckablePrivate +{ + Q_DISABLE_COPY(RadioButtonPrivate) + Q_DECLARE_PUBLIC(RadioButton) public: - QtMaterialRadioButtonPrivate(QtMaterialRadioButton *q); - ~QtMaterialRadioButtonPrivate(); + RadioButtonPrivate(RadioButton *q); + ~RadioButtonPrivate(); void init(); }; - +} #endif // QTMATERIALRADIOBUTTON_P_H