From e6053a71dd69b6f97aeded7a0217af26cd70a808 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Mon, 20 Feb 2012 13:36:42 +0100
Subject: [PATCH] remove group bindings again

---
 .../qtextracomponents/qiconitem.cpp           | 23 ++-----------------
 .../qtextracomponents/qiconitem.h             | 23 ++-----------------
 2 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/declarativeimports/qtextracomponents/qiconitem.cpp b/declarativeimports/qtextracomponents/qiconitem.cpp
index 4c0f5c741..c1b86bf9b 100644
--- a/declarativeimports/qtextracomponents/qiconitem.cpp
+++ b/declarativeimports/qtextracomponents/qiconitem.cpp
@@ -28,7 +28,6 @@
 QIconItem::QIconItem(QDeclarativeItem *parent)
     : QDeclarativeItem(parent),
       m_smooth(false),
-      m_group(NoGroup),
       m_state(DefaultState)
 {
     setFlag(QGraphicsItem::ItemHasNoContents, false);
@@ -55,24 +54,6 @@ QIcon QIconItem::icon() const
     return m_icon;
 }
 
-void QIconItem::setGroup(QIconItem::Group group)
-{
-    if (m_group == group) {
-        return;
-    }
-
-    m_group = group;
-    emit groupChanged(group);
-    emit implicitWidthChanged(implicitWidth());
-    emit implicitHeightChanged(implicitHeight());
-    update();
-}
-
-QIconItem::Group QIconItem::group() const
-{
-    return m_group;
-}
-
 QIconItem::State QIconItem::state() const
 {
     return m_state;
@@ -91,12 +72,12 @@ void QIconItem::setState(QIconItem::State state)
 
 int QIconItem::implicitWidth() const
 {
-    return KIconLoader::global()->currentSize((KIconLoader::Group)m_group);
+    return KIconLoader::global()->currentSize(KIconLoader::Desktop);
 }
 
 int QIconItem::implicitHeight() const
 {
-    return KIconLoader::global()->currentSize((KIconLoader::Group)m_group);
+    return KIconLoader::global()->currentSize(KIconLoader::Desktop);
 }
 
 void QIconItem::setSmooth(const bool smooth)
diff --git a/declarativeimports/qtextracomponents/qiconitem.h b/declarativeimports/qtextracomponents/qiconitem.h
index 845175e31..b077469ca 100644
--- a/declarativeimports/qtextracomponents/qiconitem.h
+++ b/declarativeimports/qtextracomponents/qiconitem.h
@@ -29,25 +29,13 @@ class QIconItem : public QDeclarativeItem
 
     Q_PROPERTY(QVariant icon READ icon WRITE setIcon)
     Q_PROPERTY(bool smooth READ smooth WRITE setSmooth)
-    Q_PROPERTY(int implicitWidth READ implicitWidth NOTIFY implicitWidthChanged)
-    Q_PROPERTY(int implicitHeight READ implicitHeight NOTIFY implicitHeightChanged)
-    Q_PROPERTY(Group group READ group WRITE setGroup NOTIFY groupChanged)
+    Q_PROPERTY(int implicitWidth READ implicitWidth CONSTANT)
+    Q_PROPERTY(int implicitHeight READ implicitHeight CONSTANT)
     Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged)
 
-    Q_ENUMS(Group)
     Q_ENUMS(State)
 
 public:
-    enum Group {
-        NoGroup, ///No group.
-        Desktop, ///Desktop icons.
-        FirstGroup, ///First group.
-        Toolbar, ///Toolbar icons.
-        MainToolbar, ///Main toolbar icons.
-        Small, ///Small icons, e.g. for buttons.
-        Panel, ///Panel (Plasma Taskbar) icons.
-        Dialog, ///Icons for use in dialog titles, page lists, etc.
-    };
 
     enum State {
         DefaultState, ///The default state. 
@@ -61,9 +49,6 @@ public:
     void setIcon(const QVariant &icon);
     QIcon icon() const;
 
-    void setGroup(Group group);
-    Group group() const;
-
     QIconItem::State state() const;
     void setState(State state);
 
@@ -76,15 +61,11 @@ public:
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
 
 Q_SIGNALS:
-    void implicitWidthChanged(int implicitWidth);
-    void implicitHeightChanged(int implicitHeight);
-    void groupChanged(Group group);
     void stateChanged(State state);
 
 private:
     QIcon m_icon;
     bool m_smooth;
-    Group m_group;
     State m_state;
 };