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

13
src/plugins/coreplugin/vcsmanager.cpp
View File

@@ -15,7 +15,6 @@
#include <utils/algorithm.h>
#include <utils/fileutils.h>
#include <utils/infobar.h>
#include <utils/optional.h>
#include <utils/qtcassert.h>
#include <vcsbase/vcsbaseconstants.h>
@@ -27,6 +26,8 @@
#include <QFileInfo>
#include <QMessageBox>
#include <optional>
using namespace Utils;
namespace Core {
@@ -57,14 +58,14 @@ public:
QString topLevel;
};
Utils::optional<VcsInfo> findInCache(const QString &dir) const
std::optional<VcsInfo> findInCache(const QString &dir) const
{
QTC_ASSERT(QDir(dir).isAbsolute(), return Utils::nullopt);
QTC_ASSERT(!dir.endsWith(QLatin1Char('/')), return Utils::nullopt);
QTC_ASSERT(QDir::fromNativeSeparators(dir) == dir, return Utils::nullopt);
QTC_ASSERT(QDir(dir).isAbsolute(), return std::nullopt);
QTC_ASSERT(!dir.endsWith(QLatin1Char('/')), return std::nullopt);
QTC_ASSERT(QDir::fromNativeSeparators(dir) == dir, return std::nullopt);
const auto it = m_cachedMatches.constFind(dir);
return it == m_cachedMatches.constEnd() ? Utils::nullopt : Utils::make_optional(it.value());
return it == m_cachedMatches.constEnd() ? std::nullopt : std::make_optional(it.value());
}
void clearCache()