Skip to content

Commit faa483b

Browse files
kimmovkimmov
committed
GUI: Use integer list instead of variant list for line numbers.
1 parent 2f0202d commit faa483b

8 files changed

Lines changed: 12 additions & 16 deletions

File tree

‎gui/erroritem.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class ErrorItem
3333
public:
3434
QString file;
3535
QStringList files;
36-
QStringList lines;
36+
QList<unsigned int> lines;
3737
QString id;
3838
QString severity;
3939
QString msg;

‎gui/resultstree.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ void ResultsTree::SaveErrors(Report *report, QStandardItem *item)
617617
item.msg = data["message"].toString();
618618
item.id = data["id"].toString();
619619
QString file = StripPath(data["file"].toString(), true);
620-
QString line = data["line"].toString();
620+
unsigned int line = data["line"].toUInt();
621621

622622
item.files << file;
623623
item.lines << line;
@@ -631,7 +631,7 @@ void ResultsTree::SaveErrors(Report *report, QStandardItem *item)
631631
QVariantMap child_data = child_userdata.toMap();
632632

633633
file = StripPath(child_data["file"].toString(), true);
634-
line = child_data["line"].toString();
634+
line = child_data["line"].toUInt();
635635

636636
item.files << file;
637637
item.lines << line;

‎gui/resultsview.cpp‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,23 +70,18 @@ void ResultsView::Error(const QString &file,
7070
const QString &severity,
7171
const QString &message,
7272
const QStringList &files,
73-
const QVariantList &lines,
73+
const QList<unsigned int> &lines,
7474
const QString &id)
7575
{
7676
mErrorsFound = true;
7777
ErrorItem item;
7878
item.file = file;
7979
item.files = files;
8080
item.id = id;
81+
item.lines = lines;
8182
item.msg = message;
8283
item.severity = severity;
8384

84-
QVariant line;
85-
foreach(line, lines)
86-
{
87-
item.lines.append(line.toString());
88-
}
89-
9085
mUI.mTree->AddErrorItem(item);
9186
emit GotResults();
9287
}

‎gui/resultsview.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public slots:
169169
const QString &severity,
170170
const QString &message,
171171
const QStringList &files,
172-
const QVariantList &lines,
172+
const QList<unsigned int> &lines,
173173
const QString &id);
174174

175175
/**

‎gui/threadhandler.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,13 @@ void ThreadHandler::Initialize(ResultsView *view)
145145
const QString &,
146146
const QString &,
147147
const QStringList &,
148-
const QVariantList &,
148+
const QList<unsigned int> &,
149149
const QString &)),
150150
view, SLOT(Error(const QString &,
151151
const QString &,
152152
const QString &,
153153
const QStringList &,
154-
const QVariantList &,
154+
const QList<unsigned int> &,
155155
const QString &)));
156156

157157
}

‎gui/threadresult.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void ThreadResult::reportErr(const ErrorLogger::ErrorMessage &msg)
4747
{
4848
QMutexLocker locker(&mutex);
4949

50-
QVariantList lines;
50+
QList<unsigned int> lines;
5151
QStringList files;
5252

5353
for (std::list<ErrorLogger::ErrorMessage::FileLocation>::const_iterator tok = msg._callStack.begin();

‎gui/threadresult.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public slots:
9898
const QString &severity,
9999
const QString &message,
100100
const QStringList &files,
101-
const QVariantList &lines,
101+
const QList<unsigned int> &lines,
102102
const QString &id);
103103

104104
protected:

‎gui/xmlreport.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ void XmlReport::WriteError(const ErrorItem &error)
8888

8989
mXmlWriter->writeStartElement(ErrorElementName);
9090
mXmlWriter->writeAttribute(FilenameAttribute, error.files[error.files.size() - 1]);
91-
mXmlWriter->writeAttribute(LineAttribute, error.lines[error.lines.size() - 1]);
91+
const QString line = QString::number(error.lines[error.lines.size() - 1]);
92+
mXmlWriter->writeAttribute(LineAttribute, line);
9293
mXmlWriter->writeAttribute(IdAttribute, error.id);
9394
mXmlWriter->writeAttribute(SeverityAttribute, error.severity);
9495
mXmlWriter->writeAttribute(MsgAttribute, error.msg);

0 commit comments

Comments
 (0)