QmlDesigner: Change ItemLibrarySectionModel to list

Change-Id: I04932ff50e0e4f8a1eda72df35e9ba675ae2709e
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp

@@ -162,24 +162,17 @@ void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model)
                  && (entry.requiredImport().isEmpty()
                      || model->hasImport(entryToImport(entry), true, true))) {
             QString itemSectionName = entry.category();
-            ItemLibrarySection *sectionModel;
+            ItemLibrarySection *sectionModel = sectionByName(itemSectionName);
             ItemLibraryItem *itemModel;
-            int itemId = m_nextLibId++, sectionId;
 
-            if (sections.contains(itemSectionName)) {
+            if (sectionModel == 0) {
-                sectionId = sections.value(itemSectionName);
+                sectionModel = new ItemLibrarySection(itemSectionName, this);
-                sectionModel = section(sectionId);
+                m_sectionModels.append(sectionModel);
-            } else {
-                sectionId = m_nextLibId++;
-                sectionModel = new ItemLibrarySection(sectionId, itemSectionName, this);
-                addSection(sectionModel, sectionId);
-                sections.insert(itemSectionName, sectionId);
             }
 
             itemModel = new ItemLibraryItem(sectionModel);
             itemModel->setItemLibraryEntry(entry);
             sectionModel->addSectionEntry(itemModel);
-            m_sections.insert(itemId, sectionId);
         }
     }
 
@@ -200,20 +193,9 @@ QMimeData *ItemLibraryModel::getMimeData(const ItemLibraryEntry &itemLibraryEntr
     return mimeData;
 }
 
-ItemLibrarySection *ItemLibraryModel::section(int libraryId)
-{
-    return m_sectionModels.value(libraryId);
-}
-
 QList<ItemLibrarySection *> ItemLibraryModel::sections() const
 {
-    return m_sectionModels.values();
+    return m_sectionModels;
-}
-
-void ItemLibraryModel::addSection(ItemLibrarySection *sectionModel, int sectionId)
-{
-    m_sectionModels.insert(sectionId, sectionModel);
-    sectionModel->setVisible(true);
 }
 
 void ItemLibraryModel::clearSections()
@@ -234,12 +216,9 @@ int ItemLibraryModel::visibleSectionCount() const
 {
     int visibleCount = 0;
 
-    auto sectionIterator = m_sectionModels.constBegin();
+    foreach (ItemLibrarySection *section, m_sectionModels) {
-    while (sectionIterator != m_sectionModels.constEnd()) {
+        if (section->isVisible())
-        ItemLibrarySection *sectionModel = sectionIterator.value();
-        if (sectionModel->isVisible())
             ++visibleCount;
-        ++sectionIterator;
     }
 
     return visibleCount;
@@ -249,43 +228,43 @@ QList<ItemLibrarySection *> ItemLibraryModel::visibleSections() const
 {
     QList<ItemLibrarySection *> visibleSectionList;
 
-    auto sectionIterator = m_sectionModels.constBegin();
+    foreach (ItemLibrarySection *section, m_sectionModels) {
-    while (sectionIterator != m_sectionModels.constEnd()) {
+        if (section->isVisible())
-        ItemLibrarySection *sectionModel = sectionIterator.value();
+            visibleSectionList.append(section);
-        if (sectionModel->isVisible())
-            visibleSectionList.append(sectionModel);
-        ++sectionIterator;
     }
 
     return visibleSectionList;
 }
 
+ItemLibrarySection *ItemLibraryModel::sectionByName(const QString &sectionName)
+{
+    foreach (ItemLibrarySection *itemLibrarySection, m_sectionModels) {
+        if (itemLibrarySection->sectionName() == sectionName)
+            return itemLibrarySection;
+    }
+
+    return 0;
+}
+
 void ItemLibraryModel::updateVisibility()
 {
     beginResetModel();
     endResetModel();
     bool changed = false;
 
-    auto sectionIterator = m_sectionModels.constBegin();
+    foreach (ItemLibrarySection *itemLibrarySection, m_sectionModels) {
-    while (sectionIterator != m_sectionModels.constEnd()) {
-        ItemLibrarySection *sectionModel = sectionIterator.value();
-
         QString sectionSearchText = m_searchText;
 
-        if (sectionModel->sectionName().toLower().contains(m_searchText))
+        if (itemLibrarySection->sectionName().toLower().contains(m_searchText))
             sectionSearchText.clear();
 
         bool sectionChanged = false,
-            sectionVisibility = sectionModel->updateSectionVisibility(sectionSearchText,
+            sectionVisibility = itemLibrarySection->updateSectionVisibility(sectionSearchText,
                                                                       &sectionChanged);
-        if (sectionChanged) {
+        if (sectionChanged)
             changed = true;
-            if (sectionVisibility)
-                emit sectionVisibilityChanged(sectionIterator.key());
-        }
 
-        changed |= sectionModel->setVisible(sectionVisibility);
+        changed |= itemLibrarySection->setVisible(sectionVisibility);
-        ++sectionIterator;
     }
 
     if (changed)

src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h

@@ -62,9 +62,7 @@ public:
 
     QMimeData *getMimeData(const ItemLibraryEntry &itemLibraryEntry);
 
-    ItemLibrarySection* section(int libraryId);
     QList<ItemLibrarySection*> sections() const;
-    void addSection(ItemLibrarySection *sectionModel, int sectionId);
 
     void clearSections();
 
@@ -73,6 +71,8 @@ public:
     int visibleSectionCount() const;
     QList<ItemLibrarySection*> visibleSections() const;
 
+    ItemLibrarySection *sectionByName(const QString &sectionName);
+
 public slots:
     void setSearchText(const QString &searchText);
 
@@ -93,7 +93,7 @@ private: // functions
     int getHeight(const ItemLibraryEntry &entry);
 
 private: // variables
-    QMap<int, ItemLibrarySection*> m_sectionModels;
+    QList<ItemLibrarySection*> m_sectionModels;
     QMap<int, int> m_sections;
     QHash<int, QByteArray> m_roleNames;
 

src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.cpp

@@ -33,13 +33,12 @@
 
 namespace QmlDesigner {
 
-ItemLibrarySection::ItemLibrarySection(int sectionLibId, const QString &sectionName, QObject *parent)
+ItemLibrarySection::ItemLibrarySection(const QString &sectionName, QObject *parent)
     : QObject(parent),
       m_sectionEntries(parent),
       m_name(sectionName),
-      m_sectionLibraryId(sectionLibId),
       m_sectionExpanded(true),
-      m_isVisible(false)
+      m_isVisible(true)
 {
 //    if (collapsedStateHash.contains(sectionName))
 //        m_sectionExpanded=  collapsedStateHash.value(sectionName);
@@ -51,11 +50,6 @@ QString ItemLibrarySection::sectionName() const
     return m_name;
 }
 
-int ItemLibrarySection::sectionLibraryId() const
-{
-    return m_sectionLibraryId;
-}
-
 bool ItemLibrarySection::sectionExpanded() const
 {
     return m_sectionExpanded;

src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.h

@@ -44,10 +44,9 @@ class ItemLibrarySection: public QObject {
     Q_PROPERTY(QVariant sortingRole READ sortingRole FINAL)
 
 public:
-    ItemLibrarySection(int sectionLibraryId, const QString &sectionName, QObject *parent = 0);
+    ItemLibrarySection(const QString &sectionName, QObject *parent = 0);
 
     QString sectionName() const;
-    int sectionLibraryId() const;
     bool sectionExpanded() const;
     QVariant sortingRole() const;
 
@@ -65,7 +64,6 @@ signals:
 private:
     ItemLibrarySectionModel m_sectionEntries;
     QString m_name;
-    int m_sectionLibraryId;
     bool m_sectionExpanded;
     bool m_isVisible;
 };