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

Git: Fix object leaks

Browse Source 
Change-Id: I0efb368782ffb66cf6b8d39650fe7840c5ef2501
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-05-08 23:16:23 +03:00
committed by Orgad Shaneh
parent f7ac7fb241
commit c60ab1ca3c
10 changed files with 60 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,7 +139,7 @@ void BranchDialog::add()
++i;
}
BranchAddDialog branchAddDialog;
BranchAddDialog branchAddDialog(true, this);
branchAddDialog.setBranchName(suggestedName);
branchAddDialog.setTrackedBranchName(trackedBranch, !isLocal);
@@ -249,22 +249,22 @@ void BranchDialog::rename()
QString oldBranchName = m_model->branchName(selected);
QStringList localNames = m_model->localBranchNames();
QPointer<BranchAddDialog> branchAddDialog = new BranchAddDialog(this, false);
branchAddDialog->setBranchName(oldBranchName);
branchAddDialog->setTrackedBranchName(QString(), false);
BranchAddDialog branchAddDialog(false, this);
branchAddDialog.setBranchName(oldBranchName);
branchAddDialog.setTrackedBranchName(QString(), false);
branchAddDialog->exec();
branchAddDialog.exec();
if (!branchAddDialog.isNull() && branchAddDialog->result() == QDialog::Accepted && m_model) {
if (branchAddDialog->branchName() == oldBranchName)
if (branchAddDialog.result() == QDialog::Accepted && m_model) {
if (branchAddDialog.branchName() == oldBranchName)
return;
if (localNames.contains(branchAddDialog->branchName())) {
if (localNames.contains(branchAddDialog.branchName())) {
QMessageBox::critical(this, tr("Branch Exists"),
tr("Local branch \'%1\' already exists.")
.arg(branchAddDialog->branchName()));
.arg(branchAddDialog.branchName()));
return;
}
m_model->renameBranch(oldBranchName, branchAddDialog->branchName());
m_model->renameBranch(oldBranchName, branchAddDialog.branchName());
refresh();
}
enableButtons();