feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Remove Utils::optional

Browse Source 
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>
This commit is contained in:
Eike Ziller
2022-08-26 10:30:00 +02:00
parent 34a9491a08
commit 04e50438eb
247 changed files with 1053 additions and 3751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/aspects.cpp
View File

@@ -656,8 +656,8 @@ public:
class IntegerAspectPrivate
{
public:
Utils::optional<qint64> m_minimumValue;
Utils::optional<qint64> m_maximumValue;
std::optional<qint64> m_minimumValue;
std::optional<qint64> m_maximumValue;
int m_displayIntegerBase = 10;
qint64 m_displayScaleFactor = 1;
QString m_prefix;
@@ -670,8 +670,8 @@ public:
class DoubleAspectPrivate
{
public:
Utils::optional<double> m_minimumValue;
Utils::optional<double> m_maximumValue;
std::optional<double> m_minimumValue;
std::optional<double> m_maximumValue;
QString m_prefix;
QString m_suffix;
QString m_specialValueText;
@@ -784,7 +784,7 @@ void StringAspect::setValue(const QString &val)
QString processedValue = val;
if (d->m_valueAcceptor) {
const Utils::optional<QString> tmp = d->m_valueAcceptor(value(), val);
const std::optional<QString> tmp = d->m_valueAcceptor(value(), val);
if (!tmp) {
update(); // Make sure the original value is retained in the UI
return;