TextEditor: Fix compile with Qt 5

Amends 8d08196a2118433.

Change-Id: I8f67ee0549c621d168bacb57cd4ce0ad226cf852
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

2 files changed, 12 insertions, 11 deletions

diff --git a/src/plugins/texteditor/snippets/snippetscollection.cpp b/src/plugins/texteditor/snippets/snippetscollection.cpp
index 61a94bc437..e678a93ef2 100644
--- a/src/plugins/texteditor/snippets/snippetscollection.cpp
+++ b/src/plugins/texteditor/snippets/snippetscollection.cpp
@@ -78,7 +78,7 @@ const QLatin1String kModified("modified");
 SnippetsCollection::Hint::Hint(int index) : m_index(index)
 {}
 
-SnippetsCollection::Hint::Hint(int index, QList<Snippet>::iterator it) : m_index(index), m_it(it)
+SnippetsCollection::Hint::Hint(int index, QVector<Snippet>::iterator it) : m_index(index), m_it(it)
 {}
 
 int SnippetsCollection::Hint::index() const
@@ -123,8 +123,8 @@ void SnippetsCollection::insertSnippet(const Snippet &snippet, const Hint &hint)
 SnippetsCollection::Hint SnippetsCollection::computeInsertionHint(const Snippet &snippet)
 {
     const int group = groupIndex(snippet.groupId());
-    QList<Snippet> &snippets = m_snippets[group];
-    QList<Snippet>::iterator it = std::upper_bound(snippets.begin(),
+    QVector<Snippet> &snippets = m_snippets[group];
+    QVector<Snippet>::iterator it = std::upper_bound(snippets.begin(),
                                                    snippets.begin()
                                                        + m_activeSnippetsCount.at(group),
                                                    snippet,
@@ -161,12 +161,12 @@ SnippetsCollection::Hint SnippetsCollection::computeReplacementHint(int index,
                                                                     const Snippet &snippet)
 {
     const int group = groupIndex(snippet.groupId());
-    QList<Snippet> &snippets = m_snippets[group];
+    QVector<Snippet> &snippets = m_snippets[group];
     auto activeSnippetsEnd = snippets.begin() + m_activeSnippetsCount.at(group);
-    QList<Snippet>::iterator it = std::lower_bound(snippets.begin(),
-                                                   activeSnippetsEnd,
-                                                   snippet,
-                                                   snippetComp);
+    QVector<Snippet>::iterator it = std::lower_bound(snippets.begin(),
+                                                     activeSnippetsEnd,
+                                                     snippet,
+                                                     snippetComp);
     int hintIndex = static_cast<int>(std::distance(snippets.begin(), it));
     if (index < hintIndex - 1)
         return Hint(hintIndex - 1, it);
@@ -249,6 +249,7 @@ void SnippetsCollection::restoreRemovedSnippets(const QString &groupId)
         return;
     const QVector<Snippet> toRestore = m_snippets[group].mid(m_activeSnippetsCount[group]);
     m_snippets[group].resize(m_activeSnippetsCount[group]);
+
     for (Snippet snippet : qAsConst(toRestore)) {
         snippet.setIsRemoved(false);
         insertSnippet(snippet);
diff --git a/src/plugins/texteditor/snippets/snippetscollection.h b/src/plugins/texteditor/snippets/snippetscollection.h
index 3c2b498475..3a0ad474c1 100644
--- a/src/plugins/texteditor/snippets/snippetscollection.h
+++ b/src/plugins/texteditor/snippets/snippetscollection.h
@@ -61,9 +61,9 @@ public:
         int index() const;
     private:
         explicit Hint(int index);
-        Hint(int index, QList<Snippet>::iterator it);
+        Hint(int index, QVector<Snippet>::iterator it);
         int m_index;
-        QList<Snippet>::iterator m_it;
+        QVector<Snippet>::iterator m_it;
     };
 
     void insertSnippet(const Snippet &snippet);
@@ -120,7 +120,7 @@ private:
     // Snippets for each group are kept in a list. However, not all of them are necessarily
     // active. Specifically, removed built-in snippets are kept as the last ones (for each
     // group there is a iterator that marks the logical end).
-    QVector<QList<Snippet> > m_snippets;
+    QVector<QVector<Snippet> > m_snippets;
     QVector<int> m_activeSnippetsCount;
 
     QHash<QString, int> m_groupIndexById;