From d212aa7bc4e505750a7f65c1cfc3ec2789c90bbc Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 16 Mar 2015 15:27:50 +0100 Subject: [PATCH] Vcs: Fix compile with MSVC2010 Change-Id: I7ee61e82b8e1ea39ee7f5bd9edd5ed4ea2fcb6d1 Reviewed-by: Orgad Shaneh --- src/plugins/bazaar/commiteditor.cpp | 4 +++- src/plugins/git/gitsubmiteditor.cpp | 4 +++- src/plugins/subversion/subversionsubmiteditor.cpp | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/plugins/bazaar/commiteditor.cpp b/src/plugins/bazaar/commiteditor.cpp index 5145750bcc1..8de83d10961 100644 --- a/src/plugins/bazaar/commiteditor.cpp +++ b/src/plugins/bazaar/commiteditor.cpp @@ -63,7 +63,9 @@ void CommitEditor::setFields(const QString &repositoryRoot, m_fileModel = new VcsBase::SubmitFileModel(this); m_fileModel->setRepositoryRoot(repositoryRoot); - m_fileModel->setFileStatusQualifier([](const QString &status, const QVariant &) { + m_fileModel->setFileStatusQualifier([](const QString &status, const QVariant &) + -> VcsBase::SubmitFileModel::FileStatusHint + { if (status == QLatin1String(Constants::FSTATUS_CREATED)) return VcsBase::SubmitFileModel::FileAdded; if (status == QLatin1String(Constants::FSTATUS_MODIFIED)) diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp index f295fa6be37..a7a0b364d4b 100644 --- a/src/plugins/git/gitsubmiteditor.cpp +++ b/src/plugins/git/gitsubmiteditor.cpp @@ -175,7 +175,9 @@ void GitSubmitEditor::setCommitData(const CommitData &d) m_model = new GitSubmitFileModel(this); m_model->setRepositoryRoot(d.panelInfo.repository); - m_model->setFileStatusQualifier([](const QString &, const QVariant &extraData) { + m_model->setFileStatusQualifier([](const QString &, const QVariant &extraData) + -> SubmitFileModel::FileStatusHint + { const FileStates state = static_cast(extraData.toInt()); if (state.testFlag(AddedFile) || state.testFlag(UntrackedFile)) return SubmitFileModel::FileAdded; diff --git a/src/plugins/subversion/subversionsubmiteditor.cpp b/src/plugins/subversion/subversionsubmiteditor.cpp index 10208a446ba..3a74cfda656 100644 --- a/src/plugins/subversion/subversionsubmiteditor.cpp +++ b/src/plugins/subversion/subversionsubmiteditor.cpp @@ -50,7 +50,9 @@ void SubversionSubmitEditor::setStatusList(const QList &statusOu // Hack to allow completion in "description" field : completion needs a root repository, the // checkScriptWorkingDirectory property is fine (at this point it was set by SubversionPlugin) model->setRepositoryRoot(checkScriptWorkingDirectory()); - model->setFileStatusQualifier([](const QString &status, const QVariant &) { + model->setFileStatusQualifier([](const QString &status, const QVariant &) + -> VcsBase::SubmitFileModel::FileStatusHint + { if (status == QLatin1String("A")) return VcsBase::SubmitFileModel::FileAdded; if (status == QLatin1String("M"))