From 4903993bd50f9b5a1d27899863438f28499c39c0 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Thu, 30 Oct 2014 15:40:02 +0100 Subject: [PATCH] refs #341 Fix variableScope warnings --- src/blackgui/infoarea.cpp | 2 +- src/swiftgui_standard/main.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/blackgui/infoarea.cpp b/src/blackgui/infoarea.cpp index c66c430d4..77a01091c 100644 --- a/src/blackgui/infoarea.cpp +++ b/src/blackgui/infoarea.cpp @@ -66,9 +66,9 @@ namespace BlackGui menu->addAction(lockTabBarMenuAction); connect(lockTabBarMenuAction, &QAction::toggled, this, &CInfoArea::ps_toggleTabBarLocked); - bool c = false; if (!this->m_dockableWidgets.isEmpty()) { + bool c = false; menu->addSeparator(); QMenu *subMenuToggleFloat = new QMenu("Toggle Float/Dock", menu); QMenu *subMenuDisplay = new QMenu("Display", menu); diff --git a/src/swiftgui_standard/main.cpp b/src/swiftgui_standard/main.cpp index e877da5e9..881b0548a 100644 --- a/src/swiftgui_standard/main.cpp +++ b/src/swiftgui_standard/main.cpp @@ -56,7 +56,6 @@ int main(int argc, char *argv[]) // modes GuiModes::WindowMode windowMode; - GuiModes::CoreMode coreMode; // Dialog to decide external or internal core CIntroWindow intro; @@ -68,7 +67,7 @@ int main(int argc, char *argv[]) } else { - coreMode = intro.getCoreMode(); + GuiModes::CoreMode coreMode = intro.getCoreMode(); windowMode = intro.getWindowMode(); QString dbusAddress = BlackCore::CDBusServer::fixAddressToDBusAddress(intro.getDBusAddress()); switch (coreMode)