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

7
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.cpp
View File

@@ -8,13 +8,14 @@
#include <utils/algorithm.h>
#include <utils/hostosinfo.h>
#include <utils/optional.h>
#include <utils/stringutils.h>
#include <QDir>
#include <QRegularExpression>
#include <QSet>
#include <optional>
using namespace ProjectExplorer;
using namespace Utils;
@@ -100,8 +101,8 @@ void filteredFlags(const QString &fileName,
bool skipNext = Utils::HostOsInfo::isWindowsHost()
? (!flags.front().startsWith('/') && !flags.front().startsWith('-'))
: (!flags.front().startsWith('-'));
Utils::optional<HeaderPathType> includePathType;
Utils::optional<MacroType> macroType;
std::optional<HeaderPathType> includePathType;
std::optional<MacroType> macroType;
bool fileKindIsNext = false;
QStringList filtered;