Fix #14011 (crash: GUI crash when trying to hide a result from xml file)

Author: danmar

gui/erroritem.cpp

@@ -70,21 +70,22 @@ QString ErrorItem::tool() const
 
 QString ErrorItem::toString() const
 {
-    QString str = errorPath.back().file + " - " + errorId + " - ";
+    const int i = getMainLocIndex();
+    QString ret = errorPath[i].file + ":" + QString::number(errorPath[i].line) + ":" + QString::number(errorPath[i].column) + ":";
+    ret += GuiSeverity::toString(severity);
     if (inconclusive)
-        str += "inconclusive ";
-    str += GuiSeverity::toString(severity) +"\n";
-    str += summary + "\n";
-    str += message + "\n";
-    for (const QErrorPathItem& i : errorPath) {
-        str += "  " + i.file + ": " + QString::number(i.line) + "\n";
+        ret += ",inconclusive";
+    ret += ": " + summary + " [" + errorId + "]";
+    if (errorPath.size() >= 2) {
+        for (const auto& e: errorPath)
+            ret += "\n" + e.file + ":" + QString::number(e.line) + ":" + QString::number(e.column) + ":note: " + e.info;
     }
-    return str;
+    return ret;
 }
 
-bool ErrorItem::sameCID(const ErrorItem &errorItem1, const ErrorItem &errorItem2)
+bool ErrorItem::same(const ErrorItem &errorItem1, const ErrorItem &errorItem2)
 {
-    if (errorItem1.hash || errorItem2.hash)
+    if (errorItem1.hash && errorItem2.hash)
         return errorItem1.hash == errorItem2.hash;
 
     // fallback

gui/erroritem.h

@@ -81,6 +81,18 @@ class ErrorItem {
     QString toString() const;
     QString tool() const;
 
+    int getMainLocIndex() const {
+        return isClangResult() ? 0 : errorPath.size() - 1;
+    }
+
+    QString getFile() const {
+        return errorPath.isEmpty() ? QString() : errorPath[getMainLocIndex()].file;
+    }
+
+    bool isClangResult() const {
+        return errorId.startsWith("clang");
+    }
+
     QString file0;
     QString errorId;
     Severity severity;
@@ -100,33 +112,9 @@ class ErrorItem {
     QString tags;
 
     /**
-     * Compare "CID"
+     * Compare Hash and fields
      */
-    static bool sameCID(const ErrorItem &errorItem1, const ErrorItem &errorItem2);
-};
-
-// NOLINTNEXTLINE(performance-no-int-to-ptr)
-Q_DECLARE_METATYPE(ErrorItem)
-
-/**
- * @brief A class containing error data for one shown error line.
- */
-class ErrorLine {
-public:
-    QString file;
-    int line;
-    QString file0;
-    QString errorId;
-    int cwe;
-    unsigned long long hash;
-    bool inconclusive;
-    Severity severity;
-    QString summary;
-    QString message;
-    QString sinceDate;
-    QString tags;
-    QString remark;
+    static bool same(const ErrorItem &errorItem1, const ErrorItem &errorItem2);
 };
-
 /// @}
 #endif // ERRORITEM_H

gui/resultitem.cpp

@@ -0,0 +1,6 @@
+#include "resultitem.h"
+
+ResultItem::ResultItem(QSharedPointer<ErrorItem> errorItem, Type type, int errorPathIndex)
+  : errorItem(errorItem), mType(type), mErrorPathIndex(errorPathIndex)
+{
+}

gui/resultitem.h

@@ -0,0 +1,31 @@
+#ifndef RESULTITEM_H
+#define RESULTITEM_H
+
+#include <QStandardItem>
+#include "erroritem.h"
+#include <QSharedPointer>
+
+class ResultItem : public QStandardItem
+{
+public:
+    enum class Type {file, message, note};
+
+    ResultItem(QSharedPointer<ErrorItem> errorItem, Type type, int errorPathIndex);
+    QSharedPointer<ErrorItem> errorItem;
+    bool hidden{};
+
+    QErrorPathItem getErrorPathItem() const {
+        if (!errorItem || errorItem->errorPath.isEmpty())
+            return {};
+        return errorItem->errorPath[mErrorPathIndex];
+    }
+
+    Type getType() const {
+        return mType;
+    }
+private:
+    const Type mType;
+    const int mErrorPathIndex;
+};
+
+#endif // RESULTITEM_H