From ee4b01713ff99f180f368218d768b96c66aecbb1 Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Fri, 18 Dec 2020 20:17:52 +0700 Subject: [PATCH] Const qualifiers for entities, there needed --- sea_transport/entities/IEntity.h | 2 +- sea_transport/entities/cargo_entity.cpp | 6 +++--- sea_transport/entities/cargo_entity.h | 6 +++--- sea_transport/entities/dpoint_entity.cpp | 4 ++-- sea_transport/entities/dpoint_entity.h | 4 ++-- sea_transport/entities/storage_entity.cpp | 4 ++-- sea_transport/entities/storage_entity.h | 4 ++-- sea_transport/entities/user_entity.cpp | 6 +++--- sea_transport/entities/user_entity.h | 6 +++--- sea_transport/entities/vessel_entity.cpp | 6 +++--- sea_transport/entities/vessel_entity.h | 6 +++--- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/sea_transport/entities/IEntity.h b/sea_transport/entities/IEntity.h index a1dbca3..9e577c9 100644 --- a/sea_transport/entities/IEntity.h +++ b/sea_transport/entities/IEntity.h @@ -8,7 +8,7 @@ typedef unsigned long long entity_id; class IEntity : public ISerializable { public: - virtual entity_id id() = 0; + virtual entity_id id() const = 0; }; #endif // IENTITY_H diff --git a/sea_transport/entities/cargo_entity.cpp b/sea_transport/entities/cargo_entity.cpp index 4a689f6..4104050 100644 --- a/sea_transport/entities/cargo_entity.cpp +++ b/sea_transport/entities/cargo_entity.cpp @@ -8,15 +8,15 @@ cargo_entity::cargo_entity(const QString &title, unsigned int volume) : _title(t } } -entity_id cargo_entity::id() { +entity_id cargo_entity::id() const { return this->_id; } -QString cargo_entity::title() { +QString cargo_entity::title() const { return this->_title; } -unsigned int cargo_entity::volume() { +unsigned int cargo_entity::volume() const { return this->_volume; } diff --git a/sea_transport/entities/cargo_entity.h b/sea_transport/entities/cargo_entity.h index 07d151b..8d84b3a 100644 --- a/sea_transport/entities/cargo_entity.h +++ b/sea_transport/entities/cargo_entity.h @@ -17,9 +17,9 @@ public: cargo_entity() = default; cargo_entity(const QString &title, unsigned int volume); - entity_id id(); - QString title(); - unsigned int volume(); + entity_id id() const; + QString title() const; + unsigned int volume() const; void serialize(QDataStream &output); void deserialize(QDataStream &input); diff --git a/sea_transport/entities/dpoint_entity.cpp b/sea_transport/entities/dpoint_entity.cpp index 2a2d48d..abc256a 100644 --- a/sea_transport/entities/dpoint_entity.cpp +++ b/sea_transport/entities/dpoint_entity.cpp @@ -8,11 +8,11 @@ dpoint_entity::dpoint_entity(const QString &title) : _title(title) { } } -entity_id dpoint_entity::id() { +entity_id dpoint_entity::id() const { return this->_id; } -QString dpoint_entity::title() { +QString dpoint_entity::title() const { return this->_title; } diff --git a/sea_transport/entities/dpoint_entity.h b/sea_transport/entities/dpoint_entity.h index 23aebb6..037f8ff 100644 --- a/sea_transport/entities/dpoint_entity.h +++ b/sea_transport/entities/dpoint_entity.h @@ -19,8 +19,8 @@ public: dpoint_entity() = default; dpoint_entity(const QString &title); - entity_id id(); - QString title(); + entity_id id() const; + QString title() const; const QVector storages(); void serialize(QDataStream &output); diff --git a/sea_transport/entities/storage_entity.cpp b/sea_transport/entities/storage_entity.cpp index 3e9aae3..5e55f4c 100644 --- a/sea_transport/entities/storage_entity.cpp +++ b/sea_transport/entities/storage_entity.cpp @@ -8,11 +8,11 @@ storage_entity::storage_entity(unsigned int capacity) : _capacity(capacity) { } -entity_id storage_entity::id() { +entity_id storage_entity::id() const { return this->_id; } -unsigned int storage_entity::capacity() { +unsigned int storage_entity::capacity() const { return this->_capacity; } diff --git a/sea_transport/entities/storage_entity.h b/sea_transport/entities/storage_entity.h index 0bc9f61..3b8abf5 100644 --- a/sea_transport/entities/storage_entity.h +++ b/sea_transport/entities/storage_entity.h @@ -20,8 +20,8 @@ public: storage_entity() = default; storage_entity(unsigned int capacity); - entity_id id(); - unsigned int capacity(); + entity_id id() const; + unsigned int capacity() const; const QVector cargo(); void add_cargo(cargo_entity object, bool &success); diff --git a/sea_transport/entities/user_entity.cpp b/sea_transport/entities/user_entity.cpp index 4a84f67..5cd56a7 100644 --- a/sea_transport/entities/user_entity.cpp +++ b/sea_transport/entities/user_entity.cpp @@ -4,15 +4,15 @@ user_entity::user_entity(const QString &login, const QString &password, UserRole this->_pwd_hash = QCryptographicHash::hash(password.toLocal8Bit(), QCryptographicHash::Sha3_256); } -entity_id user_entity::id() { +entity_id user_entity::id() const { return this->_id; } -const QString user_entity::login() { +const QString user_entity::login() const { return this->_login; } -UserRole user_entity::role() { +UserRole user_entity::role() const { return this->_role; } diff --git a/sea_transport/entities/user_entity.h b/sea_transport/entities/user_entity.h index 3926527..890279c 100644 --- a/sea_transport/entities/user_entity.h +++ b/sea_transport/entities/user_entity.h @@ -23,9 +23,9 @@ public: user_entity() = default; user_entity(const QString &login, const QString &password, UserRole role); - entity_id id(); - const QString login(); - UserRole role(); + entity_id id() const; + const QString login() const; + UserRole role() const; bool verify_password(const QString &password) const; void serialize(QDataStream &output); diff --git a/sea_transport/entities/vessel_entity.cpp b/sea_transport/entities/vessel_entity.cpp index 9dc49aa..b4ccdc7 100644 --- a/sea_transport/entities/vessel_entity.cpp +++ b/sea_transport/entities/vessel_entity.cpp @@ -7,15 +7,15 @@ vessel_entity::vessel_entity(const dpoint_entity &harbor, unsigned int capacity) this->_id = ++vessel_entity::__global_id; } -entity_id vessel_entity::id() { +entity_id vessel_entity::id() const { return this->_id; } -const dpoint_entity vessel_entity::harbor() { +const dpoint_entity vessel_entity::harbor() const { return this->_harbor; } -unsigned int vessel_entity::capacity() { +unsigned int vessel_entity::capacity() const { return this->_capacity; } diff --git a/sea_transport/entities/vessel_entity.h b/sea_transport/entities/vessel_entity.h index 9a28810..f381f37 100644 --- a/sea_transport/entities/vessel_entity.h +++ b/sea_transport/entities/vessel_entity.h @@ -19,9 +19,9 @@ public: vessel_entity() = default; vessel_entity(const dpoint_entity &harbor, unsigned int capacity); - entity_id id(); - const dpoint_entity harbor(); - unsigned int capacity(); + entity_id id() const; + const dpoint_entity harbor() const; + unsigned int capacity() const; const QVector cargo(); void serialize(QDataStream &output);