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

5
src/libs/utils/fancylineedit.cpp
View File

@@ -7,7 +7,6 @@
#include "execmenu.h"
#include "historycompleter.h"
#include "hostosinfo.h"
#include "optional.h"
#include "qtcassert.h"
#include "utilsicons.h"
@@ -22,6 +21,8 @@
#include <QValidator>
#include <QWindow>
#include <optional>
/*!
\class Utils::FancyLineEdit
@@ -202,7 +203,7 @@ FancyLineEdit::~FancyLineEdit()
void FancyLineEdit::setTextKeepingActiveCursor(const QString &text)
{
optional<int> cursor = hasFocus() ? make_optional(cursorPosition()) : nullopt;
std::optional<int> cursor = hasFocus() ? std::make_optional(cursorPosition()) : std::nullopt;
setText(text);
if (cursor)
setCursorPosition(*cursor);