From 6c5a17c2719a2fc6fa5f3ead1f27201d43398caf Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Mon, 23 Jun 2014 13:09:26 +0200
Subject: [PATCH] QmlDesigner: Remove itemLibId in ItemLibraryItem

Change-Id: I0b7fc69b405f59b5f20fb453556eab0a1881f9eb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
 .../components/itemlibrary/itemlibraryitem.cpp        | 11 ++---------
 .../components/itemlibrary/itemlibraryitem.h          |  5 +----
 .../components/itemlibrary/itemlibrarymodel.cpp       |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp
index 4e2fdf0064e..9e02f9cbdfa 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp
@@ -31,9 +31,8 @@
 
 namespace QmlDesigner {
 
-ItemLibraryItem::ItemLibraryItem(int itemLibId, QObject *parent)
-    : QObject(parent),
-      m_libId(itemLibId)
+ItemLibraryItem::ItemLibraryItem(QObject *parent)
+    : QObject(parent)
 {
 }
 
@@ -41,12 +40,6 @@ ItemLibraryItem::~ItemLibraryItem()
 {
 }
 
-int ItemLibraryItem::itemLibId() const
-{
-    return m_libId;
-}
-
-
 QString ItemLibraryItem::itemName() const
 {
     return m_itemLibraryEntry.name();
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h
index cb65b9dca63..e8ba2bebdd7 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h
@@ -43,17 +43,15 @@ class ItemLibraryItem: public QObject {
 
     Q_OBJECT
 
-    Q_PROPERTY(int itemLibId READ itemLibId FINAL)
     Q_PROPERTY(QVariant itemLibraryEntry READ itemLibraryEntry FINAL)
     Q_PROPERTY(QString itemName READ itemName FINAL)
     Q_PROPERTY(QString itemLibraryIconPath READ itemLibraryIconPath FINAL)
     Q_PROPERTY(QVariant sortingRole READ sortingRole FINAL)
 
 public:
-    ItemLibraryItem(int itemLibId, QObject *parent);
+    ItemLibraryItem(QObject *parent);
     ~ItemLibraryItem();
 
-    int itemLibId() const;
     QString itemName() const;
     QString itemLibraryIconPath() const;
     QVariant sortingRole() const;
@@ -66,7 +64,6 @@ public:
 
 private:
     ItemLibraryEntry m_itemLibraryEntry;
-    int m_libId;
     bool m_isVisible;
 };
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
index 4f756562213..effaa1a9d8b 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
@@ -179,7 +179,7 @@ void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model)
 
             m_itemInfos.insert(itemId, entry);
 
-            itemModel = new ItemLibraryItem(itemId, sectionModel);
+            itemModel = new ItemLibraryItem(sectionModel);
             itemModel->setItemLibraryEntry(entry);
             sectionModel->addSectionEntry(itemModel);
             m_sections.insert(itemId, sectionId);