From a182478d94e05c23d47900411801537143ec3708 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 16 Apr 2019 09:21:36 +0200 Subject: [PATCH] AutoTest: Fix uncheck all filter Change-Id: I0fe6b95b0aebc723f57546e796650cea4d3fd8d4 Reviewed-by: David Schulz --- src/plugins/autotest/testresultmodel.cpp | 31 ++++++++++++++---------- src/plugins/autotest/testresultmodel.h | 2 +- src/plugins/autotest/testresultspane.cpp | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/plugins/autotest/testresultmodel.cpp b/src/plugins/autotest/testresultmodel.cpp index 46561c5d3f1..deb6e1dfae2 100644 --- a/src/plugins/autotest/testresultmodel.cpp +++ b/src/plugins/autotest/testresultmodel.cpp @@ -381,22 +381,27 @@ TestResultFilterModel::TestResultFilterModel(TestResultModel *sourceModel, QObje m_sourceModel(sourceModel) { setSourceModel(sourceModel); - enableAllResultTypes(); + enableAllResultTypes(true); } -void TestResultFilterModel::enableAllResultTypes() +void TestResultFilterModel::enableAllResultTypes(bool enabled) { - m_enabled << Result::Pass << Result::Fail << Result::ExpectedFail - << Result::UnexpectedPass << Result::Skip << Result::MessageDebug - << Result::MessageWarn << Result::MessageInternal << Result::MessageLocation - << Result::MessageFatal << Result::Invalid << Result::BlacklistedPass - << Result::BlacklistedFail << Result::BlacklistedXFail << Result::BlacklistedXPass - << Result::Benchmark << Result::MessageIntermediate - << Result::MessageCurrentTest << Result::MessageTestCaseStart - << Result::MessageTestCaseSuccess << Result::MessageTestCaseSuccessWarn - << Result::MessageTestCaseFail << Result::MessageTestCaseFailWarn - << Result::MessageTestCaseEnd - << Result::MessageInfo << Result::MessageSystem << Result::Application; + if (enabled) { + m_enabled << Result::Pass << Result::Fail << Result::ExpectedFail + << Result::UnexpectedPass << Result::Skip << Result::MessageDebug + << Result::MessageWarn << Result::MessageInternal << Result::MessageLocation + << Result::MessageFatal << Result::Invalid << Result::BlacklistedPass + << Result::BlacklistedFail << Result::BlacklistedXFail << Result::BlacklistedXPass + << Result::Benchmark << Result::MessageIntermediate + << Result::MessageCurrentTest << Result::MessageTestCaseStart + << Result::MessageTestCaseSuccess << Result::MessageTestCaseSuccessWarn + << Result::MessageTestCaseFail << Result::MessageTestCaseFailWarn + << Result::MessageTestCaseEnd + << Result::MessageInfo << Result::MessageSystem << Result::Application; + } else { + m_enabled.clear(); + m_enabled << Result::MessageFatal << Result::MessageSystem; + } invalidateFilter(); } diff --git a/src/plugins/autotest/testresultmodel.h b/src/plugins/autotest/testresultmodel.h index 0366e8e0895..c240b434bb7 100644 --- a/src/plugins/autotest/testresultmodel.h +++ b/src/plugins/autotest/testresultmodel.h @@ -90,7 +90,7 @@ class TestResultFilterModel : public QSortFilterProxyModel public: explicit TestResultFilterModel(TestResultModel *sourceModel, QObject *parent = nullptr); - void enableAllResultTypes(); + void enableAllResultTypes(bool enabled); void toggleTestResultType(Result::Type type); void clearTestResults(); bool hasResults(); diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp index c036ad431a3..24d2ff03830 100644 --- a/src/plugins/autotest/testresultspane.cpp +++ b/src/plugins/autotest/testresultspane.cpp @@ -492,7 +492,7 @@ void TestResultsPane::checkAllFilter(bool checked) if (action->isCheckable()) action->setChecked(checked); } - m_filterModel->enableAllResultTypes(); + m_filterModel->enableAllResultTypes(checked); } void TestResultsPane::filterMenuTriggered(QAction *action)