[nemo-qml-plugin-calendar] Don't cache role names

sailfishos · Feb 3, 2014 · 6d2fa4d · 6d2fa4d
1 parent 9bf6b75
commit 6d2fa4d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/src/calendaragendamodel.cpp b/src/calendaragendamodel.cpp
@@ -44,10 +44,6 @@
 NemoCalendarAgendaModel::NemoCalendarAgendaModel(QObject *parent)
 : QAbstractListModel(parent), mIsComplete(true)
 {
-    mRoleNames[EventObjectRole] = "event";
-    mRoleNames[OccurrenceObjectRole] = "occurrence";
-    mRoleNames[SectionBucketRole] = "sectionBucket";
-
     connect(NemoCalendarEventCache::instance(), SIGNAL(modelReset()), this, SLOT(refresh()));
 }
 
@@ -59,7 +55,11 @@ NemoCalendarAgendaModel::~NemoCalendarAgendaModel()
 
 QHash<int, QByteArray> NemoCalendarAgendaModel::roleNames() const
 {
-    return mRoleNames;
+    QHash<int,QByteArray> roleNames;
+    roleNames[EventObjectRole] = "event";
+    roleNames[OccurrenceObjectRole] = "occurrence";
+    roleNames[SectionBucketRole] = "sectionBucket";
+    return roleNames;
 }
 
 QDate NemoCalendarAgendaModel::startDate() const

diff --git a/src/calendaragendamodel.h b/src/calendaragendamodel.h
@@ -90,7 +90,6 @@ private slots:
     QDate mStartDate;
     QDate mEndDate;
     QList<NemoCalendarEventOccurrence *> mEvents;
-    QHash<int,QByteArray> mRoleNames;
 
     bool mIsComplete:1;
 };

diff --git a/src/calendarnotebookmodel.cpp b/src/calendarnotebookmodel.cpp
@@ -37,13 +37,6 @@
 
 NemoCalendarNotebookModel::NemoCalendarNotebookModel()
 {
-    mRoleNames[NameRole] = "name";
-    mRoleNames[UidRole] = "uid";
-    mRoleNames[DescriptionRole] = "description";
-    mRoleNames[ColorRole] = "color";
-    mRoleNames[DefaultRole] = "isDefault";
-    mRoleNames[ReadOnlyRole] = "readOnly";
-    mRoleNames[LocalCalendarRole] = "localCalendar";
 }
 
 int NemoCalendarNotebookModel::rowCount(const QModelIndex &index) const
@@ -103,5 +96,14 @@ bool NemoCalendarNotebookModel::setData(const QModelIndex &index, const QVariant
 
 QHash<int, QByteArray> NemoCalendarNotebookModel::roleNames() const
 {
-    return mRoleNames;
+    QHash<int, QByteArray> roleNames;
+    roleNames[NameRole] = "name";
+    roleNames[UidRole] = "uid";
+    roleNames[DescriptionRole] = "description";
+    roleNames[ColorRole] = "color";
+    roleNames[DefaultRole] = "isDefault";
+    roleNames[ReadOnlyRole] = "readOnly";
+    roleNames[LocalCalendarRole] = "localCalendar";
+
+    return roleNames;
 }
diff --git a/src/calendarnotebookmodel.h b/src/calendarnotebookmodel.h
@@ -57,9 +57,6 @@ class NemoCalendarNotebookModel : public QAbstractListModel
 
 protected:
     virtual QHash<int, QByteArray> roleNames() const;
-
-private:
-    QHash<int, QByteArray> mRoleNames;
 };
 
 #endif // CALENDARNOTEBOOKMODEL_H