From 7050f78b8d4df3af3a7fe723667968e214fd1908 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Date: Wed, 13 May 2015 16:12:45 +0200
Subject: [PATCH] Core: Make EditorManager::reloadSettings available for tests

Needed for a test in ClangCodeModel in order to avoid a blocking pop-up
dialog.

Change-Id: I5a337cfcbf514052681f1941845a995d2a5856ac
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
 src/plugins/coreplugin/documentmanager.cpp    |  2 +-
 .../editormanager/editormanager.cpp           | 20 +++++++++----------
 .../coreplugin/editormanager/editormanager.h  |  5 +++++
 .../editormanager/editormanager_p.h           |  2 --
 src/plugins/coreplugin/generalsettings.cpp    |  4 ++--
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp
index 81ba85f32f0..74b4b650b25 100644
--- a/src/plugins/coreplugin/documentmanager.cpp
+++ b/src/plugins/coreplugin/documentmanager.cpp
@@ -915,7 +915,7 @@ void DocumentManager::checkForReload()
 
     d->m_blockActivated = true;
 
-    IDocument::ReloadSetting defaultBehavior = EditorManagerPrivate::reloadSetting();
+    IDocument::ReloadSetting defaultBehavior = EditorManager::reloadSetting();
     ReloadPromptAnswer previousReloadAnswer = ReloadCurrent;
     FileDeletedPromptAnswer previousDeletedAnswer = FileDeletedSave;
 
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index c000e0a4cb6..b4b7f358171 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -975,16 +975,6 @@ void EditorManagerPrivate::readSettings()
     updateAutoSave();
 }
 
-void EditorManagerPrivate::setReloadSetting(IDocument::ReloadSetting behavior)
-{
-    d->m_reloadSetting = behavior;
-}
-
-IDocument::ReloadSetting EditorManagerPrivate::reloadSetting()
-{
-    return d->m_reloadSetting;
-}
-
 void EditorManagerPrivate::setAutoSaveEnabled(bool enabled)
 {
     d->m_autoSaveEnabled = enabled;
@@ -2176,6 +2166,16 @@ void EditorManager::populateOpenWithMenu(QMenu *menu, const QString &fileName)
     menu->setEnabled(anyMatches);
 }
 
+IDocument::ReloadSetting EditorManager::reloadSetting()
+{
+    return d->m_reloadSetting;
+}
+
+void EditorManager::setReloadSetting(IDocument::ReloadSetting behavior)
+{
+     d->m_reloadSetting = behavior;
+}
+
 void EditorManager::saveDocument()
 {
     EditorManagerPrivate::saveDocument(currentDocument());
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index a844f3588f9..f475e1e5ddb 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -32,6 +32,7 @@
 #define EDITORMANAGER_H
 
 #include "../core_global.h"
+#include "../idocument.h"
 
 #include "documentmodel.h"
 
@@ -171,6 +172,10 @@ public:
     static void addNativeDirAndOpenWithActions(QMenu *contextMenu, DocumentModel::Entry *entry);
     static void populateOpenWithMenu(QMenu *menu, const QString &fileName);
 
+public: // for tests
+    static IDocument::ReloadSetting reloadSetting();
+    static void setReloadSetting(IDocument::ReloadSetting behavior);
+
 signals:
     void currentEditorChanged(Core::IEditor *editor);
     void currentDocumentStateChanged();
diff --git a/src/plugins/coreplugin/editormanager/editormanager_p.h b/src/plugins/coreplugin/editormanager/editormanager_p.h
index a448dba0fb9..ea838af285e 100644
--- a/src/plugins/coreplugin/editormanager/editormanager_p.h
+++ b/src/plugins/coreplugin/editormanager/editormanager_p.h
@@ -107,8 +107,6 @@ public:
 
     static void saveSettings();
     static void readSettings();
-    static void setReloadSetting(IDocument::ReloadSetting behavior);
-    static IDocument::ReloadSetting reloadSetting();
     static void setAutoSaveEnabled(bool enabled);
     static bool autoSaveEnabled();
     static void setAutoSaveInterval(int interval);
diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index 8c31525d29b..f2eb8d1a50a 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -114,7 +114,7 @@ QWidget *GeneralSettings::widget()
         fillLanguageBox();
 
         m_page->colorButton->setColor(StyleHelper::requestedBaseColor());
-        m_page->reloadBehavior->setCurrentIndex(EditorManagerPrivate::reloadSetting());
+        m_page->reloadBehavior->setCurrentIndex(EditorManager::reloadSetting());
         if (HostOsInfo::isAnyUnixHost()) {
             const QStringList availableTerminals = ConsoleProcess::availableTerminalEmulators();
             const QString currentTerminal = ConsoleProcess::terminalEmulator(ICore::settings(), false);
@@ -176,7 +176,7 @@ void GeneralSettings::apply()
     setLanguage(m_page->languageBox->itemData(currentIndex, Qt::UserRole).toString());
     // Apply the new base color if accepted
     StyleHelper::setBaseColor(m_page->colorButton->color());
-    EditorManagerPrivate::setReloadSetting(IDocument::ReloadSetting(m_page->reloadBehavior->currentIndex()));
+    EditorManager::setReloadSetting(IDocument::ReloadSetting(m_page->reloadBehavior->currentIndex()));
     if (HostOsInfo::isAnyUnixHost()) {
         ConsoleProcess::setTerminalEmulator(ICore::settings(),
                                             m_page->terminalComboBox->lineEdit()->text());