From 06e12a0a16c8ded7deada5586a4772779f01dbe8 Mon Sep 17 00:00:00 2001
From: targetakhil <targetakhil@gmail.com>
Date: Sat, 17 Apr 2021 22:58:04 +0530
Subject: move detection code to nheko namespace and fix a few other bugs

---
 src/timeline/TimelineViewManager.h | 43 +++++++-------------------------------
 1 file changed, 7 insertions(+), 36 deletions(-)

(limited to 'src/timeline/TimelineViewManager.h')

diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h
index 9d1b4b1d..e5dea7ce 100644
--- a/src/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
@@ -32,33 +32,6 @@ class UserSettings;
 class ChatPage;
 class DeviceVerificationFlow;
 
-struct nonesuch
-{
-        ~nonesuch()                = delete;
-        nonesuch(nonesuch const &) = delete;
-        void operator=(nonesuch const &) = delete;
-};
-
-namespace detail {
-template<class Default, class AlwaysVoid, template<class...> class Op, class... Args>
-struct detector
-{
-        using value_t = std::false_type;
-        using type    = Default;
-};
-
-template<class Default, template<class...> class Op, class... Args>
-struct detector<Default, std::void_t<Op<Args...>>, Op, Args...>
-{
-        using value_t = std::true_type;
-        using type    = Op<Args...>;
-};
-
-} // namespace detail
-
-template<template<class...> class Op, class... Args>
-using is_detected = typename detail::detector<nonesuch, void, Op, Args...>::value_t;
-
 class TimelineViewManager : public QObject
 {
         Q_OBJECT
@@ -175,15 +148,17 @@ public slots:
 
         void backToRooms() { emit showRoomList(); }
         QObject *completerFor(QString completerName, QString roomId = "");
-        void forwardMessageToRoom(mtx::events::collections::TimelineEvents *e,
-                                  QString roomId,
-                                  bool sentFromEncrypted);
+        void forwardMessageToRoom(mtx::events::collections::TimelineEvents *e, QString roomId);
 
 private slots:
         void openImageOverlayInternal(QString eventId, QImage img);
 
 private:
-         template<class Content>
+        template<template<class...> class Op, class... Args>
+        using is_detected =
+          typename nheko::detail::detector<nheko::nonesuch, void, Op, Args...>::value_t;
+
+        template<class Content>
         using f_t = decltype(Content::file);
 
         template<class Content>
@@ -192,11 +167,7 @@ private:
         template<typename T>
         static constexpr bool messageWithFileAndUrl(const mtx::events::Event<T> &e)
         {
-                if constexpr (is_detected<f_t, T>::value && is_detected<u_t, T>::value) {
-                        return true;
-                }
-
-                return false;
+                return is_detected<f_t, T>::value && is_detected<u_t, T>::value;
         }
 
 private:
-- 
cgit 1.5.1