From faa483b8d0b36a542a6b1b90508f1d3f808f3a23 Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Sat, 10 Jul 2010 20:54:33 +0300
Subject: [PATCH] GUI: Use integer list instead of variant list for line
 numbers.

---
 gui/erroritem.h       | 2 +-
 gui/resultstree.cpp   | 4 ++--
 gui/resultsview.cpp   | 9 ++-------
 gui/resultsview.h     | 2 +-
 gui/threadhandler.cpp | 4 ++--
 gui/threadresult.cpp  | 2 +-
 gui/threadresult.h    | 2 +-
 gui/xmlreport.cpp     | 3 ++-
 8 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/gui/erroritem.h b/gui/erroritem.h
index a5eb88abb..ed4215aad 100644
--- a/gui/erroritem.h
+++ b/gui/erroritem.h
@@ -33,7 +33,7 @@ class ErrorItem
 public:
     QString file;
     QStringList files;
-    QStringList lines;
+    QList<unsigned int> lines;
     QString id;
     QString severity;
     QString msg;
diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
index 096c6e94c..d63fe7ea8 100644
--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@@ -617,7 +617,7 @@ void ResultsTree::SaveErrors(Report *report, QStandardItem *item)
         item.msg = data["message"].toString();
         item.id = data["id"].toString();
         QString file = StripPath(data["file"].toString(), true);
-        QString line = data["line"].toString();
+        unsigned int line = data["line"].toUInt();
 
         item.files << file;
         item.lines << line;
@@ -631,7 +631,7 @@ void ResultsTree::SaveErrors(Report *report, QStandardItem *item)
             QVariantMap child_data = child_userdata.toMap();
 
             file = StripPath(child_data["file"].toString(), true);
-            line = child_data["line"].toString();
+            line = child_data["line"].toUInt();
 
             item.files << file;
             item.lines << line;
diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp
index e13f8b6ba..aeab7e85f 100644
--- a/gui/resultsview.cpp
+++ b/gui/resultsview.cpp
@@ -70,7 +70,7 @@ void ResultsView::Error(const QString &file,
                         const QString &severity,
                         const QString &message,
                         const QStringList &files,
-                        const QVariantList &lines,
+                        const QList<unsigned int> &lines,
                         const QString &id)
 {
     mErrorsFound = true;
@@ -78,15 +78,10 @@ void ResultsView::Error(const QString &file,
     item.file = file;
     item.files = files;
     item.id = id;
+    item.lines = lines;
     item.msg = message;
     item.severity = severity;
 
-    QVariant line;
-    foreach(line, lines)
-    {
-        item.lines.append(line.toString());
-    }
-
     mUI.mTree->AddErrorItem(item);
     emit GotResults();
 }
diff --git a/gui/resultsview.h b/gui/resultsview.h
index 6b9161581..a940fdebb 100644
--- a/gui/resultsview.h
+++ b/gui/resultsview.h
@@ -169,7 +169,7 @@ public slots:
                const QString &severity,
                const QString &message,
                const QStringList &files,
-               const QVariantList &lines,
+               const QList<unsigned int> &lines,
                const QString &id);
 
     /**
diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
index 2dad5df0e..feae8b503 100644
--- a/gui/threadhandler.cpp
+++ b/gui/threadhandler.cpp
@@ -145,13 +145,13 @@ void ThreadHandler::Initialize(ResultsView *view)
                                     const QString &,
                                     const QString &,
                                     const QStringList &,
-                                    const QVariantList &,
+                                    const QList<unsigned int> &,
                                     const QString &)),
             view, SLOT(Error(const QString &,
                              const QString &,
                              const QString &,
                              const QStringList &,
-                             const QVariantList &,
+                             const QList<unsigned int> &,
                              const QString &)));
 
 }
diff --git a/gui/threadresult.cpp b/gui/threadresult.cpp
index 56ca9ee16..165edb528 100644
--- a/gui/threadresult.cpp
+++ b/gui/threadresult.cpp
@@ -47,7 +47,7 @@ void ThreadResult::reportErr(const ErrorLogger::ErrorMessage &msg)
 {
     QMutexLocker locker(&mutex);
 
-    QVariantList lines;
+    QList<unsigned int> lines;
     QStringList files;
 
     for (std::list<ErrorLogger::ErrorMessage::FileLocation>::const_iterator tok = msg._callStack.begin();
diff --git a/gui/threadresult.h b/gui/threadresult.h
index c1b1b9a66..494d5db16 100644
--- a/gui/threadresult.h
+++ b/gui/threadresult.h
@@ -98,7 +98,7 @@ signals:
                const QString &severity,
                const QString &message,
                const QStringList &files,
-               const QVariantList &lines,
+               const QList<unsigned int> &lines,
                const QString &id);
 
 protected:
diff --git a/gui/xmlreport.cpp b/gui/xmlreport.cpp
index d8b5d2212..56a58fbd0 100644
--- a/gui/xmlreport.cpp
+++ b/gui/xmlreport.cpp
@@ -88,7 +88,8 @@ void XmlReport::WriteError(const ErrorItem &error)
 
     mXmlWriter->writeStartElement(ErrorElementName);
     mXmlWriter->writeAttribute(FilenameAttribute, error.files[error.files.size() - 1]);
-    mXmlWriter->writeAttribute(LineAttribute, error.lines[error.lines.size() - 1]);
+    const QString line = QString::number(error.lines[error.lines.size() - 1]);
+    mXmlWriter->writeAttribute(LineAttribute, line);
     mXmlWriter->writeAttribute(IdAttribute, error.id);
     mXmlWriter->writeAttribute(SeverityAttribute, error.severity);
     mXmlWriter->writeAttribute(MsgAttribute, error.msg);