From: Deniz Türkoglu <turkoglu.deniz@gmail.com>
Date: Wed, 27 Aug 2014 19:08:57 +0000 (+0200)
Subject: Fix MainToolBar visibility not saving in OSX
X-Git-Tag: 0.10.1~15
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=29f82ad3dbfb33462e9d01a628d26fa678fcf710

Fix MainToolBar visibility not saving in OSX

The current code, although completely valid, doesn't work due to moc not
seeing built in defines. See;
https://bugreports.qt-project.org/browse/QTBUG-34593
---

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 8e0172d1..68d3c6cd 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -1022,13 +1022,15 @@ void MainWin::setupToolBars()
 #endif
 }
 
-#ifdef Q_WS_MAC
 void MainWin::saveMainToolBarStatus(bool enabled)
 {
+#ifdef Q_OS_MAC
     QtUiSettings uiSettings;
     uiSettings.setValue("ShowMainToolBar", enabled);
-}
+#else
+    Q_UNUSED(enabled);
 #endif
+}
 
 
 void MainWin::connectedToCore()
diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index e1ff7ea6..f0750ed2 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -152,9 +152,7 @@ private slots:
 
     void saveMenuBarStatus(bool enabled);
     void saveStatusBarStatus(bool enabled);
-#ifdef Q_WS_MAC
     void saveMainToolBarStatus(bool enabled);
-#endif
 
     void loadLayout();
     void saveLayout();