From dd7df35720a5e2e108f4db72ab786936b99e8fc9 Mon Sep 17 00:00:00 2001
From: Mick Sayson <mick@sayson.com>
Date: Sun, 31 Jan 2021 14:41:10 -0800
Subject: [PATCH] revert(chatlog): Revert cleanup

* Fix compilation issues caused by incorrect merges
---
 src/chatlog/chatlog.cpp             | 6 ++++++
 src/model/friend.cpp                | 5 ++---
 src/model/friend.h                  | 1 -
 src/model/group.cpp                 | 2 --
 src/model/group.h                   | 1 -
 src/widget/form/genericchatform.cpp | 1 +
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/chatlog/chatlog.cpp b/src/chatlog/chatlog.cpp
index 7532f18ed..cee5c97d6 100644
--- a/src/chatlog/chatlog.cpp
+++ b/src/chatlog/chatlog.cpp
@@ -913,6 +913,12 @@ void ChatLog::focusOutEvent(QFocusEvent* ev)
     }
 }
 
+void ChatLog::wheelEvent(QWheelEvent *event)
+{
+    QGraphicsView::wheelEvent(event);
+    checkVisibility(true);
+}
+
 void ChatLog::retranslateUi()
 {
     copyAction->setText(tr("Copy"));
diff --git a/src/model/friend.cpp b/src/model/friend.cpp
index 3fcaade65..d93c5eeca 100644
--- a/src/model/friend.cpp
+++ b/src/model/friend.cpp
@@ -192,8 +192,6 @@ Status::Status Friend::getStatus() const
     return isNegotiating ? Status::Status::Negotiating : friendStatus;
 }
 
-}
-
 void Friend::setExtendedMessageSupport(bool supported)
 {
     supportedExtensions[ExtensionType::messages] = supported;
@@ -222,4 +220,5 @@ void Friend::onNegotiationComplete() {
 
     if (Status::isOnline(getStatus())) {
         emit onlineOfflineChanged(friendPk, true);
-    }
\ No newline at end of file
+    }
+}
diff --git a/src/model/friend.h b/src/model/friend.h
index 0dc964db1..c415ab0c5 100644
--- a/src/model/friend.h
+++ b/src/model/friend.h
@@ -54,7 +54,6 @@ public:
     void finishNegotiation();
     void setStatus(Status::Status s);
     Status::Status getStatus() const;
-    bool useHistory() const final;
 
     void setExtendedMessageSupport(bool supported);
     ExtensionSet getSupportedExtensions() const;
diff --git a/src/model/group.cpp b/src/model/group.cpp
index f028289e4..258613903 100644
--- a/src/model/group.cpp
+++ b/src/model/group.cpp
@@ -201,5 +201,3 @@ QString Group::getSelfName() const
 {
     return selfName;
 }
-
-}
diff --git a/src/model/group.h b/src/model/group.h
index 8733032bb..056b7665b 100644
--- a/src/model/group.h
+++ b/src/model/group.h
@@ -60,7 +60,6 @@ public:
     void setSelfName(const QString& name);
     QString getSelfName() const;
 
-    bool useHistory() const final;
 signals:
     void titleChangedByUser(const QString& title);
     void titleChanged(const QString& author, const QString& title);
diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp
index eea11e760..83c9cc370 100644
--- a/src/widget/form/genericchatform.cpp
+++ b/src/widget/form/genericchatform.cpp
@@ -44,6 +44,7 @@
 #include "src/widget/tool/flyoutoverlaywidget.h"
 #include "src/widget/translator.h"
 #include "src/widget/widget.h"
+#include "src/widget/gui.h"
 
 #include <QClipboard>
 #include <QFileDialog>