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

core: remove usages of Core::ICore::instance()->modeManager()

Browse Source 
The function is still there but should be remove in my opinion.

Change-Id: I739fe942e74f459faccb80b5bcb8a5721c6bb9bf
Reviewed-on: http://codereview.qt.nokia.com/4200
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-09-02 17:15:18 +02:00
committed by hjk
parent 65f5c42bc5
commit e684960523
14 changed files with 54 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/coreplugin/designmode.cpp
View File

@@ -191,7 +191,6 @@ void DesignMode::currentEditorChanged(Core::IEditor *editor)
return;
bool mimeEditorAvailable = false;
Core::ICore *core = Core::ICore::instance();
if (editor && editor->file()) {
const QString mimeType = editor->file()->mimeType();
@@ -216,8 +215,8 @@ void DesignMode::currentEditorChanged(Core::IEditor *editor)
if (!mimeEditorAvailable) {
setActiveContext(Context());
if (core->modeManager()->currentMode() == this)
core->modeManager()->activateMode(Core::Constants::MODE_EDIT);
if (ModeManager::instance()->currentMode() == this)
ModeManager::instance()->activateMode(Core::Constants::MODE_EDIT);
setEnabled(false);
d->m_currentEditor = QWeakPointer<Core::IEditor>();
emit actionsUpdated(d->m_currentEditor.data());

2
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -1384,7 +1384,7 @@ void EditorManager::switchToPreferedMode()
if (preferedMode.isEmpty())
preferedMode = Constants::MODE_EDIT_TYPE;
m_d->m_core->modeManager()->activateModeType(preferedMode);
ModeManager::instance()->activateModeType(preferedMode);
}
IEditor *EditorManager::openEditorWithContents(const QString &editorId,

9
src/plugins/coreplugin/modemanager.cpp
View File

@@ -60,6 +60,15 @@
namespace Core {
/*!
\class Core::ModeManager
The mode manager handles everything related to the instances of IMode
that were added to the plugin manager's object pool as well as their
buttons and the tool bar with the round buttons in the lower left
corner of Qt Creator.
*/
struct ModeManagerPrivate
{
explicit ModeManagerPrivate(Internal::MainWindow *mainWindow,

2
src/plugins/coreplugin/outputpanemanager.cpp
View File

@@ -444,7 +444,7 @@ void OutputPaneManager::showPage(int idx, bool focus)
if (!OutputPanePlaceHolder::getCurrent()) {
// In this mode we don't have a placeholder
// switch to the output mode and switch the page
ICore::instance()->modeManager()->activateMode(Constants::MODE_EDIT);
ModeManager::instance()->activateMode(Constants::MODE_EDIT);
}
if (OutputPanePlaceHolder::getCurrent()) {
// make the page visible