From be02fbf6f2f1a4cfe2e1d4a1f654325007d0bb27 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 17 Apr 2018 13:50:24 +0200 Subject: Some nitpicks: pass by const& for setters + use initializer list for QHash --- framework/src/domain/perioddayeventmodel.cpp | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'framework/src/domain/perioddayeventmodel.cpp') 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 PeriodDayEventModel::roleNames() const { - QHash 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(); } -- cgit v1.2.3