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

4
src/plugins/cmakeprojectmanager/cmaketool.cpp
View File

@@ -49,7 +49,7 @@ namespace Internal {
const char READER_TYPE_FILEAPI[] = "fileapi";
static Utils::optional<CMakeTool::ReaderType> readerTypeFromString(const QString &input)
static std::optional<CMakeTool::ReaderType> readerTypeFromString(const QString &input)
{
// Do not try to be clever here, just use whatever is in the string!
if (input == READER_TYPE_FILEAPI)
@@ -331,7 +331,7 @@ CMakeTool::PathMapper CMakeTool::pathMapper() const
return [](const FilePath &fn) { return fn; };
}
Utils::optional<CMakeTool::ReaderType> CMakeTool::readerType() const
std::optional<CMakeTool::ReaderType> CMakeTool::readerType() const
{
if (m_readerType)
return m_readerType; // Allow overriding the auto-detected value via .user files