VideoTorch and VideoMute are now properties of Camera

[harmattan/cameraplus] / imports / videotorch.h

diff --git a/imports/videotorch.h b/imports/videotorch.h
index c833aca..5c5397a 100644 (file)
--- a/imports/videotorch.h
+++ b/imports/videotorch.h
@@ -25,33 +25,24 @@
 
 #include <QObject>
 
-class Camera;
 class QtCamVideoTorch;
+class QtCamDevice;
 
 class VideoTorch : public QObject {
   Q_OBJECT
-  Q_PROPERTY(Camera* camera READ camera WRITE setCamera NOTIFY cameraChanged);
   Q_PROPERTY(bool on READ isOn WRITE setOn NOTIFY stateChanged);
 
 public:
-  VideoTorch(QObject *parent = 0);
+  VideoTorch(QtCamDevice *dev, QObject *parent = 0);
   ~VideoTorch();
 
-  Camera *camera();
-  void setCamera(Camera *camera);
-
   bool isOn() const;
   void setOn(bool on);
 
 signals:
   void stateChanged();
-  void cameraChanged();
-
-private slots:
-  void deviceChanged();
 
 private:
-  Camera *m_cam;
   QtCamVideoTorch *m_torch;
 };