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

Debugger: Use FileInProjectFinder for the console view

Browse Source 
All the functionality to guess local files from remote paths is already
there.

Change-Id: I5bffeb0f126efef99edbaf152e1a5e9e1d244699
Task-number: QTCREATORBUG-12008
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Ulf Hermann
2018-06-12 10:44:10 +02:00
parent bf7e749099
commit 451e437afd
5 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/debugger/console/consoleview.cpp
View File

@@ -29,6 +29,7 @@
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/manhattanstyle.h>
#include <qtsupport/baseqtversion.h>
#include <utils/hostosinfo.h>
#include <QAction>
@@ -128,6 +129,11 @@ void ConsoleView::onScrollToBottom()
scrollToBottom();
}
void ConsoleView::populateFileFinder()
{
QtSupport::BaseQtVersion::populateQmlFileFinder(&m_finder, nullptr);
}
void ConsoleView::mousePressEvent(QMouseEvent *event)
{
QPoint pos = event->pos();
@@ -212,17 +218,10 @@ void ConsoleView::onRowActivated(const QModelIndex &index)
if (!index.isValid())
return;
// See if we have file and line Info
QString filePath = model()->data(index, ConsoleItem::FileRole).toString();
const QUrl fileUrl = QUrl(filePath);
if (fileUrl.isLocalFile())
filePath = fileUrl.toLocalFile();
if (!filePath.isEmpty()) {
QFileInfo fi(filePath);
if (fi.exists() && fi.isFile() && fi.isReadable()) {
int line = model()->data(index, ConsoleItem::LineRole).toInt();
Core::EditorManager::openEditorAt(fi.canonicalFilePath(), line);
}
const QFileInfo fi(m_finder.findFile(model()->data(index, ConsoleItem::FileRole).toString()));
if (fi.exists() && fi.isFile() && fi.isReadable()) {
Core::EditorManager::openEditorAt(fi.canonicalFilePath(),
model()->data(index, ConsoleItem::LineRole).toInt());
}
}
@@ -250,17 +249,9 @@ bool ConsoleView::canShowItemInTextEditor(const QModelIndex &index)
if (!index.isValid())
return false;
// See if we have file and line Info
QString filePath = model()->data(index, ConsoleItem::FileRole).toString();
const QUrl fileUrl = QUrl(filePath);
if (fileUrl.isLocalFile())
filePath = fileUrl.toLocalFile();
if (!filePath.isEmpty()) {
QFileInfo fi(filePath);
if (fi.exists() && fi.isFile() && fi.isReadable())
return true;
}
return false;
bool success = false;
m_finder.findFile(model()->data(index, ConsoleItem::FileRole).toString(), &success);
return success;
}
} // Internal