From d194144fd2de7e78a9e25b791ccdb5ebe0a70bc2 Mon Sep 17 00:00:00 2001 From: renpeijia Date: Mon, 9 Aug 2021 16:18:35 +0800 Subject: [PATCH] modify:move files of dbus-interface to src/backend/dbus-interface/ --- kylin-nm.pro | 56 +++++++++---------- .../kyenterpricesettinginfo.cpp | 0 .../dbus-interface}/kyenterpricesettinginfo.h | 0 .../kylinactiveconnectresource.cpp | 0 .../kylinactiveconnectresource.h | 0 .../kylinbluetoothconnectitem.cpp | 0 .../kylinbluetoothconnectitem.h | 0 .../dbus-interface}/kylinconnectitem.cpp | 0 .../dbus-interface}/kylinconnectitem.h | 0 .../dbus-interface}/kylinconnectoperation.cpp | 0 .../dbus-interface}/kylinconnectoperation.h | 0 .../dbus-interface}/kylinconnectresource.cpp | 0 .../dbus-interface}/kylinconnectresource.h | 0 .../dbus-interface}/kylinconnectsetting.cpp | 0 .../dbus-interface}/kylinconnectsetting.h | 0 .../kylinnetworkdeviceresource.cpp | 0 .../kylinnetworkdeviceresource.h | 0 .../kylinnetworkresourcemanager.cpp | 0 .../kylinnetworkresourcemanager.h | 0 .../dbus-interface}/kylinvpnconnectitem.cpp | 0 .../dbus-interface}/kylinvpnconnectitem.h | 0 .../kylinwiredconnectoperation.cpp | 0 .../kylinwiredconnectoperation.h | 0 .../kywirelessconnectoperation.cpp | 0 .../kywirelessconnectoperation.h | 0 .../dbus-interface}/kywirelessnetitem.cpp | 0 .../dbus-interface}/kywirelessnetitem.h | 0 .../dbus-interface}/kywirelessnetresource.cpp | 0 .../dbus-interface}/kywirelessnetresource.h | 0 src/confform.h | 4 +- src/kylinwiredwidget.h | 8 +-- src/mainwindow.h | 2 +- src/nmdemo.h | 6 +- src/onelancform.h | 4 +- 34 files changed, 40 insertions(+), 40 deletions(-) rename src/{ => backend/dbus-interface}/kyenterpricesettinginfo.cpp (100%) rename src/{ => backend/dbus-interface}/kyenterpricesettinginfo.h (100%) rename src/{ => backend/dbus-interface}/kylinactiveconnectresource.cpp (100%) rename src/{ => backend/dbus-interface}/kylinactiveconnectresource.h (100%) rename src/{ => backend/dbus-interface}/kylinbluetoothconnectitem.cpp (100%) rename src/{ => backend/dbus-interface}/kylinbluetoothconnectitem.h (100%) rename src/{ => backend/dbus-interface}/kylinconnectitem.cpp (100%) rename src/{ => backend/dbus-interface}/kylinconnectitem.h (100%) rename src/{ => backend/dbus-interface}/kylinconnectoperation.cpp (100%) rename src/{ => backend/dbus-interface}/kylinconnectoperation.h (100%) rename src/{ => backend/dbus-interface}/kylinconnectresource.cpp (100%) rename src/{ => backend/dbus-interface}/kylinconnectresource.h (100%) rename src/{ => backend/dbus-interface}/kylinconnectsetting.cpp (100%) rename src/{ => backend/dbus-interface}/kylinconnectsetting.h (100%) rename src/{ => backend/dbus-interface}/kylinnetworkdeviceresource.cpp (100%) rename src/{ => backend/dbus-interface}/kylinnetworkdeviceresource.h (100%) rename src/{ => backend/dbus-interface}/kylinnetworkresourcemanager.cpp (100%) rename src/{ => backend/dbus-interface}/kylinnetworkresourcemanager.h (100%) rename src/{ => backend/dbus-interface}/kylinvpnconnectitem.cpp (100%) rename src/{ => backend/dbus-interface}/kylinvpnconnectitem.h (100%) rename src/{ => backend/dbus-interface}/kylinwiredconnectoperation.cpp (100%) rename src/{ => backend/dbus-interface}/kylinwiredconnectoperation.h (100%) rename src/{ => backend/dbus-interface}/kywirelessconnectoperation.cpp (100%) rename src/{ => backend/dbus-interface}/kywirelessconnectoperation.h (100%) rename src/{ => backend/dbus-interface}/kywirelessnetitem.cpp (100%) rename src/{ => backend/dbus-interface}/kywirelessnetitem.h (100%) rename src/{ => backend/dbus-interface}/kywirelessnetresource.cpp (100%) rename src/{ => backend/dbus-interface}/kywirelessnetresource.h (100%) diff --git a/kylin-nm.pro b/kylin-nm.pro index d89ad24e..20ee8879 100644 --- a/kylin-nm.pro +++ b/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 \ diff --git a/src/kyenterpricesettinginfo.cpp b/src/backend/dbus-interface/kyenterpricesettinginfo.cpp similarity index 100% rename from src/kyenterpricesettinginfo.cpp rename to src/backend/dbus-interface/kyenterpricesettinginfo.cpp diff --git a/src/kyenterpricesettinginfo.h b/src/backend/dbus-interface/kyenterpricesettinginfo.h similarity index 100% rename from src/kyenterpricesettinginfo.h rename to src/backend/dbus-interface/kyenterpricesettinginfo.h diff --git a/src/kylinactiveconnectresource.cpp b/src/backend/dbus-interface/kylinactiveconnectresource.cpp similarity index 100% rename from src/kylinactiveconnectresource.cpp rename to src/backend/dbus-interface/kylinactiveconnectresource.cpp diff --git a/src/kylinactiveconnectresource.h b/src/backend/dbus-interface/kylinactiveconnectresource.h similarity index 100% rename from src/kylinactiveconnectresource.h rename to src/backend/dbus-interface/kylinactiveconnectresource.h diff --git a/src/kylinbluetoothconnectitem.cpp b/src/backend/dbus-interface/kylinbluetoothconnectitem.cpp similarity index 100% rename from src/kylinbluetoothconnectitem.cpp rename to src/backend/dbus-interface/kylinbluetoothconnectitem.cpp diff --git a/src/kylinbluetoothconnectitem.h b/src/backend/dbus-interface/kylinbluetoothconnectitem.h similarity index 100% rename from src/kylinbluetoothconnectitem.h rename to src/backend/dbus-interface/kylinbluetoothconnectitem.h diff --git a/src/kylinconnectitem.cpp b/src/backend/dbus-interface/kylinconnectitem.cpp similarity index 100% rename from src/kylinconnectitem.cpp rename to src/backend/dbus-interface/kylinconnectitem.cpp diff --git a/src/kylinconnectitem.h b/src/backend/dbus-interface/kylinconnectitem.h similarity index 100% rename from src/kylinconnectitem.h rename to src/backend/dbus-interface/kylinconnectitem.h diff --git a/src/kylinconnectoperation.cpp b/src/backend/dbus-interface/kylinconnectoperation.cpp similarity index 100% rename from src/kylinconnectoperation.cpp rename to src/backend/dbus-interface/kylinconnectoperation.cpp diff --git a/src/kylinconnectoperation.h b/src/backend/dbus-interface/kylinconnectoperation.h similarity index 100% rename from src/kylinconnectoperation.h rename to src/backend/dbus-interface/kylinconnectoperation.h diff --git a/src/kylinconnectresource.cpp b/src/backend/dbus-interface/kylinconnectresource.cpp similarity index 100% rename from src/kylinconnectresource.cpp rename to src/backend/dbus-interface/kylinconnectresource.cpp diff --git a/src/kylinconnectresource.h b/src/backend/dbus-interface/kylinconnectresource.h similarity index 100% rename from src/kylinconnectresource.h rename to src/backend/dbus-interface/kylinconnectresource.h diff --git a/src/kylinconnectsetting.cpp b/src/backend/dbus-interface/kylinconnectsetting.cpp similarity index 100% rename from src/kylinconnectsetting.cpp rename to src/backend/dbus-interface/kylinconnectsetting.cpp diff --git a/src/kylinconnectsetting.h b/src/backend/dbus-interface/kylinconnectsetting.h similarity index 100% rename from src/kylinconnectsetting.h rename to src/backend/dbus-interface/kylinconnectsetting.h diff --git a/src/kylinnetworkdeviceresource.cpp b/src/backend/dbus-interface/kylinnetworkdeviceresource.cpp similarity index 100% rename from src/kylinnetworkdeviceresource.cpp rename to src/backend/dbus-interface/kylinnetworkdeviceresource.cpp diff --git a/src/kylinnetworkdeviceresource.h b/src/backend/dbus-interface/kylinnetworkdeviceresource.h similarity index 100% rename from src/kylinnetworkdeviceresource.h rename to src/backend/dbus-interface/kylinnetworkdeviceresource.h diff --git a/src/kylinnetworkresourcemanager.cpp b/src/backend/dbus-interface/kylinnetworkresourcemanager.cpp similarity index 100% rename from src/kylinnetworkresourcemanager.cpp rename to src/backend/dbus-interface/kylinnetworkresourcemanager.cpp diff --git a/src/kylinnetworkresourcemanager.h b/src/backend/dbus-interface/kylinnetworkresourcemanager.h similarity index 100% rename from src/kylinnetworkresourcemanager.h rename to src/backend/dbus-interface/kylinnetworkresourcemanager.h diff --git a/src/kylinvpnconnectitem.cpp b/src/backend/dbus-interface/kylinvpnconnectitem.cpp similarity index 100% rename from src/kylinvpnconnectitem.cpp rename to src/backend/dbus-interface/kylinvpnconnectitem.cpp diff --git a/src/kylinvpnconnectitem.h b/src/backend/dbus-interface/kylinvpnconnectitem.h similarity index 100% rename from src/kylinvpnconnectitem.h rename to src/backend/dbus-interface/kylinvpnconnectitem.h diff --git a/src/kylinwiredconnectoperation.cpp b/src/backend/dbus-interface/kylinwiredconnectoperation.cpp similarity index 100% rename from src/kylinwiredconnectoperation.cpp rename to src/backend/dbus-interface/kylinwiredconnectoperation.cpp diff --git a/src/kylinwiredconnectoperation.h b/src/backend/dbus-interface/kylinwiredconnectoperation.h similarity index 100% rename from src/kylinwiredconnectoperation.h rename to src/backend/dbus-interface/kylinwiredconnectoperation.h diff --git a/src/kywirelessconnectoperation.cpp b/src/backend/dbus-interface/kywirelessconnectoperation.cpp similarity index 100% rename from src/kywirelessconnectoperation.cpp rename to src/backend/dbus-interface/kywirelessconnectoperation.cpp diff --git a/src/kywirelessconnectoperation.h b/src/backend/dbus-interface/kywirelessconnectoperation.h similarity index 100% rename from src/kywirelessconnectoperation.h rename to src/backend/dbus-interface/kywirelessconnectoperation.h diff --git a/src/kywirelessnetitem.cpp b/src/backend/dbus-interface/kywirelessnetitem.cpp similarity index 100% rename from src/kywirelessnetitem.cpp rename to src/backend/dbus-interface/kywirelessnetitem.cpp diff --git a/src/kywirelessnetitem.h b/src/backend/dbus-interface/kywirelessnetitem.h similarity index 100% rename from src/kywirelessnetitem.h rename to src/backend/dbus-interface/kywirelessnetitem.h diff --git a/src/kywirelessnetresource.cpp b/src/backend/dbus-interface/kywirelessnetresource.cpp similarity index 100% rename from src/kywirelessnetresource.cpp rename to src/backend/dbus-interface/kywirelessnetresource.cpp diff --git a/src/kywirelessnetresource.h b/src/backend/dbus-interface/kywirelessnetresource.h similarity index 100% rename from src/kywirelessnetresource.h rename to src/backend/dbus-interface/kywirelessnetresource.h diff --git a/src/confform.h b/src/confform.h index 4fcd6fcf..92d8929a 100644 --- a/src/confform.h +++ b/src/confform.h @@ -28,8 +28,8 @@ #include #include #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; diff --git a/src/kylinwiredwidget.h b/src/kylinwiredwidget.h index 6f9a3371..75879a15 100644 --- a/src/kylinwiredwidget.h +++ b/src/kylinwiredwidget.h @@ -2,10 +2,10 @@ #define KYLINWIREDWIDGET_H #include -#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" diff --git a/src/mainwindow.h b/src/mainwindow.h index 5f8cb0ab..092ce377 100644 --- a/src/mainwindow.h +++ b/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 diff --git a/src/nmdemo.h b/src/nmdemo.h index 9ed2a76d..194b4868 100644 --- a/src/nmdemo.h +++ b/src/nmdemo.h @@ -8,9 +8,9 @@ #include #include -#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 { diff --git a/src/onelancform.h b/src/onelancform.h index 393a5934..2a9010c0 100644 --- a/src/onelancform.h +++ b/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