modify:move files of dbus-interface to src/backend/dbus-interface/

kylin-nm.pro

@@ -62,22 +62,22 @@ QMAKE_LFLAGS   *= $(shell dpkg-buildflags --get LDFLAGS)
 include(src/singleapplication/qt-single-application.pri)
 
 SOURCES += \
+    src/backend/dbus-interface/kylinconnectitem.cpp \
+    src/backend/dbus-interface/kylinconnectoperation.cpp \
+    src/backend/dbus-interface/kylinconnectresource.cpp \
+    src/backend/dbus-interface/kylinconnectsetting.cpp \
+    src/backend/dbus-interface/kylinnetworkdeviceresource.cpp \
+    src/backend/dbus-interface/kylinnetworkresourcemanager.cpp \
+    src/backend/dbus-interface/kylinvpnconnectitem.cpp \
+    src/backend/dbus-interface/kylinwiredconnectoperation.cpp \
+    src/backend/dbus-interface/kywirelessconnectoperation.cpp \
+    src/backend/dbus-interface/kywirelessnetitem.cpp \
+    src/backend/dbus-interface/kywirelessnetresource.cpp \
+    src/backend/dbus-interface/kyenterpricesettinginfo.cpp \
+    src/backend/dbus-interface/kylinactiveconnectresource.cpp \
+    src/backend/dbus-interface/kylinbluetoothconnectitem.cpp \
     src/backthread.cpp \
-    src/kyenterpricesettinginfo.cpp \
-    src/kylinactiveconnectresource.cpp \
-    src/kylinbluetoothconnectitem.cpp \
-    src/kylinconnectitem.cpp \
-    src/kylinconnectoperation.cpp \
-    src/kylinconnectresource.cpp \
-    src/kylinconnectsetting.cpp \
-    src/kylinnetworkdeviceresource.cpp \
-    src/kylinnetworkresourcemanager.cpp \
-    src/kywirelessconnectoperation.cpp \
-    src/kywirelessnetitem.cpp \
-    src/kywirelessnetresource.cpp \
     src/nmdemo.cpp \
-    src/kylinvpnconnectitem.cpp \
-    src/kylinwiredconnectoperation.cpp \
     src/kylinwiredwidget.cpp \
     src/wifi-auth-thread.cpp \
     src/confform.cpp \
@@ -110,22 +110,22 @@ SOURCES += \
 
 
 HEADERS += \
+    src/backend/dbus-interface/kyenterpricesettinginfo.h \
+    src/backend/dbus-interface/kylinactiveconnectresource.h \
+    src/backend/dbus-interface/kylinbluetoothconnectitem.h \
+    src/backend/dbus-interface/kylinconnectitem.h \
+    src/backend/dbus-interface/kylinconnectoperation.h \
+    src/backend/dbus-interface/kylinconnectresource.h \
+    src/backend/dbus-interface/kylinconnectsetting.h \
+    src/backend/dbus-interface/kylinnetworkdeviceresource.h \
+    src/backend/dbus-interface/kylinnetworkresourcemanager.h \
+    src/backend/dbus-interface/kylinvpnconnectitem.h \
+    src/backend/dbus-interface/kylinwiredconnectoperation.h \
+    src/backend/dbus-interface/kywirelessconnectoperation.h \
+    src/backend/dbus-interface/kywirelessnetitem.h \
+    src/backend/dbus-interface/kywirelessnetresource.h \
     src/backthread.h \
-    src/kyenterpricesettinginfo.h \
-    src/kylinactiveconnectresource.h \
-    src/kylinbluetoothconnectitem.h \
-    src/kylinconnectitem.h \
-    src/kylinconnectoperation.h \
-    src/kylinconnectresource.h \
-    src/kylinconnectsetting.h \
-    src/kylinnetworkdeviceresource.h \
-    src/kylinnetworkresourcemanager.h \
-    src/kywirelessconnectoperation.h \
-    src/kywirelessnetitem.h \
-    src/kywirelessnetresource.h \
     src/nmdemo.h \
-    src/kylinvpnconnectitem.h \
-    src/kylinwiredconnectoperation.h \
     src/kylinwiredwidget.h \
     src/wifi-auth-thread.h \
     src/confform.h \

src/confform.h

@@ -28,8 +28,8 @@
 #include <QDialog>
 #include <QListView>
 #include "kylin-dbus-interface.h"
-#include "kylinwiredconnectoperation.h"
-#include "kylinconnectsetting.h"
+#include "backend/dbus-interface/kylinwiredconnectoperation.h"
+#include "backend/dbus-interface/kylinconnectsetting.h"
 
 namespace Ui {
 class ConfForm;

src/kylinwiredwidget.h

@@ -2,10 +2,10 @@
 #define KYLINWIREDWIDGET_H
 
 #include <QWidget>
-#include "kylinactiveconnectresource.h"
-#include "kylinconnectresource.h"
-#include "kylinnetworkdeviceresource.h"
-#include "kylinconnectitem.h"
+#include "backend/dbus-interface/kylinactiveconnectresource.h"
+#include "backend/dbus-interface/kylinconnectresource.h"
+#include "backend/dbus-interface/kylinnetworkdeviceresource.h"
+#include "backend/dbus-interface/kylinconnectitem.h"
 #include "onelancform.h"
 #include "mainwindow.h"
 

src/mainwindow.h

@@ -26,7 +26,7 @@
 #include "kylin-network-interface.h"
 #include "utils.h"
 #include "switchbutton.h"
-#include "kylinnetworkresourcemanager.h"
+#include "backend/dbus-interface/kylinnetworkresourcemanager.h"
 #include "kylinwiredwidget.h"
 
 #include <fcntl.h>

src/nmdemo.h

@@ -8,9 +8,9 @@
 #include <QLineEdit>
 #include <QLabel>
 
-#include "kylinnetworkresourcemanager.h"
-#include "kywirelessconnectoperation.h"
-#include "kywirelessnetresource.h"
+#include "backend/dbus-interface/kylinnetworkresourcemanager.h"
+#include "backend/dbus-interface/kywirelessconnectoperation.h"
+#include "backend/dbus-interface/kywirelessnetresource.h"
 
 class NmDemo : public QDialog
 {

src/onelancform.h

@@ -26,10 +26,10 @@
 
 #include "confform.h"
 #include "kylin-network-interface.h"
-#include "kylinwiredconnectoperation.h"
+#include "backend/dbus-interface/kylinwiredconnectoperation.h"
 #include "backthread.h"
 #include "ksimplenm.h"
-#include "kylinconnectitem.h"
+#include "backend/dbus-interface/kylinconnectitem.h"
 
 
 #include <QtDBus/QDBusConnection>