diff options
author | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2015-12-12 14:10:23 +0100 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-03-17 10:23:49 +0000 |
commit | 05fbef78ad115d86caf39a632b2a9a1569a956a0 (patch) | |
tree | 60e2422cf996635083e6744e207d49f42fe2b56f | |
parent | f1e14468c6ef6ab0d6fc49cc5809429bec085793 (diff) |
Todo: non-alien dir separators in To-Do entries list
Use Utils::FileName instead of QString in TodoItem
Change-Id: I3c35599f972f0c23087f86ef10c9363a1577ce35
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
-rw-r--r-- | src/plugins/todo/todoitem.h | 4 | ||||
-rw-r--r-- | src/plugins/todo/todoitemsmodel.cpp | 2 | ||||
-rw-r--r-- | src/plugins/todo/todoitemsscanner.cpp | 2 | ||||
-rw-r--r-- | src/plugins/todo/todooutputpane.cpp | 2 | ||||
-rw-r--r-- | src/plugins/todo/todoplugin.cpp | 4 |
5 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/todo/todoitem.h b/src/plugins/todo/todoitem.h index 7af3712050..67ce251720 100644 --- a/src/plugins/todo/todoitem.h +++ b/src/plugins/todo/todoitem.h @@ -30,6 +30,8 @@ #include "constants.h" #include "todoicons.h" +#include <utils/fileutils.h> + #include <QMetaType> #include <QString> #include <QColor> @@ -43,7 +45,7 @@ public: TodoItem() : line(-1) {} QString text; - QString file; + Utils::FileName file; int line; IconType iconType; QColor color; diff --git a/src/plugins/todo/todoitemsmodel.cpp b/src/plugins/todo/todoitemsmodel.cpp index 1f8c7bb29a..5cd1cca36e 100644 --- a/src/plugins/todo/todoitemsmodel.cpp +++ b/src/plugins/todo/todoitemsmodel.cpp @@ -100,7 +100,7 @@ QVariant TodoItemsModel::data(const QModelIndex &index, int role) const case Constants::OUTPUT_COLUMN_FILE: if (role == Qt::DisplayRole) - return item.file; + return item.file.toUserOutput(); break; case Constants::OUTPUT_COLUMN_LINE: diff --git a/src/plugins/todo/todoitemsscanner.cpp b/src/plugins/todo/todoitemsscanner.cpp index eab818a2a5..9b3a25dbfa 100644 --- a/src/plugins/todo/todoitemsscanner.cpp +++ b/src/plugins/todo/todoitemsscanner.cpp @@ -54,7 +54,7 @@ void TodoItemsScanner::processCommentLine(const QString &fileName, const QString for (int i = 0; i < newItemList.count(); ++i) { newItemList[i].line = lineNumber; - newItemList[i].file = fileName; + newItemList[i].file = Utils::FileName::fromString(fileName); } outItemList << newItemList; diff --git a/src/plugins/todo/todooutputpane.cpp b/src/plugins/todo/todooutputpane.cpp index 4ab9282194..85ccce27bf 100644 --- a/src/plugins/todo/todooutputpane.cpp +++ b/src/plugins/todo/todooutputpane.cpp @@ -170,7 +170,7 @@ void TodoOutputPane::todoTreeViewClicked(const QModelIndex &index) TodoItem item; 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.color = index.data(Qt::BackgroundColorRole).value<QColor>(); item.iconType = static_cast<IconType>(index.sibling(row, Constants::OUTPUT_COLUMN_TEXT) diff --git a/src/plugins/todo/todoplugin.cpp b/src/plugins/todo/todoplugin.cpp index c3bd1a4b50..c32007a9c3 100644 --- a/src/plugins/todo/todoplugin.cpp +++ b/src/plugins/todo/todoplugin.cpp @@ -111,8 +111,8 @@ void TodoPlugin::scanningScopeChanged(ScanningScope scanningScope) void TodoPlugin::todoItemClicked(const TodoItem &item) { - if (QFileInfo::exists(item.file)) { - Core::IEditor *editor = Core::EditorManager::openEditor(item.file); + if (item.file.exists()) { + Core::IEditor *editor = Core::EditorManager::openEditor(item.file.toString()); editor->gotoLine(item.line); } } |