Fix setting role names for Qt4 (Inspired by QtGrilo fixes).

[harmattan/cameraplus] / declarative / imageresolutionmodel.cpp

diff --git a/declarative/imageresolutionmodel.cpp b/declarative/imageresolutionmodel.cpp
index 16778f4..2d9ad14 100644 (file)
--- a/declarative/imageresolutionmodel.cpp
+++ b/declarative/imageresolutionmodel.cpp
@@ -25,14 +25,17 @@
 ImageResolutionModel::ImageResolutionModel(QtCamImageSettings *settings, QObject *parent) :
   QAbstractListModel(parent), m_settings(settings) {
 
-  m_roles[IdRole] = "resolutionId";
-  m_roles[NameRole] = "resolutionName";
-  m_roles[CaptureRole] = "captureResolution";
-  m_roles[PreviewRole] = "previewResolution";
-  m_roles[FpsRole] = "frameRate";
-  m_roles[NightFpsRole] = "nightFrameRate";
-  m_roles[MegaPixelsRole] = "megaPixels";
-  m_roles[AspectRatioRole] = "resolutionAspectRatio";
+  QHash<int, QByteArray> roles;
+  roles[IdRole] = "resolutionId";
+  roles[NameRole] = "resolutionName";
+  roles[CaptureRole] = "captureResolution";
+  roles[PreviewRole] = "previewResolution";
+  roles[FpsRole] = "frameRate";
+  roles[NightFpsRole] = "nightFrameRate";
+  roles[MegaPixelsRole] = "megaPixels";
+  roles[AspectRatioRole] = "resolutionAspectRatio";
+
+  setRoleNames(roles);
 
   m_resolutions = m_settings->resolutions(m_aspectRatio);
 }
@@ -105,6 +108,12 @@ void ImageResolutionModel::setAspectRatio(const QString& aspectRatio) {
   }
 }
 
+#if defined(QT5)
 QHash<int, QByteArray> ImageResolutionModel::roleNames() const {
   return m_roles;
 }
+
+void ImageResolutionModel::setRoleNames(const QHash<int, QByteArray>& roles) {
+  m_roles = roles;
+}
+#endif