projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworked QML capabilities.
[harmattan/cameraplus]
/
imports
/
flash.h
diff --git
a/imports/flash.h
b/imports/flash.h
index
ff79eca
..
916a936
100644
(file)
--- a/
imports/flash.h
+++ b/
imports/flash.h
@@
-23,10
+23,12
@@
#ifndef FLASH_H
#define FLASH_H
#ifndef FLASH_H
#define FLASH_H
-#include
"capability.h"
+#include
<QObject>
#include "qtcamflash.h"
#include "qtcamflash.h"
-class Flash : public Capability {
+class QtCamDevice;
+
+class Flash : public QObject {
Q_OBJECT
Q_PROPERTY(FlashMode value READ value WRITE setValue NOTIFY valueChanged);
Q_OBJECT
Q_PROPERTY(FlashMode value READ value WRITE setValue NOTIFY valueChanged);
@@
-41,7
+43,7
@@
public:
RedEye = QtCamFlash::RedEye
} FlashMode;
RedEye = QtCamFlash::RedEye
} FlashMode;
- Flash(QObject *parent = 0);
+ Flash(Q
tCamDevice *dev, Q
Object *parent = 0);
~Flash();
FlashMode value();
~Flash();
FlashMode value();
@@
-51,8
+53,6
@@
signals:
void valueChanged();
private:
void valueChanged();
private:
- virtual void deviceChanged();
-
QtCamFlash *m_flash;
};
QtCamFlash *m_flash;
};