From cce6e6f1cfc198169f87bc3cc656163ebb514e3b Mon Sep 17 00:00:00 2001 From: Achraf k Date: Thu, 17 Feb 2022 01:53:19 +0100 Subject: [PATCH] Move Avatar => md namespace. --- components/qtmaterialavatar.cpp | 88 +++++++++++++++++---------------- components/qtmaterialavatar.h | 22 +++++---- components/qtmaterialavatar_p.h | 39 ++++++++------- 3 files changed, 80 insertions(+), 69 deletions(-) diff --git a/components/qtmaterialavatar.cpp b/components/qtmaterialavatar.cpp index e769f8f..ab8c38d 100644 --- a/components/qtmaterialavatar.cpp +++ b/components/qtmaterialavatar.cpp @@ -4,6 +4,8 @@ #include #include "lib/qtmaterialstyle.h" +namespace md +{ /*! * \class QtMaterialAvatarPrivate * \internal @@ -12,7 +14,7 @@ /*! * \internal */ -QtMaterialAvatarPrivate::QtMaterialAvatarPrivate(QtMaterialAvatar *q) +AvatarPrivate::AvatarPrivate(Avatar *q) : q_ptr(q) { } @@ -20,16 +22,16 @@ QtMaterialAvatarPrivate::QtMaterialAvatarPrivate(QtMaterialAvatar *q) /*! * \internal */ -QtMaterialAvatarPrivate::~QtMaterialAvatarPrivate() +AvatarPrivate::~AvatarPrivate() { } /*! * \internal */ -void QtMaterialAvatarPrivate::init() +void AvatarPrivate::init() { - Q_Q(QtMaterialAvatar); + Q_Q(Avatar); size = 40; type = Material::LetterAvatar; @@ -48,47 +50,47 @@ void QtMaterialAvatarPrivate::init() * \class QtMaterialAvatar */ -QtMaterialAvatar::QtMaterialAvatar(QWidget *parent) +Avatar::Avatar(QWidget *parent) : QWidget(parent), - d_ptr(new QtMaterialAvatarPrivate(this)) + d_ptr(new AvatarPrivate(this)) { d_func()->init(); } -QtMaterialAvatar::QtMaterialAvatar(const QIcon &icon, QWidget *parent) +Avatar::Avatar(const QIcon &icon, QWidget *parent) : QWidget(parent), - d_ptr(new QtMaterialAvatarPrivate(this)) + d_ptr(new AvatarPrivate(this)) { d_func()->init(); setIcon(icon); } -QtMaterialAvatar::QtMaterialAvatar(const QChar &letter, QWidget *parent) +Avatar::Avatar(const QChar &letter, QWidget *parent) : QWidget(parent), - d_ptr(new QtMaterialAvatarPrivate(this)) + d_ptr(new AvatarPrivate(this)) { d_func()->init(); setLetter(letter); } -QtMaterialAvatar::QtMaterialAvatar(const QImage &image, QWidget *parent) +Avatar::Avatar(const QImage &image, QWidget *parent) : QWidget(parent), - d_ptr(new QtMaterialAvatarPrivate(this)) + d_ptr(new AvatarPrivate(this)) { d_func()->init(); setImage(image); } -QtMaterialAvatar::~QtMaterialAvatar() +Avatar::~Avatar() { } -void QtMaterialAvatar::setUseThemeColors(bool value) +void Avatar::setUseThemeColors(bool value) { - Q_D(QtMaterialAvatar); + Q_D(Avatar); if (d->useThemeColors == value) { return; @@ -98,16 +100,16 @@ void QtMaterialAvatar::setUseThemeColors(bool value) update(); } -bool QtMaterialAvatar::useThemeColors() const +bool Avatar::useThemeColors() const { - Q_D(const QtMaterialAvatar); + Q_D(const Avatar); return d->useThemeColors; } -void QtMaterialAvatar::setTextColor(const QColor &color) +void Avatar::setTextColor(const QColor &color) { - Q_D(QtMaterialAvatar); + Q_D(Avatar); d->textColor = color; @@ -115,9 +117,9 @@ void QtMaterialAvatar::setTextColor(const QColor &color) update(); } -QColor QtMaterialAvatar::textColor() const +QColor Avatar::textColor() const { - Q_D(const QtMaterialAvatar); + Q_D(const Avatar); if (d->useThemeColors || !d->textColor.isValid()) { return QtMaterialStyle::instance().themeColor("canvas"); @@ -126,19 +128,19 @@ QColor QtMaterialAvatar::textColor() const } } -void QtMaterialAvatar::setBackgroundColor(const QColor &color) +void Avatar::setBackgroundColor(const QColor &color) { - Q_D(QtMaterialAvatar); + Q_D(Avatar); d->backgroundColor = color; - + MATERIAL_DISABLE_THEME_COLORS update(); } -QColor QtMaterialAvatar::backgroundColor() const +QColor Avatar::backgroundColor() const { - Q_D(const QtMaterialAvatar); + Q_D(const Avatar); if (d->useThemeColors || !d->backgroundColor.isValid()) { return QtMaterialStyle::instance().themeColor("primary1"); @@ -150,16 +152,16 @@ QColor QtMaterialAvatar::backgroundColor() const /*! * \reimp */ -QSize QtMaterialAvatar::sizeHint() const +QSize Avatar::sizeHint() const { - Q_D(const QtMaterialAvatar); + Q_D(const Avatar); return QSize(d->size+2, d->size+2); } -void QtMaterialAvatar::setSize(int size) +void Avatar::setSize(int size) { - Q_D(QtMaterialAvatar); + Q_D(Avatar); d->size = size; @@ -176,25 +178,25 @@ void QtMaterialAvatar::setSize(int size) update(); } -int QtMaterialAvatar::size() const +int Avatar::size() const { - Q_D(const QtMaterialAvatar); + Q_D(const Avatar); return d->size; } -void QtMaterialAvatar::setLetter(const QChar &letter) +void Avatar::setLetter(const QChar &letter) { - Q_D(QtMaterialAvatar); + Q_D(Avatar); d->letter = letter; d->type = Material::LetterAvatar; update(); } -void QtMaterialAvatar::setImage(const QImage &image) +void Avatar::setImage(const QImage &image) { - Q_D(QtMaterialAvatar); + Q_D(Avatar); d->image = image; d->type = Material::ImageAvatar; @@ -205,18 +207,18 @@ void QtMaterialAvatar::setImage(const QImage &image) update(); } -void QtMaterialAvatar::setIcon(const QIcon &icon) +void Avatar::setIcon(const QIcon &icon) { - Q_D(QtMaterialAvatar); + Q_D(Avatar); d->icon = icon; d->type = Material::IconAvatar; update(); } -Material::AvatarType QtMaterialAvatar::type() const +Material::AvatarType Avatar::type() const { - Q_D(const QtMaterialAvatar); + Q_D(const Avatar); return d->type; } @@ -224,11 +226,11 @@ Material::AvatarType QtMaterialAvatar::type() const /*! * \reimp */ -void QtMaterialAvatar::paintEvent(QPaintEvent *event) +void Avatar::paintEvent(QPaintEvent *event) { Q_UNUSED(event) - Q_D(QtMaterialAvatar); + Q_D(Avatar); QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing); @@ -292,3 +294,5 @@ void QtMaterialAvatar::paintEvent(QPaintEvent *event) break; } } + +} diff --git a/components/qtmaterialavatar.h b/components/qtmaterialavatar.h index 9b99ef2..a118421 100644 --- a/components/qtmaterialavatar.h +++ b/components/qtmaterialavatar.h @@ -4,18 +4,19 @@ #include #include "lib/qtmaterialtheme.h" -class QtMaterialAvatarPrivate; +namespace md { +class AvatarPrivate; -class QtMaterialAvatar : public QWidget +class Avatar : public QWidget { Q_OBJECT public: - explicit QtMaterialAvatar(QWidget *parent = 0); - explicit QtMaterialAvatar(const QIcon &icon, QWidget *parent = 0); - explicit QtMaterialAvatar(const QChar &letter, QWidget *parent = 0); - explicit QtMaterialAvatar(const QImage &image, QWidget *parent = 0); - ~QtMaterialAvatar(); + explicit Avatar(QWidget *parent = 0); + explicit Avatar(const QIcon &icon, QWidget *parent = 0); + explicit Avatar(const QChar &letter, QWidget *parent = 0); + explicit Avatar(const QImage &image, QWidget *parent = 0); + ~Avatar(); void setUseThemeColors(bool value); bool useThemeColors() const; @@ -40,11 +41,12 @@ public: protected: void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - const QScopedPointer d_ptr; + const QScopedPointer d_ptr; private: - Q_DISABLE_COPY(QtMaterialAvatar) - Q_DECLARE_PRIVATE(QtMaterialAvatar) + Q_DISABLE_COPY(Avatar) + Q_DECLARE_PRIVATE(Avatar) }; +} #endif // QTMATERIALAVATAR_H diff --git a/components/qtmaterialavatar_p.h b/components/qtmaterialavatar_p.h index 44b378e..4870d77 100644 --- a/components/qtmaterialavatar_p.h +++ b/components/qtmaterialavatar_p.h @@ -9,29 +9,34 @@ #include #include "lib/qtmaterialtheme.h" -class QtMaterialAvatar; - -class QtMaterialAvatarPrivate +namespace md { - Q_DISABLE_COPY(QtMaterialAvatarPrivate) - Q_DECLARE_PUBLIC(QtMaterialAvatar) + +class Avatar; + +class AvatarPrivate +{ + Q_DISABLE_COPY(AvatarPrivate) + Q_DECLARE_PUBLIC(Avatar) public: - QtMaterialAvatarPrivate(QtMaterialAvatar *q); - ~QtMaterialAvatarPrivate(); + AvatarPrivate(Avatar *q); + ~AvatarPrivate(); void init(); - QtMaterialAvatar *const q_ptr; - int size; - Material::AvatarType type; - QChar letter; - QImage image; - QIcon icon; - QPixmap pixmap; - bool useThemeColors; - QColor textColor; - QColor backgroundColor; + Avatar *const q_ptr; + int size; + Material::AvatarType type; + QChar letter; + QImage image; + QIcon icon; + QPixmap pixmap; + bool useThemeColors; + QColor textColor; + QColor backgroundColor; }; +} + #endif // QTMATERIALAVATAR_P_H