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

17
src/plugins/git/gitplugin.cpp
View File

@@ -779,28 +779,27 @@ void GitPlugin::startChangeRelatedAction()
if (!state.hasTopLevel())
return;
QPointer<ChangeSelectionDialog> dialog = new ChangeSelectionDialog
(state.topLevel(), Core::ICore::mainWindow());
ChangeSelectionDialog dialog(state.topLevel(), Core::ICore::mainWindow());
int result = dialog->exec();
int result = dialog.exec();
if (dialog.isNull() || result == QDialog::Rejected)
if (result == QDialog::Rejected)
return;
const QString workingDirectory = dialog->workingDirectory();
const QString change = dialog->change();
const QString workingDirectory = dialog.workingDirectory();
const QString change = dialog.change();
if (workingDirectory.isEmpty() || change.isEmpty())
return;
if (dialog->command() == Show) {
if (dialog.command() == Show) {
m_gitClient->show(workingDirectory, change);
return;
}
QString command;
bool (GitClient::*commandFunction)(const QString&, const QString&);
switch (dialog->command()) {
switch (dialog.command()) {
case CherryPick:
command = QLatin1String("Cherry-pick");
commandFunction = &GitClient::synchronousCherryPick;
@@ -823,8 +822,6 @@ void GitPlugin::startChangeRelatedAction()
if (!(m_gitClient->*commandFunction)(workingDirectory, change))
stashGuard.preventPop();
delete dialog;
}
void GitPlugin::stageFile()