aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/autotest
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/autotest')
-rw-r--r--src/plugins/autotest/itemdatacache.h10
-rw-r--r--src/plugins/autotest/qtest/qttestparser.cpp6
-rw-r--r--src/plugins/autotest/qtest/qttestparser.h4
-rw-r--r--src/plugins/autotest/testnavigationwidget.cpp3
-rw-r--r--src/plugins/autotest/testresultmodel.cpp4
-rw-r--r--src/plugins/autotest/testresultmodel.h9
-rw-r--r--src/plugins/autotest/testtreemodel.cpp12
7 files changed, 25 insertions, 23 deletions
diff --git a/src/plugins/autotest/itemdatacache.h b/src/plugins/autotest/itemdatacache.h
index 47ee2fb617..f01a2e9316 100644
--- a/src/plugins/autotest/itemdatacache.h
+++ b/src/plugins/autotest/itemdatacache.h
@@ -6,11 +6,11 @@
#include "itestframework.h"
#include "testtreeitem.h"
-#include <utils/optional.h>
-
#include <QRegularExpression>
#include <QVariantHash>
+#include <optional>
+
namespace Autotest {
namespace Internal {
@@ -35,13 +35,13 @@ public:
}
}
- Utils::optional<T> get(ITestTreeItem *item)
+ std::optional<T> get(ITestTreeItem *item)
{
auto entry = m_cache.find(item->cacheName());
if (entry == m_cache.end())
- return Utils::nullopt;
+ return std::nullopt;
entry->generation = 0;
- return Utils::make_optional(entry->value);
+ return std::make_optional(entry->value);
};
void clear() { m_cache.clear(); }
diff --git a/src/plugins/autotest/qtest/qttestparser.cpp b/src/plugins/autotest/qtest/qttestparser.cpp
index 9d09960b6a..492e584359 100644
--- a/src/plugins/autotest/qtest/qttestparser.cpp
+++ b/src/plugins/autotest/qtest/qttestparser.cpp
@@ -314,7 +314,7 @@ bool QtTestParser::processDocument(QFutureInterface<TestParseResultPtr> &futureI
for (const TestCase &testCase : testCaseList) {
if (!testCase.name.isEmpty()) {
TestCaseData data;
- Utils::optional<bool> earlyReturn = fillTestCaseData(testCase.name, doc, data);
+ std::optional<bool> earlyReturn = fillTestCaseData(testCase.name, doc, data);
if (earlyReturn.has_value() || !data.valid)
continue;
@@ -333,7 +333,7 @@ bool QtTestParser::processDocument(QFutureInterface<TestParseResultPtr> &futureI
return reported;
}
-Utils::optional<bool> QtTestParser::fillTestCaseData(
+std::optional<bool> QtTestParser::fillTestCaseData(
const QString &testCaseName, const CPlusPlus::Document::Ptr &doc,
TestCaseData &data) const
{
@@ -366,7 +366,7 @@ Utils::optional<bool> QtTestParser::fillTestCaseData(
data.fileName = Utils::FilePath::fromString(declaringDoc->fileName());
data.valid = true;
- return Utils::optional<bool>();
+ return std::optional<bool>();
}
QtTestParseResult *QtTestParser::createParseResult(
diff --git a/src/plugins/autotest/qtest/qttestparser.h b/src/plugins/autotest/qtest/qttestparser.h
index ba6f8856a8..c64e2e159f 100644
--- a/src/plugins/autotest/qtest/qttestparser.h
+++ b/src/plugins/autotest/qtest/qttestparser.h
@@ -8,7 +8,7 @@
#include "qttest_utils.h"
#include "qttesttreeitem.h"
-#include <utils/optional.h>
+#include <optional>
namespace CppEditor { class CppModelManager; }
@@ -53,7 +53,7 @@ private:
bool valid = false;
};
- Utils::optional<bool> fillTestCaseData(const QString &testCaseName,
+ std::optional<bool> fillTestCaseData(const QString &testCaseName,
const CPlusPlus::Document::Ptr &doc,
TestCaseData &data) const;
QtTestParseResult *createParseResult(const QString &testCaseName, const TestCaseData &data,
diff --git a/src/plugins/autotest/testnavigationwidget.cpp b/src/plugins/autotest/testnavigationwidget.cpp
index 48720a06c8..c6cb1ae4ee 100644
--- a/src/plugins/autotest/testnavigationwidget.cpp
+++ b/src/plugins/autotest/testnavigationwidget.cpp
@@ -318,7 +318,8 @@ void TestNavigationWidget::reapplyCachedExpandedState()
using namespace Utils;
for (TreeItem *rootNode : *m_model->rootItem()) {
rootNode->forAllChildren([this](TreeItem *child) {
- optional<bool> cached = m_expandedStateCache.get(static_cast<ITestTreeItem *>(child));
+ std::optional<bool> cached = m_expandedStateCache.get(
+ static_cast<ITestTreeItem *>(child));
if (cached.has_value()) {
QModelIndex index = child->index();
if (m_view->isExpanded(index) != cached.value())
diff --git a/src/plugins/autotest/testresultmodel.cpp b/src/plugins/autotest/testresultmodel.cpp
index 66b69bc2c0..b76a5b3f03 100644
--- a/src/plugins/autotest/testresultmodel.cpp
+++ b/src/plugins/autotest/testresultmodel.cpp
@@ -58,7 +58,7 @@ static QIcon testResultIcon(ResultType result) {
return icons[int(result)];
}
-static QIcon testSummaryIcon(const Utils::optional<TestResultItem::SummaryEvaluation> &summary)
+static QIcon testSummaryIcon(const std::optional<TestResultItem::SummaryEvaluation> &summary)
{
if (!summary)
return QIcon();
@@ -114,7 +114,7 @@ static bool isSignificant(ResultType type)
}
void TestResultItem::updateResult(bool &changed, ResultType addedChildType,
- const Utils::optional<SummaryEvaluation> &summary)
+ const std::optional<SummaryEvaluation> &summary)
{
changed = false;
if (m_testResult->result() != ResultType::TestStart)
diff --git a/src/plugins/autotest/testresultmodel.h b/src/plugins/autotest/testresultmodel.h
index 7ea51a1a26..3749abe101 100644
--- a/src/plugins/autotest/testresultmodel.h
+++ b/src/plugins/autotest/testresultmodel.h
@@ -10,9 +10,10 @@
#include <QSet>
#include <QSortFilterProxyModel>
-#include <utils/optional.h>
#include <utils/treemodel.h>
+#include <optional>
+
namespace Autotest {
namespace Internal {
@@ -36,16 +37,16 @@ public:
};
void updateResult(bool &changed, ResultType addedChildType,
- const Utils::optional<SummaryEvaluation> &summary);
+ const std::optional<SummaryEvaluation> &summary);
TestResultItem *intermediateFor(const TestResultItem *item) const;
TestResultItem *createAndAddIntermediateFor(const TestResultItem *child);
QString resultString() const;
- Utils::optional<SummaryEvaluation> summaryResult() const { return m_summaryResult; }
+ std::optional<SummaryEvaluation> summaryResult() const { return m_summaryResult; }
private:
TestResultPtr m_testResult;
- Utils::optional<SummaryEvaluation> m_summaryResult;
+ std::optional<SummaryEvaluation> m_summaryResult;
};
class TestResultModel : public Utils::TreeModel<TestResultItem>
diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp
index c1db6af365..d50d801858 100644
--- a/src/plugins/autotest/testtreemodel.cpp
+++ b/src/plugins/autotest/testtreemodel.cpp
@@ -259,7 +259,7 @@ void TestTreeModel::onBuildSystemTestsUpdated()
for (const auto &tci : bs->testcasesInfo()) {
ITestTreeItem *item = testTool->createItemFromTestCaseInfo(tci);
QTC_ASSERT(item, continue);
- if (Utils::optional<Qt::CheckState> cached = m_checkStateCache->get(item))
+ if (std::optional<Qt::CheckState> cached = m_checkStateCache->get(item))
item->setData(0, cached.value(), Qt::CheckStateRole);
m_checkStateCache->insert(item, item->checked());
rootNode->appendChild(item);
@@ -393,7 +393,7 @@ void TestTreeModel::synchronizeTestTools()
for (const auto &tci : bs->testcasesInfo()) {
ITestTreeItem *item = testTool->createItemFromTestCaseInfo(tci);
QTC_ASSERT(item, continue);
- if (Utils::optional<Qt::CheckState> cached = m_checkStateCache->get(item))
+ if (std::optional<Qt::CheckState> cached = m_checkStateCache->get(item))
item->setData(0, cached.value(), Qt::CheckStateRole);
m_checkStateCache->insert(item, item->checked());
rootNode->appendChild(item);
@@ -592,13 +592,13 @@ void TestTreeModel::insertItemInParent(TestTreeItem *item, TestTreeItem *root, b
delete item;
} else {
// restore former check state if available
- Utils::optional<Qt::CheckState> cached = m_checkStateCache->get(item);
+ std::optional<Qt::CheckState> cached = m_checkStateCache->get(item);
if (cached.has_value())
item->setData(0, cached.value(), Qt::CheckStateRole);
else
applyParentCheckState(parentNode, item);
// ..and the failed state if available
- Utils::optional<bool> failed = m_failedStateCache.get(item);
+ std::optional<bool> failed = m_failedStateCache.get(item);
if (failed.has_value())
item->setData(0, *failed, FailedRole);
parentNode->appendChild(item);
@@ -717,10 +717,10 @@ void TestTreeModel::handleParseResult(const TestParseResult *result, TestTreeIte
newItem->forAllChildItems([this](TestTreeItem *childItem) {
if (!m_checkStateCache) // parse results may arrive after session switch / project close
return;
- Utils::optional<Qt::CheckState> cached = m_checkStateCache->get(childItem);
+ std::optional<Qt::CheckState> cached = m_checkStateCache->get(childItem);
if (cached.has_value())
childItem->setData(0, cached.value(), Qt::CheckStateRole);
- Utils::optional<bool> failed = m_failedStateCache.get(childItem);
+ std::optional<bool> failed = m_failedStateCache.get(childItem);
if (failed.has_value())
childItem->setData(0, *failed, FailedRole);
});
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 00:06:50 +0000