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

Todo: non-alien dir separators in To-Do entries list

Browse Source 
Use Utils::FileName instead of QString in TodoItem

Change-Id: I3c35599f972f0c23087f86ef10c9363a1577ce35
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2015-12-12 14:10:23 +01:00
parent f1e14468c6
commit 05fbef78ad
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/todo/todoitem.h
View File

@@ -30,6 +30,8 @@
#include "constants.h" #include "constants.h"
#include "todoicons.h" #include "todoicons.h"
#include <utils/fileutils.h>
#include <QMetaType> #include <QMetaType>
#include <QString> #include <QString>
#include <QColor> #include <QColor>
@@ -43,7 +45,7 @@ public:
TodoItem() : line(-1) {} TodoItem() : line(-1) {}
QString text; QString text;
QString file; Utils::FileName file;
int line; int line;
IconType iconType; IconType iconType;
QColor color; QColor color;

2
src/plugins/todo/todoitemsmodel.cpp
View File

@@ -100,7 +100,7 @@ QVariant TodoItemsModel::data(const QModelIndex &index, int role) const
case Constants::OUTPUT_COLUMN_FILE: case Constants::OUTPUT_COLUMN_FILE:
if (role == Qt::DisplayRole) if (role == Qt::DisplayRole)
return item.file; return item.file.toUserOutput();
break; break;
case Constants::OUTPUT_COLUMN_LINE: case Constants::OUTPUT_COLUMN_LINE:

2
src/plugins/todo/todoitemsscanner.cpp
View File

@@ -54,7 +54,7 @@ void TodoItemsScanner::processCommentLine(const QString &fileName, const QString
for (int i = 0; i < newItemList.count(); ++i) { for (int i = 0; i < newItemList.count(); ++i) {
newItemList[i].line = lineNumber; newItemList[i].line = lineNumber;
newItemList[i].file = fileName; newItemList[i].file = Utils::FileName::fromString(fileName);
} }
outItemList << newItemList; outItemList << newItemList;

2
src/plugins/todo/todooutputpane.cpp
View File

@@ -170,7 +170,7 @@ void TodoOutputPane::todoTreeViewClicked(const QModelIndex &index)
TodoItem item; TodoItem item;
item.text = index.sibling(row, Constants::OUTPUT_COLUMN_TEXT).data().toString(); item.text = index.sibling(row, Constants::OUTPUT_COLUMN_TEXT).data().toString();
item.file = index.sibling(row, Constants::OUTPUT_COLUMN_FILE).data().toString(); item.file = Utils::FileName::fromUserInput(index.sibling(row, Constants::OUTPUT_COLUMN_FILE).data().toString());
item.line = index.sibling(row, Constants::OUTPUT_COLUMN_LINE).data().toInt(); item.line = index.sibling(row, Constants::OUTPUT_COLUMN_LINE).data().toInt();
item.color = index.data(Qt::BackgroundColorRole).value<QColor>(); item.color = index.data(Qt::BackgroundColorRole).value<QColor>();
item.iconType = static_cast<IconType>(index.sibling(row, Constants::OUTPUT_COLUMN_TEXT) item.iconType = static_cast<IconType>(index.sibling(row, Constants::OUTPUT_COLUMN_TEXT)

4
src/plugins/todo/todoplugin.cpp
View File

@@ -111,8 +111,8 @@ void TodoPlugin::scanningScopeChanged(ScanningScope scanningScope)
void TodoPlugin::todoItemClicked(const TodoItem &item) void TodoPlugin::todoItemClicked(const TodoItem &item)
{ {
if (QFileInfo::exists(item.file)) { if (item.file.exists()) {
Core::IEditor *editor = Core::EditorManager::openEditor(item.file); Core::IEditor *editor = Core::EditorManager::openEditor(item.file.toString());
editor->gotoLine(item.line); editor->gotoLine(item.line);
} }
} }