From 05fce073f1602e61903d1f755402551a530deefc Mon Sep 17 00:00:00 2001 From: krivoshein Date: Fri, 5 Dec 2025 12:20:47 +0300 Subject: [PATCH] refact1 --- CMakeLists.txt | 8 ++--- .../CMakeLists.txt | 8 ++--- .../CMakeLists.txt.user.00ce76f | 0 .../CMakeLists.txt.user.15ef247 | 0 .../DataBaseInterface.qrc | 0 .../DataBaseLMS.pgerd | 0 .../DataBaseLMS_global.h | 0 .../basicentity.cpp | 0 .../basicentity.h | 0 .../classroom.cpp | 0 .../classroom.h | 0 .../computer.cpp | 0 .../computer.h | 0 .../contactModel.h | 0 .../databaselms.cpp | 0 .../databaselms.h | 0 .../databaselms_Postgresql.cpp | 0 .../databaselms_groups.cpp | 0 .../databaselms_instructors.cpp | 0 .../databaselms_tasks.cpp | 0 .../databaselms_trainees.cpp | 0 .../databaselms_users.cpp | 0 .../group.cpp | 0 .../group.h | 0 .../hashtools.cpp | 0 .../hashtools.h | 0 .../instructor.cpp | 0 .../instructor.h | 0 .../interfacedatabaselms.cpp | 0 .../interfacedatabaselms.h | 0 .../resources/blankXML/ErrorDB.xml | 0 .../tasksAmmFim.cpp | 0 .../tasksAmmFim.h | 0 .../timingoftrainee.cpp | 0 .../timingoftrainee.h | 0 .../trainee.cpp | 0 .../trainee.h | 0 .../translations/DataBaseLMS_ru_RU.ts | 0 .../typeQueryToDB.h | 0 .../user.cpp | 0 .../user.h | 0 .../CMakeLists.txt | 14 ++++---- .../CMakeLists.txt.user.00ce76f | 0 .../CMakeLists.txt.user.15ef247 | 0 .../CMakeLists.txt.user.88628a1 | 0 .../InstructorsAndTrainees.qrc | 0 .../authorization/dialogauthorization.cpp | 0 .../authorization/dialogauthorization.h | 0 .../authorization/dialogauthorization.ui | 0 .../commonview.cpp | 0 .../commonview.h | 0 .../connectorToServer/Core/FileData.h | 0 .../connectorToServer/Core/dataparser.cpp | 0 .../connectorToServer/Core/dataparser.h | 0 .../Core/recognizesystem.cpp | 0 .../connectorToServer/Core/recognizesystem.h | 0 .../connectorToServer/Core/sendsystem.cpp | 0 .../connectorToServer/Core/sendsystem.h | 0 .../connectorToServer/Core/tcpclient.cpp | 0 .../connectorToServer/Core/tcpclient.h | 0 .../connectorToServer/Core/tools.cpp | 0 .../connectorToServer/Core/tools.h | 0 .../Core/versioncontainer.cpp | 0 .../connectorToServer/Core/versioncontainer.h | 0 .../connectorToServer/Datas.h | 0 .../connectorToServer/connectortoserver.cpp | 0 .../connectorToServer/connectortoserver.h | 0 .../connectortoserver_AnswerQueryToDB.cpp | 0 .../connectortoserver_LocalModelDB.cpp | 0 .../connectortoserver_Send.cpp | 0 .../connectorToServer/streamingversiondata.h | 0 .../dialognewpassword.cpp | 0 .../dialognewpassword.h | 0 .../dialognewpassword.ui | 0 .../instructors/dialogeditinstructor.cpp | 0 .../instructors/dialogeditinstructor.h | 0 .../instructors/dialogeditinstructor.ui | 0 .../instructors/dialogredactorinstructors.cpp | 0 .../instructors/dialogredactorinstructors.h | 0 .../instructors/editorinstructors.cpp | 0 .../instructors/editorinstructors.h | 0 .../instructors/editorinstructors.ui | 0 .../instructors/instructorsview.cpp | 0 .../instructors/instructorsview.h | 0 .../instructors/viewerinstructors.cpp | 0 .../instructors/viewerinstructors.h | 0 .../instructors/viewerinstructors.ui | 0 .../instructorsAndTrainees_global.h | 0 .../instructorsandtraineeswidget.cpp | 0 .../instructorsandtraineeswidget.h | 0 .../instructorsandtraineeswidget.ui | 0 .../messanger/messangercontroller.cpp | 0 .../messanger/messangercontroller.h | 0 .../messanger/messangerwidget.cpp | 0 .../messanger/messangerwidget.h | 0 .../messanger/messangerwidget.ui | 0 .../messanger/msgwidget.cpp | 0 .../messanger/msgwidget.h | 0 .../messanger/msgwidget.ui | 0 .../messanger/tabdialogmessenger.cpp | 0 .../messanger/tabdialogmessenger.h | 0 .../metatypes.cpp | 0 .../metatypes.h | 0 .../resources/icons/762.gif | Bin .../resources/icons/DB-instructors.png | Bin .../resources/icons/DB-trainees.png | Bin .../resources/icons/PNG/DB-instructors.png | Bin .../resources/icons/PNG/DB-trainees.png | Bin .../resources/icons/PNG/addInstructor.png | Bin .../resources/icons/PNG/addTrainee.png | Bin .../resources/icons/PNG/admin.png | Bin .../resources/icons/PNG/archive.png | Bin .../resources/icons/PNG/assignTask.png | Bin .../resources/icons/PNG/check.png | Bin .../resources/icons/PNG/chekNo.png | Bin .../resources/icons/PNG/chekYes.png | Bin .../resources/icons/PNG/circleGray.png | Bin .../resources/icons/PNG/circleGreen.png | Bin .../resources/icons/PNG/circleRed.png | Bin .../resources/icons/PNG/circleYellow.png | Bin .../resources/icons/PNG/connectDB.png | Bin .../resources/icons/PNG/delete.png | Bin .../resources/icons/PNG/deleteGroup.png | Bin .../resources/icons/PNG/deleteInstructor.png | Bin .../resources/icons/PNG/deleteTrainee.png | Bin .../resources/icons/PNG/docTasks.png | Bin .../resources/icons/PNG/edit.png | Bin .../resources/icons/PNG/editorDB.png | Bin .../resources/icons/PNG/filter.png | Bin .../resources/icons/PNG/group.png | Bin .../resources/icons/PNG/instructor.png | Bin .../resources/icons/PNG/instructorAdmin.png | Bin .../resources/icons/PNG/instructorArchive.png | Bin .../icons/PNG/instructorFromArchive.png | Bin .../resources/icons/PNG/lms.png | Bin .../resources/icons/PNG/login-user.png | Bin .../resources/icons/PNG/malfunction.png | Bin .../resources/icons/PNG/newGroup.png | Bin .../resources/icons/PNG/rectGray.png | Bin .../resources/icons/PNG/rectGreen.png | Bin .../resources/icons/PNG/sendMsg.png | Bin .../resources/icons/PNG/settings.png | Bin .../resources/icons/PNG/sign.png | Bin .../resources/icons/PNG/style.png | Bin .../resources/icons/PNG/task.png | Bin .../resources/icons/PNG/trainee.png | Bin .../resources/icons/PNG/traineeArchive.png | Bin .../icons/PNG/traineeFromArchive.png | Bin .../resources/icons/PNG/updateVersion.png | Bin .../resources/icons/PNG24/DB-instructors.png | Bin .../resources/icons/PNG24/DB-trainees.png | Bin .../resources/icons/PNG24/addInstructor.png | Bin .../resources/icons/PNG24/addTrainee.png | Bin .../resources/icons/PNG24/admin.png | Bin .../resources/icons/PNG24/archive.png | Bin .../resources/icons/PNG24/assignTask.png | Bin .../resources/icons/PNG24/check.png | Bin .../resources/icons/PNG24/chekNo.png | Bin .../resources/icons/PNG24/chekYes.png | Bin .../resources/icons/PNG24/circleGray.png | Bin .../resources/icons/PNG24/circleGreen.png | Bin .../resources/icons/PNG24/circleRed.png | Bin .../resources/icons/PNG24/circleYellow.png | Bin .../resources/icons/PNG24/connectDB.png | Bin .../resources/icons/PNG24/delete.png | Bin .../resources/icons/PNG24/deleteGroup.png | Bin .../icons/PNG24/deleteInstructor.png | Bin .../resources/icons/PNG24/deleteTrainee.png | Bin .../resources/icons/PNG24/docTasks.png | Bin .../resources/icons/PNG24/edit.png | Bin .../resources/icons/PNG24/editorDB.png | Bin .../resources/icons/PNG24/filter.png | Bin .../resources/icons/PNG24/group.png | Bin .../resources/icons/PNG24/instructor.png | Bin .../resources/icons/PNG24/instructorAdmin.png | Bin .../icons/PNG24/instructorArchive.png | Bin .../icons/PNG24/instructorFromArchive.png | Bin .../resources/icons/PNG24/lms.png | Bin .../resources/icons/PNG24/login-user.png | Bin .../resources/icons/PNG24/malfunction.png | Bin .../resources/icons/PNG24/newGroup.png | Bin .../resources/icons/PNG24/rectGray.png | Bin .../resources/icons/PNG24/rectGreen.png | Bin .../resources/icons/PNG24/sendMsg.png | Bin .../resources/icons/PNG24/settings.png | Bin .../resources/icons/PNG24/sign.png | Bin .../resources/icons/PNG24/style.png | Bin .../resources/icons/PNG24/task.png | Bin .../resources/icons/PNG24/trainee.png | Bin .../resources/icons/PNG24/traineeArchive.png | Bin .../icons/PNG24/traineeFromArchive.png | Bin .../resources/icons/PNG24/updateVersion.png | Bin .../resources/icons/PNG32/DB-instructors.png | Bin .../resources/icons/PNG32/DB-trainees.png | Bin .../resources/icons/PNG32/addInstructor.png | Bin .../resources/icons/PNG32/addTrainee.png | Bin .../resources/icons/PNG32/admin.png | Bin .../resources/icons/PNG32/archive.png | Bin .../resources/icons/PNG32/assignTask.png | Bin .../resources/icons/PNG32/check.png | Bin .../resources/icons/PNG32/chekNo.png | Bin .../resources/icons/PNG32/chekYes.png | Bin .../resources/icons/PNG32/circleGray.png | Bin .../resources/icons/PNG32/circleGreen.png | Bin .../resources/icons/PNG32/circleRed.png | Bin .../resources/icons/PNG32/circleYellow.png | Bin .../resources/icons/PNG32/connectDB.png | Bin .../resources/icons/PNG32/delete.png | Bin .../resources/icons/PNG32/deleteGroup.png | Bin .../icons/PNG32/deleteInstructor.png | Bin .../resources/icons/PNG32/deleteTrainee.png | Bin .../resources/icons/PNG32/docTasks.png | Bin .../resources/icons/PNG32/edit.png | Bin .../resources/icons/PNG32/editorDB.png | Bin .../resources/icons/PNG32/filter.png | Bin .../resources/icons/PNG32/group.png | Bin .../resources/icons/PNG32/instructor.png | Bin .../resources/icons/PNG32/instructorAdmin.png | Bin .../icons/PNG32/instructorArchive.png | Bin .../icons/PNG32/instructorFromArchive.png | Bin .../resources/icons/PNG32/lms.png | Bin .../resources/icons/PNG32/login-user.png | Bin .../resources/icons/PNG32/malfunction.png | Bin .../resources/icons/PNG32/newGroup.png | Bin .../resources/icons/PNG32/rectGray.png | Bin .../resources/icons/PNG32/rectGreen.png | Bin .../resources/icons/PNG32/sendMsg.png | Bin .../resources/icons/PNG32/settings.png | Bin .../resources/icons/PNG32/sign.png | Bin .../resources/icons/PNG32/style.png | Bin .../resources/icons/PNG32/task.png | Bin .../resources/icons/PNG32/trainee.png | Bin .../resources/icons/PNG32/traineeArchive.png | Bin .../icons/PNG32/traineeFromArchive.png | Bin .../resources/icons/PNG32/updateVersion.png | Bin .../resources/icons/addInstructor.png | Bin .../resources/icons/addTrainee.png | Bin .../resources/icons/admin.png | Bin .../resources/icons/archive.png | Bin .../resources/icons/assignTask.png | Bin .../resources/icons/branch-closed.png | Bin .../resources/icons/branch-end.png | Bin .../resources/icons/branch-more.png | Bin .../resources/icons/branch-open.png | Bin .../resources/icons/check.png | Bin .../resources/icons/chekNo.png | Bin .../resources/icons/chekYes.png | Bin .../resources/icons/circleGray.png | Bin .../resources/icons/circleGreen.png | Bin .../resources/icons/circleRed.png | Bin .../resources/icons/circleYellow.png | Bin .../resources/icons/connectDB.png | Bin .../resources/icons/critical.png | Bin .../resources/icons/delete.png | Bin .../resources/icons/deleteGroup.png | Bin .../resources/icons/deleteInstructor.png | Bin .../resources/icons/deleteTrainee.png | Bin .../resources/icons/docTasks.png | Bin .../resources/icons/edit.png | Bin .../resources/icons/editorDB.png | Bin .../resources/icons/exchange.png | Bin .../resources/icons/eye.png | Bin .../resources/icons/filter.png | Bin .../resources/icons/group.png | Bin .../resources/icons/info.png | Bin .../resources/icons/instructor.png | Bin .../resources/icons/instructorAdmin.png | Bin .../resources/icons/instructorArchive.png | Bin .../resources/icons/instructorFromArchive.png | Bin .../resources/icons/link.png | Bin .../resources/icons/lms.png | Bin .../resources/icons/login-user.png | Bin .../resources/icons/malfunction.png | Bin .../resources/icons/newGroup.png | Bin .../resources/icons/personalCard.png | Bin .../resources/icons/personalCard_2.png | Bin .../resources/icons/procedure.png | Bin .../resources/icons/rectGray.png | Bin .../resources/icons/rectGreen.png | Bin .../resources/icons/sendMsg.png | Bin .../resources/icons/settings.png | Bin .../resources/icons/sign.png | Bin .../resources/icons/style.png | Bin .../resources/icons/task.png | Bin .../resources/icons/trainee.png | Bin .../resources/icons/traineeArchive.png | Bin .../resources/icons/traineeFromArchive.png | Bin .../resources/icons/updateVersion.png | Bin .../resources/icons/vline.png | Bin .../resources/icons/warning.png | Bin .../settings/dialognewversion.cpp | 0 .../settings/dialognewversion.h | 0 .../settings/dialognewversion.ui | 0 .../settings/dialogsettings.cpp | 0 .../settings/dialogsettings.h | 0 .../settings/dialogsettings.ui | 0 .../settings/dialogversioncontrol.cpp | 0 .../settings/dialogversioncontrol.h | 0 .../settings/dialogversioncontrol.ui | 0 .../specialmessagebox/specialmessagebox.cpp | 0 .../specialmessagebox/specialmessagebox.h | 0 .../specialmessagebox/specialmessagebox.ui | 0 .../tasks/ammtaskswidget.cpp | 0 .../tasks/ammtaskswidget.h | 0 .../tasks/ammtaskswidget.ui | 0 .../tasks/checkertask.cpp | 0 .../tasks/checkertask.h | 0 .../tasks/checkertask.ui | 0 .../tasks/dialogchekertask.cpp | 0 .../tasks/dialogchekertask.h | 0 .../tasks/dialoglistsubproc.cpp | 0 .../tasks/dialoglistsubproc.h | 0 .../tasks/dialogtaskscommon.cpp | 0 .../tasks/dialogtaskscommon.h | 0 .../tasks/fimtaskswidget.cpp | 0 .../tasks/fimtaskswidget.h | 0 .../tasks/fimtaskswidget.ui | 0 .../tasks/listsubproc.cpp | 0 .../tasks/listsubproc.h | 0 .../tasks/listsubproc.ui | 0 .../tasks/module.cpp | 0 .../tasks/module.h | 0 .../tasks/subprocitemwidget.cpp | 0 .../tasks/subprocitemwidget.h | 0 .../tasks/subprocitemwidget.ui | 0 .../tasks/tasktreepreparation.cpp | 0 .../tasks/tasktreepreparation.h | 0 .../tasks/viewertaskscommon.cpp | 0 .../tasks/viewertaskscommon.h | 0 .../tasks/viewertaskscommon.ui | 0 .../trainees/computersLocations.cpp | 0 .../trainees/computersLocations.h | 0 .../trainees/dialogcardtrainee.cpp | 0 .../trainees/dialogcardtrainee.h | 0 .../trainees/dialogeditgroup.cpp | 0 .../trainees/dialogeditgroup.h | 0 .../trainees/dialogeditgroup.ui | 0 .../trainees/dialogedittrainee.cpp | 0 .../trainees/dialogedittrainee.h | 0 .../trainees/dialogedittrainee.ui | 0 .../trainees/dialogredactortrainees.cpp | 0 .../trainees/dialogredactortrainees.h | 0 .../trainees/editortrainees.cpp | 0 .../trainees/editortrainees.h | 0 .../trainees/editortrainees.ui | 0 .../trainees/personalcardtrainee.cpp | 0 .../trainees/personalcardtrainee.h | 0 .../trainees/personalcardtrainee.ui | 0 .../trainees/traineesview.cpp | 0 .../trainees/traineesview.h | 0 .../trainees/viewertrainees.cpp | 0 .../trainees/viewertrainees.h | 0 .../trainees/viewertrainees.ui | 0 .../InstructorsAndTraineesWidget_ru_RU.qm | Bin .../InstructorsAndTraineesWidget_ru_RU.ts | 0 .../widgets/waitanimationwidget.cpp | 0 .../widgets/waitanimationwidget.h | 0 .../widgets/waitanimationwidget.ui | 0 .../widgets/widgettools.cpp | 0 .../widgets/widgettools.h | 0 {Server => LibServer}/CMakeLists.txt | 24 ++++++------- .../CMakeLists.txt.user.00ce76f | 0 .../CMakeLists.txt.user.02bbda2 | 0 .../CMakeLists.txt.user.15ef247 | 0 {Server => LibServer}/Data/Client.h | 0 {Server => LibServer}/Data/PacketType.h | 0 .../Data/StreamingVersionData.h | 0 .../Data/typesDataServerClient.h | 0 {Server => LibServer}/Data/userType.h | 0 {Server => LibServer}/Server.qrc | 0 {Server => LibServer}/ServerLMS_global.h | 0 .../Systems/.vs/ProjectSettings.json | 0 .../Systems/.vs/Systems/v16/.suo | Bin .../Systems/.vs/Systems/v16/Browse.VC.db | Bin .../Systems/.vs/VSWorkspaceState.json | 0 {Server => LibServer}/Systems/.vs/slnx.sqlite | Bin .../Systems/Parsers/clientanswerparser.cpp | 0 .../Systems/Parsers/clientanswerparser.h | 0 .../Systems/Parsers/dataparser.cpp | 0 .../Systems/Parsers/dataparser.h | 0 .../Systems/Parsers/dbanswerparser.cpp | 0 .../Systems/Parsers/dbanswerparser.h | 0 .../Systems/Parsers/docsanswerparser.cpp | 0 .../Systems/Parsers/docsanswerparser.h | 0 .../Systems/Parsers/processparser.cpp | 0 .../Systems/Parsers/processparser.h | 0 .../Systems/assetsmanager.cpp | 0 {Server => LibServer}/Systems/assetsmanager.h | 0 {Server => LibServer}/Systems/chatsystem.cpp | 0 {Server => LibServer}/Systems/chatsystem.h | 0 .../Systems/commonclienthandler.cpp | 0 .../Systems/commonclienthandler.h | 0 {Server => LibServer}/Systems/docsupdater.cpp | 0 {Server => LibServer}/Systems/docsupdater.h | 0 .../Systems/fasthashcalculator.cpp | 0 .../Systems/fasthashcalculator.h | 0 {Server => LibServer}/Systems/logger.cpp | 0 {Server => LibServer}/Systems/logger.h | 0 .../Systems/processingsystem.cpp | 0 .../Systems/processingsystem.h | 0 .../Systems/recognizesystem.cpp | 0 .../Systems/recognizesystem.h | 0 {Server => LibServer}/Systems/sendsystem.cpp | 0 {Server => LibServer}/Systems/sendsystem.h | 0 {Server => LibServer}/Systems/tools.cpp | 0 {Server => LibServer}/Systems/tools.h | 0 .../Systems/updatecontroller.cpp | 0 .../Systems/updatecontroller.h | 0 .../clienthandler/clienthandler.cpp | 0 .../clienthandler/clienthandler.h | 0 {Server => LibServer}/metatypes.cpp | 0 {Server => LibServer}/metatypes.h | 0 .../multithreadserver/multithreadserver.cpp | 0 .../multithreadserver/multithreadserver.h | 0 .../providerdblms/providerdblms.cpp | 0 .../providerdblms/providerdblms.h | 0 .../resources/blankXML/ListGroups.xml | 0 .../resources/blankXML/ListInstructors.xml | 0 .../resources/blankXML/ListSubProc.xml | 0 .../resources/blankXML/ListTasksAMM.xml | 0 .../resources/blankXML/ListTasksFIM.xml | 0 .../resources/blankXML/ListTrainees.xml | 0 .../resources/icons/checkDB.png | Bin .../resources/icons/circleGray.png | Bin .../resources/icons/circleGreen.png | Bin .../resources/icons/circleRed.png | Bin .../resources/icons/editorDB.png | Bin .../resources/icons/exchange.png | Bin .../resources/icons/lock.png | Bin .../resources/icons/open.png | Bin .../resources/icons/procedure.png | Bin .../resources/icons/rocket.png | Bin .../resources/icons/settings.png | Bin .../resources/icons/stop.png | Bin .../resources/icons/switchOff.png | Bin .../resources/icons/switchOn.png | Bin .../resources/icons/unlock.png | Bin {Server => LibServer}/serverlmswidget.cpp | 0 {Server => LibServer}/serverlmswidget.h | 0 {Server => LibServer}/serverlmswidget.ui | 0 .../settings/dialogcheckdb.cpp | 0 .../settings/dialogcheckdb.h | 0 .../settings/dialogcheckdb.ui | 0 .../settings/dialogsettingstray.cpp | 0 .../settings/dialogsettingstray.h | 0 .../settings/dialogsettingstray.ui | 0 .../translations/ServerLMS_ru_RU.qm | Bin .../translations/ServerLMS_ru_RU.ts | 0 ProgramAWSinstructorMPS/CMakeLists.txt | 34 +++++++++--------- ProgramServerMPS/CMakeLists.txt | 28 +++++++-------- 450 files changed, 58 insertions(+), 58 deletions(-) rename {DataBaseInterface => LibDataBaseInterface}/CMakeLists.txt (84%) rename {DataBaseInterface => LibDataBaseInterface}/CMakeLists.txt.user.00ce76f (100%) rename {DataBaseInterface => LibDataBaseInterface}/CMakeLists.txt.user.15ef247 (100%) rename {DataBaseInterface => LibDataBaseInterface}/DataBaseInterface.qrc (100%) rename {DataBaseInterface => LibDataBaseInterface}/DataBaseLMS.pgerd (100%) rename {DataBaseInterface => LibDataBaseInterface}/DataBaseLMS_global.h (100%) rename {DataBaseInterface => LibDataBaseInterface}/basicentity.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/basicentity.h (100%) rename {DataBaseInterface => LibDataBaseInterface}/classroom.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/classroom.h (100%) rename {DataBaseInterface => LibDataBaseInterface}/computer.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/computer.h (100%) rename {DataBaseInterface => LibDataBaseInterface}/contactModel.h (100%) rename {DataBaseInterface => LibDataBaseInterface}/databaselms.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/databaselms.h (100%) rename {DataBaseInterface => LibDataBaseInterface}/databaselms_Postgresql.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/databaselms_groups.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/databaselms_instructors.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/databaselms_tasks.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/databaselms_trainees.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/databaselms_users.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/group.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/group.h (100%) rename {DataBaseInterface => LibDataBaseInterface}/hashtools.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/hashtools.h (100%) rename {DataBaseInterface => LibDataBaseInterface}/instructor.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/instructor.h (100%) rename {DataBaseInterface => LibDataBaseInterface}/interfacedatabaselms.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/interfacedatabaselms.h (100%) rename {DataBaseInterface => LibDataBaseInterface}/resources/blankXML/ErrorDB.xml (100%) rename {DataBaseInterface => LibDataBaseInterface}/tasksAmmFim.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/tasksAmmFim.h (100%) rename {DataBaseInterface => LibDataBaseInterface}/timingoftrainee.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/timingoftrainee.h (100%) rename {DataBaseInterface => LibDataBaseInterface}/trainee.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/trainee.h (100%) rename {DataBaseInterface => LibDataBaseInterface}/translations/DataBaseLMS_ru_RU.ts (100%) rename {DataBaseInterface => LibDataBaseInterface}/typeQueryToDB.h (100%) rename {DataBaseInterface => LibDataBaseInterface}/user.cpp (100%) rename {DataBaseInterface => LibDataBaseInterface}/user.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/CMakeLists.txt (92%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/CMakeLists.txt.user.00ce76f (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/CMakeLists.txt.user.15ef247 (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/CMakeLists.txt.user.88628a1 (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/InstructorsAndTrainees.qrc (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/authorization/dialogauthorization.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/authorization/dialogauthorization.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/authorization/dialogauthorization.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/commonview.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/commonview.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/Core/FileData.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/Core/dataparser.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/Core/dataparser.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/Core/recognizesystem.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/Core/recognizesystem.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/Core/sendsystem.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/Core/sendsystem.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/Core/tcpclient.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/Core/tcpclient.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/Core/tools.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/Core/tools.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/Core/versioncontainer.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/Core/versioncontainer.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/Datas.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/connectortoserver.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/connectortoserver.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/connectortoserver_AnswerQueryToDB.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/connectortoserver_LocalModelDB.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/connectortoserver_Send.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/connectorToServer/streamingversiondata.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/dialognewpassword.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/dialognewpassword.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/dialognewpassword.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructors/dialogeditinstructor.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructors/dialogeditinstructor.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructors/dialogeditinstructor.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructors/dialogredactorinstructors.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructors/dialogredactorinstructors.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructors/editorinstructors.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructors/editorinstructors.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructors/editorinstructors.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructors/instructorsview.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructors/instructorsview.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructors/viewerinstructors.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructors/viewerinstructors.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructors/viewerinstructors.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructorsAndTrainees_global.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructorsandtraineeswidget.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructorsandtraineeswidget.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/instructorsandtraineeswidget.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/messanger/messangercontroller.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/messanger/messangercontroller.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/messanger/messangerwidget.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/messanger/messangerwidget.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/messanger/messangerwidget.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/messanger/msgwidget.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/messanger/msgwidget.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/messanger/msgwidget.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/messanger/tabdialogmessenger.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/messanger/tabdialogmessenger.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/metatypes.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/metatypes.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/762.gif (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/DB-instructors.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/DB-trainees.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/DB-instructors.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/DB-trainees.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/addInstructor.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/addTrainee.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/admin.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/archive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/assignTask.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/check.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/chekNo.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/chekYes.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/circleGray.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/circleGreen.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/circleRed.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/circleYellow.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/connectDB.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/delete.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/deleteGroup.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/deleteInstructor.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/deleteTrainee.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/docTasks.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/edit.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/editorDB.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/filter.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/group.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/instructor.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/instructorAdmin.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/instructorArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/instructorFromArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/lms.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/login-user.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/malfunction.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/newGroup.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/rectGray.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/rectGreen.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/sendMsg.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/settings.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/sign.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/style.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/task.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/trainee.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/traineeArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/traineeFromArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG/updateVersion.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/DB-instructors.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/DB-trainees.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/addInstructor.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/addTrainee.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/admin.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/archive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/assignTask.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/check.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/chekNo.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/chekYes.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/circleGray.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/circleGreen.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/circleRed.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/circleYellow.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/connectDB.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/delete.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/deleteGroup.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/deleteInstructor.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/deleteTrainee.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/docTasks.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/edit.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/editorDB.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/filter.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/group.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/instructor.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/instructorAdmin.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/instructorArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/instructorFromArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/lms.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/login-user.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/malfunction.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/newGroup.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/rectGray.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/rectGreen.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/sendMsg.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/settings.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/sign.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/style.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/task.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/trainee.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/traineeArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/traineeFromArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG24/updateVersion.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/DB-instructors.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/DB-trainees.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/addInstructor.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/addTrainee.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/admin.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/archive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/assignTask.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/check.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/chekNo.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/chekYes.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/circleGray.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/circleGreen.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/circleRed.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/circleYellow.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/connectDB.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/delete.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/deleteGroup.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/deleteInstructor.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/deleteTrainee.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/docTasks.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/edit.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/editorDB.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/filter.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/group.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/instructor.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/instructorAdmin.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/instructorArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/instructorFromArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/lms.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/login-user.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/malfunction.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/newGroup.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/rectGray.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/rectGreen.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/sendMsg.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/settings.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/sign.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/style.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/task.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/trainee.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/traineeArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/traineeFromArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/PNG32/updateVersion.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/addInstructor.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/addTrainee.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/admin.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/archive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/assignTask.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/branch-closed.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/branch-end.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/branch-more.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/branch-open.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/check.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/chekNo.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/chekYes.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/circleGray.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/circleGreen.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/circleRed.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/circleYellow.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/connectDB.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/critical.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/delete.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/deleteGroup.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/deleteInstructor.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/deleteTrainee.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/docTasks.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/edit.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/editorDB.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/exchange.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/eye.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/filter.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/group.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/info.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/instructor.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/instructorAdmin.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/instructorArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/instructorFromArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/link.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/lms.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/login-user.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/malfunction.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/newGroup.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/personalCard.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/personalCard_2.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/procedure.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/rectGray.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/rectGreen.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/sendMsg.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/settings.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/sign.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/style.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/task.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/trainee.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/traineeArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/traineeFromArchive.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/updateVersion.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/vline.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/resources/icons/warning.png (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/settings/dialognewversion.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/settings/dialognewversion.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/settings/dialognewversion.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/settings/dialogsettings.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/settings/dialogsettings.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/settings/dialogsettings.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/settings/dialogversioncontrol.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/settings/dialogversioncontrol.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/settings/dialogversioncontrol.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/specialmessagebox/specialmessagebox.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/specialmessagebox/specialmessagebox.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/specialmessagebox/specialmessagebox.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/ammtaskswidget.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/ammtaskswidget.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/ammtaskswidget.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/checkertask.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/checkertask.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/checkertask.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/dialogchekertask.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/dialogchekertask.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/dialoglistsubproc.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/dialoglistsubproc.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/dialogtaskscommon.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/dialogtaskscommon.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/fimtaskswidget.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/fimtaskswidget.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/fimtaskswidget.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/listsubproc.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/listsubproc.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/listsubproc.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/module.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/module.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/subprocitemwidget.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/subprocitemwidget.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/subprocitemwidget.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/tasktreepreparation.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/tasktreepreparation.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/viewertaskscommon.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/viewertaskscommon.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/tasks/viewertaskscommon.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/computersLocations.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/computersLocations.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/dialogcardtrainee.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/dialogcardtrainee.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/dialogeditgroup.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/dialogeditgroup.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/dialogeditgroup.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/dialogedittrainee.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/dialogedittrainee.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/dialogedittrainee.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/dialogredactortrainees.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/dialogredactortrainees.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/editortrainees.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/editortrainees.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/editortrainees.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/personalcardtrainee.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/personalcardtrainee.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/personalcardtrainee.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/traineesview.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/traineesview.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/viewertrainees.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/viewertrainees.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/trainees/viewertrainees.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/translations/InstructorsAndTraineesWidget_ru_RU.qm (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/translations/InstructorsAndTraineesWidget_ru_RU.ts (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/widgets/waitanimationwidget.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/widgets/waitanimationwidget.h (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/widgets/waitanimationwidget.ui (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/widgets/widgettools.cpp (100%) rename {InstructorsAndTrainees => LibInstructorsAndTrainees}/widgets/widgettools.h (100%) rename {Server => LibServer}/CMakeLists.txt (87%) rename {Server => LibServer}/CMakeLists.txt.user.00ce76f (100%) rename {Server => LibServer}/CMakeLists.txt.user.02bbda2 (100%) rename {Server => LibServer}/CMakeLists.txt.user.15ef247 (100%) rename {Server => LibServer}/Data/Client.h (100%) rename {Server => LibServer}/Data/PacketType.h (100%) rename {Server => LibServer}/Data/StreamingVersionData.h (100%) rename {Server => LibServer}/Data/typesDataServerClient.h (100%) rename {Server => LibServer}/Data/userType.h (100%) rename {Server => LibServer}/Server.qrc (100%) rename {Server => LibServer}/ServerLMS_global.h (100%) rename {Server => LibServer}/Systems/.vs/ProjectSettings.json (100%) rename {Server => LibServer}/Systems/.vs/Systems/v16/.suo (100%) rename {Server => LibServer}/Systems/.vs/Systems/v16/Browse.VC.db (100%) rename {Server => LibServer}/Systems/.vs/VSWorkspaceState.json (100%) rename {Server => LibServer}/Systems/.vs/slnx.sqlite (100%) rename {Server => LibServer}/Systems/Parsers/clientanswerparser.cpp (100%) rename {Server => LibServer}/Systems/Parsers/clientanswerparser.h (100%) rename {Server => LibServer}/Systems/Parsers/dataparser.cpp (100%) rename {Server => LibServer}/Systems/Parsers/dataparser.h (100%) rename {Server => LibServer}/Systems/Parsers/dbanswerparser.cpp (100%) rename {Server => LibServer}/Systems/Parsers/dbanswerparser.h (100%) rename {Server => LibServer}/Systems/Parsers/docsanswerparser.cpp (100%) rename {Server => LibServer}/Systems/Parsers/docsanswerparser.h (100%) rename {Server => LibServer}/Systems/Parsers/processparser.cpp (100%) rename {Server => LibServer}/Systems/Parsers/processparser.h (100%) rename {Server => LibServer}/Systems/assetsmanager.cpp (100%) rename {Server => LibServer}/Systems/assetsmanager.h (100%) rename {Server => LibServer}/Systems/chatsystem.cpp (100%) rename {Server => LibServer}/Systems/chatsystem.h (100%) rename {Server => LibServer}/Systems/commonclienthandler.cpp (100%) rename {Server => LibServer}/Systems/commonclienthandler.h (100%) rename {Server => LibServer}/Systems/docsupdater.cpp (100%) rename {Server => LibServer}/Systems/docsupdater.h (100%) rename {Server => LibServer}/Systems/fasthashcalculator.cpp (100%) rename {Server => LibServer}/Systems/fasthashcalculator.h (100%) rename {Server => LibServer}/Systems/logger.cpp (100%) rename {Server => LibServer}/Systems/logger.h (100%) rename {Server => LibServer}/Systems/processingsystem.cpp (100%) rename {Server => LibServer}/Systems/processingsystem.h (100%) rename {Server => LibServer}/Systems/recognizesystem.cpp (100%) rename {Server => LibServer}/Systems/recognizesystem.h (100%) rename {Server => LibServer}/Systems/sendsystem.cpp (100%) rename {Server => LibServer}/Systems/sendsystem.h (100%) rename {Server => LibServer}/Systems/tools.cpp (100%) rename {Server => LibServer}/Systems/tools.h (100%) rename {Server => LibServer}/Systems/updatecontroller.cpp (100%) rename {Server => LibServer}/Systems/updatecontroller.h (100%) rename {Server => LibServer}/clienthandler/clienthandler.cpp (100%) rename {Server => LibServer}/clienthandler/clienthandler.h (100%) rename {Server => LibServer}/metatypes.cpp (100%) rename {Server => LibServer}/metatypes.h (100%) rename {Server => LibServer}/multithreadserver/multithreadserver.cpp (100%) rename {Server => LibServer}/multithreadserver/multithreadserver.h (100%) rename {Server => LibServer}/providerdblms/providerdblms.cpp (100%) rename {Server => LibServer}/providerdblms/providerdblms.h (100%) rename {Server => LibServer}/resources/blankXML/ListGroups.xml (100%) rename {Server => LibServer}/resources/blankXML/ListInstructors.xml (100%) rename {Server => LibServer}/resources/blankXML/ListSubProc.xml (100%) rename {Server => LibServer}/resources/blankXML/ListTasksAMM.xml (100%) rename {Server => LibServer}/resources/blankXML/ListTasksFIM.xml (100%) rename {Server => LibServer}/resources/blankXML/ListTrainees.xml (100%) rename {Server => LibServer}/resources/icons/checkDB.png (100%) rename {Server => LibServer}/resources/icons/circleGray.png (100%) rename {Server => LibServer}/resources/icons/circleGreen.png (100%) rename {Server => LibServer}/resources/icons/circleRed.png (100%) rename {Server => LibServer}/resources/icons/editorDB.png (100%) rename {Server => LibServer}/resources/icons/exchange.png (100%) rename {Server => LibServer}/resources/icons/lock.png (100%) rename {Server => LibServer}/resources/icons/open.png (100%) rename {Server => LibServer}/resources/icons/procedure.png (100%) rename {Server => LibServer}/resources/icons/rocket.png (100%) rename {Server => LibServer}/resources/icons/settings.png (100%) rename {Server => LibServer}/resources/icons/stop.png (100%) rename {Server => LibServer}/resources/icons/switchOff.png (100%) rename {Server => LibServer}/resources/icons/switchOn.png (100%) rename {Server => LibServer}/resources/icons/unlock.png (100%) rename {Server => LibServer}/serverlmswidget.cpp (100%) rename {Server => LibServer}/serverlmswidget.h (100%) rename {Server => LibServer}/serverlmswidget.ui (100%) rename {Server => LibServer}/settings/dialogcheckdb.cpp (100%) rename {Server => LibServer}/settings/dialogcheckdb.h (100%) rename {Server => LibServer}/settings/dialogcheckdb.ui (100%) rename {Server => LibServer}/settings/dialogsettingstray.cpp (100%) rename {Server => LibServer}/settings/dialogsettingstray.h (100%) rename {Server => LibServer}/settings/dialogsettingstray.ui (100%) rename {Server => LibServer}/translations/ServerLMS_ru_RU.qm (100%) rename {Server => LibServer}/translations/ServerLMS_ru_RU.ts (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b768c7c..855394a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,14 +30,14 @@ find_package(Qt5 COMPONENTS LinguistTools REQUIRED) find_package(Qt5 COMPONENTS Xml REQUIRED) find_package(Qt5 COMPONENTS Concurrent REQUIRED) -add_subdirectory(DataBaseInterface) -add_subdirectory(InstructorsAndTrainees) +add_subdirectory(LibDataBaseInterface) +add_subdirectory(LibInstructorsAndTrainees) +add_subdirectory(LibServer) add_subdirectory(ProgramAWSinstructorMPS) -add_subdirectory(Server) add_subdirectory(ProgramServerMPS) add_dependencies(InstructorsAndTrainees DataBaseInterface) -add_dependencies(ProgramAWSinstructorMPS InstructorsAndTrainees) add_dependencies(Server DataBaseInterface) add_dependencies(Server InstructorsAndTrainees) +add_dependencies(ProgramAWSinstructorMPS InstructorsAndTrainees) add_dependencies(ProgramServerMPS Server) diff --git a/DataBaseInterface/CMakeLists.txt b/LibDataBaseInterface/CMakeLists.txt similarity index 84% rename from DataBaseInterface/CMakeLists.txt rename to LibDataBaseInterface/CMakeLists.txt index 0010c74..fbc6e01 100644 --- a/DataBaseInterface/CMakeLists.txt +++ b/LibDataBaseInterface/CMakeLists.txt @@ -50,26 +50,26 @@ if(PROJECT_TYPE_DEBUG) add_custom_command(TARGET DataBaseInterface POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/Debug64/DataBaseInterface/libDataBaseInterface.dll + ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface/libDataBaseInterface.dll ${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS) add_custom_command(TARGET DataBaseInterface POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/Debug64/DataBaseInterface/libDataBaseInterface.dll + ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface/libDataBaseInterface.dll ${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMPS) else() add_custom_command(TARGET DataBaseInterface POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/Release64/DataBaseInterface/libDataBaseInterface.dll + ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface/libDataBaseInterface.dll ${REPO_PATH}/BUILDS/Release64/ProgramServerMPS) add_custom_command(TARGET DataBaseInterface POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/Release64/DataBaseInterface/libDataBaseInterface.dll + ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface/libDataBaseInterface.dll ${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMPS) endif() diff --git a/DataBaseInterface/CMakeLists.txt.user.00ce76f b/LibDataBaseInterface/CMakeLists.txt.user.00ce76f similarity index 100% rename from DataBaseInterface/CMakeLists.txt.user.00ce76f rename to LibDataBaseInterface/CMakeLists.txt.user.00ce76f diff --git a/DataBaseInterface/CMakeLists.txt.user.15ef247 b/LibDataBaseInterface/CMakeLists.txt.user.15ef247 similarity index 100% rename from DataBaseInterface/CMakeLists.txt.user.15ef247 rename to LibDataBaseInterface/CMakeLists.txt.user.15ef247 diff --git a/DataBaseInterface/DataBaseInterface.qrc b/LibDataBaseInterface/DataBaseInterface.qrc similarity index 100% rename from DataBaseInterface/DataBaseInterface.qrc rename to LibDataBaseInterface/DataBaseInterface.qrc diff --git a/DataBaseInterface/DataBaseLMS.pgerd b/LibDataBaseInterface/DataBaseLMS.pgerd similarity index 100% rename from DataBaseInterface/DataBaseLMS.pgerd rename to LibDataBaseInterface/DataBaseLMS.pgerd diff --git a/DataBaseInterface/DataBaseLMS_global.h b/LibDataBaseInterface/DataBaseLMS_global.h similarity index 100% rename from DataBaseInterface/DataBaseLMS_global.h rename to LibDataBaseInterface/DataBaseLMS_global.h diff --git a/DataBaseInterface/basicentity.cpp b/LibDataBaseInterface/basicentity.cpp similarity index 100% rename from DataBaseInterface/basicentity.cpp rename to LibDataBaseInterface/basicentity.cpp diff --git a/DataBaseInterface/basicentity.h b/LibDataBaseInterface/basicentity.h similarity index 100% rename from DataBaseInterface/basicentity.h rename to LibDataBaseInterface/basicentity.h diff --git a/DataBaseInterface/classroom.cpp b/LibDataBaseInterface/classroom.cpp similarity index 100% rename from DataBaseInterface/classroom.cpp rename to LibDataBaseInterface/classroom.cpp diff --git a/DataBaseInterface/classroom.h b/LibDataBaseInterface/classroom.h similarity index 100% rename from DataBaseInterface/classroom.h rename to LibDataBaseInterface/classroom.h diff --git a/DataBaseInterface/computer.cpp b/LibDataBaseInterface/computer.cpp similarity index 100% rename from DataBaseInterface/computer.cpp rename to LibDataBaseInterface/computer.cpp diff --git a/DataBaseInterface/computer.h b/LibDataBaseInterface/computer.h similarity index 100% rename from DataBaseInterface/computer.h rename to LibDataBaseInterface/computer.h diff --git a/DataBaseInterface/contactModel.h b/LibDataBaseInterface/contactModel.h similarity index 100% rename from DataBaseInterface/contactModel.h rename to LibDataBaseInterface/contactModel.h diff --git a/DataBaseInterface/databaselms.cpp b/LibDataBaseInterface/databaselms.cpp similarity index 100% rename from DataBaseInterface/databaselms.cpp rename to LibDataBaseInterface/databaselms.cpp diff --git a/DataBaseInterface/databaselms.h b/LibDataBaseInterface/databaselms.h similarity index 100% rename from DataBaseInterface/databaselms.h rename to LibDataBaseInterface/databaselms.h diff --git a/DataBaseInterface/databaselms_Postgresql.cpp b/LibDataBaseInterface/databaselms_Postgresql.cpp similarity index 100% rename from DataBaseInterface/databaselms_Postgresql.cpp rename to LibDataBaseInterface/databaselms_Postgresql.cpp diff --git a/DataBaseInterface/databaselms_groups.cpp b/LibDataBaseInterface/databaselms_groups.cpp similarity index 100% rename from DataBaseInterface/databaselms_groups.cpp rename to LibDataBaseInterface/databaselms_groups.cpp diff --git a/DataBaseInterface/databaselms_instructors.cpp b/LibDataBaseInterface/databaselms_instructors.cpp similarity index 100% rename from DataBaseInterface/databaselms_instructors.cpp rename to LibDataBaseInterface/databaselms_instructors.cpp diff --git a/DataBaseInterface/databaselms_tasks.cpp b/LibDataBaseInterface/databaselms_tasks.cpp similarity index 100% rename from DataBaseInterface/databaselms_tasks.cpp rename to LibDataBaseInterface/databaselms_tasks.cpp diff --git a/DataBaseInterface/databaselms_trainees.cpp b/LibDataBaseInterface/databaselms_trainees.cpp similarity index 100% rename from DataBaseInterface/databaselms_trainees.cpp rename to LibDataBaseInterface/databaselms_trainees.cpp diff --git a/DataBaseInterface/databaselms_users.cpp b/LibDataBaseInterface/databaselms_users.cpp similarity index 100% rename from DataBaseInterface/databaselms_users.cpp rename to LibDataBaseInterface/databaselms_users.cpp diff --git a/DataBaseInterface/group.cpp b/LibDataBaseInterface/group.cpp similarity index 100% rename from DataBaseInterface/group.cpp rename to LibDataBaseInterface/group.cpp diff --git a/DataBaseInterface/group.h b/LibDataBaseInterface/group.h similarity index 100% rename from DataBaseInterface/group.h rename to LibDataBaseInterface/group.h diff --git a/DataBaseInterface/hashtools.cpp b/LibDataBaseInterface/hashtools.cpp similarity index 100% rename from DataBaseInterface/hashtools.cpp rename to LibDataBaseInterface/hashtools.cpp diff --git a/DataBaseInterface/hashtools.h b/LibDataBaseInterface/hashtools.h similarity index 100% rename from DataBaseInterface/hashtools.h rename to LibDataBaseInterface/hashtools.h diff --git a/DataBaseInterface/instructor.cpp b/LibDataBaseInterface/instructor.cpp similarity index 100% rename from DataBaseInterface/instructor.cpp rename to LibDataBaseInterface/instructor.cpp diff --git a/DataBaseInterface/instructor.h b/LibDataBaseInterface/instructor.h similarity index 100% rename from DataBaseInterface/instructor.h rename to LibDataBaseInterface/instructor.h diff --git a/DataBaseInterface/interfacedatabaselms.cpp b/LibDataBaseInterface/interfacedatabaselms.cpp similarity index 100% rename from DataBaseInterface/interfacedatabaselms.cpp rename to LibDataBaseInterface/interfacedatabaselms.cpp diff --git a/DataBaseInterface/interfacedatabaselms.h b/LibDataBaseInterface/interfacedatabaselms.h similarity index 100% rename from DataBaseInterface/interfacedatabaselms.h rename to LibDataBaseInterface/interfacedatabaselms.h diff --git a/DataBaseInterface/resources/blankXML/ErrorDB.xml b/LibDataBaseInterface/resources/blankXML/ErrorDB.xml similarity index 100% rename from DataBaseInterface/resources/blankXML/ErrorDB.xml rename to LibDataBaseInterface/resources/blankXML/ErrorDB.xml diff --git a/DataBaseInterface/tasksAmmFim.cpp b/LibDataBaseInterface/tasksAmmFim.cpp similarity index 100% rename from DataBaseInterface/tasksAmmFim.cpp rename to LibDataBaseInterface/tasksAmmFim.cpp diff --git a/DataBaseInterface/tasksAmmFim.h b/LibDataBaseInterface/tasksAmmFim.h similarity index 100% rename from DataBaseInterface/tasksAmmFim.h rename to LibDataBaseInterface/tasksAmmFim.h diff --git a/DataBaseInterface/timingoftrainee.cpp b/LibDataBaseInterface/timingoftrainee.cpp similarity index 100% rename from DataBaseInterface/timingoftrainee.cpp rename to LibDataBaseInterface/timingoftrainee.cpp diff --git a/DataBaseInterface/timingoftrainee.h b/LibDataBaseInterface/timingoftrainee.h similarity index 100% rename from DataBaseInterface/timingoftrainee.h rename to LibDataBaseInterface/timingoftrainee.h diff --git a/DataBaseInterface/trainee.cpp b/LibDataBaseInterface/trainee.cpp similarity index 100% rename from DataBaseInterface/trainee.cpp rename to LibDataBaseInterface/trainee.cpp diff --git a/DataBaseInterface/trainee.h b/LibDataBaseInterface/trainee.h similarity index 100% rename from DataBaseInterface/trainee.h rename to LibDataBaseInterface/trainee.h diff --git a/DataBaseInterface/translations/DataBaseLMS_ru_RU.ts b/LibDataBaseInterface/translations/DataBaseLMS_ru_RU.ts similarity index 100% rename from DataBaseInterface/translations/DataBaseLMS_ru_RU.ts rename to LibDataBaseInterface/translations/DataBaseLMS_ru_RU.ts diff --git a/DataBaseInterface/typeQueryToDB.h b/LibDataBaseInterface/typeQueryToDB.h similarity index 100% rename from DataBaseInterface/typeQueryToDB.h rename to LibDataBaseInterface/typeQueryToDB.h diff --git a/DataBaseInterface/user.cpp b/LibDataBaseInterface/user.cpp similarity index 100% rename from DataBaseInterface/user.cpp rename to LibDataBaseInterface/user.cpp diff --git a/DataBaseInterface/user.h b/LibDataBaseInterface/user.h similarity index 100% rename from DataBaseInterface/user.h rename to LibDataBaseInterface/user.h diff --git a/InstructorsAndTrainees/CMakeLists.txt b/LibInstructorsAndTrainees/CMakeLists.txt similarity index 92% rename from InstructorsAndTrainees/CMakeLists.txt rename to LibInstructorsAndTrainees/CMakeLists.txt index 18a99d1..0153d48 100644 --- a/InstructorsAndTrainees/CMakeLists.txt +++ b/LibInstructorsAndTrainees/CMakeLists.txt @@ -163,11 +163,11 @@ target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_ target_compile_definitions(InstructorsAndTrainees PRIVATE INSTRUCTORSANDTRAINEES_LIBRARY) -target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseInterface) +target_include_directories(InstructorsAndTrainees PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface) if(PROJECT_TYPE_DEBUG) - target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseInterface) + target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface) else() - target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseInterface) + target_link_directories(InstructorsAndTrainees PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface) endif() target_link_libraries(InstructorsAndTrainees PRIVATE libDataBaseInterface.dll) @@ -175,24 +175,24 @@ if(PROJECT_TYPE_DEBUG) add_custom_command(TARGET InstructorsAndTrainees POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees/libInstructorsAndTrainees.dll + ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll ${REPO_PATH}/BUILDS/Debug64/ProgramAWSinstructorMPS) add_custom_command(TARGET InstructorsAndTrainees POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees/libInstructorsAndTrainees.dll + ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll ${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS) else() add_custom_command(TARGET InstructorsAndTrainees POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees/libInstructorsAndTrainees.dll + ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll ${REPO_PATH}/BUILDS/Release64/ProgramAWSinstructorMPS) add_custom_command(TARGET InstructorsAndTrainees POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees/libInstructorsAndTrainees.dll + ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees/libInstructorsAndTrainees.dll ${REPO_PATH}/BUILDS/Release64/ProgramServerMPS) endif() diff --git a/InstructorsAndTrainees/CMakeLists.txt.user.00ce76f b/LibInstructorsAndTrainees/CMakeLists.txt.user.00ce76f similarity index 100% rename from InstructorsAndTrainees/CMakeLists.txt.user.00ce76f rename to LibInstructorsAndTrainees/CMakeLists.txt.user.00ce76f diff --git a/InstructorsAndTrainees/CMakeLists.txt.user.15ef247 b/LibInstructorsAndTrainees/CMakeLists.txt.user.15ef247 similarity index 100% rename from InstructorsAndTrainees/CMakeLists.txt.user.15ef247 rename to LibInstructorsAndTrainees/CMakeLists.txt.user.15ef247 diff --git a/InstructorsAndTrainees/CMakeLists.txt.user.88628a1 b/LibInstructorsAndTrainees/CMakeLists.txt.user.88628a1 similarity index 100% rename from InstructorsAndTrainees/CMakeLists.txt.user.88628a1 rename to LibInstructorsAndTrainees/CMakeLists.txt.user.88628a1 diff --git a/InstructorsAndTrainees/InstructorsAndTrainees.qrc b/LibInstructorsAndTrainees/InstructorsAndTrainees.qrc similarity index 100% rename from InstructorsAndTrainees/InstructorsAndTrainees.qrc rename to LibInstructorsAndTrainees/InstructorsAndTrainees.qrc diff --git a/InstructorsAndTrainees/authorization/dialogauthorization.cpp b/LibInstructorsAndTrainees/authorization/dialogauthorization.cpp similarity index 100% rename from InstructorsAndTrainees/authorization/dialogauthorization.cpp rename to LibInstructorsAndTrainees/authorization/dialogauthorization.cpp diff --git a/InstructorsAndTrainees/authorization/dialogauthorization.h b/LibInstructorsAndTrainees/authorization/dialogauthorization.h similarity index 100% rename from InstructorsAndTrainees/authorization/dialogauthorization.h rename to LibInstructorsAndTrainees/authorization/dialogauthorization.h diff --git a/InstructorsAndTrainees/authorization/dialogauthorization.ui b/LibInstructorsAndTrainees/authorization/dialogauthorization.ui similarity index 100% rename from InstructorsAndTrainees/authorization/dialogauthorization.ui rename to LibInstructorsAndTrainees/authorization/dialogauthorization.ui diff --git a/InstructorsAndTrainees/commonview.cpp b/LibInstructorsAndTrainees/commonview.cpp similarity index 100% rename from InstructorsAndTrainees/commonview.cpp rename to LibInstructorsAndTrainees/commonview.cpp diff --git a/InstructorsAndTrainees/commonview.h b/LibInstructorsAndTrainees/commonview.h similarity index 100% rename from InstructorsAndTrainees/commonview.h rename to LibInstructorsAndTrainees/commonview.h diff --git a/InstructorsAndTrainees/connectorToServer/Core/FileData.h b/LibInstructorsAndTrainees/connectorToServer/Core/FileData.h similarity index 100% rename from InstructorsAndTrainees/connectorToServer/Core/FileData.h rename to LibInstructorsAndTrainees/connectorToServer/Core/FileData.h diff --git a/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp b/LibInstructorsAndTrainees/connectorToServer/Core/dataparser.cpp similarity index 100% rename from InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp rename to LibInstructorsAndTrainees/connectorToServer/Core/dataparser.cpp diff --git a/InstructorsAndTrainees/connectorToServer/Core/dataparser.h b/LibInstructorsAndTrainees/connectorToServer/Core/dataparser.h similarity index 100% rename from InstructorsAndTrainees/connectorToServer/Core/dataparser.h rename to LibInstructorsAndTrainees/connectorToServer/Core/dataparser.h diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp b/LibInstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp similarity index 100% rename from InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp rename to LibInstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h b/LibInstructorsAndTrainees/connectorToServer/Core/recognizesystem.h similarity index 100% rename from InstructorsAndTrainees/connectorToServer/Core/recognizesystem.h rename to LibInstructorsAndTrainees/connectorToServer/Core/recognizesystem.h diff --git a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp b/LibInstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp similarity index 100% rename from InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp rename to LibInstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp diff --git a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h b/LibInstructorsAndTrainees/connectorToServer/Core/sendsystem.h similarity index 100% rename from InstructorsAndTrainees/connectorToServer/Core/sendsystem.h rename to LibInstructorsAndTrainees/connectorToServer/Core/sendsystem.h diff --git a/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp b/LibInstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp similarity index 100% rename from InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp rename to LibInstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp diff --git a/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h b/LibInstructorsAndTrainees/connectorToServer/Core/tcpclient.h similarity index 100% rename from InstructorsAndTrainees/connectorToServer/Core/tcpclient.h rename to LibInstructorsAndTrainees/connectorToServer/Core/tcpclient.h diff --git a/InstructorsAndTrainees/connectorToServer/Core/tools.cpp b/LibInstructorsAndTrainees/connectorToServer/Core/tools.cpp similarity index 100% rename from InstructorsAndTrainees/connectorToServer/Core/tools.cpp rename to LibInstructorsAndTrainees/connectorToServer/Core/tools.cpp diff --git a/InstructorsAndTrainees/connectorToServer/Core/tools.h b/LibInstructorsAndTrainees/connectorToServer/Core/tools.h similarity index 100% rename from InstructorsAndTrainees/connectorToServer/Core/tools.h rename to LibInstructorsAndTrainees/connectorToServer/Core/tools.h diff --git a/InstructorsAndTrainees/connectorToServer/Core/versioncontainer.cpp b/LibInstructorsAndTrainees/connectorToServer/Core/versioncontainer.cpp similarity index 100% rename from InstructorsAndTrainees/connectorToServer/Core/versioncontainer.cpp rename to LibInstructorsAndTrainees/connectorToServer/Core/versioncontainer.cpp diff --git a/InstructorsAndTrainees/connectorToServer/Core/versioncontainer.h b/LibInstructorsAndTrainees/connectorToServer/Core/versioncontainer.h similarity index 100% rename from InstructorsAndTrainees/connectorToServer/Core/versioncontainer.h rename to LibInstructorsAndTrainees/connectorToServer/Core/versioncontainer.h diff --git a/InstructorsAndTrainees/connectorToServer/Datas.h b/LibInstructorsAndTrainees/connectorToServer/Datas.h similarity index 100% rename from InstructorsAndTrainees/connectorToServer/Datas.h rename to LibInstructorsAndTrainees/connectorToServer/Datas.h diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/LibInstructorsAndTrainees/connectorToServer/connectortoserver.cpp similarity index 100% rename from InstructorsAndTrainees/connectorToServer/connectortoserver.cpp rename to LibInstructorsAndTrainees/connectorToServer/connectortoserver.cpp diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/LibInstructorsAndTrainees/connectorToServer/connectortoserver.h similarity index 100% rename from InstructorsAndTrainees/connectorToServer/connectortoserver.h rename to LibInstructorsAndTrainees/connectorToServer/connectortoserver.h diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver_AnswerQueryToDB.cpp b/LibInstructorsAndTrainees/connectorToServer/connectortoserver_AnswerQueryToDB.cpp similarity index 100% rename from InstructorsAndTrainees/connectorToServer/connectortoserver_AnswerQueryToDB.cpp rename to LibInstructorsAndTrainees/connectorToServer/connectortoserver_AnswerQueryToDB.cpp diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver_LocalModelDB.cpp b/LibInstructorsAndTrainees/connectorToServer/connectortoserver_LocalModelDB.cpp similarity index 100% rename from InstructorsAndTrainees/connectorToServer/connectortoserver_LocalModelDB.cpp rename to LibInstructorsAndTrainees/connectorToServer/connectortoserver_LocalModelDB.cpp diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver_Send.cpp b/LibInstructorsAndTrainees/connectorToServer/connectortoserver_Send.cpp similarity index 100% rename from InstructorsAndTrainees/connectorToServer/connectortoserver_Send.cpp rename to LibInstructorsAndTrainees/connectorToServer/connectortoserver_Send.cpp diff --git a/InstructorsAndTrainees/connectorToServer/streamingversiondata.h b/LibInstructorsAndTrainees/connectorToServer/streamingversiondata.h similarity index 100% rename from InstructorsAndTrainees/connectorToServer/streamingversiondata.h rename to LibInstructorsAndTrainees/connectorToServer/streamingversiondata.h diff --git a/InstructorsAndTrainees/dialognewpassword.cpp b/LibInstructorsAndTrainees/dialognewpassword.cpp similarity index 100% rename from InstructorsAndTrainees/dialognewpassword.cpp rename to LibInstructorsAndTrainees/dialognewpassword.cpp diff --git a/InstructorsAndTrainees/dialognewpassword.h b/LibInstructorsAndTrainees/dialognewpassword.h similarity index 100% rename from InstructorsAndTrainees/dialognewpassword.h rename to LibInstructorsAndTrainees/dialognewpassword.h diff --git a/InstructorsAndTrainees/dialognewpassword.ui b/LibInstructorsAndTrainees/dialognewpassword.ui similarity index 100% rename from InstructorsAndTrainees/dialognewpassword.ui rename to LibInstructorsAndTrainees/dialognewpassword.ui diff --git a/InstructorsAndTrainees/instructors/dialogeditinstructor.cpp b/LibInstructorsAndTrainees/instructors/dialogeditinstructor.cpp similarity index 100% rename from InstructorsAndTrainees/instructors/dialogeditinstructor.cpp rename to LibInstructorsAndTrainees/instructors/dialogeditinstructor.cpp diff --git a/InstructorsAndTrainees/instructors/dialogeditinstructor.h b/LibInstructorsAndTrainees/instructors/dialogeditinstructor.h similarity index 100% rename from InstructorsAndTrainees/instructors/dialogeditinstructor.h rename to LibInstructorsAndTrainees/instructors/dialogeditinstructor.h diff --git a/InstructorsAndTrainees/instructors/dialogeditinstructor.ui b/LibInstructorsAndTrainees/instructors/dialogeditinstructor.ui similarity index 100% rename from InstructorsAndTrainees/instructors/dialogeditinstructor.ui rename to LibInstructorsAndTrainees/instructors/dialogeditinstructor.ui diff --git a/InstructorsAndTrainees/instructors/dialogredactorinstructors.cpp b/LibInstructorsAndTrainees/instructors/dialogredactorinstructors.cpp similarity index 100% rename from InstructorsAndTrainees/instructors/dialogredactorinstructors.cpp rename to LibInstructorsAndTrainees/instructors/dialogredactorinstructors.cpp diff --git a/InstructorsAndTrainees/instructors/dialogredactorinstructors.h b/LibInstructorsAndTrainees/instructors/dialogredactorinstructors.h similarity index 100% rename from InstructorsAndTrainees/instructors/dialogredactorinstructors.h rename to LibInstructorsAndTrainees/instructors/dialogredactorinstructors.h diff --git a/InstructorsAndTrainees/instructors/editorinstructors.cpp b/LibInstructorsAndTrainees/instructors/editorinstructors.cpp similarity index 100% rename from InstructorsAndTrainees/instructors/editorinstructors.cpp rename to LibInstructorsAndTrainees/instructors/editorinstructors.cpp diff --git a/InstructorsAndTrainees/instructors/editorinstructors.h b/LibInstructorsAndTrainees/instructors/editorinstructors.h similarity index 100% rename from InstructorsAndTrainees/instructors/editorinstructors.h rename to LibInstructorsAndTrainees/instructors/editorinstructors.h diff --git a/InstructorsAndTrainees/instructors/editorinstructors.ui b/LibInstructorsAndTrainees/instructors/editorinstructors.ui similarity index 100% rename from InstructorsAndTrainees/instructors/editorinstructors.ui rename to LibInstructorsAndTrainees/instructors/editorinstructors.ui diff --git a/InstructorsAndTrainees/instructors/instructorsview.cpp b/LibInstructorsAndTrainees/instructors/instructorsview.cpp similarity index 100% rename from InstructorsAndTrainees/instructors/instructorsview.cpp rename to LibInstructorsAndTrainees/instructors/instructorsview.cpp diff --git a/InstructorsAndTrainees/instructors/instructorsview.h b/LibInstructorsAndTrainees/instructors/instructorsview.h similarity index 100% rename from InstructorsAndTrainees/instructors/instructorsview.h rename to LibInstructorsAndTrainees/instructors/instructorsview.h diff --git a/InstructorsAndTrainees/instructors/viewerinstructors.cpp b/LibInstructorsAndTrainees/instructors/viewerinstructors.cpp similarity index 100% rename from InstructorsAndTrainees/instructors/viewerinstructors.cpp rename to LibInstructorsAndTrainees/instructors/viewerinstructors.cpp diff --git a/InstructorsAndTrainees/instructors/viewerinstructors.h b/LibInstructorsAndTrainees/instructors/viewerinstructors.h similarity index 100% rename from InstructorsAndTrainees/instructors/viewerinstructors.h rename to LibInstructorsAndTrainees/instructors/viewerinstructors.h diff --git a/InstructorsAndTrainees/instructors/viewerinstructors.ui b/LibInstructorsAndTrainees/instructors/viewerinstructors.ui similarity index 100% rename from InstructorsAndTrainees/instructors/viewerinstructors.ui rename to LibInstructorsAndTrainees/instructors/viewerinstructors.ui diff --git a/InstructorsAndTrainees/instructorsAndTrainees_global.h b/LibInstructorsAndTrainees/instructorsAndTrainees_global.h similarity index 100% rename from InstructorsAndTrainees/instructorsAndTrainees_global.h rename to LibInstructorsAndTrainees/instructorsAndTrainees_global.h diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp similarity index 100% rename from InstructorsAndTrainees/instructorsandtraineeswidget.cpp rename to LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.h b/LibInstructorsAndTrainees/instructorsandtraineeswidget.h similarity index 100% rename from InstructorsAndTrainees/instructorsandtraineeswidget.h rename to LibInstructorsAndTrainees/instructorsandtraineeswidget.h diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.ui b/LibInstructorsAndTrainees/instructorsandtraineeswidget.ui similarity index 100% rename from InstructorsAndTrainees/instructorsandtraineeswidget.ui rename to LibInstructorsAndTrainees/instructorsandtraineeswidget.ui diff --git a/InstructorsAndTrainees/messanger/messangercontroller.cpp b/LibInstructorsAndTrainees/messanger/messangercontroller.cpp similarity index 100% rename from InstructorsAndTrainees/messanger/messangercontroller.cpp rename to LibInstructorsAndTrainees/messanger/messangercontroller.cpp diff --git a/InstructorsAndTrainees/messanger/messangercontroller.h b/LibInstructorsAndTrainees/messanger/messangercontroller.h similarity index 100% rename from InstructorsAndTrainees/messanger/messangercontroller.h rename to LibInstructorsAndTrainees/messanger/messangercontroller.h diff --git a/InstructorsAndTrainees/messanger/messangerwidget.cpp b/LibInstructorsAndTrainees/messanger/messangerwidget.cpp similarity index 100% rename from InstructorsAndTrainees/messanger/messangerwidget.cpp rename to LibInstructorsAndTrainees/messanger/messangerwidget.cpp diff --git a/InstructorsAndTrainees/messanger/messangerwidget.h b/LibInstructorsAndTrainees/messanger/messangerwidget.h similarity index 100% rename from InstructorsAndTrainees/messanger/messangerwidget.h rename to LibInstructorsAndTrainees/messanger/messangerwidget.h diff --git a/InstructorsAndTrainees/messanger/messangerwidget.ui b/LibInstructorsAndTrainees/messanger/messangerwidget.ui similarity index 100% rename from InstructorsAndTrainees/messanger/messangerwidget.ui rename to LibInstructorsAndTrainees/messanger/messangerwidget.ui diff --git a/InstructorsAndTrainees/messanger/msgwidget.cpp b/LibInstructorsAndTrainees/messanger/msgwidget.cpp similarity index 100% rename from InstructorsAndTrainees/messanger/msgwidget.cpp rename to LibInstructorsAndTrainees/messanger/msgwidget.cpp diff --git a/InstructorsAndTrainees/messanger/msgwidget.h b/LibInstructorsAndTrainees/messanger/msgwidget.h similarity index 100% rename from InstructorsAndTrainees/messanger/msgwidget.h rename to LibInstructorsAndTrainees/messanger/msgwidget.h diff --git a/InstructorsAndTrainees/messanger/msgwidget.ui b/LibInstructorsAndTrainees/messanger/msgwidget.ui similarity index 100% rename from InstructorsAndTrainees/messanger/msgwidget.ui rename to LibInstructorsAndTrainees/messanger/msgwidget.ui diff --git a/InstructorsAndTrainees/messanger/tabdialogmessenger.cpp b/LibInstructorsAndTrainees/messanger/tabdialogmessenger.cpp similarity index 100% rename from InstructorsAndTrainees/messanger/tabdialogmessenger.cpp rename to LibInstructorsAndTrainees/messanger/tabdialogmessenger.cpp diff --git a/InstructorsAndTrainees/messanger/tabdialogmessenger.h b/LibInstructorsAndTrainees/messanger/tabdialogmessenger.h similarity index 100% rename from InstructorsAndTrainees/messanger/tabdialogmessenger.h rename to LibInstructorsAndTrainees/messanger/tabdialogmessenger.h diff --git a/InstructorsAndTrainees/metatypes.cpp b/LibInstructorsAndTrainees/metatypes.cpp similarity index 100% rename from InstructorsAndTrainees/metatypes.cpp rename to LibInstructorsAndTrainees/metatypes.cpp diff --git a/InstructorsAndTrainees/metatypes.h b/LibInstructorsAndTrainees/metatypes.h similarity index 100% rename from InstructorsAndTrainees/metatypes.h rename to LibInstructorsAndTrainees/metatypes.h diff --git a/InstructorsAndTrainees/resources/icons/762.gif b/LibInstructorsAndTrainees/resources/icons/762.gif similarity index 100% rename from InstructorsAndTrainees/resources/icons/762.gif rename to LibInstructorsAndTrainees/resources/icons/762.gif diff --git a/InstructorsAndTrainees/resources/icons/DB-instructors.png b/LibInstructorsAndTrainees/resources/icons/DB-instructors.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/DB-instructors.png rename to LibInstructorsAndTrainees/resources/icons/DB-instructors.png diff --git a/InstructorsAndTrainees/resources/icons/DB-trainees.png b/LibInstructorsAndTrainees/resources/icons/DB-trainees.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/DB-trainees.png rename to LibInstructorsAndTrainees/resources/icons/DB-trainees.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/DB-instructors.png b/LibInstructorsAndTrainees/resources/icons/PNG/DB-instructors.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/DB-instructors.png rename to LibInstructorsAndTrainees/resources/icons/PNG/DB-instructors.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/DB-trainees.png b/LibInstructorsAndTrainees/resources/icons/PNG/DB-trainees.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/DB-trainees.png rename to LibInstructorsAndTrainees/resources/icons/PNG/DB-trainees.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/addInstructor.png b/LibInstructorsAndTrainees/resources/icons/PNG/addInstructor.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/addInstructor.png rename to LibInstructorsAndTrainees/resources/icons/PNG/addInstructor.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/addTrainee.png b/LibInstructorsAndTrainees/resources/icons/PNG/addTrainee.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/addTrainee.png rename to LibInstructorsAndTrainees/resources/icons/PNG/addTrainee.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/admin.png b/LibInstructorsAndTrainees/resources/icons/PNG/admin.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/admin.png rename to LibInstructorsAndTrainees/resources/icons/PNG/admin.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/archive.png b/LibInstructorsAndTrainees/resources/icons/PNG/archive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/archive.png rename to LibInstructorsAndTrainees/resources/icons/PNG/archive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/assignTask.png b/LibInstructorsAndTrainees/resources/icons/PNG/assignTask.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/assignTask.png rename to LibInstructorsAndTrainees/resources/icons/PNG/assignTask.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/check.png b/LibInstructorsAndTrainees/resources/icons/PNG/check.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/check.png rename to LibInstructorsAndTrainees/resources/icons/PNG/check.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/chekNo.png b/LibInstructorsAndTrainees/resources/icons/PNG/chekNo.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/chekNo.png rename to LibInstructorsAndTrainees/resources/icons/PNG/chekNo.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/chekYes.png b/LibInstructorsAndTrainees/resources/icons/PNG/chekYes.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/chekYes.png rename to LibInstructorsAndTrainees/resources/icons/PNG/chekYes.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/circleGray.png b/LibInstructorsAndTrainees/resources/icons/PNG/circleGray.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/circleGray.png rename to LibInstructorsAndTrainees/resources/icons/PNG/circleGray.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/circleGreen.png b/LibInstructorsAndTrainees/resources/icons/PNG/circleGreen.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/circleGreen.png rename to LibInstructorsAndTrainees/resources/icons/PNG/circleGreen.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/circleRed.png b/LibInstructorsAndTrainees/resources/icons/PNG/circleRed.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/circleRed.png rename to LibInstructorsAndTrainees/resources/icons/PNG/circleRed.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/circleYellow.png b/LibInstructorsAndTrainees/resources/icons/PNG/circleYellow.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/circleYellow.png rename to LibInstructorsAndTrainees/resources/icons/PNG/circleYellow.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/connectDB.png b/LibInstructorsAndTrainees/resources/icons/PNG/connectDB.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/connectDB.png rename to LibInstructorsAndTrainees/resources/icons/PNG/connectDB.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/delete.png b/LibInstructorsAndTrainees/resources/icons/PNG/delete.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/delete.png rename to LibInstructorsAndTrainees/resources/icons/PNG/delete.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/deleteGroup.png b/LibInstructorsAndTrainees/resources/icons/PNG/deleteGroup.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/deleteGroup.png rename to LibInstructorsAndTrainees/resources/icons/PNG/deleteGroup.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/deleteInstructor.png b/LibInstructorsAndTrainees/resources/icons/PNG/deleteInstructor.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/deleteInstructor.png rename to LibInstructorsAndTrainees/resources/icons/PNG/deleteInstructor.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/deleteTrainee.png b/LibInstructorsAndTrainees/resources/icons/PNG/deleteTrainee.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/deleteTrainee.png rename to LibInstructorsAndTrainees/resources/icons/PNG/deleteTrainee.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/docTasks.png b/LibInstructorsAndTrainees/resources/icons/PNG/docTasks.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/docTasks.png rename to LibInstructorsAndTrainees/resources/icons/PNG/docTasks.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/edit.png b/LibInstructorsAndTrainees/resources/icons/PNG/edit.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/edit.png rename to LibInstructorsAndTrainees/resources/icons/PNG/edit.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/editorDB.png b/LibInstructorsAndTrainees/resources/icons/PNG/editorDB.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/editorDB.png rename to LibInstructorsAndTrainees/resources/icons/PNG/editorDB.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/filter.png b/LibInstructorsAndTrainees/resources/icons/PNG/filter.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/filter.png rename to LibInstructorsAndTrainees/resources/icons/PNG/filter.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/group.png b/LibInstructorsAndTrainees/resources/icons/PNG/group.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/group.png rename to LibInstructorsAndTrainees/resources/icons/PNG/group.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/instructor.png b/LibInstructorsAndTrainees/resources/icons/PNG/instructor.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/instructor.png rename to LibInstructorsAndTrainees/resources/icons/PNG/instructor.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/instructorAdmin.png b/LibInstructorsAndTrainees/resources/icons/PNG/instructorAdmin.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/instructorAdmin.png rename to LibInstructorsAndTrainees/resources/icons/PNG/instructorAdmin.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/instructorArchive.png b/LibInstructorsAndTrainees/resources/icons/PNG/instructorArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/instructorArchive.png rename to LibInstructorsAndTrainees/resources/icons/PNG/instructorArchive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/instructorFromArchive.png b/LibInstructorsAndTrainees/resources/icons/PNG/instructorFromArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/instructorFromArchive.png rename to LibInstructorsAndTrainees/resources/icons/PNG/instructorFromArchive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/lms.png b/LibInstructorsAndTrainees/resources/icons/PNG/lms.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/lms.png rename to LibInstructorsAndTrainees/resources/icons/PNG/lms.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/login-user.png b/LibInstructorsAndTrainees/resources/icons/PNG/login-user.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/login-user.png rename to LibInstructorsAndTrainees/resources/icons/PNG/login-user.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/malfunction.png b/LibInstructorsAndTrainees/resources/icons/PNG/malfunction.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/malfunction.png rename to LibInstructorsAndTrainees/resources/icons/PNG/malfunction.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/newGroup.png b/LibInstructorsAndTrainees/resources/icons/PNG/newGroup.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/newGroup.png rename to LibInstructorsAndTrainees/resources/icons/PNG/newGroup.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/rectGray.png b/LibInstructorsAndTrainees/resources/icons/PNG/rectGray.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/rectGray.png rename to LibInstructorsAndTrainees/resources/icons/PNG/rectGray.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/rectGreen.png b/LibInstructorsAndTrainees/resources/icons/PNG/rectGreen.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/rectGreen.png rename to LibInstructorsAndTrainees/resources/icons/PNG/rectGreen.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/sendMsg.png b/LibInstructorsAndTrainees/resources/icons/PNG/sendMsg.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/sendMsg.png rename to LibInstructorsAndTrainees/resources/icons/PNG/sendMsg.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/settings.png b/LibInstructorsAndTrainees/resources/icons/PNG/settings.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/settings.png rename to LibInstructorsAndTrainees/resources/icons/PNG/settings.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/sign.png b/LibInstructorsAndTrainees/resources/icons/PNG/sign.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/sign.png rename to LibInstructorsAndTrainees/resources/icons/PNG/sign.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/style.png b/LibInstructorsAndTrainees/resources/icons/PNG/style.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/style.png rename to LibInstructorsAndTrainees/resources/icons/PNG/style.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/task.png b/LibInstructorsAndTrainees/resources/icons/PNG/task.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/task.png rename to LibInstructorsAndTrainees/resources/icons/PNG/task.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/trainee.png b/LibInstructorsAndTrainees/resources/icons/PNG/trainee.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/trainee.png rename to LibInstructorsAndTrainees/resources/icons/PNG/trainee.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/traineeArchive.png b/LibInstructorsAndTrainees/resources/icons/PNG/traineeArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/traineeArchive.png rename to LibInstructorsAndTrainees/resources/icons/PNG/traineeArchive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/traineeFromArchive.png b/LibInstructorsAndTrainees/resources/icons/PNG/traineeFromArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/traineeFromArchive.png rename to LibInstructorsAndTrainees/resources/icons/PNG/traineeFromArchive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG/updateVersion.png b/LibInstructorsAndTrainees/resources/icons/PNG/updateVersion.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG/updateVersion.png rename to LibInstructorsAndTrainees/resources/icons/PNG/updateVersion.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/DB-instructors.png b/LibInstructorsAndTrainees/resources/icons/PNG24/DB-instructors.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/DB-instructors.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/DB-instructors.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/DB-trainees.png b/LibInstructorsAndTrainees/resources/icons/PNG24/DB-trainees.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/DB-trainees.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/DB-trainees.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/addInstructor.png b/LibInstructorsAndTrainees/resources/icons/PNG24/addInstructor.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/addInstructor.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/addInstructor.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/addTrainee.png b/LibInstructorsAndTrainees/resources/icons/PNG24/addTrainee.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/addTrainee.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/addTrainee.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/admin.png b/LibInstructorsAndTrainees/resources/icons/PNG24/admin.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/admin.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/admin.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/archive.png b/LibInstructorsAndTrainees/resources/icons/PNG24/archive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/archive.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/archive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/assignTask.png b/LibInstructorsAndTrainees/resources/icons/PNG24/assignTask.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/assignTask.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/assignTask.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/check.png b/LibInstructorsAndTrainees/resources/icons/PNG24/check.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/check.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/check.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/chekNo.png b/LibInstructorsAndTrainees/resources/icons/PNG24/chekNo.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/chekNo.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/chekNo.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/chekYes.png b/LibInstructorsAndTrainees/resources/icons/PNG24/chekYes.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/chekYes.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/chekYes.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/circleGray.png b/LibInstructorsAndTrainees/resources/icons/PNG24/circleGray.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/circleGray.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/circleGray.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/circleGreen.png b/LibInstructorsAndTrainees/resources/icons/PNG24/circleGreen.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/circleGreen.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/circleGreen.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/circleRed.png b/LibInstructorsAndTrainees/resources/icons/PNG24/circleRed.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/circleRed.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/circleRed.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/circleYellow.png b/LibInstructorsAndTrainees/resources/icons/PNG24/circleYellow.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/circleYellow.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/circleYellow.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/connectDB.png b/LibInstructorsAndTrainees/resources/icons/PNG24/connectDB.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/connectDB.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/connectDB.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/delete.png b/LibInstructorsAndTrainees/resources/icons/PNG24/delete.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/delete.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/delete.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/deleteGroup.png b/LibInstructorsAndTrainees/resources/icons/PNG24/deleteGroup.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/deleteGroup.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/deleteGroup.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/deleteInstructor.png b/LibInstructorsAndTrainees/resources/icons/PNG24/deleteInstructor.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/deleteInstructor.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/deleteInstructor.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/deleteTrainee.png b/LibInstructorsAndTrainees/resources/icons/PNG24/deleteTrainee.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/deleteTrainee.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/deleteTrainee.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/docTasks.png b/LibInstructorsAndTrainees/resources/icons/PNG24/docTasks.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/docTasks.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/docTasks.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/edit.png b/LibInstructorsAndTrainees/resources/icons/PNG24/edit.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/edit.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/edit.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/editorDB.png b/LibInstructorsAndTrainees/resources/icons/PNG24/editorDB.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/editorDB.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/editorDB.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/filter.png b/LibInstructorsAndTrainees/resources/icons/PNG24/filter.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/filter.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/filter.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/group.png b/LibInstructorsAndTrainees/resources/icons/PNG24/group.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/group.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/group.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/instructor.png b/LibInstructorsAndTrainees/resources/icons/PNG24/instructor.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/instructor.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/instructor.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/instructorAdmin.png b/LibInstructorsAndTrainees/resources/icons/PNG24/instructorAdmin.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/instructorAdmin.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/instructorAdmin.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/instructorArchive.png b/LibInstructorsAndTrainees/resources/icons/PNG24/instructorArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/instructorArchive.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/instructorArchive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/instructorFromArchive.png b/LibInstructorsAndTrainees/resources/icons/PNG24/instructorFromArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/instructorFromArchive.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/instructorFromArchive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/lms.png b/LibInstructorsAndTrainees/resources/icons/PNG24/lms.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/lms.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/lms.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/login-user.png b/LibInstructorsAndTrainees/resources/icons/PNG24/login-user.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/login-user.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/login-user.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/malfunction.png b/LibInstructorsAndTrainees/resources/icons/PNG24/malfunction.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/malfunction.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/malfunction.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/newGroup.png b/LibInstructorsAndTrainees/resources/icons/PNG24/newGroup.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/newGroup.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/newGroup.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/rectGray.png b/LibInstructorsAndTrainees/resources/icons/PNG24/rectGray.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/rectGray.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/rectGray.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/rectGreen.png b/LibInstructorsAndTrainees/resources/icons/PNG24/rectGreen.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/rectGreen.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/rectGreen.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/sendMsg.png b/LibInstructorsAndTrainees/resources/icons/PNG24/sendMsg.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/sendMsg.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/sendMsg.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/settings.png b/LibInstructorsAndTrainees/resources/icons/PNG24/settings.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/settings.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/settings.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/sign.png b/LibInstructorsAndTrainees/resources/icons/PNG24/sign.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/sign.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/sign.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/style.png b/LibInstructorsAndTrainees/resources/icons/PNG24/style.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/style.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/style.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/task.png b/LibInstructorsAndTrainees/resources/icons/PNG24/task.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/task.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/task.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/trainee.png b/LibInstructorsAndTrainees/resources/icons/PNG24/trainee.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/trainee.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/trainee.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/traineeArchive.png b/LibInstructorsAndTrainees/resources/icons/PNG24/traineeArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/traineeArchive.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/traineeArchive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/traineeFromArchive.png b/LibInstructorsAndTrainees/resources/icons/PNG24/traineeFromArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/traineeFromArchive.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/traineeFromArchive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG24/updateVersion.png b/LibInstructorsAndTrainees/resources/icons/PNG24/updateVersion.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG24/updateVersion.png rename to LibInstructorsAndTrainees/resources/icons/PNG24/updateVersion.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/DB-instructors.png b/LibInstructorsAndTrainees/resources/icons/PNG32/DB-instructors.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/DB-instructors.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/DB-instructors.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/DB-trainees.png b/LibInstructorsAndTrainees/resources/icons/PNG32/DB-trainees.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/DB-trainees.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/DB-trainees.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/addInstructor.png b/LibInstructorsAndTrainees/resources/icons/PNG32/addInstructor.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/addInstructor.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/addInstructor.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/addTrainee.png b/LibInstructorsAndTrainees/resources/icons/PNG32/addTrainee.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/addTrainee.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/addTrainee.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/admin.png b/LibInstructorsAndTrainees/resources/icons/PNG32/admin.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/admin.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/admin.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/archive.png b/LibInstructorsAndTrainees/resources/icons/PNG32/archive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/archive.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/archive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/assignTask.png b/LibInstructorsAndTrainees/resources/icons/PNG32/assignTask.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/assignTask.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/assignTask.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/check.png b/LibInstructorsAndTrainees/resources/icons/PNG32/check.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/check.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/check.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/chekNo.png b/LibInstructorsAndTrainees/resources/icons/PNG32/chekNo.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/chekNo.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/chekNo.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/chekYes.png b/LibInstructorsAndTrainees/resources/icons/PNG32/chekYes.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/chekYes.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/chekYes.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/circleGray.png b/LibInstructorsAndTrainees/resources/icons/PNG32/circleGray.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/circleGray.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/circleGray.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/circleGreen.png b/LibInstructorsAndTrainees/resources/icons/PNG32/circleGreen.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/circleGreen.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/circleGreen.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/circleRed.png b/LibInstructorsAndTrainees/resources/icons/PNG32/circleRed.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/circleRed.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/circleRed.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/circleYellow.png b/LibInstructorsAndTrainees/resources/icons/PNG32/circleYellow.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/circleYellow.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/circleYellow.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/connectDB.png b/LibInstructorsAndTrainees/resources/icons/PNG32/connectDB.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/connectDB.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/connectDB.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/delete.png b/LibInstructorsAndTrainees/resources/icons/PNG32/delete.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/delete.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/delete.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/deleteGroup.png b/LibInstructorsAndTrainees/resources/icons/PNG32/deleteGroup.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/deleteGroup.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/deleteGroup.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/deleteInstructor.png b/LibInstructorsAndTrainees/resources/icons/PNG32/deleteInstructor.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/deleteInstructor.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/deleteInstructor.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/deleteTrainee.png b/LibInstructorsAndTrainees/resources/icons/PNG32/deleteTrainee.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/deleteTrainee.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/deleteTrainee.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/docTasks.png b/LibInstructorsAndTrainees/resources/icons/PNG32/docTasks.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/docTasks.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/docTasks.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/edit.png b/LibInstructorsAndTrainees/resources/icons/PNG32/edit.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/edit.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/edit.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/editorDB.png b/LibInstructorsAndTrainees/resources/icons/PNG32/editorDB.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/editorDB.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/editorDB.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/filter.png b/LibInstructorsAndTrainees/resources/icons/PNG32/filter.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/filter.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/filter.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/group.png b/LibInstructorsAndTrainees/resources/icons/PNG32/group.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/group.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/group.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/instructor.png b/LibInstructorsAndTrainees/resources/icons/PNG32/instructor.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/instructor.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/instructor.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/instructorAdmin.png b/LibInstructorsAndTrainees/resources/icons/PNG32/instructorAdmin.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/instructorAdmin.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/instructorAdmin.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/instructorArchive.png b/LibInstructorsAndTrainees/resources/icons/PNG32/instructorArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/instructorArchive.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/instructorArchive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/instructorFromArchive.png b/LibInstructorsAndTrainees/resources/icons/PNG32/instructorFromArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/instructorFromArchive.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/instructorFromArchive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/lms.png b/LibInstructorsAndTrainees/resources/icons/PNG32/lms.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/lms.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/lms.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/login-user.png b/LibInstructorsAndTrainees/resources/icons/PNG32/login-user.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/login-user.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/login-user.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/malfunction.png b/LibInstructorsAndTrainees/resources/icons/PNG32/malfunction.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/malfunction.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/malfunction.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/newGroup.png b/LibInstructorsAndTrainees/resources/icons/PNG32/newGroup.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/newGroup.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/newGroup.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/rectGray.png b/LibInstructorsAndTrainees/resources/icons/PNG32/rectGray.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/rectGray.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/rectGray.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/rectGreen.png b/LibInstructorsAndTrainees/resources/icons/PNG32/rectGreen.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/rectGreen.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/rectGreen.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/sendMsg.png b/LibInstructorsAndTrainees/resources/icons/PNG32/sendMsg.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/sendMsg.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/sendMsg.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/settings.png b/LibInstructorsAndTrainees/resources/icons/PNG32/settings.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/settings.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/settings.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/sign.png b/LibInstructorsAndTrainees/resources/icons/PNG32/sign.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/sign.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/sign.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/style.png b/LibInstructorsAndTrainees/resources/icons/PNG32/style.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/style.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/style.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/task.png b/LibInstructorsAndTrainees/resources/icons/PNG32/task.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/task.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/task.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/trainee.png b/LibInstructorsAndTrainees/resources/icons/PNG32/trainee.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/trainee.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/trainee.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/traineeArchive.png b/LibInstructorsAndTrainees/resources/icons/PNG32/traineeArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/traineeArchive.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/traineeArchive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/traineeFromArchive.png b/LibInstructorsAndTrainees/resources/icons/PNG32/traineeFromArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/traineeFromArchive.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/traineeFromArchive.png diff --git a/InstructorsAndTrainees/resources/icons/PNG32/updateVersion.png b/LibInstructorsAndTrainees/resources/icons/PNG32/updateVersion.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/PNG32/updateVersion.png rename to LibInstructorsAndTrainees/resources/icons/PNG32/updateVersion.png diff --git a/InstructorsAndTrainees/resources/icons/addInstructor.png b/LibInstructorsAndTrainees/resources/icons/addInstructor.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/addInstructor.png rename to LibInstructorsAndTrainees/resources/icons/addInstructor.png diff --git a/InstructorsAndTrainees/resources/icons/addTrainee.png b/LibInstructorsAndTrainees/resources/icons/addTrainee.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/addTrainee.png rename to LibInstructorsAndTrainees/resources/icons/addTrainee.png diff --git a/InstructorsAndTrainees/resources/icons/admin.png b/LibInstructorsAndTrainees/resources/icons/admin.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/admin.png rename to LibInstructorsAndTrainees/resources/icons/admin.png diff --git a/InstructorsAndTrainees/resources/icons/archive.png b/LibInstructorsAndTrainees/resources/icons/archive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/archive.png rename to LibInstructorsAndTrainees/resources/icons/archive.png diff --git a/InstructorsAndTrainees/resources/icons/assignTask.png b/LibInstructorsAndTrainees/resources/icons/assignTask.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/assignTask.png rename to LibInstructorsAndTrainees/resources/icons/assignTask.png diff --git a/InstructorsAndTrainees/resources/icons/branch-closed.png b/LibInstructorsAndTrainees/resources/icons/branch-closed.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/branch-closed.png rename to LibInstructorsAndTrainees/resources/icons/branch-closed.png diff --git a/InstructorsAndTrainees/resources/icons/branch-end.png b/LibInstructorsAndTrainees/resources/icons/branch-end.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/branch-end.png rename to LibInstructorsAndTrainees/resources/icons/branch-end.png diff --git a/InstructorsAndTrainees/resources/icons/branch-more.png b/LibInstructorsAndTrainees/resources/icons/branch-more.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/branch-more.png rename to LibInstructorsAndTrainees/resources/icons/branch-more.png diff --git a/InstructorsAndTrainees/resources/icons/branch-open.png b/LibInstructorsAndTrainees/resources/icons/branch-open.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/branch-open.png rename to LibInstructorsAndTrainees/resources/icons/branch-open.png diff --git a/InstructorsAndTrainees/resources/icons/check.png b/LibInstructorsAndTrainees/resources/icons/check.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/check.png rename to LibInstructorsAndTrainees/resources/icons/check.png diff --git a/InstructorsAndTrainees/resources/icons/chekNo.png b/LibInstructorsAndTrainees/resources/icons/chekNo.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/chekNo.png rename to LibInstructorsAndTrainees/resources/icons/chekNo.png diff --git a/InstructorsAndTrainees/resources/icons/chekYes.png b/LibInstructorsAndTrainees/resources/icons/chekYes.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/chekYes.png rename to LibInstructorsAndTrainees/resources/icons/chekYes.png diff --git a/InstructorsAndTrainees/resources/icons/circleGray.png b/LibInstructorsAndTrainees/resources/icons/circleGray.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/circleGray.png rename to LibInstructorsAndTrainees/resources/icons/circleGray.png diff --git a/InstructorsAndTrainees/resources/icons/circleGreen.png b/LibInstructorsAndTrainees/resources/icons/circleGreen.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/circleGreen.png rename to LibInstructorsAndTrainees/resources/icons/circleGreen.png diff --git a/InstructorsAndTrainees/resources/icons/circleRed.png b/LibInstructorsAndTrainees/resources/icons/circleRed.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/circleRed.png rename to LibInstructorsAndTrainees/resources/icons/circleRed.png diff --git a/InstructorsAndTrainees/resources/icons/circleYellow.png b/LibInstructorsAndTrainees/resources/icons/circleYellow.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/circleYellow.png rename to LibInstructorsAndTrainees/resources/icons/circleYellow.png diff --git a/InstructorsAndTrainees/resources/icons/connectDB.png b/LibInstructorsAndTrainees/resources/icons/connectDB.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/connectDB.png rename to LibInstructorsAndTrainees/resources/icons/connectDB.png diff --git a/InstructorsAndTrainees/resources/icons/critical.png b/LibInstructorsAndTrainees/resources/icons/critical.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/critical.png rename to LibInstructorsAndTrainees/resources/icons/critical.png diff --git a/InstructorsAndTrainees/resources/icons/delete.png b/LibInstructorsAndTrainees/resources/icons/delete.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/delete.png rename to LibInstructorsAndTrainees/resources/icons/delete.png diff --git a/InstructorsAndTrainees/resources/icons/deleteGroup.png b/LibInstructorsAndTrainees/resources/icons/deleteGroup.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/deleteGroup.png rename to LibInstructorsAndTrainees/resources/icons/deleteGroup.png diff --git a/InstructorsAndTrainees/resources/icons/deleteInstructor.png b/LibInstructorsAndTrainees/resources/icons/deleteInstructor.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/deleteInstructor.png rename to LibInstructorsAndTrainees/resources/icons/deleteInstructor.png diff --git a/InstructorsAndTrainees/resources/icons/deleteTrainee.png b/LibInstructorsAndTrainees/resources/icons/deleteTrainee.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/deleteTrainee.png rename to LibInstructorsAndTrainees/resources/icons/deleteTrainee.png diff --git a/InstructorsAndTrainees/resources/icons/docTasks.png b/LibInstructorsAndTrainees/resources/icons/docTasks.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/docTasks.png rename to LibInstructorsAndTrainees/resources/icons/docTasks.png diff --git a/InstructorsAndTrainees/resources/icons/edit.png b/LibInstructorsAndTrainees/resources/icons/edit.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/edit.png rename to LibInstructorsAndTrainees/resources/icons/edit.png diff --git a/InstructorsAndTrainees/resources/icons/editorDB.png b/LibInstructorsAndTrainees/resources/icons/editorDB.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/editorDB.png rename to LibInstructorsAndTrainees/resources/icons/editorDB.png diff --git a/InstructorsAndTrainees/resources/icons/exchange.png b/LibInstructorsAndTrainees/resources/icons/exchange.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/exchange.png rename to LibInstructorsAndTrainees/resources/icons/exchange.png diff --git a/InstructorsAndTrainees/resources/icons/eye.png b/LibInstructorsAndTrainees/resources/icons/eye.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/eye.png rename to LibInstructorsAndTrainees/resources/icons/eye.png diff --git a/InstructorsAndTrainees/resources/icons/filter.png b/LibInstructorsAndTrainees/resources/icons/filter.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/filter.png rename to LibInstructorsAndTrainees/resources/icons/filter.png diff --git a/InstructorsAndTrainees/resources/icons/group.png b/LibInstructorsAndTrainees/resources/icons/group.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/group.png rename to LibInstructorsAndTrainees/resources/icons/group.png diff --git a/InstructorsAndTrainees/resources/icons/info.png b/LibInstructorsAndTrainees/resources/icons/info.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/info.png rename to LibInstructorsAndTrainees/resources/icons/info.png diff --git a/InstructorsAndTrainees/resources/icons/instructor.png b/LibInstructorsAndTrainees/resources/icons/instructor.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/instructor.png rename to LibInstructorsAndTrainees/resources/icons/instructor.png diff --git a/InstructorsAndTrainees/resources/icons/instructorAdmin.png b/LibInstructorsAndTrainees/resources/icons/instructorAdmin.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/instructorAdmin.png rename to LibInstructorsAndTrainees/resources/icons/instructorAdmin.png diff --git a/InstructorsAndTrainees/resources/icons/instructorArchive.png b/LibInstructorsAndTrainees/resources/icons/instructorArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/instructorArchive.png rename to LibInstructorsAndTrainees/resources/icons/instructorArchive.png diff --git a/InstructorsAndTrainees/resources/icons/instructorFromArchive.png b/LibInstructorsAndTrainees/resources/icons/instructorFromArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/instructorFromArchive.png rename to LibInstructorsAndTrainees/resources/icons/instructorFromArchive.png diff --git a/InstructorsAndTrainees/resources/icons/link.png b/LibInstructorsAndTrainees/resources/icons/link.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/link.png rename to LibInstructorsAndTrainees/resources/icons/link.png diff --git a/InstructorsAndTrainees/resources/icons/lms.png b/LibInstructorsAndTrainees/resources/icons/lms.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/lms.png rename to LibInstructorsAndTrainees/resources/icons/lms.png diff --git a/InstructorsAndTrainees/resources/icons/login-user.png b/LibInstructorsAndTrainees/resources/icons/login-user.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/login-user.png rename to LibInstructorsAndTrainees/resources/icons/login-user.png diff --git a/InstructorsAndTrainees/resources/icons/malfunction.png b/LibInstructorsAndTrainees/resources/icons/malfunction.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/malfunction.png rename to LibInstructorsAndTrainees/resources/icons/malfunction.png diff --git a/InstructorsAndTrainees/resources/icons/newGroup.png b/LibInstructorsAndTrainees/resources/icons/newGroup.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/newGroup.png rename to LibInstructorsAndTrainees/resources/icons/newGroup.png diff --git a/InstructorsAndTrainees/resources/icons/personalCard.png b/LibInstructorsAndTrainees/resources/icons/personalCard.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/personalCard.png rename to LibInstructorsAndTrainees/resources/icons/personalCard.png diff --git a/InstructorsAndTrainees/resources/icons/personalCard_2.png b/LibInstructorsAndTrainees/resources/icons/personalCard_2.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/personalCard_2.png rename to LibInstructorsAndTrainees/resources/icons/personalCard_2.png diff --git a/InstructorsAndTrainees/resources/icons/procedure.png b/LibInstructorsAndTrainees/resources/icons/procedure.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/procedure.png rename to LibInstructorsAndTrainees/resources/icons/procedure.png diff --git a/InstructorsAndTrainees/resources/icons/rectGray.png b/LibInstructorsAndTrainees/resources/icons/rectGray.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/rectGray.png rename to LibInstructorsAndTrainees/resources/icons/rectGray.png diff --git a/InstructorsAndTrainees/resources/icons/rectGreen.png b/LibInstructorsAndTrainees/resources/icons/rectGreen.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/rectGreen.png rename to LibInstructorsAndTrainees/resources/icons/rectGreen.png diff --git a/InstructorsAndTrainees/resources/icons/sendMsg.png b/LibInstructorsAndTrainees/resources/icons/sendMsg.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/sendMsg.png rename to LibInstructorsAndTrainees/resources/icons/sendMsg.png diff --git a/InstructorsAndTrainees/resources/icons/settings.png b/LibInstructorsAndTrainees/resources/icons/settings.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/settings.png rename to LibInstructorsAndTrainees/resources/icons/settings.png diff --git a/InstructorsAndTrainees/resources/icons/sign.png b/LibInstructorsAndTrainees/resources/icons/sign.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/sign.png rename to LibInstructorsAndTrainees/resources/icons/sign.png diff --git a/InstructorsAndTrainees/resources/icons/style.png b/LibInstructorsAndTrainees/resources/icons/style.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/style.png rename to LibInstructorsAndTrainees/resources/icons/style.png diff --git a/InstructorsAndTrainees/resources/icons/task.png b/LibInstructorsAndTrainees/resources/icons/task.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/task.png rename to LibInstructorsAndTrainees/resources/icons/task.png diff --git a/InstructorsAndTrainees/resources/icons/trainee.png b/LibInstructorsAndTrainees/resources/icons/trainee.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/trainee.png rename to LibInstructorsAndTrainees/resources/icons/trainee.png diff --git a/InstructorsAndTrainees/resources/icons/traineeArchive.png b/LibInstructorsAndTrainees/resources/icons/traineeArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/traineeArchive.png rename to LibInstructorsAndTrainees/resources/icons/traineeArchive.png diff --git a/InstructorsAndTrainees/resources/icons/traineeFromArchive.png b/LibInstructorsAndTrainees/resources/icons/traineeFromArchive.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/traineeFromArchive.png rename to LibInstructorsAndTrainees/resources/icons/traineeFromArchive.png diff --git a/InstructorsAndTrainees/resources/icons/updateVersion.png b/LibInstructorsAndTrainees/resources/icons/updateVersion.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/updateVersion.png rename to LibInstructorsAndTrainees/resources/icons/updateVersion.png diff --git a/InstructorsAndTrainees/resources/icons/vline.png b/LibInstructorsAndTrainees/resources/icons/vline.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/vline.png rename to LibInstructorsAndTrainees/resources/icons/vline.png diff --git a/InstructorsAndTrainees/resources/icons/warning.png b/LibInstructorsAndTrainees/resources/icons/warning.png similarity index 100% rename from InstructorsAndTrainees/resources/icons/warning.png rename to LibInstructorsAndTrainees/resources/icons/warning.png diff --git a/InstructorsAndTrainees/settings/dialognewversion.cpp b/LibInstructorsAndTrainees/settings/dialognewversion.cpp similarity index 100% rename from InstructorsAndTrainees/settings/dialognewversion.cpp rename to LibInstructorsAndTrainees/settings/dialognewversion.cpp diff --git a/InstructorsAndTrainees/settings/dialognewversion.h b/LibInstructorsAndTrainees/settings/dialognewversion.h similarity index 100% rename from InstructorsAndTrainees/settings/dialognewversion.h rename to LibInstructorsAndTrainees/settings/dialognewversion.h diff --git a/InstructorsAndTrainees/settings/dialognewversion.ui b/LibInstructorsAndTrainees/settings/dialognewversion.ui similarity index 100% rename from InstructorsAndTrainees/settings/dialognewversion.ui rename to LibInstructorsAndTrainees/settings/dialognewversion.ui diff --git a/InstructorsAndTrainees/settings/dialogsettings.cpp b/LibInstructorsAndTrainees/settings/dialogsettings.cpp similarity index 100% rename from InstructorsAndTrainees/settings/dialogsettings.cpp rename to LibInstructorsAndTrainees/settings/dialogsettings.cpp diff --git a/InstructorsAndTrainees/settings/dialogsettings.h b/LibInstructorsAndTrainees/settings/dialogsettings.h similarity index 100% rename from InstructorsAndTrainees/settings/dialogsettings.h rename to LibInstructorsAndTrainees/settings/dialogsettings.h diff --git a/InstructorsAndTrainees/settings/dialogsettings.ui b/LibInstructorsAndTrainees/settings/dialogsettings.ui similarity index 100% rename from InstructorsAndTrainees/settings/dialogsettings.ui rename to LibInstructorsAndTrainees/settings/dialogsettings.ui diff --git a/InstructorsAndTrainees/settings/dialogversioncontrol.cpp b/LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp similarity index 100% rename from InstructorsAndTrainees/settings/dialogversioncontrol.cpp rename to LibInstructorsAndTrainees/settings/dialogversioncontrol.cpp diff --git a/InstructorsAndTrainees/settings/dialogversioncontrol.h b/LibInstructorsAndTrainees/settings/dialogversioncontrol.h similarity index 100% rename from InstructorsAndTrainees/settings/dialogversioncontrol.h rename to LibInstructorsAndTrainees/settings/dialogversioncontrol.h diff --git a/InstructorsAndTrainees/settings/dialogversioncontrol.ui b/LibInstructorsAndTrainees/settings/dialogversioncontrol.ui similarity index 100% rename from InstructorsAndTrainees/settings/dialogversioncontrol.ui rename to LibInstructorsAndTrainees/settings/dialogversioncontrol.ui diff --git a/InstructorsAndTrainees/specialmessagebox/specialmessagebox.cpp b/LibInstructorsAndTrainees/specialmessagebox/specialmessagebox.cpp similarity index 100% rename from InstructorsAndTrainees/specialmessagebox/specialmessagebox.cpp rename to LibInstructorsAndTrainees/specialmessagebox/specialmessagebox.cpp diff --git a/InstructorsAndTrainees/specialmessagebox/specialmessagebox.h b/LibInstructorsAndTrainees/specialmessagebox/specialmessagebox.h similarity index 100% rename from InstructorsAndTrainees/specialmessagebox/specialmessagebox.h rename to LibInstructorsAndTrainees/specialmessagebox/specialmessagebox.h diff --git a/InstructorsAndTrainees/specialmessagebox/specialmessagebox.ui b/LibInstructorsAndTrainees/specialmessagebox/specialmessagebox.ui similarity index 100% rename from InstructorsAndTrainees/specialmessagebox/specialmessagebox.ui rename to LibInstructorsAndTrainees/specialmessagebox/specialmessagebox.ui diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp similarity index 100% rename from InstructorsAndTrainees/tasks/ammtaskswidget.cpp rename to LibInstructorsAndTrainees/tasks/ammtaskswidget.cpp diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.h b/LibInstructorsAndTrainees/tasks/ammtaskswidget.h similarity index 100% rename from InstructorsAndTrainees/tasks/ammtaskswidget.h rename to LibInstructorsAndTrainees/tasks/ammtaskswidget.h diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.ui b/LibInstructorsAndTrainees/tasks/ammtaskswidget.ui similarity index 100% rename from InstructorsAndTrainees/tasks/ammtaskswidget.ui rename to LibInstructorsAndTrainees/tasks/ammtaskswidget.ui diff --git a/InstructorsAndTrainees/tasks/checkertask.cpp b/LibInstructorsAndTrainees/tasks/checkertask.cpp similarity index 100% rename from InstructorsAndTrainees/tasks/checkertask.cpp rename to LibInstructorsAndTrainees/tasks/checkertask.cpp diff --git a/InstructorsAndTrainees/tasks/checkertask.h b/LibInstructorsAndTrainees/tasks/checkertask.h similarity index 100% rename from InstructorsAndTrainees/tasks/checkertask.h rename to LibInstructorsAndTrainees/tasks/checkertask.h diff --git a/InstructorsAndTrainees/tasks/checkertask.ui b/LibInstructorsAndTrainees/tasks/checkertask.ui similarity index 100% rename from InstructorsAndTrainees/tasks/checkertask.ui rename to LibInstructorsAndTrainees/tasks/checkertask.ui diff --git a/InstructorsAndTrainees/tasks/dialogchekertask.cpp b/LibInstructorsAndTrainees/tasks/dialogchekertask.cpp similarity index 100% rename from InstructorsAndTrainees/tasks/dialogchekertask.cpp rename to LibInstructorsAndTrainees/tasks/dialogchekertask.cpp diff --git a/InstructorsAndTrainees/tasks/dialogchekertask.h b/LibInstructorsAndTrainees/tasks/dialogchekertask.h similarity index 100% rename from InstructorsAndTrainees/tasks/dialogchekertask.h rename to LibInstructorsAndTrainees/tasks/dialogchekertask.h diff --git a/InstructorsAndTrainees/tasks/dialoglistsubproc.cpp b/LibInstructorsAndTrainees/tasks/dialoglistsubproc.cpp similarity index 100% rename from InstructorsAndTrainees/tasks/dialoglistsubproc.cpp rename to LibInstructorsAndTrainees/tasks/dialoglistsubproc.cpp diff --git a/InstructorsAndTrainees/tasks/dialoglistsubproc.h b/LibInstructorsAndTrainees/tasks/dialoglistsubproc.h similarity index 100% rename from InstructorsAndTrainees/tasks/dialoglistsubproc.h rename to LibInstructorsAndTrainees/tasks/dialoglistsubproc.h diff --git a/InstructorsAndTrainees/tasks/dialogtaskscommon.cpp b/LibInstructorsAndTrainees/tasks/dialogtaskscommon.cpp similarity index 100% rename from InstructorsAndTrainees/tasks/dialogtaskscommon.cpp rename to LibInstructorsAndTrainees/tasks/dialogtaskscommon.cpp diff --git a/InstructorsAndTrainees/tasks/dialogtaskscommon.h b/LibInstructorsAndTrainees/tasks/dialogtaskscommon.h similarity index 100% rename from InstructorsAndTrainees/tasks/dialogtaskscommon.h rename to LibInstructorsAndTrainees/tasks/dialogtaskscommon.h diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp similarity index 100% rename from InstructorsAndTrainees/tasks/fimtaskswidget.cpp rename to LibInstructorsAndTrainees/tasks/fimtaskswidget.cpp diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.h b/LibInstructorsAndTrainees/tasks/fimtaskswidget.h similarity index 100% rename from InstructorsAndTrainees/tasks/fimtaskswidget.h rename to LibInstructorsAndTrainees/tasks/fimtaskswidget.h diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.ui b/LibInstructorsAndTrainees/tasks/fimtaskswidget.ui similarity index 100% rename from InstructorsAndTrainees/tasks/fimtaskswidget.ui rename to LibInstructorsAndTrainees/tasks/fimtaskswidget.ui diff --git a/InstructorsAndTrainees/tasks/listsubproc.cpp b/LibInstructorsAndTrainees/tasks/listsubproc.cpp similarity index 100% rename from InstructorsAndTrainees/tasks/listsubproc.cpp rename to LibInstructorsAndTrainees/tasks/listsubproc.cpp diff --git a/InstructorsAndTrainees/tasks/listsubproc.h b/LibInstructorsAndTrainees/tasks/listsubproc.h similarity index 100% rename from InstructorsAndTrainees/tasks/listsubproc.h rename to LibInstructorsAndTrainees/tasks/listsubproc.h diff --git a/InstructorsAndTrainees/tasks/listsubproc.ui b/LibInstructorsAndTrainees/tasks/listsubproc.ui similarity index 100% rename from InstructorsAndTrainees/tasks/listsubproc.ui rename to LibInstructorsAndTrainees/tasks/listsubproc.ui diff --git a/InstructorsAndTrainees/tasks/module.cpp b/LibInstructorsAndTrainees/tasks/module.cpp similarity index 100% rename from InstructorsAndTrainees/tasks/module.cpp rename to LibInstructorsAndTrainees/tasks/module.cpp diff --git a/InstructorsAndTrainees/tasks/module.h b/LibInstructorsAndTrainees/tasks/module.h similarity index 100% rename from InstructorsAndTrainees/tasks/module.h rename to LibInstructorsAndTrainees/tasks/module.h diff --git a/InstructorsAndTrainees/tasks/subprocitemwidget.cpp b/LibInstructorsAndTrainees/tasks/subprocitemwidget.cpp similarity index 100% rename from InstructorsAndTrainees/tasks/subprocitemwidget.cpp rename to LibInstructorsAndTrainees/tasks/subprocitemwidget.cpp diff --git a/InstructorsAndTrainees/tasks/subprocitemwidget.h b/LibInstructorsAndTrainees/tasks/subprocitemwidget.h similarity index 100% rename from InstructorsAndTrainees/tasks/subprocitemwidget.h rename to LibInstructorsAndTrainees/tasks/subprocitemwidget.h diff --git a/InstructorsAndTrainees/tasks/subprocitemwidget.ui b/LibInstructorsAndTrainees/tasks/subprocitemwidget.ui similarity index 100% rename from InstructorsAndTrainees/tasks/subprocitemwidget.ui rename to LibInstructorsAndTrainees/tasks/subprocitemwidget.ui diff --git a/InstructorsAndTrainees/tasks/tasktreepreparation.cpp b/LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp similarity index 100% rename from InstructorsAndTrainees/tasks/tasktreepreparation.cpp rename to LibInstructorsAndTrainees/tasks/tasktreepreparation.cpp diff --git a/InstructorsAndTrainees/tasks/tasktreepreparation.h b/LibInstructorsAndTrainees/tasks/tasktreepreparation.h similarity index 100% rename from InstructorsAndTrainees/tasks/tasktreepreparation.h rename to LibInstructorsAndTrainees/tasks/tasktreepreparation.h diff --git a/InstructorsAndTrainees/tasks/viewertaskscommon.cpp b/LibInstructorsAndTrainees/tasks/viewertaskscommon.cpp similarity index 100% rename from InstructorsAndTrainees/tasks/viewertaskscommon.cpp rename to LibInstructorsAndTrainees/tasks/viewertaskscommon.cpp diff --git a/InstructorsAndTrainees/tasks/viewertaskscommon.h b/LibInstructorsAndTrainees/tasks/viewertaskscommon.h similarity index 100% rename from InstructorsAndTrainees/tasks/viewertaskscommon.h rename to LibInstructorsAndTrainees/tasks/viewertaskscommon.h diff --git a/InstructorsAndTrainees/tasks/viewertaskscommon.ui b/LibInstructorsAndTrainees/tasks/viewertaskscommon.ui similarity index 100% rename from InstructorsAndTrainees/tasks/viewertaskscommon.ui rename to LibInstructorsAndTrainees/tasks/viewertaskscommon.ui diff --git a/InstructorsAndTrainees/trainees/computersLocations.cpp b/LibInstructorsAndTrainees/trainees/computersLocations.cpp similarity index 100% rename from InstructorsAndTrainees/trainees/computersLocations.cpp rename to LibInstructorsAndTrainees/trainees/computersLocations.cpp diff --git a/InstructorsAndTrainees/trainees/computersLocations.h b/LibInstructorsAndTrainees/trainees/computersLocations.h similarity index 100% rename from InstructorsAndTrainees/trainees/computersLocations.h rename to LibInstructorsAndTrainees/trainees/computersLocations.h diff --git a/InstructorsAndTrainees/trainees/dialogcardtrainee.cpp b/LibInstructorsAndTrainees/trainees/dialogcardtrainee.cpp similarity index 100% rename from InstructorsAndTrainees/trainees/dialogcardtrainee.cpp rename to LibInstructorsAndTrainees/trainees/dialogcardtrainee.cpp diff --git a/InstructorsAndTrainees/trainees/dialogcardtrainee.h b/LibInstructorsAndTrainees/trainees/dialogcardtrainee.h similarity index 100% rename from InstructorsAndTrainees/trainees/dialogcardtrainee.h rename to LibInstructorsAndTrainees/trainees/dialogcardtrainee.h diff --git a/InstructorsAndTrainees/trainees/dialogeditgroup.cpp b/LibInstructorsAndTrainees/trainees/dialogeditgroup.cpp similarity index 100% rename from InstructorsAndTrainees/trainees/dialogeditgroup.cpp rename to LibInstructorsAndTrainees/trainees/dialogeditgroup.cpp diff --git a/InstructorsAndTrainees/trainees/dialogeditgroup.h b/LibInstructorsAndTrainees/trainees/dialogeditgroup.h similarity index 100% rename from InstructorsAndTrainees/trainees/dialogeditgroup.h rename to LibInstructorsAndTrainees/trainees/dialogeditgroup.h diff --git a/InstructorsAndTrainees/trainees/dialogeditgroup.ui b/LibInstructorsAndTrainees/trainees/dialogeditgroup.ui similarity index 100% rename from InstructorsAndTrainees/trainees/dialogeditgroup.ui rename to LibInstructorsAndTrainees/trainees/dialogeditgroup.ui diff --git a/InstructorsAndTrainees/trainees/dialogedittrainee.cpp b/LibInstructorsAndTrainees/trainees/dialogedittrainee.cpp similarity index 100% rename from InstructorsAndTrainees/trainees/dialogedittrainee.cpp rename to LibInstructorsAndTrainees/trainees/dialogedittrainee.cpp diff --git a/InstructorsAndTrainees/trainees/dialogedittrainee.h b/LibInstructorsAndTrainees/trainees/dialogedittrainee.h similarity index 100% rename from InstructorsAndTrainees/trainees/dialogedittrainee.h rename to LibInstructorsAndTrainees/trainees/dialogedittrainee.h diff --git a/InstructorsAndTrainees/trainees/dialogedittrainee.ui b/LibInstructorsAndTrainees/trainees/dialogedittrainee.ui similarity index 100% rename from InstructorsAndTrainees/trainees/dialogedittrainee.ui rename to LibInstructorsAndTrainees/trainees/dialogedittrainee.ui diff --git a/InstructorsAndTrainees/trainees/dialogredactortrainees.cpp b/LibInstructorsAndTrainees/trainees/dialogredactortrainees.cpp similarity index 100% rename from InstructorsAndTrainees/trainees/dialogredactortrainees.cpp rename to LibInstructorsAndTrainees/trainees/dialogredactortrainees.cpp diff --git a/InstructorsAndTrainees/trainees/dialogredactortrainees.h b/LibInstructorsAndTrainees/trainees/dialogredactortrainees.h similarity index 100% rename from InstructorsAndTrainees/trainees/dialogredactortrainees.h rename to LibInstructorsAndTrainees/trainees/dialogredactortrainees.h diff --git a/InstructorsAndTrainees/trainees/editortrainees.cpp b/LibInstructorsAndTrainees/trainees/editortrainees.cpp similarity index 100% rename from InstructorsAndTrainees/trainees/editortrainees.cpp rename to LibInstructorsAndTrainees/trainees/editortrainees.cpp diff --git a/InstructorsAndTrainees/trainees/editortrainees.h b/LibInstructorsAndTrainees/trainees/editortrainees.h similarity index 100% rename from InstructorsAndTrainees/trainees/editortrainees.h rename to LibInstructorsAndTrainees/trainees/editortrainees.h diff --git a/InstructorsAndTrainees/trainees/editortrainees.ui b/LibInstructorsAndTrainees/trainees/editortrainees.ui similarity index 100% rename from InstructorsAndTrainees/trainees/editortrainees.ui rename to LibInstructorsAndTrainees/trainees/editortrainees.ui diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.cpp b/LibInstructorsAndTrainees/trainees/personalcardtrainee.cpp similarity index 100% rename from InstructorsAndTrainees/trainees/personalcardtrainee.cpp rename to LibInstructorsAndTrainees/trainees/personalcardtrainee.cpp diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.h b/LibInstructorsAndTrainees/trainees/personalcardtrainee.h similarity index 100% rename from InstructorsAndTrainees/trainees/personalcardtrainee.h rename to LibInstructorsAndTrainees/trainees/personalcardtrainee.h diff --git a/InstructorsAndTrainees/trainees/personalcardtrainee.ui b/LibInstructorsAndTrainees/trainees/personalcardtrainee.ui similarity index 100% rename from InstructorsAndTrainees/trainees/personalcardtrainee.ui rename to LibInstructorsAndTrainees/trainees/personalcardtrainee.ui diff --git a/InstructorsAndTrainees/trainees/traineesview.cpp b/LibInstructorsAndTrainees/trainees/traineesview.cpp similarity index 100% rename from InstructorsAndTrainees/trainees/traineesview.cpp rename to LibInstructorsAndTrainees/trainees/traineesview.cpp diff --git a/InstructorsAndTrainees/trainees/traineesview.h b/LibInstructorsAndTrainees/trainees/traineesview.h similarity index 100% rename from InstructorsAndTrainees/trainees/traineesview.h rename to LibInstructorsAndTrainees/trainees/traineesview.h diff --git a/InstructorsAndTrainees/trainees/viewertrainees.cpp b/LibInstructorsAndTrainees/trainees/viewertrainees.cpp similarity index 100% rename from InstructorsAndTrainees/trainees/viewertrainees.cpp rename to LibInstructorsAndTrainees/trainees/viewertrainees.cpp diff --git a/InstructorsAndTrainees/trainees/viewertrainees.h b/LibInstructorsAndTrainees/trainees/viewertrainees.h similarity index 100% rename from InstructorsAndTrainees/trainees/viewertrainees.h rename to LibInstructorsAndTrainees/trainees/viewertrainees.h diff --git a/InstructorsAndTrainees/trainees/viewertrainees.ui b/LibInstructorsAndTrainees/trainees/viewertrainees.ui similarity index 100% rename from InstructorsAndTrainees/trainees/viewertrainees.ui rename to LibInstructorsAndTrainees/trainees/viewertrainees.ui diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm b/LibInstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm similarity index 100% rename from InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm rename to LibInstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm diff --git a/InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts b/LibInstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts similarity index 100% rename from InstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts rename to LibInstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts diff --git a/InstructorsAndTrainees/widgets/waitanimationwidget.cpp b/LibInstructorsAndTrainees/widgets/waitanimationwidget.cpp similarity index 100% rename from InstructorsAndTrainees/widgets/waitanimationwidget.cpp rename to LibInstructorsAndTrainees/widgets/waitanimationwidget.cpp diff --git a/InstructorsAndTrainees/widgets/waitanimationwidget.h b/LibInstructorsAndTrainees/widgets/waitanimationwidget.h similarity index 100% rename from InstructorsAndTrainees/widgets/waitanimationwidget.h rename to LibInstructorsAndTrainees/widgets/waitanimationwidget.h diff --git a/InstructorsAndTrainees/widgets/waitanimationwidget.ui b/LibInstructorsAndTrainees/widgets/waitanimationwidget.ui similarity index 100% rename from InstructorsAndTrainees/widgets/waitanimationwidget.ui rename to LibInstructorsAndTrainees/widgets/waitanimationwidget.ui diff --git a/InstructorsAndTrainees/widgets/widgettools.cpp b/LibInstructorsAndTrainees/widgets/widgettools.cpp similarity index 100% rename from InstructorsAndTrainees/widgets/widgettools.cpp rename to LibInstructorsAndTrainees/widgets/widgettools.cpp diff --git a/InstructorsAndTrainees/widgets/widgettools.h b/LibInstructorsAndTrainees/widgets/widgettools.h similarity index 100% rename from InstructorsAndTrainees/widgets/widgettools.h rename to LibInstructorsAndTrainees/widgets/widgettools.h diff --git a/Server/CMakeLists.txt b/LibServer/CMakeLists.txt similarity index 87% rename from Server/CMakeLists.txt rename to LibServer/CMakeLists.txt index 909ee77..e6ad624 100644 --- a/Server/CMakeLists.txt +++ b/LibServer/CMakeLists.txt @@ -75,23 +75,23 @@ target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Data) target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Systems) target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Systems/Parsers) -target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseInterface) +target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface) if(PROJECT_TYPE_DEBUG) - target_link_directories(Server PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseInterface) + target_link_directories(Server PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface) else() - target_link_directories(Server PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseInterface) + target_link_directories(Server PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface) endif() target_link_libraries(Server PRIVATE libDataBaseInterface.dll) -target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees) -target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/authorization) -target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/tasks) -target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/widgets) -target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/specialmessagebox) +target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees) +target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/authorization) +target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks) +target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets) +target_include_directories(Server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox) if(PROJECT_TYPE_DEBUG) - target_link_directories(Server PUBLIC ${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees) + target_link_directories(Server PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees) else() - target_link_directories(Server PUBLIC ${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees) + target_link_directories(Server PUBLIC ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees) endif() target_link_libraries(Server PRIVATE libInstructorsAndTrainees.dll) @@ -101,12 +101,12 @@ if(PROJECT_TYPE_DEBUG) add_custom_command(TARGET Server POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/Debug64/Server/libServer.dll + ${REPO_PATH}/BUILDS/Debug64/LibServer/libServer.dll ${REPO_PATH}/BUILDS/Debug64/ProgramServerMPS) else() add_custom_command(TARGET Server POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${REPO_PATH}/BUILDS/Release64/Server/libServer.dll + ${REPO_PATH}/BUILDS/Release64/LibServer/libServer.dll ${REPO_PATH}/BUILDS/Release64/ProgramServerMPS) endif() diff --git a/Server/CMakeLists.txt.user.00ce76f b/LibServer/CMakeLists.txt.user.00ce76f similarity index 100% rename from Server/CMakeLists.txt.user.00ce76f rename to LibServer/CMakeLists.txt.user.00ce76f diff --git a/Server/CMakeLists.txt.user.02bbda2 b/LibServer/CMakeLists.txt.user.02bbda2 similarity index 100% rename from Server/CMakeLists.txt.user.02bbda2 rename to LibServer/CMakeLists.txt.user.02bbda2 diff --git a/Server/CMakeLists.txt.user.15ef247 b/LibServer/CMakeLists.txt.user.15ef247 similarity index 100% rename from Server/CMakeLists.txt.user.15ef247 rename to LibServer/CMakeLists.txt.user.15ef247 diff --git a/Server/Data/Client.h b/LibServer/Data/Client.h similarity index 100% rename from Server/Data/Client.h rename to LibServer/Data/Client.h diff --git a/Server/Data/PacketType.h b/LibServer/Data/PacketType.h similarity index 100% rename from Server/Data/PacketType.h rename to LibServer/Data/PacketType.h diff --git a/Server/Data/StreamingVersionData.h b/LibServer/Data/StreamingVersionData.h similarity index 100% rename from Server/Data/StreamingVersionData.h rename to LibServer/Data/StreamingVersionData.h diff --git a/Server/Data/typesDataServerClient.h b/LibServer/Data/typesDataServerClient.h similarity index 100% rename from Server/Data/typesDataServerClient.h rename to LibServer/Data/typesDataServerClient.h diff --git a/Server/Data/userType.h b/LibServer/Data/userType.h similarity index 100% rename from Server/Data/userType.h rename to LibServer/Data/userType.h diff --git a/Server/Server.qrc b/LibServer/Server.qrc similarity index 100% rename from Server/Server.qrc rename to LibServer/Server.qrc diff --git a/Server/ServerLMS_global.h b/LibServer/ServerLMS_global.h similarity index 100% rename from Server/ServerLMS_global.h rename to LibServer/ServerLMS_global.h diff --git a/Server/Systems/.vs/ProjectSettings.json b/LibServer/Systems/.vs/ProjectSettings.json similarity index 100% rename from Server/Systems/.vs/ProjectSettings.json rename to LibServer/Systems/.vs/ProjectSettings.json diff --git a/Server/Systems/.vs/Systems/v16/.suo b/LibServer/Systems/.vs/Systems/v16/.suo similarity index 100% rename from Server/Systems/.vs/Systems/v16/.suo rename to LibServer/Systems/.vs/Systems/v16/.suo diff --git a/Server/Systems/.vs/Systems/v16/Browse.VC.db b/LibServer/Systems/.vs/Systems/v16/Browse.VC.db similarity index 100% rename from Server/Systems/.vs/Systems/v16/Browse.VC.db rename to LibServer/Systems/.vs/Systems/v16/Browse.VC.db diff --git a/Server/Systems/.vs/VSWorkspaceState.json b/LibServer/Systems/.vs/VSWorkspaceState.json similarity index 100% rename from Server/Systems/.vs/VSWorkspaceState.json rename to LibServer/Systems/.vs/VSWorkspaceState.json diff --git a/Server/Systems/.vs/slnx.sqlite b/LibServer/Systems/.vs/slnx.sqlite similarity index 100% rename from Server/Systems/.vs/slnx.sqlite rename to LibServer/Systems/.vs/slnx.sqlite diff --git a/Server/Systems/Parsers/clientanswerparser.cpp b/LibServer/Systems/Parsers/clientanswerparser.cpp similarity index 100% rename from Server/Systems/Parsers/clientanswerparser.cpp rename to LibServer/Systems/Parsers/clientanswerparser.cpp diff --git a/Server/Systems/Parsers/clientanswerparser.h b/LibServer/Systems/Parsers/clientanswerparser.h similarity index 100% rename from Server/Systems/Parsers/clientanswerparser.h rename to LibServer/Systems/Parsers/clientanswerparser.h diff --git a/Server/Systems/Parsers/dataparser.cpp b/LibServer/Systems/Parsers/dataparser.cpp similarity index 100% rename from Server/Systems/Parsers/dataparser.cpp rename to LibServer/Systems/Parsers/dataparser.cpp diff --git a/Server/Systems/Parsers/dataparser.h b/LibServer/Systems/Parsers/dataparser.h similarity index 100% rename from Server/Systems/Parsers/dataparser.h rename to LibServer/Systems/Parsers/dataparser.h diff --git a/Server/Systems/Parsers/dbanswerparser.cpp b/LibServer/Systems/Parsers/dbanswerparser.cpp similarity index 100% rename from Server/Systems/Parsers/dbanswerparser.cpp rename to LibServer/Systems/Parsers/dbanswerparser.cpp diff --git a/Server/Systems/Parsers/dbanswerparser.h b/LibServer/Systems/Parsers/dbanswerparser.h similarity index 100% rename from Server/Systems/Parsers/dbanswerparser.h rename to LibServer/Systems/Parsers/dbanswerparser.h diff --git a/Server/Systems/Parsers/docsanswerparser.cpp b/LibServer/Systems/Parsers/docsanswerparser.cpp similarity index 100% rename from Server/Systems/Parsers/docsanswerparser.cpp rename to LibServer/Systems/Parsers/docsanswerparser.cpp diff --git a/Server/Systems/Parsers/docsanswerparser.h b/LibServer/Systems/Parsers/docsanswerparser.h similarity index 100% rename from Server/Systems/Parsers/docsanswerparser.h rename to LibServer/Systems/Parsers/docsanswerparser.h diff --git a/Server/Systems/Parsers/processparser.cpp b/LibServer/Systems/Parsers/processparser.cpp similarity index 100% rename from Server/Systems/Parsers/processparser.cpp rename to LibServer/Systems/Parsers/processparser.cpp diff --git a/Server/Systems/Parsers/processparser.h b/LibServer/Systems/Parsers/processparser.h similarity index 100% rename from Server/Systems/Parsers/processparser.h rename to LibServer/Systems/Parsers/processparser.h diff --git a/Server/Systems/assetsmanager.cpp b/LibServer/Systems/assetsmanager.cpp similarity index 100% rename from Server/Systems/assetsmanager.cpp rename to LibServer/Systems/assetsmanager.cpp diff --git a/Server/Systems/assetsmanager.h b/LibServer/Systems/assetsmanager.h similarity index 100% rename from Server/Systems/assetsmanager.h rename to LibServer/Systems/assetsmanager.h diff --git a/Server/Systems/chatsystem.cpp b/LibServer/Systems/chatsystem.cpp similarity index 100% rename from Server/Systems/chatsystem.cpp rename to LibServer/Systems/chatsystem.cpp diff --git a/Server/Systems/chatsystem.h b/LibServer/Systems/chatsystem.h similarity index 100% rename from Server/Systems/chatsystem.h rename to LibServer/Systems/chatsystem.h diff --git a/Server/Systems/commonclienthandler.cpp b/LibServer/Systems/commonclienthandler.cpp similarity index 100% rename from Server/Systems/commonclienthandler.cpp rename to LibServer/Systems/commonclienthandler.cpp diff --git a/Server/Systems/commonclienthandler.h b/LibServer/Systems/commonclienthandler.h similarity index 100% rename from Server/Systems/commonclienthandler.h rename to LibServer/Systems/commonclienthandler.h diff --git a/Server/Systems/docsupdater.cpp b/LibServer/Systems/docsupdater.cpp similarity index 100% rename from Server/Systems/docsupdater.cpp rename to LibServer/Systems/docsupdater.cpp diff --git a/Server/Systems/docsupdater.h b/LibServer/Systems/docsupdater.h similarity index 100% rename from Server/Systems/docsupdater.h rename to LibServer/Systems/docsupdater.h diff --git a/Server/Systems/fasthashcalculator.cpp b/LibServer/Systems/fasthashcalculator.cpp similarity index 100% rename from Server/Systems/fasthashcalculator.cpp rename to LibServer/Systems/fasthashcalculator.cpp diff --git a/Server/Systems/fasthashcalculator.h b/LibServer/Systems/fasthashcalculator.h similarity index 100% rename from Server/Systems/fasthashcalculator.h rename to LibServer/Systems/fasthashcalculator.h diff --git a/Server/Systems/logger.cpp b/LibServer/Systems/logger.cpp similarity index 100% rename from Server/Systems/logger.cpp rename to LibServer/Systems/logger.cpp diff --git a/Server/Systems/logger.h b/LibServer/Systems/logger.h similarity index 100% rename from Server/Systems/logger.h rename to LibServer/Systems/logger.h diff --git a/Server/Systems/processingsystem.cpp b/LibServer/Systems/processingsystem.cpp similarity index 100% rename from Server/Systems/processingsystem.cpp rename to LibServer/Systems/processingsystem.cpp diff --git a/Server/Systems/processingsystem.h b/LibServer/Systems/processingsystem.h similarity index 100% rename from Server/Systems/processingsystem.h rename to LibServer/Systems/processingsystem.h diff --git a/Server/Systems/recognizesystem.cpp b/LibServer/Systems/recognizesystem.cpp similarity index 100% rename from Server/Systems/recognizesystem.cpp rename to LibServer/Systems/recognizesystem.cpp diff --git a/Server/Systems/recognizesystem.h b/LibServer/Systems/recognizesystem.h similarity index 100% rename from Server/Systems/recognizesystem.h rename to LibServer/Systems/recognizesystem.h diff --git a/Server/Systems/sendsystem.cpp b/LibServer/Systems/sendsystem.cpp similarity index 100% rename from Server/Systems/sendsystem.cpp rename to LibServer/Systems/sendsystem.cpp diff --git a/Server/Systems/sendsystem.h b/LibServer/Systems/sendsystem.h similarity index 100% rename from Server/Systems/sendsystem.h rename to LibServer/Systems/sendsystem.h diff --git a/Server/Systems/tools.cpp b/LibServer/Systems/tools.cpp similarity index 100% rename from Server/Systems/tools.cpp rename to LibServer/Systems/tools.cpp diff --git a/Server/Systems/tools.h b/LibServer/Systems/tools.h similarity index 100% rename from Server/Systems/tools.h rename to LibServer/Systems/tools.h diff --git a/Server/Systems/updatecontroller.cpp b/LibServer/Systems/updatecontroller.cpp similarity index 100% rename from Server/Systems/updatecontroller.cpp rename to LibServer/Systems/updatecontroller.cpp diff --git a/Server/Systems/updatecontroller.h b/LibServer/Systems/updatecontroller.h similarity index 100% rename from Server/Systems/updatecontroller.h rename to LibServer/Systems/updatecontroller.h diff --git a/Server/clienthandler/clienthandler.cpp b/LibServer/clienthandler/clienthandler.cpp similarity index 100% rename from Server/clienthandler/clienthandler.cpp rename to LibServer/clienthandler/clienthandler.cpp diff --git a/Server/clienthandler/clienthandler.h b/LibServer/clienthandler/clienthandler.h similarity index 100% rename from Server/clienthandler/clienthandler.h rename to LibServer/clienthandler/clienthandler.h diff --git a/Server/metatypes.cpp b/LibServer/metatypes.cpp similarity index 100% rename from Server/metatypes.cpp rename to LibServer/metatypes.cpp diff --git a/Server/metatypes.h b/LibServer/metatypes.h similarity index 100% rename from Server/metatypes.h rename to LibServer/metatypes.h diff --git a/Server/multithreadserver/multithreadserver.cpp b/LibServer/multithreadserver/multithreadserver.cpp similarity index 100% rename from Server/multithreadserver/multithreadserver.cpp rename to LibServer/multithreadserver/multithreadserver.cpp diff --git a/Server/multithreadserver/multithreadserver.h b/LibServer/multithreadserver/multithreadserver.h similarity index 100% rename from Server/multithreadserver/multithreadserver.h rename to LibServer/multithreadserver/multithreadserver.h diff --git a/Server/providerdblms/providerdblms.cpp b/LibServer/providerdblms/providerdblms.cpp similarity index 100% rename from Server/providerdblms/providerdblms.cpp rename to LibServer/providerdblms/providerdblms.cpp diff --git a/Server/providerdblms/providerdblms.h b/LibServer/providerdblms/providerdblms.h similarity index 100% rename from Server/providerdblms/providerdblms.h rename to LibServer/providerdblms/providerdblms.h diff --git a/Server/resources/blankXML/ListGroups.xml b/LibServer/resources/blankXML/ListGroups.xml similarity index 100% rename from Server/resources/blankXML/ListGroups.xml rename to LibServer/resources/blankXML/ListGroups.xml diff --git a/Server/resources/blankXML/ListInstructors.xml b/LibServer/resources/blankXML/ListInstructors.xml similarity index 100% rename from Server/resources/blankXML/ListInstructors.xml rename to LibServer/resources/blankXML/ListInstructors.xml diff --git a/Server/resources/blankXML/ListSubProc.xml b/LibServer/resources/blankXML/ListSubProc.xml similarity index 100% rename from Server/resources/blankXML/ListSubProc.xml rename to LibServer/resources/blankXML/ListSubProc.xml diff --git a/Server/resources/blankXML/ListTasksAMM.xml b/LibServer/resources/blankXML/ListTasksAMM.xml similarity index 100% rename from Server/resources/blankXML/ListTasksAMM.xml rename to LibServer/resources/blankXML/ListTasksAMM.xml diff --git a/Server/resources/blankXML/ListTasksFIM.xml b/LibServer/resources/blankXML/ListTasksFIM.xml similarity index 100% rename from Server/resources/blankXML/ListTasksFIM.xml rename to LibServer/resources/blankXML/ListTasksFIM.xml diff --git a/Server/resources/blankXML/ListTrainees.xml b/LibServer/resources/blankXML/ListTrainees.xml similarity index 100% rename from Server/resources/blankXML/ListTrainees.xml rename to LibServer/resources/blankXML/ListTrainees.xml diff --git a/Server/resources/icons/checkDB.png b/LibServer/resources/icons/checkDB.png similarity index 100% rename from Server/resources/icons/checkDB.png rename to LibServer/resources/icons/checkDB.png diff --git a/Server/resources/icons/circleGray.png b/LibServer/resources/icons/circleGray.png similarity index 100% rename from Server/resources/icons/circleGray.png rename to LibServer/resources/icons/circleGray.png diff --git a/Server/resources/icons/circleGreen.png b/LibServer/resources/icons/circleGreen.png similarity index 100% rename from Server/resources/icons/circleGreen.png rename to LibServer/resources/icons/circleGreen.png diff --git a/Server/resources/icons/circleRed.png b/LibServer/resources/icons/circleRed.png similarity index 100% rename from Server/resources/icons/circleRed.png rename to LibServer/resources/icons/circleRed.png diff --git a/Server/resources/icons/editorDB.png b/LibServer/resources/icons/editorDB.png similarity index 100% rename from Server/resources/icons/editorDB.png rename to LibServer/resources/icons/editorDB.png diff --git a/Server/resources/icons/exchange.png b/LibServer/resources/icons/exchange.png similarity index 100% rename from Server/resources/icons/exchange.png rename to LibServer/resources/icons/exchange.png diff --git a/Server/resources/icons/lock.png b/LibServer/resources/icons/lock.png similarity index 100% rename from Server/resources/icons/lock.png rename to LibServer/resources/icons/lock.png diff --git a/Server/resources/icons/open.png b/LibServer/resources/icons/open.png similarity index 100% rename from Server/resources/icons/open.png rename to LibServer/resources/icons/open.png diff --git a/Server/resources/icons/procedure.png b/LibServer/resources/icons/procedure.png similarity index 100% rename from Server/resources/icons/procedure.png rename to LibServer/resources/icons/procedure.png diff --git a/Server/resources/icons/rocket.png b/LibServer/resources/icons/rocket.png similarity index 100% rename from Server/resources/icons/rocket.png rename to LibServer/resources/icons/rocket.png diff --git a/Server/resources/icons/settings.png b/LibServer/resources/icons/settings.png similarity index 100% rename from Server/resources/icons/settings.png rename to LibServer/resources/icons/settings.png diff --git a/Server/resources/icons/stop.png b/LibServer/resources/icons/stop.png similarity index 100% rename from Server/resources/icons/stop.png rename to LibServer/resources/icons/stop.png diff --git a/Server/resources/icons/switchOff.png b/LibServer/resources/icons/switchOff.png similarity index 100% rename from Server/resources/icons/switchOff.png rename to LibServer/resources/icons/switchOff.png diff --git a/Server/resources/icons/switchOn.png b/LibServer/resources/icons/switchOn.png similarity index 100% rename from Server/resources/icons/switchOn.png rename to LibServer/resources/icons/switchOn.png diff --git a/Server/resources/icons/unlock.png b/LibServer/resources/icons/unlock.png similarity index 100% rename from Server/resources/icons/unlock.png rename to LibServer/resources/icons/unlock.png diff --git a/Server/serverlmswidget.cpp b/LibServer/serverlmswidget.cpp similarity index 100% rename from Server/serverlmswidget.cpp rename to LibServer/serverlmswidget.cpp diff --git a/Server/serverlmswidget.h b/LibServer/serverlmswidget.h similarity index 100% rename from Server/serverlmswidget.h rename to LibServer/serverlmswidget.h diff --git a/Server/serverlmswidget.ui b/LibServer/serverlmswidget.ui similarity index 100% rename from Server/serverlmswidget.ui rename to LibServer/serverlmswidget.ui diff --git a/Server/settings/dialogcheckdb.cpp b/LibServer/settings/dialogcheckdb.cpp similarity index 100% rename from Server/settings/dialogcheckdb.cpp rename to LibServer/settings/dialogcheckdb.cpp diff --git a/Server/settings/dialogcheckdb.h b/LibServer/settings/dialogcheckdb.h similarity index 100% rename from Server/settings/dialogcheckdb.h rename to LibServer/settings/dialogcheckdb.h diff --git a/Server/settings/dialogcheckdb.ui b/LibServer/settings/dialogcheckdb.ui similarity index 100% rename from Server/settings/dialogcheckdb.ui rename to LibServer/settings/dialogcheckdb.ui diff --git a/Server/settings/dialogsettingstray.cpp b/LibServer/settings/dialogsettingstray.cpp similarity index 100% rename from Server/settings/dialogsettingstray.cpp rename to LibServer/settings/dialogsettingstray.cpp diff --git a/Server/settings/dialogsettingstray.h b/LibServer/settings/dialogsettingstray.h similarity index 100% rename from Server/settings/dialogsettingstray.h rename to LibServer/settings/dialogsettingstray.h diff --git a/Server/settings/dialogsettingstray.ui b/LibServer/settings/dialogsettingstray.ui similarity index 100% rename from Server/settings/dialogsettingstray.ui rename to LibServer/settings/dialogsettingstray.ui diff --git a/Server/translations/ServerLMS_ru_RU.qm b/LibServer/translations/ServerLMS_ru_RU.qm similarity index 100% rename from Server/translations/ServerLMS_ru_RU.qm rename to LibServer/translations/ServerLMS_ru_RU.qm diff --git a/Server/translations/ServerLMS_ru_RU.ts b/LibServer/translations/ServerLMS_ru_RU.ts similarity index 100% rename from Server/translations/ServerLMS_ru_RU.ts rename to LibServer/translations/ServerLMS_ru_RU.ts diff --git a/ProgramAWSinstructorMPS/CMakeLists.txt b/ProgramAWSinstructorMPS/CMakeLists.txt index d8671b3..a52be70 100644 --- a/ProgramAWSinstructorMPS/CMakeLists.txt +++ b/ProgramAWSinstructorMPS/CMakeLists.txt @@ -26,30 +26,30 @@ target_link_libraries(ProgramAWSinstructorMPS PRIVATE Qt5::Sql) target_link_libraries(ProgramAWSinstructorMPS PRIVATE Qt5::Xml) target_link_libraries(ProgramAWSinstructorMPS PRIVATE Qt5::Network) -target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees) -target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/instructors) -target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/trainees) -target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/tasks) -target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/docTasks) -target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/connectorToServer) -target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/connectorToServer/Core) -target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/messanger) -target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/widgets) -target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/specialmessagebox) -target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/settings) -target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/authorization) +target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees) +target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/instructors) +target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/trainees) +target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks) +target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/docTasks) +target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer) +target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer/Core) +target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/messanger) +target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets) +target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox) +target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/settings) +target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/authorization) if(PROJECT_TYPE_DEBUG) - target_link_directories(ProgramAWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees) + target_link_directories(ProgramAWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees) else() - target_link_directories(ProgramAWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees) + target_link_directories(ProgramAWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees) endif() target_link_libraries(ProgramAWSinstructorMPS PRIVATE libInstructorsAndTrainees.dll) -target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseInterface) +target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface) if(PROJECT_TYPE_DEBUG) - target_link_directories(ProgramAWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseInterface) + target_link_directories(ProgramAWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface) else() - target_link_directories(ProgramAWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseInterface) + target_link_directories(ProgramAWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface) endif() target_link_libraries(ProgramAWSinstructorMPS PRIVATE libDataBaseInterface.dll) diff --git a/ProgramServerMPS/CMakeLists.txt b/ProgramServerMPS/CMakeLists.txt index 3690f01..befbd35 100644 --- a/ProgramServerMPS/CMakeLists.txt +++ b/ProgramServerMPS/CMakeLists.txt @@ -26,27 +26,27 @@ target_link_libraries(ProgramServerMPS PRIVATE Qt5::Network) target_link_libraries(ProgramServerMPS PRIVATE Qt5::Sql) target_link_libraries(ProgramServerMPS PRIVATE Qt5::Xml) -target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../DataBaseInterface) +target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface) if(PROJECT_TYPE_DEBUG) - target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/DataBaseInterface) + target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface) else() - target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/DataBaseInterface) + target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface) endif() target_link_libraries(ProgramServerMPS PRIVATE libDataBaseInterface.dll) -target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Server) -target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Server/clienthandler) -target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Server/multithreadserver) -target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Server/providerdblms) -target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Server/Systems) +target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer) +target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/clienthandler) +target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/multithreadserver) +target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/providerdblms) +target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/Systems) if(PROJECT_TYPE_DEBUG) - target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/Server) + target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibServer) else() - target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/Server) + target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibServer) endif() target_link_libraries(ProgramServerMPS PRIVATE libServer.dll) -target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees) -target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/tasks) -target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/widgets) -target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../InstructorsAndTrainees/specialmessagebox) +target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees) +target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks) +target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets) +target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox)