From 902c96ee53db6d5cbe2c21c9424c89e1e0088cb1 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Mon, 7 Sep 2020 00:27:41 -0400 Subject: use a singleton (oh no) instead of passing Abaddon* everywhere --- abaddon.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'abaddon.cpp') diff --git a/abaddon.cpp b/abaddon.cpp index 236a4a6..bf82910 100644 --- a/abaddon.cpp +++ b/abaddon.cpp @@ -28,6 +28,11 @@ Abaddon::~Abaddon() { m_discord.Stop(); } +Abaddon &Abaddon::Get() { + static Abaddon instance; + return instance; +} + int Abaddon::StartGTK() { m_gtk_app = Gtk::Application::create("com.github.lorpus.abaddon"); @@ -39,7 +44,6 @@ int Abaddon::StartGTK() { }); m_main_window = std::make_unique(); - m_main_window->SetAbaddon(this); m_main_window->set_title(APP_TITLE); m_main_window->show(); m_main_window->UpdateComponents(); @@ -260,6 +264,5 @@ void Abaddon::ActionReloadCSS() { int main(int argc, char **argv) { Gtk::Main::init_gtkmm_internals(); // why??? - Abaddon abaddon; - return abaddon.StartGTK(); + return Abaddon::Get().StartGTK(); } -- cgit v1.2.3