From 2125525e775de909a181cb7f6cfa18200722f230 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 30 May 2013 17:26:51 +0200 Subject: [PATCH] Move openEditorAt from BaseTextEditorWidget to EditorManager More sensible place, gotoLine is a method in IEditor anyhow. Change-Id: I420a6bf17060c16e6f1a4f45e0bef89379fb6bf8 Reviewed-by: David Schulz --- src/plugins/bookmarks/bookmarkmanager.cpp | 6 ++--- src/plugins/classview/classviewmanager.cpp | 6 +---- .../editormanager/editormanager.cpp | 13 ++++++++++ .../coreplugin/editormanager/editormanager.h | 3 +++ src/plugins/cppeditor/cppeditor.cpp | 8 +++---- src/plugins/cppeditor/cpptypehierarchy.cpp | 16 ++++++------- .../cpptools/cppcurrentdocumentfilter.cpp | 4 ++-- src/plugins/cpptools/cppfindreferences.cpp | 10 ++++---- src/plugins/cpptools/cpplocatorfilter.cpp | 4 ++-- src/plugins/cpptools/symbolsfindfilter.cpp | 6 ++--- src/plugins/designer/qtcreatorintegration.cpp | 4 ++-- .../showineditortaskhandler.cpp | 4 ++-- .../qmljseditor/qmljsfindreferences.cpp | 7 +++--- src/plugins/qmljstools/qmlconsoleview.cpp | 4 ++-- .../qmljstools/qmljsfunctionfilter.cpp | 6 ++--- src/plugins/qtsupport/qtoutputformatter.cpp | 11 +++++---- src/plugins/texteditor/basefilefind.cpp | 13 +++++----- src/plugins/texteditor/basetexteditor.cpp | 24 ++----------------- src/plugins/texteditor/basetexteditor.h | 5 ---- src/plugins/texteditor/itexteditor.cpp | 3 --- src/plugins/texteditor/itexteditor.h | 1 + src/plugins/texteditor/refactoringchanges.cpp | 2 +- src/plugins/valgrind/callgrindtool.cpp | 4 ++-- src/plugins/valgrind/memcheckerrorview.cpp | 7 +++--- src/plugins/valgrind/memchecktool.cpp | 11 ++++----- 25 files changed, 84 insertions(+), 98 deletions(-) diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index aee3b30f6cf..dd8929014d2 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -508,8 +508,8 @@ Bookmark *BookmarkManager::bookmarkForIndex(const QModelIndex &index) bool BookmarkManager::gotoBookmark(Bookmark *bookmark) { using namespace TextEditor; - if (ITextEditor *editor = qobject_cast(BaseTextEditorWidget::openEditorAt(bookmark->filePath(), - bookmark->lineNumber()))) { + if (ITextEditor *editor = qobject_cast(EditorManager::openEditorAt(bookmark->filePath(), + bookmark->lineNumber()))) { return (editor->currentLine() == bookmark->lineNumber()); } return false; diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp index d2d718b1d41..73ea0ff6db5 100644 --- a/src/plugins/classview/classviewmanager.cpp +++ b/src/plugins/classview/classviewmanager.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -287,10 +286,7 @@ void Manager::onDocumentUpdated(CPlusPlus::Document::Ptr doc) void Manager::gotoLocation(const QString &fileName, int line, int column) { - bool newEditor = false; - TextEditor::BaseTextEditorWidget::openEditorAt(fileName, line, column, Core::Id(), - Core::EditorManager::IgnoreNavigationHistory, - &newEditor); + Core::EditorManager::openEditorAt(fileName, line, column); } void Manager::gotoLocations(const QList &list) diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 93c1f4c1d28..a6802a61874 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -1419,6 +1419,19 @@ IEditor *EditorManager::openEditor(const QString &fileName, const Id &editorId, fileName, editorId, flags, newEditor); } +IEditor *EditorManager::openEditorAt(const QString &fileName, int line, int column, + const Id &editorId, OpenEditorFlags flags, bool *newEditor) +{ + m_instance->cutForwardNavigationHistory(); + m_instance->addCurrentPositionToNavigationHistory(); + OpenEditorFlags tempFlags = flags | IgnoreNavigationHistory; + Core::IEditor *editor = Core::EditorManager::openEditor(fileName, editorId, + tempFlags, newEditor); + if (editor && line != -1) + editor->gotoLine(line, column); + return editor; +} + static int extractLineNumber(QString *fileName) { int i = fileName->length() - 1; diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h index e0d2ba6026b..b3bae535e4a 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.h +++ b/src/plugins/coreplugin/editormanager/editormanager.h @@ -118,6 +118,9 @@ public: static QString splitLineNumber(QString *fileName); static IEditor *openEditor(const QString &fileName, const Id &editorId = Id(), OpenEditorFlags flags = 0, bool *newEditor = 0); + static IEditor *openEditorAt(const QString &fileName, int line, int column = 0, + const Id &editorId = Id(), OpenEditorFlags flags = 0, + bool *newEditor = 0); static IEditor *openEditorWithContents(const Id &editorId, QString *titlePattern = 0, const QString &contents = QString()); diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 00e6a932378..b1b31f0e372 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -2002,10 +2002,10 @@ bool CPPEditorWidget::openCppEditorAt(const Link &link, bool inNextSplit) return true; } - return TextEditor::BaseTextEditorWidget::openEditorAt(link.targetFileName, - link.targetLine, - link.targetColumn, - Constants::CPPEDITOR_ID); + return Core::EditorManager::openEditorAt(link.targetFileName, + link.targetLine, + link.targetColumn, + Constants::CPPEDITOR_ID); } void CPPEditorWidget::semanticRehighlight(bool force) diff --git a/src/plugins/cppeditor/cpptypehierarchy.cpp b/src/plugins/cppeditor/cpptypehierarchy.cpp index 11d75cc4ae1..2883a6f8f20 100644 --- a/src/plugins/cppeditor/cpptypehierarchy.cpp +++ b/src/plugins/cppeditor/cpptypehierarchy.cpp @@ -105,10 +105,10 @@ private: if (!m_link.hasValidTarget()) return; - TextEditor::BaseTextEditorWidget::openEditorAt(m_link.targetFileName, - m_link.targetLine, - m_link.targetColumn, - Constants::CPPEDITOR_ID); + Core::EditorManager::openEditorAt(m_link.targetFileName, + m_link.targetLine, + m_link.targetColumn, + Constants::CPPEDITOR_ID); } CPPEditorWidget::Link m_link; @@ -205,10 +205,10 @@ void CppTypeHierarchyWidget::onItemClicked(const QModelIndex &index) const TextEditor::BaseTextEditorWidget::Link link = index.data(LinkRole).value(); if (link.hasValidTarget()) - TextEditor::BaseTextEditorWidget::openEditorAt(link.targetFileName, - link.targetLine, - link.targetColumn, - Constants::CPPEDITOR_ID); + Core::EditorManager::openEditorAt(link.targetFileName, + link.targetLine, + link.targetColumn, + Constants::CPPEDITOR_ID); } // CppTypeHierarchyStackedWidget diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp index eaf3aa358d8..b26042d0a68 100644 --- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp +++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp @@ -110,8 +110,8 @@ QList CppCurrentDocumentFilter::matchesFor(QFutureInterfac void CppCurrentDocumentFilter::accept(Locator::FilterEntry selection) const { ModelItemInfo info = qvariant_cast(selection.internalData); - TextEditor::BaseTextEditorWidget::openEditorAt(info.fileName, info.line, info.column, - Core::Id(), Core::EditorManager::ModeSwitch); + Core::EditorManager::openEditorAt(info.fileName, info.line, info.column, + Core::Id(), Core::EditorManager::ModeSwitch); } void CppCurrentDocumentFilter::refresh(QFutureInterface &future) diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index 4d8283c1453..f27d92081d2 100644 --- a/src/plugins/cpptools/cppfindreferences.cpp +++ b/src/plugins/cpptools/cppfindreferences.cpp @@ -32,11 +32,11 @@ #include "cpptoolsconstants.h" #include "cppmodelmanagerinterface.h" +#include #include #include #include #include -#include #include #include @@ -509,10 +509,10 @@ void CppFindReferences::setPaused(bool paused) void CppFindReferences::openEditor(const Find::SearchResultItem &item) { if (item.path.size() > 0) { - TextEditor::BaseTextEditorWidget::openEditorAt(QDir::fromNativeSeparators(item.path.first()), - item.lineNumber, item.textMarkPos, - Core::Id(), - Core::EditorManager::ModeSwitch); + Core::EditorManager::openEditorAt(QDir::fromNativeSeparators(item.path.first()), + item.lineNumber, item.textMarkPos, + Core::Id(), + Core::EditorManager::ModeSwitch); } else { Core::EditorManager::openEditor(QDir::fromNativeSeparators(item.text), Core::Id(), Core::EditorManager::ModeSwitch); diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp index 6bb5c8ef518..e2ea80f0d2f 100644 --- a/src/plugins/cpptools/cpplocatorfilter.cpp +++ b/src/plugins/cpptools/cpplocatorfilter.cpp @@ -177,8 +177,8 @@ QList CppLocatorFilter::matchesFor(QFutureInterface(selection.internalData); - TextEditor::BaseTextEditorWidget::openEditorAt(info.fileName, info.line, info.column, - Core::Id(), Core::EditorManager::ModeSwitch); + Core::EditorManager::openEditorAt(info.fileName, info.line, info.column, + Core::Id(), Core::EditorManager::ModeSwitch); } void CppLocatorFilter::reset() diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp index 78c636674d0..290b5bd5fd1 100644 --- a/src/plugins/cpptools/symbolsfindfilter.cpp +++ b/src/plugins/cpptools/symbolsfindfilter.cpp @@ -187,9 +187,9 @@ void SymbolsFindFilter::openEditor(const Find::SearchResultItem &item) if (!item.userData.canConvert()) return; ModelItemInfo info = item.userData.value(); - TextEditor::BaseTextEditorWidget::openEditorAt(info.fileName, - info.line, - info.column); + Core::EditorManager::openEditorAt(info.fileName, + info.line, + info.column); } QWidget *SymbolsFindFilter::createConfigWidget() diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index 3b1395159f2..1fbb5a9d2c3 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/src/plugins/designer/qtcreatorintegration.cpp @@ -270,7 +270,7 @@ static Document::Ptr findDefinition(Function *functionDeclaration, int *line) static inline ITextEditor *editableAt(const QString &fileName, int line, int column) { - return qobject_cast(TextEditor::BaseTextEditorWidget::openEditorAt(fileName, line, column)); + return qobject_cast(Core::EditorManager::openEditorAt(fileName, line, column)); } static void addDeclaration(const Snapshot &snapshot, @@ -626,7 +626,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName, } // jump to function definition, position within code - TextEditor::BaseTextEditorWidget::openEditorAt(sourceDoc->fileName(), line + 2, indentation); + Core::EditorManager::openEditorAt(sourceDoc->fileName(), line + 2, indentation); return true; } diff --git a/src/plugins/projectexplorer/showineditortaskhandler.cpp b/src/plugins/projectexplorer/showineditortaskhandler.cpp index f01c9e3ced5..3090fb47d74 100644 --- a/src/plugins/projectexplorer/showineditortaskhandler.cpp +++ b/src/plugins/projectexplorer/showineditortaskhandler.cpp @@ -31,7 +31,7 @@ #include "task.h" -#include +#include #include #include @@ -49,7 +49,7 @@ bool ShowInEditorTaskHandler::canHandle(const ProjectExplorer::Task &task) const void ShowInEditorTaskHandler::handle(const ProjectExplorer::Task &task) { QFileInfo fi(task.file.toFileInfo()); - TextEditor::BaseTextEditorWidget::openEditorAt(fi.filePath(), task.movedLine); + Core::EditorManager::openEditorAt(fi.filePath(), task.movedLine); } QAction *ShowInEditorTaskHandler::createAction(QObject *parent) const diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp index 50ebf9a6b2c..e5aa05c2e77 100644 --- a/src/plugins/qmljseditor/qmljsfindreferences.cpp +++ b/src/plugins/qmljseditor/qmljsfindreferences.cpp @@ -29,7 +29,6 @@ #include "qmljsfindreferences.h" -#include #include #include #include @@ -985,9 +984,9 @@ void FindReferences::setPaused(bool paused) void FindReferences::openEditor(const Find::SearchResultItem &item) { if (item.path.size() > 0) { - TextEditor::BaseTextEditorWidget::openEditorAt(QDir::fromNativeSeparators(item.path.first()), - item.lineNumber, item.textMarkPos, Core::Id(), - Core::EditorManager::ModeSwitch); + Core::EditorManager::openEditorAt(QDir::fromNativeSeparators(item.path.first()), + item.lineNumber, item.textMarkPos, Core::Id(), + Core::EditorManager::ModeSwitch); } else { Core::EditorManager::openEditor(QDir::fromNativeSeparators(item.text), Core::Id(), Core::EditorManager::ModeSwitch); diff --git a/src/plugins/qmljstools/qmlconsoleview.cpp b/src/plugins/qmljstools/qmlconsoleview.cpp index c44ddd7f45a..b8e3e5fd3b3 100644 --- a/src/plugins/qmljstools/qmlconsoleview.cpp +++ b/src/plugins/qmljstools/qmlconsoleview.cpp @@ -31,7 +31,7 @@ #include "qmlconsoleitemdelegate.h" #include "qmlconsoleitemmodel.h" -#include +#include #include #include @@ -231,7 +231,7 @@ void QmlConsoleView::onRowActivated(const QModelIndex &index) QFileInfo fi(filePath); if (fi.exists() && fi.isFile() && fi.isReadable()) { int line = model()->data(index, QmlConsoleItemModel::LineRole).toInt(); - TextEditor::BaseTextEditorWidget::openEditorAt(fi.canonicalFilePath(), line); + Core::EditorManager::openEditorAt(fi.canonicalFilePath(), line); } } } diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp index 3c500314c96..13710f5dd0d 100644 --- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp +++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp @@ -30,7 +30,7 @@ #include "qmljsfunctionfilter.h" #include "qmljslocatordata.h" -#include +#include #include @@ -111,6 +111,6 @@ QList FunctionFilter::matchesFor(QFutureInterface(selection.internalData); - TextEditor::BaseTextEditorWidget::openEditorAt(entry.fileName, entry.line, entry.column, - Core::Id(), Core::EditorManager::ModeSwitch); + Core::EditorManager::openEditorAt(entry.fileName, entry.line, entry.column, + Core::Id(), Core::EditorManager::ModeSwitch); } diff --git a/src/plugins/qtsupport/qtoutputformatter.cpp b/src/plugins/qtsupport/qtoutputformatter.cpp index 34b7d38f1cb..82d0dcc8919 100644 --- a/src/plugins/qtsupport/qtoutputformatter.cpp +++ b/src/plugins/qtsupport/qtoutputformatter.cpp @@ -29,11 +29,12 @@ #include "qtoutputformatter.h" -#include +#include #include -#include +#include #include +#include using namespace ProjectExplorer; using namespace QtSupport; @@ -195,7 +196,7 @@ void QtOutputFormatter::handleLink(const QString &href) const int line = qmlLineColumnLink.cap(2).toInt(); const int column = qmlLineColumnLink.cap(3).toInt(); - TextEditor::BaseTextEditorWidget::openEditorAt(m_projectFinder.findFile(fileUrl), line, column - 1); + Core::EditorManager::openEditorAt(m_projectFinder.findFile(fileUrl), line, column - 1); return; } @@ -206,7 +207,7 @@ void QtOutputFormatter::handleLink(const QString &href) if (qmlLineLink.indexIn(href) != -1) { const QUrl fileUrl = QUrl(qmlLineLink.cap(1)); const int line = qmlLineLink.cap(2).toInt(); - TextEditor::BaseTextEditorWidget::openEditorAt(m_projectFinder.findFile(fileUrl), line); + Core::EditorManager::openEditorAt(m_projectFinder.findFile(fileUrl), line); return; } @@ -233,7 +234,7 @@ void QtOutputFormatter::handleLink(const QString &href) if (!fileName.isEmpty()) { fileName = m_projectFinder.findFile(QUrl::fromLocalFile(fileName)); - TextEditor::BaseTextEditorWidget::openEditorAt(fileName, line, 0); + Core::EditorManager::openEditorAt(fileName, line, 0); return; } } diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 8f1ccf1e64f..baf1318dc10 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -36,7 +36,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -309,11 +310,11 @@ void BaseFileFind::openEditor(const Find::SearchResultItem &item) SearchResult *result = qobject_cast(sender()); Core::IEditor *openedEditor = 0; if (item.path.size() > 0) { - openedEditor = TextEditor::BaseTextEditorWidget::openEditorAt(QDir::fromNativeSeparators(item.path.first()), - item.lineNumber, - item.textMarkPos, - Core::Id(), - Core::EditorManager::ModeSwitch); + openedEditor = Core::EditorManager::openEditorAt(QDir::fromNativeSeparators(item.path.first()), + item.lineNumber, + item.textMarkPos, + Core::Id(), + Core::EditorManager::ModeSwitch); } else { openedEditor = Core::EditorManager::openEditor(QDir::fromNativeSeparators(item.text), Core::Id(), Core::EditorManager::ModeSwitch); diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 3984a4ca9b7..ab343d4ad4e 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -154,25 +154,6 @@ private: using namespace Internal; -Core::IEditor *BaseTextEditorWidget::openEditorAt(const QString &fileName, int line, int column, - Core::Id editorKind, - Core::EditorManager::OpenEditorFlags flags, - bool *newEditor) -{ - Core::EditorManager *editorManager = Core::EditorManager::instance(); - editorManager->cutForwardNavigationHistory(); - editorManager->addCurrentPositionToNavigationHistory(); - Core::IEditor *editor = Core::EditorManager::openEditor(fileName, editorKind, - flags, newEditor); - TextEditor::ITextEditor *texteditor = qobject_cast(editor); - if (texteditor && line != -1) { - texteditor->gotoLine(line, column); - return texteditor; - } - - return editor; -} - QString BaseTextEditorWidget::plainTextFromSelection(const QTextCursor &cursor) const { // Copy the selected text as plain text @@ -4918,9 +4899,8 @@ bool BaseTextEditorWidget::openLink(const Link &link, bool inNextSplit) return true; } - return openEditorAt(link.targetFileName, link.targetLine, link.targetColumn, Core::Id(), - Core::EditorManager::IgnoreNavigationHistory - | Core::EditorManager::ModeSwitch); + return Core::EditorManager::openEditorAt(link.targetFileName, link.targetLine, link.targetColumn, + Core::Id(), Core::EditorManager::ModeSwitch); } void BaseTextEditorWidget::updateLink(QMouseEvent *e) diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h index c109bc43960..4a1f17e571d 100644 --- a/src/plugins/texteditor/basetexteditor.h +++ b/src/plugins/texteditor/basetexteditor.h @@ -131,11 +131,6 @@ public: BaseTextEditorWidget(QWidget *parent); ~BaseTextEditorWidget(); - static Core::IEditor *openEditorAt(const QString &fileName, int line, int column = 0, - Core::Id editorId = Core::Id(), - Core::EditorManager::OpenEditorFlags flags = Core::EditorManager::IgnoreNavigationHistory, - bool *newEditor = 0); - const Utils::ChangeSet &changeSet() const; void setChangeSet(const Utils::ChangeSet &changeSet); diff --git a/src/plugins/texteditor/itexteditor.cpp b/src/plugins/texteditor/itexteditor.cpp index beb34d75a68..75248dd1b30 100644 --- a/src/plugins/texteditor/itexteditor.cpp +++ b/src/plugins/texteditor/itexteditor.cpp @@ -29,8 +29,6 @@ #include "itexteditor.h" -#include - #include using namespace TextEditor; @@ -66,7 +64,6 @@ QMap TextEditor::ITextEditor::openedTextEditorsEncodings( return workingCopy; } - ITextEditorDocument *ITextEditor::textDocument() { return qobject_cast(document()); diff --git a/src/plugins/texteditor/itexteditor.h b/src/plugins/texteditor/itexteditor.h index 2e1ae06e38b..dd9a3fcb7fa 100644 --- a/src/plugins/texteditor/itexteditor.h +++ b/src/plugins/texteditor/itexteditor.h @@ -35,6 +35,7 @@ #include "itextmark.h" #include +#include #include #include diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp index f5638ae6005..8ca3a3cc8d7 100644 --- a/src/plugins/texteditor/refactoringchanges.cpp +++ b/src/plugins/texteditor/refactoringchanges.cpp @@ -141,7 +141,7 @@ BaseTextEditorWidget *RefactoringChanges::openEditor(const QString &fileName, bo // openEditorAt uses a 1-based line and a 0-based column! column -= 1; } - Core::IEditor *editor = BaseTextEditorWidget::openEditorAt( + Core::IEditor *editor = Core::EditorManager::openEditorAt( fileName, line, column, Core::Id(), flags); if (editor) diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 48f5f1d7f57..efaaba214db 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -62,7 +62,7 @@ #include #include #include -#include +#include #include #include @@ -322,7 +322,7 @@ void CallgrindToolPrivate::selectFunction(const Function *func) if (QFile::exists(func->file())) { ///TODO: custom position support? int line = func->lineNumber(); - TextEditor::BaseTextEditorWidget::openEditorAt(func->file(), qMax(line, 0)); + Core::EditorManager::openEditorAt(func->file(), qMax(line, 0)); } } diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp index 8943616975b..874c54ea865 100644 --- a/src/plugins/valgrind/memcheckerrorview.cpp +++ b/src/plugins/valgrind/memcheckerrorview.cpp @@ -41,9 +41,9 @@ #include "xmlprotocol/suppression.h" #include -#include +#include #include -#include +#include #include #include @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -432,7 +433,7 @@ void MemcheckErrorDelegate::openLinkInEditor(const QString &link) const int pathEnd = link.lastIndexOf(QLatin1Char(':')); const QString path = link.mid(pathStart, pathEnd - pathStart); const int line = link.mid(pathEnd + 1).toInt(0); - TextEditor::BaseTextEditorWidget::openEditorAt(path, qMax(line, 0)); + Core::EditorManager::openEditorAt(path, qMax(line, 0)); } MemcheckErrorView::MemcheckErrorView(QWidget *parent) diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 5e82687068e..39e91f9bc07 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -54,15 +54,14 @@ #include #include -#include -#include -#include #include +#include #include +#include +#include +#include #include -#include - #include #include #include @@ -502,7 +501,7 @@ void MemcheckTool::suppressionActionTriggered() const QString file = action->data().toString(); QTC_ASSERT(!file.isEmpty(), return); - TextEditor::BaseTextEditorWidget::openEditorAt(file, 0); + Core::EditorManager::openEditorAt(file, 0); } void MemcheckTool::parserError(const Valgrind::XmlProtocol::Error &error)