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

8
src/plugins/docker/dockerapi.cpp
View File

@@ -62,7 +62,7 @@ void DockerApi::checkCanConnect(bool async)
if (!lk.owns_lock())
return;
m_dockerDaemonAvailable = nullopt;
m_dockerDaemonAvailable = std::nullopt;
emit dockerDaemonAvailableChanged();
auto future = Utils::runAsync([lk = std::move(lk), this] {
@@ -88,16 +88,16 @@ void DockerApi::recheckDockerDaemon()
s_instance->checkCanConnect();
}
Utils::optional<bool> DockerApi::dockerDaemonAvailable(bool async)
std::optional<bool> DockerApi::dockerDaemonAvailable(bool async)
{
if (!m_dockerDaemonAvailable.has_value())
checkCanConnect(async);
return m_dockerDaemonAvailable;
}
Utils::optional<bool> DockerApi::isDockerDaemonAvailable(bool async)
std::optional<bool> DockerApi::isDockerDaemonAvailable(bool async)
{
QTC_ASSERT(s_instance, return nullopt);
QTC_ASSERT(s_instance, return std::nullopt);
return s_instance->dockerDaemonAvailable(async);
}

9
src/plugins/docker/dockerapi.h
View File

@@ -7,11 +7,12 @@
#include <utils/filepath.h>
#include <utils/guard.h>
#include <utils/optional.h>
#include <QMutex>
#include <QObject>
#include <optional>
namespace Docker::Internal {
class DockerApi : public QObject
@@ -31,13 +32,13 @@ signals:
void dockerDaemonAvailableChanged();
public:
Utils::optional<bool> dockerDaemonAvailable(bool async = true);
static Utils::optional<bool> isDockerDaemonAvailable(bool async = true);
std::optional<bool> dockerDaemonAvailable(bool async = true);
static std::optional<bool> isDockerDaemonAvailable(bool async = true);
private:
Utils::FilePath dockerClient();
Utils::optional<bool> m_dockerDaemonAvailable;
std::optional<bool> m_dockerDaemonAvailable;
QMutex m_daemonCheckGuard;
DockerSettings *m_settings;
};

2
src/plugins/docker/dockerdevicewidget.cpp
View File

@@ -194,7 +194,7 @@ DockerDeviceWidget::DockerDeviceWidget(const IDevice::Ptr &device)
void DockerDeviceWidget::updateDaemonStateTexts()
{
Utils::optional<bool> daemonState = DockerApi::instance()->dockerDaemonAvailable();
std::optional<bool> daemonState = DockerApi::instance()->dockerDaemonAvailable();
if (!daemonState.has_value()) {
m_daemonReset->setIcon(Icons::INFO.icon());
m_daemonState->setText(Tr::tr("Daemon state not evaluated."));

2
src/plugins/docker/dockerplugin.h
View File

@@ -7,7 +7,7 @@
#include <extensionsystem/iplugin.h>
#include <utils/optional.h>
#include <optional>
namespace Docker::Internal {