gcc Pepega

src/util/QObjectRef.hpp

@@ -3,72 +3,73 @@
 #include <QObject>
 #include <type_traits>
 
-namespace chatterino
+namespace chatterino {
+/// Holds a pointer to a QObject and resets it to nullptr if the QObject
+/// gets destroyed.
+template <typename T>
+class QObjectRef
 {
-    /// Holds a pointer to a QObject and resets it to nullptr if the QObject
-    /// gets destroyed.
-    template <typename T>
-    class QObjectRef
+public:
+    QObjectRef()
     {
-    public:
-        QObjectRef()
+        static_assert(std::is_base_of_v<QObject, T>);
+    }
+
+    explicit QObjectRef(T *t)
+    {
+        static_assert(std::is_base_of_v<QObject, T>);
+
+        this->set(t);
+    }
+
+    ~QObjectRef()
+    {
+        this->set(nullptr);
+    }
+
+    QObjectRef &operator=(T *t)
+    {
+        this->set(t);
+
+        return *this;
+    }
+
+    operator bool()
+    {
+        return t_;
+    }
+
+    T *operator->()
+    {
+        return t_;
+    }
+
+    T *get()
+    {
+        return t_;
+    }
+
+private:
+    void set(T *other)
+    {
+        // old
+        if (this->conn_)
         {
-            static_assert(std::is_base_of_v<QObject, T>);
+            QObject::disconnect(this->conn_);
         }
 
-        explicit QObjectRef(T* t)
+        // new
+        if (other)
         {
-            static_assert(std::is_base_of_v<QObject, T>);
-
-            this->swap(t);
-        }
-
-        ~QObjectRef()
-        {
-            this->swap(nullptr);
-        }
-
-        QObjectRef& operator=(T* t)
-        {
-            this->swap(t);
-            return *this;
-        }
-
-        operator bool()
-        {
-            return t_;
-        }
-
-        T* operator->()
-        {
-            return t_;
-        }
-
-        T* get()
-        {
-            return t_;
-        }
-
-        QObject* swap(T* other)
-        {
-            // old
-            if (this->conn_)
-            {
-                QObject::disconnect(this->conn_);
-            }
-
-            // new
-            if (other)
-            {
+            this->conn_ =
                 QObject::connect(other, &QObject::destroyed,
-                    [this]() { this->swap(nullptr); });
-            }
-
-            return std::exchange(this->t_, other);
+                                 [this](QObject *) { this->set(nullptr); });
         }
 
-    private:
-        T* t_{};
-        QMetaObject::Connection conn_;
-    };
+        this->t_ = other;
+    }
+
+    T *t_{};
+    QMetaObject::Connection conn_;
+};
 }  // namespace chatterino

src/widgets/splits/SplitInput.hpp

@@ -2,6 +2,7 @@
 
 #include "util/QObjectRef.hpp"
 #include "widgets/BaseWidget.hpp"
+#include "widgets/dialogs/EmotePopup.hpp"
 
 #include <QHBoxLayout>
 #include <QLabel>