feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core/Help: Clean up HelpManager interface and users

Browse Source 
Change-Id: Ia6edf583f2a002d7c6f4878df670a78614ea087d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
hjk
2013-08-29 19:00:34 +02:00
parent 975e1be2ab
commit d66369e21d
20 changed files with 197 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/help/openpagesmanager.cpp
View File

@@ -49,6 +49,7 @@
#include <coreplugin/helpmanager.h>
#include <coreplugin/modemanager.h>
using namespace Core;
using namespace Help::Internal;
OpenPagesManager *OpenPagesManager::m_instance = 0;
@@ -235,12 +236,11 @@ void OpenPagesManager::closeCurrentPage()
if (indexes.isEmpty())
return;
Core::HelpManager *manager = Core::HelpManager::instance();
const bool closeOnReturn = manager->customValue(QLatin1String("ReturnOnClose"),
const bool closeOnReturn = HelpManager::customValue(QLatin1String("ReturnOnClose"),
false).toBool();
if (m_model->rowCount() == 1 && closeOnReturn) {
Core::ModeManager::activateMode(Core::Constants::MODE_EDIT);
ModeManager::activateMode(Core::Constants::MODE_EDIT);
} else {
Q_ASSERT(indexes.count() == 1);
removePage(indexes.first().row());