diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2016-05-26 14:50:52 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2016-05-30 11:58:31 +0000 |
| commit | 2b2b06a6d3090144394c4a4294cd21d5185a26a4 (patch) | |
| tree | eff75609138d0d3355def256b621330ab11b9941 /src/plugins/subversion | |
| parent | 44b0ca4754f0b64f6f25e3b25d53216035a1786c (diff) | |
SVN: Avoid uncessesary QString creations.
Commmits a5b7ba58f0bdab751a72b2ce647bc59070d88215
and a5720ca8af7e2a0f38ffe657767d1b751f7725dc
remove some QLatinString uses.
As the subversion status strings only contains
Latin1 characters, the comparisons can be speed
up by restricting to Latin1, instead using
fromUtf8() as would be done otherwise.
Change-Id: I734691bda6f5a1214ec6b15fe6d7ed4b028fbc1e
Reviewed-by: Hugues Delorme <delorme.hugues@fougue.pro>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/subversion')
| -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); |