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

Move openEditorAt from BaseTextEditorWidget to EditorManager

Browse Source 
More sensible place, gotoLine is a method in IEditor anyhow.

Change-Id: I420a6bf17060c16e6f1a4f45e0bef89379fb6bf8
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Eike Ziller
2013-05-30 17:26:51 +02:00
parent 97ce8e4098
commit 2125525e77
25 changed files with 84 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmljstools/qmlconsoleview.cpp
View File

@@ -31,7 +31,7 @@
#include "qmlconsoleitemdelegate.h"
#include "qmlconsoleitemmodel.h"
#include <texteditor/basetexteditor.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/manhattanstyle.h>
#include <utils/hostosinfo.h>
@@ -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);
}
}
}

6
src/plugins/qmljstools/qmljsfunctionfilter.cpp
View File

@@ -30,7 +30,7 @@
#include "qmljsfunctionfilter.h"
#include "qmljslocatordata.h"
#include <texteditor/basetexteditor.h>
#include <coreplugin/editormanager/editormanager.h>
#include <QStringMatcher>
@@ -111,6 +111,6 @@ QList<Locator::FilterEntry> FunctionFilter::matchesFor(QFutureInterface<Locator:
void FunctionFilter::accept(Locator::FilterEntry selection) const
{
const LocatorData::Entry entry = qvariant_cast<LocatorData::Entry>(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);
}