diff --git a/DB_IaT/Debug64/.ninja_deps b/DB_IaT/Debug64/.ninja_deps index 2dd71b9..560b51c 100644 Binary files a/DB_IaT/Debug64/.ninja_deps and b/DB_IaT/Debug64/.ninja_deps differ diff --git a/DB_IaT/Debug64/.ninja_log b/DB_IaT/Debug64/.ninja_log index a5c3f6e..f74d948 100644 --- a/DB_IaT/Debug64/.ninja_log +++ b/DB_IaT/Debug64/.ninja_log @@ -1,89 +1,154 @@ # ninja log v5 -1400 1526 7554403513026725 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -83 2371 7560612368844534 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b -80 2215 7560612367304363 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 -21 63 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -2683 3428 7560612378874436 libInstructorsAndTrainees.dll.a c1e915765a645e23 -21 63 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -90 2120 7560612366345595 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de -4398 4745 7554403545178109 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 305a6e3310d2037b -374 1491 7558001940578855 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 8b56e47f4dc12dfc -47 59 0 clean 9c4b4372737ab8da -21 63 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -21 63 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -4063 6185 7554403559590571 CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj 481eedcb91b88485 -21 63 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -1400 1526 7554403513026725 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c -21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -21 63 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -72 2392 7560612369105271 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 -417 2216 7560471257446302 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj 9ad1bf13dc80c680 -21 63 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -21 63 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -1578 4794 7554403545565259 CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj eaab4dd1a4821d3d -69 2074 7560612365897921 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 -489 2055 7560378913951554 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj fb0943d52b183a47 -21 63 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -1565 4028 7554403537718314 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj f93eecf151ea8490 -16 47 0 CMakeFiles/clean.additional 7155004b3956b606 -74 2111 7560612366245861 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 -2683 3428 7560612378874436 libInstructorsAndTrainees.dll c1e915765a645e23 -21 63 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -21 63 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -1573 4657 7554403543966835 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj c57be72ccb40ac81 -21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -21 63 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -21 63 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -94 1839 7560612363554957 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj ddd815f2ca650c79 +18 389 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +18 389 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +39 49 0 clean 9c4b4372737ab8da +1563 4191 7561300423539017 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogeditinstructor.cpp.obj 8b56e47f4dc12dfc +18 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +18 389 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +2164 2912 7561302047976178 libInstructorsAndTrainees.dll.a c1e915765a645e23 +18 389 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +407 2294 7561308705377540 CMakeFiles/InstructorsAndTrainees.dir/instructors/viewerinstructors.cpp.obj 7ddeadbf3b0dea24 +4584 4946 7561300431368401 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp.obj 305a6e3310d2037b +418 2419 7561308706610242 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj 8fc854e83acd17de +410 2650 7561308708955176 CMakeFiles/InstructorsAndTrainees.dir/instructors/editorinstructors.cpp.obj d4fbe9d883edc93b +1394 1529 7561300397279283 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c +4213 6427 7561300446255078 CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj 481eedcb91b88485 +395 2289 7561308705327672 CMakeFiles/InstructorsAndTrainees.dir/commonview.cpp.obj fed61e18b9b49808 +1581 4985 7561300431827175 CMakeFiles/InstructorsAndTrainees.dir/docTasks/doctaskswidget.cpp.obj eaab4dd1a4821d3d +18 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +18 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +18 389 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +398 2641 7561308708845465 CMakeFiles/InstructorsAndTrainees.dir/trainees/editortrainees.cpp.obj 2eb29bce9ccb4f74 +18 389 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +2961 5704 7561300439036917 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj 9ad1bf13dc80c680 +18 389 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +18 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +1394 1529 7561300397279283 InstructorsAndTrainees_autogen/EWIEGA46WW/qrc_resources.cpp f2ed85aad0f78c7c +18 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +18 389 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +1540 4212 7561300423718538 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogeditgroup.cpp.obj fb0943d52b183a47 +18 389 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +1567 4070 7561300422337129 CMakeFiles/InstructorsAndTrainees.dir/instructors/dialogauthorizationinstructor.cpp.obj f93eecf151ea8490 +9 39 0 CMakeFiles/clean.additional 7155004b3956b606 +400 2499 7561308707439185 CMakeFiles/InstructorsAndTrainees.dir/trainees/viewertrainees.cpp.obj fdca52f2b0e8f989 +2164 2912 7561302047976178 libInstructorsAndTrainees.dll c1e915765a645e23 +18 389 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +18 389 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +1577 4904 7561300430899659 CMakeFiles/InstructorsAndTrainees.dir/tasks/taskswidget.cpp.obj c57be72ccb40ac81 +18 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +18 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +18 389 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +18 389 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +18 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +3216 5780 7561300439786890 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj ddd815f2ca650c79 15 276 7560367350521828 build.ninja 76aa11f472515be0 -77 2234 7560612367514596 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b -21 63 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -1543 3051 7554403527720657 CMakeFiles/InstructorsAndTrainees.dir/trainees/computersLocations.cpp.obj d6745e62ffbfb46 -491 2059 7560378913981469 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj 580c1c7cd7084a9f -66 2682 7560612371974262 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 -21 63 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -431 2002 7555250082834355 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj bec4c837d4b193f1 -64 2552 7560612370693881 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de -21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -101 1677 7560612361930750 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj 8ca63217f4ebd7bf -21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -87 2216 7560612367304363 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 -21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -1582 2944 7554403526627168 CMakeFiles/InstructorsAndTrainees.dir/docTasks/module.cpp.obj 7e450168ba24c81a -97 2148 7560612366593743 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj fdf4a5794596b63d -21 63 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -19 57 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -19 57 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -19 57 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -19 57 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -19 57 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -19 57 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -19 57 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -19 57 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 -19 57 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 -19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 -19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 -19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 -19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 -19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 -19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 -19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 -19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 -19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 -19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 -19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 -19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 -19 57 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +403 2462 7561308707059042 CMakeFiles/InstructorsAndTrainees.dir/trainees/traineesview.cpp.obj a3eaea1c64402a5b +18 389 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +1546 2961 7561300411336063 CMakeFiles/InstructorsAndTrainees.dir/trainees/computersLocations.cpp.obj d6745e62ffbfb46 +1543 4137 7561300422751128 CMakeFiles/InstructorsAndTrainees.dir/trainees/dialogedittrainee.cpp.obj 580c1c7cd7084a9f +428 2164 7561302041079745 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 +18 389 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +18 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +4191 5891 7561300440891451 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj bec4c837d4b193f1 +390 2787 7561308710321971 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de +18 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +425 1940 7561308701838194 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj 8ca63217f4ebd7bf +18 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +414 2368 7561308706121555 CMakeFiles/InstructorsAndTrainees.dir/instructors/instructorsview.cpp.obj 129517285e22bd60 +18 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +1585 3216 7561300413689931 CMakeFiles/InstructorsAndTrainees.dir/docTasks/module.cpp.obj 7e450168ba24c81a +421 2354 7561308705965961 CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj fdf4a5794596b63d +18 389 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +20 394 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +20 394 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +20 394 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +20 394 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +20 394 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +20 394 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +20 394 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +20 394 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +20 394 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +20 394 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +20 394 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +20 394 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +20 394 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +20 394 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +20 394 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +20 394 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +20 394 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +20 394 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +20 394 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +20 394 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +20 394 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +20 394 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +20 394 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +20 394 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +20 394 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +20 394 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +20 394 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +20 394 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +394 2021 7561309408641304 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de +397 2154 7561309409973464 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 +18 58 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +18 58 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +18 58 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +18 58 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +18 58 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +18 58 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +18 58 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +18 58 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +18 58 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +18 58 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +18 58 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +18 58 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +18 58 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +18 58 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +18 58 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +18 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +18 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +18 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +18 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +18 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +18 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +18 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +18 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +18 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +18 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +18 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +18 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +18 58 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +59 1391 7561309684402039 CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj 481eedcb91b88485 +1391 2167 7561309691614194 libInstructorsAndTrainees.dll c1e915765a645e23 +1391 2167 7561309691614194 libInstructorsAndTrainees.dll.a c1e915765a645e23 +20 419 0 CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +20 419 0 InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +20 419 0 InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +20 419 0 InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +20 419 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +20 419 0 InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +20 419 0 InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +20 419 0 InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +20 419 0 InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +20 419 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +20 419 0 InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +20 419 0 InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +20 419 0 InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +20 419 0 InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +20 419 0 D:/LMS/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen 325fc9931da2ad77 +20 419 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/mocs_compilation.cpp 325fc9931da2ad77 +20 419 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/ui_instructorsandtraineeswidget.h 325fc9931da2ad77 +20 419 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_editortrainees.h 325fc9931da2ad77 +20 419 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogeditgroup.h 325fc9931da2ad77 +20 419 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_dialogedittrainee.h 325fc9931da2ad77 +20 419 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/trainees/ui_viewertrainees.h 325fc9931da2ad77 +20 419 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_viewerinstructors.h 325fc9931da2ad77 +20 419 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_editorinstructors.h 325fc9931da2ad77 +20 419 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogeditinstructor.h 325fc9931da2ad77 +20 419 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/instructors/ui_dialogauthorizationinstructor.h 325fc9931da2ad77 +20 419 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/tasks/ui_taskswidget.h 325fc9931da2ad77 +20 419 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/docTasks/ui_doctaskswidget.h 325fc9931da2ad77 +20 419 0 D:/LMS/DB_IaT/Debug64/InstructorsAndTrainees_autogen/include/messanger/ui_messangerwidget.h 325fc9931da2ad77 +420 1999 7561313012430981 CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj fe245428360a3de +422 2170 7561313014140114 CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj 4bdc1eb7edfd1941 +2170 2905 7561313020906388 libInstructorsAndTrainees.dll c1e915765a645e23 +2170 2905 7561313020906388 libInstructorsAndTrainees.dll.a c1e915765a645e23 diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj index 0731fc2..623b020 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/InstructorsAndTrainees_autogen/mocs_compilation.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj index 6798430..45abcdf 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/dataparser.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj index 96f645c..bd0e3df 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/recognizesystem.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj index c33eb05..2b81827 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/sendsystem.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj index f41096c..50ee0f5 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tcpclient.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj index e9a9aab..0e3df20 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/Core/tools.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj index 5a29c36..219db31 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/connectorToServer/connectortoserver.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj index 9583f8a..a759d6f 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/instructorsandtraineeswidget.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj index 82c4e3c..37b405b 100644 Binary files a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj and b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees.dir/messanger/messangerwidget.cpp.obj differ diff --git a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt index 7f07ecd..a655012 100644 --- a/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt +++ b/DB_IaT/Debug64/CMakeFiles/InstructorsAndTrainees_autogen.dir/ParseCache.txt @@ -1,52 +1,41 @@ # Generated by CMake. Changes will be overwritten. -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h - mmc:Q_OBJECT - uic:ui_dialogeditgroup.h -D:/LMS/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp - uic:ui_messangerwidget.h -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp uic:ui_dialogeditinstructor.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h - mmc:Q_OBJECT - uic:ui_dialogauthorizationinstructor.h -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp - uic:ui_dialogedittrainee.h -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.h mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.h mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.h + mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.h D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsAndTrainees_global.h -D:/LMS/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h - mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h - mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.h mmc:Q_OBJECT D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.h mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.h + mmc:Q_OBJECT + uic:ui_dialogeditgroup.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.cpp + uic:ui_dialogedittrainee.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogeditgroup.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp + uic:ui_dialogeditinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.h D:/LMS/DB_IaT/InstructorsAndTrainees/tasks/taskswidget.cpp uic:ui_taskswidget.h D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp @@ -54,31 +43,42 @@ D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/traineesview.cpp D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/editortrainees.cpp uic:ui_editortrainees.h -D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.h +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/dialogedittrainee.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/module.h +D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsAndTrainees_global.h +D:/LMS/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/dataparser.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.h + mmc:Q_OBJECT +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.cpp uic:ui_dialogauthorizationinstructor.h -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp D:/LMS/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp uic:ui_instructorsandtraineeswidget.h D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.h mmc:Q_OBJECT -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/computersLocations.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h +D:/LMS/DB_IaT/InstructorsAndTrainees/commonview.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/dialogauthorizationinstructor.h mmc:Q_OBJECT - uic:ui_dialogeditinstructor.h + uic:ui_dialogauthorizationinstructor.h D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp D:/LMS/DB_IaT/InstructorsAndTrainees/trainees/viewertrainees.cpp uic:ui_viewertrainees.h -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp -D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/FileData.h D:/LMS/DB_IaT/InstructorsAndTrainees/docTasks/doctaskswidget.cpp uic:ui_doctaskswidget.h +D:/LMS/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/FileData.h D:/LMS/DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.cpp uic:ui_viewerinstructors.h +D:/LMS/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp + uic:ui_messangerwidget.h diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/B2PLHLQ6FC/moc_recognizesystem.cpp b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/B2PLHLQ6FC/moc_recognizesystem.cpp index 0b1f54b..e7b6909 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/B2PLHLQ6FC/moc_recognizesystem.cpp +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/B2PLHLQ6FC/moc_recognizesystem.cpp @@ -23,8 +23,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_RecognizeSystem_t { - QByteArrayData data[43]; - char stringdata0[718]; + QByteArrayData data[46]; + char stringdata0[750]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -61,21 +61,24 @@ QT_MOC_LITERAL(24, 333, 10), // "listGroups" QT_MOC_LITERAL(25, 344, 25), // "sigSocketWaitForReadyRead" QT_MOC_LITERAL(26, 370, 8), // "waitTime" QT_MOC_LITERAL(27, 379, 15), // "sigStartCompare" -QT_MOC_LITERAL(28, 395, 34), // "sigAnswerQueryToDB_ListInstru..." -QT_MOC_LITERAL(29, 430, 17), // "QList" -QT_MOC_LITERAL(30, 448, 29), // "sigAnswerQueryToDB_ListGroups" -QT_MOC_LITERAL(31, 478, 12), // "QList" -QT_MOC_LITERAL(32, 491, 31), // "sigAnswerQueryToDB_ListTrainees" -QT_MOC_LITERAL(33, 523, 14), // "QList" -QT_MOC_LITERAL(34, 538, 32), // "sigAnswerQueryToDB_ListComputers" -QT_MOC_LITERAL(35, 571, 15), // "QList" -QT_MOC_LITERAL(36, 587, 13), // "listComputers" -QT_MOC_LITERAL(37, 601, 33), // "sigAnswerQueryToDB_ListClassr..." -QT_MOC_LITERAL(38, 635, 16), // "QList" -QT_MOC_LITERAL(39, 652, 14), // "listClassrooms" -QT_MOC_LITERAL(40, 667, 28), // "sigAnswerQueryToDB_ListTasks" -QT_MOC_LITERAL(41, 696, 11), // "QList" -QT_MOC_LITERAL(42, 708, 9) // "listTasks" +QT_MOC_LITERAL(28, 395, 20), // "signal_MessageForGUI" +QT_MOC_LITERAL(29, 416, 5), // "login" +QT_MOC_LITERAL(30, 422, 4), // "text" +QT_MOC_LITERAL(31, 427, 34), // "sigAnswerQueryToDB_ListInstru..." +QT_MOC_LITERAL(32, 462, 17), // "QList" +QT_MOC_LITERAL(33, 480, 29), // "sigAnswerQueryToDB_ListGroups" +QT_MOC_LITERAL(34, 510, 12), // "QList" +QT_MOC_LITERAL(35, 523, 31), // "sigAnswerQueryToDB_ListTrainees" +QT_MOC_LITERAL(36, 555, 14), // "QList" +QT_MOC_LITERAL(37, 570, 32), // "sigAnswerQueryToDB_ListComputers" +QT_MOC_LITERAL(38, 603, 15), // "QList" +QT_MOC_LITERAL(39, 619, 13), // "listComputers" +QT_MOC_LITERAL(40, 633, 33), // "sigAnswerQueryToDB_ListClassr..." +QT_MOC_LITERAL(41, 667, 16), // "QList" +QT_MOC_LITERAL(42, 684, 14), // "listClassrooms" +QT_MOC_LITERAL(43, 699, 28), // "sigAnswerQueryToDB_ListTasks" +QT_MOC_LITERAL(44, 728, 11), // "QList" +QT_MOC_LITERAL(45, 740, 9) // "listTasks" }, "RecognizeSystem\0sigUpdateBytesAvailable\0" @@ -88,8 +91,8 @@ QT_MOC_LITERAL(42, 708, 9) // "listTasks" "QList*\0listInstructors\0" "QList*\0listTrainees\0QList*\0" "listGroups\0sigSocketWaitForReadyRead\0" - "waitTime\0sigStartCompare\0" - "sigAnswerQueryToDB_ListInstructors\0" + "waitTime\0sigStartCompare\0signal_MessageForGUI\0" + "login\0text\0sigAnswerQueryToDB_ListInstructors\0" "QList\0sigAnswerQueryToDB_ListGroups\0" "QList\0sigAnswerQueryToDB_ListTrainees\0" "QList\0sigAnswerQueryToDB_ListComputers\0" @@ -107,31 +110,32 @@ static const uint qt_meta_data_RecognizeSystem[] = { 8, // revision 0, // classname 0, 0, // classinfo - 17, 14, // methods + 18, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 17, // signalCount + 18, // signalCount // signals: name, argc, parameters, tag, flags - 1, 0, 99, 2, 0x06 /* Public */, - 3, 0, 100, 2, 0x06 /* Public */, - 4, 3, 101, 2, 0x06 /* Public */, - 8, 1, 108, 2, 0x06 /* Public */, - 10, 0, 111, 2, 0x06 /* Public */, - 11, 0, 112, 2, 0x06 /* Public */, - 12, 1, 113, 2, 0x06 /* Public */, - 15, 1, 116, 2, 0x06 /* Public */, - 18, 3, 119, 2, 0x06 /* Public */, - 25, 1, 126, 2, 0x06 /* Public */, - 27, 0, 129, 2, 0x06 /* Public */, - 28, 1, 130, 2, 0x06 /* Public */, - 30, 1, 133, 2, 0x06 /* Public */, - 32, 1, 136, 2, 0x06 /* Public */, - 34, 1, 139, 2, 0x06 /* Public */, - 37, 1, 142, 2, 0x06 /* Public */, - 40, 1, 145, 2, 0x06 /* Public */, + 1, 0, 104, 2, 0x06 /* Public */, + 3, 0, 105, 2, 0x06 /* Public */, + 4, 3, 106, 2, 0x06 /* Public */, + 8, 1, 113, 2, 0x06 /* Public */, + 10, 0, 116, 2, 0x06 /* Public */, + 11, 0, 117, 2, 0x06 /* Public */, + 12, 1, 118, 2, 0x06 /* Public */, + 15, 1, 121, 2, 0x06 /* Public */, + 18, 3, 124, 2, 0x06 /* Public */, + 25, 1, 131, 2, 0x06 /* Public */, + 27, 0, 134, 2, 0x06 /* Public */, + 28, 2, 135, 2, 0x06 /* Public */, + 31, 1, 140, 2, 0x06 /* Public */, + 33, 1, 143, 2, 0x06 /* Public */, + 35, 1, 146, 2, 0x06 /* Public */, + 37, 1, 149, 2, 0x06 /* Public */, + 40, 1, 152, 2, 0x06 /* Public */, + 43, 1, 155, 2, 0x06 /* Public */, // signals: parameters QMetaType::Void, @@ -145,12 +149,13 @@ static const uint qt_meta_data_RecognizeSystem[] = { QMetaType::Void, 0x80000000 | 19, 0x80000000 | 21, 0x80000000 | 23, 20, 22, 24, QMetaType::Void, QMetaType::Int, 26, QMetaType::Void, - QMetaType::Void, 0x80000000 | 29, 20, - QMetaType::Void, 0x80000000 | 31, 24, - QMetaType::Void, 0x80000000 | 33, 22, - QMetaType::Void, 0x80000000 | 35, 36, + QMetaType::Void, QMetaType::QString, QMetaType::QString, 29, 30, + QMetaType::Void, 0x80000000 | 32, 20, + QMetaType::Void, 0x80000000 | 34, 24, + QMetaType::Void, 0x80000000 | 36, 22, QMetaType::Void, 0x80000000 | 38, 39, QMetaType::Void, 0x80000000 | 41, 42, + QMetaType::Void, 0x80000000 | 44, 45, 0 // eod }; @@ -172,12 +177,13 @@ void RecognizeSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int case 8: _t->sigAnswerQueryToDB((*reinterpret_cast< QList*(*)>(_a[1])),(*reinterpret_cast< QList*(*)>(_a[2])),(*reinterpret_cast< QList*(*)>(_a[3]))); break; case 9: _t->sigSocketWaitForReadyRead((*reinterpret_cast< int(*)>(_a[1]))); break; case 10: _t->sigStartCompare(); break; - case 11: _t->sigAnswerQueryToDB_ListInstructors((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 12: _t->sigAnswerQueryToDB_ListGroups((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 13: _t->sigAnswerQueryToDB_ListTrainees((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 14: _t->sigAnswerQueryToDB_ListComputers((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 15: _t->sigAnswerQueryToDB_ListClassrooms((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 16: _t->sigAnswerQueryToDB_ListTasks((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 11: _t->signal_MessageForGUI((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; + case 12: _t->sigAnswerQueryToDB_ListInstructors((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 13: _t->sigAnswerQueryToDB_ListGroups((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 14: _t->sigAnswerQueryToDB_ListTrainees((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 15: _t->sigAnswerQueryToDB_ListComputers((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 16: _t->sigAnswerQueryToDB_ListClassrooms((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 17: _t->sigAnswerQueryToDB_ListTasks((*reinterpret_cast< QList(*)>(_a[1]))); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -259,45 +265,52 @@ void RecognizeSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int return; } } + { + using _t = void (RecognizeSystem::*)(QString , QString ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::signal_MessageForGUI)) { + *result = 11; + return; + } + } { using _t = void (RecognizeSystem::*)(QList ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::sigAnswerQueryToDB_ListInstructors)) { - *result = 11; + *result = 12; return; } } { using _t = void (RecognizeSystem::*)(QList ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::sigAnswerQueryToDB_ListGroups)) { - *result = 12; + *result = 13; return; } } { using _t = void (RecognizeSystem::*)(QList ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::sigAnswerQueryToDB_ListTrainees)) { - *result = 13; + *result = 14; return; } } { using _t = void (RecognizeSystem::*)(QList ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::sigAnswerQueryToDB_ListComputers)) { - *result = 14; + *result = 15; return; } } { using _t = void (RecognizeSystem::*)(QList ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::sigAnswerQueryToDB_ListClassrooms)) { - *result = 15; + *result = 16; return; } } { using _t = void (RecognizeSystem::*)(QList ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&RecognizeSystem::sigAnswerQueryToDB_ListTasks)) { - *result = 16; + *result = 17; return; } } @@ -333,13 +346,13 @@ int RecognizeSystem::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 17) + if (_id < 18) qt_static_metacall(this, _c, _id, _a); - _id -= 17; + _id -= 18; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 17) + if (_id < 18) *reinterpret_cast(_a[0]) = -1; - _id -= 17; + _id -= 18; } return _id; } @@ -417,45 +430,52 @@ void RecognizeSystem::sigStartCompare() } // SIGNAL 11 -void RecognizeSystem::sigAnswerQueryToDB_ListInstructors(QList _t1) +void RecognizeSystem::signal_MessageForGUI(QString _t1, QString _t2) { - void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; QMetaObject::activate(this, &staticMetaObject, 11, _a); } // SIGNAL 12 -void RecognizeSystem::sigAnswerQueryToDB_ListGroups(QList _t1) +void RecognizeSystem::sigAnswerQueryToDB_ListInstructors(QList _t1) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 12, _a); } // SIGNAL 13 -void RecognizeSystem::sigAnswerQueryToDB_ListTrainees(QList _t1) +void RecognizeSystem::sigAnswerQueryToDB_ListGroups(QList _t1) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 13, _a); } // SIGNAL 14 -void RecognizeSystem::sigAnswerQueryToDB_ListComputers(QList _t1) +void RecognizeSystem::sigAnswerQueryToDB_ListTrainees(QList _t1) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 14, _a); } // SIGNAL 15 -void RecognizeSystem::sigAnswerQueryToDB_ListClassrooms(QList _t1) +void RecognizeSystem::sigAnswerQueryToDB_ListComputers(QList _t1) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 15, _a); } // SIGNAL 16 -void RecognizeSystem::sigAnswerQueryToDB_ListTasks(QList _t1) +void RecognizeSystem::sigAnswerQueryToDB_ListClassrooms(QList _t1) { void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 16, _a); } + +// SIGNAL 17 +void RecognizeSystem::sigAnswerQueryToDB_ListTasks(QList _t1) +{ + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 17, _a); +} QT_WARNING_POP QT_END_MOC_NAMESPACE diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/K2SFLZ7GVT/moc_messangerwidget.cpp b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/K2SFLZ7GVT/moc_messangerwidget.cpp index 590126f..9b41eaa 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/K2SFLZ7GVT/moc_messangerwidget.cpp +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/K2SFLZ7GVT/moc_messangerwidget.cpp @@ -23,8 +23,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_MessangerWidget_t { - QByteArrayData data[15]; - char stringdata0[230]; + QByteArrayData data[16]; + char stringdata0[254]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -47,7 +47,8 @@ QT_MOC_LITERAL(10, 153, 20), // "slot_LanguageChanged" QT_MOC_LITERAL(11, 174, 8), // "language" QT_MOC_LITERAL(12, 183, 18), // "slot_InitMessanger" QT_MOC_LITERAL(13, 202, 14), // "QList" -QT_MOC_LITERAL(14, 217, 12) // "listTrainees" +QT_MOC_LITERAL(14, 217, 12), // "listTrainees" +QT_MOC_LITERAL(15, 230, 23) // "slot_msgFromClientReady" }, "MessangerWidget\0signal_msgToClientReady\0" @@ -56,7 +57,7 @@ QT_MOC_LITERAL(14, 217, 12) // "listTrainees" "index\0slot_traineeSelected\0" "slot_LanguageChanged\0language\0" "slot_InitMessanger\0QList\0" - "listTrainees" + "listTrainees\0slot_msgFromClientReady" }; #undef QT_MOC_LITERAL @@ -66,7 +67,7 @@ static const uint qt_meta_data_MessangerWidget[] = { 8, // revision 0, // classname 0, 0, // classinfo - 7, 14, // methods + 8, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -74,15 +75,16 @@ static const uint qt_meta_data_MessangerWidget[] = { 2, // signalCount // signals: name, argc, parameters, tag, flags - 1, 2, 49, 2, 0x06 /* Public */, - 5, 1, 54, 2, 0x06 /* Public */, + 1, 2, 54, 2, 0x06 /* Public */, + 5, 1, 59, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 6, 0, 57, 2, 0x08 /* Private */, - 7, 1, 58, 2, 0x08 /* Private */, - 9, 1, 61, 2, 0x0a /* Public */, - 10, 1, 64, 2, 0x0a /* Public */, - 12, 1, 67, 2, 0x0a /* Public */, + 6, 0, 62, 2, 0x08 /* Private */, + 7, 1, 63, 2, 0x08 /* Private */, + 9, 1, 66, 2, 0x0a /* Public */, + 10, 1, 69, 2, 0x0a /* Public */, + 12, 1, 72, 2, 0x0a /* Public */, + 15, 2, 75, 2, 0x0a /* Public */, // signals: parameters QMetaType::Void, QMetaType::QString, QMetaType::QString, 3, 4, @@ -94,6 +96,7 @@ static const uint qt_meta_data_MessangerWidget[] = { QMetaType::Void, QMetaType::QString, 3, QMetaType::Void, QMetaType::QString, 11, QMetaType::Void, 0x80000000 | 13, 14, + QMetaType::Void, QMetaType::QString, QMetaType::QString, 3, 4, 0 // eod }; @@ -111,6 +114,7 @@ void MessangerWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int case 4: _t->slot_traineeSelected((*reinterpret_cast< QString(*)>(_a[1]))); break; case 5: _t->slot_LanguageChanged((*reinterpret_cast< QString(*)>(_a[1]))); break; case 6: _t->slot_InitMessanger((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 7: _t->slot_msgFromClientReady((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -161,13 +165,13 @@ int MessangerWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 7) + if (_id < 8) qt_static_metacall(this, _c, _id, _a); - _id -= 7; + _id -= 8; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 7) + if (_id < 8) *reinterpret_cast(_a[0]) = -1; - _id -= 7; + _id -= 8; } return _id; } diff --git a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/XGTKJIRJR2/moc_connectortoserver.cpp b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/XGTKJIRJR2/moc_connectortoserver.cpp index abaabff..eab42ab 100644 --- a/DB_IaT/Debug64/InstructorsAndTrainees_autogen/XGTKJIRJR2/moc_connectortoserver.cpp +++ b/DB_IaT/Debug64/InstructorsAndTrainees_autogen/XGTKJIRJR2/moc_connectortoserver.cpp @@ -23,8 +23,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_ConnectorToServer_t { - QByteArrayData data[46]; - char stringdata0[788]; + QByteArrayData data[47]; + char stringdata0[814]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -60,25 +60,26 @@ QT_MOC_LITERAL(23, 353, 5), // "state" QT_MOC_LITERAL(24, 359, 20), // "signal_InitMessanger" QT_MOC_LITERAL(25, 380, 14), // "QList" QT_MOC_LITERAL(26, 395, 12), // "listTrainees" -QT_MOC_LITERAL(27, 408, 36), // "slot_AnswerQueryToDB_ListInst..." -QT_MOC_LITERAL(28, 445, 17), // "QList" -QT_MOC_LITERAL(29, 463, 15), // "listInstructors" -QT_MOC_LITERAL(30, 479, 31), // "slot_AnswerQueryToDB_ListGroups" -QT_MOC_LITERAL(31, 511, 12), // "QList" -QT_MOC_LITERAL(32, 524, 10), // "listGroups" -QT_MOC_LITERAL(33, 535, 33), // "slot_AnswerQueryToDB_ListTrai..." -QT_MOC_LITERAL(34, 569, 34), // "slot_AnswerQueryToDB_ListComp..." -QT_MOC_LITERAL(35, 604, 15), // "QList" -QT_MOC_LITERAL(36, 620, 13), // "listComputers" -QT_MOC_LITERAL(37, 634, 35), // "slot_AnswerQueryToDB_ListClas..." -QT_MOC_LITERAL(38, 670, 16), // "QList" -QT_MOC_LITERAL(39, 687, 14), // "listClassrooms" -QT_MOC_LITERAL(40, 702, 30), // "slot_AnswerQueryToDB_ListTasks" -QT_MOC_LITERAL(41, 733, 11), // "QList" -QT_MOC_LITERAL(42, 745, 9), // "listTasks" -QT_MOC_LITERAL(43, 755, 21), // "slot_msgToClientReady" -QT_MOC_LITERAL(44, 777, 5), // "login" -QT_MOC_LITERAL(45, 783, 4) // "text" +QT_MOC_LITERAL(27, 408, 25), // "signal_msgFromClientReady" +QT_MOC_LITERAL(28, 434, 5), // "login" +QT_MOC_LITERAL(29, 440, 4), // "text" +QT_MOC_LITERAL(30, 445, 36), // "slot_AnswerQueryToDB_ListInst..." +QT_MOC_LITERAL(31, 482, 17), // "QList" +QT_MOC_LITERAL(32, 500, 15), // "listInstructors" +QT_MOC_LITERAL(33, 516, 31), // "slot_AnswerQueryToDB_ListGroups" +QT_MOC_LITERAL(34, 548, 12), // "QList" +QT_MOC_LITERAL(35, 561, 10), // "listGroups" +QT_MOC_LITERAL(36, 572, 33), // "slot_AnswerQueryToDB_ListTrai..." +QT_MOC_LITERAL(37, 606, 34), // "slot_AnswerQueryToDB_ListComp..." +QT_MOC_LITERAL(38, 641, 15), // "QList" +QT_MOC_LITERAL(39, 657, 13), // "listComputers" +QT_MOC_LITERAL(40, 671, 35), // "slot_AnswerQueryToDB_ListClas..." +QT_MOC_LITERAL(41, 707, 16), // "QList" +QT_MOC_LITERAL(42, 724, 14), // "listClassrooms" +QT_MOC_LITERAL(43, 739, 30), // "slot_AnswerQueryToDB_ListTasks" +QT_MOC_LITERAL(44, 770, 11), // "QList" +QT_MOC_LITERAL(45, 782, 9), // "listTasks" +QT_MOC_LITERAL(46, 792, 21) // "slot_msgToClientReady" }, "ConnectorToServer\0sigSetConnect\0\0" @@ -92,7 +93,8 @@ QT_MOC_LITERAL(45, 783, 4) // "text" "signal_UpdateDB\0treeInstructor\0" "treeTrainee\0signal_ConnectedToServer\0" "state\0signal_InitMessanger\0QList\0" - "listTrainees\0slot_AnswerQueryToDB_ListInstructors\0" + "listTrainees\0signal_msgFromClientReady\0" + "login\0text\0slot_AnswerQueryToDB_ListInstructors\0" "QList\0listInstructors\0" "slot_AnswerQueryToDB_ListGroups\0" "QList\0listGroups\0" @@ -102,8 +104,7 @@ QT_MOC_LITERAL(45, 783, 4) // "text" "slot_AnswerQueryToDB_ListClassrooms\0" "QList\0listClassrooms\0" "slot_AnswerQueryToDB_ListTasks\0" - "QList\0listTasks\0slot_msgToClientReady\0" - "login\0text" + "QList\0listTasks\0slot_msgToClientReady" }; #undef QT_MOC_LITERAL @@ -113,31 +114,32 @@ static const uint qt_meta_data_ConnectorToServer[] = { 8, // revision 0, // classname 0, 0, // classinfo - 15, 14, // methods + 16, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 8, // signalCount + 9, // signalCount // signals: name, argc, parameters, tag, flags - 1, 2, 89, 2, 0x06 /* Public */, - 7, 3, 94, 2, 0x06 /* Public */, - 12, 0, 101, 2, 0x06 /* Public */, - 13, 1, 102, 2, 0x06 /* Public */, - 16, 1, 105, 2, 0x06 /* Public */, - 19, 2, 108, 2, 0x06 /* Public */, - 22, 1, 113, 2, 0x06 /* Public */, - 24, 1, 116, 2, 0x06 /* Public */, + 1, 2, 94, 2, 0x06 /* Public */, + 7, 3, 99, 2, 0x06 /* Public */, + 12, 0, 106, 2, 0x06 /* Public */, + 13, 1, 107, 2, 0x06 /* Public */, + 16, 1, 110, 2, 0x06 /* Public */, + 19, 2, 113, 2, 0x06 /* Public */, + 22, 1, 118, 2, 0x06 /* Public */, + 24, 1, 121, 2, 0x06 /* Public */, + 27, 2, 124, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 27, 1, 119, 2, 0x0a /* Public */, - 30, 1, 122, 2, 0x0a /* Public */, - 33, 1, 125, 2, 0x0a /* Public */, - 34, 1, 128, 2, 0x0a /* Public */, - 37, 1, 131, 2, 0x0a /* Public */, - 40, 1, 134, 2, 0x0a /* Public */, - 43, 2, 137, 2, 0x0a /* Public */, + 30, 1, 129, 2, 0x0a /* Public */, + 33, 1, 132, 2, 0x0a /* Public */, + 36, 1, 135, 2, 0x0a /* Public */, + 37, 1, 138, 2, 0x0a /* Public */, + 40, 1, 141, 2, 0x0a /* Public */, + 43, 1, 144, 2, 0x0a /* Public */, + 46, 2, 147, 2, 0x0a /* Public */, // signals: parameters QMetaType::Void, 0x80000000 | 3, 0x80000000 | 5, 4, 6, @@ -148,15 +150,16 @@ static const uint qt_meta_data_ConnectorToServer[] = { QMetaType::Void, QMetaType::Bool, QMetaType::Bool, 20, 21, QMetaType::Void, QMetaType::Bool, 23, QMetaType::Void, 0x80000000 | 25, 26, + QMetaType::Void, QMetaType::QString, QMetaType::QString, 28, 29, // slots: parameters - QMetaType::Void, 0x80000000 | 28, 29, QMetaType::Void, 0x80000000 | 31, 32, + QMetaType::Void, 0x80000000 | 34, 35, QMetaType::Void, 0x80000000 | 25, 26, - QMetaType::Void, 0x80000000 | 35, 36, QMetaType::Void, 0x80000000 | 38, 39, QMetaType::Void, 0x80000000 | 41, 42, - QMetaType::Void, QMetaType::QString, QMetaType::QString, 44, 45, + QMetaType::Void, 0x80000000 | 44, 45, + QMetaType::Void, QMetaType::QString, QMetaType::QString, 28, 29, 0 // eod }; @@ -175,13 +178,14 @@ void ConnectorToServer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in case 5: _t->signal_UpdateDB((*reinterpret_cast< bool(*)>(_a[1])),(*reinterpret_cast< bool(*)>(_a[2]))); break; case 6: _t->signal_ConnectedToServer((*reinterpret_cast< bool(*)>(_a[1]))); break; case 7: _t->signal_InitMessanger((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 8: _t->slot_AnswerQueryToDB_ListInstructors((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 9: _t->slot_AnswerQueryToDB_ListGroups((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 10: _t->slot_AnswerQueryToDB_ListTrainees((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 11: _t->slot_AnswerQueryToDB_ListComputers((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 12: _t->slot_AnswerQueryToDB_ListClassrooms((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 13: _t->slot_AnswerQueryToDB_ListTasks((*reinterpret_cast< QList(*)>(_a[1]))); break; - case 14: _t->slot_msgToClientReady((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; + case 8: _t->signal_msgFromClientReady((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; + case 9: _t->slot_AnswerQueryToDB_ListInstructors((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 10: _t->slot_AnswerQueryToDB_ListGroups((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 11: _t->slot_AnswerQueryToDB_ListTrainees((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 12: _t->slot_AnswerQueryToDB_ListComputers((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 13: _t->slot_AnswerQueryToDB_ListClassrooms((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 14: _t->slot_AnswerQueryToDB_ListTasks((*reinterpret_cast< QList(*)>(_a[1]))); break; + case 15: _t->slot_msgToClientReady((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; default: ; } } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { @@ -255,6 +259,13 @@ void ConnectorToServer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in return; } } + { + using _t = void (ConnectorToServer::*)(QString , QString ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ConnectorToServer::signal_msgFromClientReady)) { + *result = 8; + return; + } + } } } @@ -287,13 +298,13 @@ int ConnectorToServer::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 15) + if (_id < 16) qt_static_metacall(this, _c, _id, _a); - _id -= 15; + _id -= 16; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 15) + if (_id < 16) qt_static_metacall(this, _c, _id, _a); - _id -= 15; + _id -= 16; } return _id; } @@ -352,5 +363,12 @@ void ConnectorToServer::signal_InitMessanger(QList _t1) void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 7, _a); } + +// SIGNAL 8 +void ConnectorToServer::signal_msgFromClientReady(QString _t1, QString _t2) +{ + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; + QMetaObject::activate(this, &staticMetaObject, 8, _a); +} QT_WARNING_POP QT_END_MOC_NAMESPACE diff --git a/DB_IaT/Debug64/libInstructorsAndTrainees.dll b/DB_IaT/Debug64/libInstructorsAndTrainees.dll index c7fa1cc..6e078a1 100644 Binary files a/DB_IaT/Debug64/libInstructorsAndTrainees.dll and b/DB_IaT/Debug64/libInstructorsAndTrainees.dll differ diff --git a/DB_IaT/Debug64/libInstructorsAndTrainees.dll.a b/DB_IaT/Debug64/libInstructorsAndTrainees.dll.a index 71254d3..2f967a0 100644 Binary files a/DB_IaT/Debug64/libInstructorsAndTrainees.dll.a and b/DB_IaT/Debug64/libInstructorsAndTrainees.dll.a differ diff --git a/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user b/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user index aba755b..cd27e26 100644 --- a/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user +++ b/DB_IaT/InstructorsAndTrainees/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp index 296b6cd..d06662a 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp @@ -357,6 +357,26 @@ void RecognizeSystem::xmlParser(QByteArray array) emit sigAuth(serverAuth); } + if(xmlReader.name() == "ServerMessage"){ + + ClientMessage *clientMessage = new ClientMessage; + + foreach(const QXmlStreamAttribute &attr, xmlReader.attributes()) + { + QString name = attr.name().toString(); + QString value = attr.value().toString(); + + if (name == "Login"){ + clientMessage->Login = value; + } + if (name == "Text"){ + clientMessage->Text = value; + } + } + + emit signal_MessageForGUI(clientMessage->Login, clientMessage->Text); + } + if(xmlReader.name() == "ServerDeAuthorization"){ ServerDeAuthorization *serverDeAuth = new ServerDeAuthorization; diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h index 707314f..b2ece21 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h @@ -10,6 +10,7 @@ #include "instructor.h" #include "trainee.h" #include "group.h" +#include "Datas.h" class RecognizeSystem : public QObject @@ -38,6 +39,8 @@ signals: void sigSocketWaitForReadyRead(int waitTime); void sigStartCompare(); + void signal_MessageForGUI(QString login, QString text); + void sigAnswerQueryToDB_ListInstructors(QList listInstructors); void sigAnswerQueryToDB_ListGroups(QList listGroups); void sigAnswerQueryToDB_ListTrainees(QList listTrainees); diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h index 7ee23df..187a466 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tools.h @@ -32,6 +32,8 @@ enum PacketType{ TYPE_QT = 9, TYPE_DISABLE = 11, + TYPE_XMLANSWER_MESSAGE_FOR_GUI = 90, + //xml-ответы на запросы к БД TYPE_XMLANSWER_QUERY_DB__LIST_INSTRUCTORS = 100, TYPE_XMLANSWER_QUERY_DB__LIST_GROUPS = 101, diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h b/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h index 5a34aa3..0d2573f 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/Datas.h @@ -69,6 +69,7 @@ public: class ClientMessage { public: + QString Login; QString Text; }; diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index 61ebc1c..4421bc0 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -281,8 +281,6 @@ void ConnectorToServer::slot_msgToClientReady(QString login, QString text) sendMessageForClient(id, login, text); } - - void ConnectorToServer::initialize() { createObjects(); @@ -302,6 +300,7 @@ void ConnectorToServer::bindConnection() connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::sigLoginResult); connect(recognizeSystem,&RecognizeSystem::sigDeAuth,this,&ConnectorToServer::sigDeLoginResult); + connect(recognizeSystem,&RecognizeSystem::signal_MessageForGUI,this,&ConnectorToServer::signal_msgFromClientReady); //connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB,this,&ConnectorToServer::slot_AnswerQueryToDB); connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListInstructors,this,&ConnectorToServer::slot_AnswerQueryToDB_ListInstructors); diff --git a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h index bd3b9ec..77eb228 100644 --- a/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h +++ b/DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h @@ -80,6 +80,8 @@ signals: void signal_InitMessanger(QList listTrainees); + void signal_msgFromClientReady(QString login, QString text); + private: void initialize(); diff --git a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index a9b433b..8f0f139 100644 --- a/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/DB_IaT/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -48,6 +48,7 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : connect(viewerTrainees, &ViewerTrainees::signal_traineeSelected, messangerWidget, &MessangerWidget::slot_traineeSelected); connect(messangerWidget, &MessangerWidget::signal_tabMessengerChanged, viewerTrainees, &ViewerTrainees::slot_tabMessengerChanged); connect(messangerWidget, &MessangerWidget::signal_msgToClientReady, connectorToServer, &ConnectorToServer::slot_msgToClientReady); + connect(connectorToServer,&ConnectorToServer::signal_msgFromClientReady,messangerWidget,&MessangerWidget::slot_msgFromClientReady); docTasksWidget = new DocTasksWidget(this); diff --git a/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp b/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp index a6985cd..635f311 100644 --- a/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp +++ b/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.cpp @@ -143,6 +143,11 @@ void MessangerWidget::slot_InitMessanger(QList listTrainees) } } +void MessangerWidget::slot_msgFromClientReady(QString login, QString text) +{ + addMsg(login, "name", text, MessangerWidget::ETypeMsg::fromClient); +} + void MessangerWidget::keyPressEvent(QKeyEvent *event) { if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) diff --git a/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h b/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h index 2410a04..a22544b 100644 --- a/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h +++ b/DB_IaT/InstructorsAndTrainees/messanger/messangerwidget.h @@ -5,6 +5,7 @@ #include #include #include +#include "Datas.h" class DialogMsg { @@ -66,6 +67,7 @@ public slots: void slot_LanguageChanged(QString language); //слот обработки сигнала об инициализации мессенджера void slot_InitMessanger(QList listTrainees); + void slot_msgFromClientReady(QString login, QString text); private: virtual void keyPressEvent(QKeyEvent *event) override; diff --git a/DB_LMS/DataBaseLMS/CMakeLists.txt.user b/DB_LMS/DataBaseLMS/CMakeLists.txt.user index c660169..2906125 100644 --- a/DB_LMS/DataBaseLMS/CMakeLists.txt.user +++ b/DB_LMS/DataBaseLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/GUIdataBaseLMS/Debug64/.cmake/api/v1/reply/index-2024-12-11T07-18-39-0361.json b/GUIdataBaseLMS/Debug64/.cmake/api/v1/reply/index-2024-12-17T06-34-27-0469.json similarity index 100% rename from GUIdataBaseLMS/Debug64/.cmake/api/v1/reply/index-2024-12-11T07-18-39-0361.json rename to GUIdataBaseLMS/Debug64/.cmake/api/v1/reply/index-2024-12-17T06-34-27-0469.json diff --git a/GUIdataBaseLMS/Debug64/.ninja_deps b/GUIdataBaseLMS/Debug64/.ninja_deps index df85e24..51bd6e9 100644 Binary files a/GUIdataBaseLMS/Debug64/.ninja_deps and b/GUIdataBaseLMS/Debug64/.ninja_deps differ diff --git a/GUIdataBaseLMS/Debug64/.ninja_log b/GUIdataBaseLMS/Debug64/.ninja_log index 150227f..380a253 100644 --- a/GUIdataBaseLMS/Debug64/.ninja_log +++ b/GUIdataBaseLMS/Debug64/.ninja_log @@ -1,94 +1,66 @@ # ninja log v5 -43 1342 7557107440849708 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c -1432 1575 7557107443163402 GUIdataBaseLMS.exe dadb916a9424404 -10 32 0 CMakeFiles/clean.additional 7155004b3956b606 -13 44 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -48 1432 7557107441742981 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 -13 44 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -2188 2534 7549968971818713 testDBpgSQL.exe 2cffdb60e2e039f -32 39 0 clean 9c4b4372737ab8da -456 505 7551837947273032 GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 -13 44 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -24 454 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 -441 482 7549320531460357 testDBpgSQL_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp e72511a2b01b9766 24 454 0 testDBpgSQL_autogen/mocs_compilation.cpp d08ec0c05fa072d8 -513 565 7551837947891396 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj f3adc5dfd1a45619 -13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -46 1366 7557107441082894 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 -13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +24 454 0 testDBpgSQL_autogen/include/ui_mainwindow.h d08ec0c05fa072d8 +17 48 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +456 505 7551837947273032 GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 +32 39 0 clean 9c4b4372737ab8da +2188 2534 7549968971818713 testDBpgSQL.exe 2cffdb60e2e039f +17 48 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f 456 505 7551837947273032 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp 2845afa7952c1899 -13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -15 45 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -15 45 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -15 45 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -15 45 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -15 45 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -15 45 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -13 44 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -13 44 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -13 44 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -13 44 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -13 44 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -13 44 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -13 44 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +17 48 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +42 1359 7560516203584944 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 +17 48 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +513 565 7551837947891396 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp.obj f3adc5dfd1a45619 +40 1340 7560516203393501 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c +1462 1612 7560516206097136 GUIdataBaseLMS.exe dadb916a9424404 +10 32 0 CMakeFiles/clean.additional 7155004b3956b606 +441 482 7549320531460357 testDBpgSQL_autogen/EWIEGA46WW/qrc_testDBpgSQL.cpp e72511a2b01b9766 +17 48 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +45 1462 7560516204608000 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 +17 48 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +17 57 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +17 57 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +17 57 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +17 57 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +17 57 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +17 57 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +58 1362 7561270615116359 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c +60 1401 7561270615510715 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 +63 1480 7561270616293868 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 +1480 1631 7561270617794445 GUIdataBaseLMS.exe dadb916a9424404 +17 50 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +17 50 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +17 50 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +17 50 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f +17 50 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f +17 50 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f 14 46 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f 14 46 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f 14 46 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f 14 46 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f 14 46 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f 14 46 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -13 45 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -13 45 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -13 45 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -13 45 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -13 45 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -13 45 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -29 76 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -29 76 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -29 76 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -29 76 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -29 76 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -29 76 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -8 37 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -8 37 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -8 37 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -8 37 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -8 37 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -8 37 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -38 1326 7560395999281203 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c -40 1352 7560395999549986 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 -43 1457 7560396000586833 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 -1457 1615 7560396002162734 GUIdataBaseLMS.exe dadb916a9424404 +46 1326 7561300495744043 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c +49 1390 7561300496392782 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 +52 1442 7561300496911793 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 +1442 1589 7561300498365263 GUIdataBaseLMS.exe dadb916a9424404 16 47 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f 16 47 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f 16 47 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f 16 47 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f 16 47 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f 16 47 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -12 43 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -12 43 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -12 43 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -12 43 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -8 39 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -8 39 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -8 39 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -8 39 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f -8 39 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f -8 39 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f -40 1340 7560516203393501 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c -42 1359 7560516203584944 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 -45 1462 7560516204608000 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 -1462 1612 7560516206097136 GUIdataBaseLMS.exe dadb916a9424404 +48 1335 7561302103148836 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c +50 1361 7561302103408833 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 +53 1471 7561302104507899 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 +1471 1618 7561302105971956 GUIdataBaseLMS.exe dadb916a9424404 17 48 0 CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f 17 48 0 GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f 17 48 0 GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f 17 48 0 D:/LMS/GUIdataBaseLMS/Debug64/CMakeFiles/GUIdataBaseLMS_autogen c6b82d135913dd0f 17 48 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/mocs_compilation.cpp c6b82d135913dd0f 17 48 0 D:/LMS/GUIdataBaseLMS/Debug64/GUIdataBaseLMS_autogen/include/ui_mainwindow.h c6b82d135913dd0f +48 1332 7561309766294076 CMakeFiles/GUIdataBaseLMS.dir/GUIdataBaseLMS_autogen/mocs_compilation.cpp.obj a7350fa2ef349e5c +50 1367 7561309766633299 CMakeFiles/GUIdataBaseLMS.dir/main.cpp.obj a2eccd89d22e2bf1 +53 1469 7561309767660784 CMakeFiles/GUIdataBaseLMS.dir/mainwindow.cpp.obj de40007ae8044c51 +1469 1616 7561309769110163 GUIdataBaseLMS.exe dadb916a9424404 diff --git a/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe b/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe index 82642df..fea1203 100644 Binary files a/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe and b/GUIdataBaseLMS/Debug64/GUIdataBaseLMS.exe differ diff --git a/GUIdataBaseLMS/Debug64/StaticData/temp.xml b/GUIdataBaseLMS/Debug64/StaticData/temp.xml index 84a89f3..40e39ea 100644 --- a/GUIdataBaseLMS/Debug64/StaticData/temp.xml +++ b/GUIdataBaseLMS/Debug64/StaticData/temp.xml @@ -1,2 +1,2 @@ - + diff --git a/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll b/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll index c7fa1cc..6e078a1 100644 Binary files a/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll and b/GUIdataBaseLMS/Debug64/libInstructorsAndTrainees.dll differ diff --git a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user b/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user index 90326ce..69a66a6 100644 --- a/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user +++ b/GUIdataBaseLMS/GUIdataBaseLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/ServerLMS/Debug64/.ninja_deps b/ServerLMS/Debug64/.ninja_deps index 4dca3c9..98b56a0 100644 Binary files a/ServerLMS/Debug64/.ninja_deps and b/ServerLMS/Debug64/.ninja_deps differ diff --git a/ServerLMS/Debug64/.ninja_log b/ServerLMS/Debug64/.ninja_log index 3f80e29..477c2fe 100644 --- a/ServerLMS/Debug64/.ninja_log +++ b/ServerLMS/Debug64/.ninja_log @@ -1,110 +1,100 @@ # ninja log v5 -804 4066 7556902319537071 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 +60 2225 7560635986964049 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 +63 116 7556089587835465 ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 +19 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +19 57 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +574 3228 7560612478085555 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 +19 57 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +1168 3150 7548373207023899 CMakeFiles/ServerLMS.dir/messangerwidget.cpp.obj 8dd57f666ed5ecf4 +118 178 7556089588473760 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj f93621c79a78fad0 +57 2392 7560635988624358 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc +15 261 7560367350521828 build.ninja 80e6aedf30bdcc22 +19 57 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +19 57 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +2392 2950 7560635993714374 libServerLMS.dll.a 2f530586cec8163 +42 52 0 clean 9c4b4372737ab8da +569 3525 7560612481064279 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 826 2779 7556902306691506 CMakeFiles/ServerLMS.dir/providerdblms.cpp.obj f56962914220ed2d -814 4257 7556902321476316 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 -46 593 7557936125072610 libServerLMS.dll 2f530586cec8163 -15 42 0 CMakeFiles/clean.additional 7155004b3956b606 -816 4009 7556902318962185 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 -60 2465 7557935709557960 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf +578 3474 7560612480554593 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 +2392 2950 7560635993714374 libServerLMS.dll 2f530586cec8163 67 1245 7555255334257083 CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj 81bfa701d65b5429 -15 46 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -811 4027 7556902319144502 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c +15 42 0 CMakeFiles/clean.additional 7155004b3956b606 +582 3493 7560612480724118 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 +585 3893 7560612484744294 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf +19 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +576 3706 7560612482874853 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c 1287 8367 7551893701770796 CMakeFiles/ServerLMS.dir/Systems/logger.cpp.obj 68e3223fc0caab27 63 116 7556089587835465 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 -824 3969 7556902318568719 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58 -42 52 0 clean 9c4b4372737ab8da -46 593 7557936125072610 libServerLMS.dll.a 2f530586cec8163 -15 46 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 -15 46 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 -15 261 7560367350521828 build.ninja 80e6aedf30bdcc22 -807 4552 7556902324401138 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc -118 178 7556089588473760 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj f93621c79a78fad0 -1168 3150 7548373207023899 CMakeFiles/ServerLMS.dir/messangerwidget.cpp.obj 8dd57f666ed5ecf4 -15 46 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -809 4186 7556902320746871 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 -15 46 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -15 46 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -63 116 7556089587835465 ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 -62 2260 7557935707531126 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 -21 654 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 -21 654 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -21 654 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -21 654 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 -21 654 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -21 654 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -665 3465 7560481992544048 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 -674 3466 7560481992554019 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 -667 3622 7560481994109874 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 -654 3632 7560481994211215 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 -677 3662 7560481994495096 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58 -659 3798 7560481995865263 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 -671 3818 7560481996067921 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf -657 3895 7560481996852847 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc -662 3977 7560481997674492 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c -3977 4574 7560482003193366 libServerLMS.dll 2f530586cec8163 -3977 4574 7560482003193366 libServerLMS.dll.a 2f530586cec8163 -18 56 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 -18 56 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -18 56 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -18 56 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 -18 56 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -18 56 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -15 48 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 -15 48 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -15 48 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -15 48 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 -15 48 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -15 48 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -49 2134 7560539041796990 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 -2134 2694 7560539046914827 libServerLMS.dll 2f530586cec8163 -2134 2694 7560539046914827 libServerLMS.dll.a 2f530586cec8163 -18 61 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 -18 61 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -18 61 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -18 61 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 -18 61 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -18 61 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -13 488 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 -13 488 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -13 488 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -13 488 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 -13 488 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -13 488 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -495 3264 7560568013544626 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c -508 3344 7560568014395597 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 -502 3508 7560568016005634 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 -512 3545 7560568016325066 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58 -488 3562 7560568016572622 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 -498 3587 7560568016825885 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 -491 3732 7560568018275537 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc -493 3887 7560568019826793 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 -505 3909 7560568020035964 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf -3909 4468 7560568025168840 libServerLMS.dll 2f530586cec8163 -3909 4468 7560568025168840 libServerLMS.dll.a 2f530586cec8163 -18 568 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 -18 568 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -18 568 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -18 568 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 -18 568 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 -18 568 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -574 3228 7560612478085555 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 -578 3474 7560612480554593 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 -582 3493 7560612480724118 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 -569 3525 7560612481064279 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 -588 3590 7560612481654427 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 -576 3706 7560612482874853 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c 591 3764 7560612483399129 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58 -571 3829 7560612484097423 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc -585 3893 7560612484744294 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf -3893 4453 7560612489895728 libServerLMS.dll 2f530586cec8163 -3893 4453 7560612489895728 libServerLMS.dll.a 2f530586cec8163 +31 718 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +31 718 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +31 718 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +31 718 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +31 718 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +31 718 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +743 2487 7561242805019325 CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj 81bfa701d65b5429 +737 3614 7561242816277266 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 +731 3721 7561242817335787 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 +726 3795 7561242818074175 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c +723 3887 7561242818963494 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 +721 3979 7561242819916027 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc +718 3992 7561242820066622 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 +728 4032 7561242820460763 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 +734 4341 7561242823539774 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf +14 41 0 CMakeFiles/clean.additional 7155004b3956b606 +41 51 0 clean 9c4b4372737ab8da +13 1212 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +13 1212 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +13 1212 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +13 1212 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +13 1212 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +13 1212 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +1212 1297 7561244908126083 ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 +1212 1297 7561244908126083 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp 9bce64f5ef0262e2 +1336 1423 7561244909394494 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/EWIEGA46WW/qrc_resources.cpp.obj f93621c79a78fad0 +1313 2503 7561244920193719 CMakeFiles/ServerLMS.dir/Systems/logger.cpp.obj 68e3223fc0caab27 +1332 2625 7561244921398015 CMakeFiles/ServerLMS.dir/providerdblms.cpp.obj f56962914220ed2d +1328 2657 7561244921730483 CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj 81bfa701d65b5429 +1307 4436 7561244939485891 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 +1321 4473 7561244939862147 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 +1298 4474 7561244939862147 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 +1302 4576 7561244940897322 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 +1310 4597 7561244941107904 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 +1300 4677 7561244941919381 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc +1317 4681 7561244941939349 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf +1305 4831 7561244943444174 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c +18 516 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +18 516 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +18 516 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +18 516 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +18 516 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +18 516 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +524 3164 7561248884567065 CMakeFiles/ServerLMS.dir/multithreadserver.cpp.obj 8ac2c4a8e2ef203c +522 3214 7561248885071641 CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj 6c16bf194fe85608 +539 3249 7561248885416221 CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj d73c57350f364b58 +529 3359 7561248886416239 CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj c4c12bda48d8fa92 +535 3450 7561248887449334 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 +527 3580 7561248888706914 CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj f698d155fbad3bd2 +517 3634 7561248889253351 CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj 40e4c8c7d98890e8 +519 3662 7561248889527328 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc +532 3736 7561248890281826 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf +3736 4502 7561248897341999 libServerLMS.dll 2f530586cec8163 +3736 4502 7561248897341999 libServerLMS.dll.a 2f530586cec8163 +18 62 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 +18 62 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +18 62 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +18 62 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 +18 62 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 +18 62 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 +62 2385 7561264081554617 CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b273ef6b79a34bf +2385 2946 7561264086684288 libServerLMS.dll 2f530586cec8163 +2385 2946 7561264086684288 libServerLMS.dll.a 2f530586cec8163 19 57 0 CMakeFiles/ServerLMS_autogen a1ba014d73005738 19 57 0 ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 19 57 0 ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 19 57 0 D:/LMS/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen a1ba014d73005738 19 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/mocs_compilation.cpp a1ba014d73005738 19 57 0 D:/LMS/ServerLMS/Debug64/ServerLMS_autogen/include/ui_serverlmswidget.h a1ba014d73005738 -60 2225 7560635986964049 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 -57 2392 7560635988624358 CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj 12010b53b3caa3fc -2392 2950 7560635993714374 libServerLMS.dll 2f530586cec8163 -2392 2950 7560635993714374 libServerLMS.dll.a 2f530586cec8163 +57 2165 7561312838276686 CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj 64946e3309bfc754 +2165 2722 7561312843381972 libServerLMS.dll 2f530586cec8163 +2165 2722 7561312843381972 libServerLMS.dll.a 2f530586cec8163 diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj index 5b77686..ae844b7 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/ServerLMS_autogen/mocs_compilation.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj index 3837bf1..af080b1 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/dataparser.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj index 9f5cef5..eaf5bf9 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/processingsystem.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj index 5189695..d6be3bd 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/recognizesystem.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj index 9164b64..6fc3080 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/sendsystem.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj index 7579dd0..3c20409 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/tools.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj index 5da99ae..2364351 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/Systems/updatecontroller.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj index d26246b..cceb4a9 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/clienthandler.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj index 075a85d..32c0d34 100644 Binary files a/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj and b/ServerLMS/Debug64/CMakeFiles/ServerLMS.dir/serverlmswidget.cpp.obj differ diff --git a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt index 3093ae6..9a4349e 100644 --- a/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt +++ b/ServerLMS/Debug64/CMakeFiles/ServerLMS_autogen.dir/ParseCache.txt @@ -1,22 +1,7 @@ # Generated by CMake. Changes will be overwritten. -D:/LMS/ServerLMS/ServerLMS/clienthandler.cpp -D:/LMS/ServerLMS/ServerLMS/providerdblms.h - mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.cpp -D:/LMS/ServerLMS/ServerLMS/multithreadserver.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/logger.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.cpp -D:/LMS/ServerLMS/ServerLMS/providerdblms.cpp -D:/LMS/ServerLMS/ServerLMS/Client.h -D:/LMS/ServerLMS/ServerLMS/multithreadserver.h - mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.h mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/ServerLMS_global.h -D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp -D:/LMS/ServerLMS/ServerLMS/serverlmswidget.h - mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.h mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/serverlmswidget.cpp @@ -24,14 +9,29 @@ D:/LMS/ServerLMS/ServerLMS/serverlmswidget.cpp D:/LMS/ServerLMS/ServerLMS/Systems/logger.h mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/Systems/tools.cpp -D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.h +D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.h mmc:Q_OBJECT D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.h mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.h +D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.h mmc:Q_OBJECT -D:/LMS/ServerLMS/ServerLMS/typesDataServerClient.h D:/LMS/ServerLMS/ServerLMS/Systems/tools.h D:/LMS/ServerLMS/ServerLMS/clienthandler.h mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/clienthandler.cpp +D:/LMS/ServerLMS/ServerLMS/providerdblms.h + mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/multithreadserver.h + mmc:Q_OBJECT +D:/LMS/ServerLMS/ServerLMS/Client.h +D:/LMS/ServerLMS/ServerLMS/typesDataServerClient.h D:/LMS/ServerLMS/ServerLMS/Systems/processingsystem.cpp +D:/LMS/ServerLMS/ServerLMS/providerdblms.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/recognizesystem.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/logger.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/sendsystem.cpp +D:/LMS/ServerLMS/ServerLMS/multithreadserver.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/updatecontroller.cpp +D:/LMS/ServerLMS/ServerLMS/Systems/dataparser.cpp +D:/LMS/ServerLMS/ServerLMS/serverlmswidget.h + mmc:Q_OBJECT diff --git a/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/moc_clienthandler.cpp b/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/moc_clienthandler.cpp index f613e75..f819422 100644 --- a/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/moc_clienthandler.cpp +++ b/ServerLMS/Debug64/ServerLMS_autogen/EWIEGA46WW/moc_clienthandler.cpp @@ -171,6 +171,13 @@ void ClientHandler::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { switch (_id) { default: *reinterpret_cast(_a[0]) = -1; break; + case 0: + switch (*reinterpret_cast(_a[1])) { + default: *reinterpret_cast(_a[0]) = -1; break; + case 1: + *reinterpret_cast(_a[0]) = qRegisterMetaType< PacketType >(); break; + } + break; case 1: switch (*reinterpret_cast(_a[1])) { default: *reinterpret_cast(_a[0]) = -1; break; diff --git a/ServerLMS/Debug64/ServerLMS_autogen/VO5QMHL5JN/moc_processingsystem.cpp b/ServerLMS/Debug64/ServerLMS_autogen/VO5QMHL5JN/moc_processingsystem.cpp index 1b4f1c1..ae390f9 100644 --- a/ServerLMS/Debug64/ServerLMS_autogen/VO5QMHL5JN/moc_processingsystem.cpp +++ b/ServerLMS/Debug64/ServerLMS_autogen/VO5QMHL5JN/moc_processingsystem.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_ProcessingSystem_t { - QByteArrayData data[10]; - char stringdata0[125]; + QByteArrayData data[11]; + char stringdata0[151]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -41,13 +41,15 @@ QT_MOC_LITERAL(5, 68, 3), // "log" QT_MOC_LITERAL(6, 72, 17), // "sigAddToMessanger" QT_MOC_LITERAL(7, 90, 5), // "login" QT_MOC_LITERAL(8, 96, 4), // "text" -QT_MOC_LITERAL(9, 101, 23) // "signal_msgToClientReady" +QT_MOC_LITERAL(9, 101, 23), // "signal_msgToClientReady" +QT_MOC_LITERAL(10, 125, 25) // "signal_msgFromClientReady" }, "ProcessingSystem\0sigUpdateListClients\0" "\0sigAuthChanged\0sigLogMessage\0log\0" "sigAddToMessanger\0login\0text\0" - "signal_msgToClientReady" + "signal_msgToClientReady\0" + "signal_msgFromClientReady" }; #undef QT_MOC_LITERAL @@ -57,25 +59,27 @@ static const uint qt_meta_data_ProcessingSystem[] = { 8, // revision 0, // classname 0, 0, // classinfo - 5, 14, // methods + 6, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 5, // signalCount + 6, // signalCount // signals: name, argc, parameters, tag, flags - 1, 0, 39, 2, 0x06 /* Public */, - 3, 0, 40, 2, 0x06 /* Public */, - 4, 1, 41, 2, 0x06 /* Public */, - 6, 2, 44, 2, 0x06 /* Public */, - 9, 2, 49, 2, 0x06 /* Public */, + 1, 0, 44, 2, 0x06 /* Public */, + 3, 0, 45, 2, 0x06 /* Public */, + 4, 1, 46, 2, 0x06 /* Public */, + 6, 2, 49, 2, 0x06 /* Public */, + 9, 2, 54, 2, 0x06 /* Public */, + 10, 2, 59, 2, 0x06 /* Public */, // signals: parameters QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::QString, 5, QMetaType::Void, QMetaType::QString, QMetaType::QString, 7, 8, + QMetaType::Void, QMetaType::QString, QMetaType::QString, 7, 8, QMetaType::Void, QMetaType::QString, QMetaType::QString, 7, 8, 0 // eod @@ -92,6 +96,7 @@ void ProcessingSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int case 2: _t->sigLogMessage((*reinterpret_cast< QString(*)>(_a[1]))); break; case 3: _t->sigAddToMessanger((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; case 4: _t->signal_msgToClientReady((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; + case 5: _t->signal_msgFromClientReady((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -131,6 +136,13 @@ void ProcessingSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int return; } } + { + using _t = void (ProcessingSystem::*)(QString , QString ); + if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&ProcessingSystem::signal_msgFromClientReady)) { + *result = 5; + return; + } + } } } @@ -163,13 +175,13 @@ int ProcessingSystem::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 5) + if (_id < 6) qt_static_metacall(this, _c, _id, _a); - _id -= 5; + _id -= 6; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 5) + if (_id < 6) *reinterpret_cast(_a[0]) = -1; - _id -= 5; + _id -= 6; } return _id; } @@ -206,5 +218,12 @@ void ProcessingSystem::signal_msgToClientReady(QString _t1, QString _t2) void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; QMetaObject::activate(this, &staticMetaObject, 4, _a); } + +// SIGNAL 5 +void ProcessingSystem::signal_msgFromClientReady(QString _t1, QString _t2) +{ + void *_a[] = { nullptr, const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; + QMetaObject::activate(this, &staticMetaObject, 5, _a); +} QT_WARNING_POP QT_END_MOC_NAMESPACE diff --git a/ServerLMS/Debug64/ServerLMS_autogen/VO5QMHL5JN/moc_sendsystem.cpp b/ServerLMS/Debug64/ServerLMS_autogen/VO5QMHL5JN/moc_sendsystem.cpp index c9d0487..5c20982 100644 --- a/ServerLMS/Debug64/ServerLMS_autogen/VO5QMHL5JN/moc_sendsystem.cpp +++ b/ServerLMS/Debug64/ServerLMS_autogen/VO5QMHL5JN/moc_sendsystem.cpp @@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_SendSystem_t { - QByteArrayData data[10]; - char stringdata0[110]; + QByteArrayData data[11]; + char stringdata0[116]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -38,15 +38,17 @@ QT_MOC_LITERAL(2, 23, 0), // "" QT_MOC_LITERAL(3, 24, 15), // "sigSendToLogger" QT_MOC_LITERAL(4, 40, 7), // "message" QT_MOC_LITERAL(5, 48, 17), // "sigSendXMLmessage" -QT_MOC_LITERAL(6, 66, 13), // "sigSendNotify" -QT_MOC_LITERAL(7, 80, 11), // "socketWrite" -QT_MOC_LITERAL(8, 92, 5), // "array" -QT_MOC_LITERAL(9, 98, 11) // "socketClose" +QT_MOC_LITERAL(6, 66, 5), // "login" +QT_MOC_LITERAL(7, 72, 13), // "sigSendNotify" +QT_MOC_LITERAL(8, 86, 11), // "socketWrite" +QT_MOC_LITERAL(9, 98, 5), // "array" +QT_MOC_LITERAL(10, 104, 11) // "socketClose" }, "SendSystem\0sigLoadHash\0\0sigSendToLogger\0" - "message\0sigSendXMLmessage\0sigSendNotify\0" - "socketWrite\0array\0socketClose" + "message\0sigSendXMLmessage\0login\0" + "sigSendNotify\0socketWrite\0array\0" + "socketClose" }; #undef QT_MOC_LITERAL @@ -56,31 +58,33 @@ static const uint qt_meta_data_SendSystem[] = { 8, // revision 0, // classname 0, 0, // classinfo - 6, 14, // methods + 7, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 4, // signalCount + 5, // signalCount // signals: name, argc, parameters, tag, flags - 1, 0, 44, 2, 0x06 /* Public */, - 3, 1, 45, 2, 0x06 /* Public */, - 5, 1, 48, 2, 0x06 /* Public */, - 6, 1, 51, 2, 0x06 /* Public */, + 1, 0, 49, 2, 0x06 /* Public */, + 3, 1, 50, 2, 0x06 /* Public */, + 5, 2, 53, 2, 0x06 /* Public */, + 5, 1, 58, 2, 0x26 /* Public | MethodCloned */, + 7, 1, 61, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 7, 1, 54, 2, 0x0a /* Public */, - 9, 0, 57, 2, 0x0a /* Public */, + 8, 1, 64, 2, 0x0a /* Public */, + 10, 0, 67, 2, 0x0a /* Public */, // signals: parameters QMetaType::Void, QMetaType::Void, QMetaType::QString, 4, + QMetaType::QByteArray, QMetaType::QString, QMetaType::QString, 4, 6, QMetaType::QByteArray, QMetaType::QString, 4, QMetaType::QByteArray, QMetaType::QString, 4, // slots: parameters - QMetaType::Void, QMetaType::QByteArray, 8, + QMetaType::Void, QMetaType::QByteArray, 9, QMetaType::Void, 0 // eod @@ -94,12 +98,14 @@ void SendSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, switch (_id) { case 0: _t->sigLoadHash(); break; case 1: _t->sigSendToLogger((*reinterpret_cast< QString(*)>(_a[1]))); break; - case 2: { QByteArray _r = _t->sigSendXMLmessage((*reinterpret_cast< QString(*)>(_a[1]))); + case 2: { QByteArray _r = _t->sigSendXMLmessage((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); if (_a[0]) *reinterpret_cast< QByteArray*>(_a[0]) = std::move(_r); } break; - case 3: { QByteArray _r = _t->sigSendNotify((*reinterpret_cast< QString(*)>(_a[1]))); + case 3: { QByteArray _r = _t->sigSendXMLmessage((*reinterpret_cast< QString(*)>(_a[1]))); if (_a[0]) *reinterpret_cast< QByteArray*>(_a[0]) = std::move(_r); } break; - case 4: _t->socketWrite((*reinterpret_cast< QByteArray(*)>(_a[1]))); break; - case 5: _t->socketClose(); break; + case 4: { QByteArray _r = _t->sigSendNotify((*reinterpret_cast< QString(*)>(_a[1]))); + if (_a[0]) *reinterpret_cast< QByteArray*>(_a[0]) = std::move(_r); } break; + case 5: _t->socketWrite((*reinterpret_cast< QByteArray(*)>(_a[1]))); break; + case 6: _t->socketClose(); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -119,7 +125,7 @@ void SendSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, } } { - using _t = QByteArray (SendSystem::*)(QString ); + using _t = QByteArray (SendSystem::*)(QString , QString ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&SendSystem::sigSendXMLmessage)) { *result = 2; return; @@ -128,7 +134,7 @@ void SendSystem::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, { using _t = QByteArray (SendSystem::*)(QString ); if (*reinterpret_cast<_t *>(_a[1]) == static_cast<_t>(&SendSystem::sigSendNotify)) { - *result = 3; + *result = 4; return; } } @@ -164,13 +170,13 @@ int SendSystem::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 6) + if (_id < 7) qt_static_metacall(this, _c, _id, _a); - _id -= 6; + _id -= 7; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 6) + if (_id < 7) *reinterpret_cast(_a[0]) = -1; - _id -= 6; + _id -= 7; } return _id; } @@ -189,20 +195,20 @@ void SendSystem::sigSendToLogger(QString _t1) } // SIGNAL 2 -QByteArray SendSystem::sigSendXMLmessage(QString _t1) +QByteArray SendSystem::sigSendXMLmessage(QString _t1, QString _t2) { QByteArray _t0{}; - void *_a[] = { const_cast(reinterpret_cast(std::addressof(_t0))), const_cast(reinterpret_cast(std::addressof(_t1))) }; + void *_a[] = { const_cast(reinterpret_cast(std::addressof(_t0))), const_cast(reinterpret_cast(std::addressof(_t1))), const_cast(reinterpret_cast(std::addressof(_t2))) }; QMetaObject::activate(this, &staticMetaObject, 2, _a); return _t0; } -// SIGNAL 3 +// SIGNAL 4 QByteArray SendSystem::sigSendNotify(QString _t1) { QByteArray _t0{}; void *_a[] = { const_cast(reinterpret_cast(std::addressof(_t0))), const_cast(reinterpret_cast(std::addressof(_t1))) }; - QMetaObject::activate(this, &staticMetaObject, 3, _a); + QMetaObject::activate(this, &staticMetaObject, 4, _a); return _t0; } QT_WARNING_POP diff --git a/ServerLMS/Debug64/libServerLMS.dll b/ServerLMS/Debug64/libServerLMS.dll index b86ef50..cf8f27d 100644 Binary files a/ServerLMS/Debug64/libServerLMS.dll and b/ServerLMS/Debug64/libServerLMS.dll differ diff --git a/ServerLMS/Debug64/libServerLMS.dll.a b/ServerLMS/Debug64/libServerLMS.dll.a index efcc624..5dccb82 100644 Binary files a/ServerLMS/Debug64/libServerLMS.dll.a and b/ServerLMS/Debug64/libServerLMS.dll.a differ diff --git a/ServerLMS/ServerLMS/CMakeLists.txt.user b/ServerLMS/ServerLMS/CMakeLists.txt.user index f35e160..5c3df12 100644 --- a/ServerLMS/ServerLMS/CMakeLists.txt.user +++ b/ServerLMS/ServerLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/ServerLMS/ServerLMS/Systems/dataparser.cpp b/ServerLMS/ServerLMS/Systems/dataparser.cpp index f5fe0d7..2e97bc8 100644 --- a/ServerLMS/ServerLMS/Systems/dataparser.cpp +++ b/ServerLMS/ServerLMS/Systems/dataparser.cpp @@ -519,12 +519,18 @@ QByteArray DataParser::xmlAnswer_ClientQueryToDB_ListTasks(bool result, QList listTag; + SAttribute attribute2; SAttribute attribute1 = {"Text", text}; QList listAttr = {attribute1}; + if(login != "") + { + attribute2 = {"Login", login}; + listAttr.append(attribute2); + } SXmlAnswerTag tag = {"ServerMessage", listAttr}; listTag.append(tag); diff --git a/ServerLMS/ServerLMS/Systems/dataparser.h b/ServerLMS/ServerLMS/Systems/dataparser.h index 8a16d98..c292ac6 100644 --- a/ServerLMS/ServerLMS/Systems/dataparser.h +++ b/ServerLMS/ServerLMS/Systems/dataparser.h @@ -38,7 +38,7 @@ public: QByteArray xmlAnswer_ClientQueryToDB_ListClassrooms(bool result, QList *listClassrooms); QByteArray xmlAnswer_ClientQueryToDB_ListTasks(bool result, QList *listTasks); - QByteArray xmlAnswer_message(QString text); + QByteArray xmlAnswer_message(QString text, QString login = ""); QByteArray xmlAnswer_task(QString text); QByteArray xmlAnswer_notify(QString code); QByteArray xmlAnswer_tasks(QStringList listTasks); diff --git a/ServerLMS/ServerLMS/Systems/processingsystem.cpp b/ServerLMS/ServerLMS/Systems/processingsystem.cpp index 6b29b62..7b5fbf7 100644 --- a/ServerLMS/ServerLMS/Systems/processingsystem.cpp +++ b/ServerLMS/ServerLMS/Systems/processingsystem.cpp @@ -224,15 +224,16 @@ void ProcessingSystem::processingToClientMessage(ClientHandler *client, ToClient void ProcessingSystem::processingFromClientMessage(ClientHandler *client, ClientMessage clientMessage) { + /* QString peerAddress = client->getSocket()->peerAddress().toString(); QString peerPort = QString::number(client->getSocket()->peerPort()); QString str = "Msg From Client [" + peerAddress + ":" + peerPort + "] : " + clientMessage.Text; emit sigLogMessage(str); + */ - //Здесь нужно оттранслировать на ГУИ! - //emit sigAddToMessanger(client->getClient()->getLogin(), clientMessage.Text); + signal_msgFromClientReady(client->getClient()->getLogin(), clientMessage.Text); } void ProcessingSystem::processingClientNotify(ClientHandler *client, ClientNotify clientNotify) diff --git a/ServerLMS/ServerLMS/Systems/processingsystem.h b/ServerLMS/ServerLMS/Systems/processingsystem.h index 67f98be..7264930 100644 --- a/ServerLMS/ServerLMS/Systems/processingsystem.h +++ b/ServerLMS/ServerLMS/Systems/processingsystem.h @@ -37,6 +37,7 @@ signals: void sigLogMessage(QString log); void sigAddToMessanger(QString login,QString text); void signal_msgToClientReady(QString login, QString text); + void signal_msgFromClientReady(QString login, QString text); private: ServerLMSWidget *server; diff --git a/ServerLMS/ServerLMS/Systems/sendsystem.h b/ServerLMS/ServerLMS/Systems/sendsystem.h index e9c803e..011b053 100644 --- a/ServerLMS/ServerLMS/Systems/sendsystem.h +++ b/ServerLMS/ServerLMS/Systems/sendsystem.h @@ -42,7 +42,7 @@ public slots: signals: void sigLoadHash(); void sigSendToLogger(QString message); - QByteArray sigSendXMLmessage(QString message); + QByteArray sigSendXMLmessage(QString message, QString login = ""); QByteArray sigSendNotify(QString message); private: diff --git a/ServerLMS/ServerLMS/Systems/tools.h b/ServerLMS/ServerLMS/Systems/tools.h index 8c6b5c2..748ec54 100644 --- a/ServerLMS/ServerLMS/Systems/tools.h +++ b/ServerLMS/ServerLMS/Systems/tools.h @@ -32,6 +32,8 @@ enum PacketType TYPE_DISABLE = 11, TYPE_FILESIZE = 20, + TYPE_XMLANSWER_MESSAGE_FOR_GUI = 90, + //xml-ответы на запросы к БД TYPE_XMLANSWER_QUERY_DB__LIST_INSTRUCTORS = 100, TYPE_XMLANSWER_QUERY_DB__LIST_GROUPS = 101, diff --git a/ServerLMS/ServerLMS/serverlmswidget.cpp b/ServerLMS/ServerLMS/serverlmswidget.cpp index a91ec5a..ba3c2f4 100644 --- a/ServerLMS/ServerLMS/serverlmswidget.cpp +++ b/ServerLMS/ServerLMS/serverlmswidget.cpp @@ -73,6 +73,7 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) : connect(processingSystem,&ProcessingSystem::sigAuthChanged,this, &ServerLMSWidget::slot_AuthChanged); connect(processingSystem,&ProcessingSystem::signal_msgToClientReady,this, &ServerLMSWidget::slot_msgToClientFromGUI); + connect(processingSystem,&ProcessingSystem::signal_msgFromClientReady,this, &ServerLMSWidget::slot_msgToGUIfromClient); on_btnStartServer_clicked(); @@ -258,7 +259,7 @@ void ServerLMSWidget::slot_msgToGUIfromClient(QString login, QString text) { QString textMsg = text; - QByteArray byteArrayMsg = dataParser->xmlAnswer_message(textMsg); + QByteArray byteArrayMsg = dataParser->xmlAnswer_message(textMsg, login); //Проходим все открытые сокеты, ищем нужный foreach(int idSocket, clientsMap.keys()) @@ -267,7 +268,7 @@ void ServerLMSWidget::slot_msgToGUIfromClient(QString login, QString text) if(handler->getClient()->getTypeClient() == TypeClientAutorization::TYPE_GUI) {//Отправляем GUI-клиенту для отображения в Мессенджере - handler->sendXmlAnswer(byteArrayMsg); + handler->sendXmlAnswer(byteArrayMsg, PacketType::TYPE_XMLANSWER); QString peerAddress = clientsMap[idSocket]->getSocket()->peerAddress().toString(); QString peerPort = QString::number(clientsMap[idSocket]->getSocket()->peerPort()); diff --git a/TestServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T10-16-15-0576.json b/TestServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-17T06-34-27-0469.json similarity index 100% rename from TestServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-06T10-16-15-0576.json rename to TestServerLMS/Debug64/.cmake/api/v1/reply/index-2024-12-17T06-34-27-0469.json diff --git a/TestServerLMS/Debug64/.ninja_deps b/TestServerLMS/Debug64/.ninja_deps index ebff1bc..a013208 100644 Binary files a/TestServerLMS/Debug64/.ninja_deps and b/TestServerLMS/Debug64/.ninja_deps differ diff --git a/TestServerLMS/Debug64/.ninja_log b/TestServerLMS/Debug64/.ninja_log index a5fc92a..8cc8222 100644 --- a/TestServerLMS/Debug64/.ninja_log +++ b/TestServerLMS/Debug64/.ninja_log @@ -1,61 +1,33 @@ # ninja log v5 531 577 7551768470787617 TestServerLMS_autogen/EWIEGA46WW/qrc_testServerLMS.cpp 7826208a1b187af8 584 624 7551768471280319 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/EWIEGA46WW/qrc_testServerLMS.cpp.obj 243f7b95850f8289 -13 43 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -39 2176 7556242986507402 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj ead884c44f7eae81 -13 43 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 43 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +13 45 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +45 2185 7560568747003841 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj ead884c44f7eae81 +13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +13 45 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 35 42 0 clean 9c4b4372737ab8da 10 35 0 CMakeFiles/clean.additional 7155004b3956b606 -50 205 7556248731227612 TestServerLMS.exe 68113cd959b50515 -13 43 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -531 577 7551768470787617 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/EWIEGA46WW/qrc_testServerLMS.cpp 7826208a1b187af8 -41 2174 7556242986487175 CMakeFiles/TestServerLMS.dir/main.cpp.obj 1d4cd62574a9f6ed -12 229 7551833755120909 build.ninja ac221dfe1922250d -13 43 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 43 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -43 2290 7556242987640656 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj e30b9f2440a3c47d -14 46 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -14 46 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -14 46 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -14 46 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -14 46 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -14 46 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -28 74 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -28 74 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -28 74 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -28 74 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -28 74 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -28 74 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -76 2192 7560482432625375 CMakeFiles/TestServerLMS.dir/main.cpp.obj 1d4cd62574a9f6ed -74 2237 7560482433070297 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj ead884c44f7eae81 -78 2306 7560482433769990 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj e30b9f2440a3c47d -2306 2466 7560482435351275 TestServerLMS.exe 68113cd959b50515 -18 55 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -18 55 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -18 55 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -18 55 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -18 55 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -18 55 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 45 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 45 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 45 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 45 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 44 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 44 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 44 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 44 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 44 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 44 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 45 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 45 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 45 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -13 45 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 -13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 -13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 -48 2163 7560568746804377 CMakeFiles/TestServerLMS.dir/main.cpp.obj 1d4cd62574a9f6ed -45 2185 7560568747003841 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj ead884c44f7eae81 -50 2335 7560568748525266 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj e30b9f2440a3c47d 2335 2489 7560568750044910 TestServerLMS.exe 68113cd959b50515 +13 45 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +531 577 7551768470787617 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/EWIEGA46WW/qrc_testServerLMS.cpp 7826208a1b187af8 +48 2163 7560568746804377 CMakeFiles/TestServerLMS.dir/main.cpp.obj 1d4cd62574a9f6ed +12 229 7561204673832909 build.ninja ac221dfe1922250d +13 45 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +13 45 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +50 2335 7560568748525266 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj e30b9f2440a3c47d +18 57 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +18 57 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +18 57 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +18 57 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +18 57 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +18 57 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +57 2197 7561249255204927 CMakeFiles/TestServerLMS.dir/TestServerLMS_autogen/mocs_compilation.cpp.obj ead884c44f7eae81 +60 2199 7561249255254517 CMakeFiles/TestServerLMS.dir/main.cpp.obj 1d4cd62574a9f6ed +62 2318 7561249256434394 CMakeFiles/TestServerLMS.dir/mainwindow.cpp.obj e30b9f2440a3c47d +2318 2485 7561249258098451 TestServerLMS.exe 68113cd959b50515 +17 48 0 CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +17 48 0 TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +17 48 0 TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 +17 48 0 D:/LMS/TestServerLMS/Debug64/CMakeFiles/TestServerLMS_autogen 5989ad27e0bf1fd0 +17 48 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/mocs_compilation.cpp 5989ad27e0bf1fd0 +17 48 0 D:/LMS/TestServerLMS/Debug64/TestServerLMS_autogen/include/ui_mainwindow.h 5989ad27e0bf1fd0 diff --git a/TestServerLMS/Debug64/ListInstructors.xml b/TestServerLMS/Debug64/ListInstructors.xml index 0d512b5..1e21e82 100644 --- a/TestServerLMS/Debug64/ListInstructors.xml +++ b/TestServerLMS/Debug64/ListInstructors.xml @@ -1,15 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/TestServerLMS/Debug64/ListTrainees.xml b/TestServerLMS/Debug64/ListTrainees.xml index 8570e5b..c9b2a07 100644 --- a/TestServerLMS/Debug64/ListTrainees.xml +++ b/TestServerLMS/Debug64/ListTrainees.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/TestServerLMS/Debug64/StaticData/save.xml b/TestServerLMS/Debug64/StaticData/save.xml index 4902929..1e9bf53 100644 --- a/TestServerLMS/Debug64/StaticData/save.xml +++ b/TestServerLMS/Debug64/StaticData/save.xml @@ -1,2 +1,2 @@ - + diff --git a/TestServerLMS/Debug64/TestServerLMS.exe b/TestServerLMS/Debug64/TestServerLMS.exe index 4ecf97e..c5c2039 100644 Binary files a/TestServerLMS/Debug64/TestServerLMS.exe and b/TestServerLMS/Debug64/TestServerLMS.exe differ diff --git a/TestServerLMS/Debug64/libServerLMS.dll b/TestServerLMS/Debug64/libServerLMS.dll index b86ef50..cf8f27d 100644 Binary files a/TestServerLMS/Debug64/libServerLMS.dll and b/TestServerLMS/Debug64/libServerLMS.dll differ diff --git a/TestServerLMS/TestServerLMS/CMakeLists.txt.user b/TestServerLMS/TestServerLMS/CMakeLists.txt.user index c9b6f34..cf95d8d 100644 --- a/TestServerLMS/TestServerLMS/CMakeLists.txt.user +++ b/TestServerLMS/TestServerLMS/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId