summaryrefslogtreecommitdiff
path: root/src/plugins/languageclient/progressmanager.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2022-08-26 10:30:00 +0200
committerEike Ziller <eike.ziller@qt.io>2022-09-01 06:58:04 +0000
commit04e50438eb85c1b2be6d4dcdfd5319cdb55ae576 (patch)
tree4a3e9f078730bb538e2ca2751d189ff14a89901e /src/plugins/languageclient/progressmanager.cpp
parent34a9491a08639f8df0b55d74d51f4dadaa1cc2fd (diff)
downloadqt-creator-04e50438eb85c1b2be6d4dcdfd5319cdb55ae576.tar.gz
Utils: Remove Utils::optional
Since we are now requiring macOS 10.14 we can remove our local implementation of optional and use std::optional for macOS too. Change-Id: I2bd018261b68da64f7f031a812045dd7784697e1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/plugins/languageclient/progressmanager.cpp')
-rw-r--r--src/plugins/languageclient/progressmanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/languageclient/progressmanager.cpp b/src/plugins/languageclient/progressmanager.cpp
index 8bb97afe7e..0f3580dcfb 100644
--- a/src/plugins/languageclient/progressmanager.cpp
+++ b/src/plugins/languageclient/progressmanager.cpp
@@ -77,7 +77,7 @@ void ProgressManager::reportProgress(const ProgressToken &token,
{
const LanguageClientProgress &progress = m_progress.value(token);
if (progress.progressInterface) {
- const Utils::optional<QString> &message = report.message();
+ const std::optional<QString> &message = report.message();
if (message.has_value()) {
progress.progressInterface->setSubtitle(*message);
const bool showSubtitle = !message->isEmpty();
@@ -85,7 +85,7 @@ void ProgressManager::reportProgress(const ProgressToken &token,
}
}
if (progress.futureInterface) {
- if (const Utils::optional<double> &percentage = report.percentage(); percentage.has_value())
+ if (const std::optional<double> &percentage = report.percentage(); percentage.has_value())
progress.futureInterface->setProgressValue(*percentage);
}
}