From: Daniel Albers <daniel@lbe.rs>
Date: Thu, 28 Aug 2014 07:23:25 +0000 (+0200)
Subject: Merge pull request #87 from denizt/moc
X-Git-Tag: 0.11.0~17
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=88dc36d63c95c618f19e15b6f8ee9281e97cb765;hp=e236a6edfe3bf2ab64283bfd6c4b904e0acc4757

Merge pull request #87 from denizt/moc

Fix MainToolBar visibility not saving in OSX
---

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 2a1ce6f4..63fe459b 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -1025,13 +1025,15 @@ void MainWin::setupToolBars()
 #endif
 }
 
-#ifdef Q_OS_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 ad16889c..08400375 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -154,9 +154,7 @@ private slots:
 
     void saveMenuBarStatus(bool enabled);
     void saveStatusBarStatus(bool enabled);
-#ifdef Q_OS_MAC
     void saveMainToolBarStatus(bool enabled);
-#endif
 
     void loadLayout();
     void saveLayout();