summary refs log tree commit diff
path: root/src/ui
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-11-22 00:32:49 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2021-11-22 00:33:43 +0100
commita13f492e7d587ade54606a77c4e9f497a0fea737 (patch)
treeffb115cd17450e8094e7e15e0d04f2d5d2e9a852 /src/ui
parentMerge pull request #822 from Nheko-Reborn/dm-filter (diff)
downloadnheko-a13f492e7d587ade54606a77c4e9f497a0fea737.tar.xz
Make clang-format <13 and clang-format >=13 behave the same
I think old clang-format is just buggy in those cases, so we should
reenable those blocks, once everyone has 13 or up.
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/FlatButton.cpp4
-rw-r--r--src/ui/FlatButton.h2
-rw-r--r--src/ui/RaisedButton.cpp2
-rw-r--r--src/ui/RaisedButton.h1
-rw-r--r--src/ui/ThemeManager.cpp2
-rw-r--r--src/ui/ThemeManager.h2
6 files changed, 1 insertions, 12 deletions
diff --git a/src/ui/FlatButton.cpp b/src/ui/FlatButton.cpp
index 4d19c8bb..c80a88dc 100644
--- a/src/ui/FlatButton.cpp
+++ b/src/ui/FlatButton.cpp
@@ -86,8 +86,6 @@ FlatButton::FlatButton(const QString &text, ui::Role role, QWidget *parent, ui::
     setRole(role);
 }
 
-FlatButton::~FlatButton() {}
-
 void
 FlatButton::applyPreset(ui::ButtonPreset preset)
 {
@@ -615,8 +613,6 @@ FlatButtonStateMachine::FlatButtonStateMachine(FlatButton *parent)
     addTransition(button_, QEvent::FocusOut, pressed_state_, hovered_state_);
 }
 
-FlatButtonStateMachine::~FlatButtonStateMachine() {}
-
 void
 FlatButtonStateMachine::setOverlayOpacity(qreal opacity)
 {
diff --git a/src/ui/FlatButton.h b/src/ui/FlatButton.h
index b39c94ac..3f2c3f05 100644
--- a/src/ui/FlatButton.h
+++ b/src/ui/FlatButton.h
@@ -22,7 +22,6 @@ class FlatButtonStateMachine : public QStateMachine
 
 public:
     explicit FlatButtonStateMachine(FlatButton *parent);
-    ~FlatButtonStateMachine() override;
 
     void setOverlayOpacity(qreal opacity);
     void setCheckedOverlayProgress(qreal opacity);
@@ -101,7 +100,6 @@ public:
                ui::Role role,
                QWidget *parent         = nullptr,
                ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset);
-    ~FlatButton() override;
 
     void applyPreset(ui::ButtonPreset preset);
 
diff --git a/src/ui/RaisedButton.cpp b/src/ui/RaisedButton.cpp
index fd0cbd76..42afdd37 100644
--- a/src/ui/RaisedButton.cpp
+++ b/src/ui/RaisedButton.cpp
@@ -74,8 +74,6 @@ RaisedButton::RaisedButton(const QString &text, QWidget *parent)
     setText(text);
 }
 
-RaisedButton::~RaisedButton() {}
-
 bool
 RaisedButton::event(QEvent *event)
 {
diff --git a/src/ui/RaisedButton.h b/src/ui/RaisedButton.h
index 277fa7ff..a93fa000 100644
--- a/src/ui/RaisedButton.h
+++ b/src/ui/RaisedButton.h
@@ -17,7 +17,6 @@ class RaisedButton : public FlatButton
 public:
     explicit RaisedButton(QWidget *parent = nullptr);
     explicit RaisedButton(const QString &text, QWidget *parent = nullptr);
-    ~RaisedButton() override;
 
 protected:
     bool event(QEvent *event) override;
diff --git a/src/ui/ThemeManager.cpp b/src/ui/ThemeManager.cpp
index 0c84777a..05c73aa7 100644
--- a/src/ui/ThemeManager.cpp
+++ b/src/ui/ThemeManager.cpp
@@ -6,8 +6,6 @@
 
 #include "ThemeManager.h"
 
-ThemeManager::ThemeManager() {}
-
 QColor
 ThemeManager::themeColor(const QString &key) const
 {
diff --git a/src/ui/ThemeManager.h b/src/ui/ThemeManager.h
index 5e86c68f..de5307ed 100644
--- a/src/ui/ThemeManager.h
+++ b/src/ui/ThemeManager.h
@@ -16,7 +16,7 @@ public:
     QColor themeColor(const QString &key) const;
 
 private:
-    ThemeManager();
+    ThemeManager() {}
 
     ThemeManager(ThemeManager const &);
     void operator=(ThemeManager const &);