From 15011129c125501a04d89caa2a0660af907c0c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=9D=92?= <yangwanqing@linuxdeepin.com>
Date: Thu, 2 Jul 2015 16:15:45 +0800
Subject: [PATCH] Clear up AbstractDockItem

---
 dde-dock/src/Widgets/appitem.h      |  4 +++-
 dde-dock/src/Widgets/docklayout.cpp |  5 -----
 dde-dock/src/Widgets/docklayout.h   |  1 -
 dde-dock/src/abstractdockitem.h     | 25 ++-----------------------
 4 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/dde-dock/src/Widgets/appitem.h b/dde-dock/src/Widgets/appitem.h
index 28041f871..df29b8906 100644
--- a/dde-dock/src/Widgets/appitem.h
+++ b/dde-dock/src/Widgets/appitem.h
@@ -55,9 +55,11 @@ private:
 private:
     DockModeData *dockCons = DockModeData::getInstants();
     AppBackground * appBackground = NULL;
-    QPoint nextPos;
 
+    QLabel * m_appIcon = NULL;
     bool m_isCurrentOpened = false;
+    QString m_itemTitle = "";
+    QString m_itemIconPath = "";
 };
 
 #endif // APPITEM_H
diff --git a/dde-dock/src/Widgets/docklayout.cpp b/dde-dock/src/Widgets/docklayout.cpp
index ab7c55e78..1b1a3feb0 100644
--- a/dde-dock/src/Widgets/docklayout.cpp
+++ b/dde-dock/src/Widgets/docklayout.cpp
@@ -40,11 +40,6 @@ void DockLayout::moveItem(int from, int to)
     relayout();
 }
 
-void DockLayout::setItemMoveable(int index, bool moveable)
-{
-    appList.at(index)->setMoveable(moveable);
-}
-
 void DockLayout::setSpacing(qreal spacing)
 {
     this->itemSpacing = spacing;
diff --git a/dde-dock/src/Widgets/docklayout.h b/dde-dock/src/Widgets/docklayout.h
index 81f449103..a07729132 100644
--- a/dde-dock/src/Widgets/docklayout.h
+++ b/dde-dock/src/Widgets/docklayout.h
@@ -23,7 +23,6 @@ public:
     void insertItem(AbstractDockItem *item, int index);
     void removeItem(int index);
     void moveItem(int from, int to);
-    void setItemMoveable(int index, bool moveable);
     void setSpacing(qreal spacing);
     void setSortDirection(DockLayout::Direction value);
     int indexOf(AbstractDockItem * item);
diff --git a/dde-dock/src/abstractdockitem.h b/dde-dock/src/abstractdockitem.h
index 23d85004a..3328c5d6c 100644
--- a/dde-dock/src/abstractdockitem.h
+++ b/dde-dock/src/abstractdockitem.h
@@ -16,22 +16,8 @@ public:
 
     virtual QWidget * getContents() { return NULL; }
 
-    virtual void setTitle(const QString &title) { m_itemTitle = title; }
-    virtual void setIcon(const QString &iconPath, int size = 42) {
-        m_appIcon = new AppIcon(iconPath, this);
-        m_appIcon->resize(size, size);
-        m_appIcon->move((width() - m_appIcon->width()) / 2,
-                        (height() - m_appIcon->height()) / 2);
-    }
-
-    virtual void setMoveable(bool value) { m_itemMoveable = value; }
-    virtual bool moveable() { return m_itemMoveable; }
-    virtual void setActived(bool value) { m_isActived = value; }
+    virtual bool moveable() { return m_moveable; }
     virtual bool actived() { return m_isActived; }
-    virtual void setHovered(bool value) { m_isHovered = value; }
-    virtual bool hovered() { return m_isHovered; }
-    virtual void setIndex(int value) { m_itemIndex = value; }
-    virtual int index() { return m_itemIndex; }
 
     void resize(int width,int height){
         QFrame::resize(width,height);
@@ -59,18 +45,11 @@ signals:
     void widthChanged();
 
 protected:
-    QLabel * m_appIcon = NULL;
 
-    bool m_itemMoveable = true;
+    bool m_moveable = true;
     bool m_isActived = false;
-    bool m_isHovered = false;
 
-    QString m_itemTitle = "";
-    QString m_itemIconPath = "";
     QPoint m_itemNextPos;
-
-    int m_itemIndex = 0;
-
 };
 
 #endif // ABSTRACTDOCKITEM_H