diff --git a/.gitignore b/sea_transport/.gitignore similarity index 100% rename from .gitignore rename to sea_transport/.gitignore diff --git a/README.md b/sea_transport/README.md similarity index 100% rename from README.md rename to sea_transport/README.md diff --git a/authwindow.cpp b/sea_transport/authwindow.cpp similarity index 100% rename from authwindow.cpp rename to sea_transport/authwindow.cpp diff --git a/authwindow.h b/sea_transport/authwindow.h similarity index 100% rename from authwindow.h rename to sea_transport/authwindow.h diff --git a/authwindow.ui b/sea_transport/authwindow.ui similarity index 100% rename from authwindow.ui rename to sea_transport/authwindow.ui diff --git a/cargoeditdialog.cpp b/sea_transport/cargoeditdialog.cpp similarity index 100% rename from cargoeditdialog.cpp rename to sea_transport/cargoeditdialog.cpp diff --git a/cargoeditdialog.h b/sea_transport/cargoeditdialog.h similarity index 100% rename from cargoeditdialog.h rename to sea_transport/cargoeditdialog.h diff --git a/cargoeditdialog.ui b/sea_transport/cargoeditdialog.ui similarity index 100% rename from cargoeditdialog.ui rename to sea_transport/cargoeditdialog.ui diff --git a/deliverypointeditdialog.cpp b/sea_transport/deliverypointeditdialog.cpp similarity index 100% rename from deliverypointeditdialog.cpp rename to sea_transport/deliverypointeditdialog.cpp diff --git a/deliverypointeditdialog.h b/sea_transport/deliverypointeditdialog.h similarity index 100% rename from deliverypointeditdialog.h rename to sea_transport/deliverypointeditdialog.h diff --git a/deliverypointeditdialog.ui b/sea_transport/deliverypointeditdialog.ui similarity index 100% rename from deliverypointeditdialog.ui rename to sea_transport/deliverypointeditdialog.ui diff --git a/entities/IEntity.h b/sea_transport/entities/IEntity.h similarity index 100% rename from entities/IEntity.h rename to sea_transport/entities/IEntity.h diff --git a/entities/ISerializable.h b/sea_transport/entities/ISerializable.h similarity index 100% rename from entities/ISerializable.h rename to sea_transport/entities/ISerializable.h diff --git a/entities/cargo_entity.cpp b/sea_transport/entities/cargo_entity.cpp similarity index 100% rename from entities/cargo_entity.cpp rename to sea_transport/entities/cargo_entity.cpp diff --git a/entities/cargo_entity.h b/sea_transport/entities/cargo_entity.h similarity index 100% rename from entities/cargo_entity.h rename to sea_transport/entities/cargo_entity.h diff --git a/entities/dpoint_entity.cpp b/sea_transport/entities/dpoint_entity.cpp similarity index 100% rename from entities/dpoint_entity.cpp rename to sea_transport/entities/dpoint_entity.cpp diff --git a/entities/dpoint_entity.h b/sea_transport/entities/dpoint_entity.h similarity index 100% rename from entities/dpoint_entity.h rename to sea_transport/entities/dpoint_entity.h diff --git a/entities/storage_entity.cpp b/sea_transport/entities/storage_entity.cpp similarity index 100% rename from entities/storage_entity.cpp rename to sea_transport/entities/storage_entity.cpp diff --git a/entities/storage_entity.h b/sea_transport/entities/storage_entity.h similarity index 100% rename from entities/storage_entity.h rename to sea_transport/entities/storage_entity.h diff --git a/entities/user_entity.cpp b/sea_transport/entities/user_entity.cpp similarity index 92% rename from entities/user_entity.cpp rename to sea_transport/entities/user_entity.cpp index 88a1607..4a84f67 100644 --- a/entities/user_entity.cpp +++ b/sea_transport/entities/user_entity.cpp @@ -16,7 +16,7 @@ UserRole user_entity::role() { return this->_role; } -bool user_entity::verify_password(const QString &password) { +bool user_entity::verify_password(const QString &password) const { return (this->_pwd_hash == QCryptographicHash::hash(password.toLocal8Bit(), QCryptographicHash::Sha3_256)); } diff --git a/entities/user_entity.h b/sea_transport/entities/user_entity.h similarity index 91% rename from entities/user_entity.h rename to sea_transport/entities/user_entity.h index 670152f..3926527 100644 --- a/entities/user_entity.h +++ b/sea_transport/entities/user_entity.h @@ -26,7 +26,7 @@ public: entity_id id(); const QString login(); UserRole role(); - bool verify_password(const QString &password); + bool verify_password(const QString &password) const; void serialize(QDataStream &output); void deserialize(QDataStream &input); diff --git a/entities/vessel_entity.cpp b/sea_transport/entities/vessel_entity.cpp similarity index 100% rename from entities/vessel_entity.cpp rename to sea_transport/entities/vessel_entity.cpp diff --git a/entities/vessel_entity.h b/sea_transport/entities/vessel_entity.h similarity index 100% rename from entities/vessel_entity.h rename to sea_transport/entities/vessel_entity.h diff --git a/generate_puml.ps1 b/sea_transport/generate_puml.ps1 similarity index 100% rename from generate_puml.ps1 rename to sea_transport/generate_puml.ps1 diff --git a/main.cpp b/sea_transport/main.cpp similarity index 100% rename from main.cpp rename to sea_transport/main.cpp diff --git a/sea_transport.pro b/sea_transport/sea_transport.pro similarity index 100% rename from sea_transport.pro rename to sea_transport/sea_transport.pro diff --git a/storageeditdialog.cpp b/sea_transport/storageeditdialog.cpp similarity index 100% rename from storageeditdialog.cpp rename to sea_transport/storageeditdialog.cpp diff --git a/storageeditdialog.h b/sea_transport/storageeditdialog.h similarity index 100% rename from storageeditdialog.h rename to sea_transport/storageeditdialog.h diff --git a/storageeditdialog.ui b/sea_transport/storageeditdialog.ui similarity index 100% rename from storageeditdialog.ui rename to sea_transport/storageeditdialog.ui diff --git a/system/apparatus.cpp b/sea_transport/system/apparatus.cpp similarity index 100% rename from system/apparatus.cpp rename to sea_transport/system/apparatus.cpp diff --git a/system/apparatus.h b/sea_transport/system/apparatus.h similarity index 100% rename from system/apparatus.h rename to sea_transport/system/apparatus.h diff --git a/system/auth_system.cpp b/sea_transport/system/auth_system.cpp similarity index 100% rename from system/auth_system.cpp rename to sea_transport/system/auth_system.cpp diff --git a/system/auth_system.h b/sea_transport/system/auth_system.h similarity index 100% rename from system/auth_system.h rename to sea_transport/system/auth_system.h diff --git a/system/object_system.cpp b/sea_transport/system/object_system.cpp similarity index 100% rename from system/object_system.cpp rename to sea_transport/system/object_system.cpp diff --git a/system/object_system.h b/sea_transport/system/object_system.h similarity index 100% rename from system/object_system.h rename to sea_transport/system/object_system.h diff --git a/usereditdialog.cpp b/sea_transport/usereditdialog.cpp similarity index 100% rename from usereditdialog.cpp rename to sea_transport/usereditdialog.cpp diff --git a/usereditdialog.h b/sea_transport/usereditdialog.h similarity index 100% rename from usereditdialog.h rename to sea_transport/usereditdialog.h diff --git a/usereditdialog.ui b/sea_transport/usereditdialog.ui similarity index 100% rename from usereditdialog.ui rename to sea_transport/usereditdialog.ui diff --git a/vesseleditdialog.cpp b/sea_transport/vesseleditdialog.cpp similarity index 100% rename from vesseleditdialog.cpp rename to sea_transport/vesseleditdialog.cpp diff --git a/vesseleditdialog.h b/sea_transport/vesseleditdialog.h similarity index 100% rename from vesseleditdialog.h rename to sea_transport/vesseleditdialog.h diff --git a/vesseleditdialog.ui b/sea_transport/vesseleditdialog.ui similarity index 100% rename from vesseleditdialog.ui rename to sea_transport/vesseleditdialog.ui diff --git a/sea_transport_project.pro b/sea_transport_project.pro new file mode 100644 index 0000000..18ba504 --- /dev/null +++ b/sea_transport_project.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs + +SUBDIRS += \ + sea_transport diff --git a/sea_transport_project.pro.user b/sea_transport_project.pro.user new file mode 100644 index 0000000..df7f6b5 --- /dev/null +++ b/sea_transport_project.pro.user @@ -0,0 +1,352 @@ + + + + + + EnvironmentId + {420d7b21-4a15-495a-b93d-2808238bc8a0} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + true + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + *.md, *.MD, Makefile + false + true + + + + ProjectExplorer.Project.PluginSettings + + + true + true + true + true + true + + + 0 + true + + true + Builtin.DefaultTidyAndClazy + 4 + + + + true + + + + + ProjectExplorer.Project.Target.0 + + Desktop + Desktop Qt 5.15.0 MinGW 64-bit + Desktop Qt 5.15.0 MinGW 64-bit + qt.qt5.5150.win64_mingw81_kit + 0 + 0 + 0 + + true + 0 + C:\Users\Admin\Documents\repos\build-sea_transport_project-Desktop_Qt_5_15_0_MinGW_64_bit-Debug + C:/Users/Admin/Documents/repos/build-sea_transport_project-Desktop_Qt_5_15_0_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + + Отладка + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 2 + 2 + + + true + 2 + C:\Users\Admin\Documents\repos\build-sea_transport_project-Desktop_Qt_5_15_0_MinGW_64_bit-Release + C:/Users/Admin/Documents/repos/build-sea_transport_project-Desktop_Qt_5_15_0_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + + Выпуск + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 2 + + + true + 0 + C:\Users\Admin\Documents\repos\build-sea_transport_project-Desktop_Qt_5_15_0_MinGW_64_bit-Profile + C:/Users/Admin/Documents/repos/build-sea_transport_project-Desktop_Qt_5_15_0_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Сборка + Сборка + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Очистка + Очистка + ProjectExplorer.BuildSteps.Clean + + 2 + false + + + Профилирование + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Развёртывание + Развёртывание + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Admin/Documents/repos/sea_transport_project/sea_transport/sea_transport.pro + C:/Users/Admin/Documents/repos/sea_transport_project/sea_transport/sea_transport.pro + + false + + false + true + true + false + false + true + + C:/Users/Admin/Documents/repos/build-sea_transport_project-Desktop_Qt_5_15_0_MinGW_64_bit-Debug/sea_transport + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + +