diff --git a/tests/models/models/albumimage.hpp b/tests/models/models/albumimage.hpp index 6f9137109..774cd1c8a 100644 --- a/tests/models/models/albumimage.hpp +++ b/tests/models/models/albumimage.hpp @@ -11,7 +11,7 @@ namespace Models using Orm::Constants::ID; using Orm::Constants::NAME; -using Orm::Constants::SIZE; +using Orm::Constants::SIZE_; using Orm::Tiny::Model; using Orm::Tiny::Relations::BelongsTo; @@ -48,7 +48,7 @@ private: ID, NAME, "ext", - SIZE, + SIZE_, }; }; diff --git a/tests/models/models/massassignmentmodels.hpp b/tests/models/models/massassignmentmodels.hpp index a0ebde8f0..ac36c5e0d 100644 --- a/tests/models/models/massassignmentmodels.hpp +++ b/tests/models/models/massassignmentmodels.hpp @@ -9,7 +9,7 @@ namespace Models using Orm::Constants::NAME; using Orm::Constants::NOTE; -using Orm::Constants::SIZE; +using Orm::Constants::SIZE_; using Orm::Tiny::Model; @@ -35,7 +35,7 @@ class Torrent_GuardedAttribute final : public Model /*! The attributes that are mass assignable. */ inline static const QStringList u_fillable { // NOLINT(cppcoreguidelines-interfaces-global-init) NAME, - SIZE, + SIZE_, "progress", "added_on", "hash", diff --git a/tests/models/models/torrent.hpp b/tests/models/models/torrent.hpp index 3aef215c7..fa0204ebf 100644 --- a/tests/models/models/torrent.hpp +++ b/tests/models/models/torrent.hpp @@ -26,7 +26,7 @@ namespace Models using Orm::Constants::ID; using Orm::Constants::NAME; using Orm::Constants::NOTE; -using Orm::Constants::SIZE; +using Orm::Constants::SIZE_; //using Orm::Tiny::CastItem; //using Orm::Tiny::CastType; @@ -164,7 +164,7 @@ private: /*! The model's default values for attributes. */ // inline static const QVector u_attributes { -// {SIZE, 0}, +// {SIZE_, 0}, // {"progress", 0}, // {"added_on", QDateTime({2021, 4, 1}, {15, 10, 10}, Qt::UTC)}, // }; @@ -173,7 +173,7 @@ private: inline static const QStringList u_fillable { // NOLINT(cppcoreguidelines-interfaces-global-init) ID, NAME, - SIZE, + SIZE_, "progress", "added_on", "hash", diff --git a/tests/models/models/torrenteager.hpp b/tests/models/models/torrenteager.hpp index a1b0ed7d3..e2df7545a 100644 --- a/tests/models/models/torrenteager.hpp +++ b/tests/models/models/torrenteager.hpp @@ -12,7 +12,7 @@ namespace Models using Orm::Constants::NAME; using Orm::Constants::NOTE; -using Orm::Constants::SIZE; +using Orm::Constants::SIZE_; using Orm::Tiny::AttributeItem; using Orm::Tiny::Model; @@ -60,7 +60,7 @@ private: /*! The model's default values for attributes. */ inline static const QVector u_attributes { // NOLINT(cppcoreguidelines-interfaces-global-init) - {SIZE, 0}, + {SIZE_, 0}, {"progress", 0}, {"added_on", QDateTime({2021, 4, 1}, {15, 10, 10}, Qt::UTC)}, }; @@ -68,7 +68,7 @@ private: /*! The attributes that are mass assignable. */ inline static const QStringList u_fillable { // NOLINT(cppcoreguidelines-interfaces-global-init) NAME, - SIZE, + SIZE_, "progress", "added_on", "hash", diff --git a/tests/models/models/torrenteager_without_qdatetime.hpp b/tests/models/models/torrenteager_without_qdatetime.hpp index d9ffa0355..124376505 100644 --- a/tests/models/models/torrenteager_without_qdatetime.hpp +++ b/tests/models/models/torrenteager_without_qdatetime.hpp @@ -9,7 +9,7 @@ namespace Models using Orm::Constants::NAME; using Orm::Constants::NOTE; -using Orm::Constants::SIZE; +using Orm::Constants::SIZE_; using Orm::Tiny::AttributeItem; using Orm::Tiny::Model; @@ -26,14 +26,14 @@ class TorrentEager_Without_QDateTime final : /*! The model's default values for attributes. */ inline static const QVector u_attributes { // NOLINT(cppcoreguidelines-interfaces-global-init) - {SIZE, 0}, + {SIZE_, 0}, {"progress", 0}, }; /*! The attributes that are mass assignable. */ inline static const QStringList u_fillable { // NOLINT(cppcoreguidelines-interfaces-global-init) NAME, - SIZE, + SIZE_, "progress", "added_on", "hash", diff --git a/tests/models/models/torrentpreviewablefile.hpp b/tests/models/models/torrentpreviewablefile.hpp index 7a07249b3..cfc2a2e74 100644 --- a/tests/models/models/torrentpreviewablefile.hpp +++ b/tests/models/models/torrentpreviewablefile.hpp @@ -12,7 +12,7 @@ namespace Models using Orm::Constants::NAME; using Orm::Constants::NOTE; -using Orm::Constants::SIZE; +using Orm::Constants::SIZE_; using Orm::Tiny::Relations::BelongsTo; using Orm::Tiny::Relations::HasOne; @@ -54,7 +54,7 @@ public: // Ownership of a unique_ptr() auto relation = belongsTo(); - relation->withDefault({{NAME, "default_torrent_name"}, {SIZE, 123}}); + relation->withDefault({{NAME, "default_torrent_name"}, {SIZE_, 123}}); return relation; } @@ -83,7 +83,7 @@ public: { auto relation = hasOne("previewable_file_id"); - relation->withDefault({{NAME, "default_fileproperty_name"}, {SIZE, 321}}); + relation->withDefault({{NAME, "default_fileproperty_name"}, {SIZE_, 321}}); return relation; } @@ -113,7 +113,7 @@ private: inline static QStringList u_fillable { // NOLINT(cppcoreguidelines-interfaces-global-init) "file_index", "filepath", - SIZE, + SIZE_, "progress", NOTE, }; diff --git a/tests/models/models/torrentpreviewablefileeager.hpp b/tests/models/models/torrentpreviewablefileeager.hpp index 5f959c47d..cedea9736 100644 --- a/tests/models/models/torrentpreviewablefileeager.hpp +++ b/tests/models/models/torrentpreviewablefileeager.hpp @@ -10,7 +10,7 @@ namespace Models { using Orm::Constants::NOTE; -using Orm::Constants::SIZE; +using Orm::Constants::SIZE_; using Orm::Tiny::Model; using Orm::Tiny::Relations::HasOne; @@ -49,7 +49,7 @@ private: inline static QStringList u_fillable { // NOLINT(cppcoreguidelines-interfaces-global-init) "file_index", "filepath", - SIZE, + SIZE_, "progress", NOTE, }; diff --git a/tests/models/models/torrentpreviewablefileeager_withdefault.hpp b/tests/models/models/torrentpreviewablefileeager_withdefault.hpp index 3235ebc5e..334d2de57 100644 --- a/tests/models/models/torrentpreviewablefileeager_withdefault.hpp +++ b/tests/models/models/torrentpreviewablefileeager_withdefault.hpp @@ -12,7 +12,7 @@ namespace Models using Orm::Constants::NAME; using Orm::Constants::NOTE; -using Orm::Constants::SIZE; +using Orm::Constants::SIZE_; using Orm::Tiny::Model; using Orm::Tiny::Relations::BelongsTo; @@ -58,7 +58,7 @@ public: auto relation = belongsTo( {}, {}, QString::fromUtf8(__func__)); // NOLINT(cppcoreguidelines-pro-bounds-array-to-pointer-decay) - relation->withDefault({{NAME, "default_torrent_name"}, {SIZE, 123}}); + relation->withDefault({{NAME, "default_torrent_name"}, {SIZE_, 123}}); return relation; } @@ -92,7 +92,7 @@ public: auto relation = hasOne("previewable_file_id"); - relation->withDefault({{NAME, "default_fileproperty_name"}, {SIZE, 321}}); + relation->withDefault({{NAME, "default_fileproperty_name"}, {SIZE_, 321}}); return relation; } @@ -125,7 +125,7 @@ private: inline static QStringList u_fillable { // NOLINT(cppcoreguidelines-interfaces-global-init) "file_index", "filepath", - SIZE, + SIZE_, "progress", NOTE, };