QmlDesigner: Store imports in a list, not a set

The order of imports does matter, therefore it should also be
represented as a list in the model.

Reviewed-by: Marco Bubke

diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h
index 641c1cd..a852362 100644 (file)
--- a/src/plugins/qmldesigner/designercore/include/model.h
+++ b/src/plugins/qmldesigner/designercore/include/model.h
@@ -96,7 +96,7 @@ public:
     // Editing sub-components:
 
     // Imports:
-    QSet<Import> imports() const;
+    QList<Import> imports() const;
     void addImport(const Import &import);
     void removeImport(const Import &import);
 

diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp
index 3cfafe5..2a9fdaf 100644 (file)
--- a/src/plugins/qmldesigner/designercore/model/model.cpp
+++ b/src/plugins/qmldesigner/designercore/model/model.cpp
@@ -122,13 +122,13 @@ void ModelPrivate::addImport(const Import &import)
     if (m_imports.contains(import))
         return;
 
-    m_imports.insert(import);
+    m_imports.append(import);
     notifyImportAdded(import);
 }
 
 void ModelPrivate::removeImport(const Import &import)
 {
-    if (!m_imports.remove(import))
+    if (!m_imports.removeOne(import))
         return;
 
     notifyImportRemoved(import);
@@ -1004,7 +1004,7 @@ Model *Model::create(QString type, int major, int minor)
 //    return subModel;
 //}
 
-QSet<Import> Model::imports() const
+QList<Import> Model::imports() const
 {
     return m_d->imports();
 }

diff --git a/src/plugins/qmldesigner/designercore/model/model_p.h b/src/plugins/qmldesigner/designercore/model/model_p.h
index fcd38b3..026f0b0 100644 (file)
--- a/src/plugins/qmldesigner/designercore/model/model_p.h
+++ b/src/plugins/qmldesigner/designercore/model/model_p.h
@@ -154,7 +154,7 @@ public:
 
 
     // Imports:
-    QSet<Import> imports() const { return m_imports; }
+    QList<Import> imports() const { return m_imports; }
     void addImport(const Import &import);
     void removeImport(const Import &import);
     void notifyImportAdded(const Import &import) const;
@@ -197,7 +197,7 @@ private:
     Model *m_q;
     MetaInfo m_metaInfo;
 
-    QSet<Import> m_imports;
+    QList<Import> m_imports;
     QList<QWeakPointer<AbstractView> > m_viewList;
     QList<InternalNodePointer> m_selectedNodeList;
     QHash<QString,InternalNodePointer> m_idNodeHash;

diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 81a1dd1..909487c 100644 (file)
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -491,7 +491,7 @@ bool TextToModelMerger::isActive() const
 void TextToModelMerger::setupImports(const Document::Ptr &doc,
                                      DifferenceHandler &differenceHandler)
 {
-    QSet<Import> existingImports = m_rewriterView->model()->imports();
+    QList<Import> existingImports = m_rewriterView->model()->imports();
 
     for (UiImportList *iter = doc->qmlProgram()->imports; iter; iter = iter->next) {
         UiImport *import = iter->import;
@@ -510,13 +510,13 @@ void TextToModelMerger::setupImports(const Document::Ptr &doc,
             const Import newImport = Import::createFileImport(strippedFileName,
                                                               version, as);
 
-            if (!existingImports.remove(newImport))
+            if (!existingImports.removeOne(newImport))
                 differenceHandler.modelMissesImport(newImport);
         } else {
             const Import newImport =
                     Import::createLibraryImport(flatten(import->importUri), as, version);
 
-            if (!existingImports.remove(newImport))
+            if (!existingImports.removeOne(newImport))
                 differenceHandler.modelMissesImport(newImport);
         }
     }