summary refs log tree commit diff
path: root/src/notifications
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/notifications
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/notifications')
-rw-r--r--src/notifications/Manager.h5
-rw-r--r--src/notifications/ManagerWin.cpp15
2 files changed, 14 insertions, 6 deletions
diff --git a/src/notifications/Manager.h b/src/notifications/Manager.h
index da930296..c5253ecb 100644
--- a/src/notifications/Manager.h
+++ b/src/notifications/Manager.h
@@ -87,9 +87,8 @@ private:
 
 #if defined(Q_OS_WINDOWS)
 private:
-    void systemPostNotification(const QString &line1,
-                                const QString &line2,
-                                const QString &iconPath);
+    void
+    systemPostNotification(const QString &line1, const QString &line2, const QString &iconPath);
 #endif
 
     // these slots are platform specific (D-Bus only)
diff --git a/src/notifications/ManagerWin.cpp b/src/notifications/ManagerWin.cpp
index 4376e4d8..e90b4c24 100644
--- a/src/notifications/ManagerWin.cpp
+++ b/src/notifications/ManagerWin.cpp
@@ -100,10 +100,19 @@ NotificationsManager::systemPostNotification(const QString &line1,
     WinToast::instance()->showToast(templ, new CustomHandler());
 }
 
-void NotificationsManager::actionInvoked(uint, QString) {}
-void NotificationsManager::notificationReplied(uint, QString) {}
+// clang-format off
+// clang-format < 12 is buggy on this
+void
+NotificationsManager::actionInvoked(uint, QString)
+{}
 
-void NotificationsManager::notificationClosed(uint, uint) {}
+void
+NotificationsManager::notificationReplied(uint, QString)
+{}
+
+void
+NotificationsManager::notificationClosed(uint, uint)
+{}
 
 void
 NotificationsManager::removeNotification(const QString &, const QString &)