diff options
| -rw-r--r-- | src/plugins/subversion/subversionplugin.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/subversion/subversionsubmiteditor.cpp | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index cdc5bd5d46..96c66229eb 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -145,11 +145,12 @@ StatusList parseStatusOutput(const QString &output) foreach (const QString &l, list) { const QString line =l.trimmed(); if (line.size() > 8) { - const QString state = line.left(1); + const QByteArray state = line.left(1).toLatin1(); if (state == FileAddedC || state == FileConflictedC || state == FileDeletedC || state == FileModifiedC) { const QString fileName = line.mid(7); // Column 8 starting from svn 1.6 - changeSet.push_back(SubversionSubmitEditor::StatusFilePair(QString(state), fileName.trimmed())); + changeSet.push_back(SubversionSubmitEditor::StatusFilePair(QLatin1String(state), + fileName.trimmed())); } } diff --git a/src/plugins/subversion/subversionsubmiteditor.cpp b/src/plugins/subversion/subversionsubmiteditor.cpp index 213c7ec4dc..55f5f472d8 100644 --- a/src/plugins/subversion/subversionsubmiteditor.cpp +++ b/src/plugins/subversion/subversionsubmiteditor.cpp @@ -48,20 +48,23 @@ void SubversionSubmitEditor::setStatusList(const QList<StatusFilePair> &statusOu model->setFileStatusQualifier([](const QString &status, const QVariant &) -> VcsBase::SubmitFileModel::FileStatusHint { - if (status == FileConflictedC) + const QByteArray statusC = status.toLatin1(); + if (statusC == FileConflictedC) return VcsBase::SubmitFileModel::FileUnmerged; - if (status == FileAddedC) + if (statusC == FileAddedC) return VcsBase::SubmitFileModel::FileAdded; - if (status == FileModifiedC) + if (statusC == FileModifiedC) return VcsBase::SubmitFileModel::FileModified; - if (status == FileDeletedC) + if (statusC == FileDeletedC) return VcsBase::SubmitFileModel::FileDeleted; return VcsBase::SubmitFileModel::FileStatusUnknown; } ); for (const StatusFilePair &pair : statusOutput) { const VcsBase::CheckMode checkMode = - (pair.first == FileConflictedC) ? VcsBase::Uncheckable : VcsBase::Unchecked; + (pair.first == QLatin1String(FileConflictedC)) + ? VcsBase::Uncheckable + : VcsBase::Unchecked; model->addFile(pair.second, pair.first, checkMode); } setFileModel(model); |