summary refs log tree commit diff
path: root/src/ui
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2017-10-01 12:11:33 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2017-10-01 12:51:29 +0300
commit0c0ac68bc2e23fe1590614bb961a21a4bb09d0dc (patch)
tree11da9fbb7105834401d8e7999d42a4107221aa37 /src/ui
parentMerge pull request #82 from rokups/fix/#50 (diff)
downloadnheko-0c0ac68bc2e23fe1590614bb961a21a4bb09d0dc.tar.xz
Remove extra clang-format options
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/Avatar.cc4
-rw-r--r--src/ui/Badge.cc4
-rw-r--r--src/ui/FlatButton.cc11
-rw-r--r--src/ui/RaisedButton.cc4
-rw-r--r--src/ui/Ripple.cc4
-rw-r--r--src/ui/RippleOverlay.cc4
-rw-r--r--src/ui/TextField.cc15
-rw-r--r--src/ui/Theme.cc4
8 files changed, 15 insertions, 35 deletions
diff --git a/src/ui/Avatar.cc b/src/ui/Avatar.cc

index c8068366..c2ee629b 100644 --- a/src/ui/Avatar.cc +++ b/src/ui/Avatar.cc
@@ -19,9 +19,7 @@ Avatar::Avatar(QWidget *parent) setSizePolicy(policy); } -Avatar::~Avatar() -{ -} +Avatar::~Avatar() {} QColor Avatar::textColor() const diff --git a/src/ui/Badge.cc b/src/ui/Badge.cc
index ab34be0f..6e73eca0 100644 --- a/src/ui/Badge.cc +++ b/src/ui/Badge.cc
@@ -22,9 +22,7 @@ Badge::Badge(const QString &text, QWidget *parent) setText(text); } -Badge::~Badge() -{ -} +Badge::~Badge() {} void Badge::init() diff --git a/src/ui/FlatButton.cc b/src/ui/FlatButton.cc
index f2314078..45a7683e 100644 --- a/src/ui/FlatButton.cc +++ b/src/ui/FlatButton.cc
@@ -12,7 +12,8 @@ #include "ThemeManager.h" // The ampersand is automatically set in QPushButton or QCheckbx -// by KDEPlatformTheme plugin in Qt5. [https://bugs.kde.org/show_bug.cgi?id=337491] +// by KDEPlatformTheme plugin in Qt5. +// [https://bugs.kde.org/show_bug.cgi?id=337491] // // A workaroud is to add // @@ -79,9 +80,7 @@ FlatButton::FlatButton(const QString &text, ui::Role role, QWidget *parent, ui:: setRole(role); } -FlatButton::~FlatButton() -{ -} +FlatButton::~FlatButton() {} void FlatButton::applyPreset(ui::ButtonPreset preset) @@ -611,9 +610,7 @@ FlatButtonStateMachine::FlatButtonStateMachine(FlatButton *parent) addTransition(button_, QEvent::FocusOut, pressed_state_, hovered_state_); } -FlatButtonStateMachine::~FlatButtonStateMachine() -{ -} +FlatButtonStateMachine::~FlatButtonStateMachine() {} void FlatButtonStateMachine::setOverlayOpacity(qreal opacity) diff --git a/src/ui/RaisedButton.cc b/src/ui/RaisedButton.cc
index c30f253a..c519f84f 100644 --- a/src/ui/RaisedButton.cc +++ b/src/ui/RaisedButton.cc
@@ -70,9 +70,7 @@ RaisedButton::RaisedButton(const QString &text, QWidget *parent) setText(text); } -RaisedButton::~RaisedButton() -{ -} +RaisedButton::~RaisedButton() {} bool RaisedButton::event(QEvent *event) diff --git a/src/ui/Ripple.cc b/src/ui/Ripple.cc
index 2869bf7b..008d7a6a 100644 --- a/src/ui/Ripple.cc +++ b/src/ui/Ripple.cc
@@ -25,9 +25,7 @@ Ripple::Ripple(const QPoint &center, RippleOverlay *overlay, QObject *parent) init(); } -Ripple::~Ripple() -{ -} +Ripple::~Ripple() {} void Ripple::setRadius(qreal radius) diff --git a/src/ui/RippleOverlay.cc b/src/ui/RippleOverlay.cc
index cf264363..26d432f6 100644 --- a/src/ui/RippleOverlay.cc +++ b/src/ui/RippleOverlay.cc
@@ -11,9 +11,7 @@ RippleOverlay::RippleOverlay(QWidget *parent) setAttribute(Qt::WA_NoSystemBackground); } -RippleOverlay::~RippleOverlay() -{ -} +RippleOverlay::~RippleOverlay() {} void RippleOverlay::addRipple(Ripple *ripple) diff --git a/src/ui/TextField.cc b/src/ui/TextField.cc
index efa77c39..e038f2dd 100644 --- a/src/ui/TextField.cc +++ b/src/ui/TextField.cc
@@ -32,9 +32,7 @@ TextField::TextField(QWidget *parent) QCoreApplication::processEvents(); } -TextField::~TextField() -{ -} +TextField::~TextField() {} void TextField::setBackgroundColor(const QColor &color) @@ -199,7 +197,8 @@ TextField::paintEvent(QPaintEvent *event) if (text().isEmpty()) { painter.setOpacity(1 - state_machine_->progress()); - // painter.fillRect(rect(), parentWidget()->palette().color(backgroundRole())); + // painter.fillRect(rect(), + // parentWidget()->palette().color(backgroundRole())); painter.fillRect(rect(), backgroundColor()); } @@ -273,9 +272,7 @@ TextFieldStateMachine::TextFieldStateMachine(TextField *parent) connect(text_field_, SIGNAL(textChanged(QString)), this, SLOT(setupProperties())); } -TextFieldStateMachine::~TextFieldStateMachine() -{ -} +TextFieldStateMachine::~TextFieldStateMachine() {} void TextFieldStateMachine::setLabel(TextFieldLabel *label) @@ -352,9 +349,7 @@ TextFieldLabel::TextFieldLabel(TextField *parent) setFont(font); } -TextFieldLabel::~TextFieldLabel() -{ -} +TextFieldLabel::~TextFieldLabel() {} void TextFieldLabel::paintEvent(QPaintEvent *) diff --git a/src/ui/Theme.cc b/src/ui/Theme.cc
index 1560cf12..52d4b883 100644 --- a/src/ui/Theme.cc +++ b/src/ui/Theme.cc
@@ -22,9 +22,7 @@ Theme::Theme(QObject *parent) setColor("Transparent", ui::Color::Transparent); } -Theme::~Theme() -{ -} +Theme::~Theme() {} QColor Theme::rgba(int r, int g, int b, qreal a) const