removed leftover bughunting GUI related fields from `ErrorMessage` (#4351)
This commit is contained in:
Oliver Stöneberg
GitHub
parent
bfd9470600
commit
c54b3f4de0
|
|
@ -36,7 +36,6 @@ bool operator==(const QErrorPathItem &i1, const QErrorPathItem &i2)
|
|||
|
||||
ErrorItem::ErrorItem()
|
||||
: severity(Severity::none)
|
||||
, incomplete(false)
|
||||
, inconclusive(false)
|
||||
, cwe(-1)
|
||||
, hash(0)
|
||||
|
|
@ -44,10 +43,8 @@ ErrorItem::ErrorItem()
|
|||
|
||||
ErrorItem::ErrorItem(const ErrorMessage &errmsg)
|
||||
: file0(QString::fromStdString(errmsg.file0))
|
||||
, function(QString::fromStdString(errmsg.function))
|
||||
, errorId(QString::fromStdString(errmsg.id))
|
||||
, severity(errmsg.severity)
|
||||
, incomplete(errmsg.incomplete)
|
||||
, inconclusive(errmsg.certainty == Certainty::inconclusive)
|
||||
, summary(QString::fromStdString(errmsg.shortMessage()))
|
||||
, message(QString::fromStdString(errmsg.verboseMessage()))
|
||||
|
|
|
|||
|
|
@ -81,10 +81,8 @@ public:
|
|||
QString tool() const;
|
||||
|
||||
QString file0;
|
||||
QString function;
|
||||
QString errorId;
|
||||
Severity::SeverityType severity;
|
||||
bool incomplete;
|
||||
bool inconclusive;
|
||||
QString summary;
|
||||
QString message;
|
||||
|
|
@ -114,7 +112,6 @@ public:
|
|||
int line;
|
||||
QString file0;
|
||||
QString errorId;
|
||||
bool incomplete;
|
||||
int cwe;
|
||||
unsigned long long hash;
|
||||
bool inconclusive;
|
||||
|
|
|
|||
|
|
@ -57,10 +57,8 @@ static const char CWE[] = "cwe";
|
|||
static const char ERRORID[] = "id";
|
||||
static const char FILENAME[] = "file";
|
||||
static const char FILE0[] = "file0";
|
||||
static const char FUNCTION[] = "function";
|
||||
static const char HASH[] = "hash";
|
||||
static const char HIDE[] = "hide";
|
||||
static const char INCOMPLETE[] = "incomplete";
|
||||
static const char INCONCLUSIVE[] = "inconclusive";
|
||||
static const char LINE[] = "line";
|
||||
static const char MESSAGE[] = "message";
|
||||
|
|
@ -182,7 +180,6 @@ bool ResultsTree::addErrorItem(const ErrorItem &item)
|
|||
line.file = realfile;
|
||||
line.line = loc.line;
|
||||
line.errorId = item.errorId;
|
||||
line.incomplete = item.incomplete;
|
||||
line.cwe = item.cwe;
|
||||
line.hash = item.hash;
|
||||
line.inconclusive = item.inconclusive;
|
||||
|
|
@ -214,12 +211,10 @@ bool ResultsTree::addErrorItem(const ErrorItem &item)
|
|||
data[LINE] = loc.line;
|
||||
data[COLUMN] = loc.column;
|
||||
data[ERRORID] = item.errorId;
|
||||
data[INCOMPLETE] = item.incomplete;
|
||||
data[CWE] = item.cwe;
|
||||
data[HASH] = item.hash;
|
||||
data[INCONCLUSIVE] = item.inconclusive;
|
||||
data[FILE0] = stripPath(item.file0, true);
|
||||
data[FUNCTION] = item.function;
|
||||
data[SINCEDATE] = item.sinceDate;
|
||||
data[SYMBOLNAMES] = item.symbolNames;
|
||||
data[TAGS] = line.tags;
|
||||
|
|
@ -251,7 +246,6 @@ bool ResultsTree::addErrorItem(const ErrorItem &item)
|
|||
child_data[LINE] = e.line;
|
||||
child_data[COLUMN] = e.column;
|
||||
child_data[ERRORID] = line.errorId;
|
||||
child_data[INCOMPLETE] = line.incomplete;
|
||||
child_data[CWE] = line.cwe;
|
||||
child_data[HASH] = line.hash;
|
||||
child_data[INCONCLUSIVE] = line.inconclusive;
|
||||
|
|
@ -1280,7 +1274,6 @@ void ResultsTree::readErrorItem(const QStandardItem *error, ErrorItem *item) con
|
|||
item->summary = data[SUMMARY].toString();
|
||||
item->message = data[MESSAGE].toString();
|
||||
item->errorId = data[ERRORID].toString();
|
||||
item->incomplete = data[INCOMPLETE].toBool();
|
||||
item->cwe = data[CWE].toInt();
|
||||
item->hash = data[HASH].toULongLong();
|
||||
item->inconclusive = data[INCONCLUSIVE].toBool();
|
||||
|
|
|
|||
|
|
@ -39,14 +39,13 @@
|
|||
#include <tinyxml2.h>
|
||||
|
||||
ErrorMessage::ErrorMessage()
|
||||
: incomplete(false), severity(Severity::none), cwe(0U), certainty(Certainty::normal), hash(0)
|
||||
: severity(Severity::none), cwe(0U), certainty(Certainty::normal), hash(0)
|
||||
{}
|
||||
|
||||
ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1, Severity::SeverityType severity, const std::string &msg, std::string id, Certainty::CertaintyLevel certainty) :
|
||||
callStack(std::move(callStack)), // locations for this error message
|
||||
id(std::move(id)), // set the message id
|
||||
file0(std::move(file1)),
|
||||
incomplete(false),
|
||||
severity(severity), // severity for this error message
|
||||
cwe(0U),
|
||||
certainty(certainty),
|
||||
|
|
@ -62,7 +61,6 @@ ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1,
|
|||
callStack(std::move(callStack)), // locations for this error message
|
||||
id(std::move(id)), // set the message id
|
||||
file0(std::move(file1)),
|
||||
incomplete(false),
|
||||
severity(severity), // severity for this error message
|
||||
cwe(cwe.id),
|
||||
certainty(certainty),
|
||||
|
|
@ -73,7 +71,7 @@ ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1,
|
|||
}
|
||||
|
||||
ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack, const TokenList* list, Severity::SeverityType severity, std::string id, const std::string& msg, Certainty::CertaintyLevel certainty)
|
||||
: id(std::move(id)), incomplete(false), severity(severity), cwe(0U), certainty(certainty), hash(0)
|
||||
: id(std::move(id)), severity(severity), cwe(0U), certainty(certainty), hash(0)
|
||||
{
|
||||
// Format callstack
|
||||
for (std::list<const Token *>::const_iterator it = callstack.begin(); it != callstack.end(); ++it) {
|
||||
|
|
@ -92,7 +90,7 @@ ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack, const Token
|
|||
|
||||
|
||||
ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack, const TokenList* list, Severity::SeverityType severity, std::string id, const std::string& msg, const CWE &cwe, Certainty::CertaintyLevel certainty)
|
||||
: id(std::move(id)), incomplete(false), severity(severity), cwe(cwe.id), certainty(certainty)
|
||||
: id(std::move(id)), severity(severity), cwe(cwe.id), certainty(certainty)
|
||||
{
|
||||
// Format callstack
|
||||
for (const Token *tok: callstack) {
|
||||
|
|
@ -112,7 +110,7 @@ ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack, const Token
|
|||
}
|
||||
|
||||
ErrorMessage::ErrorMessage(const ErrorPath &errorPath, const TokenList *tokenList, Severity::SeverityType severity, const char id[], const std::string &msg, const CWE &cwe, Certainty::CertaintyLevel certainty)
|
||||
: id(id), incomplete(false), severity(severity), cwe(cwe.id), certainty(certainty)
|
||||
: id(id), severity(severity), cwe(cwe.id), certainty(certainty)
|
||||
{
|
||||
// Format callstack
|
||||
for (const ErrorPathItem& e: errorPath) {
|
||||
|
|
@ -139,8 +137,7 @@ ErrorMessage::ErrorMessage(const ErrorPath &errorPath, const TokenList *tokenLis
|
|||
}
|
||||
|
||||
ErrorMessage::ErrorMessage(const tinyxml2::XMLElement * const errmsg)
|
||||
: incomplete(false),
|
||||
severity(Severity::none),
|
||||
: severity(Severity::none),
|
||||
cwe(0U),
|
||||
certainty(Certainty::normal)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -184,10 +184,6 @@ public:
|
|||
|
||||
/** For GUI rechecking; source file (not header) */
|
||||
std::string file0;
|
||||
/** For GUI bug hunting; function name */
|
||||
std::string function;
|
||||
/** For GUI bug hunting; incomplete analysis */
|
||||
bool incomplete;
|
||||
|
||||
Severity::SeverityType severity;
|
||||
CWE cwe;
|
||||
|
|
|
|||
Loading…
Reference in New Issue