Removed egov services models from shared code.

mobile-datovka.pro

@@ -91,8 +91,6 @@ SOURCES += \
     src/accounts.cpp \
     src/auxiliaries/attachment_helper.cpp \
     src/auxiliaries/email_helper.cpp \
-    src/datovka_shared/gov_services/model/gov_form_list_model.cpp \
-    src/datovka_shared/gov_services/model/gov_service_list_model.cpp \
     src/datovka_shared/gov_services/service/gov_mv_crr_vbh.cpp \
     src/datovka_shared/gov_services/service/gov_mv_ir_vp.cpp \
     src/datovka_shared/gov_services/service/gov_mv_rt_vt.cpp \
@@ -143,6 +141,8 @@ SOURCES += \
     src/dialogues/widget_message_dialogue.cpp \
     src/files.cpp \
     src/global.cpp \
+    src/gov_services/models/gov_form_list_model.cpp \
+    src/gov_services/models/gov_service_list_model.cpp \
     src/gov_wrapper.cpp \
     src/io/filesystem.cpp \
     src/isds/isds_conversion.cpp \
@@ -212,8 +212,6 @@ HEADERS += \
     src/auxiliaries/attachment_helper.h \
     src/auxiliaries/email_helper.h \
     src/common.h \
-    src/datovka_shared/gov_services/model/gov_form_list_model.h \
-    src/datovka_shared/gov_services/model/gov_service_list_model.h \
     src/datovka_shared/gov_services/service/gov_mv_crr_vbh.h \
     src/datovka_shared/gov_services/service/gov_mv_ir_vp.h \
     src/datovka_shared/gov_services/service/gov_mv_rt_vt.h \
@@ -266,6 +264,8 @@ HEADERS += \
     src/dialogues/widget_message_dialogue.h \
     src/files.h \
     src/global.h \
+    src/gov_services/models/gov_form_list_model.h \
+    src/gov_services/models/gov_service_list_model.h \
     src/gov_wrapper.h \
     src/io/db_tables.h \
     src/io/filesystem.h \

src/datovka_shared/gov_services/model/gov_form_list_model.cpp → src/gov_services/models/gov_form_list_model.cpp

@@ -23,7 +23,7 @@
 
 #include <QQmlEngine> /* qmlRegisterType */
 
-#include "src/datovka_shared/gov_services/model/gov_form_list_model.h"
+#include "src/gov_services/models/gov_form_list_model.h"
 
 void GovFormListModel::declareQML(void)
 {

src/datovka_shared/gov_services/model/gov_service_list_model.cpp → src/gov_services/models/gov_service_list_model.cpp

@@ -23,7 +23,7 @@
 
 #include <QQmlEngine> /* qmlRegisterType */
 
-#include "src/datovka_shared/gov_services/model/gov_service_list_model.h"
+#include "src/gov_services/models/gov_service_list_model.h"
 #include "src/datovka_shared/gov_services/service/gov_service.h"
 #include "src/global.h"
 

src/gov_wrapper.cpp

@@ -23,8 +23,6 @@
 
 #include <QScopedPointer>
 
-#include "src/datovka_shared/gov_services/model/gov_form_list_model.h"
-#include "src/datovka_shared/gov_services/model/gov_service_list_model.h"
 #include "src/datovka_shared/gov_services/service/gov_mv_crr_vbh.h"
 #include "src/datovka_shared/gov_services/service/gov_mv_ir_vp.h"
 #include "src/datovka_shared/gov_services/service/gov_mv_rt_vt.h"
@@ -41,6 +39,8 @@
 #include "src/datovka_shared/log/memory_log.h"
 #include "src/dialogues/dialogues.h"
 #include "src/global.h"
+#include "src/gov_services/models/gov_form_list_model.h"
+#include "src/gov_services/models/gov_service_list_model.h"
 #include "src/gov_wrapper.h"
 #include "src/models/accountmodel.h"
 #include "src/net/isds_wrapper.h"

src/main.cpp

@@ -37,8 +37,6 @@
 
 #include "src/accounts.h"
 #include "src/datovka_shared/crypto/crypto_trusted_certs.h"
-#include "src/datovka_shared/gov_services/model/gov_form_list_model.h"
-#include "src/datovka_shared/gov_services/model/gov_service_list_model.h"
 #include "src/datovka_shared/io/records_management_db.h"
 #include "src/datovka_shared/localisation/localisation.h"
 #include "src/datovka_shared/log/log.h"
@@ -50,6 +48,8 @@
 #include "src/dialogues/dialogues.h"
 #include "src/files.h"
 #include "src/global.h"
+#include "src/gov_services/models/gov_form_list_model.h"
+#include "src/gov_services/models/gov_service_list_model.h"
 #include "src/gov_wrapper.h"
 #include "src/io/filesystem.h"
 #include "src/locker.h"