diff --git a/src/BlurhashProvider.cpp b/src/BlurhashProvider.cpp
index cc7d5a73423c2ccbcadf12e2b5a5ae868e58a1b9..acaef400eba1444b2f6219a5f8ab1a16d59967cf 100644
--- a/src/BlurhashProvider.cpp
+++ b/src/BlurhashProvider.cpp
@@ -31,7 +31,8 @@ BlurhashResponse::run()
                 return;
         }
 
-        QImage image(decoded.image.data(), (int)decoded.width, (int)decoded.height, QImage::Format_RGB32);
+        QImage image(
+          decoded.image.data(), (int)decoded.width, (int)decoded.height, QImage::Format_RGB32);
 
         m_image = image.copy();
         emit finished();
diff --git a/src/Cache.cpp b/src/Cache.cpp
index 3099b0c9ced79a4e9f221dd072d1b0ac7e1d96bd..3f8d5d96c5740d607f19cdec0371a1417ced7b15 100644
--- a/src/Cache.cpp
+++ b/src/Cache.cpp
@@ -1259,7 +1259,8 @@ Cache::saveState(const mtx::responses::Sync &res)
                                                 nhlog::db()->warn(
                                                   "failed to parse room info: room_id ({}), {}: {}",
                                                   room.first,
-                                                  std::string(data.data(), data.size()), e.what());
+                                                  std::string(data.data(), data.size()),
+                                                  e.what());
                                         }
                                 }
                         }
@@ -1460,7 +1461,8 @@ Cache::singleRoomInfo(const std::string &room_id)
                 } catch (const json::exception &e) {
                         nhlog::db()->warn("failed to parse room info: room_id ({}), {}: {}",
                                           room_id,
-                                          std::string(data.data(), data.size()), e.what());
+                                          std::string(data.data(), data.size()),
+                                          e.what());
                 }
         }
 
@@ -1494,7 +1496,8 @@ Cache::getRoomInfo(const std::vector<std::string> &rooms)
                         } catch (const json::exception &e) {
                                 nhlog::db()->warn("failed to parse room info: room_id ({}), {}: {}",
                                                   room,
-                                                  std::string(data.data(), data.size()), e.what());
+                                                  std::string(data.data(), data.size()),
+                                                  e.what());
                         }
                 } else {
                         // Check if the room is an invite.
@@ -1507,10 +1510,11 @@ Cache::getRoomInfo(const std::vector<std::string> &rooms)
                                         room_info.emplace(QString::fromStdString(room),
                                                           std::move(tmp));
                                 } catch (const json::exception &e) {
-                                        nhlog::db()->warn(
-                                          "failed to parse room info for invite: room_id ({}), {}: {}",
-                                          room,
-                                          std::string(data.data(), data.size()), e.what());
+                                        nhlog::db()->warn("failed to parse room info for invite: "
+                                                          "room_id ({}), {}: {}",
+                                                          room,
+                                                          std::string(data.data(), data.size()),
+                                                          e.what());
                                 }
                         }
                 }
@@ -2043,7 +2047,7 @@ Cache::getRoomName(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb)
                 }
         }
 
-        auto cursor     = lmdb::cursor::open(txn, membersdb);
+        auto cursor      = lmdb::cursor::open(txn, membersdb);
         const auto total = membersdb.size(txn);
 
         std::size_t ii = 0;
diff --git a/src/CommunitiesList.cpp b/src/CommunitiesList.cpp
index 010200c8f046008558952d384a68c6ac9ca704c0..f3af9932e552f132e35c2dcb2e9e76e2e4efd49c 100644
--- a/src/CommunitiesList.cpp
+++ b/src/CommunitiesList.cpp
@@ -104,7 +104,8 @@ CommunitiesList::setTagsForRoom(const QString &room_id, const std::vector<std::s
                 }
                 // insert or remove the room from the tag as appropriate
                 std::string current_tag =
-                  it->first.right(static_cast<int>(it->first.size() - strlen("tag:"))).toStdString();
+                  it->first.right(static_cast<int>(it->first.size() - strlen("tag:")))
+                    .toStdString();
                 if (std::find(tags.begin(), tags.end(), current_tag) != tags.end()) {
                         // the room has this tag
                         it->second->addRoom(room_id);
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 7228faf473969837a0e7768fd9a3f02ff0819424..3bb090df0e46f4752149caf2e809e9169cc22668 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -388,8 +388,9 @@ utils::escapeBlacklistedHtml(const QString &rawStr)
                 switch (data.at(pos)) {
                 case '<': {
                         bool oneTagMatched = false;
-                        const int endPos      = static_cast<int>(std::min(static_cast<size_t>(data.indexOf('>', pos)),
-                                                 static_cast<size_t>(data.indexOf(' ', pos))));
+                        const int endPos =
+                          static_cast<int>(std::min(static_cast<size_t>(data.indexOf('>', pos)),
+                                                    static_cast<size_t>(data.indexOf(' ', pos))));
 
                         auto mid = data.mid(pos + 1, endPos - pos - 1);
                         for (const auto &tag : allowedTags) {
diff --git a/src/popups/SuggestionsPopup.cpp b/src/popups/SuggestionsPopup.cpp
index 42efe6ce92cf3d10f45680dc20e19bea1a30ac02..8add43130b9ed3b693c57fcb0dae586f971a9141 100644
--- a/src/popups/SuggestionsPopup.cpp
+++ b/src/popups/SuggestionsPopup.cpp
@@ -150,7 +150,8 @@ SuggestionsPopup::removeLayoutItemsAfter(size_t startingPos)
         size_t posToRemove = layout_->count() - 1;
 
         QLayoutItem *item;
-        while (startingPos <= posToRemove && (item = layout_->takeAt((int)posToRemove)) != nullptr) {
+        while (startingPos <= posToRemove &&
+               (item = layout_->takeAt((int)posToRemove)) != nullptr) {
                 delete item->widget();
                 delete item;
 
diff --git a/src/timeline/EventStore.h b/src/timeline/EventStore.h
index a71e95d566d96bcbe0a4c3836d5cb3b35f6f15a9..c6b397424897baafa91eed1cc597f33ffd6505b5 100644
--- a/src/timeline/EventStore.h
+++ b/src/timeline/EventStore.h
@@ -29,7 +29,8 @@ public:
                 friend uint qHash(const Index &i, uint seed = 0) noexcept
                 {
                         QtPrivate::QHashCombine hash;
-                        seed = hash(seed, QByteArray::fromRawData(i.room.data(), (int)i.room.size()));
+                        seed =
+                          hash(seed, QByteArray::fromRawData(i.room.data(), (int)i.room.size()));
                         seed = hash(seed, i.idx);
                         return seed;
                 }
@@ -46,7 +47,8 @@ public:
                 friend uint qHash(const IdIndex &i, uint seed = 0) noexcept
                 {
                         QtPrivate::QHashCombine hash;
-                        seed = hash(seed, QByteArray::fromRawData(i.room.data(), (int)i.room.size()));
+                        seed =
+                          hash(seed, QByteArray::fromRawData(i.room.data(), (int)i.room.size()));
                         seed = hash(seed, QByteArray::fromRawData(i.id.data(), (int)i.id.size()));
                         return seed;
                 }