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

8
src/plugins/languageclient/languageclientquickfix.cpp
View File

@@ -27,9 +27,9 @@ void CodeActionQuickFixOperation::perform()
{
if (!m_client)
return;
if (Utils::optional<WorkspaceEdit> edit = m_action.edit())
if (std::optional<WorkspaceEdit> edit = m_action.edit())
applyWorkspaceEdit(m_client, *edit);
else if (Utils::optional<Command> command = m_action.command())
else if (std::optional<Command> command = m_action.command())
m_client->executeCommand(*command);
}
@@ -91,11 +91,11 @@ void LanguageClientQuickFixAssistProcessor::cancel()
void LanguageClientQuickFixAssistProcessor::handleCodeActionResponse(const CodeActionRequest::Response &response)
{
m_currentRequest.reset();
if (const Utils::optional<CodeActionRequest::Response::Error> &error = response.error())
if (const std::optional<CodeActionRequest::Response::Error> &error = response.error())
m_client->log(*error);
m_client->removeAssistProcessor(this);
GenericProposal *proposal = nullptr;
if (const Utils::optional<CodeActionResult> &result = response.result())
if (const std::optional<CodeActionResult> &result = response.result())
proposal = handleCodeActionResult(*result);
setAsyncProposalAvailable(proposal);
}