diff --git a/components/materiallib/qtmaterialcheckable.cpp b/components/materiallib/qtmaterialcheckable.cpp index ef1ff38..c50230b 100644 --- a/components/materiallib/qtmaterialcheckable.cpp +++ b/components/materiallib/qtmaterialcheckable.cpp @@ -15,8 +15,8 @@ #include /*! - * \class QtMaterialCheckablePrivate - * \internal + * @class QtMaterialCheckablePrivate + * @internal */ QtMaterialCheckablePrivate::QtMaterialCheckablePrivate(QtMaterialCheckable *q) @@ -123,7 +123,7 @@ void QtMaterialCheckablePrivate::init() } /*! - * \class QtMaterialCheckable + * @class QtMaterialCheckable */ QtMaterialCheckable::QtMaterialCheckable(QWidget *parent) @@ -284,7 +284,7 @@ QIcon QtMaterialCheckable::uncheckedIcon() const } /*! - * \reimp + * @reimp */ QSize QtMaterialCheckable::sizeHint() const { @@ -302,7 +302,7 @@ QtMaterialCheckable::QtMaterialCheckable(QtMaterialCheckablePrivate &d, QWidget } /*! - * \reimp + * @reimp */ bool QtMaterialCheckable::event(QEvent *event) { @@ -328,7 +328,7 @@ bool QtMaterialCheckable::event(QEvent *event) } /*! - * \reimp + * @reimp */ bool QtMaterialCheckable::eventFilter(QObject *obj, QEvent *event) { @@ -341,7 +341,7 @@ bool QtMaterialCheckable::eventFilter(QObject *obj, QEvent *event) } /*! - * \reimp + * @reimp */ void QtMaterialCheckable::mousePressEvent(QMouseEvent *event) { @@ -370,7 +370,7 @@ void QtMaterialCheckable::mousePressEvent(QMouseEvent *event) } /*! - * \reimp + * @reimp */ void QtMaterialCheckable::paintEvent(QPaintEvent *event) { diff --git a/components/materiallib/qtmaterialcheckable_internal.cpp b/components/materiallib/qtmaterialcheckable_internal.cpp index 49402e1..a36f6ad 100644 --- a/components/materiallib/qtmaterialcheckable_internal.cpp +++ b/components/materiallib/qtmaterialcheckable_internal.cpp @@ -6,8 +6,8 @@ #include /*! - * \class QtMaterialCheckableIcon - * \internal + * @class QtMaterialCheckableIcon + * @internal */ QtMaterialCheckableIcon::QtMaterialCheckableIcon(const QIcon &icon, QtMaterialCheckable *parent) diff --git a/components/materiallib/qtmaterialripple.cpp b/components/materiallib/qtmaterialripple.cpp index f22e7ee..cab5b2a 100644 --- a/components/materiallib/qtmaterialripple.cpp +++ b/components/materiallib/qtmaterialripple.cpp @@ -2,8 +2,8 @@ #include /*! - * \class QtMaterialRipple - * \internal + * @class QtMaterialRipple + * @internal */ QtMaterialRipple::QtMaterialRipple(const QPoint ¢er, QObject *parent) diff --git a/components/materiallib/qtmaterialrippleoverlay.cpp b/components/materiallib/qtmaterialrippleoverlay.cpp index af1ed70..e887b37 100644 --- a/components/materiallib/qtmaterialrippleoverlay.cpp +++ b/components/materiallib/qtmaterialrippleoverlay.cpp @@ -3,8 +3,8 @@ #include /*! - * \class QtMaterialRippleOverlay - * \internal + * @class QtMaterialRippleOverlay + * @internal */ QtMaterialRippleOverlay::QtMaterialRippleOverlay(QWidget *parent) @@ -43,7 +43,7 @@ void QtMaterialRippleOverlay::removeRipple(QtMaterialRipple *ripple) } /*! - * \reimp + * @reimp */ void QtMaterialRippleOverlay::paintEvent(QPaintEvent *event) { diff --git a/components/materiallib/qtmaterialstyle.cpp b/components/materiallib/qtmaterialstyle.cpp index 7c7883e..4461b9b 100644 --- a/components/materiallib/qtmaterialstyle.cpp +++ b/components/materiallib/qtmaterialstyle.cpp @@ -1,10 +1,10 @@ +#include #include #include -#include /*! - * \class QtMaterialStylePrivate - * \internal + * @class QtMaterialStylePrivate + * @internal */ QtMaterialStylePrivate::QtMaterialStylePrivate(QtMaterialStyle *q) @@ -26,8 +26,8 @@ void QtMaterialStylePrivate::init() } /*! - * \class QtMaterialStyle - * \internal + * @class QtMaterialStyle + * @internal */ void QtMaterialStyle::setTheme(QtMaterialTheme *theme) diff --git a/components/materiallib/qtmaterialtheme.cpp b/components/materiallib/qtmaterialtheme.cpp index 799057b..980e41f 100644 --- a/components/materiallib/qtmaterialtheme.cpp +++ b/components/materiallib/qtmaterialtheme.cpp @@ -7,8 +7,8 @@ #include /*!material - * \class QtMaterialThemePrivate - * \internal + * @class QtMaterialThemePrivate + * @internal */ QtMaterialThemePrivate::QtMaterialThemePrivate(QtMaterialTheme *q) @@ -26,7 +26,7 @@ QColor QtMaterialThemePrivate::rgba(int r, int g, int b, qreal a) const } /*! - * \class QtMaterialTheme + * @class QtMaterialTheme */ QtMaterialTheme::QtMaterialTheme(QObject *parent) diff --git a/components/qtmaterialappbar.cpp b/components/qtmaterialappbar.cpp index f2ffc17..62e307b 100644 --- a/components/qtmaterialappbar.cpp +++ b/components/qtmaterialappbar.cpp @@ -5,12 +5,12 @@ #include /*! - * \class QtMaterialAppBarPrivate - * \internal + * @class QtMaterialAppBarPrivate + * @internal */ /*! - * \internal + * @internal */ QtMaterialAppBarPrivate::QtMaterialAppBarPrivate(QtMaterialAppBar *q) : q_ptr(q) @@ -18,12 +18,12 @@ QtMaterialAppBarPrivate::QtMaterialAppBarPrivate(QtMaterialAppBar *q) } /*! - * \internal + * @internal */ QtMaterialAppBarPrivate::~QtMaterialAppBarPrivate() {} /*! - * \internal + * @internal */ void QtMaterialAppBarPrivate::init() { @@ -43,7 +43,7 @@ void QtMaterialAppBarPrivate::init() } /*! - * \class QtMaterialAppBar + * @class QtMaterialAppBar */ QtMaterialAppBar::QtMaterialAppBar(QWidget *parent) diff --git a/components/qtmaterialautocomplete_internal.cpp b/components/qtmaterialautocomplete_internal.cpp index f78ca3c..c342b65 100644 --- a/components/qtmaterialautocomplete_internal.cpp +++ b/components/qtmaterialautocomplete_internal.cpp @@ -5,12 +5,12 @@ #include /*! - * \class QtMaterialAutoCompleteStateMachine - * \internal + * @class QtMaterialAutoCompleteStateMachine + * @internal */ /*! - * \internal + * @internal */ QtMaterialAutoCompleteStateMachine::QtMaterialAutoCompleteStateMachine(QWidget *menu) : QStateMachine(menu) @@ -62,6 +62,6 @@ QtMaterialAutoCompleteStateMachine::QtMaterialAutoCompleteStateMachine(QWidget * } /*! - * \internal + * @internal */ QtMaterialAutoCompleteStateMachine::~QtMaterialAutoCompleteStateMachine() {} diff --git a/components/qtmaterialavatar.cpp b/components/qtmaterialavatar.cpp index 588ed88..399716a 100644 --- a/components/qtmaterialavatar.cpp +++ b/components/qtmaterialavatar.cpp @@ -1,16 +1,16 @@ #include "qtmaterialavatar.h" +#include "lib/qtmaterialstyle.h" #include "qtmaterialavatar_p.h" #include #include -#include "lib/qtmaterialstyle.h" /*! - * \class QtMaterialAvatarPrivate - * \internal + * @class QtMaterialAvatarPrivate + * @internal */ /*! - * \internal + * @internal */ QtMaterialAvatarPrivate::QtMaterialAvatarPrivate(QtMaterialAvatar *q) : q_ptr(q) @@ -18,46 +18,43 @@ QtMaterialAvatarPrivate::QtMaterialAvatarPrivate(QtMaterialAvatar *q) } /*! - * \internal + * @internal */ -QtMaterialAvatarPrivate::~QtMaterialAvatarPrivate() -{ -} +QtMaterialAvatarPrivate::~QtMaterialAvatarPrivate() {} /*! - * \internal + * @internal */ void QtMaterialAvatarPrivate::init() { Q_Q(QtMaterialAvatar); - size = 40; - type = Material::LetterAvatar; + size = 40; + type = Material::LetterAvatar; useThemeColors = true; QFont font(q->font()); font.setPointSizeF(16); q->setFont(font); - QSizePolicy policy(QSizePolicy::MinimumExpanding, - QSizePolicy::MinimumExpanding); + QSizePolicy policy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); q->setSizePolicy(policy); } /*! - * \class QtMaterialAvatar + * @class QtMaterialAvatar */ QtMaterialAvatar::QtMaterialAvatar(QWidget *parent) - : QWidget(parent), - d_ptr(new QtMaterialAvatarPrivate(this)) + : QWidget(parent) + , d_ptr(new QtMaterialAvatarPrivate(this)) { d_func()->init(); } QtMaterialAvatar::QtMaterialAvatar(const QIcon &icon, QWidget *parent) - : QWidget(parent), - d_ptr(new QtMaterialAvatarPrivate(this)) + : QWidget(parent) + , d_ptr(new QtMaterialAvatarPrivate(this)) { d_func()->init(); @@ -65,8 +62,8 @@ QtMaterialAvatar::QtMaterialAvatar(const QIcon &icon, QWidget *parent) } QtMaterialAvatar::QtMaterialAvatar(const QChar &letter, QWidget *parent) - : QWidget(parent), - d_ptr(new QtMaterialAvatarPrivate(this)) + : QWidget(parent) + , d_ptr(new QtMaterialAvatarPrivate(this)) { d_func()->init(); @@ -74,17 +71,15 @@ QtMaterialAvatar::QtMaterialAvatar(const QChar &letter, QWidget *parent) } QtMaterialAvatar::QtMaterialAvatar(const QImage &image, QWidget *parent) - : QWidget(parent), - d_ptr(new QtMaterialAvatarPrivate(this)) + : QWidget(parent) + , d_ptr(new QtMaterialAvatarPrivate(this)) { d_func()->init(); setImage(image); } -QtMaterialAvatar::~QtMaterialAvatar() -{ -} +QtMaterialAvatar::~QtMaterialAvatar() {} void QtMaterialAvatar::setUseThemeColors(bool value) { @@ -131,7 +126,7 @@ void QtMaterialAvatar::setBackgroundColor(const QColor &color) Q_D(QtMaterialAvatar); d->backgroundColor = color; - + MATERIAL_DISABLE_THEME_COLORS update(); } @@ -148,13 +143,13 @@ QColor QtMaterialAvatar::backgroundColor() const } /*! - * \reimp + * @reimp */ QSize QtMaterialAvatar::sizeHint() const { Q_D(const QtMaterialAvatar); - return QSize(d->size+2, d->size+2); + return QSize(d->size + 2, d->size + 2); } void QtMaterialAvatar::setSize(int size) @@ -164,13 +159,11 @@ void QtMaterialAvatar::setSize(int size) d->size = size; if (!d->image.isNull()) { - d->pixmap = QPixmap::fromImage(d->image.scaled(d->size, d->size, - Qt::IgnoreAspectRatio, - Qt::SmoothTransformation)); + d->pixmap = QPixmap::fromImage(d->image.scaled(d->size, d->size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); } QFont f(font()); - f.setPointSizeF(size*16.0/40.0); + f.setPointSizeF(size * 16.0 / 40.0); setFont(f); update(); @@ -199,9 +192,7 @@ void QtMaterialAvatar::setImage(const QImage &image) d->image = image; d->type = Material::ImageAvatar; - d->pixmap = QPixmap::fromImage(image.scaled(d->size, d->size, - Qt::IgnoreAspectRatio, - Qt::SmoothTransformation)); + d->pixmap = QPixmap::fromImage(image.scaled(d->size, d->size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); update(); } @@ -222,7 +213,7 @@ Material::AvatarType QtMaterialAvatar::type() const } /*! - * \reimp + * @reimp */ void QtMaterialAvatar::paintEvent(QPaintEvent *event) { @@ -234,61 +225,52 @@ void QtMaterialAvatar::paintEvent(QPaintEvent *event) painter.setRenderHint(QPainter::Antialiasing); QRect r = rect(); - const qreal hs = d->size/2.0; + const qreal hs = d->size / 2.0; - if (!isEnabled()) - { + if (!isEnabled()) { QBrush brush; brush.setStyle(Qt::SolidPattern); brush.setColor(QtMaterialStyle::instance().themeColor("disabled")); painter.setPen(Qt::NoPen); painter.setBrush(brush); - painter.drawEllipse(QRectF((width()-d->size)/2.0, (height()-d->size)/2.0, - d->size, d->size)); + painter.drawEllipse(QRectF((width() - d->size) / 2.0, (height() - d->size) / 2.0, d->size, d->size)); return; } - if (Material::ImageAvatar != d->type) - { + if (Material::ImageAvatar != d->type) { QBrush brush; brush.setStyle(Qt::SolidPattern); brush.setColor(backgroundColor()); painter.setPen(Qt::NoPen); painter.setBrush(brush); - painter.drawEllipse(QRectF((width()-d->size)/2.0, (height()-d->size)/2.0, - d->size, d->size)); + painter.drawEllipse(QRectF((width() - d->size) / 2.0, (height() - d->size) / 2.0, d->size, d->size)); } - switch (d->type) - { - case Material::ImageAvatar: - { - QPainterPath path; - path.addEllipse(width()/2.0-hs, height()/2.0-hs, d->size, d->size); - painter.setClipPath(path); + switch (d->type) { + case Material::ImageAvatar: { + QPainterPath path; + path.addEllipse(width() / 2.0 - hs, height() / 2.0 - hs, d->size, d->size); + painter.setClipPath(path); - painter.drawPixmap(QRect(width()/2.0-hs, height()/2.0-hs, d->size, d->size), - d->pixmap); - break; - } - case Material::IconAvatar: - { - QRect iconGeometry((width()-hs)/2, (height()-hs)/2, hs, hs); - QPixmap pixmap = d->icon.pixmap(hs, hs); - QPainter icon(&pixmap); - icon.setCompositionMode(QPainter::CompositionMode_SourceIn); - icon.fillRect(pixmap.rect(), textColor()); - painter.drawPixmap(iconGeometry, pixmap); - break; - } - case Material::LetterAvatar: - { - painter.setPen(textColor()); - painter.setBrush(Qt::NoBrush); - painter.drawText(r, Qt::AlignCenter, QString(d->letter)); - break; - } - default: - break; + painter.drawPixmap(QRect(width() / 2.0 - hs, height() / 2.0 - hs, d->size, d->size), d->pixmap); + break; + } + case Material::IconAvatar: { + QRect iconGeometry((width() - hs) / 2, (height() - hs) / 2, hs, hs); + QPixmap pixmap = d->icon.pixmap(hs, hs); + QPainter icon(&pixmap); + icon.setCompositionMode(QPainter::CompositionMode_SourceIn); + icon.fillRect(pixmap.rect(), textColor()); + painter.drawPixmap(iconGeometry, pixmap); + break; + } + case Material::LetterAvatar: { + painter.setPen(textColor()); + painter.setBrush(Qt::NoBrush); + painter.drawText(r, Qt::AlignCenter, QString(d->letter)); + break; + } + default: + break; } } diff --git a/components/qtmaterialbadge.cpp b/components/qtmaterialbadge.cpp index 1148dbe..75e5902 100644 --- a/components/qtmaterialbadge.cpp +++ b/components/qtmaterialbadge.cpp @@ -4,12 +4,12 @@ #include /*! - * \class QtMaterialBadgePrivate - * \internal + * @class QtMaterialBadgePrivate + * @internal */ /*! - * \internal + * @internal */ QtMaterialBadgePrivate::QtMaterialBadgePrivate(QtMaterialBadge *q) : q_ptr(q) @@ -17,12 +17,12 @@ QtMaterialBadgePrivate::QtMaterialBadgePrivate(QtMaterialBadge *q) } /*! - * \internal + * @internal */ QtMaterialBadgePrivate::~QtMaterialBadgePrivate() {} /*! - * \internal + * @internal */ void QtMaterialBadgePrivate::init() { diff --git a/components/qtmaterialcheckbox.cpp b/components/qtmaterialcheckbox.cpp index fcf123d..aed12ef 100644 --- a/components/qtmaterialcheckbox.cpp +++ b/components/qtmaterialcheckbox.cpp @@ -6,12 +6,12 @@ #include /*! - * \class QtMaterialCheckBoxPrivate - * \internal + * @class QtMaterialCheckBoxPrivate + * @internal */ /*! - * \internal + * @internal */ QtMaterialCheckBoxPrivate::QtMaterialCheckBoxPrivate(QtMaterialCheckBox *q) : QtMaterialCheckablePrivate(q) @@ -20,12 +20,12 @@ QtMaterialCheckBoxPrivate::QtMaterialCheckBoxPrivate(QtMaterialCheckBox *q) } /*! - * \internal + * @internal */ QtMaterialCheckBoxPrivate::~QtMaterialCheckBoxPrivate() {} /*! - * \internal + * @internal */ void QtMaterialCheckBoxPrivate::init() { @@ -70,7 +70,7 @@ void QtMaterialCheckBoxPrivate::init() } /*! - * \class QtMaterialCheckBox + * @class QtMaterialCheckBox */ QtMaterialCheckBox::QtMaterialCheckBox(QWidget *parent) diff --git a/components/qtmaterialcircularprogress.cpp b/components/qtmaterialcircularprogress.cpp index c893014..5ea7ffa 100644 --- a/components/qtmaterialcircularprogress.cpp +++ b/components/qtmaterialcircularprogress.cpp @@ -75,7 +75,7 @@ void QtMaterialCircularProgressPrivate::init() } /*! - * \class QtMaterialCircularProgress + * @class QtMaterialCircularProgress */ QtMaterialCircularProgress::QtMaterialCircularProgress(QWidget *parent) @@ -175,7 +175,7 @@ QColor QtMaterialCircularProgress::color() const } /*! - * \reimp + * @reimp */ QSize QtMaterialCircularProgress::sizeHint() const { @@ -186,7 +186,7 @@ QSize QtMaterialCircularProgress::sizeHint() const } /*! - * \reimp + * @reimp */ void QtMaterialCircularProgress::paintEvent(QPaintEvent *event) { diff --git a/components/qtmaterialcircularprogress_internal.cpp b/components/qtmaterialcircularprogress_internal.cpp index 15f803b..c40c1c4 100644 --- a/components/qtmaterialcircularprogress_internal.cpp +++ b/components/qtmaterialcircularprogress_internal.cpp @@ -1,8 +1,8 @@ #include "qtmaterialcircularprogress_internal.h" /*! - * \class QtMaterialCircularProgressDelegate - * \internal + * @class QtMaterialCircularProgressDelegate + * @internal */ QtMaterialCircularProgressDelegate::QtMaterialCircularProgressDelegate(QtMaterialCircularProgress *parent) diff --git a/components/qtmaterialdrawer_internal.cpp b/components/qtmaterialdrawer_internal.cpp index 2bd2d93..15782de 100644 --- a/components/qtmaterialdrawer_internal.cpp +++ b/components/qtmaterialdrawer_internal.cpp @@ -113,8 +113,8 @@ void QtMaterialDrawerStateMachine::updatePropertyAssignments() } /*! - * \class QtMaterialDrawerWidget - * \internal + * @class QtMaterialDrawerWidget + * @internal */ QtMaterialDrawerWidget::QtMaterialDrawerWidget(QWidget *parent) diff --git a/components/qtmaterialflatbutton.cpp b/components/qtmaterialflatbutton.cpp index 820b074..e5a3687 100644 --- a/components/qtmaterialflatbutton.cpp +++ b/components/qtmaterialflatbutton.cpp @@ -12,12 +12,12 @@ #include /*! - * \class QtMaterialFlatButtonPrivate - * \internal + * @class QtMaterialFlatButtonPrivate + * @internal */ /*! - * \internal + * @internal */ QtMaterialFlatButtonPrivate::QtMaterialFlatButtonPrivate(QtMaterialFlatButton *q) : q_ptr(q) @@ -25,12 +25,12 @@ QtMaterialFlatButtonPrivate::QtMaterialFlatButtonPrivate(QtMaterialFlatButton *q } /*! - * \internal + * @internal */ QtMaterialFlatButtonPrivate::~QtMaterialFlatButtonPrivate() {} /*! - * \internal + * @internal */ void QtMaterialFlatButtonPrivate::init() { @@ -70,7 +70,7 @@ void QtMaterialFlatButtonPrivate::init() } /*! - * \class QtMaterialFlatButton + * @class QtMaterialFlatButton */ QtMaterialFlatButton::QtMaterialFlatButton(QWidget *parent, Material::ButtonPreset preset) @@ -450,7 +450,7 @@ Qt::Alignment QtMaterialFlatButton::textAlignment() const } /*! - * \reimp + * @reimp */ QSize QtMaterialFlatButton::sizeHint() const { @@ -477,7 +477,7 @@ QtMaterialFlatButton::QtMaterialFlatButton(QtMaterialFlatButtonPrivate &d, QWidg } /*! - * \reimp + * @reimp */ void QtMaterialFlatButton::checkStateSet() { @@ -489,7 +489,7 @@ void QtMaterialFlatButton::checkStateSet() } /*! - * \reimp + * @reimp */ void QtMaterialFlatButton::mousePressEvent(QMouseEvent *event) { @@ -526,7 +526,7 @@ void QtMaterialFlatButton::mousePressEvent(QMouseEvent *event) } /*! - * \reimp + * @reimp */ void QtMaterialFlatButton::mouseReleaseEvent(QMouseEvent *event) { @@ -545,7 +545,7 @@ void QtMaterialFlatButton::resizeEvent(QResizeEvent *event) } /*! - * \reimp + * @reimp */ void QtMaterialFlatButton::paintEvent(QPaintEvent *event) { @@ -576,7 +576,7 @@ void QtMaterialFlatButton::paintEvent(QPaintEvent *event) } /*! - * \internal + * @internal */ void QtMaterialFlatButton::paintBackground(QPainter *painter) { @@ -630,7 +630,7 @@ void QtMaterialFlatButton::paintBackground(QPainter *painter) } /*! - * \internal + * @internal */ void QtMaterialFlatButton::paintHalo(QPainter *painter) { @@ -659,7 +659,7 @@ void QtMaterialFlatButton::paintHalo(QPainter *painter) #define COLOR_INTERPOLATE(CH) (1 - progress) * source.CH() + progress *dest.CH() /*! - * \internal + * @internal */ void QtMaterialFlatButton::paintForeground(QPainter *painter) { @@ -716,7 +716,7 @@ void QtMaterialFlatButton::paintForeground(QPainter *painter) } /*! - * \internal + * @internal */ void QtMaterialFlatButton::updateClipPath() { diff --git a/components/qtmaterialflatbutton_internal.cpp b/components/qtmaterialflatbutton_internal.cpp index 0fb427c..4b90f09 100644 --- a/components/qtmaterialflatbutton_internal.cpp +++ b/components/qtmaterialflatbutton_internal.cpp @@ -7,8 +7,8 @@ #include /*! - * \class QtMaterialFlatButtonStateMachine - * \internal + * @class QtMaterialFlatButtonStateMachine + * @internal */ QtMaterialFlatButtonStateMachine::QtMaterialFlatButtonStateMachine(QtMaterialFlatButton *parent) diff --git a/components/qtmaterialiconbutton.cpp b/components/qtmaterialiconbutton.cpp index 9e7d605..ffac96d 100644 --- a/components/qtmaterialiconbutton.cpp +++ b/components/qtmaterialiconbutton.cpp @@ -6,8 +6,8 @@ #include /*! - * \class QtMaterialIconButtonPrivate - * \internal + * @class QtMaterialIconButtonPrivate + * @internal */ QtMaterialIconButtonPrivate::QtMaterialIconButtonPrivate(QtMaterialIconButton *q) @@ -44,7 +44,7 @@ void QtMaterialIconButtonPrivate::updateRipple() } /*! - * \class QtMaterialIconButton + * @class QtMaterialIconButton */ QtMaterialIconButton::QtMaterialIconButton(const QIcon &icon, QWidget *parent) @@ -59,7 +59,7 @@ QtMaterialIconButton::QtMaterialIconButton(const QIcon &icon, QWidget *parent) QtMaterialIconButton::~QtMaterialIconButton() {} /*! - * \reimp + * @reimp */ QSize QtMaterialIconButton::sizeHint() const { @@ -133,7 +133,7 @@ QtMaterialIconButton::QtMaterialIconButton(QtMaterialIconButtonPrivate &d, QWidg } /*! - * \reimp + * @reimp */ bool QtMaterialIconButton::event(QEvent *event) { @@ -158,7 +158,7 @@ bool QtMaterialIconButton::event(QEvent *event) } /*! - * \reimp + * @reimp */ bool QtMaterialIconButton::eventFilter(QObject *obj, QEvent *event) { @@ -171,7 +171,7 @@ bool QtMaterialIconButton::eventFilter(QObject *obj, QEvent *event) } /*! - * \reimp + * @reimp */ void QtMaterialIconButton::mousePressEvent(QMouseEvent *event) { @@ -184,7 +184,7 @@ void QtMaterialIconButton::mousePressEvent(QMouseEvent *event) } /*! - * \reimp + * @reimp */ void QtMaterialIconButton::paintEvent(QPaintEvent *event) { diff --git a/components/qtmaterialprogress.cpp b/components/qtmaterialprogress.cpp index 681437e..b2c4770 100644 --- a/components/qtmaterialprogress.cpp +++ b/components/qtmaterialprogress.cpp @@ -7,8 +7,8 @@ #include /*! - * \class QtMaterialProgressPrivate - * \internal + * @class QtMaterialProgressPrivate + * @internal */ QtMaterialProgressPrivate::QtMaterialProgressPrivate(QtMaterialProgress *q) @@ -41,7 +41,7 @@ void QtMaterialProgressPrivate::init() } /*! - * \class QtMaterialProgress + * @class QtMaterialProgress */ QtMaterialProgress::QtMaterialProgress(QWidget *parent) @@ -130,7 +130,7 @@ QColor QtMaterialProgress::backgroundColor() const } /*! - * \reimp + * @reimp */ void QtMaterialProgress::paintEvent(QPaintEvent *event) { diff --git a/components/qtmaterialprogress_internal.cpp b/components/qtmaterialprogress_internal.cpp index 0544bae..db22e28 100644 --- a/components/qtmaterialprogress_internal.cpp +++ b/components/qtmaterialprogress_internal.cpp @@ -1,8 +1,8 @@ #include "qtmaterialprogress_internal.h" /*! - * \class QtMaterialProgressDelegate - * \internal + * @class QtMaterialProgressDelegate + * @internal */ QtMaterialProgressDelegate::QtMaterialProgressDelegate(QtMaterialProgress *parent) diff --git a/components/qtmaterialscrollbar_internal.h b/components/qtmaterialscrollbar_internal.h index 7b1cc92..020ded7 100644 --- a/components/qtmaterialscrollbar_internal.h +++ b/components/qtmaterialscrollbar_internal.h @@ -1,8 +1,8 @@ #ifndef QTMATERIALSCROLLBAR_INTERNAL_H #define QTMATERIALSCROLLBAR_INTERNAL_H -#include #include "qtmaterialscrollbar.h" +#include class QtMaterialScrollBarStateMachine : public QStateMachine { @@ -21,9 +21,9 @@ private: Q_DISABLE_COPY(QtMaterialScrollBarStateMachine) QtMaterialScrollBar *const m_scrollBar; - QState *const m_focusState; - QState *const m_blurState; - qreal m_opacity; + QState *const m_focusState; + QState *const m_blurState; + qreal m_opacity; }; inline void QtMaterialScrollBarStateMachine::setOpacity(qreal opacity) @@ -37,4 +37,4 @@ inline qreal QtMaterialScrollBarStateMachine::opacity() const return m_opacity; } -#endif // QTMATERIALSCROLLBAR_INTERNAL_H +#endif // QTMATERIALSCROLLBAR_INTERNAL_H diff --git a/components/qtmaterialtabs_internal.cpp b/components/qtmaterialtabs_internal.cpp index e42ccf7..ac8d7af 100644 --- a/components/qtmaterialtabs_internal.cpp +++ b/components/qtmaterialtabs_internal.cpp @@ -8,8 +8,8 @@ #include /*! - * \class QtMaterialTabsInkBar - * \internal + * @class QtMaterialTabsInkBar + * @internal */ QtMaterialTabsInkBar::QtMaterialTabsInkBar(QtMaterialTabs *parent) @@ -89,8 +89,8 @@ void QtMaterialTabsInkBar::paintEvent(QPaintEvent *event) } /*! - * \class QtMaterialTab - * \internal + * @class QtMaterialTab + * @internal */ QtMaterialTab::QtMaterialTab(QtMaterialTabs *parent) diff --git a/components/qtmaterialtextfield.cpp b/components/qtmaterialtextfield.cpp index e6c2ba7..b97ab24 100644 --- a/components/qtmaterialtextfield.cpp +++ b/components/qtmaterialtextfield.cpp @@ -7,8 +7,8 @@ #include /*! - * \class QtMaterialTextFieldPrivate - * \internal + * @class QtMaterialTextFieldPrivate + * @internal */ QtMaterialTextFieldPrivate::QtMaterialTextFieldPrivate(QtMaterialTextField *q) @@ -42,7 +42,7 @@ void QtMaterialTextFieldPrivate::init() } /*! - * \class QtMaterialTextField + * @class QtMaterialTextField */ QtMaterialTextField::QtMaterialTextField(QWidget *parent) @@ -251,7 +251,7 @@ QtMaterialTextField::QtMaterialTextField(QtMaterialTextFieldPrivate &d, QWidget } /*! - * \reimp + * @reimp */ bool QtMaterialTextField::event(QEvent *event) { diff --git a/components/qtmaterialtextfield_internal.cpp b/components/qtmaterialtextfield_internal.cpp index 6b82de6..e9a2b97 100644 --- a/components/qtmaterialtextfield_internal.cpp +++ b/components/qtmaterialtextfield_internal.cpp @@ -5,8 +5,8 @@ #include /*! - * \class QtMaterialTextFieldStateMachine - * \internal + * @class QtMaterialTextFieldStateMachine + * @internal */ QtMaterialTextFieldStateMachine::QtMaterialTextFieldStateMachine(QtMaterialTextField *parent) @@ -115,8 +115,8 @@ void QtMaterialTextFieldStateMachine::setupProperties() } /*! - * \class QtMaterialTextFieldLabel - * \internal + * @class QtMaterialTextFieldLabel + * @internal */ QtMaterialTextFieldLabel::QtMaterialTextFieldLabel(QtMaterialTextField *parent) @@ -137,7 +137,7 @@ QtMaterialTextFieldLabel::QtMaterialTextFieldLabel(QtMaterialTextField *parent) QtMaterialTextFieldLabel::~QtMaterialTextFieldLabel() {} /*! - * \reimp + * @reimp */ void QtMaterialTextFieldLabel::paintEvent(QPaintEvent *event) {