Some nitpicks: pass by const& for setters + use initializer list for QHashcalendar-feature/eventmodel

2 files changed, 15 insertions, 17 deletions

diff --git a/framework/src/domain/perioddayeventmodel.cpp b/framework/src/domain/perioddayeventmodel.cpp
index ff25e702..637e5584 100644
--- a/framework/src/domain/perioddayeventmodel.cpp
+++ b/framework/src/domain/perioddayeventmodel.cpp
@@ -79,7 +79,7 @@ void PeriodDayEventModel::partitionData()
     endResetModel();
 }
 
-int PeriodDayEventModel::bucketOf(QDate const &candidate) const
+int PeriodDayEventModel::bucketOf(const QDate &candidate) const
 {
     int bucket = mPeriodStart.daysTo(candidate);
     if (bucket >= mPeriodLength || bucket < 0) {
@@ -214,15 +214,13 @@ QVariant PeriodDayEventModel::data(const QModelIndex &id, int role) const
 
 QHash<int, QByteArray> PeriodDayEventModel::roleNames() const
 {
-    QHash<int, QByteArray> roles;
-
-    roles[Events]      = "events";
-    roles[Summary]     = "summary";
-    roles[Description] = "description";
-    roles[StartTime]   = "starts";
-    roles[Duration]    = "duration";
-
-    return roles;
+    return {
+        {Events, "events"},
+        {Summary, "summary"},
+        {Description, "description"},
+        {StartTime, "starts"},
+        {Duration, "duration"},
+    };
 }
 
 QDate PeriodDayEventModel::periodStart() const
@@ -230,18 +228,18 @@ QDate PeriodDayEventModel::periodStart() const
     return mPeriodStart;
 }
 
-void PeriodDayEventModel::setPeriodStart(QDate start)
+void PeriodDayEventModel::setPeriodStart(const QDate &start)
 {
     if (!start.isValid()) {
         SinkWarning() << "Passed an invalid starting date in setPeriodStart, ignoring...";
         return;
     }
 
-    mPeriodStart = std::move(start);
+    mPeriodStart = start;
     partitionData();
 }
 
-void PeriodDayEventModel::setPeriodStart(QVariant start)
+void PeriodDayEventModel::setPeriodStart(const QVariant &start)
 {
     setPeriodStart(start.toDate());
 }
@@ -253,6 +251,6 @@ int PeriodDayEventModel::periodLength() const
 
 void PeriodDayEventModel::setPeriodLength(int length)
 {
-    mPeriodLength = std::move(length);
+    mPeriodLength = length;
     partitionData();
 }
diff --git a/framework/src/domain/perioddayeventmodel.h b/framework/src/domain/perioddayeventmodel.h
index 5f493bbe..e116d9a2 100644
--- a/framework/src/domain/perioddayeventmodel.h
+++ b/framework/src/domain/perioddayeventmodel.h
@@ -109,15 +109,15 @@ public:
     QHash<int, QByteArray> roleNames() const override;
 
     QDate periodStart() const;
-    void setPeriodStart(QDate);
-    void setPeriodStart(QVariant);
+    void setPeriodStart(const QDate &);
+    void setPeriodStart(const QVariant &);
     int periodLength() const;
     void setPeriodLength(int);
 
 private:
     void partitionData();
 
-    int bucketOf(QDate const &candidate) const;
+    int bucketOf(const QDate &candidate) const;
 
     QDate mPeriodStart;
     int mPeriodLength = 7;