diff options
| author | hjk <hjk@qt.io> | 2019-07-03 18:34:30 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-07-04 12:28:38 +0000 |
| commit | 6a58666f4403cdde1809784c1cc98668a4b02cfc (patch) | |
| tree | af2ab09f192f779947a71022a91fb090bbfd5353 /src/plugins/vcsbase | |
| parent | 599b03179e392b97023c6ebca98faa514967841a (diff) | |
More Utils::toSet/toList
... and unrelated cosmetic changes.
Change-Id: I591b17fd5289831e701b683f8fb47816efd1fa67
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/vcsbase')
| -rw-r--r-- | src/plugins/vcsbase/baseannotationhighlighter.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/plugins/vcsbase/baseannotationhighlighter.cpp b/src/plugins/vcsbase/baseannotationhighlighter.cpp index 32a03770407..ac23e85394f 100644 --- a/src/plugins/vcsbase/baseannotationhighlighter.cpp +++ b/src/plugins/vcsbase/baseannotationhighlighter.cpp @@ -24,9 +24,12 @@ ****************************************************************************/ #include "baseannotationhighlighter.h" + #include <texteditor/fontsettings.h> #include <texteditor/texteditorsettings.h> +#include <utils/algorithm.h> + #include <QDebug> #include <QColor> #include <QTextDocument> @@ -68,7 +71,7 @@ void BaseAnnotationHighlighterPrivate::updateOtherFormats() .toTextCharFormat(TextEditor::C_TEXT) .brushProperty(QTextFormat::BackgroundBrush) .color(); - q->setChangeNumbers(m_changeNumberMap.keys().toSet()); + q->setChangeNumbers(Utils::toSet(m_changeNumberMap.keys())); } BaseAnnotationHighlighter::BaseAnnotationHighlighter(const ChangeNumbers &changeNumbers, diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 3017ae03b98..3d07ced719d 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -37,17 +37,21 @@ #include <aggregation/aggregate.h> #include <cpptools/cppmodelmanager.h> + +#include <coreplugin/find/basetextfind.h> #include <coreplugin/icore.h> #include <coreplugin/editormanager/editormanager.h> + +#include <utils/algorithm.h> #include <utils/checkablemessagebox.h> #include <utils/completingtextedit.h> -#include <utils/synchronousprocess.h> #include <utils/fileutils.h> #include <utils/icon.h> -#include <utils/theme/theme.h> #include <utils/qtcassert.h> +#include <utils/synchronousprocess.h> #include <utils/temporarydirectory.h> -#include <coreplugin/find/basetextfind.h> +#include <utils/theme/theme.h> + #include <texteditor/fontsettings.h> #include <texteditor/texteditorsettings.h> @@ -459,7 +463,7 @@ void VcsBaseSubmitEditor::setFileModel(SubmitFileModel *model) // Populate completer with symbols if (!uniqueSymbols.isEmpty()) { QCompleter *completer = d->m_widget->descriptionEdit()->completer(); - QStringList symbolsList = uniqueSymbols.toList(); + QStringList symbolsList = Utils::toList(uniqueSymbols); symbolsList.sort(); completer->setModel(new QStringListModel(symbolsList, completer)); } |