noisymime
/
cppcheck
mirror of https://github.com/noisymime/cppcheck.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GUI: small refactoring

This commit is contained in:
Daniel Marjamäki 2017-08-02 12:45:57 +02:00
parent 4024420a4d
commit f516c5696e
2 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gui/resultstree.cpp
View File

@ -972,9 +972,8 @@ void ResultsTree::saveResults(Report *report) const
report->writeHeader(); report->writeHeader();
for (int i = 0; i < mModel.rowCount(); i++) { for (int i = 0; i < mModel.rowCount(); i++) {
QStandardItem *item = mModel.item(i, 0); if (mSaveAllErrors || !isRowHidden(i, QModelIndex()))
//if (!isRowHidden(i, QModelIndex())) saveErrors(report, mModel.item(i, 0));
saveErrors(report, item);
} }
report->writeFooter(); report->writeFooter();
@ -997,29 +996,36 @@ void ResultsTree::saveErrors(Report *report, QStandardItem *item) const
continue; continue;
} }
ErrorItem item;
readErrorItem(error, &item);
report->writeError(item);
}
}
void ResultsTree::readErrorItem(const QStandardItem *error, ErrorItem *item) const {
//Get error's user data //Get error's user data
QVariant userdata = error->data(); QVariant userdata = error->data();
//Convert it to QVariantMap //Convert it to QVariantMap
QVariantMap data = userdata.toMap(); QVariantMap data = userdata.toMap();
ErrorItem item; item->severity = ShowTypes::ShowTypeToSeverity(ShowTypes::VariantToShowType(data["severity"]));
item.severity = ShowTypes::ShowTypeToSeverity(ShowTypes::VariantToShowType(data["severity"])); item->summary = data["summary"].toString();
item.summary = data["summary"].toString(); item->message = data["message"].toString();
item.message = data["message"].toString(); item->errorId = data["id"].toString();
item.errorId = data["id"].toString(); item->inconclusive = data["inconclusive"].toBool();
item.inconclusive = data["inconclusive"].toBool(); item->file0 = data["file0"].toString();
item.file0 = data["file0"].toString();
if (error->rowCount() == 0) { if (error->rowCount() == 0) {
QErrorPathItem e; QErrorPathItem e;
e.file = stripPath(data["file"].toString(), true); e.file = stripPath(data["file"].toString(), true);
e.line = data["line"].toUInt(); e.line = data["line"].toUInt();
e.info = data["message"].toString(); e.info = data["message"].toString();
item.errorPath << e; item->errorPath << e;
} }
for (int j = 0; j < error->rowCount(); j++) { for (int j = 0; j < error->rowCount(); j++) {
QStandardItem *child_error = error->child(j, 0); const QStandardItem *child_error = error->child(j, 0);
//Get error's user data //Get error's user data
QVariant child_userdata = child_error->data(); QVariant child_userdata = child_error->data();
//Convert it to QVariantMap //Convert it to QVariantMap
@ -1029,10 +1035,7 @@ void ResultsTree::saveErrors(Report *report, QStandardItem *item) const
e.file = stripPath(child_data["file"].toString(), true); e.file = stripPath(child_data["file"].toString(), true);
e.line = child_data["line"].toUInt(); e.line = child_data["line"].toUInt();
e.info = child_data["message"].toString(); e.info = child_data["message"].toString();
item.errorPath << e; item->errorPath << e;
}
report->writeError(item);
} }
} }

3
gui/resultstree.h
View File

@ -498,6 +498,9 @@ protected:
bool mVisibleErrors; bool mVisibleErrors;
private: private:
/** @brief Convert GUI error item into data error item */
void readErrorItem(const QStandardItem *error, ErrorItem *item) const;
QItemSelectionModel *mSelectionModel; QItemSelectionModel *mSelectionModel;
ThreadHandler *mThread; ThreadHandler *mThread;
}; };