Merge branch '0.7.0-dev' of ssh://github.com/Nheko-Reborn/nheko into 0.7.0-dev

5 files changed, 4 insertions, 6 deletions

diff --git a/src/popups/PopupItem.cpp b/src/popups/PopupItem.cpp

index b10cd32e..94de3a92 100644
--- a/src/popups/PopupItem.cpp
+++ b/src/popups/PopupItem.cpp
@@ -2,9 +2,9 @@
 #include <QPainter>
 #include <QStyleOption>
 
-#include "PopupItem.h"
 #include "../Utils.h"
 #include "../ui/Avatar.h"
+#include "PopupItem.h"
 
 constexpr int PopupHMargin    = 4;
 constexpr int PopupItemMargin = 3;
diff --git a/src/popups/ReplyPopup.cpp b/src/popups/ReplyPopup.cpp

index a883739f..04c3cea5 100644
--- a/src/popups/ReplyPopup.cpp
+++ b/src/popups/ReplyPopup.cpp
@@ -1,5 +1,5 @@
-#include <QPaintEvent>
 #include <QLabel>
+#include <QPaintEvent>
 #include <QPainter>
 #include <QStyleOption>
 
@@ -32,7 +32,7 @@ ReplyPopup::setReplyContent(const QString &user, const QString &msg, const QStri
         // layout position.
         // if (!item) {
         auto userItem = new UserItem(this, user);
-        auto *text = new QLabel(this);
+        auto *text    = new QLabel(this);
         text->setText(msg);
         auto *event = new QLabel(this);
         event->setText(srcEvent);
diff --git a/src/popups/ReplyPopup.h b/src/popups/ReplyPopup.h

index d8355e53..57c2bc8a 100644
--- a/src/popups/ReplyPopup.h
+++ b/src/popups/ReplyPopup.h
@@ -28,5 +28,4 @@ signals:
 
 private:
         QVBoxLayout *layout_;
-
 };
diff --git a/src/popups/SuggestionsPopup.cpp b/src/popups/SuggestionsPopup.cpp

index 6861a76a..ba1f77b9 100644
--- a/src/popups/SuggestionsPopup.cpp
+++ b/src/popups/SuggestionsPopup.cpp
@@ -3,10 +3,10 @@
 #include <QStyleOption>
 
 #include "../Config.h"
-#include "SuggestionsPopup.h"
 #include "../Utils.h"
 #include "../ui/Avatar.h"
 #include "../ui/DropShadow.h"
+#include "SuggestionsPopup.h"
 
 SuggestionsPopup::SuggestionsPopup(QWidget *parent)
   : QWidget(parent)
diff --git a/src/popups/SuggestionsPopup.h b/src/popups/SuggestionsPopup.h

index 4fbb97b3..1ef720b2 100644
--- a/src/popups/SuggestionsPopup.h
+++ b/src/popups/SuggestionsPopup.h
@@ -10,7 +10,6 @@
 #include "../ChatPage.h"
 #include "PopupItem.h"
 
-
 class SuggestionsPopup : public QWidget
 {
         Q_OBJECT