forked from qt-creator/qt-creator
Utils: Remove Utils::optional
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:
@@ -8,10 +8,11 @@
|
||||
#include <languageserverprotocol/languagefeatures.h>
|
||||
#include <texteditor/codeassist/completionassistprovider.h>
|
||||
#include <texteditor/codeassist/iassistprocessor.h>
|
||||
#include <utils/optional.h>
|
||||
|
||||
#include <QPointer>
|
||||
|
||||
#include <optional>
|
||||
|
||||
namespace TextEditor { class IAssistProposal; }
|
||||
|
||||
namespace LanguageClient {
|
||||
@@ -32,7 +33,7 @@ public:
|
||||
bool isActivationCharSequence(const QString &sequence) const override;
|
||||
bool isContinuationChar(const QChar &c) const override;
|
||||
|
||||
void setTriggerCharacters(const Utils::optional<QList<QString>> &triggerChars);
|
||||
void setTriggerCharacters(const std::optional<QList<QString>> &triggerChars);
|
||||
|
||||
private:
|
||||
QList<QString> m_triggerChars;
|
||||
@@ -54,7 +55,7 @@ private:
|
||||
const LanguageServerProtocol::SignatureHelpRequest::Response &response);
|
||||
|
||||
QPointer<Client> m_client;
|
||||
Utils::optional<LanguageServerProtocol::MessageId> m_currentRequest;
|
||||
std::optional<LanguageServerProtocol::MessageId> m_currentRequest;
|
||||
int m_pos = -1;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user