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

Vcs: Fix compile with MSVC2010

Browse Source 
Change-Id: I7ee61e82b8e1ea39ee7f5bd9edd5ed4ea2fcb6d1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2015-03-16 15:27:50 +01:00
parent c8da2438ec
commit d212aa7bc4
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/bazaar/commiteditor.cpp
View File

@@ -63,7 +63,9 @@ void CommitEditor::setFields(const QString &repositoryRoot,
m_fileModel = new VcsBase::SubmitFileModel(this); m_fileModel = new VcsBase::SubmitFileModel(this);
m_fileModel->setRepositoryRoot(repositoryRoot); 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)) if (status == QLatin1String(Constants::FSTATUS_CREATED))
return VcsBase::SubmitFileModel::FileAdded; return VcsBase::SubmitFileModel::FileAdded;
if (status == QLatin1String(Constants::FSTATUS_MODIFIED)) if (status == QLatin1String(Constants::FSTATUS_MODIFIED))

4
src/plugins/git/gitsubmiteditor.cpp
View File

@@ -175,7 +175,9 @@ void GitSubmitEditor::setCommitData(const CommitData &d)
m_model = new GitSubmitFileModel(this); m_model = new GitSubmitFileModel(this);
m_model->setRepositoryRoot(d.panelInfo.repository); 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<FileStates>(extraData.toInt()); const FileStates state = static_cast<FileStates>(extraData.toInt());
if (state.testFlag(AddedFile) || state.testFlag(UntrackedFile)) if (state.testFlag(AddedFile) || state.testFlag(UntrackedFile))
return SubmitFileModel::FileAdded; return SubmitFileModel::FileAdded;

4
src/plugins/subversion/subversionsubmiteditor.cpp
View File

@@ -50,7 +50,9 @@ void SubversionSubmitEditor::setStatusList(const QList<StatusFilePair> &statusOu
// Hack to allow completion in "description" field : completion needs a root repository, the // 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) // checkScriptWorkingDirectory property is fine (at this point it was set by SubversionPlugin)
model->setRepositoryRoot(checkScriptWorkingDirectory()); model->setRepositoryRoot(checkScriptWorkingDirectory());
model->setFileStatusQualifier([](const QString &status, const QVariant &) { model->setFileStatusQualifier([](const QString &status, const QVariant &)
-> VcsBase::SubmitFileModel::FileStatusHint
{
if (status == QLatin1String("A")) if (status == QLatin1String("A"))
return VcsBase::SubmitFileModel::FileAdded; return VcsBase::SubmitFileModel::FileAdded;
if (status == QLatin1String("M")) if (status == QLatin1String("M"))