From d20833364aa40dcf725a45027f2c067f9325b2c3 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 22 Jan 2015 16:02:32 +0100 Subject: [PATCH] VcsBaseClient: Fix build on windows Windows does pick ::log in favor of this->log in the lambda. Change-Id: Ib3037606dfe70de955b10e69e2bc513b99b82fca Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 14 +++++++------- src/plugins/vcsbase/vcsbaseclient.cpp | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 6bf1c21bb43..2035d0dfb7f 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -974,8 +974,8 @@ void GitClient::log(const QString &workingDirectory, const QString &fileName, VcsBaseEditorWidget *editor = findExistingVCSEditor("logFileName", sourceFile); if (!editor) { auto *argWidget = new GitLogArgumentsWidget(settings()); - QObject::connect(argWidget, &VcsBaseEditorParameterWidget::commandExecutionRequested, - [=] { log(workingDirectory, fileName, enableAnnotationContextMenu, args); }); + connect(argWidget, &VcsBaseEditorParameterWidget::commandExecutionRequested, + [=]() { this->log(workingDirectory, fileName, enableAnnotationContextMenu, args); }); editor = createVcsEditor(editorId, title, sourceFile, CodecLogOutput, "logFileName", sourceFile, argWidget); } @@ -1100,11 +1100,11 @@ void GitClient::blame(const QString &workingDirectory, if (!editor) { auto *argWidget = new GitBlameArgumentsWidget(settings()); argWidget->setBaseArguments(args); - QObject::connect(argWidget, &VcsBaseEditorParameterWidget::commandExecutionRequested, - [=] { - const int line = VcsBaseEditor::lineNumberOfCurrentEditor(); - blame(workingDirectory, args, fileName, revision, line); - } ); + connect(argWidget, &VcsBaseEditorParameterWidget::commandExecutionRequested, + [=] { + const int line = VcsBaseEditor::lineNumberOfCurrentEditor(); + blame(workingDirectory, args, fileName, revision, line); + } ); editor = createVcsEditor(editorId, title, sourceFile, CodecSource, "blameFileName", id, argWidget); } diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index 302578cae01..99fa15a63ae 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -101,8 +101,8 @@ VcsBaseClientPrivate::VcsBaseClientPrivate(VcsBaseClient *client, VcsBaseClientS void VcsBaseClientPrivate::bindCommandToEditor(VcsCommand *cmd, VcsBaseEditorWidget *editor) { editor->setCommand(cmd); - QObject::connect(cmd, &VcsCommand::finished, - m_cmdFinishedMapper, static_cast(&QSignalMapper::map)); + connect(cmd, &VcsCommand::finished, + m_cmdFinishedMapper, static_cast(&QSignalMapper::map)); m_cmdFinishedMapper->setMapping(cmd, editor); } @@ -345,7 +345,7 @@ void VcsBaseClient::log(const QString &workingDir, const QStringList &files, if (!paramWidget && (paramWidget = d->createLogEditor())) { // editor has been just created, createVcsEditor() didn't set a configuration widget yet connect(paramWidget, &VcsBaseEditorParameterWidget::commandExecutionRequested, - [=] { log(workingDir, files, extraOptions, enableAnnotationContextMenu); } ); + [=]() { this->log(workingDir, files, extraOptions, enableAnnotationContextMenu); } ); editor->setConfigurationWidget(paramWidget); }