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

Git: Rename branchName -> fullName

Browse Source 
The model can contain tags

Change-Id: I70a75534848232476447125801a5ca7e963bbdcc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-29 22:17:58 +03:00
committed by Orgad Shaneh
parent 2af4c05b8c
commit b2a09f7b45
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,7 +419,7 @@ QModelIndex BranchModel::currentBranch() const
return nodeToIndex(m_currentBranch);
}
QString BranchModel::branchName(const QModelIndex &idx) const
QString BranchModel::fullName(const QModelIndex &idx) const
{
if (!idx.isValid())
return QString();
@@ -473,7 +473,7 @@ bool BranchModel::isTag(const QModelIndex &idx) const
void BranchModel::removeBranch(const QModelIndex &idx)
{
QString branch = branchName(idx);
QString branch = fullName(idx);
if (branch.isEmpty())
return;
@@ -491,7 +491,7 @@ void BranchModel::removeBranch(const QModelIndex &idx)
void BranchModel::removeTag(const QModelIndex &idx)
{
QString tag = branchName(idx);
QString tag = fullName(idx);
if (tag.isEmpty())
return;
@@ -509,7 +509,7 @@ void BranchModel::removeTag(const QModelIndex &idx)
void BranchModel::checkoutBranch(const QModelIndex &idx)
{
QString branch = branchName(idx);
QString branch = fullName(idx);
if (branch.isEmpty())
return;
@@ -535,7 +535,7 @@ void BranchModel::checkoutBranch(const QModelIndex &idx)
bool BranchModel::branchIsMerged(const QModelIndex &idx)
{
QString branch = branchName(idx);
QString branch = fullName(idx);
if (branch.isEmpty())
return false;
@@ -573,7 +573,7 @@ QModelIndex BranchModel::addBranch(const QString &name, bool track, const QModel
if (!m_rootNode || !m_rootNode->count())
return QModelIndex();
const QString trackedBranch = branchName(startPoint);
const QString trackedBranch = fullName(startPoint);
QString output;
QString errorMessage;