From ccd772f4f40dddf6a23a352a467e6dac3c9dde00 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 5 Apr 2024 11:51:29 +0300 Subject: [PATCH] kdeui: format and indent Signed-off-by: Ivailo Monev --- kdeui/colors/kcolorcombo.cpp | 62 ++++++++++++++++-------------------- kdeui/colors/kcolorcombo.h | 14 ++++---- 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/kdeui/colors/kcolorcombo.cpp b/kdeui/colors/kcolorcombo.cpp index 4e681523..2ea41f61 100644 --- a/kdeui/colors/kcolorcombo.cpp +++ b/kdeui/colors/kcolorcombo.cpp @@ -31,20 +31,19 @@ class KColorComboDelegate : public QAbstractItemDelegate { - public: - enum ItemRoles { - ColorRole = Qt::UserRole + 1 - }; +public: + enum ItemRoles { + ColorRole = Qt::UserRole + 1 + }; - enum LayoutMetrics { - FrameMargin = 3 - }; + enum LayoutMetrics { + FrameMargin = 3 + }; - KColorComboDelegate(QObject *parent = 0); - virtual ~KColorComboDelegate(); + KColorComboDelegate(QObject *parent = 0); - virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; - virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const final; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const final; }; static QBrush k_colorcombodelegate_brush(const QModelIndex &index, int role) @@ -64,10 +63,6 @@ KColorComboDelegate::KColorComboDelegate(QObject *parent) { } -KColorComboDelegate::~KColorComboDelegate() -{ -} - void KColorComboDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { // background @@ -129,7 +124,6 @@ void KColorComboDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o QSize KColorComboDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const { Q_UNUSED(index) - // the width does not matter, as the view will always use the maximum width available return QSize(100, option.fontMetrics.height() + 2 * FrameMargin); } @@ -175,20 +169,20 @@ static inline QColor standardColor(int i) class KColorComboPrivate { - public: - KColorComboPrivate(KColorCombo *qq); +public: + KColorComboPrivate(KColorCombo *qq); - void addColors(); - void setCustomColor(const QColor &color, bool lookupInPresets = true); + void addColors(); + void setCustomColor(const QColor &color, bool lookupInPresets = true); - // slots - void _k_slotActivated(int index); - void _k_slotHighlighted(int index); + // slots + void _k_slotActivated(int index); + void _k_slotHighlighted(int index); - KColorCombo *q; - QList colorList; - QColor customColor; - QColor internalcolor; + KColorCombo *q; + QList colorList; + QColor customColor; + QColor internalcolor; }; KColorComboPrivate::KColorComboPrivate(KColorCombo *qq) @@ -244,7 +238,7 @@ KColorCombo::KColorCombo( QWidget *parent ) KColorCombo::~KColorCombo() { - delete d; + delete d; } void KColorCombo::setColors( const QList &colors ) @@ -260,11 +254,10 @@ QList KColorCombo::colors() const QList list; for (int i = 0; i < STANDARD_PALETTE_SIZE; ++i) { list += standardColor(i); - } + } return list; - } else { - return d->colorList; } + return d->colorList; } /** @@ -275,11 +268,9 @@ void KColorCombo::setColor( const QColor &col ) if (!col.isValid()) { return; } - if (count() == 0) { d->addColors(); } - d->setCustomColor(col, true); } @@ -287,8 +278,9 @@ void KColorCombo::setColor( const QColor &col ) /** Returns the currently selected color */ -QColor KColorCombo::color() const { - return d->internalcolor; +QColor KColorCombo::color() const +{ + return d->internalcolor; } bool KColorCombo::isCustomColor() const diff --git a/kdeui/colors/kcolorcombo.h b/kdeui/colors/kcolorcombo.h index e060e5c4..7622bd11 100644 --- a/kdeui/colors/kcolorcombo.h +++ b/kdeui/colors/kcolorcombo.h @@ -44,20 +44,20 @@ class KColorComboPrivate; class KDEUI_EXPORT KColorCombo : public QComboBox { Q_OBJECT - Q_PROPERTY( QColor color READ color WRITE setColor NOTIFY activated USER true ) - Q_PROPERTY( QList colors READ colors WRITE setColors ) + Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY activated USER true) + Q_PROPERTY(QList colors READ colors WRITE setColors) public: /** * Constructs a color combo box. */ - explicit KColorCombo(QWidget *parent = 0); + explicit KColorCombo(QWidget *parent = nullptr); ~KColorCombo(); /** * Selects the color @p col. */ - void setColor( const QColor &col ); + void setColor(const QColor &col); /** * Returns the currently selected color. **/ @@ -75,7 +75,7 @@ public: * @param cols list of colors. If empty, the selection list reverts to * the standard list. **/ - void setColors(const QList &colors ); + void setColors(const QList &colors); /** * Return the list of colors available for selection. @@ -92,11 +92,11 @@ Q_SIGNALS: /** * Emitted when a new color box has been selected. */ - void activated( const QColor &col ); + void activated(const QColor &col); /** * Emitted when a new item has been highlighted. */ - void highlighted( const QColor &col ); + void highlighted(const QColor &col); protected: virtual void paintEvent(QPaintEvent *event);