Skip to content

Commit 9a51660

Browse files
committed
GUI: Fix line numbers and filenames in errors.
When converting to use new ErrorItem and ErrorLine I made few mistakes in how I handled the data. And for some reason there was not even warnings about converting integers to QStrings.
1 parent 352941f commit 9a51660

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

gui/resultstree.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void ResultsTree::AddErrorItem(const ErrorItem &item)
9393
ErrorLine line;
9494
line.file = realfile;
9595
line.id = item.id;
96-
line.line = item.lines[0];
96+
line.line = QString::number(item.lines[0]);
9797
line.msg = item.msg;
9898
line.severity = item.severity;
9999
//Create the base item for the error and ensure it has a proper
@@ -108,17 +108,17 @@ void ResultsTree::AddErrorItem(const ErrorItem &item)
108108

109109
//Add user data to that item
110110
QMap<QString, QVariant> data;
111-
data["severity"] = SeverityToShowType(line.severity);
112-
data["message"] = line.msg;
113-
data["file"] = line.file;
114-
data["line"] = line.line;
115-
data["id"] = line.id;
111+
data["severity"] = SeverityToShowType(item.severity);
112+
data["message"] = item.msg;
113+
data["file"] = item.files[0];
114+
data["line"] = QString::number(item.lines[0]);
115+
data["id"] = item.id;
116116
stditem->setData(QVariant(data));
117117

118118
//Add backtrace files as children
119119
for (int i = 1; i < item.files.size() && i < item.lines.size(); i++)
120120
{
121-
line.file = item.files[i];
121+
line.file = StripPath(item.files[i], false);
122122
line.line = item.lines[i];
123123
QStandardItem *child_item;
124124
child_item = AddBacktraceFiles(stditem,
@@ -130,7 +130,7 @@ void ResultsTree::AddErrorItem(const ErrorItem &item)
130130
QMap<QString, QVariant> child_data;
131131
child_data["severity"] = SeverityToShowType(line.severity);
132132
child_data["message"] = line.msg;
133-
child_data["file"] = line.file;
133+
child_data["file"] = item.files[i];
134134
child_data["line"] = line.line;
135135
child_data["id"] = line.id;
136136
child_item->setData(QVariant(child_data));

0 commit comments

Comments
 (0)