diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp index 65500a0ea86..297f5519747 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp @@ -31,11 +31,9 @@ namespace QmlDesigner { -ItemLibraryItem::ItemLibraryItem(int itemLibId, const QString &itemName, QObject *parent) +ItemLibraryItem::ItemLibraryItem(int itemLibId, QObject *parent) : QObject(parent), - m_libId(itemLibId), - m_name(itemName), - m_iconSize(64, 64) + m_libId(itemLibId) { } @@ -51,13 +49,13 @@ int ItemLibraryItem::itemLibId() const QString ItemLibraryItem::itemName() const { - return m_name; + return m_itemLibraryEntry.name(); } QString ItemLibraryItem::itemLibraryIconPath() const { //Prepend image provider prefix - return QStringLiteral("image://qmldesigner_itemlibrary/") + m_iconPath; + return QStringLiteral("image://qmldesigner_itemlibrary/") + m_itemLibraryEntry.libraryEntryIconPath(); } QVariant ItemLibraryItem::sortingRole() const @@ -65,17 +63,6 @@ QVariant ItemLibraryItem::sortingRole() const return itemName(); } -void ItemLibraryItem::setItemIconPath(const QString &iconPath) -{ - m_iconPath = iconPath; -} - -void ItemLibraryItem::setItemIconSize(const QSize &itemIconSize) -{ - m_iconSize = itemIconSize; - setItemIconPath(m_iconPath); -} - bool ItemLibraryItem::setVisible(bool isVisible) { if (isVisible != m_isVisible) { diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h index a25afe22ccf..e9261d008ac 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h @@ -50,7 +50,7 @@ class ItemLibraryItem: public QObject { Q_PROPERTY(QVariant sortingRole READ sortingRole FINAL) public: - ItemLibraryItem(int itemLibId, const QString &itemName, QObject *parent); + ItemLibraryItem(int itemLibId, QObject *parent); ~ItemLibraryItem(); int itemLibId() const; @@ -58,9 +58,6 @@ public: QString itemLibraryIconPath() const; QVariant sortingRole() const; - void setItemIconPath(const QString &iconPath); - void setItemIconSize(const QSize &itemIconSize); - bool setVisible(bool isVisible); bool isVisible() const; @@ -71,9 +68,6 @@ private: ItemLibraryEntry m_itemLibraryEntry; int m_libId; bool m_isVisible; - QString m_name; - QString m_iconPath; - QSize m_iconSize; }; } // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp index 13b7899ac4c..65e15a62ebf 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp @@ -64,7 +64,6 @@ void ItemLibraryModel::setExpanded(bool expanded, const QString §ion) ItemLibraryModel::ItemLibraryModel(QObject *parent) : QAbstractListModel(parent), - m_itemIconSize(64, 64), m_nextLibId(0) { addRoleNames(); @@ -123,16 +122,6 @@ void ItemLibraryModel::setSearchText(const QString &searchText) } } - -void ItemLibraryModel::setItemIconSize(const QSize &itemIconSize) -{ - m_itemIconSize = itemIconSize; - - foreach (ItemLibrarySection* itemLibrarySectionModel, sections()) { - itemLibrarySectionModel->updateItemIconSize(itemIconSize); - } -} - int ItemLibraryModel::getSectionLibId(int itemLibId) { return m_sections.value(itemLibId); @@ -190,10 +179,7 @@ void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model) m_itemInfos.insert(itemId, entry); - itemModel = new ItemLibraryItem(itemId, entry.name(), sectionModel); - - itemModel->setItemIconPath(entry.libraryEntryIconPath()); - itemModel->setItemIconSize(m_itemIconSize); + itemModel = new ItemLibraryItem(itemId, sectionModel); itemModel->setItemLibraryEntry(entry); sectionModel->addSectionEntry(itemModel); m_sections.insert(itemId, sectionId); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h index 5487661668d..1f9d3d6bb81 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h @@ -77,7 +77,6 @@ public: public slots: void setSearchText(const QString &searchText); - void setItemIconSize(const QSize &itemIconSize); int getSectionLibId(int itemLibId); void setExpanded(bool, const QString §ion); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.cpp index 308ec0600cf..864cd1c1dfa 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.cpp @@ -106,12 +106,6 @@ bool ItemLibrarySection::updateSectionVisibility(const QString &searchText, bool } -void ItemLibrarySection::updateItemIconSize(const QSize &itemIconSize) -{ - foreach (ItemLibraryItem* itemLibraryItemModel, m_sectionEntries.items()) - itemLibraryItemModel->setItemIconSize(itemIconSize); -} - bool ItemLibrarySection::setVisible(bool isVisible) { if (isVisible != m_isVisible) { diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.h index 063a2a90304..6d3fb45e8a7 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.h @@ -55,7 +55,6 @@ public: QObject *sectionEntries(); bool updateSectionVisibility(const QString &searchText, bool *changed); - void updateItemIconSize(const QSize &itemIconSize); bool setVisible(bool isVisible); bool isVisible() const; diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index 0c265191fe2..a610b7c77d4 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -74,7 +74,6 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) : /* create Items view and its model */ m_itemsView->setResizeMode(QQuickView::SizeRootObjectToView); m_itemLibraryModel = new ItemLibraryModel(this); - m_itemLibraryModel->setItemIconSize(m_itemIconSize); QQmlContext *rootContext = m_itemsView->rootContext(); rootContext->setContextProperty(QStringLiteral("itemLibraryModel"), m_itemLibraryModel.data());