Исправлена структура проекта

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
+        view/model/ubconfig_quotas.cc
-        model/ubconfig_quotas.h
+        view/model/ubconfig_quotas.h
-        model/system_quotas.h
+        view/model/system_quotas.h
-        model/system_quotas.cc
+        view/model/system_quotas.cc
-        model/my_device.h
+        view/model/my_device.h
-        model/my_device.cc
+        view/model/my_device.cc
         project_lib.h
         my_type.h
-        model/save.h
+        view/model/save.h
-        model/save.cc
+        view/model/save.cc
-        model/load.h
+        view/model/load.h
-        model/load.cc
+        view/model/load.cc
-        model/my_process.h
+        view/model/my_process.h
-        model/my_process.cc
+        view/model/my_process.cc
-        model/util.h
+        view/model/util.h
-        model/util.cc
+        view/model/util.cc
         view/my_plug.h
         view/my_plug.cc
         view/ubl-util-standard.h

source/model/CmakeLists.txt

@@ -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})

source/view/CmakeLists.txt

@@ -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})

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 {

source/view/model/system_quotas.h

@@ -1,7 +1,7 @@
 #ifndef SYSTEM_CMD_QUOTAS
 #define SYSTEM_CMD_QUOTAS
-#include "../project_lib.h"
+#include "../../project_lib.h"
-#include "../my_type.h"
+#include "../../my_type.h"
 #include "my_process.h"
 #include "util.h"
 

source/view/model/ubconfig_quotas.h

@@ -1,8 +1,8 @@
 #ifndef UBCONFIG_QUOTAS
 #define UBCONFIG_QUOTAS
 
-#include "../project_lib.h"
+#include "../../project_lib.h"
-#include "../my_type.h"
+#include "../../my_type.h"
 #include "my_process.h"
 #include "util.h"
 

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;
 

source/view/model/wrapper_load_save.h

@@ -1,7 +1,7 @@
 #ifndef WRAPPER_LOAD_H
 #define WRAPPER_LOAD_H
-#include "../my_type.h"
+#include "../../my_type.h"
-#include "../project_lib.h"
+#include "../../project_lib.h"
 #include "load.h"
 #include "save.h"
 #include "my_process.h"