From 188dbc3a43fc645fae14f36e232d945c18bd12eb Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 12 Aug 2009 10:41:30 +0200
Subject: [PATCH] API naming.
Reviewed-by: hjk
---
src/plugins/coreplugin/editormanager/editormanager.cpp | 2 +-
src/plugins/coreplugin/editormanager/editormanager.h | 6 +++---
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp | 2 +-
src/plugins/cpaster/cpasterplugin.cpp | 2 +-
src/plugins/cvs/cvsplugin.cpp | 2 +-
src/plugins/git/gitclient.cpp | 2 +-
src/plugins/perforce/perforceplugin.cpp | 2 +-
src/plugins/subversion/subversionplugin.cpp | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 0e25ca8d5cd..c62d54dc05d 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1189,7 +1189,7 @@ void EditorManager::ensureEditorManagerVisible()
m_d->m_core->modeManager()->activateMode(Constants::MODE_EDIT);
}
-IEditor *EditorManager::newFile(const QString &editorKind,
+IEditor *EditorManager::openEditorWithContents(const QString &editorKind,
QString *titlePattern,
const QString &contents)
{
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index 9243d7e5e6b..ccc54f75f1d 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -113,6 +113,9 @@ public:
IEditor *openEditor(const QString &fileName,
const QString &editorKind = QString(),
OpenEditorFlags flags = 0);
+ IEditor *openEditorWithContents(const QString &editorKind,
+ QString *titlePattern = 0,
+ const QString &contents = QString());
bool openExternalEditor(const QString &fileName, const QString &editorKind);
@@ -120,9 +123,6 @@ public:
QString getOpenWithEditorKind(const QString &fileName, bool *isExternalEditor = 0) const;
void ensureEditorManagerVisible();
- IEditor *newFile(const QString &editorKind,
- QString *titlePattern = 0,
- const QString &contents = QString());
bool hasEditor(const QString &fileName) const;
QList<IEditor *> editorsForFileName(const QString &filename) const;
QList<IEditor *> editorsForFile(IFile *file) const;
diff --git a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
index 1a4803ca71d..bb2142792f0 100644
--- a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
+++ b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
@@ -273,7 +273,7 @@ Core::IEditor *EditorManagerPrototype::openEditor(const QString &fileName, const
Core::IEditor *EditorManagerPrototype::newFile(const QString &editorKind, QString titlePattern, const QString &contents)
{
- return callee()->newFile(editorKind, &titlePattern, contents);
+ return callee()->openEditorWithContents(editorKind, &titlePattern, contents);
}
int EditorManagerPrototype::makeEditorWritable(Core::IEditor *editor)
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 36054f796a7..1135b7bbfdf 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -263,7 +263,7 @@ void CodepasterPlugin::finishFetch(const QString &titleDescription,
ICore::instance()->messageManager()->printToOutputPane(content, true);
} else {
EditorManager* manager = EditorManager::instance();
- IEditor* editor = manager->newFile(Core::Constants::K_DEFAULT_TEXT_EDITOR, &title, content);
+ IEditor* editor = manager->openEditorWithContents(Core::Constants::K_DEFAULT_TEXT_EDITOR, &title, content);
manager->activateEditor(editor);
}
}
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index d46efdacef4..d347768a280 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -1134,7 +1134,7 @@ Core::IEditor * CVSPlugin::showOutputInEditor(const QString& title, const QStrin
if (CVS::Constants::debug)
qDebug() << "CVSPlugin::showOutputInEditor" << title << kind << "source=" << source << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title;
- Core::IEditor *editor = Core::EditorManager::instance()->newFile(kind, &s, output.toLocal8Bit());
+ Core::IEditor *editor = Core::EditorManager::instance()->openEditorWithContents(kind, &s, output.toLocal8Bit());
CVSEditor *e = qobject_cast<CVSEditor*>(editor->widget());
if (!e)
return 0;
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 4c75d60cd87..a703b0a54a6 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -173,7 +173,7 @@ VCSBase::VCSBaseEditor
QTC_ASSERT(rc, return 0);
} else {
// Create new, set wait message, set up with source and codec
- outputEditor = m_core->editorManager()->newFile(kind, &title, m_msgWait);
+ outputEditor = m_core->editorManager()->openEditorWithContents(kind, &title, m_msgWait);
outputEditor->file()->setProperty(registerDynamicProperty, dynamicPropertyValue);
rc = VCSBase::VCSBaseEditor::getVcsBaseEditor(outputEditor);
QTC_ASSERT(rc, return 0);
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index c3a0553ea0b..25469cd1858 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -884,7 +884,7 @@ Core::IEditor * PerforcePlugin::showOutputInEditor(const QString& title, const Q
if (Perforce::Constants::debug)
qDebug() << "PerforcePlugin::showOutputInEditor" << title << kind << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title;
- Core::IEditor *editor = Core::EditorManager::instance()->newFile(kind, &s, output);
+ Core::IEditor *editor = Core::EditorManager::instance()->openEditorWithContents(kind, &s, output);
PerforceEditor *e = qobject_cast<PerforceEditor*>(editor->widget());
if (!e)
return 0;
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index de74574614a..f1aa7344831 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -979,7 +979,7 @@ Core::IEditor * SubversionPlugin::showOutputInEditor(const QString& title, const
if (Subversion::Constants::debug)
qDebug() << "SubversionPlugin::showOutputInEditor" << title << kind << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title;
- Core::IEditor *editor = Core::EditorManager::instance()->newFile(kind, &s, output);
+ Core::IEditor *editor = Core::EditorManager::instance()->openEditorWithContents(kind, &s, output);
SubversionEditor *e = qobject_cast<SubversionEditor*>(editor->widget());
if (!e)
return 0;
--
GitLab