From dcddea6fb89246d63be91a1f1151ce2dbd255a12 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Mon, 13 Apr 2020 16:22:30 +0200
Subject: Fix reply not closing

fixes #124
---
 src/TextInputWidget.h | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

(limited to 'src/TextInputWidget.h')

diff --git a/src/TextInputWidget.h b/src/TextInputWidget.h
index 77d77e44..addb61ec 100644
--- a/src/TextInputWidget.h
+++ b/src/TextInputWidget.h
@@ -28,7 +28,6 @@
 
 #include "dialogs/PreviewUploadOverlay.h"
 #include "emoji/PickButton.h"
-#include "popups/ReplyPopup.h"
 #include "popups/SuggestionsPopup.h"
 
 struct SearchResult;
@@ -49,27 +48,15 @@ public:
         QSize minimumSizeHint() const override;
 
         void submit();
-        void showReplyPopup(const RelatedInfo &related_);
-        void closeReply()
-        {
-                replyPopup_.hide();
-                related = {};
-        }
-
-        // Used for replies
-        std::optional<RelatedInfo> related;
 
 signals:
         void heightChanged(int height);
         void startedTyping();
         void stoppedTyping();
         void startedUpload();
-        void message(QString, const std::optional<RelatedInfo> &);
+        void message(QString msg);
         void command(QString name, QString args);
-        void media(QSharedPointer<QIODevice> data,
-                   QString mimeClass,
-                   const QString &filename,
-                   const std::optional<RelatedInfo> &related);
+        void media(QSharedPointer<QIODevice> data, QString mimeClass, const QString &filename);
 
         //! Trigger the suggestion popup.
         void showSuggestions(const QString &query);
@@ -97,7 +84,6 @@ private:
         QTimer *typingTimer_;
 
         SuggestionsPopup suggestionsPopup_;
-        ReplyPopup replyPopup_;
 
         enum class AnchorType
         {
@@ -163,21 +149,18 @@ public slots:
         void openFileSelection();
         void hideUploadSpinner();
         void focusLineEdit() { input_->setFocus(); }
-        void addReply(const RelatedInfo &related);
-        void closeReplyPopup() { input_->closeReply(); }
 
 private slots:
         void addSelectedEmoji(const QString &emoji);
 
 signals:
-        void sendTextMessage(const QString &msg, const std::optional<RelatedInfo> &related);
-        void sendEmoteMessage(QString msg, const std::optional<RelatedInfo> &related);
+        void sendTextMessage(const QString &msg);
+        void sendEmoteMessage(QString msg);
         void heightChanged(int height);
 
         void uploadMedia(const QSharedPointer<QIODevice> data,
                          QString mimeClass,
-                         const QString &filename,
-                         const std::optional<RelatedInfo> &related);
+                         const QString &filename);
 
         void sendJoinRoomRequest(const QString &room);
         void sendInviteRoomRequest(const QString &userid, const QString &reason);
-- 
cgit 1.5.1