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

editormanager: simplify use of interface

Browse Source 
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
hjk
2012-05-08 09:43:14 +02:00
committed by hjk
parent 2ef2532bf6
commit 21bf0046c3
83 changed files with 215 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gerrit/gerritplugin.cpp
View File

@@ -222,7 +222,7 @@ void FetchContext::processFinished(int exitCode, QProcess::ExitStatus es)
m_progress.reportFinished();
QString title = QString(QLatin1String("Gerrit patch %1/%2"))
.arg(m_change->number).arg(m_change->currentPatchSet.patchSetNumber);
Core::IEditor *editor = Core::EditorManager::instance()->openEditor(
Core::IEditor *editor = Core::EditorManager::openEditor(
m_patchFileName, Git::Constants::GIT_DIFF_EDITOR_ID);
VcsBase::VcsBaseEditorWidget *vcsEditor = VcsBase::VcsBaseEditorWidget::getVcsBaseEditor(editor);
vcsEditor->setDiffBaseDirectory(m_repository);

6
src/plugins/git/gitclient.cpp
View File

@@ -402,7 +402,7 @@ VcsBase::VcsBaseEditorWidget *GitClient::findExistingVCSEditor(const char *regis
return 0;
// Exists already
Core::EditorManager::instance()->activateEditor(outputEditor, Core::EditorManager::ModeSwitch);
Core::EditorManager::activateEditor(outputEditor, Core::EditorManager::ModeSwitch);
outputEditor->createNew(m_msgWait);
rc = VcsBase::VcsBaseEditorWidget::getVcsBaseEditor(outputEditor);
@@ -427,7 +427,7 @@ VcsBase::VcsBaseEditorWidget *GitClient::createVcsEditor(const Core::Id &id,
QTC_CHECK(!findExistingVCSEditor(registerDynamicProperty, dynamicPropertyValue));
// Create new, set wait message, set up with source and codec
Core::IEditor *outputEditor = Core::ICore::editorManager()->openEditorWithContents(id, &title, m_msgWait);
Core::IEditor *outputEditor = Core::EditorManager::openEditorWithContents(id, &title, m_msgWait);
outputEditor->document()->setProperty(registerDynamicProperty, dynamicPropertyValue);
rc = VcsBase::VcsBaseEditorWidget::getVcsBaseEditor(outputEditor);
connect(rc, SIGNAL(annotateRevisionRequested(QString,QString,int)),
@@ -444,7 +444,7 @@ VcsBase::VcsBaseEditorWidget *GitClient::createVcsEditor(const Core::Id &id,
}
rc->setForceReadOnly(true);
Core::ICore::editorManager()->activateEditor(outputEditor, Core::EditorManager::ModeSwitch);
Core::EditorManager::activateEditor(outputEditor, Core::EditorManager::ModeSwitch);
if (configWidget)
rc->setConfigurationWidget(configWidget);

6
src/plugins/git/gitplugin.cpp
View File

@@ -713,8 +713,8 @@ void GitPlugin::startCommit(bool amend)
Core::IEditor *GitPlugin::openSubmitEditor(const QString &fileName, const CommitData &cd, bool amend)
{
Core::IEditor *editor = Core::ICore::editorManager()->openEditor(fileName, Constants::GITSUBMITEDITOR_ID,
Core::EditorManager::ModeSwitch);
Core::IEditor *editor = Core::EditorManager::openEditor(fileName, Constants::GITSUBMITEDITOR_ID,
Core::EditorManager::ModeSwitch);
GitSubmitEditor *submitEditor = qobject_cast<GitSubmitEditor*>(editor);
QTC_ASSERT(submitEditor, return 0);
// The actions are for some reason enabled by the context switching
@@ -735,7 +735,7 @@ void GitPlugin::submitCurrentLog()
// Close the submit editor
m_submitActionTriggered = true;
QList<Core::IEditor*> editors;
editors.push_back(Core::ICore::editorManager()->currentEditor());
editors.push_back(Core::EditorManager::currentEditor());
Core::ICore::editorManager()->closeEditors(editors);
}