diff --git a/src/BlurhashProvider.h b/src/BlurhashProvider.h
index 566e07ac..bbe28c2c 100644
--- a/src/BlurhashProvider.h
+++ b/src/BlurhashProvider.h
@@ -20,8 +20,7 @@ public:
     BlurhashRunnable(const QString &id, const QSize &requestedSize)
       : m_id(id)
       , m_requestedSize(requestedSize)
-    {
-    }
+    {}
 
     void run() override;
 signals:
diff --git a/src/CacheCryptoStructs.h b/src/CacheCryptoStructs.h
index 04e852b4..6c32667e 100644
--- a/src/CacheCryptoStructs.h
+++ b/src/CacheCryptoStructs.h
@@ -96,8 +96,7 @@ struct MegolmSessionIndex
     MegolmSessionIndex(std::string room_id_, const mtx::events::msg::Encrypted &e)
       : room_id(std::move(room_id_))
       , session_id(e.session_id)
-    {
-    }
+    {}
 
     //! The room in which this session exists.
     std::string room_id;
diff --git a/src/ColorImageProvider.h b/src/ColorImageProvider.h
index 05cc1084..e7fa1571 100644
--- a/src/ColorImageProvider.h
+++ b/src/ColorImageProvider.h
@@ -10,8 +10,7 @@ class ColorImageProvider : public QQuickImageProvider
 public:
     ColorImageProvider()
       : QQuickImageProvider(QQuickImageProvider::Pixmap)
-    {
-    }
+    {}
 
     QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) override;
 };
diff --git a/src/EventAccessors.h b/src/EventAccessors.h
index 8e130c29..9d8a34e7 100644
--- a/src/EventAccessors.h
+++ b/src/EventAccessors.h
@@ -15,8 +15,8 @@
 namespace nheko {
 struct nonesuch
 {
-    ~nonesuch()                      = delete;
-    nonesuch(nonesuch const &)       = delete;
+    ~nonesuch()                = delete;
+    nonesuch(nonesuch const &) = delete;
     void operator=(nonesuch const &) = delete;
 };
 
diff --git a/src/InviteesModel.cpp b/src/InviteesModel.cpp
index 8e30847c..aa6d41d8 100644
--- a/src/InviteesModel.cpp
+++ b/src/InviteesModel.cpp
@@ -12,8 +12,7 @@
 
 InviteesModel::InviteesModel(QObject *parent)
   : QAbstractListModel{parent}
-{
-}
+{}
 
 void
 InviteesModel::addUser(QString mxid)
diff --git a/src/JdenticonProvider.cpp b/src/JdenticonProvider.cpp
index 22d2b887..03c7cd82 100644
--- a/src/JdenticonProvider.cpp
+++ b/src/JdenticonProvider.cpp
@@ -83,8 +83,7 @@ JdenticonRunnable::JdenticonRunnable(const QString &key,
   , m_crop{crop}
   , m_radius{radius}
   , m_requestedSize(requestedSize.isValid() ? requestedSize : QSize(100, 100))
-{
-}
+{}
 
 void
 JdenticonRunnable::run()
diff --git a/src/MainWindow.h b/src/MainWindow.h
index 529f68e0..3db18a98 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -56,10 +56,7 @@ public:
     void showChatPage();
 
 #ifdef NHEKO_DBUS_SYS
-    bool dbusAvailable() const
-    {
-        return dbusAvailable_;
-    }
+    bool dbusAvailable() const { return dbusAvailable_; }
 #endif
 
     Q_INVOKABLE void addPerRoomWindow(const QString &room, QWindow *window);
diff --git a/src/MxcImageProvider.h b/src/MxcImageProvider.h
index 5d8330aa..2a09df87 100644
--- a/src/MxcImageProvider.h
+++ b/src/MxcImageProvider.h
@@ -29,8 +29,7 @@ public:
       , m_requestedSize(requestedSize)
       , m_crop(crop)
       , m_radius(radius)
-    {
-    }
+    {}
 
     void run();
 
diff --git a/src/dbus/NhekoDBusApi.cpp b/src/dbus/NhekoDBusApi.cpp
index cc19f0a0..c6604633 100644
--- a/src/dbus/NhekoDBusApi.cpp
+++ b/src/dbus/NhekoDBusApi.cpp
@@ -44,8 +44,7 @@ RoomInfoItem::RoomInfoItem(const QString &roomId,
   , roomName_{title}
   , image_{image}
   , unreadNotifications_{unreadNotifications}
-{
-}
+{}
 
 RoomInfoItem::RoomInfoItem(const RoomInfoItem &other)
   : QObject{other.parent()}
@@ -54,8 +53,7 @@ RoomInfoItem::RoomInfoItem(const RoomInfoItem &other)
   , roomName_{other.roomName_}
   , image_{other.image_}
   , unreadNotifications_{other.unreadNotifications_}
-{
-}
+{}
 
 RoomInfoItem &
 RoomInfoItem::operator=(const RoomInfoItem &other)
diff --git a/src/dbus/NhekoDBusBackend.cpp b/src/dbus/NhekoDBusBackend.cpp
index e752f15f..f0ed9df1 100644
--- a/src/dbus/NhekoDBusBackend.cpp
+++ b/src/dbus/NhekoDBusBackend.cpp
@@ -16,8 +16,7 @@
 NhekoDBusBackend::NhekoDBusBackend(RoomlistModel *parent)
   : QObject{parent}
   , m_parent{parent}
-{
-}
+{}
 
 QVector<nheko::dbus::RoomInfoItem>
 NhekoDBusBackend::rooms(const QDBusMessage &message)
diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
index db782a86..25ae8725 100644
--- a/src/encryption/DeviceVerificationFlow.cpp
+++ b/src/encryption/DeviceVerificationFlow.cpp
@@ -631,7 +631,7 @@ DeviceVerificationFlow::startVerificationRequest()
     req.hashes                       = {"sha256"};
     req.message_authentication_codes = {"hkdf-hmac-sha256"};
     req.short_authentication_string  = {mtx::events::msg::SASMethods::Decimal,
-                                        mtx::events::msg::SASMethods::Emoji};
+                                       mtx::events::msg::SASMethods::Emoji};
 
     if (this->type == DeviceVerificationFlow::Type::ToDevice) {
         mtx::requests::ToDeviceMessages<mtx::events::msg::KeyVerificationStart> body;
diff --git a/src/encryption/VerificationManager.cpp b/src/encryption/VerificationManager.cpp
index 826f5194..8c775948 100644
--- a/src/encryption/VerificationManager.cpp
+++ b/src/encryption/VerificationManager.cpp
@@ -15,8 +15,7 @@
 VerificationManager::VerificationManager(TimelineViewManager *o)
   : QObject(o)
   , rooms_(o->rooms())
-{
-}
+{}
 
 static bool
 isValidTime(std::optional<uint64_t> t)
diff --git a/src/main.cpp b/src/main.cpp
index aabc0da1..47ebba27 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -102,8 +102,7 @@ registerSignalHandlers()
 // No implementation for systems with no stacktrace support.
 void
 registerSignalHandlers()
-{
-}
+{}
 
 #endif
 
diff --git a/src/notifications/ManagerWin.cpp b/src/notifications/ManagerWin.cpp
index 3e6a0c77..91483492 100644
--- a/src/notifications/ManagerWin.cpp
+++ b/src/notifications/ManagerWin.cpp
@@ -44,8 +44,7 @@ init()
 
 NotificationsManager::NotificationsManager(QObject *parent)
   : QObject(parent)
-{
-}
+{}
 
 void
 NotificationsManager::postNotification(const mtx::responses::Notification &notification,
diff --git a/src/timeline/CommunitiesModel.cpp b/src/timeline/CommunitiesModel.cpp
index 14909479..4f650f49 100644
--- a/src/timeline/CommunitiesModel.cpp
+++ b/src/timeline/CommunitiesModel.cpp
@@ -14,8 +14,7 @@
 
 CommunitiesModel::CommunitiesModel(QObject *parent)
   : QAbstractListModel(parent)
-{
-}
+{}
 
 QHash<int, QByteArray>
 CommunitiesModel::roleNames() const
diff --git a/src/timeline/DelegateChooser.h b/src/timeline/DelegateChooser.h
index 8dff66ad..1772c0c2 100644
--- a/src/timeline/DelegateChooser.h
+++ b/src/timeline/DelegateChooser.h
@@ -74,8 +74,7 @@ private:
         DelegateIncubator(DelegateChooser &parent)
           : QQmlIncubator(QQmlIncubator::AsynchronousIfNested)
           , chooser(parent)
-        {
-        }
+        {}
         void statusChanged(QQmlIncubator::Status status) override;
 
         DelegateChooser &chooser;
diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h
index 683a2ed9..28a4bcf6 100644
--- a/src/timeline/InputBar.h
+++ b/src/timeline/InputBar.h
@@ -39,8 +39,7 @@ class InputVideoSurface : public QAbstractVideoSurface
 public:
     InputVideoSurface(QObject *parent)
       : QAbstractVideoSurface(parent)
-    {
-    }
+    {}
 
     bool present(const QVideoFrame &frame) override;
 
diff --git a/src/timeline/PresenceEmitter.h b/src/timeline/PresenceEmitter.h
index 7028c501..6cbfa96a 100644
--- a/src/timeline/PresenceEmitter.h
+++ b/src/timeline/PresenceEmitter.h
@@ -19,8 +19,7 @@ class PresenceEmitter : public QObject
 public:
     PresenceEmitter(QObject *p = nullptr)
       : QObject(p)
-    {
-    }
+    {}
 
     void sync(const std::vector<mtx::events::Event<mtx::events::presence::Presence>> &presences);
 
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 1e0893b4..142ca793 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -1366,8 +1366,7 @@ struct SendMessageVisitor
 {
     explicit SendMessageVisitor(TimelineModel *model)
       : model_(model)
-    {
-    }
+    {}
 
     template<typename T, mtx::events::EventType Event>
     void sendRoomEvent(mtx::events::RoomEvent<T> msg)
@@ -1391,8 +1390,7 @@ struct SendMessageVisitor
     // Do-nothing operator for all unhandled events
     template<typename T>
     void operator()(const mtx::events::Event<T> &)
-    {
-    }
+    {}
 
     // Operator for m.room.message events that contain a msgtype in their content
     template<typename T,
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index 646d018c..c52473b1 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -147,8 +147,7 @@ class StateKeeper
 public:
     StateKeeper(std::function<void()> &&fn)
       : fn_(std::move(fn))
-    {
-    }
+    {}
 
     ~StateKeeper() { fn_(); }
 
diff --git a/src/ui/HiddenEvents.h b/src/ui/HiddenEvents.h
index 52f62bbd..928b14ba 100644
--- a/src/ui/HiddenEvents.h
+++ b/src/ui/HiddenEvents.h
@@ -18,8 +18,7 @@ class HiddenEvents : public QObject
 public:
     explicit HiddenEvents(QObject *p = nullptr)
       : QObject(p)
-    {
-    }
+    {}
 
     Q_INVOKABLE void toggle(int type);
     Q_INVOKABLE void save();
diff --git a/src/ui/NhekoCursorShape.cpp b/src/ui/NhekoCursorShape.cpp
index 1c5918b4..10a6ddab 100644
--- a/src/ui/NhekoCursorShape.cpp
+++ b/src/ui/NhekoCursorShape.cpp
@@ -10,8 +10,7 @@
 NhekoCursorShape::NhekoCursorShape(QQuickItem *parent)
   : QQuickItem(parent)
   , currentShape_(Qt::CursorShape::ArrowCursor)
-{
-}
+{}
 
 Qt::CursorShape
 NhekoCursorShape::cursorShape() const
diff --git a/src/ui/UIA.h b/src/ui/UIA.h
index 9d673dea..150b595d 100644
--- a/src/ui/UIA.h
+++ b/src/ui/UIA.h
@@ -20,8 +20,7 @@ public:
 
     UIA(QObject *parent = nullptr)
       : QObject(parent)
-    {
-    }
+    {}
 
     mtx::http::UIAHandler genericHandler(QString context);
 
diff --git a/src/ui/UserProfile.h b/src/ui/UserProfile.h
index 0f993928..4652a72e 100644
--- a/src/ui/UserProfile.h
+++ b/src/ui/UserProfile.h
@@ -45,8 +45,7 @@ public:
       , verification_status(verification_status_)
       , lastIp(lastIp_)
       , lastTs(lastTs_)
-    {
-    }
+    {}
     DeviceInfo(const QString deviceID,
                const QString displayName,
                verification::Status verification_status_)
@@ -54,12 +53,10 @@ public:
       , display_name(displayName)
       , verification_status(verification_status_)
       , lastTs(0)
-    {
-    }
+    {}
     DeviceInfo()
       : verification_status(verification::UNVERIFIED)
-    {
-    }
+    {}
 
     QString device_id;
     QString display_name;
diff --git a/src/voip/CallDevices.cpp b/src/voip/CallDevices.cpp
index 61c6c0a1..b0c90d84 100644
--- a/src/voip/CallDevices.cpp
+++ b/src/voip/CallDevices.cpp
@@ -20,8 +20,7 @@ extern "C"
 
 CallDevices::CallDevices()
   : QObject()
-{
-}
+{}
 
 #ifdef GSTREAMER_AVAILABLE
 namespace {
diff --git a/src/voip/CallDevices.h b/src/voip/CallDevices.h
index 4b2c1e48..cecb6357 100644
--- a/src/voip/CallDevices.h
+++ b/src/voip/CallDevices.h
@@ -43,6 +43,6 @@ private:
     GstDevice *videoDevice(std::pair<int, int> &resolution, std::pair<int, int> &frameRate) const;
 
 public:
-    CallDevices(CallDevices const &)    = delete;
+    CallDevices(CallDevices const &) = delete;
     void operator=(CallDevices const &) = delete;
 };
diff --git a/src/voip/WebRTCSession.cpp b/src/voip/WebRTCSession.cpp
index 89a6d268..31174500 100644
--- a/src/voip/WebRTCSession.cpp
+++ b/src/voip/WebRTCSession.cpp
@@ -1152,8 +1152,7 @@ WebRTCSession::acceptAnswer(const std::string &)
 
 void
 WebRTCSession::acceptICECandidates(const std::vector<mtx::events::msg::CallCandidates::Candidate> &)
-{
-}
+{}
 
 bool
 WebRTCSession::isMicMuted() const
@@ -1169,12 +1168,10 @@ WebRTCSession::toggleMicMute()
 
 void
 WebRTCSession::toggleLocalPiP()
-{
-}
+{}
 
 void
 WebRTCSession::end()
-{
-}
+{}
 
 #endif
diff --git a/src/voip/WebRTCSession.h b/src/voip/WebRTCSession.h
index 15e904ca..04383679 100644
--- a/src/voip/WebRTCSession.h
+++ b/src/voip/WebRTCSession.h
@@ -113,6 +113,6 @@ private:
     void clear();
 
 public:
-    WebRTCSession(WebRTCSession const &)  = delete;
+    WebRTCSession(WebRTCSession const &) = delete;
     void operator=(WebRTCSession const &) = delete;
 };