From f0575d8bd5b457a94fb9d87e5451fa4afb94cc28 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 15 May 2023 11:39:29 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83?= =?UTF-8?q?=D1=80=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/CMakeLists.txt | 28 ++++++++++---------- source/model/CmakeLists.txt | 19 ------------- source/view/CmakeLists.txt | 16 ----------- source/{ => view}/model/load.cc | 0 source/{ => view}/model/load.h | 0 source/{ => view}/model/my_device.cc | 0 source/{ => view}/model/my_device.h | 4 +-- source/{ => view}/model/my_process.cc | 0 source/{ => view}/model/my_process.h | 0 source/{ => view}/model/save.cc | 0 source/{ => view}/model/save.h | 0 source/{ => view}/model/system_quotas.cc | 0 source/{ => view}/model/system_quotas.h | 4 +-- source/{ => view}/model/ubconfig_quotas.cc | 0 source/{ => view}/model/ubconfig_quotas.h | 4 +-- source/{ => view}/model/util.cc | 0 source/{ => view}/model/util.h | 2 +- source/{ => view}/model/wrapper_load_save.cc | 0 source/{ => view}/model/wrapper_load_save.h | 4 +-- 19 files changed, 23 insertions(+), 58 deletions(-) delete mode 100644 source/model/CmakeLists.txt delete mode 100644 source/view/CmakeLists.txt rename source/{ => view}/model/load.cc (100%) rename source/{ => view}/model/load.h (100%) rename source/{ => view}/model/my_device.cc (100%) rename source/{ => view}/model/my_device.h (84%) rename source/{ => view}/model/my_process.cc (100%) rename source/{ => view}/model/my_process.h (100%) rename source/{ => view}/model/save.cc (100%) rename source/{ => view}/model/save.h (100%) rename source/{ => view}/model/system_quotas.cc (100%) rename source/{ => view}/model/system_quotas.h (95%) rename source/{ => view}/model/ubconfig_quotas.cc (100%) rename source/{ => view}/model/ubconfig_quotas.h (91%) rename source/{ => view}/model/util.cc (100%) rename source/{ => view}/model/util.h (96%) rename source/{ => view}/model/wrapper_load_save.cc (100%) rename source/{ => view}/model/wrapper_load_save.h (96%) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index d4a9320..73820da 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -33,22 +33,22 @@ set(SOURCE_FILES ubl-settings-diskquota-cm.h view/ubl-settings-diskquota.h view/ubl-settings-diskquota.cc - model/ubconfig_quotas.cc - model/ubconfig_quotas.h - model/system_quotas.h - model/system_quotas.cc - model/my_device.h - model/my_device.cc + view/model/ubconfig_quotas.cc + view/model/ubconfig_quotas.h + view/model/system_quotas.h + view/model/system_quotas.cc + view/model/my_device.h + view/model/my_device.cc project_lib.h my_type.h - model/save.h - model/save.cc - model/load.h - model/load.cc - model/my_process.h - model/my_process.cc - model/util.h - model/util.cc + view/model/save.h + view/model/save.cc + view/model/load.h + view/model/load.cc + view/model/my_process.h + view/model/my_process.cc + view/model/util.h + view/model/util.cc view/my_plug.h view/my_plug.cc view/ubl-util-standard.h diff --git a/source/model/CmakeLists.txt b/source/model/CmakeLists.txt deleted file mode 100644 index 4f88ba8..0000000 --- a/source/model/CmakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -add_library(model -load.cc -load.h -my_device.cc -my_device.h -my_process.cc -my_process.h -save.cc -save.h -system_quotas.cc -system_quotas.h -ubconfig_quotas.cc -ubconfig_quotas.h -util.cc -util.h -wrapper_load_save.cc -wrapper_load_save.h -) -target_include_directories(model PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file diff --git a/source/view/CmakeLists.txt b/source/view/CmakeLists.txt deleted file mode 100644 index c755b28..0000000 --- a/source/view/CmakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -add_library(view -my_plug.cc -my_plug.h -ubl-settings-diskquota.h -ubl-settings-diskquota.cc -ubl-util-standard.h -view_about.cc -view_about.h -view_filters.h -view_filters.cc -view_open_browser.h -view_open_browser.cc -view_set_user_group.h -view_set_user_group.cc -) -target_include_directories(view PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file diff --git a/source/model/load.cc b/source/view/model/load.cc similarity index 100% rename from source/model/load.cc rename to source/view/model/load.cc diff --git a/source/model/load.h b/source/view/model/load.h similarity index 100% rename from source/model/load.h rename to source/view/model/load.h diff --git a/source/model/my_device.cc b/source/view/model/my_device.cc similarity index 100% rename from source/model/my_device.cc rename to source/view/model/my_device.cc diff --git a/source/model/my_device.h b/source/view/model/my_device.h similarity index 84% rename from source/model/my_device.h rename to source/view/model/my_device.h index a4cf9db..73b0e76 100644 --- a/source/model/my_device.h +++ b/source/view/model/my_device.h @@ -1,10 +1,10 @@ #ifndef MY_DEVICE_H #define MY_DEVICE_H -#include "../project_lib.h" +#include "../../project_lib.h" #include "my_process.h" #include "util.h" -#include "../my_type.h" +#include "../../my_type.h" namespace Devices { diff --git a/source/model/my_process.cc b/source/view/model/my_process.cc similarity index 100% rename from source/model/my_process.cc rename to source/view/model/my_process.cc diff --git a/source/model/my_process.h b/source/view/model/my_process.h similarity index 100% rename from source/model/my_process.h rename to source/view/model/my_process.h diff --git a/source/model/save.cc b/source/view/model/save.cc similarity index 100% rename from source/model/save.cc rename to source/view/model/save.cc diff --git a/source/model/save.h b/source/view/model/save.h similarity index 100% rename from source/model/save.h rename to source/view/model/save.h diff --git a/source/model/system_quotas.cc b/source/view/model/system_quotas.cc similarity index 100% rename from source/model/system_quotas.cc rename to source/view/model/system_quotas.cc diff --git a/source/model/system_quotas.h b/source/view/model/system_quotas.h similarity index 95% rename from source/model/system_quotas.h rename to source/view/model/system_quotas.h index a6cc631..65b2b5e 100644 --- a/source/model/system_quotas.h +++ b/source/view/model/system_quotas.h @@ -1,7 +1,7 @@ #ifndef SYSTEM_CMD_QUOTAS #define SYSTEM_CMD_QUOTAS -#include "../project_lib.h" -#include "../my_type.h" +#include "../../project_lib.h" +#include "../../my_type.h" #include "my_process.h" #include "util.h" diff --git a/source/model/ubconfig_quotas.cc b/source/view/model/ubconfig_quotas.cc similarity index 100% rename from source/model/ubconfig_quotas.cc rename to source/view/model/ubconfig_quotas.cc diff --git a/source/model/ubconfig_quotas.h b/source/view/model/ubconfig_quotas.h similarity index 91% rename from source/model/ubconfig_quotas.h rename to source/view/model/ubconfig_quotas.h index 26124d3..8ace1ad 100644 --- a/source/model/ubconfig_quotas.h +++ b/source/view/model/ubconfig_quotas.h @@ -1,8 +1,8 @@ #ifndef UBCONFIG_QUOTAS #define UBCONFIG_QUOTAS -#include "../project_lib.h" -#include "../my_type.h" +#include "../../project_lib.h" +#include "../../my_type.h" #include "my_process.h" #include "util.h" diff --git a/source/model/util.cc b/source/view/model/util.cc similarity index 100% rename from source/model/util.cc rename to source/view/model/util.cc diff --git a/source/model/util.h b/source/view/model/util.h similarity index 96% rename from source/model/util.h rename to source/view/model/util.h index faaee62..5f2fa9d 100644 --- a/source/model/util.h +++ b/source/view/model/util.h @@ -1,6 +1,6 @@ #ifndef UTIL_H #define UTIL_H -#include "../project_lib.h" +#include "../../project_lib.h" using namespace std; diff --git a/source/model/wrapper_load_save.cc b/source/view/model/wrapper_load_save.cc similarity index 100% rename from source/model/wrapper_load_save.cc rename to source/view/model/wrapper_load_save.cc diff --git a/source/model/wrapper_load_save.h b/source/view/model/wrapper_load_save.h similarity index 96% rename from source/model/wrapper_load_save.h rename to source/view/model/wrapper_load_save.h index 7f6a338..a2db82c 100644 --- a/source/model/wrapper_load_save.h +++ b/source/view/model/wrapper_load_save.h @@ -1,7 +1,7 @@ #ifndef WRAPPER_LOAD_H #define WRAPPER_LOAD_H -#include "../my_type.h" -#include "../project_lib.h" +#include "../../my_type.h" +#include "../../project_lib.h" #include "load.h" #include "save.h" #include "my_process.h"