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

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;
};