refact1

2026-03-27 19:45:43 +03:00 · 2025-12-05 12:20:47 +03:00
parent 57673d0ee4
commit 05fce073f1
450 changed files with 58 additions and 58 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,14 +30,14 @@ find_package(Qt5 COMPONENTS LinguistTools REQUIRED)
 find_package(Qt5 COMPONENTS Xml REQUIRED)
 find_package(Qt5 COMPONENTS Concurrent REQUIRED)

-add_subdirectory(DataBaseInterface)
-add_subdirectory(InstructorsAndTrainees)
+add_subdirectory(LibDataBaseInterface)
+add_subdirectory(LibInstructorsAndTrainees)
+add_subdirectory(LibServer)
 add_subdirectory(ProgramAWSinstructorMPS)
-add_subdirectory(Server)
 add_subdirectory(ProgramServerMPS)

 add_dependencies(InstructorsAndTrainees DataBaseInterface)
-add_dependencies(ProgramAWSinstructorMPS InstructorsAndTrainees)
 add_dependencies(Server DataBaseInterface)
 add_dependencies(Server InstructorsAndTrainees)
+add_dependencies(ProgramAWSinstructorMPS InstructorsAndTrainees)
 add_dependencies(ProgramServerMPS Server)
--- a/LibDataBaseInterface/CMakeLists.txt
+++ b/LibDataBaseInterface/CMakeLists.txt
@@ -50,26 +50,26 @@ if(PROJECT_TYPE_DEBUG)
    add_custom_command(TARGET DataBaseInterface
 	   POST_BUILD
 	   COMMAND ${CMAKE_COMMAND} -E copy_if_different
-           ${REPO_PATH}/BUILDS/Debug64/DataBaseInterface/libDataBaseInterface.dll
+           ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface/libDataBaseInterface.dll
           ${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS)

    add_custom_command(TARGET DataBaseInterface
 	   POST_BUILD
 	   COMMAND ${CMAKE_COMMAND} -E copy_if_different
-           ${REPO_PATH}/BUILDS/Debug64/DataBaseInterface/libDataBaseInterface.dll
+           ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface/libDataBaseInterface.dll
           ${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMPS)
 else()

    add_custom_command(TARGET DataBaseInterface
 	    POST_BUILD
 	    COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            ${REPO_PATH}/BUILDS/Release64/DataBaseInterface/libDataBaseInterface.dll
+            ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface/libDataBaseInterface.dll
            ${REPO_PATH}/BUILDS/Release64/ProgramServerMPS)

    add_custom_command(TARGET DataBaseInterface
 	     POST_BUILD
 	     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-             ${REPO_PATH}/BUILDS/Release64/DataBaseInterface/libDataBaseInterface.dll
+             ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface/libDataBaseInterface.dll
             ${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMPS)
 endif()

--- a/LibDataBaseInterface/CMakeLists.txt.user.00ce76f
+++ b/LibDataBaseInterface/CMakeLists.txt.user.00ce76f
--- a/LibDataBaseInterface/CMakeLists.txt.user.15ef247
+++ b/LibDataBaseInterface/CMakeLists.txt.user.15ef247
--- a/LibDataBaseInterface/DataBaseInterface.qrc
+++ b/LibDataBaseInterface/DataBaseInterface.qrc
--- a/LibDataBaseInterface/DataBaseLMS.pgerd
+++ b/LibDataBaseInterface/DataBaseLMS.pgerd
--- a/LibDataBaseInterface/DataBaseLMS_global.h
+++ b/LibDataBaseInterface/DataBaseLMS_global.h
--- a/LibDataBaseInterface/basicentity.cpp
+++ b/LibDataBaseInterface/basicentity.cpp
--- a/LibDataBaseInterface/basicentity.h
+++ b/LibDataBaseInterface/basicentity.h
--- a/LibDataBaseInterface/classroom.cpp
+++ b/LibDataBaseInterface/classroom.cpp
--- a/LibDataBaseInterface/classroom.h
+++ b/LibDataBaseInterface/classroom.h
--- a/LibDataBaseInterface/computer.cpp
+++ b/LibDataBaseInterface/computer.cpp
--- a/LibDataBaseInterface/computer.h
+++ b/LibDataBaseInterface/computer.h
--- a/LibDataBaseInterface/contactModel.h
+++ b/LibDataBaseInterface/contactModel.h
--- a/LibDataBaseInterface/databaselms.cpp
+++ b/LibDataBaseInterface/databaselms.cpp
--- a/LibDataBaseInterface/databaselms.h
+++ b/LibDataBaseInterface/databaselms.h
--- a/LibDataBaseInterface/databaselms_Postgresql.cpp
+++ b/LibDataBaseInterface/databaselms_Postgresql.cpp
--- a/LibDataBaseInterface/databaselms_groups.cpp
+++ b/LibDataBaseInterface/databaselms_groups.cpp
--- a/LibDataBaseInterface/databaselms_instructors.cpp
+++ b/LibDataBaseInterface/databaselms_instructors.cpp
--- a/LibDataBaseInterface/databaselms_tasks.cpp
+++ b/LibDataBaseInterface/databaselms_tasks.cpp
--- a/LibDataBaseInterface/databaselms_trainees.cpp
+++ b/LibDataBaseInterface/databaselms_trainees.cpp
--- a/LibDataBaseInterface/databaselms_users.cpp
+++ b/LibDataBaseInterface/databaselms_users.cpp
--- a/LibDataBaseInterface/group.cpp
+++ b/LibDataBaseInterface/group.cpp
--- a/LibDataBaseInterface/group.h
+++ b/LibDataBaseInterface/group.h
--- a/LibDataBaseInterface/hashtools.cpp
+++ b/LibDataBaseInterface/hashtools.cpp
--- a/LibDataBaseInterface/hashtools.h
+++ b/LibDataBaseInterface/hashtools.h
--- a/LibDataBaseInterface/instructor.cpp
+++ b/LibDataBaseInterface/instructor.cpp
--- a/LibDataBaseInterface/instructor.h
+++ b/LibDataBaseInterface/instructor.h
--- a/LibDataBaseInterface/interfacedatabaselms.cpp
+++ b/LibDataBaseInterface/interfacedatabaselms.cpp
--- a/LibDataBaseInterface/interfacedatabaselms.h
+++ b/LibDataBaseInterface/interfacedatabaselms.h
--- a/LibDataBaseInterface/resources/blankXML/ErrorDB.xml
+++ b/LibDataBaseInterface/resources/blankXML/ErrorDB.xml
--- a/LibDataBaseInterface/tasksAmmFim.cpp
+++ b/LibDataBaseInterface/tasksAmmFim.cpp
--- a/LibDataBaseInterface/tasksAmmFim.h
+++ b/LibDataBaseInterface/tasksAmmFim.h
--- a/LibDataBaseInterface/timingoftrainee.cpp
+++ b/LibDataBaseInterface/timingoftrainee.cpp
--- a/LibDataBaseInterface/timingoftrainee.h
+++ b/LibDataBaseInterface/timingoftrainee.h
--- a/LibDataBaseInterface/trainee.cpp
+++ b/LibDataBaseInterface/trainee.cpp
--- a/LibDataBaseInterface/trainee.h
+++ b/LibDataBaseInterface/trainee.h
--- a/LibDataBaseInterface/translations/DataBaseLMS_ru_RU.ts
+++ b/LibDataBaseInterface/translations/DataBaseLMS_ru_RU.ts
--- a/LibDataBaseInterface/typeQueryToDB.h
+++ b/LibDataBaseInterface/typeQueryToDB.h
--- a/LibDataBaseInterface/user.cpp
+++ b/LibDataBaseInterface/user.cpp
--- a/LibDataBaseInterface/user.h
+++ b/LibDataBaseInterface/user.h
--- a/LibInstructorsAndTrainees/CMakeLists.txt
+++ b/LibInstructorsAndTrainees/CMakeLists.txt
@@ -163,11 +163,11 @@ target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_

 target_compile_definitions(InstructorsAndTrainees PRIVATE INSTRUCTORSANDTRAINEES_LIBRARY)

-target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseInterface)
+target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface)
 if(PROJECT_TYPE_DEBUG)
-    target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseInterface)
+    target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface)
 else()
-    target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseInterface)
+    target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface)
 endif()
 target_link_libraries(InstructorsAndTrainees PRIVATE libDataBaseInterface.dll)

@@ -175,24 +175,24 @@ if(PROJECT_TYPE_DEBUG)
    add_custom_command(TARGET InstructorsAndTrainees
                        POST_BUILD
                        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                        ${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
+                        ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll
                        ${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMPS)

    add_custom_command(TARGET InstructorsAndTrainees
                        POST_BUILD
                        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                        ${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
+                        ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll
                        ${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS)
 else()
    add_custom_command(TARGET InstructorsAndTrainees
                        POST_BUILD
                        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                        ${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
+                        ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll
                        ${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMPS)
    add_custom_command(TARGET InstructorsAndTrainees
                        POST_BUILD
                        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                        ${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
+                        ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll
                        ${REPO_PATH}/BUILDS/Release64/ProgramServerMPS)
 endif()

--- a/LibInstructorsAndTrainees/CMakeLists.txt.user.00ce76f
+++ b/LibInstructorsAndTrainees/CMakeLists.txt.user.00ce76f
--- a/LibInstructorsAndTrainees/CMakeLists.txt.user.15ef247
+++ b/LibInstructorsAndTrainees/CMakeLists.txt.user.15ef247
--- a/LibInstructorsAndTrainees/CMakeLists.txt.user.88628a1
+++ b/LibInstructorsAndTrainees/CMakeLists.txt.user.88628a1
--- a/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc
+++ b/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc
--- a/LibInstructorsAndTrainees/authorization/dialogauthorization.cpp
+++ b/LibInstructorsAndTrainees/authorization/dialogauthorization.cpp
--- a/LibInstructorsAndTrainees/authorization/dialogauthorization.h
+++ b/LibInstructorsAndTrainees/authorization/dialogauthorization.h
--- a/LibInstructorsAndTrainees/authorization/dialogauthorization.ui
+++ b/LibInstructorsAndTrainees/authorization/dialogauthorization.ui
--- a/LibInstructorsAndTrainees/commonview.cpp
+++ b/LibInstructorsAndTrainees/commonview.cpp
--- a/LibInstructorsAndTrainees/commonview.h
+++ b/LibInstructorsAndTrainees/commonview.h
--- a/LibInstructorsAndTrainees/connectorToServer/Core/FileData.h
+++ b/LibInstructorsAndTrainees/connectorToServer/Core/FileData.h
--- a/LibInstructorsAndTrainees/connectorToServer/Core/dataparser.cpp
+++ b/LibInstructorsAndTrainees/connectorToServer/Core/dataparser.cpp
--- a/LibInstructorsAndTrainees/connectorToServer/Core/dataparser.h
+++ b/LibInstructorsAndTrainees/connectorToServer/Core/dataparser.h
--- a/LibInstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
+++ b/LibInstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
--- a/LibInstructorsAndTrainees/connectorToServer/Core/recognizesystem.h
+++ b/LibInstructorsAndTrainees/connectorToServer/Core/recognizesystem.h
--- a/LibInstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp
+++ b/LibInstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp
--- a/LibInstructorsAndTrainees/connectorToServer/Core/sendsystem.h
+++ b/LibInstructorsAndTrainees/connectorToServer/Core/sendsystem.h
--- a/LibInstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp
+++ b/LibInstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp
--- a/LibInstructorsAndTrainees/connectorToServer/Core/tcpclient.h
+++ b/LibInstructorsAndTrainees/connectorToServer/Core/tcpclient.h
--- a/LibInstructorsAndTrainees/connectorToServer/Core/tools.cpp
+++ b/LibInstructorsAndTrainees/connectorToServer/Core/tools.cpp
--- a/LibInstructorsAndTrainees/connectorToServer/Core/tools.h
+++ b/LibInstructorsAndTrainees/connectorToServer/Core/tools.h
--- a/LibInstructorsAndTrainees/connectorToServer/Core/versioncontainer.cpp
+++ b/LibInstructorsAndTrainees/connectorToServer/Core/versioncontainer.cpp
--- a/LibInstructorsAndTrainees/connectorToServer/Core/versioncontainer.h
+++ b/LibInstructorsAndTrainees/connectorToServer/Core/versioncontainer.h
--- a/LibInstructorsAndTrainees/connectorToServer/Datas.h
+++ b/LibInstructorsAndTrainees/connectorToServer/Datas.h
--- a/LibInstructorsAndTrainees/connectorToServer/connectortoserver.cpp
+++ b/LibInstructorsAndTrainees/connectorToServer/connectortoserver.cpp
--- a/LibInstructorsAndTrainees/connectorToServer/connectortoserver.h
+++ b/LibInstructorsAndTrainees/connectorToServer/connectortoserver.h
--- a/LibInstructorsAndTrainees/connectorToServer/connectortoserver_AnswerQueryToDB.cpp
+++ b/LibInstructorsAndTrainees/connectorToServer/connectortoserver_AnswerQueryToDB.cpp
--- a/LibInstructorsAndTrainees/connectorToServer/connectortoserver_LocalModelDB.cpp
+++ b/LibInstructorsAndTrainees/connectorToServer/connectortoserver_LocalModelDB.cpp
--- a/LibInstructorsAndTrainees/connectorToServer/connectortoserver_Send.cpp
+++ b/LibInstructorsAndTrainees/connectorToServer/connectortoserver_Send.cpp
--- a/LibInstructorsAndTrainees/connectorToServer/streamingversiondata.h
+++ b/LibInstructorsAndTrainees/connectorToServer/streamingversiondata.h
--- a/LibInstructorsAndTrainees/dialognewpassword.cpp
+++ b/LibInstructorsAndTrainees/dialognewpassword.cpp
--- a/LibInstructorsAndTrainees/dialognewpassword.h
+++ b/LibInstructorsAndTrainees/dialognewpassword.h
--- a/LibInstructorsAndTrainees/dialognewpassword.ui
+++ b/LibInstructorsAndTrainees/dialognewpassword.ui
--- a/LibInstructorsAndTrainees/instructors/dialogeditinstructor.cpp
+++ b/LibInstructorsAndTrainees/instructors/dialogeditinstructor.cpp
--- a/LibInstructorsAndTrainees/instructors/dialogeditinstructor.h
+++ b/LibInstructorsAndTrainees/instructors/dialogeditinstructor.h
--- a/LibInstructorsAndTrainees/instructors/dialogeditinstructor.ui
+++ b/LibInstructorsAndTrainees/instructors/dialogeditinstructor.ui
--- a/LibInstructorsAndTrainees/instructors/dialogredactorinstructors.cpp
+++ b/LibInstructorsAndTrainees/instructors/dialogredactorinstructors.cpp
--- a/LibInstructorsAndTrainees/instructors/dialogredactorinstructors.h
+++ b/LibInstructorsAndTrainees/instructors/dialogredactorinstructors.h
--- a/LibInstructorsAndTrainees/instructors/editorinstructors.cpp
+++ b/LibInstructorsAndTrainees/instructors/editorinstructors.cpp
--- a/LibInstructorsAndTrainees/instructors/editorinstructors.h
+++ b/LibInstructorsAndTrainees/instructors/editorinstructors.h
--- a/LibInstructorsAndTrainees/instructors/editorinstructors.ui
+++ b/LibInstructorsAndTrainees/instructors/editorinstructors.ui
--- a/LibInstructorsAndTrainees/instructors/instructorsview.cpp
+++ b/LibInstructorsAndTrainees/instructors/instructorsview.cpp
--- a/LibInstructorsAndTrainees/instructors/instructorsview.h
+++ b/LibInstructorsAndTrainees/instructors/instructorsview.h
--- a/LibInstructorsAndTrainees/instructors/viewerinstructors.cpp
+++ b/LibInstructorsAndTrainees/instructors/viewerinstructors.cpp
--- a/LibInstructorsAndTrainees/instructors/viewerinstructors.h
+++ b/LibInstructorsAndTrainees/instructors/viewerinstructors.h
--- a/LibInstructorsAndTrainees/instructors/viewerinstructors.ui
+++ b/LibInstructorsAndTrainees/instructors/viewerinstructors.ui
--- a/LibInstructorsAndTrainees/instructorsAndTrainees_global.h
+++ b/LibInstructorsAndTrainees/instructorsAndTrainees_global.h
--- a/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp
+++ b/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp
--- a/LibInstructorsAndTrainees/instructorsandtraineeswidget.h
+++ b/LibInstructorsAndTrainees/instructorsandtraineeswidget.h
--- a/LibInstructorsAndTrainees/instructorsandtraineeswidget.ui
+++ b/LibInstructorsAndTrainees/instructorsandtraineeswidget.ui
--- a/LibInstructorsAndTrainees/messanger/messangercontroller.cpp
+++ b/LibInstructorsAndTrainees/messanger/messangercontroller.cpp
--- a/LibInstructorsAndTrainees/messanger/messangercontroller.h
+++ b/LibInstructorsAndTrainees/messanger/messangercontroller.h
--- a/LibInstructorsAndTrainees/messanger/messangerwidget.cpp
+++ b/LibInstructorsAndTrainees/messanger/messangerwidget.cpp
--- a/LibInstructorsAndTrainees/messanger/messangerwidget.h
+++ b/LibInstructorsAndTrainees/messanger/messangerwidget.h
--- a/LibInstructorsAndTrainees/messanger/messangerwidget.ui
+++ b/LibInstructorsAndTrainees/messanger/messangerwidget.ui
--- a/LibInstructorsAndTrainees/messanger/msgwidget.cpp
+++ b/LibInstructorsAndTrainees/messanger/msgwidget.cpp
--- a/LibInstructorsAndTrainees/messanger/msgwidget.h
+++ b/LibInstructorsAndTrainees/messanger/msgwidget.h
--- a/LibInstructorsAndTrainees/messanger/msgwidget.ui
+++ b/LibInstructorsAndTrainees/messanger/msgwidget.ui
--- a/LibInstructorsAndTrainees/messanger/tabdialogmessenger.cpp
+++ b/LibInstructorsAndTrainees/messanger/tabdialogmessenger.cpp
--- a/Show More
+++ b/Show More