From 4a075c3f0d3d68be4f58c1d1b52a66455f24bffe Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 19 Mar 2012 10:04:17 +0100
Subject: [PATCH] general settings: compile fix msvc

Change-Id: I377c269db97906796703df0881eb93d16ca95f5d
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
---
 src/plugins/coreplugin/generalsettings.cpp | 12 ++++++------
 src/plugins/coreplugin/generalsettings.h   |  4 ----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index 87d2db42cfa..c75caa48e91 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -220,19 +220,19 @@ void GeneralSettings::resetInterfaceColor()
     m_page->colorButton->setColor(StyleHelper::DEFAULT_BASE_COLOR);
 }
 
-#ifdef Q_OS_UNIX
 void GeneralSettings::resetTerminal()
 {
+#if defined(Q_OS_UNIX)
     m_page->terminalEdit->setText(ConsoleProcess::defaultTerminalEmulator() + QLatin1String(" -e"));
+#endif
 }
 
-#ifndef Q_OS_MAC
 void GeneralSettings::resetFileBrowser()
 {
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
     m_page->externalFileBrowserEdit->setText(UnixUtils::defaultFileBrowser());
+#endif
 }
-#endif
-#endif
 
 
 void GeneralSettings::variableHelpDialogCreator(const QString &helpText)
@@ -257,12 +257,12 @@ void GeneralSettings::variableHelpDialogCreator(const QString &helpText)
 }
 
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
 void GeneralSettings::showHelpForFileBrowser()
 {
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
     variableHelpDialogCreator(UnixUtils::fileBrowserHelpText());
-}
 #endif
+}
 
 void GeneralSettings::resetLanguage()
 {
diff --git a/src/plugins/coreplugin/generalsettings.h b/src/plugins/coreplugin/generalsettings.h
index 66ccbeb8149..e5b5220d74a 100644
--- a/src/plugins/coreplugin/generalsettings.h
+++ b/src/plugins/coreplugin/generalsettings.h
@@ -67,13 +67,9 @@ public:
 private slots:
     void resetInterfaceColor();
     void resetLanguage();
-#ifdef Q_OS_UNIX
-#  ifndef Q_OS_MAC
     void showHelpForFileBrowser();
     void resetFileBrowser();
-#  endif
     void resetTerminal();
-#endif
 
 private:
     void variableHelpDialogCreator(const QString &helpText);