Merge master and fix conflicts

1 files changed, 5 insertions, 9 deletions

diff --git a/src/dialogs/ReadReceipts.h b/src/dialogs/ReadReceipts.h

index e298af0a..2e7a0217 100644
--- a/src/dialogs/ReadReceipts.h
+++ b/src/dialogs/ReadReceipts.h
@@ -2,12 +2,12 @@
 
 #include <QDateTime>
 #include <QFrame>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QListWidget>
-#include <QVBoxLayout>
 
 class Avatar;
+class QLabel;
+class QListWidget;
+class QHBoxLayout;
+class QVBoxLayout;
 
 namespace dialogs {
 
@@ -47,11 +47,7 @@ public slots:
 
 protected:
         void paintEvent(QPaintEvent *event) override;
-        void hideEvent(QHideEvent *event) override
-        {
-                userList_->clear();
-                QFrame::hideEvent(event);
-        }
+        void hideEvent(QHideEvent *event) override;
 
 private:
         QLabel *topLabel_;