From ddcce73111d23198991687ec9a1f9ebd06635e1c Mon Sep 17 00:00:00 2001 From: Leon Richardt Date: Thu, 19 Sep 2019 23:28:31 +0200 Subject: [PATCH] Use Version singleton to set window title --- src/widgets/Window.cpp | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp index 1a597dc40..264146893 100644 --- a/src/widgets/Window.cpp +++ b/src/widgets/Window.cpp @@ -363,30 +363,12 @@ void Window::addMenuBar() [=] { this->notebook_->selectPreviousTab(); }); } -#define UGLYMACROHACK1(s) #s -#define UGLYMACROHACK(s) UGLYMACROHACK1(s) - void Window::onAccountSelected() { auto user = getApp()->accounts->twitch.getCurrent(); // update title - QString title = "Chatterino "; - if (Modes::getInstance().isNightly) - { - title += "Nightly "; - } - title += CHATTERINO_VERSION; - - if (Modes::getInstance().isNightly) - { -#ifdef CHATTERINO_NIGHTLY_VERSION_STRING - title += - QString(" (" UGLYMACROHACK(CHATTERINO_NIGHTLY_VERSION_STRING) ")"); -#endif - } - - this->setWindowTitle(title); + this->setWindowTitle(Version::getInstance().getFullVersion()); // update user if (user->isAnon())