Move files from controller to model

tprigent · May 23, 2021 · f6f6f26 · f6f6f26
1 parent d822e38
commit f6f6f26
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,11 +33,11 @@ set(SOURCE_FILES
         src/controller/extern_files_manager.c
         src/model/structures.h
         src/controller/struct_to_BDD_patient.c
-        src/controller/BDD_to_struct_patient.c
+        src/model/BDD_to_struct_patient.c
         src/controller/struct_to_BDD_folder.c
         src/controller/struct_to_BDD_session.c
-        src/controller/BDD_to_struct_session.c
-        src/controller/BDD_to_struct_folder.c)
+        src/model/BDD_to_struct_session.c
+        src/model/BDD_to_struct_folder.c)
 
 add_executable(Kinesia ${SOURCE_FILES})
 
@@ -86,9 +86,9 @@ set(SOURCE_FILES_TEST
         src/controller/struct_to_BDD_patient.c
         src/controller/struct_to_BDD_folder.c
         src/controller/struct_to_BDD_session.c
-        src/controller/BDD_to_struct_patient.c
-        src/controller/BDD_to_struct_session.c
-        src/controller/BDD_to_struct_folder.c)
+        src/model/BDD_to_struct_patient.c
+        src/model/BDD_to_struct_session.c
+        src/model/BDD_to_struct_folder.c)
 
 add_executable(UnitTest tests/UTest.c ${SOURCE_FILES_TEST})
 

diff --git a/src/model/BDD_to_struct_folder.c b/src/model/BDD_to_struct_folder.c
@@ -7,7 +7,7 @@
 #include <sqlite3.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "../model/folder_manager.h"
+#include "folder_manager.h"
 #include <string.h>
 
 /*!

diff --git a/src/model/BDD_to_struct_folder.h b/src/model/BDD_to_struct_folder.h
@@ -6,7 +6,7 @@
 #ifndef LOGICIEL_KINE_BDD_TO_STRUCT_FOLDER_H
 #define LOGICIEL_KINE_BDD_TO_STRUCT_FOLDER_H
 
-#include "../model/structures.h"
+#include "structures.h"
 
 int getNbFolder(int idPatient);
 Folder* getFolder(int idFolder);

diff --git a/src/model/BDD_to_struct_patient.c b/src/model/BDD_to_struct_patient.c
@@ -4,7 +4,7 @@
 */
 
 #include "BDD_to_struct_patient.h"
-#include "../model/patient_manager.h"
+#include "patient_manager.h"
 #include <string.h>
 #include <sqlite3.h>
 #include <stdlib.h>

diff --git a/src/model/BDD_to_struct_patient.h b/src/model/BDD_to_struct_patient.h
@@ -6,7 +6,7 @@
 #ifndef LOGICIEL_KINE_BDD_TO_STRUCT_PATIENT_H
 #define LOGICIEL_KINE_BDD_TO_STRUCT_PATIENT_H
 
-#include "../model/structures.h"
+#include "structures.h"
 
 int getNbPatient(Archived a);
 char* getNameFirstnamePatient(int id);

diff --git a/src/model/BDD_to_struct_session.c b/src/model/BDD_to_struct_session.c
@@ -4,8 +4,8 @@
 */
 
 #include "BDD_to_struct_session.h"
-#include "../model/session_manager.h"
-#include "display_helpers.h"
+#include "session_manager.h"
+#include "../controller/display_helpers.h"
 #include <sqlite3.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/model/BDD_to_struct_session.h b/src/model/BDD_to_struct_session.h
@@ -6,7 +6,7 @@
 #ifndef LOGICIEL_KINE_BDD_TO_STRUCT_SESSION_H
 #define LOGICIEL_KINE_BDD_TO_STRUCT_SESSION_H
 
-#include "../model/structures.h"
+#include "structures.h"
 
 Session * getSession(int idSession);
 Session * getSession0(int idFolder);

diff --git a/src/view/editor_views.c b/src/view/editor_views.c
@@ -13,8 +13,8 @@
 #include "../controller/struct_to_BDD_patient.h"
 #include "../controller/struct_to_BDD_session.h"
 #include "../controller/struct_to_BDD_folder.h"
-#include "../controller/BDD_to_struct_folder.h"
-#include "../controller/BDD_to_struct_session.h"
+#include "../model/BDD_to_struct_folder.h"
+#include "../model/BDD_to_struct_session.h"
 #include "../controller/display_helpers.h"
 #include "../controller/UI_to_struct.h"
 #include "../model/folder_manager.h"

diff --git a/src/view/editor_views.h b/src/view/editor_views.h
@@ -8,7 +8,7 @@
 
 #include "../model/structures.h"
 #include "../model/patient_manager.h"
-#include "../controller/BDD_to_struct_patient.h"
+#include "../model/BDD_to_struct_patient.h"
 #include "../controller/extern_files_manager.h"
 
 /**

diff --git a/src/view/home_view.c b/src/view/home_view.c
@@ -8,8 +8,8 @@
 #include "work_view.h"
 #include "editor_views.h"
 #include "../controller/display_helpers.h"
-#include "../controller/BDD_to_struct_session.h"
-#include "../controller/BDD_to_struct_folder.h"
+#include "../model/BDD_to_struct_session.h"
+#include "../model/BDD_to_struct_folder.h"
 #include "../model/patient_manager.h"
 #include "../model/folder_manager.h"
 #include "../model/session_manager.h"

diff --git a/src/view/work_view.c b/src/view/work_view.c
@@ -10,8 +10,8 @@
 #include "editor_views.h"
 #include "../controller/UI_to_struct.h"
 #include "../controller/display_helpers.h"
-#include "../controller/BDD_to_struct_folder.h"
-#include "../controller/BDD_to_struct_session.h"
+#include "../model/BDD_to_struct_folder.h"
+#include "../model/BDD_to_struct_session.h"
 #include "../controller/struct_to_BDD_session.h"
 #include "../model/session_manager.h"