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
src/plugins/analyzerbase/analyzerutils.cpp
+1 -4
View File
@@ -73,10 +73,7 @@ static void moveCursorToEndOfName(QTextCursor *tc)
// We cannot depend on this since CppEditor plugin code is internal and requires building the implementation files ourselves
CPlusPlus::Symbol *AnalyzerUtils::findSymbolUnderCursor()
{
EditorManager *editorManager = EditorManager::instance();
if (!editorManager)
return 0;
IEditor *editor = editorManager->currentEditor();
IEditor *editor = EditorManager::currentEditor();
if (!editor)
return 0;
TextEditor::ITextEditor *textEditor = qobject_cast<TextEditor::ITextEditor *>(editor);
src/plugins/bazaar/bazaarplugin.cpp
+1 -1
View File
@@ -569,7 +569,7 @@ void BazaarPlugin::showCommitWidget(const QList<VcsBase::VcsBaseClient::StatusIt
return;
}
Core::IEditor *editor = Core::ICore::editorManager()->openEditor(m_changeLog->fileName(),
Core::IEditor *editor = Core::EditorManager::openEditor(m_changeLog->fileName(),
Constants::COMMIT_ID,
Core::EditorManager::ModeSwitch);
if (!editor) {
src/plugins/bookmarks/bookmarkmanager.cpp
+1 -4
View File
@@ -594,10 +594,7 @@ void BookmarkManager::prev()
TextEditor::ITextEditor *BookmarkManager::currentTextEditor() const
{
Core::EditorManager *em = Core::EditorManager::instance();
Core::IEditor *currEditor = em->currentEditor();
if (!currEditor)
return 0;
Core::IEditor *currEditor = EditorManager::currentEditor();
return qobject_cast<TextEditor::ITextEditor *>(currEditor);
}
src/plugins/classview/classviewmanager.cpp
+1 -2
View File
@@ -309,8 +309,7 @@ void Manager::gotoLocations(const QList<QVariant> &list)
bool currentPositionAvailable = false;
// what is open now?
Core::IEditor *editor = Core::EditorManager::instance()->currentEditor();
if (editor) {
if (Core::IEditor *editor = Core::EditorManager::currentEditor()) {
// get current file name
Core::IDocument *document = editor->document();
if (document)
src/plugins/coreplugin/basefilewizard.cpp
+1 -2
View File
@@ -654,10 +654,9 @@ bool BaseFileWizard::postGenerateFiles(const QWizard *, const GeneratedFiles &l,
bool BaseFileWizard::postGenerateOpenEditors(const GeneratedFiles &l, QString *errorMessage)
{
Core::EditorManager *em = Core::EditorManager::instance();
foreach(const Core::GeneratedFile &file, l) {
if (file.attributes() & Core::GeneratedFile::OpenEditorAttribute) {
if (!em->openEditor(file.path(), file.editorId(), Core::EditorManager::ModeSwitch )) {
if (!Core::EditorManager::openEditor(file.path(), file.editorId(), Core::EditorManager::ModeSwitch )) {
if (errorMessage)
*errorMessage = tr("Failed to open an editor for '%1'.").arg(QDir::toNativeSeparators(file.path()));
return false;
src/plugins/coreplugin/documentmanager.cpp
+8 -8
View File
@@ -1095,9 +1095,9 @@ void DocumentManager::syncWithEditor(Core::IContext *context)
if (!context)
return;
Core::IEditor *editor = Core::EditorManager::instance()->currentEditor();
if (editor && (editor->widget() == context->widget()) &&
!editor->isTemporary())
Core::IEditor *editor = Core::EditorManager::currentEditor();
if (editor && editor->widget() == context->widget()
&& !editor->isTemporary())
setCurrentFile(editor->document()->fileName());
}
@@ -1333,8 +1333,8 @@ void DocumentManager::populateOpenWithMenu(QMenu *menu, const QString &fileName)
bool anyMatches = false;
if (const MimeType mt = ICore::mimeDatabase()->findByFile(QFileInfo(fileName))) {
const EditorFactoryList factories = ICore::editorManager()->editorFactories(mt, false);
const ExternalEditorList externalEditors = ICore::editorManager()->externalEditors(mt, false);
const EditorFactoryList factories = EditorManager::editorFactories(mt, false);
const ExternalEditorList externalEditors = EditorManager::externalEditors(mt, false);
anyMatches = !factories.empty() || !externalEditors.empty();
if (anyMatches) {
// Add all suitable editors
@@ -1363,11 +1363,11 @@ void DocumentManager::populateOpenWithMenu(QMenu *menu, const QString &fileName)
void DocumentManager::executeOpenWithMenuAction(QAction *action)
{
QTC_ASSERT(action, return);
EditorManager *em = EditorManager::instance();
const QVariant data = action->data();
OpenWithEntry entry = qVariantValue<OpenWithEntry>(data);
if (entry.editorFactory) {
// close any open editors that have this file open, but have a different type.
EditorManager *em = EditorManager::instance();
QList<IEditor *> editorsOpenForFile = em->editorsForFileName(entry.fileName);
if (!editorsOpenForFile.isEmpty()) {
foreach (IEditor *openEditor, editorsOpenForFile) {
@@ -1378,11 +1378,11 @@ void DocumentManager::executeOpenWithMenuAction(QAction *action)
return;
}
em->openEditor(entry.fileName, entry.editorFactory->id(), EditorManager::ModeSwitch);
EditorManager::openEditor(entry.fileName, entry.editorFactory->id(), EditorManager::ModeSwitch);
return;
}
if (entry.externalEditor)
em->openExternalEditor(entry.fileName, entry.externalEditor->id());
EditorManager::openExternalEditor(entry.fileName, entry.externalEditor->id());
}
void DocumentManager::slotExecuteOpenWithMenuAction(QAction *action)
src/plugins/coreplugin/editmode.cpp
+2 -2
View File
@@ -111,6 +111,6 @@ void EditMode::grabEditorManager(Core::IMode *mode)
if (mode != this)
return;
if (m_editorManager->currentEditor())
m_editorManager->currentEditor()->widget()->setFocus();
if (EditorManager::currentEditor())
EditorManager::currentEditor()->widget()->setFocus();
}
src/plugins/coreplugin/editormanager/editormanager.cpp
+13 -13
View File
@@ -634,9 +634,9 @@ QList<IEditor *> EditorManager::editorsForDocument(IDocument *document) const
return found;
}
IEditor *EditorManager::currentEditor() const
IEditor *EditorManager::currentEditor()
{
return d->m_currentEditor;
return m_instance->d->m_currentEditor;
}
void EditorManager::emptyView(Core::Internal::EditorView *view)
@@ -1047,12 +1047,12 @@ Core::IEditor *EditorManager::placeEditor(Core::Internal::EditorView *view, Core
void EditorManager::activateEditor(Core::IEditor *editor, OpenEditorFlags flags)
{
SplitterOrView *splitterOrView = d->m_splitter->findView(editor);
SplitterOrView *splitterOrView = m_instance->d->m_splitter->findView(editor);
EditorView *view = (splitterOrView ? splitterOrView->view() : 0);
// TODO an IEditor doesn't have to belong to a view, which makes this method a bit funny
if (!view)
view = currentEditorView();
activateEditor(view, editor, flags);
view = m_instance->currentEditorView();
m_instance->activateEditor(view, editor, flags);
}
Core::IEditor *EditorManager::activateEditor(Core::Internal::EditorView *view, Core::IEditor *editor, OpenEditorFlags flags)
@@ -1124,7 +1124,7 @@ static void mimeTypeFactoryRecursion(const MimeDatabase *db,
}
EditorManager::EditorFactoryList
EditorManager::editorFactories(const MimeType &mimeType, bool bestMatchOnly) const
EditorManager::editorFactories(const MimeType &mimeType, bool bestMatchOnly)
{
EditorFactoryList rc;
const EditorFactoryList allFactories = pluginManager()->getObjects<IEditorFactory>();
@@ -1135,7 +1135,7 @@ EditorManager::EditorFactoryList
}
EditorManager::ExternalEditorList
EditorManager::externalEditors(const MimeType &mimeType, bool bestMatchOnly) const
EditorManager::externalEditors(const MimeType &mimeType, bool bestMatchOnly)
{
ExternalEditorList rc;
const ExternalEditorList allEditors = pluginManager()->getObjects<IExternalEditor>();
@@ -1187,11 +1187,11 @@ IEditor *EditorManager::createEditor(const Id &editorId, const QString &fileName
return 0;
}
IEditor *editor = factories.front()->createEditor(this);
IEditor *editor = factories.front()->createEditor(m_instance);
if (editor)
connect(editor, SIGNAL(changed()), this, SLOT(handleEditorStateChange()));
connect(editor, SIGNAL(changed()), m_instance, SLOT(handleEditorStateChange()));
if (editor)
emit editorCreated(editor, fileName);
emit m_instance->editorCreated(editor, fileName);
return editor;
}
@@ -1257,7 +1257,7 @@ Core::Id EditorManager::getOpenWithEditorId(const QString &fileName,
IEditor *EditorManager::openEditor(const QString &fileName, const Id &editorId,
OpenEditorFlags flags, bool *newEditor)
{
return openEditor(currentEditorView(), fileName, editorId, flags, newEditor);
return m_instance->openEditor(m_instance->currentEditorView(), fileName, editorId, flags, newEditor);
}
int extractLineNumber(QString *fileName)
@@ -1408,7 +1408,7 @@ IEditor *EditorManager::openEditorWithContents(const Id &editorId,
if (base.contains(dollar)) {
int i = 1;
QSet<QString> docnames;
foreach (IEditor *editor, openedEditors()) {
foreach (IEditor *editor, m_instance->openedEditors()) {
QString name = editor->document()->fileName();
if (name.isEmpty()) {
name = editor->displayName();
@@ -1445,7 +1445,7 @@ IEditor *EditorManager::openEditorWithContents(const Id &editorId,
title = edt->displayName();
edt->setDisplayName(title);
addEditor(edt);
m_instance->addEditor(edt);
QApplication::restoreOverrideCursor();
return edt;
}
src/plugins/coreplugin/editormanager/editormanager.h
+8 -8
View File
@@ -117,12 +117,12 @@ public:
};
Q_DECLARE_FLAGS(OpenEditorFlags, OpenEditorFlag)
IEditor *openEditor(const QString &fileName, const Id &editorId = Id(),
static IEditor *openEditor(const QString &fileName, const Id &editorId = Id(),
OpenEditorFlags flags = 0, bool *newEditor = 0);
IEditor *openEditorWithContents(const Id &editorId,
static IEditor *openEditorWithContents(const Id &editorId,
QString *titlePattern = 0, const QString &contents = QString());
bool openExternalEditor(const QString &fileName, const Id &editorId);
static bool openExternalEditor(const QString &fileName, const Id &editorId);
QStringList getOpenFileNames() const;
Id getOpenWithEditorId(const QString &fileName, bool *isExternalEditor = 0) const;
@@ -131,11 +131,11 @@ public:
QList<IEditor *> editorsForFileName(const QString &filename) const;
QList<IEditor *> editorsForDocument(IDocument *document) const;
IEditor *currentEditor() const;
static IEditor *currentEditor();
QList<IEditor *> visibleEditors() const;
QList<IEditor*> openedEditors() const;
void activateEditor(IEditor *editor, OpenEditorFlags flags = 0);
static void activateEditor(IEditor *editor, OpenEditorFlags flags = 0);
void activateEditorForIndex(const QModelIndex &index, OpenEditorFlags = 0);
IEditor *activateEditorForDocument(Internal::EditorView *view, IDocument *document, OpenEditorFlags flags = 0);
@@ -170,8 +170,8 @@ public:
void hideEditorStatusBar(const QString &id);
EditorFactoryList editorFactories(const MimeType &mimeType, bool bestMatchOnly = true) const;
ExternalEditorList externalEditors(const MimeType &mimeType, bool bestMatchOnly = true) const;
static EditorFactoryList editorFactories(const MimeType &mimeType, bool bestMatchOnly = true);
static ExternalEditorList externalEditors(const MimeType &mimeType, bool bestMatchOnly = true);
void setReloadSetting(IDocument::ReloadSetting behavior);
IDocument::ReloadSetting reloadSetting() const;
@@ -238,7 +238,7 @@ public slots:
private:
QList<IDocument *> documentsForEditors(QList<IEditor *> editors) const;
IEditor *createEditor(const Id &id = Id(), const QString &fileName = QString());
static IEditor *createEditor(const Id &id = Id(), const QString &fileName = QString());
void addEditor(IEditor *editor, bool isDuplicate = false);
void removeEditor(IEditor *editor);
src/plugins/coreplugin/editormanager/editorview.cpp
+1 -2
View File
@@ -798,7 +798,6 @@ QByteArray SplitterOrView::saveState() const
<< static_cast<SplitterOrView*>(m_splitter->widget(1))->saveState();
} else {
IEditor* e = editor();
EditorManager *em = ICore::editorManager();
// don't save state of temporary or ad-hoc editors
if (e && (e->isTemporary() || e->document()->fileName().isEmpty())) {
@@ -814,7 +813,7 @@ QByteArray SplitterOrView::saveState() const
if (!e) {
stream << QByteArray("empty");
} else if (e == em->currentEditor()) {
} else if (e == EditorManager::currentEditor()) {
stream << QByteArray("currenteditor")
<< e->document()->fileName() << e->id().toString() << e->saveState();
} else {
src/plugins/coreplugin/editormanager/ieditorfactory.cpp
+1 -1
View File
@@ -37,6 +37,6 @@
Core::IDocument *Core::IEditorFactory::open(const QString &fileName)
{
Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, id());
Core::IEditor *iface = Core::EditorManager::openEditor(fileName, id());
return iface ? iface->document() : 0;
}
src/plugins/coreplugin/editormanager/openeditorsview.cpp
+1 -1
View File
@@ -199,7 +199,7 @@ void OpenEditorsWidget::closeEditor(const QModelIndex &index)
{
EditorManager::instance()->closeEditor(index);
// work around selection changes
updateCurrentItem(EditorManager::instance()->currentEditor());
updateCurrentItem(EditorManager::currentEditor());
}
void OpenEditorsWidget::contextMenuRequested(QPoint pos)
src/plugins/coreplugin/editormanager/openeditorswindow.cpp
+1 -1
View File
@@ -284,7 +284,7 @@ void OpenEditorsWindow::selectEditor(QTreeWidgetItem *item)
EditorView *view = item->data(0, Qt::UserRole+1).value<EditorView*>();
EditorManager::instance()->activateEditorForDocument(view, document, EditorManager::ModeSwitch);
} else {
if (!EditorManager::instance()->openEditor(
if (!EditorManager::openEditor(
item->toolTip(0), item->data(0, Qt::UserRole+2).value<Core::Id>(),
Core::EditorManager::ModeSwitch)) {
EditorManager::instance()->openedEditorsModel()->removeEditor(item->toolTip(0));
src/plugins/coreplugin/editortoolbar.cpp
+11 -19
View File
@@ -245,15 +245,12 @@ void EditorToolBar::setCloseSplitIcon(const QIcon &icon)
void EditorToolBar::closeEditor()
{
if (!currentEditor())
IEditor *current = EditorManager::currentEditor();
if (!current)
return;
if (d->m_isStandalone) {
EditorManager *em = ICore::editorManager();
if (IEditor *editor = currentEditor()) {
em->closeEditor(editor);
}
}
if (d->m_isStandalone)
EditorManager::instance()->closeEditor(current);
emit closeClicked();
}
@@ -349,8 +346,8 @@ void EditorToolBar::listContextMenu(QPoint pos)
void EditorToolBar::makeEditorWritable()
{
if (currentEditor())
ICore::editorManager()->makeFileWritable(currentEditor()->document());
if (IEditor *current = EditorManager::currentEditor())
EditorManager::instance()->makeFileWritable(current->document());
}
void EditorToolBar::setCanGoBack(bool canGoBack)
@@ -372,15 +369,10 @@ void EditorToolBar::updateActionShortcuts()
d->m_closeSplitButton->setToolTip(am->command(Constants::REMOVE_CURRENT_SPLIT)->stringWithAppendedShortcut(tr("Remove Split")));
}
IEditor *EditorToolBar::currentEditor() const
{
return ICore::editorManager()->currentEditor();
}
void EditorToolBar::checkEditorStatus()
{
IEditor *editor = qobject_cast<IEditor *>(sender());
IEditor *current = currentEditor();
IEditor *current = EditorManager::currentEditor();
if (current == editor)
updateEditorStatus(editor);
@@ -413,13 +405,13 @@ void EditorToolBar::updateEditorStatus(IEditor *editor)
d->m_lockButton->setEnabled(false);
d->m_lockButton->setToolTip(tr("File is writable"));
}
if (editor == currentEditor())
IEditor *current = EditorManager::currentEditor();
if (editor == current)
d->m_editorList->setToolTip(
currentEditor()->document()->fileName().isEmpty()
? currentEditor()->displayName()
current->document()->fileName().isEmpty()
? current->displayName()
: QDir::toNativeSeparators(editor->document()->fileName())
);
}
void EditorToolBar::setNavigationVisible(bool isVisible)
src/plugins/coreplugin/editortoolbar.h
-1
View File
@@ -107,7 +107,6 @@ private slots:
private:
void updateToolBar(QWidget *toolBar);
IEditor *currentEditor() const;
EditorToolBarPrivate *d;
};
src/plugins/coreplugin/externaltool.cpp
+1 -1
View File
@@ -600,7 +600,7 @@ void ExternalToolRunner::run()
return;
}
if (m_tool->modifiesCurrentDocument()) {
if (IEditor *editor = EditorManager::instance()->currentEditor()) {
if (IEditor *editor = EditorManager::currentEditor()) {
m_expectedFileName = editor->document()->fileName();
bool cancelled = false;
DocumentManager::saveModifiedDocuments(QList<IDocument *>() << editor->document(), &cancelled);
src/plugins/coreplugin/mainwindow.cpp
+5 -5
View File
@@ -919,7 +919,7 @@ void MainWindow::openFiles(const QStringList &fileNames, ICore::OpenFilesFlags f
emFlags = EditorManager::ModeSwitch;
if (flags & ICore::CanContainLineNumbers)
emFlags |= EditorManager::CanContainLineNumber;
Core::IEditor *editor = editorManager()->openEditor(absoluteFilePath, Id(), emFlags);
Core::IEditor *editor = EditorManager::openEditor(absoluteFilePath, Id(), emFlags);
if (!editor && (flags & ICore::StopOnLoadFail))
return;
}
@@ -931,7 +931,7 @@ void MainWindow::setFocusToEditor()
bool focusWasMovedToEditor = false;
// give focus to the editor if we have one
if (IEditor *editor = m_editorManager->currentEditor()) {
if (IEditor *editor = EditorManager::currentEditor()) {
if (qApp->focusWidget() != editor->widget()->focusWidget()) {
QWidget *w = editor->widget()->focusWidget();
if (!w)
@@ -1055,9 +1055,9 @@ void MainWindow::openFileWith()
if (!editorId.isValid())
continue;
if (isExternal) {
editorManager()->openExternalEditor(fileName, editorId);
EditorManager::openExternalEditor(fileName, editorId);
} else {
editorManager()->openEditor(fileName, editorId, Core::EditorManager::ModeSwitch);
EditorManager::openEditor(fileName, editorId, Core::EditorManager::ModeSwitch);
}
}
}
@@ -1352,7 +1352,7 @@ void MainWindow::openRecentFile()
{
if (const QAction *action = qobject_cast<const QAction*>(sender())) {
const DocumentManager::RecentFile file = action->data().value<DocumentManager::RecentFile>();
editorManager()->openEditor(file.first, file.second, Core::EditorManager::ModeSwitch);
EditorManager::openEditor(file.first, file.second, EditorManager::ModeSwitch);
}
}
src/plugins/coreplugin/mimetypesettings.cpp
+2 -2
View File
@@ -141,12 +141,12 @@ void MimeTypeSettingsModel::load()
foreach (const MimeType &mimeType, m_mimeTypes) {
QString value;
const QList<IEditorFactory *> factories =
ICore::editorManager()->editorFactories(mimeType);
EditorManager::editorFactories(mimeType);
if (!factories.isEmpty()) {
value = factories.front()->displayName();
} else {
const QList<IExternalEditor *> externalEditors =
ICore::editorManager()->externalEditors(mimeType);
EditorManager::externalEditors(mimeType);
if (!externalEditors.isEmpty())
value = externalEditors.front()->displayName();
else
src/plugins/coreplugin/outputpanemanager.cpp
+1 -1
View File
@@ -386,7 +386,7 @@ void OutputPaneManager::slotHide()
m_buttons.value(idx)->setChecked(false);
if (m_pageMap.value(idx))
m_pageMap.value(idx)->visibilityChanged(false);
if (IEditor *editor = Core::EditorManager::instance()->currentEditor()) {
if (IEditor *editor = Core::EditorManager::currentEditor()) {
QWidget *w = editor->widget()->focusWidget();
if (!w)
w = editor->widget();
src/plugins/cpaster/cpasterplugin.cpp
+2 -2
View File
@@ -206,7 +206,7 @@ void CodepasterPlugin::postEditor()
{
QString data;
QString mimeType;
if (IEditor* editor = EditorManager::instance()->currentEditor()) {
if (IEditor *editor = EditorManager::currentEditor()) {
if (ITextEditor *textEditor = qobject_cast<ITextEditor *>(editor)) {
data = textEditor->selectedText();
if (data.isEmpty())
@@ -365,7 +365,7 @@ void CodepasterPlugin::finishFetch(const QString &titleDescription,
const QString fileName = saver.fileName();
m_fetchedSnippets.push_back(fileName);
// Open editor with title.
Core::IEditor* editor = EditorManager::instance()->openEditor(fileName, Core::Id(), EditorManager::ModeSwitch);
Core::IEditor *editor = EditorManager::openEditor(fileName, Core::Id(), EditorManager::ModeSwitch);
QTC_ASSERT(editor, return);
editor->setDisplayName(titleDescription);
}
src/plugins/cppeditor/cppeditor.cpp
+3 -3
View File
@@ -688,7 +688,7 @@ void CPPEditorWidget::onDocumentUpdated(Document::Ptr doc)
return;
if (! m_initialized ||
(Core::EditorManager::instance()->currentEditor() == editor()
(Core::EditorManager::currentEditor() == editor()
&& (!m_lastSemanticInfo.doc
|| !m_lastSemanticInfo.doc->translationUnit()->ast()
|| m_lastSemanticInfo.doc->fileName() != editorDocument()->fileName()))) {
@@ -1869,7 +1869,7 @@ void CPPEditorWidget::updateSemanticInfo(const SemanticInfo &semanticInfo)
m_highlighter.cancel();
if (! semanticHighlighterDisabled && semanticInfo.doc) {
if (Core::EditorManager::instance()->currentEditor() == editor()) {
if (Core::EditorManager::currentEditor() == editor()) {
if (m_highlightingSupport) {
m_highlighter = m_highlightingSupport->highlightingFuture(semanticInfo.doc, semanticInfo.snapshot);
m_highlightRevision = semanticInfo.revision;
@@ -2224,7 +2224,7 @@ void CPPEditorWidget::updateFunctionDeclDefLink()
void CPPEditorWidget::updateFunctionDeclDefLinkNow()
{
if (Core::EditorManager::instance()->currentEditor() != editor())
if (Core::EditorManager::currentEditor() != editor())
return;
if (m_declDefLink) {
// update the change marker
src/plugins/cppeditor/cppplugin.cpp
+4 -8
View File
@@ -339,24 +339,21 @@ ExtensionSystem::IPlugin::ShutdownFlag CppPlugin::aboutToShutdown()
void CppPlugin::switchDeclarationDefinition()
{
Core::EditorManager *em = Core::EditorManager::instance();
CPPEditorWidget *editor = qobject_cast<CPPEditorWidget*>(em->currentEditor()->widget());
CPPEditorWidget *editor = qobject_cast<CPPEditorWidget*>(Core::EditorManager::currentEditor()->widget());
if (editor)
editor->switchDeclarationDefinition();
}
void CppPlugin::renameSymbolUnderCursor()
{
Core::EditorManager *em = Core::EditorManager::instance();
CPPEditorWidget *editor = qobject_cast<CPPEditorWidget*>(em->currentEditor()->widget());
CPPEditorWidget *editor = qobject_cast<CPPEditorWidget*>(Core::EditorManager::currentEditor()->widget());
if (editor)
editor->renameSymbolUnderCursor();
}
void CppPlugin::findUsages()
{
Core::EditorManager *em = Core::EditorManager::instance();
CPPEditorWidget *editor = qobject_cast<CPPEditorWidget*>(em->currentEditor()->widget());
CPPEditorWidget *editor = qobject_cast<CPPEditorWidget*>(Core::EditorManager::currentEditor()->widget());
if (editor)
editor->findUsages();
}
@@ -393,8 +390,7 @@ void CppPlugin::currentEditorChanged(Core::IEditor *editor)
void CppPlugin::openTypeHierarchy()
{
Core::EditorManager *em = Core::EditorManager::instance();
CPPEditorWidget *editor = qobject_cast<CPPEditorWidget*>(em->currentEditor()->widget());
CPPEditorWidget *editor = qobject_cast<CPPEditorWidget*>(Core::EditorManager::currentEditor()->widget());
if (editor) {
Core::NavigationWidget *navigation = Core::NavigationWidget::instance();
navigation->activateSubWidget(Core::Id(Constants::TYPE_HIERARCHY_ID));
src/plugins/cppeditor/cpptypehierarchy.cpp
+1 -2
View File
@@ -248,8 +248,7 @@ void CppTypeHierarchyWidget::onItemClicked(const QModelIndex &index)
// CppTypeHierarchyStackedWidget
CppTypeHierarchyStackedWidget::CppTypeHierarchyStackedWidget(QWidget *parent) :
QStackedWidget(parent),
m_typeHiearchyWidgetInstance(
new CppTypeHierarchyWidget(Core::EditorManager::instance()->currentEditor()))
m_typeHiearchyWidgetInstance(new CppTypeHierarchyWidget(Core::EditorManager::currentEditor()))
{
addWidget(m_typeHiearchyWidgetInstance);
src/plugins/cpptools/cppfilesettingspage.cpp
+1 -1
View File
@@ -315,7 +315,7 @@ void CppFileSettingsWidget::slotEdit()
setLicenseTemplatePath(path);
}
// Edit (now) existing file with C++
Core::EditorManager::instance()->openEditor(path, CppEditor::Constants::CPPEDITOR_ID,
Core::EditorManager::openEditor(path, CppEditor::Constants::CPPEDITOR_ID,
Core::EditorManager::ModeSwitch);
}
src/plugins/cpptools/cppfindreferences.cpp
+1 -1
View File
@@ -519,7 +519,7 @@ void CppFindReferences::openEditor(const Find::SearchResultItem &item)
Core::Id(),
Core::EditorManager::ModeSwitch);
} else {
Core::EditorManager::instance()->openEditor(QDir::fromNativeSeparators(item.text),
Core::EditorManager::openEditor(QDir::fromNativeSeparators(item.text),
Core::Id(), Core::EditorManager::ModeSwitch);
}
}
src/plugins/cpptools/cpptoolsplugin.cpp
+2 -3
View File
@@ -159,11 +159,10 @@ ExtensionSystem::IPlugin::ShutdownFlag CppToolsPlugin::aboutToShutdown()
void CppToolsPlugin::switchHeaderSource()
{
Core::EditorManager *editorManager = Core::EditorManager::instance();
Core::IEditor *editor = editorManager->currentEditor();
Core::IEditor *editor = Core::EditorManager::currentEditor();
QString otherFile = correspondingHeaderOrSource(editor->document()->fileName());
if (!otherFile.isEmpty())
editorManager->openEditor(otherFile);
Core::EditorManager::openEditor(otherFile);
}
static QStringList findFilesInProject(const QString &name,
src/plugins/cvs/cvsplugin.cpp
+8 -8
View File
@@ -611,7 +611,7 @@ void CvsPlugin::cvsDiff(const CvsDiffParameters &p)
const QString tag = VcsBaseEditorWidget::editorTag(DiffOutput, p.workingDir, p.files);
if (IEditor *existingEditor = VcsBaseEditorWidget::locateEditorByTag(tag)) {
existingEditor->createNew(output);
EditorManager::instance()->activateEditor(existingEditor, EditorManager::ModeSwitch);
EditorManager::activateEditor(existingEditor, EditorManager::ModeSwitch);
setDiffBaseDirectory(existingEditor, p.workingDir);
return;
}
@@ -635,7 +635,7 @@ void CvsPlugin::cvsDiff(const CvsDiffParameters &p)
CvsSubmitEditor *CvsPlugin::openCVSSubmitEditor(const QString &fileName)
{
IEditor *editor = EditorManager::instance()->openEditor(fileName, Constants::CVSCOMMITEDITOR_ID,
IEditor *editor = EditorManager::openEditor(fileName, Constants::CVSCOMMITEDITOR_ID,
EditorManager::ModeSwitch);
CvsSubmitEditor *submitEditor = qobject_cast<CvsSubmitEditor*>(editor);
QTC_CHECK(submitEditor);
@@ -883,7 +883,7 @@ void CvsPlugin::filelog(const QString &workingDir,
const QString tag = VcsBaseEditorWidget::editorTag(LogOutput, workingDir, files);
if (Core::IEditor *editor = VcsBaseEditorWidget::locateEditorByTag(tag)) {
editor->createNew(response.stdOut);
Core::EditorManager::instance()->activateEditor(editor, Core::EditorManager::ModeSwitch);
Core::EditorManager::activateEditor(editor, Core::EditorManager::ModeSwitch);
} else {
const QString title = QString::fromLatin1("cvs log %1").arg(id);
Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, LogOutput, source, codec);
@@ -1026,7 +1026,7 @@ void CvsPlugin::annotate(const QString &workingDir, const QString &file,
if (IEditor *editor = VcsBaseEditorWidget::locateEditorByTag(tag)) {
editor->createNew(response.stdOut);
VcsBaseEditorWidget::gotoLineOfEditor(editor, lineNumber);
EditorManager::instance()->activateEditor(editor, EditorManager::ModeSwitch);
EditorManager::activateEditor(editor, EditorManager::ModeSwitch);
} else {
const QString title = QString::fromLatin1("cvs annotate %1").arg(id);
IEditor *newEditor = showOutputInEditor(title, response.stdOut, AnnotateOutput, source, codec);
@@ -1221,7 +1221,7 @@ bool CvsPlugin::describe(const QString &repositoryPath,
const QString commitId = entries.front().revisions.front().commitId;
if (IEditor *editor = VcsBaseEditorWidget::locateEditorByTag(commitId)) {
editor->createNew(output);
EditorManager::instance()->activateEditor(editor, EditorManager::ModeSwitch);
EditorManager::activateEditor(editor, EditorManager::ModeSwitch);
setDiffBaseDirectory(editor, repositoryPath);
} else {
const QString title = QString::fromLatin1("cvs describe %1").arg(commitId);
@@ -1236,7 +1236,7 @@ void CvsPlugin::submitCurrentLog()
{
m_submitActionTriggered = true;
EditorManager::instance()->closeEditors(QList<IEditor*>()
<< EditorManager::instance()->currentEditor());
<< EditorManager::currentEditor());
}
// Run CVS. At this point, file arguments must be relative to
@@ -1293,7 +1293,7 @@ IEditor *CvsPlugin::showOutputInEditor(const QString& title, const QString &outp
qDebug() << "CVSPlugin::showOutputInEditor" << title << id.name()
<< "source=" << source << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title;
IEditor *editor = EditorManager::instance()->openEditorWithContents(id, &s, output);
IEditor *editor = EditorManager::openEditorWithContents(id, &s, output);
connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,int)),
this, SLOT(vcsAnnotate(QString,QString,int)));
CvsEditor *e = qobject_cast<CvsEditor*>(editor->widget());
@@ -1307,7 +1307,7 @@ IEditor *CvsPlugin::showOutputInEditor(const QString& title, const QString &outp
if (codec)
e->setCodec(codec);
IEditor *ie = e->editor();
EditorManager::instance()->activateEditor(ie, EditorManager::ModeSwitch);
EditorManager::activateEditor(ie, EditorManager::ModeSwitch);
return ie;
}
src/plugins/debugger/debuggerengine.cpp
+3 -4
View File
@@ -639,11 +639,10 @@ void DebuggerEngine::gotoLocation(const Location &loc)
const QString file = loc.fileName();
const int line = loc.lineNumber();
EditorManager *editorManager = EditorManager::instance();
QList<IEditor *> editors = editorManager->editorsForFileName(file);
QList<IEditor *> editors = EditorManager::instance()->editorsForFileName(file);
IEditor *editor = 0;
if (editors.isEmpty()) {
editor = editorManager->openEditor(file, Core::Id(),
editor = EditorManager::openEditor(file, Core::Id(),
EditorManager::IgnoreNavigationHistory);
if (editor) {
editors.append(editor);
@@ -665,7 +664,7 @@ void DebuggerEngine::gotoLocation(const Location &loc)
// FIXME: Breaks with split views.
if (!d->m_memoryAgent.hasVisibleEditor() || loc.needsRaise())
editorManager->activateEditor(editor);
EditorManager::activateEditor(editor);
//qDebug() << "MEMORY: " << d->m_memoryAgent.hasVisibleEditor();
}
src/plugins/debugger/debuggerplugin.cpp
+8 -16
View File
@@ -573,10 +573,7 @@ public:
static TextEditor::ITextEditor *currentTextEditor()
{
if (const Core::EditorManager *editorManager = Core::EditorManager::instance())
if (Core::IEditor *editor = editorManager->currentEditor())
return qobject_cast<TextEditor::ITextEditor*>(editor);
return 0;
return qobject_cast<TextEditor::ITextEditor *>(Core::EditorManager::currentEditor());
}
static bool currentTextEditorPosition(ContextData *data)
@@ -1033,10 +1030,7 @@ public slots:
void handleAddToWatchWindow()
{
// Requires a selection, but that's the only case we want anyway.
EditorManager *editorManager = EditorManager::instance();
if (!editorManager)
return;
IEditor *editor = editorManager->currentEditor();
IEditor *editor = EditorManager::currentEditor();
if (!editor)
return;
ITextEditor *textEditor = qobject_cast<ITextEditor*>(editor);
@@ -2192,7 +2186,7 @@ void DebuggerPluginPrivate::cleanupViews()
// if they are not modified and not current editor.
if (editor->property(Constants::OPENED_WITH_DISASSEMBLY).toBool()
|| (!editor->document()->isModified()
&& editor != editorManager->currentEditor())) {
&& editor != EditorManager::currentEditor())) {
toClose.append(editor);
} else {
editor->setProperty(Constants::OPENED_BY_DEBUGGER, false);
@@ -2470,9 +2464,9 @@ void DebuggerPluginPrivate::onModeChanged(IMode *mode)
return;
}
EditorManager *editorManager = EditorManager::instance();
if (editorManager->currentEditor())
editorManager->currentEditor()->widget()->setFocus();
if (IEditor *editor = EditorManager::currentEditor())
editor->widget()->setFocus();
m_toolTipManager->debugModeEntered();
}
@@ -2611,12 +2605,10 @@ void DebuggerPluginPrivate::openTextEditor(const QString &titlePattern0,
if (m_shuttingDown)
return;
QString titlePattern = titlePattern0;
EditorManager *editorManager = EditorManager::instance();
QTC_ASSERT(editorManager, return);
IEditor *editor = editorManager->openEditorWithContents(
IEditor *editor = EditorManager::openEditorWithContents(
CC::K_DEFAULT_TEXT_EDITOR_ID, &titlePattern, contents);
QTC_ASSERT(editor, return);
editorManager->activateEditor(editor, EditorManager::IgnoreNavigationHistory);
EditorManager::activateEditor(editor, EditorManager::IgnoreNavigationHistory);
}
src/plugins/debugger/debuggertooltipmanager.cpp
+1 -1
View File
@@ -236,7 +236,7 @@ DebuggerToolTipEditor::DebuggerToolTipEditor(IEditor *ie) :
DebuggerToolTipEditor DebuggerToolTipEditor::currentToolTipEditor()
{
if (IEditor *ie = EditorManager::instance()->currentEditor())
if (IEditor *ie = EditorManager::currentEditor())
return DebuggerToolTipEditor(ie);
return DebuggerToolTipEditor();
}
src/plugins/debugger/disassembleragent.cpp
+2 -3
View File
@@ -305,11 +305,10 @@ void DisassemblerAgent::setContentsToEditor(const DisassemblerLines &contents)
using namespace Core;
using namespace TextEditor;
EditorManager *editorManager = EditorManager::instance();
if (!d->editor) {
QString titlePattern = QLatin1String("Disassembler");
d->editor = qobject_cast<ITextEditor *>(
editorManager->openEditorWithContents(
EditorManager::openEditorWithContents(
Core::Constants::K_DEFAULT_TEXT_EDITOR_ID,
&titlePattern));
QTC_ASSERT(d->editor, return);
@@ -323,7 +322,7 @@ void DisassemblerAgent::setContentsToEditor(const DisassemblerLines &contents)
baseTextEdit->setRequestMarkEnabled(true);
}
editorManager->activateEditor(d->editor);
EditorManager::activateEditor(d->editor);
QPlainTextEdit *plainTextEdit =
qobject_cast<QPlainTextEdit *>(d->editor->widget());
src/plugins/debugger/memoryagent.cpp
+2 -3
View File
@@ -192,10 +192,9 @@ bool MemoryAgent::doCreateBinEditor(quint64 addr, unsigned flags,
}
// Editor: Register tracking not supported.
QTC_ASSERT(!(flags & DebuggerEngine::MemoryTrackRegister), return false);
EditorManager *editorManager = EditorManager::instance();
if (!title.endsWith(QLatin1Char('$')))
title.append(QLatin1String(" $"));
IEditor *editor = editorManager->openEditorWithContents(
IEditor *editor = EditorManager::openEditorWithContents(
Core::Constants::K_DEFAULT_BINARY_EDITOR_ID, &title);
if (!editor)
return false;
@@ -208,7 +207,7 @@ bool MemoryAgent::doCreateBinEditor(quint64 addr, unsigned flags,
MemoryView::setBinEditorRange(editorBinEditor, addr, MemoryAgent::DataRange, MemoryAgent::BinBlockSize);
MemoryView::setBinEditorMarkup(editorBinEditor, ml);
m_editors << editor;
editorManager->activateEditor(editor);
EditorManager::activateEditor(editor);
return true;
}
src/plugins/debugger/qml/qmlengine.cpp
+2 -2
View File
@@ -559,7 +559,7 @@ void QmlEngine::gotoLocation(const Location &location)
}
}
if (!editor) {
editor = editorManager->openEditorWithContents(QmlJSEditor::Constants::C_QMLJSEDITOR_ID,
editor = Core::EditorManager::openEditorWithContents(QmlJSEditor::Constants::C_QMLJSEDITOR_ID,
&titlePattern);
if (editor) {
editor->setProperty(Constants::OPENED_BY_DEBUGGER, true);
@@ -567,7 +567,7 @@ void QmlEngine::gotoLocation(const Location &location)
updateEditor(editor, m_sourceDocuments.value(fileName));
}
editorManager->activateEditor(editor);
Core::EditorManager::activateEditor(editor);
} else {
DebuggerEngine::gotoLocation(location);
src/plugins/debugger/sourceagent.cpp
+3 -5
View File
@@ -131,12 +131,11 @@ void SourceAgent::setContent(const QString &filePath, const QString &content)
d->path = filePath;
EditorManager *editorManager = EditorManager::instance();
if (!d->editor) {
QString titlePattern = d->producer + QLatin1String(": ")
+ QFileInfo(filePath).fileName();
d->editor = qobject_cast<ITextEditor *>(
editorManager->openEditorWithContents(
EditorManager::openEditorWithContents(
CppEditor::Constants::CPPEDITOR_ID,
&titlePattern, content));
QTC_ASSERT(d->editor, return);
@@ -148,7 +147,7 @@ void SourceAgent::setContent(const QString &filePath, const QString &content)
baseTextEdit->setRequestMarkEnabled(true);
}
editorManager->activateEditor(d->editor);
EditorManager::activateEditor(d->editor);
QPlainTextEdit *plainTextEdit =
qobject_cast<QPlainTextEdit *>(d->editor->widget());
@@ -178,8 +177,7 @@ void SourceAgent::updateLocationMarker()
QTextBlock block = tc.document()->findBlockByNumber(lineNumber - 1);
tc.setPosition(block.position());
plainTextEdit->setTextCursor(tc);
EditorManager *editorManager = EditorManager::instance();
editorManager->activateEditor(d->editor);
EditorManager::activateEditor(d->editor);
}
}
src/plugins/designer/formeditorfactory.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ QString FormEditorFactory::displayName() const
Core::IDocument *FormEditorFactory::open(const QString &fileName)
{
Core::IEditor *iface = Core::EditorManager::instance()->openEditor(fileName, id());
Core::IEditor *iface = Core::EditorManager::openEditor(fileName, id());
if (!iface)
return 0;
if (qobject_cast<FormWindowEditor *>(iface)) {
src/plugins/designer/formeditorw.cpp
+2 -2
View File
@@ -906,7 +906,7 @@ void FormEditorW::print()
// Find out current existing editor file
static QString currentFile()
{
if (Core::IEditor *editor = Core::EditorManager::instance()->currentEditor())
if (Core::IEditor *editor = Core::EditorManager::currentEditor())
if (const Core::IDocument *document = editor->document()) {
const QString fileName = document->fileName();
if (!fileName.isEmpty() && QFileInfo(fileName).isFile())
@@ -954,7 +954,7 @@ void FormEditorW::switchSourceForm()
{
const QString fileToOpen = otherFile();
if (!fileToOpen.isEmpty())
Core::ICore::editorManager()->openEditor(fileToOpen, Core::Id(), Core::EditorManager::ModeSwitch);
Core::EditorManager::openEditor(fileToOpen, Core::Id(), Core::EditorManager::ModeSwitch);
}
} // namespace Internal
src/plugins/fakevim/fakevimplugin.cpp
+7 -11
View File
@@ -1023,7 +1023,7 @@ void FakeVimPluginPrivate::userActionTriggered()
if (!key)
return;
QString cmd = userCommandMap().value(key);
IEditor *editor = ICore::editorManager()->currentEditor();
IEditor *editor = EditorManager::currentEditor();
FakeVimHandler *handler = m_editorToHandler[editor];
if (handler)
handler->handleInput(cmd);
@@ -1257,11 +1257,9 @@ void FakeVimPluginPrivate::windowCommand(int key)
void FakeVimPluginPrivate::moveSomewhere(DistFunction f)
{
EditorManager *editorManager = ICore::editorManager();
IEditor *editor = editorManager->currentEditor();
IEditor *editor = EditorManager::currentEditor();
QWidget *w = editor->widget();
QPlainTextEdit *pe =
qobject_cast<QPlainTextEdit *>(editor->widget());
QPlainTextEdit *pe = qobject_cast<QPlainTextEdit *>(w);
QTC_ASSERT(pe, return);
QRect rc = pe->cursorRect();
QRect cursorRect(w->mapToGlobal(rc.topLeft()),
@@ -1271,8 +1269,7 @@ void FakeVimPluginPrivate::moveSomewhere(DistFunction f)
IEditor *bestEditor = 0;
int bestValue = 1 << 30;
QList<IEditor*> editors = editorManager->visibleEditors();
foreach (IEditor *editor, editors) {
foreach (IEditor *editor, EditorManager::instance()->visibleEditors()) {
QWidget *w = editor->widget();
QRect editorRect(w->mapToGlobal(w->geometry().topLeft()),
w->mapToGlobal(w->geometry().bottomRight()));
@@ -1290,7 +1287,7 @@ void FakeVimPluginPrivate::moveSomewhere(DistFunction f)
// FIME: This is know to fail as the EditorManager will fall back to
// the current editor's view. Needs additional public API there.
if (bestEditor)
editorManager->activateEditor(bestEditor);
EditorManager::activateEditor(bestEditor);
}
void FakeVimPluginPrivate::find(bool reverse)
@@ -1707,9 +1704,8 @@ void FakeVimPluginPrivate::changeSelection
int FakeVimPluginPrivate::currentFile() const
{
EditorManager *editorManager = ICore::editorManager();
OpenEditorsModel *model = editorManager->openedEditorsModel();
IEditor *editor = editorManager->currentEditor();
OpenEditorsModel *model = EditorManager::instance()->openedEditorsModel();
IEditor *editor = EditorManager::currentEditor();
return model->indexOf(editor).row();
}
src/plugins/git/gerrit/gerritplugin.cpp
+1 -1
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);
src/plugins/git/gitclient.cpp
+3 -3
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);
src/plugins/git/gitplugin.cpp
+2 -2
View File
@@ -713,7 +713,7 @@ 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::IEditor *editor = Core::EditorManager::openEditor(fileName, Constants::GITSUBMITEDITOR_ID,
Core::EditorManager::ModeSwitch);
GitSubmitEditor *submitEditor = qobject_cast<GitSubmitEditor*>(editor);
QTC_ASSERT(submitEditor, return 0);
@@ -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);
}
src/plugins/help/helpplugin.cpp
+1 -1
View File
@@ -832,7 +832,7 @@ HelpViewer *HelpPlugin::viewerForContextMode()
switch (contextHelpOption()) {
case Help::Constants::SideBySideIfPossible: {
// side by side if possible
if (IEditor *editor = EditorManager::instance()->currentEditor()) {
if (IEditor *editor = EditorManager::currentEditor()) {
if (!placeHolder || !placeHolder->isVisible()) {
if (!editor->widget())
break;
src/plugins/imageviewer/imagevieweractionhandler.cpp
+1 -2
View File
@@ -58,8 +58,7 @@ ImageViewerActionHandler::ImageViewerActionHandler(QObject *parent) :
void ImageViewerActionHandler::actionTriggered(int supportedAction)
{
Core::EditorManager *editorManager = Core::EditorManager::instance();
Core::IEditor *editor = editorManager->currentEditor();
Core::IEditor *editor = Core::EditorManager::currentEditor();
ImageViewer *viewer = qobject_cast<ImageViewer *>(editor);
if (!viewer)
return;
src/plugins/locator/basefilefilter.cpp
+1 -2
View File
@@ -99,8 +99,7 @@ QList<FilterEntry> BaseFileFilter::matchesFor(QFutureInterface<Locator::FilterEn
void BaseFileFilter::accept(Locator::FilterEntry selection) const
{
Core::EditorManager *em = Core::EditorManager::instance();
em->openEditor(selection.internalData.toString(), Id(), Core::EditorManager::ModeSwitch);
EditorManager::openEditor(selection.internalData.toString(), Id(), EditorManager::ModeSwitch);
}
void BaseFileFilter::generateFileNames()
src/plugins/locator/filesystemfilter.cpp
+3 -3
View File
@@ -59,7 +59,7 @@ QList<FilterEntry> FileSystemFilter::matchesFor(QFutureInterface<Locator::Filter
if (filePath.startsWith(QLatin1String("~/"))) {
directory.replace(0, 1, QDir::homePath());
} else {
IEditor *editor = m_editorManager->currentEditor();
IEditor *editor = EditorManager::currentEditor();
if (editor && !editor->document()->fileName().isEmpty()) {
QFileInfo info(editor->document()->fileName());
directory.prepend(info.absolutePath() + QLatin1Char('/'));
@@ -109,8 +109,8 @@ void FileSystemFilter::accept(FilterEntry selection) const
m_locatorWidget->show(value, value.length());
return;
}
m_editorManager->openEditor(selection.internalData.toString(), Id(),
Core::EditorManager::ModeSwitch);
EditorManager::openEditor(selection.internalData.toString(), Id(),
EditorManager::ModeSwitch);
}
bool FileSystemFilter::openConfigDialog(QWidget *parent, bool &needsRefresh)
src/plugins/locator/opendocumentsfilter.cpp
+1 -1
View File
@@ -102,5 +102,5 @@ void OpenDocumentsFilter::refresh(QFutureInterface<void> &future)
void OpenDocumentsFilter::accept(FilterEntry selection) const
{
m_editorManager->openEditor(selection.internalData.toString(), Core::Id(), Core::EditorManager::ModeSwitch);
EditorManager::openEditor(selection.internalData.toString(), Id(), EditorManager::ModeSwitch);
}
src/plugins/macros/findmacrohandler.cpp
+4 -4
View File
@@ -75,7 +75,7 @@ bool FindMacroHandler::canExecuteEvent(const MacroEvent &macroEvent)
bool FindMacroHandler::executeEvent(const MacroEvent &macroEvent)
{
Core::IEditor *editor = Core::EditorManager::instance()->currentEditor();
Core::IEditor *editor = Core::EditorManager::currentEditor();
if (!editor)
return false;
@@ -228,7 +228,7 @@ void FindMacroHandler::changeEditor(Core::IEditor *editor)
void FindMacroHandler::startRecording(Macros::Macro* macro)
{
IMacroHandler::startRecording(macro);
const Core::EditorManager *editorManager = Core::EditorManager::instance();
if (editorManager->currentEditor())
changeEditor(editorManager->currentEditor());
Core::IEditor *current = Core::EditorManager::currentEditor();
if (current)
changeEditor(current);
}
src/plugins/macros/macrolocatorfilter.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ QList<Locator::FilterEntry> MacroLocatorFilter::matchesFor(QFutureInterface<Loca
void MacroLocatorFilter::accept(Locator::FilterEntry selection) const
{
// Give the focus back to the editor
Core::IEditor *editor = Core::EditorManager::instance()->currentEditor();
Core::IEditor *editor = Core::EditorManager::currentEditor();
if (editor)
editor->widget()->setFocus(Qt::OtherFocusReason);
src/plugins/macros/macromanager.cpp
+2 -3
View File
@@ -226,9 +226,8 @@ bool MacroManager::MacroManagerPrivate::executeMacro(Macro *macro)
// Set the focus back to the editor
// TODO: is it really needed??
const Core::EditorManager *editorManager = Core::EditorManager::instance();
if (editorManager->currentEditor())
editorManager->currentEditor()->widget()->setFocus(Qt::OtherFocusReason);
if (Core::IEditor *current = Core::EditorManager::currentEditor())
current->widget()->setFocus(Qt::OtherFocusReason);
return !error;
}
src/plugins/madde/maemopackagecreationwidget.cpp
+1 -1
View File
@@ -276,7 +276,7 @@ void MaemoPackageCreationWidget::editSpecFile()
void MaemoPackageCreationWidget::editFile(const QString &filePath)
{
Core::EditorManager::instance()->openEditor(filePath, Core::Id(),
Core::EditorManager::openEditor(filePath, Core::Id(),
Core::EditorManager::ModeSwitch);
}
src/plugins/mercurial/mercurialplugin.cpp
+1 -1
View File
@@ -582,7 +582,7 @@ void MercurialPlugin::showCommitWidget(const QList<VcsBaseClient::StatusItem> &s
return;
}
Core::IEditor *editor = core->editorManager()->openEditor(changeLog->fileName(),
Core::IEditor *editor = Core::EditorManager::openEditor(changeLog->fileName(),
Constants::COMMIT_ID,
Core::EditorManager::ModeSwitch);
if (!editor) {
src/plugins/perforce/perforceplugin.cpp
+5 -6
View File
@@ -678,8 +678,7 @@ void PerforcePlugin::startSubmitProject()
Core::IEditor *PerforcePlugin::openPerforceSubmitEditor(const QString &fileName, const QStringList &depotFileNames)
{
Core::EditorManager *editorManager = Core::EditorManager::instance();
Core::IEditor *editor = editorManager->openEditor(fileName, Constants::PERFORCE_SUBMIT_EDITOR_ID,
Core::IEditor *editor = Core::EditorManager::openEditor(fileName, Constants::PERFORCE_SUBMIT_EDITOR_ID,
Core::EditorManager::ModeSwitch);
PerforceSubmitEditor *submitEditor = static_cast<PerforceSubmitEditor*>(editor);
submitEditor->restrictToProjectFiles(depotFileNames);
@@ -1198,7 +1197,7 @@ Core::IEditor *PerforcePlugin::showOutputInEditor(const QString &title, const QS
qDebug() << "PerforcePlugin::showOutputInEditor" << title << id.name()
<< "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title;
Core::IEditor *editor = Core::EditorManager::instance()->openEditorWithContents(id, &s, output);
Core::IEditor *editor = Core::EditorManager::openEditorWithContents(id, &s, output);
connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,int)),
this, SLOT(vcsAnnotate(QString,QString,int)));
PerforceEditor *e = qobject_cast<PerforceEditor*>(editor->widget());
@@ -1211,7 +1210,7 @@ Core::IEditor *PerforcePlugin::showOutputInEditor(const QString &title, const QS
if (codec)
e->setCodec(codec);
Core::IEditor *ie = e->editor();
Core::EditorManager::instance()->activateEditor(ie, Core::EditorManager::ModeSwitch);
Core::EditorManager::activateEditor(ie, Core::EditorManager::ModeSwitch);
return ie;
}
@@ -1294,7 +1293,7 @@ void PerforcePlugin::p4Diff(const PerforceDiffParameters &p)
if (existingEditor) {
existingEditor->createNew(result.stdOut);
Core::EditorManager::instance()->activateEditor(existingEditor, Core::EditorManager::ModeSwitch);
Core::EditorManager::activateEditor(existingEditor, Core::EditorManager::ModeSwitch);
return;
}
// Create new editor
@@ -1329,7 +1328,7 @@ void PerforcePlugin::submitCurrentLog()
{
m_submitActionTriggered = true;
Core::EditorManager *em = Core::EditorManager::instance();
em->closeEditors(QList<Core::IEditor*>() << em->currentEditor());
em->closeEditors(QList<Core::IEditor*>() << Core::EditorManager::currentEditor());
}
void PerforcePlugin::cleanCommitMessageFile()
src/plugins/projectexplorer/foldernavigationwidget.cpp
+1 -2
View File
@@ -270,8 +270,7 @@ void FolderNavigationWidget::openItem(const QModelIndex &srcIndex)
return;
}
// Open file.
Core::EditorManager *editorManager = Core::EditorManager::instance();
editorManager->openEditor(m_fileSystemModel->filePath(srcIndex), Core::Id(), Core::EditorManager::ModeSwitch);
Core::EditorManager::openEditor(m_fileSystemModel->filePath(srcIndex), Core::Id(), Core::EditorManager::ModeSwitch);
}
void FolderNavigationWidget::setCurrentTitle(QString dirName, const QString &fullPath)
src/plugins/projectexplorer/projectexplorer.cpp
+2 -3
View File
@@ -1044,7 +1044,7 @@ void ProjectExplorerPlugin::loadAction()
// for your special convenience, we preselect a pro file if it is
// the current file
if (Core::IEditor *editor = Core::EditorManager::instance()->currentEditor()) {
if (Core::IEditor *editor = Core::EditorManager::currentEditor()) {
if (const Core::IDocument *document= editor->document()) {
const QString fn = document->fileName();
const bool isProject = d->m_profileMimeTypes.contains(document->mimeType());
@@ -2708,8 +2708,7 @@ void ProjectExplorerPlugin::removeProject()
void ProjectExplorerPlugin::openFile()
{
QTC_ASSERT(d->m_currentNode, return);
Core::EditorManager *em = Core::EditorManager::instance();
em->openEditor(d->m_currentNode->path(), Core::Id(), Core::EditorManager::ModeSwitch);
Core::EditorManager::openEditor(d->m_currentNode->path(), Core::Id(), Core::EditorManager::ModeSwitch);
}
void ProjectExplorerPlugin::searchOnFileSystem()
src/plugins/projectexplorer/projecttreewidget.cpp
+2 -4
View File
@@ -360,10 +360,8 @@ void ProjectTreeWidget::initView()
void ProjectTreeWidget::openItem(const QModelIndex &mainIndex)
{
Node *node = m_model->nodeForIndex(mainIndex);
if (node->nodeType() == FileNodeType) {
Core::EditorManager *editorManager = Core::EditorManager::instance();
editorManager->openEditor(node->path(), Core::Id(), Core::EditorManager::ModeSwitch);
}
if (node->nodeType() == FileNodeType)
Core::EditorManager::openEditor(node->path(), Core::Id(), Core::EditorManager::ModeSwitch);
}
void ProjectTreeWidget::setProjectFilter(bool filter)
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
+2 -2
View File
@@ -332,7 +332,7 @@ void DesignDocumentController::setCrumbleBarInfo(const CrumbleBarInfo &crumbleBa
DesignDocumentControllerPrivate::pushCrumblePath = false;
while (!compareCrumbleBarInfo(d->formEditorView->crumblePath()->dataForLastIndex().value<CrumbleBarInfo>(), crumbleBarInfo))
d->formEditorView->crumblePath()->popElement();
Core::EditorManager::instance()->openEditor(crumbleBarInfo.fileName);
Core::EditorManager::openEditor(crumbleBarInfo.fileName);
DesignDocumentControllerPrivate::pushCrumblePath = true;
Internal::DesignModeWidget::instance()->currentDesignDocumentController()->changeToSubComponent(crumbleBarInfo.modelNode);
DesignDocumentControllerPrivate::clearCrumblePath = true;
@@ -525,7 +525,7 @@ void DesignDocumentController::changeToSubComponent(const ModelNode &componentNo
void DesignDocumentController::changeToExternalSubComponent(const QString &fileName)
{
DesignDocumentControllerPrivate::clearCrumblePath = false;
Core::EditorManager::instance()->openEditor(fileName);
Core::EditorManager::openEditor(fileName);
DesignDocumentControllerPrivate::clearCrumblePath = true;
}
src/plugins/qmldesigner/components/navigator/navigatorview.cpp
+1 -1
View File
@@ -273,7 +273,7 @@ void NavigatorView::changeToComponent(const QModelIndex &index)
if (index.isValid() && m_treeModel->data(index, Qt::UserRole).isValid()) {
ModelNode doubleClickNode = m_treeModel->nodeForIndex(index);
if (doubleClickNode.metaInfo().isComponent())
Core::EditorManager::instance()->openEditor(doubleClickNode.metaInfo().componentFileName());
Core::EditorManager::openEditor(doubleClickNode.metaInfo().componentFileName());
}
}
src/plugins/qmldesigner/designmodewidget.cpp
+2 -6
View File
@@ -842,9 +842,7 @@ void DesignModeWidget::onGoBackClicked()
if (m_navigatorHistoryCounter > 0) {
--m_navigatorHistoryCounter;
m_keepNavigatorHistory = true;
Core::EditorManager::instance()->openEditor(m_navigatorHistory.at(m_navigatorHistoryCounter));
Core::EditorManager::openEditor(m_navigatorHistory.at(m_navigatorHistoryCounter));
m_keepNavigatorHistory = false;
}
}
@@ -854,9 +852,7 @@ void DesignModeWidget::onGoForwardClicked()
if (m_navigatorHistoryCounter < (m_navigatorHistory.size() - 1)) {
++m_navigatorHistoryCounter;
m_keepNavigatorHistory = true;
Core::EditorManager::instance()->openEditor(m_navigatorHistory.at(m_navigatorHistoryCounter));
Core::EditorManager::openEditor(m_navigatorHistory.at(m_navigatorHistoryCounter));
m_keepNavigatorHistory = false;
}
}
src/plugins/qmldesigner/qmldesignerplugin.cpp
+2 -4
View File
@@ -301,7 +301,7 @@ void BauhausPlugin::contextChanged(Core::IContext *context, const Core::Context
foreach (int additionalContext, additionalContexts) {
if (m_context->context().contains(additionalContext)) {
m_isActive = true;
m_mainWidget->showEditor(m_editorManager->currentEditor());
m_mainWidget->showEditor(Core::EditorManager::currentEditor());
return;
}
}
@@ -371,10 +371,8 @@ BauhausPlugin *BauhausPlugin::pluginInstance()
void BauhausPlugin::switchTextDesign()
{
Core::EditorManager *editorManager = Core::EditorManager::instance();
Core::IEditor *editor = editorManager->currentEditor();
if (Core::ModeManager::currentMode()->id() == Core::Constants::MODE_EDIT) {
Core::IEditor *editor = Core::EditorManager::currentEditor();
if (editor->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID) {
Core::ModeManager::activateMode(Core::Constants::MODE_DESIGN);
m_mainWidget->setFocus();
src/plugins/qmljseditor/qmljseditor.cpp
+2 -4
View File
@@ -1321,8 +1321,7 @@ void QmlJSTextEditorWidget::updateSemanticInfo()
return;
// Save time by not doing it for non-active editors.
Core::EditorManager *editorManager = Core::EditorManager::instance();
if (editorManager->currentEditor() != editor())
if (Core::EditorManager::currentEditor() != editor())
return;
m_updateSemanticInfoTimer->start();
@@ -1378,8 +1377,7 @@ void QmlJSTextEditorWidget::acceptNewSemanticInfo(const SemanticInfo &semanticIn
appendExtraSelectionsForMessages(&selections, m_semanticInfo.staticAnalysisMessages, document());
setExtraSelections(CodeWarningsSelection, selections);
Core::EditorManager *editorManager = Core::EditorManager::instance();
if (editorManager->currentEditor() == editor())
if (Core::EditorManager::currentEditor() == editor())
m_semanticHighlighter->rerun(m_semanticInfo.scopeChain());
emit semanticInfoUpdated();
src/plugins/qmljseditor/qmljseditorplugin.cpp
+4 -9
View File
@@ -294,22 +294,19 @@ Utils::JsonSchemaManager *QmlJSEditorPlugin::jsonManager() const
void QmlJSEditorPlugin::findUsages()
{
Core::EditorManager *em = Core::EditorManager::instance();
if (QmlJSTextEditorWidget *editor = qobject_cast<QmlJSTextEditorWidget*>(em->currentEditor()->widget()))
if (QmlJSTextEditorWidget *editor = qobject_cast<QmlJSTextEditorWidget*>(Core::EditorManager::currentEditor()->widget()))
editor->findUsages();
}
void QmlJSEditorPlugin::renameUsages()
{
Core::EditorManager *em = Core::EditorManager::instance();
if (QmlJSTextEditorWidget *editor = qobject_cast<QmlJSTextEditorWidget*>(em->currentEditor()->widget()))
if (QmlJSTextEditorWidget *editor = qobject_cast<QmlJSTextEditorWidget*>(Core::EditorManager::currentEditor()->widget()))
editor->renameUsages();
}
void QmlJSEditorPlugin::reformatFile()
{
Core::EditorManager *em = Core::EditorManager::instance();
if (QmlJSTextEditorWidget *editor = qobject_cast<QmlJSTextEditorWidget*>(em->currentEditor()->widget())) {
if (QmlJSTextEditorWidget *editor = qobject_cast<QmlJSTextEditorWidget*>(Core::EditorManager::currentEditor()->widget())) {
QTC_ASSERT(!editor->isSemanticInfoOutdated(), return);
const QString &newText = QmlJS::reformat(editor->semanticInfo().document);
@@ -322,9 +319,7 @@ void QmlJSEditorPlugin::reformatFile()
void QmlJSEditorPlugin::showContextPane()
{
Core::EditorManager *em = Core::EditorManager::instance();
if (QmlJSTextEditorWidget *editor = qobject_cast<QmlJSTextEditorWidget*>(em->currentEditor()->widget()))
if (QmlJSTextEditorWidget *editor = qobject_cast<QmlJSTextEditorWidget*>(Core::EditorManager::currentEditor()->widget()))
editor->showContextPane();
}
src/plugins/qmljseditor/qmljsfindreferences.cpp
+1 -1
View File
@@ -975,7 +975,7 @@ void FindReferences::openEditor(const Find::SearchResultItem &item)
item.lineNumber, item.textMarkPos, Core::Id(),
Core::EditorManager::ModeSwitch);
} else {
Core::EditorManager::instance()->openEditor(QDir::fromNativeSeparators(item.text),
Core::EditorManager::openEditor(QDir::fromNativeSeparators(item.text),
Core::Id(), Core::EditorManager::ModeSwitch);
}
}
src/plugins/qmlprofiler/qmlprofilertool.cpp
+2 -3
View File
@@ -491,12 +491,11 @@ void QmlProfilerTool::gotoSourceLocation(const QString &fileUrl, int lineNumber,
if (!fileInfo.exists() || !fileInfo.isReadable())
return;
EditorManager *editorManager = EditorManager::instance();
IEditor *editor = editorManager->openEditor(projectFileName);
IEditor *editor = EditorManager::openEditor(projectFileName);
TextEditor::ITextEditor *textEditor = qobject_cast<TextEditor::ITextEditor*>(editor);
if (textEditor) {
editorManager->addCurrentPositionToNavigationHistory();
EditorManager::instance()->addCurrentPositionToNavigationHistory();
// textEditor counts columns starting with 0, but the ASTs store the
// location starting with 1, therefore the -1 in the call to gotoLine
textEditor->gotoLine(lineNumber, columnNumber - 1);
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+1 -1
View File
@@ -330,7 +330,7 @@ void QmlProjectRunConfiguration::updateEnabled()
{
bool qmlFileFound = false;
if (mainScriptSource() == FileInEditor) {
Core::IEditor *editor = Core::EditorManager::instance()->currentEditor();
Core::IEditor *editor = Core::EditorManager::currentEditor();
Core::MimeDatabase *db = ICore::mimeDatabase();
if (editor) {
m_currentFileFilename = editor->document()->fileName();
src/plugins/qt4projectmanager/qt4projectmanager.cpp
+3 -4
View File
@@ -318,8 +318,8 @@ void Qt4Manager::setContextFile(ProjectExplorer::FileNode *file)
void Qt4Manager::addLibrary()
{
Core::EditorManager *em = Core::EditorManager::instance();
ProFileEditorWidget *editor = qobject_cast<ProFileEditorWidget*>(em->currentEditor()->widget());
ProFileEditorWidget *editor =
qobject_cast<ProFileEditorWidget*>(Core::EditorManager::currentEditor()->widget());
if (editor)
addLibrary(editor->editorDocument()->fileName(), editor);
}
@@ -341,9 +341,8 @@ void Qt4Manager::addLibrary(const QString &fileName, ProFileEditorWidget *editor
if (editor) {
editable = editor->editor();
} else {
Core::EditorManager *em = Core::EditorManager::instance();
editable = qobject_cast<TextEditor::BaseTextEditor *>
(em->openEditor(fileName, Qt4ProjectManager::Constants::PROFILE_EDITOR_ID));
(Core::EditorManager::openEditor(fileName, Qt4ProjectManager::Constants::PROFILE_EDITOR_ID));
}
if (!editable)
return;
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
+1 -1
View File
@@ -282,7 +282,7 @@ bool AbstractMobileAppWizard::postGenerateFiles(const QWizard *w,
if (success) {
const QString fileToOpen = fileToOpenPostGeneration();
if (!fileToOpen.isEmpty()) {
Core::EditorManager::instance()->openEditor(fileToOpen, Core::Id(), Core::EditorManager::ModeSwitch);
Core::EditorManager::openEditor(fileToOpen, Core::Id(), Core::EditorManager::ModeSwitch);
ProjectExplorer::ProjectExplorerPlugin::instance()->setCurrentFile(0, fileToOpen);
}
}
src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp
+1 -1
View File
@@ -203,7 +203,7 @@ void RemoteLinuxDeployConfigurationWidget::openProjectFile()
return;
const DeployableFilesPerProFile * const proFileInfo =
d->deployConfiguration->deploymentInfo()->modelAt(row);
Core::EditorManager::instance()->openEditor(proFileInfo->proFilePath(), Core::Id(),
Core::EditorManager::openEditor(proFileInfo->proFilePath(), Core::Id(),
Core::EditorManager::ModeSwitch);
}
src/plugins/resourceeditor/resourceeditorplugin.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ void ResourceEditorPlugin::onUndoStackChanged(ResourceEditorW const *editor,
ResourceEditorW * ResourceEditorPlugin::currentEditor() const
{
ResourceEditorW * const focusEditor = qobject_cast<ResourceEditorW *>(
Core::EditorManager::instance()->currentEditor());
Core::EditorManager::currentEditor());
QTC_ASSERT(focusEditor, return 0);
return focusEditor;
}
src/plugins/subversion/subversionplugin.cpp
+8 -8
View File
@@ -611,7 +611,7 @@ void SubversionPlugin::svnDiff(const Subversion::Internal::SubversionDiffParamet
// Show in the same editor if diff has been executed before
if (Core::IEditor *existingEditor = VcsBase::VcsBaseEditorWidget::locateEditorByTag(tag)) {
existingEditor->createNew(response.stdOut);
Core::EditorManager::instance()->activateEditor(existingEditor, Core::EditorManager::ModeSwitch);
Core::EditorManager::activateEditor(existingEditor, Core::EditorManager::ModeSwitch);
setDiffBaseDirectory(existingEditor, p.workingDir);
return;
}
@@ -635,7 +635,7 @@ void SubversionPlugin::svnDiff(const Subversion::Internal::SubversionDiffParamet
SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QString &fileName)
{
Core::IEditor *editor = Core::EditorManager::instance()->openEditor(fileName,
Core::IEditor *editor = Core::EditorManager::openEditor(fileName,
Constants::SUBVERSIONCOMMITEDITOR_ID,
Core::EditorManager::ModeSwitch);
SubversionSubmitEditor *submitEditor = qobject_cast<SubversionSubmitEditor*>(editor);
@@ -923,7 +923,7 @@ void SubversionPlugin::filelog(const QString &workingDir,
const QString tag = VcsBase::VcsBaseEditorWidget::editorTag(VcsBase::LogOutput, workingDir, files);
if (Core::IEditor *editor = VcsBase::VcsBaseEditorWidget::locateEditorByTag(tag)) {
editor->createNew(response.stdOut);
Core::EditorManager::instance()->activateEditor(editor, Core::EditorManager::ModeSwitch);
Core::EditorManager::activateEditor(editor, Core::EditorManager::ModeSwitch);
} else {
const QString title = QString::fromLatin1("svn log %1").arg(id);
const QString source = VcsBase::VcsBaseEditorWidget::getSource(workingDir, files);
@@ -1001,7 +1001,7 @@ void SubversionPlugin::vcsAnnotate(const QString &workingDir, const QString &fil
if (Core::IEditor *editor = VcsBase::VcsBaseEditorWidget::locateEditorByTag(tag)) {
editor->createNew(response.stdOut);
VcsBase::VcsBaseEditorWidget::gotoLineOfEditor(editor, lineNumber);
Core::EditorManager::instance()->activateEditor(editor, Core::EditorManager::ModeSwitch);
Core::EditorManager::activateEditor(editor, Core::EditorManager::ModeSwitch);
} else {
const QString title = QString::fromLatin1("svn annotate %1").arg(id);
Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VcsBase::AnnotateOutput, source, codec);
@@ -1066,7 +1066,7 @@ void SubversionPlugin::describe(const QString &source, const QString &changeNr)
const QString tag = VcsBase::VcsBaseEditorWidget::editorTag(VcsBase::DiffOutput, source, QStringList(), changeNr);
if (Core::IEditor *editor = VcsBase::VcsBaseEditorWidget::locateEditorByTag(tag)) {
editor->createNew(description);
Core::EditorManager::instance()->activateEditor(editor, Core::EditorManager::ModeSwitch);
Core::EditorManager::activateEditor(editor, Core::EditorManager::ModeSwitch);
} else {
const QString title = QString::fromLatin1("svn describe %1#%2").arg(fi.fileName(), changeNr);
Core::IEditor *newEditor = showOutputInEditor(title, description, VcsBase::DiffOutput, source, codec);
@@ -1096,7 +1096,7 @@ void SubversionPlugin::submitCurrentLog()
{
m_submitActionTriggered = true;
Core::EditorManager::instance()->closeEditors(QList<Core::IEditor*>()
<< Core::EditorManager::instance()->currentEditor());
<< Core::EditorManager::currentEditor());
}
SubversionResponse
@@ -1172,7 +1172,7 @@ Core::IEditor *SubversionPlugin::showOutputInEditor(const QString &title, const
qDebug() << "SubversionPlugin::showOutputInEditor" << title << id.name()
<< "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title;
Core::IEditor *editor = Core::EditorManager::instance()->openEditorWithContents(id, &s, output);
Core::IEditor *editor = Core::EditorManager::openEditorWithContents(id, &s, output);
connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,int)),
this, SLOT(annotateVersion(QString,QString,int)));
SubversionEditor *e = qobject_cast<SubversionEditor*>(editor->widget());
@@ -1186,7 +1186,7 @@ Core::IEditor *SubversionPlugin::showOutputInEditor(const QString &title, const
if (codec)
e->setCodec(codec);
Core::IEditor *ie = e->editor();
Core::EditorManager::instance()->activateEditor(ie, Core::EditorManager::ModeSwitch);
Core::EditorManager::activateEditor(ie, Core::EditorManager::ModeSwitch);
return ie;
}
src/plugins/texteditor/basefilefind.cpp
+1 -1
View File
@@ -292,7 +292,7 @@ void BaseFileFind::openEditor(const Find::SearchResultItem &item)
Core::Id(),
Core::EditorManager::ModeSwitch);
} else {
openedEditor = Core::EditorManager::instance()->openEditor(QDir::fromNativeSeparators(item.text),
openedEditor = Core::EditorManager::openEditor(QDir::fromNativeSeparators(item.text),
Core::Id(), Core::EditorManager::ModeSwitch);
}
if (m_currentFindSupport)
src/plugins/texteditor/basetextdocument.cpp
+1 -1
View File
@@ -211,7 +211,7 @@ bool BaseTextDocument::save(QString *errorString, const QString &fileName, bool
int undos = d->m_document->availableUndoSteps();
// When saving the current editor, make sure to maintain the cursor position for undo
Core::IEditor *currentEditor = Core::EditorManager::instance()->currentEditor();
Core::IEditor *currentEditor = Core::EditorManager::currentEditor();
if (BaseTextEditor *editable = qobject_cast<BaseTextEditor*>(currentEditor)) {
if (editable->document() == this) {
editorWidget = editable->editorWidget();
src/plugins/texteditor/basetexteditor.cpp
+1 -1
View File
@@ -170,7 +170,7 @@ Core::IEditor *BaseTextEditorWidget::openEditorAt(const QString &fileName, int l
Core::EditorManager *editorManager = Core::EditorManager::instance();
editorManager->cutForwardNavigationHistory();
editorManager->addCurrentPositionToNavigationHistory();
Core::IEditor *editor = editorManager->openEditor(fileName, editorKind,
Core::IEditor *editor = Core::EditorManager::openEditor(fileName, editorKind,
flags, newEditor);
TextEditor::ITextEditor *texteditor = qobject_cast<TextEditor::ITextEditor *>(editor);
if (texteditor && line != -1) {
src/plugins/texteditor/findincurrentfile.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ FindInCurrentFile::FindInCurrentFile()
{
connect(Core::ICore::editorManager(), SIGNAL(currentEditorChanged(Core::IEditor*)),
this, SLOT(handleFileChange(Core::IEditor*)));
handleFileChange(Core::ICore::editorManager()->currentEditor());
handleFileChange(Core::EditorManager::currentEditor());
}
QString FindInCurrentFile::id() const
src/plugins/texteditor/linenumberfilter.cpp
+1 -4
View File
@@ -75,8 +75,5 @@ void LineNumberFilter::accept(FilterEntry selection) const
ITextEditor *LineNumberFilter::currentTextEditor() const
{
Core::EditorManager *editorManager = Core::EditorManager::instance();
if (!editorManager->currentEditor())
return 0;
return qobject_cast<TextEditor::ITextEditor*>(editorManager->currentEditor());
return qobject_cast<TextEditor::ITextEditor *>(EditorManager::currentEditor());
}
src/plugins/texteditor/outlinefactory.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ OutlineWidgetStack::OutlineWidgetStack(OutlineFactory *factory) :
Core::EditorManager *editorManager = Core::EditorManager::instance();
connect(editorManager, SIGNAL(currentEditorChanged(Core::IEditor*)),
this, SLOT(updateCurrentEditor(Core::IEditor*)));
updateCurrentEditor(editorManager->currentEditor());
updateCurrentEditor(Core::EditorManager::currentEditor());
}
OutlineWidgetStack::~OutlineWidgetStack()
src/plugins/texteditor/texteditorplugin.cpp
+5 -6
View File
@@ -145,8 +145,7 @@ void ScratchFileWizard::runWizard(const QString &, QWidget *, const QString &, c
file.setAutoRemove(false);
QTC_ASSERT(file.open(), return; );
file.close();
Core::EditorManager *em = Core::EditorManager::instance();
em->openEditor(file.fileName(), Core::Id(), Core::EditorManager::ModeSwitch);
Core::EditorManager::openEditor(file.fileName(), Core::Id(), Core::EditorManager::ModeSwitch);
}
// ExtensionSystem::PluginInterface
@@ -272,14 +271,14 @@ void TextEditorPlugin::initializeEditor(PlainTextEditorWidget *editor)
void TextEditorPlugin::invokeCompletion()
{
Core::IEditor *iface = Core::EditorManager::instance()->currentEditor();
Core::IEditor *iface = Core::EditorManager::currentEditor();
if (BaseTextEditorWidget *w = qobject_cast<BaseTextEditorWidget *>(iface->widget()))
w->invokeAssist(Completion);
}
void TextEditorPlugin::invokeQuickFix()
{
Core::IEditor *iface = Core::EditorManager::instance()->currentEditor();
Core::IEditor *iface = Core::EditorManager::currentEditor();
if (BaseTextEditorWidget *w = qobject_cast<BaseTextEditorWidget *>(iface->widget()))
w->invokeAssist(QuickFix);
}
@@ -302,7 +301,7 @@ void TextEditorPlugin::updateVariable(const QByteArray &variable)
<< kCurrentDocumentFontSize;
if (variables.contains(variable)) {
QString value;
Core::IEditor *iface = Core::EditorManager::instance()->currentEditor();
Core::IEditor *iface = Core::EditorManager::currentEditor();
ITextEditor *editor = qobject_cast<ITextEditor *>(iface);
if (editor) {
if (variable == kCurrentDocumentSelection) {
@@ -326,7 +325,7 @@ void TextEditorPlugin::updateVariable(const QByteArray &variable)
void TextEditorPlugin::updateCurrentSelection(const QString &text)
{
Core::IEditor *iface = Core::EditorManager::instance()->currentEditor();
Core::IEditor *iface = Core::EditorManager::currentEditor();
ITextEditor *editor = qobject_cast<ITextEditor *>(iface);
if (editor) {
int pos = editor->position();
src/plugins/todo/todoitemsprovider.cpp
+1 -1
View File
@@ -167,7 +167,7 @@ void TodoItemsProvider::setupCurrentEditorBinding()
{
Core::EditorManager *editorManager = Core::EditorManager::instance();
m_currentEditor = editorManager->currentEditor();
m_currentEditor = Core::EditorManager::currentEditor();
connect(editorManager, SIGNAL(currentEditorChanged(Core::IEditor*)),
SLOT(currentEditorChanged(Core::IEditor*)));
}
src/plugins/todo/todoplugin.cpp
+1 -1
View File
@@ -100,7 +100,7 @@ void TodoPlugin::scanningScopeChanged(ScanningScope scanningScope)
void TodoPlugin::todoItemClicked(const TodoItem &item)
{
if (QFileInfo(item.file).exists()) {
Core::IEditor *editor = Core::EditorManager::instance()->openEditor(item.file);
Core::IEditor *editor = Core::EditorManager::openEditor(item.file);
editor->gotoLine(item.line);
}
}
src/plugins/vcsbase/cleandialog.cpp
+1 -1
View File
@@ -275,7 +275,7 @@ void CleanDialog::slotDoubleClicked(const QModelIndex &index)
if (const QStandardItem *item = d->m_filesModel->itemFromIndex(index))
if (!item->data(Internal::isDirectoryRole).toBool()) {
const QString fname = item->data(Internal::fileNameRole).toString();
Core::EditorManager::instance()->openEditor(fname, Core::Id(), Core::EditorManager::ModeSwitch);
Core::EditorManager::openEditor(fname, Core::Id(), Core::EditorManager::ModeSwitch);
}
}
src/plugins/vcsbase/vcsbaseclient.cpp
+2 -2
View File
@@ -568,7 +568,7 @@ VcsBase::VcsBaseEditorWidget *VcsBaseClient::createVcsEditor(const QString &kind
baseEditor = VcsBase::VcsBaseEditorWidget::getVcsBaseEditor(outputEditor);
QTC_ASSERT(baseEditor, return 0);
} else {
outputEditor = Core::ICore::editorManager()->openEditorWithContents(Core::Id(kind), &title, progressMsg);
outputEditor = Core::EditorManager::openEditorWithContents(Core::Id(kind), &title, progressMsg);
outputEditor->document()->setProperty(registerDynamicProperty, dynamicPropertyValue);
baseEditor = VcsBase::VcsBaseEditorWidget::getVcsBaseEditor(outputEditor);
connect(baseEditor, SIGNAL(annotateRevisionRequested(QString,QString,int)),
@@ -580,7 +580,7 @@ VcsBase::VcsBaseEditorWidget *VcsBaseClient::createVcsEditor(const QString &kind
}
baseEditor->setForceReadOnly(true);
Core::ICore::editorManager()->activateEditor(outputEditor, Core::EditorManager::ModeSwitch);
Core::EditorManager::activateEditor(outputEditor, Core::EditorManager::ModeSwitch);
return baseEditor;
}
src/plugins/vcsbase/vcsbaseeditor.cpp
+2 -3
View File
@@ -1095,8 +1095,7 @@ void VcsBaseEditorWidget::jumpToChangeFromDiff(QTextCursor cursor)
if (!exists)
return;
Core::EditorManager *em = Core::EditorManager::instance();
Core::IEditor *ed = em->openEditor(fileName, Core::Id(), Core::EditorManager::ModeSwitch);
Core::IEditor *ed = Core::EditorManager::openEditor(fileName, Core::Id(), Core::EditorManager::ModeSwitch);
if (TextEditor::ITextEditor *editor = qobject_cast<TextEditor::ITextEditor *>(ed))
editor->gotoLine(chunkStart + lineCount);
}
@@ -1256,7 +1255,7 @@ VcsBaseEditorWidget *VcsBaseEditorWidget::getVcsBaseEditor(const Core::IEditor *
// Return line number of current editor if it matches.
int VcsBaseEditorWidget::lineNumberOfCurrentEditor(const QString &currentFile)
{
Core::IEditor *ed = Core::EditorManager::instance()->currentEditor();
Core::IEditor *ed = Core::EditorManager::currentEditor();
if (!ed)
return -1;
if (!currentFile.isEmpty()) {
src/plugins/vcsbase/vcsbaseoutputwindow.cpp
+1 -1
View File
@@ -194,7 +194,7 @@ void OutputWindowPlainTextEdit::contextMenuEvent(QContextMenuEvent *event)
}
if (action == openAction) {
const QString fileName = action->data().toString();
Core::EditorManager::instance()->openEditor(fileName, Core::Id(), Core::EditorManager::ModeSwitch);
Core::EditorManager::openEditor(fileName, Core::Id(), Core::EditorManager::ModeSwitch);
}
}
delete menu;
src/plugins/vcsbase/vcsbaseplugin.cpp
+3 -3
View File
@@ -237,11 +237,11 @@ void StateListener::slotStateChanged()
// temporary path prefix or does the file contains a hash, indicating a project
// folder?
State state;
Core::EditorManager *em = Core::ICore::editorManager();
if (!em || !em->currentEditor() || !em->currentEditor()->document())
Core::IEditor *currentEditor = Core::EditorManager::currentEditor();
if (!currentEditor || !currentEditor->document())
state.currentFile.clear();
else
state.currentFile = em->currentEditor()->document()->fileName();
state.currentFile = currentEditor->document()->fileName();
QScopedPointer<QFileInfo> currentFileInfo; // Instantiate QFileInfo only once if required.
if (!state.currentFile.isEmpty()) {
const bool isTempFile = state.currentFile.startsWith(QDir::tempPath());
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+4 -3
View File
@@ -807,15 +807,16 @@ void VcsBaseSubmitEditor::filterUntrackedFilesOfProject(const QString &repositor
// Helper to raise an already open submit editor to prevent opening twice.
bool VcsBaseSubmitEditor::raiseSubmitEditor()
{
Core::EditorManager *em = Core::EditorManager::instance();
// Nothing to do?
if (Core::IEditor *ce = em->currentEditor())
if (Core::IEditor *ce = Core::EditorManager::currentEditor())
if (qobject_cast<VcsBaseSubmitEditor*>(ce))
return true;
// Try to activate a hidden one
Core::EditorManager *em = Core::EditorManager::instance();
foreach (Core::IEditor *e, em->openedEditors()) {
if (qobject_cast<VcsBaseSubmitEditor*>(e)) {
em->activateEditor(e, Core::EditorManager::IgnoreNavigationHistory | Core::EditorManager::ModeSwitch);
Core::EditorManager::activateEditor(e,
Core::EditorManager::IgnoreNavigationHistory | Core::EditorManager::ModeSwitch);
return true;
}
}