diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp index 0ae4874f8e9181ab3dac6d123db789b605041fe3..2d391d1d9b58b129ceee7ea52ffe5022247e7183 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp @@ -133,34 +133,11 @@ void ItemLibraryModel::setItemIconSize(const QSize &itemIconSize) } } - -int ItemLibraryModel::getItemSectionIndex(int itemLibId) -{ - if (m_sections.contains(itemLibId)) - return section(m_sections.value(itemLibId))->visibleItemIndex(itemLibId); - else - return -1; -} - - int ItemLibraryModel::getSectionLibId(int itemLibId) { return m_sections.value(itemLibId); } - -bool ItemLibraryModel::isItemVisible(int itemLibId) -{ - if (!m_sections.contains(itemLibId)) - return false; - - int sectionLibId = m_sections.value(itemLibId); - if (section(sectionLibId)->isVisible()) - return false; - - return section(sectionLibId)->isItemVisible(itemLibId); -} - Import entryToImport(const ItemLibraryEntry &entry) { if (entry.majorVersion() == -1 && entry.minorVersion() == -1) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h index e41eecb48268f3578a670d6a7893f6bf2bb1b052..640016efb9d6eae5cc6354699f584dce7f0f7b5f 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h @@ -79,9 +79,7 @@ public slots: void setSearchText(const QString &searchText); void setItemIconSize(const QSize &itemIconSize); - int getItemSectionIndex(int itemLibId); int getSectionLibId(int itemLibId); - bool isItemVisible(int itemLibId); void setExpanded(bool, const QString §ion); signals: diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.cpp index 2751606541cef51ceef9e07ba23a5d3402a2d92f..1a13a7d498760aac1446631cc57ec1a65e4e51ef 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.cpp @@ -75,28 +75,11 @@ void ItemLibrarySection::addSectionEntry(ItemLibraryItem *sectionEntry) m_sectionEntries.addItem(sectionEntry, sectionEntry->itemLibId()); } - -void ItemLibrarySection::removeSectionEntry(int itemLibId) -{ - m_sectionEntries.removeItem(itemLibId); -} - QObject *ItemLibrarySection::sectionEntries() { return &m_sectionEntries; } -int ItemLibrarySection::visibleItemIndex(int itemLibId) -{ - return m_sectionEntries.item(itemLibId)->isVisible(); -} - -bool ItemLibrarySection::isItemVisible(int itemLibId) -{ - return m_sectionEntries.itemVisible(itemLibId); -} - - bool ItemLibrarySection::updateSectionVisibility(const QString &searchText, bool *changed) { bool haveVisibleItems = false; @@ -105,11 +88,13 @@ bool ItemLibrarySection::updateSectionVisibility(const QString &searchText, bool QMap::const_iterator itemIterator = m_sectionEntries.items().constBegin(); while (itemIterator != m_sectionEntries.items().constEnd()) { + ItemLibraryItem *itemLibraryItem = itemIterator.value(); + - bool itemVisible = m_sectionEntries.item(itemIterator.key())->itemName().toLower().contains(searchText); + bool itemVisible = itemLibraryItem->itemName().toLower().contains(searchText); bool itemChanged = false; - itemChanged = m_sectionEntries.setItemVisible(itemIterator.key(), itemVisible); + itemChanged = itemLibraryItem->setVisible(itemVisible); *changed |= itemChanged; diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.h index 2e0347a3ba9ba9bd2c60dc277ca66ce3d6c63ca3..063a2a9030467f85828b17f35e28e344eb8e68f6 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.h @@ -52,12 +52,8 @@ public: QVariant sortingRole() const; void addSectionEntry(ItemLibraryItem *sectionEntry); - void removeSectionEntry(int itemLibId); QObject *sectionEntries(); - int visibleItemIndex(int itemLibId); - bool isItemVisible(int itemLibId); - bool updateSectionVisibility(const QString &searchText, bool *changed); void updateItemIconSize(const QSize &itemIconSize); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp index 831122b680c9df5eaef4886b785ffff642b8126c..ed2ff4ed56f653eaf993635c75c813cdab0acc25 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp @@ -92,29 +92,6 @@ void ItemLibrarySectionModel::addItem(ItemLibraryItem *element, int libId) element->setVisible(true); } -void ItemLibrarySectionModel::removeItem(int libId) -{ - ItemLibraryItem *itemLibraryItem = m_itemModels.value(libId); - - itemLibraryItem->setVisible(false); - - m_itemModels.remove(libId); - - delete itemLibraryItem; -} - -bool ItemLibrarySectionModel::itemVisible(int libId) const -{ - ItemLibraryItem *itemLibraryItem = m_itemModels.value(libId); - return itemLibraryItem->isVisible(); -} - -bool ItemLibrarySectionModel::setItemVisible(int libId, bool visible) -{ - ItemLibraryItem *itemLibraryItem = m_itemModels.value(libId); - return itemLibraryItem->setVisible(visible); -} - void ItemLibrarySectionModel::privateInsert(int pos, QObject *element) { m_privList.insert(pos, element); @@ -135,11 +112,6 @@ const QList ItemLibrarySectionModel::itemList() const return m_itemModels.values(); } -ItemLibraryItem *ItemLibrarySectionModel::item(int libId) -{ - return m_itemModels.value(libId); -} - void ItemLibrarySectionModel::resetModel() { beginResetModel(); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.h index 3eeb4578e02e8e627e9cb7544eb2b0cb9a2f0c3b..210fc75772e34e8a3af8f6e26fdbe2e22012ad6f 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.h @@ -52,10 +52,6 @@ public: void clearItems(); void addItem(ItemLibraryItem *item, int libId); - void removeItem(int libId); - - bool itemVisible(int libId) const; - bool setItemVisible(int libId, bool visible); void privateInsert(int pos, QObject *item); void privateRemove(int pos); @@ -63,8 +59,6 @@ public: const QMap &items() const; const QList itemList() const; - ItemLibraryItem* item(int libId); - void resetModel(); private: // functions