feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Minor cleanup in BranchModel

Browse Source 
* Use member initialization
* Use nullptr
* Remove unneeded local var

Change-Id: Ibca6c3bc5caf9e028166b833ba1ed9fc165e290b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2017-03-26 16:36:07 +03:00
committed by Orgad Shaneh
parent ad8b797860
commit 8478e35384
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,13 +55,12 @@ class BranchNode
{ {
public: public:
BranchNode() : BranchNode() :
parent(0),
name("<ROOT>") name("<ROOT>")
{ } { }
BranchNode(const QString &n, const QString &s = QString(), const QString &t = QString(), BranchNode(const QString &n, const QString &s = QString(), const QString &t = QString(),
const QDateTime &dt = QDateTime()) : const QDateTime &dt = QDateTime()) :
parent(0), name(n), sha(s), tracking(t), dateTime(dt) name(n), sha(s), tracking(t), dateTime(dt)
{ } { }
~BranchNode() ~BranchNode()
@@ -120,7 +119,7 @@ public:
if (children.at(i)->name == name) if (children.at(i)->name == name)
return children.at(i); return children.at(i);
} }
return 0; return nullptr;
} }
QStringList fullName(bool includePrefix = false) const QStringList fullName(bool includePrefix = false) const
@@ -182,7 +181,7 @@ public:
return children.indexOf(node); return children.indexOf(node);
} }
BranchNode *parent; BranchNode *parent = nullptr;
QList<BranchNode *> children; QList<BranchNode *> children;
QString name; QString name;
@@ -349,7 +348,7 @@ void BranchModel::clear()
if (hasTags()) if (hasTags())
m_rootNode->children.takeLast(); m_rootNode->children.takeLast();
m_currentBranch = 0; m_currentBranch = nullptr;
m_obsoleteLocalBranches.clear(); m_obsoleteLocalBranches.clear();
} }
@@ -376,7 +375,7 @@ bool BranchModel::refresh(const QString &workingDirectory, QString *errorMessage
if (m_currentBranch) { if (m_currentBranch) {
if (m_currentBranch->parent == m_rootNode->children.at(LocalBranches)) if (m_currentBranch->parent == m_rootNode->children.at(LocalBranches))
m_currentBranch = 0; m_currentBranch = nullptr;
setCurrentBranch(); setCurrentBranch();
} }
@@ -448,8 +447,7 @@ QString BranchModel::fullName(const QModelIndex &idx, bool includePrefix) const
BranchNode *node = indexToNode(idx); BranchNode *node = indexToNode(idx);
if (!node || !node->isLeaf()) if (!node || !node->isLeaf())
return QString(); return QString();
QStringList path = node->fullName(includePrefix); return node->fullName(includePrefix).join('/');
return path.join('/');
} }
QStringList BranchModel::localBranchNames() const QStringList BranchModel::localBranchNames() const
@@ -623,7 +621,7 @@ QModelIndex BranchModel::addBranch(const QString &name, bool track, const QModel
if (slash != -1) { if (slash != -1) {
const QString nodeName = name.left(slash); const QString nodeName = name.left(slash);
int pos = positionForName(local, nodeName); int pos = positionForName(local, nodeName);
BranchNode *child = (pos == local->count()) ? 0 : local->children.at(pos); BranchNode *child = (pos == local->count()) ? nullptr : local->children.at(pos);
if (!child || child->name != nodeName) { if (!child || child->name != nodeName) {
child = new BranchNode(nodeName); child = new BranchNode(nodeName);
beginInsertRows(nodeToIndex(local, 0), pos, pos); beginInsertRows(nodeToIndex(local, 0), pos, pos);
@@ -697,7 +695,7 @@ void BranchModel::parseOutputLine(const QString &line)
QStringList nameParts = fullName.split('/'); QStringList nameParts = fullName.split('/');
nameParts.removeFirst(); // remove refs... nameParts.removeFirst(); // remove refs...
BranchNode *root = 0; BranchNode *root = nullptr;
if (nameParts.first() == "heads") { if (nameParts.first() == "heads") {
root = m_rootNode->children.at(LocalBranches); root = m_rootNode->children.at(LocalBranches);
} else if (nameParts.first() == "remotes") { } else if (nameParts.first() == "remotes") {
@@ -731,7 +729,7 @@ void BranchModel::parseOutputLine(const QString &line)
BranchNode *BranchModel::indexToNode(const QModelIndex &index) const BranchNode *BranchModel::indexToNode(const QModelIndex &index) const
{ {
if (index.column() > 1) if (index.column() > 1)
return 0; return nullptr;
if (!index.isValid()) if (!index.isValid())
return m_rootNode; return m_rootNode;
return static_cast<BranchNode *>(index.internalPointer()); return static_cast<BranchNode *>(index.internalPointer());