From b62d2577cb7d1169fd1a89aa52ca4fb9c6fac3e7 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sun, 7 Jan 2024 14:38:27 +0100 Subject: [PATCH] Remove now-unneccessary fakeDtor --- src/Application.cpp | 5 ----- src/Application.hpp | 6 ------ src/RunGui.cpp | 2 +- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Application.cpp b/src/Application.cpp index 7ce1c67c3..7b3e9a0ad 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -147,11 +147,6 @@ Application::Application(Settings &_settings, Paths &_paths, const Args &_args) Application::~Application() = default; -void Application::fakeDtor() -{ - this->twitchPubSub.reset(); -} - void Application::initialize(Settings &settings, Paths &paths) { assert(isAppInitialized == false); diff --git a/src/Application.hpp b/src/Application.hpp index 737989169..66eb79fa5 100644 --- a/src/Application.hpp +++ b/src/Application.hpp @@ -98,12 +98,6 @@ public: Application &operator=(const Application &) = delete; Application &operator=(Application &&) = delete; - /** - * In the interim, before we remove _exit(0); from RunGui.cpp, - * this will destroy things we know can be destroyed - */ - void fakeDtor(); - void initialize(Settings &settings, Paths &paths); void load(); void save(); diff --git a/src/RunGui.cpp b/src/RunGui.cpp index 50ca92731..a1283ab7b 100644 --- a/src/RunGui.cpp +++ b/src/RunGui.cpp @@ -294,6 +294,6 @@ void runGui(QApplication &a, Paths &paths, Settings &settings, const Args &args) // flushing windows clipboard to keep copied messages flushClipboard(); #endif - app.fakeDtor(); } + } // namespace chatterino