diff options
author | Orgad Shaneh <[email protected]> | 2018-09-20 01:32:36 +0300 |
---|---|---|
committer | Orgad Shaneh <[email protected]> | 2018-09-20 07:02:17 +0000 |
commit | 8f65486dfc1edb00ddf36e6b99887b9e063e0402 (patch) | |
tree | e4e7c95c96aed6fe255d5e981add718289b7554d /src/plugins/vcsbase/vcsbaseclient.cpp | |
parent | e0520794f53463d759eba228708acdede040e237 (diff) |
VCSBase: Modernize
override, auto, nullptr, member initializers.
Change-Id: Ie21b8f4a4d6673947d82619bc3de677fcea63d7f
Reviewed-by: Alessandro Portale <[email protected]>
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseclient.cpp')
-rw-r--r-- | src/plugins/vcsbase/vcsbaseclient.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index af80c664f5b..43f4256c936 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -68,7 +68,7 @@ static Core::IEditor *locateEditor(const char *property, const QString &entry) foreach (Core::IDocument *document, Core::DocumentModel::openedDocuments()) if (document->property(property).toString() == entry) return Core::DocumentModel::editorsForDocument(document).first(); - return 0; + return nullptr; } namespace VcsBase { @@ -247,20 +247,20 @@ VcsBaseEditorWidget *VcsBaseClientImpl::createVcsEditor(Core::Id kind, QString t const char *registerDynamicProperty, const QString &dynamicPropertyValue) const { - VcsBaseEditorWidget *baseEditor = 0; + VcsBaseEditorWidget *baseEditor = nullptr; Core::IEditor *outputEditor = locateEditor(registerDynamicProperty, dynamicPropertyValue); const QString progressMsg = tr("Working..."); if (outputEditor) { // Exists already outputEditor->document()->setContents(progressMsg.toUtf8()); baseEditor = VcsBaseEditor::getVcsBaseEditor(outputEditor); - QTC_ASSERT(baseEditor, return 0); + QTC_ASSERT(baseEditor, return nullptr); Core::EditorManager::activateEditor(outputEditor); } else { outputEditor = Core::EditorManager::openEditorWithContents(kind, &title, progressMsg.toUtf8()); outputEditor->document()->setProperty(registerDynamicProperty, dynamicPropertyValue); baseEditor = VcsBaseEditor::getVcsBaseEditor(outputEditor); - QTC_ASSERT(baseEditor, return 0); + QTC_ASSERT(baseEditor, return nullptr); connect(baseEditor, &VcsBaseEditorWidget::annotateRevisionRequested, this, &VcsBaseClientImpl::annotateRevisionRequested); baseEditor->setSource(source); @@ -455,7 +455,8 @@ void VcsBaseClient::diff(const QString &workingDir, const QStringList &files, else args << extraOptions; args << files; - QTextCodec *codec = source.isEmpty() ? static_cast<QTextCodec *>(0) : VcsBaseEditor::getCodec(source); + QTextCodec *codec = source.isEmpty() ? static_cast<QTextCodec *>(nullptr) + : VcsBaseEditor::getCodec(source); VcsCommand *command = createCommand(workingDir, editor); command->setCodec(codec); enqueueJob(command, args, workingDir, exitCodeInterpreter(DiffCommand)); @@ -528,7 +529,7 @@ void VcsBaseClient::status(const QString &workingDir, const QString &file, QStringList args(vcsCommandString(StatusCommand)); args << extraOptions << file; VcsOutputWindow::setRepository(workingDir); - VcsCommand *cmd = createCommand(workingDir, 0, VcsWindowOutputBind); + VcsCommand *cmd = createCommand(workingDir, nullptr, VcsWindowOutputBind); connect(cmd, &VcsCommand::finished, VcsOutputWindow::instance(), &VcsOutputWindow::clearRepository, Qt::QueuedConnection); @@ -632,7 +633,7 @@ void VcsBaseClient::commit(const QString &repositoryRoot, // for example) QStringList args(vcsCommandString(CommitCommand)); args << extraOptions << files; - VcsCommand *cmd = createCommand(repositoryRoot, 0, VcsWindowOutputBind); + VcsCommand *cmd = createCommand(repositoryRoot, nullptr, VcsWindowOutputBind); if (!commitMessageFile.isEmpty()) connect(cmd, &VcsCommand::finished, [commitMessageFile]() { QFile(commitMessageFile).remove(); }); enqueueJob(cmd, args); |