walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 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

75
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,45 +996,49 @@ void ResultsTree::saveErrors(Report *report, QStandardItem *item) const
continue; continue;
} }
//Get error's user data
QVariant userdata = error->data();
//Convert it to QVariantMap
QVariantMap data = userdata.toMap();
ErrorItem item; ErrorItem item;
item.severity = ShowTypes::ShowTypeToSeverity(ShowTypes::VariantToShowType(data["severity"])); readErrorItem(error, &item);
item.summary = data["summary"].toString();
item.message = data["message"].toString();
item.errorId = data["id"].toString();
item.inconclusive = data["inconclusive"].toBool();
item.file0 = data["file0"].toString();
if (error->rowCount() == 0) {
QErrorPathItem e;
e.file = stripPath(data["file"].toString(), true);
e.line = data["line"].toUInt();
e.info = data["message"].toString();
item.errorPath << e;
}
for (int j = 0; j < error->rowCount(); j++) {
QStandardItem *child_error = error->child(j, 0);
//Get error's user data
QVariant child_userdata = child_error->data();
//Convert it to QVariantMap
QVariantMap child_data = child_userdata.toMap();
QErrorPathItem e;
e.file = stripPath(child_data["file"].toString(), true);
e.line = child_data["line"].toUInt();
e.info = child_data["message"].toString();
item.errorPath << e;
}
report->writeError(item); report->writeError(item);
} }
} }
void ResultsTree::readErrorItem(const QStandardItem *error, ErrorItem *item) const {
//Get error's user data
QVariant userdata = error->data();
//Convert it to QVariantMap
QVariantMap data = userdata.toMap();
item->severity = ShowTypes::ShowTypeToSeverity(ShowTypes::VariantToShowType(data["severity"]));
item->summary = data["summary"].toString();
item->message = data["message"].toString();
item->errorId = data["id"].toString();
item->inconclusive = data["inconclusive"].toBool();
item->file0 = data["file0"].toString();
if (error->rowCount() == 0) {
QErrorPathItem e;
e.file = stripPath(data["file"].toString(), true);
e.line = data["line"].toUInt();
e.info = data["message"].toString();
item->errorPath << e;
}
for (int j = 0; j < error->rowCount(); j++) {
const QStandardItem *child_error = error->child(j, 0);
//Get error's user data
QVariant child_userdata = child_error->data();
//Convert it to QVariantMap
QVariantMap child_data = child_userdata.toMap();
QErrorPathItem e;
e.file = stripPath(child_data["file"].toString(), true);
e.line = child_data["line"].toUInt();
e.info = child_data["message"].toString();
item->errorPath << e;
}
}
void ResultsTree::updateSettings(bool showFullPath, void ResultsTree::updateSettings(bool showFullPath,
bool saveFullPath, bool saveFullPath,
bool saveAllErrors, bool saveAllErrors,

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;
}; };