From 7ff94854e4decb7b2228410f8e3169126f24dbc8 Mon Sep 17 00:00:00 2001 From: Hualet Wang Date: Tue, 30 Jun 2015 17:54:47 +0800 Subject: [PATCH] update source code structure --- dde-dock/dde-dock.pro | 52 ++++++++++++++++++++++++++++++ dde-dock/{src => }/images.qrc | 0 dde-dock/src/dde-dock.pro | 52 ------------------------------ dde-dock/src/dockplugininterface.h | 0 dde-dock/src/mainwidget.h | 2 +- 5 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 dde-dock/dde-dock.pro rename dde-dock/{src => }/images.qrc (100%) delete mode 100644 dde-dock/src/dde-dock.pro mode change 100755 => 100644 dde-dock/src/dockplugininterface.h diff --git a/dde-dock/dde-dock.pro b/dde-dock/dde-dock.pro new file mode 100644 index 000000000..12604e683 --- /dev/null +++ b/dde-dock/dde-dock.pro @@ -0,0 +1,52 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2015-06-20T10:09:57 +# +#------------------------------------------------- + +QT += core gui x11extras + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +TARGET = dde-dock +TEMPLATE = app +INCLUDEPATH += src/ + +SOURCES += \ + src/main.cpp \ + src/mainwidget.cpp \ + src/Widgets/appbackground.cpp \ + src/Widgets/appicon.cpp \ + src/Widgets/appitem.cpp \ + src/Widgets/dockconstants.cpp \ + src/Widgets/dockitem.cpp \ + src/Widgets/dockitemdelegate.cpp \ + src/Widgets/docklayout.cpp \ + src/Widgets/dockmodel.cpp \ + src/Widgets/dockview.cpp \ + src/Widgets/screenmask.cpp \ + src/Widgets/windowpreview.cpp \ + src/Panel/panel.cpp + +HEADERS += \ + src/abstractdockitem.h \ + src/dockplugininterface.h \ + src/mainwidget.h \ + src/Widgets/appbackground.h \ + src/Widgets/appicon.h \ + src/Widgets/appitem.h \ + src/Widgets/dockconstants.h \ + src/Widgets/dockitem.h \ + src/Widgets/dockitemdelegate.h \ + src/Widgets/docklayout.h \ + src/Widgets/dockmodel.h \ + src/Widgets/dockview.h \ + src/Widgets/screenmask.h \ + src/Widgets/windowpreview.h \ + src/Panel/panel.h + +RESOURCES += \ + images.qrc + +PKGCONFIG += gtk+-2.0 x11 +CONFIG += c++11 link_pkgconfig diff --git a/dde-dock/src/images.qrc b/dde-dock/images.qrc similarity index 100% rename from dde-dock/src/images.qrc rename to dde-dock/images.qrc diff --git a/dde-dock/src/dde-dock.pro b/dde-dock/src/dde-dock.pro deleted file mode 100644 index 85dfdf67b..000000000 --- a/dde-dock/src/dde-dock.pro +++ /dev/null @@ -1,52 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2015-06-20T10:09:57 -# -#------------------------------------------------- - -QT += core gui x11extras - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TARGET = dde-dock -TEMPLATE = app - - -SOURCES += \ - main.cpp \ - mainwidget.cpp \ - Widgets/appbackground.cpp \ - Widgets/appicon.cpp \ - Widgets/appitem.cpp \ - Widgets/dockconstants.cpp \ - Widgets/dockitem.cpp \ - Widgets/dockitemdelegate.cpp \ - Widgets/docklayout.cpp \ - Widgets/dockmodel.cpp \ - Widgets/dockview.cpp \ - Widgets/screenmask.cpp \ - Widgets/windowpreview.cpp \ - Panel/panel.cpp - -HEADERS += \ - abstractdockitem.h \ - dockplugininterface.h \ - mainwidget.h \ - Widgets/appbackground.h \ - Widgets/appicon.h \ - Widgets/appitem.h \ - Widgets/dockconstants.h \ - Widgets/dockitem.h \ - Widgets/dockitemdelegate.h \ - Widgets/docklayout.h \ - Widgets/dockmodel.h \ - Widgets/dockview.h \ - Widgets/screenmask.h \ - Widgets/windowpreview.h \ - Panel/panel.h - -RESOURCES += \ - images.qrc - -PKGCONFIG += gtk+-2.0 x11 -CONFIG += c++11 link_pkgconfig diff --git a/dde-dock/src/dockplugininterface.h b/dde-dock/src/dockplugininterface.h old mode 100755 new mode 100644 diff --git a/dde-dock/src/mainwidget.h b/dde-dock/src/mainwidget.h index 229557e40..0a33a4790 100644 --- a/dde-dock/src/mainwidget.h +++ b/dde-dock/src/mainwidget.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include "Panel/panel.h" class MainWidget : public QWidget {