Changelog for 0.0.8

[harmattan/cameraplus] / declarative / camera.h

diff --git a/declarative/camera.h b/declarative/camera.h
index 68e4d25..76ad878 100644 (file)
--- a/declarative/camera.h
+++ b/declarative/camera.h
@@ -23,13 +23,12 @@
 #ifndef CAMERA_H
 #define CAMERA_H
 
-#include <QDeclarativeItem>
+#include <QObject>
 #include <QVariant>
 #include <QPointer>
 
 class QtCamera;
 class QtCamDevice;
-class QtCamGraphicsViewfinder;
 class Sounds;
 class NotificationsContainer;
 class Zoom;
@@ -49,8 +48,9 @@ class Roi;
 class VideoMute;
 class VideoTorch;
 class CameraConfig;
+class Quirks;
 
-class Camera : public QDeclarativeItem {
+class Camera : public QObject {
   Q_OBJECT
 
   Q_PROPERTY(int deviceCount READ deviceCount NOTIFY deviceCountChanged)
@@ -62,9 +62,6 @@ class Camera : public QDeclarativeItem {
   Q_PROPERTY(QString videoSuffix READ videoSuffix CONSTANT);
   Q_PROPERTY(Sounds *sounds READ sounds WRITE setSounds NOTIFY soundsChanged);
 
-  Q_PROPERTY(QRectF renderArea READ renderArea NOTIFY renderAreaChanged);
-  Q_PROPERTY(QSizeF videoResolution READ videoResolution NOTIFY videoResolutionChanged);
-
   Q_PROPERTY(Zoom *zoom READ zoom NOTIFY zoomChanged);
   Q_PROPERTY(Flash *flash READ flash NOTIFY flashChanged);
   Q_PROPERTY(Scene *scene READ scene NOTIFY sceneChanged);
@@ -83,7 +80,8 @@ class Camera : public QDeclarativeItem {
   Q_PROPERTY(VideoMute *videoMute READ videoMute NOTIFY videoMuteChanged);
   Q_PROPERTY(VideoTorch *videoTorch READ videoTorch NOTIFY videoTorchChanged);
 
-  Q_PROPERTY(bool renderingEnabled READ isRenderingEnabled WRITE setRenderingEnabled NOTIFY renderingEnabledChanged);
+  Q_PROPERTY(Quirks *quirks READ quirks NOTIFY quirksChanged);
+
   // TODO: We need a setter here too.
   Q_PROPERTY(CameraConfig *cameraConfig READ cameraConfig CONSTANT);
 
@@ -96,11 +94,9 @@ public:
     VideoMode
   } CameraMode;
 
-  Camera(QDeclarativeItem *parent = 0);
+  Camera(QObject *parent = 0);
   ~Camera();
 
-  virtual void componentComplete();
-
   int deviceCount() const;
   Q_INVOKABLE QString deviceName(int index) const;
   Q_INVOKABLE QVariant deviceId(int index) const;
@@ -143,17 +139,14 @@ public:
   VideoMute *videoMute() const;
   VideoTorch *videoTorch() const;
 
-  QRectF renderArea() const;
-  QSizeF videoResolution() const;
-
-  bool isRenderingEnabled() const;
-  void setRenderingEnabled(bool enabled);
+  Quirks *quirks() const;
 
   CameraConfig *cameraConfig() const;
 
 signals:
   void deviceCountChanged();
   void deviceIdChanged();
+  void prepareForDeviceChange();
   void deviceChanged();
   void modeChanged();
   void idleStateChanged();
@@ -181,9 +174,7 @@ signals:
   void videoMuteChanged();
   void videoTorchChanged();
   void renderingEnabledChanged();
-
-protected:
-  void geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry);
+  void quirksChanged();
 
 private:
   bool applyMode();
@@ -195,7 +186,6 @@ private:
   QtCamera *m_cam;
   QtCamDevice *m_dev;
   QVariant m_id;
-  QtCamGraphicsViewfinder *m_vf;
   CameraMode m_mode;
   NotificationsContainer *m_notifications;
 
@@ -217,6 +207,7 @@ private:
   VideoMute *m_videoMute;
   VideoTorch *m_videoTorch;
   CameraConfig *m_config;
+  Quirks *m_quirks;
 };
 
 #endif /* CAMERA_H */