From 558b49e7a5a82efab8ece694f875b8bdb1e05771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E5=8D=9A=E6=96=87?= <sbw@sbw.so>
Date: Thu, 23 Jun 2016 16:43:22 +0800
Subject: [PATCH] change interface

Change-Id: I3abad84dcab440f0767a5fc1f123c7c4e64fc03d
---
 frame/controller/dockitemcontroller.cpp    | 6 ++----
 frame/controller/dockitemcontroller.h      | 2 +-
 frame/controller/dockpluginscontroller.cpp | 7 ++++---
 frame/controller/dockpluginscontroller.h   | 8 ++++++--
 frame/main.cpp                             | 2 ++
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/frame/controller/dockitemcontroller.cpp b/frame/controller/dockitemcontroller.cpp
index 91a402e4f..d4285cf83 100644
--- a/frame/controller/dockitemcontroller.cpp
+++ b/frame/controller/dockitemcontroller.cpp
@@ -68,7 +68,7 @@ DockItemController::DockItemController(QObject *parent)
     connect(m_appInter, &DBusDock::EntryAdded, this, &DockItemController::appItemAdded);
     connect(m_appInter, &DBusDock::EntryRemoved, this, &DockItemController::appItemRemoved);
 
-    connect(m_pluginsInter, &DockPluginsController::pluginsInserted, this, &DockItemController::pluginsItemAdded);
+    connect(m_pluginsInter, &DockPluginsController::pluginsInserted, this, &DockItemController::pluginsItemInserted);
 }
 
 void DockItemController::appItemAdded(const QDBusObjectPath &path, const int index)
@@ -110,10 +110,8 @@ void DockItemController::appItemRemoved(const QString &appId)
     }
 }
 
-void DockItemController::pluginsItemAdded(PluginsItemInterface *interface)
+void DockItemController::pluginsItemInserted(PluginsItem *item)
 {
-    PluginsItem *item = new PluginsItem(interface);
-
     m_itemList.append(item);
     emit itemInserted(m_itemList.size(), item);
 }
diff --git a/frame/controller/dockitemcontroller.h b/frame/controller/dockitemcontroller.h
index a666a7d5f..7f72512b7 100644
--- a/frame/controller/dockitemcontroller.h
+++ b/frame/controller/dockitemcontroller.h
@@ -31,7 +31,7 @@ private:
     explicit DockItemController(QObject *parent = 0);
     void appItemAdded(const QDBusObjectPath &path, const int index);
     void appItemRemoved(const QString &appId);
-    void pluginsItemAdded(PluginsItemInterface *interface);
+    void pluginsItemInserted(PluginsItem *item);
 
 private:
     QList<DockItem *> m_itemList;
diff --git a/frame/controller/dockpluginscontroller.cpp b/frame/controller/dockpluginscontroller.cpp
index 11c9cb9a0..c3f6cf081 100644
--- a/frame/controller/dockpluginscontroller.cpp
+++ b/frame/controller/dockpluginscontroller.cpp
@@ -1,11 +1,13 @@
 #include "dockpluginscontroller.h"
 #include "pluginsiteminterface.h"
+#include "dockitemcontroller.h"
 
 #include <QDebug>
 #include <QDir>
 
-DockPluginsController::DockPluginsController(QObject *parent)
-    : QObject(parent)
+DockPluginsController::DockPluginsController(DockItemController *itemControllerInter)
+    : QObject(itemControllerInter),
+      m_itemControllerInter(itemControllerInter)
 {
     QMetaObject::invokeMethod(this, "loadPlugins", Qt::QueuedConnection);
 }
@@ -42,6 +44,5 @@ void DockPluginsController::loadPlugins()
 
         m_pluginLoaderList.append(pluginLoader);
         m_pluginsInterfaceList.append(interface);
-        emit pluginsInserted(interface);
     }
 }
diff --git a/frame/controller/dockpluginscontroller.h b/frame/controller/dockpluginscontroller.h
index 19ee6d0d4..f544a51d1 100644
--- a/frame/controller/dockpluginscontroller.h
+++ b/frame/controller/dockpluginscontroller.h
@@ -1,20 +1,23 @@
 #ifndef DOCKPLUGINSCONTROLLER_H
 #define DOCKPLUGINSCONTROLLER_H
 
+#include "item/pluginsitem.h"
+
 #include <QPluginLoader>
 #include <QList>
 
+class DockItemController;
 class PluginsItemInterface;
 class DockPluginsController : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit DockPluginsController(QObject *parent = 0);
+    explicit DockPluginsController(DockItemController *itemControllerInter = 0);
     ~DockPluginsController();
 
 signals:
-    void pluginsInserted(PluginsItemInterface *interface) const;
+    void pluginsInserted(PluginsItem *pluginsItem) const;
 
 private slots:
     void loadPlugins();
@@ -22,6 +25,7 @@ private slots:
 private:
     QList<PluginsItemInterface *> m_pluginsInterfaceList;
     QList<QPluginLoader *> m_pluginLoaderList;
+    DockItemController *m_itemControllerInter;
 };
 
 #endif // DOCKPLUGINSCONTROLLER_H
diff --git a/frame/main.cpp b/frame/main.cpp
index 08f3b3f31..1cfa3b610 100644
--- a/frame/main.cpp
+++ b/frame/main.cpp
@@ -19,6 +19,8 @@ int main(int argc, char *argv[])
     app.setApplicationDisplayName("DDE Dock");
     app.setApplicationVersion("2.0");
 
+    QDBusConnection::sessionBus().registerService("com.deepin.dde.dock");
+
     MainWindow mw;
     QTimer::singleShot(500, &mw, &MainWindow::show);