From ebfb84f41eb054b457df9135b839bffd7c0ae955 Mon Sep 17 00:00:00 2001
From: Iceyer <me@iceyer.net>
Date: Fri, 4 Mar 2016 10:56:31 +0800
Subject: [PATCH] Change depends from dui to libdtk

Change-Id: I0688b9c1c56612016f62e4c209789847c5d70f0c
---
 README.md                                              | 4 ++--
 dde-dock-shutdown-plugin/dde-dock-shutdown-plugin.pro  | 2 --
 dde-dock-systray-plugin/compositetrayitem.h            | 4 ++--
 dde-dock-systray-plugin/dde-dock-systray-plugin.pro    | 4 ++--
 dde-dock/dde-dock.pro                                  | 2 +-
 dde-dock/src/controller/old/pluginssettingframe.h      | 6 +++---
 dde-dock/src/main.cpp                                  | 2 +-
 dde-dock/src/widgets/plugin/dockpluginssettingwindow.h | 6 +++---
 dde-dock/src/widgets/previewwindow.h                   | 4 ++--
 9 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 5fb800d04..4d7705a57 100644
--- a/README.md
+++ b/README.md
@@ -7,11 +7,11 @@ DDE Dock is Deepin Desktop Environment task bar.
 ### Build dependencies
 
 * qmake (>= 5.3)
-* [libdui](https://github.com/linuxdeepin/libdui) (developer package)
+* [deepin-tool-kit](https://github.com/linuxdeepin/deepin-tool-kit) (developer package)
 
 ### Runtime dependencies
 
-* [libdui](https://github.com/linuxdeepin/libdui)
+* [deepin-tool-kit](https://github.com/linuxdeepin/deepin-tool-kit)
 * [dde-daemon](https://github.com/linuxdeepin/dde-daemon)
 * gtk+-2.0
 * Qt5 (>= 5.3)
diff --git a/dde-dock-shutdown-plugin/dde-dock-shutdown-plugin.pro b/dde-dock-shutdown-plugin/dde-dock-shutdown-plugin.pro
index 45851691c..106591d55 100644
--- a/dde-dock-shutdown-plugin/dde-dock-shutdown-plugin.pro
+++ b/dde-dock-shutdown-plugin/dde-dock-shutdown-plugin.pro
@@ -1,5 +1,3 @@
-include(../../common.pri)
-
 QT       += core gui widgets
 
 TARGET = dde-dock-shutdown-plugin
diff --git a/dde-dock-systray-plugin/compositetrayitem.h b/dde-dock-systray-plugin/compositetrayitem.h
index 45419e583..30373011f 100644
--- a/dde-dock-systray-plugin/compositetrayitem.h
+++ b/dde-dock-systray-plugin/compositetrayitem.h
@@ -13,11 +13,11 @@
 #include <QFrame>
 #include <QMap>
 
-#include <libdui/dimagebutton.h>
+#include <dimagebutton.h>
 
 #include "interfaces/dockconstants.h"
 
-DUI_USE_NAMESPACE
+DWIDGET_USE_NAMESPACE;
 
 class TrayIcon;
 class QLabel;
diff --git a/dde-dock-systray-plugin/dde-dock-systray-plugin.pro b/dde-dock-systray-plugin/dde-dock-systray-plugin.pro
index 5d9e83cd0..705bea8f3 100644
--- a/dde-dock-systray-plugin/dde-dock-systray-plugin.pro
+++ b/dde-dock-systray-plugin/dde-dock-systray-plugin.pro
@@ -8,8 +8,8 @@ QT       += core gui dbus x11extras
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-CONFIG += plugin c++11 link_pkgconfig dui
-PKGCONFIG += xcb xcb-image xcb-composite
+PKGCONFIG += xcb xcb-image xcb-composite dtkbase dtkwidget
+CONFIG += plugin c++11 link_pkgconfig
 
 TARGET = $$qtLibraryTarget(dde-dock-systray-plugin)
 TEMPLATE = lib
diff --git a/dde-dock/dde-dock.pro b/dde-dock/dde-dock.pro
index 99cb33b73..ca343cd9e 100644
--- a/dde-dock/dde-dock.pro
+++ b/dde-dock/dde-dock.pro
@@ -19,7 +19,7 @@ RESOURCES += \
     dark.qrc \
     light.qrc
 
-PKGCONFIG += gtk+-2.0 x11 cairo xcb xcb-ewmh xcb-damage dui
+PKGCONFIG += gtk+-2.0 x11 cairo xcb xcb-ewmh xcb-damage dtkbase dtkwidget
 CONFIG += c++11 link_pkgconfig
 
 include (../cutelogger/cutelogger.pri)
diff --git a/dde-dock/src/controller/old/pluginssettingframe.h b/dde-dock/src/controller/old/pluginssettingframe.h
index 5df802641..b2f2f15b6 100644
--- a/dde-dock/src/controller/old/pluginssettingframe.h
+++ b/dde-dock/src/controller/old/pluginssettingframe.h
@@ -18,10 +18,10 @@
 #include <QLabel>
 #include <QDebug>
 
-#include <libdui/dswitchbutton.h>
-#include <libdui/dseparatorhorizontal.h>
+#include <dswitchbutton.h>
+#include <dseparatorhorizontal.h>
 
-DUI_USE_NAMESPACE
+DWIDGET_USE_NAMESPACE
 
 class PluginsSettingLine : public QLabel
 {
diff --git a/dde-dock/src/main.cpp b/dde-dock/src/main.cpp
index a0cf325a5..a6076f75d 100644
--- a/dde-dock/src/main.cpp
+++ b/dde-dock/src/main.cpp
@@ -13,7 +13,7 @@
 #include <QTranslator>
 #include <QDBusConnection>
 
-#include <libdui/dapplication.h>
+#include <dapplication.h>
 
 #include "mainwidget.h"
 #include "logmanager.h"
diff --git a/dde-dock/src/widgets/plugin/dockpluginssettingwindow.h b/dde-dock/src/widgets/plugin/dockpluginssettingwindow.h
index 95b15da4a..dee8e8b54 100644
--- a/dde-dock/src/widgets/plugin/dockpluginssettingwindow.h
+++ b/dde-dock/src/widgets/plugin/dockpluginssettingwindow.h
@@ -18,10 +18,10 @@
 #include <QLabel>
 #include <QDebug>
 
-#include <libdui/dswitchbutton.h>
-#include <libdui/dseparatorhorizontal.h>
+#include <dswitchbutton.h>
+#include <dseparatorhorizontal.h>
 
-DUI_USE_NAMESPACE
+DWIDGET_USE_NAMESPACE
 
 class PluginSettingLine;
 
diff --git a/dde-dock/src/widgets/previewwindow.h b/dde-dock/src/widgets/previewwindow.h
index 20098dbff..c3ec02644 100644
--- a/dde-dock/src/widgets/previewwindow.h
+++ b/dde-dock/src/widgets/previewwindow.h
@@ -14,9 +14,9 @@
 #include <QPointer>
 #include <QPropertyAnimation>
 
-#include <libdui/darrowrectangle.h>
+#include <darrowrectangle.h>
 
-DUI_USE_NAMESPACE
+DWIDGET_USE_NAMESPACE
 
 class PreviewWindow : public DArrowRectangle
 {