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

Git: Use nullptr in Mergetool

Browse Source 
Change-Id: I93206f5d735f3b8b291d752faf6b7da77e98342e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2018-06-17 15:19:43 +03:00
committed by Orgad Shaneh
parent e26e13212a
commit b63ae202e7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files)
connect(m_process, &QIODevice::readyRead, this, &MergeTool::readData); connect(m_process, &QIODevice::readyRead, this, &MergeTool::readData);
} else { } else {
delete m_process; delete m_process;
m_process = 0; m_process = nullptr;
return false; return false;
} }
return true; return true;