diff options
Diffstat (limited to 'framework/src')
-rw-r--r-- | framework/src/domain/perioddayeventmodel.cpp | 26 | ||||
-rw-r--r-- | framework/src/domain/perioddayeventmodel.h | 6 |
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() | |||
79 | endResetModel(); | 79 | endResetModel(); |
80 | } | 80 | } |
81 | 81 | ||
82 | int PeriodDayEventModel::bucketOf(QDate const &candidate) const | 82 | int PeriodDayEventModel::bucketOf(const QDate &candidate) const |
83 | { | 83 | { |
84 | int bucket = mPeriodStart.daysTo(candidate); | 84 | int bucket = mPeriodStart.daysTo(candidate); |
85 | if (bucket >= mPeriodLength || bucket < 0) { | 85 | if (bucket >= mPeriodLength || bucket < 0) { |
@@ -214,15 +214,13 @@ QVariant PeriodDayEventModel::data(const QModelIndex &id, int role) const | |||
214 | 214 | ||
215 | QHash<int, QByteArray> PeriodDayEventModel::roleNames() const | 215 | QHash<int, QByteArray> PeriodDayEventModel::roleNames() const |
216 | { | 216 | { |
217 | QHash<int, QByteArray> roles; | 217 | return { |
218 | 218 | {Events, "events"}, | |
219 | roles[Events] = "events"; | 219 | {Summary, "summary"}, |
220 | roles[Summary] = "summary"; | 220 | {Description, "description"}, |
221 | roles[Description] = "description"; | 221 | {StartTime, "starts"}, |
222 | roles[StartTime] = "starts"; | 222 | {Duration, "duration"}, |
223 | roles[Duration] = "duration"; | 223 | }; |
224 | |||
225 | return roles; | ||
226 | } | 224 | } |
227 | 225 | ||
228 | QDate PeriodDayEventModel::periodStart() const | 226 | QDate PeriodDayEventModel::periodStart() const |
@@ -230,18 +228,18 @@ QDate PeriodDayEventModel::periodStart() const | |||
230 | return mPeriodStart; | 228 | return mPeriodStart; |
231 | } | 229 | } |
232 | 230 | ||
233 | void PeriodDayEventModel::setPeriodStart(QDate start) | 231 | void PeriodDayEventModel::setPeriodStart(const QDate &start) |
234 | { | 232 | { |
235 | if (!start.isValid()) { | 233 | if (!start.isValid()) { |
236 | SinkWarning() << "Passed an invalid starting date in setPeriodStart, ignoring..."; | 234 | SinkWarning() << "Passed an invalid starting date in setPeriodStart, ignoring..."; |
237 | return; | 235 | return; |
238 | } | 236 | } |
239 | 237 | ||
240 | mPeriodStart = std::move(start); | 238 | mPeriodStart = start; |
241 | partitionData(); | 239 | partitionData(); |
242 | } | 240 | } |
243 | 241 | ||
244 | void PeriodDayEventModel::setPeriodStart(QVariant start) | 242 | void PeriodDayEventModel::setPeriodStart(const QVariant &start) |
245 | { | 243 | { |
246 | setPeriodStart(start.toDate()); | 244 | setPeriodStart(start.toDate()); |
247 | } | 245 | } |
@@ -253,6 +251,6 @@ int PeriodDayEventModel::periodLength() const | |||
253 | 251 | ||
254 | void PeriodDayEventModel::setPeriodLength(int length) | 252 | void PeriodDayEventModel::setPeriodLength(int length) |
255 | { | 253 | { |
256 | mPeriodLength = std::move(length); | 254 | mPeriodLength = length; |
257 | partitionData(); | 255 | partitionData(); |
258 | } | 256 | } |
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: | |||
109 | QHash<int, QByteArray> roleNames() const override; | 109 | QHash<int, QByteArray> roleNames() const override; |
110 | 110 | ||
111 | QDate periodStart() const; | 111 | QDate periodStart() const; |
112 | void setPeriodStart(QDate); | 112 | void setPeriodStart(const QDate &); |
113 | void setPeriodStart(QVariant); | 113 | void setPeriodStart(const QVariant &); |
114 | int periodLength() const; | 114 | int periodLength() const; |
115 | void setPeriodLength(int); | 115 | void setPeriodLength(int); |
116 | 116 | ||
117 | private: | 117 | private: |
118 | void partitionData(); | 118 | void partitionData(); |
119 | 119 | ||
120 | int bucketOf(QDate const &candidate) const; | 120 | int bucketOf(const QDate &candidate) const; |
121 | 121 | ||
122 | QDate mPeriodStart; | 122 | QDate mPeriodStart; |
123 | int mPeriodLength = 7; | 123 | int mPeriodLength = 7; |