Don't reuse file names

[harmattan/cameraplus] / src / postcapturemodel.cpp

diff --git a/src/postcapturemodel.cpp b/src/postcapturemodel.cpp
index 54e7c31..fc639c9 100644 (file)
--- a/src/postcapturemodel.cpp
+++ b/src/postcapturemodel.cpp
@@ -79,6 +79,11 @@ PostCaptureModel::PostCaptureModel(QObject *parent) :
 
   qDBusRegisterMetaType<Quad>();
   qDBusRegisterMetaType<QList<Quad> >();
+
+  QHash<int, QByteArray> roles;
+  roles.insert(Item, "item");
+
+  setRoleNames(roles);
 }
 
 PostCaptureModel::~PostCaptureModel() {
@@ -88,12 +93,6 @@ PostCaptureModel::~PostCaptureModel() {
   delete m_connection; m_connection = 0;
 }
 
-QHash<int, QByteArray> PostCaptureModel::roleNames() const {
-  QHash<int, QByteArray> roles;
-  roles.insert(Item, "item");
-  return roles;
-}
-
 void PostCaptureModel::reload() {
   delete m_connection; m_connection = 0;
 
@@ -281,6 +280,16 @@ void PostCaptureModel::graphUpdated(const QString& className, const QList<Quad>&
   }
 }
 
+#if defined(QT5)
+QHash<int, QByteArray> PostCaptureModel::roleNames() const {
+  return m_roles;
+}
+
+void PostCaptureModel::setRoleNames(const QHash<int, QByteArray>& roles) {
+  m_roles = roles;
+}
+#endif
+
 PostCaptureModelItem::PostCaptureModelItem(const QSparqlResultRow& row, QObject *parent) :
   QObject(parent) {