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

6
src/plugins/git/branchmodel.cpp
View File

@@ -726,17 +726,17 @@ void BranchModel::setOldBranchesIncluded(bool value)
d->oldBranchesIncluded = value;
}
Utils::optional<QString> BranchModel::remoteName(const QModelIndex &idx) const
std::optional<QString> BranchModel::remoteName(const QModelIndex &idx) const
{
const BranchNode *remotesNode = d->rootNode->children.at(RemoteBranches);
const BranchNode *node = indexToNode(idx);
if (!node)
return Utils::nullopt;
return std::nullopt;
if (node == remotesNode)
return QString();
if (node->parent == remotesNode)
return node->name;
return Utils::nullopt;
return std::nullopt;
}
void BranchModel::refreshCurrentBranch()

5
src/plugins/git/branchmodel.h
View File

@@ -4,11 +4,12 @@
#pragma once
#include <utils/filepath.h>
#include <utils/optional.h>
#include <QAbstractListModel>
#include <QVariant>
#include <optional>
namespace VcsBase { class VcsCommand; }
namespace Git {
@@ -63,7 +64,7 @@ public:
QModelIndex addBranch(const QString &name, bool track, const QModelIndex &trackedBranch);
void setRemoteTracking(const QModelIndex &trackingIndex);
void setOldBranchesIncluded(bool value);
Utils::optional<QString> remoteName(const QModelIndex &idx) const;
std::optional<QString> remoteName(const QModelIndex &idx) const;
void refreshCurrentBranch();
private:

2
src/plugins/git/branchview.cpp
View File

@@ -228,7 +228,7 @@ void BranchView::slotCustomContextMenu(const QPoint &point)
QMenu contextMenu;
contextMenu.addAction(tr("&Add..."), this, &BranchView::add);
const Utils::optional<QString> remote = m_model->remoteName(index);
const std::optional<QString> remote = m_model->remoteName(index);
if (remote.has_value()) {
contextMenu.addAction(tr("&Fetch"), this, [this, &remote]() {
GitClient::instance()->fetch(m_repository, *remote);