Introduce a base class for capabilities.

Introduce the Capability base class for all capabilities.
It has only one property for now (isSupported).

Conflicts:
	declarative/declarative.pro
	declarative/plugin.cpp

diff --git a/declarative/aperture.cpp b/declarative/aperture.cpp
index 9eacc16..ab4ffd6 100644 (file)
--- a/declarative/aperture.cpp
+++ b/declarative/aperture.cpp
@@ -22,9 +22,11 @@
 #include "qtcamaperture.h"
 
 Aperture::Aperture(QtCamDevice *dev, QObject *parent) :
-  QObject(parent),
+  Capability(parent),
   m_aperture(new QtCamAperture(dev, this)) {
 
+  setCapability(m_aperture);
+
   QObject::connect(m_aperture, SIGNAL(valueChanged()), this, SIGNAL(valueChanged()));
   QObject::connect(m_aperture, SIGNAL(minimumValueChanged()), this, SIGNAL(minimumChanged()));
   QObject::connect(m_aperture, SIGNAL(maximumValueChanged()), this, SIGNAL(maximunmChanged()));

diff --git a/declarative/aperture.h b/declarative/aperture.h
index 7ce88ce..a59a344 100644 (file)
--- a/declarative/aperture.h
+++ b/declarative/aperture.h
@@ -23,12 +23,12 @@
 #ifndef APERTURE_H
 #define APERTURE_H
 
-#include <QObject>
+#include "capability.h"
 
 class QtCamAperture;
 class QtCamDevice;
 
-class Aperture : public QObject {
+class Aperture : public Capability {
   Q_OBJECT
 
   Q_PROPERTY(unsigned int value READ value WRITE setValue NOTIFY valueChanged);

diff --git a/declarative/colortone.cpp b/declarative/colortone.cpp
index 48301f3..54eda2e 100644 (file)
--- a/declarative/colortone.cpp
+++ b/declarative/colortone.cpp
@@ -21,9 +21,11 @@
 #include "colortone.h"
 
 ColorTone::ColorTone(QtCamDevice *dev, QObject *parent) :
-  QObject(parent),
+  Capability(parent),
   m_color(new QtCamColorTone(dev, this)) {
 
+  setCapability(m_color);
+
   QObject::connect(m_color, SIGNAL(valueChanged()), this, SIGNAL(valueChanged()));
 }
 

diff --git a/declarative/colortone.h b/declarative/colortone.h
index 0789acd..e35f8c6 100644 (file)
--- a/declarative/colortone.h
+++ b/declarative/colortone.h
@@ -23,12 +23,12 @@
 #ifndef COLOR_TONE_H
 #define COLOR_TONE_H
 
-#include <QObject>
+#include "capability.h"
 #include "qtcamcolortone.h"
 
 class QtCamDevice;
 
-class ColorTone : public QObject {
+class ColorTone : public Capability {
   Q_OBJECT
 
   Q_PROPERTY(ColorToneMode value READ value WRITE setValue NOTIFY valueChanged);

diff --git a/declarative/declarative.pro b/declarative/declarative.pro
index e1fe398..18dcfe6 100644 (file)
--- a/declarative/declarative.pro
+++ b/declarative/declarative.pro
@@ -21,7 +21,7 @@ HEADERS += plugin.h previewprovider.h camera.h mode.h imagemode.h videomode.h \
            flickerreduction.h videomute.h metadata.h imagesettings.h \
            imageresolutionmodel.h videosettings.h videoresolutionmodel.h \
            notificationscontainer.h sounds.h focus.h autofocus.h \
-           roi.h cameraconfig.h videoplayer.h viewfinder.h
+           roi.h cameraconfig.h videoplayer.h viewfinder.h capability.h
 
 SOURCES += plugin.cpp previewprovider.cpp camera.cpp mode.cpp imagemode.cpp videomode.cpp \
            zoom.cpp flash.cpp scene.cpp evcomp.cpp videotorch.cpp whitebalance.cpp \
@@ -29,7 +29,7 @@ SOURCES += plugin.cpp previewprovider.cpp camera.cpp mode.cpp imagemode.cpp vide
            flickerreduction.cpp videomute.cpp metadata.cpp imagesettings.cpp \
            imageresolutionmodel.cpp videosettings.cpp videoresolutionmodel.cpp \
            notificationscontainer.cpp sounds.cpp focus.cpp autofocus.cpp \
-           roi.cpp cameraconfig.cpp videoplayer.cpp viewfinder.cpp
+           roi.cpp cameraconfig.cpp videoplayer.cpp viewfinder.cpp capability.cpp
 
 PLUGIN_IMPORT_PATH = QtCamera
 target.path = $$[QT_INSTALL_IMPORTS]/$$PLUGIN_IMPORT_PATH

diff --git a/declarative/evcomp.cpp b/declarative/evcomp.cpp
index 6b722d4..dfed9cf 100644 (file)
--- a/declarative/evcomp.cpp
+++ b/declarative/evcomp.cpp
@@ -22,9 +22,11 @@
 #include "qtcamevcomp.h"
 
 EvComp::EvComp(QtCamDevice *dev, QObject *parent) :
-  QObject(parent),
+  Capability(parent),
   m_evComp(new QtCamEvComp(dev, this)) {
 
+  setCapability(m_evComp);
+
   QObject::connect(m_evComp, SIGNAL(valueChanged()), this, SIGNAL(valueChanged()));
   QObject::connect(m_evComp, SIGNAL(minimumValueChanged()), this, SIGNAL(minimumChanged()));
   QObject::connect(m_evComp, SIGNAL(maximumValueChanged()), this, SIGNAL(maximunmChanged()));

diff --git a/declarative/evcomp.h b/declarative/evcomp.h
index a0ab9eb..cc546c4 100644 (file)
--- a/declarative/evcomp.h
+++ b/declarative/evcomp.h
@@ -23,12 +23,12 @@
 #ifndef EV_COMP_H
 #define EV_COMP_H
 
-#include <QObject>
+#include "capability.h"
 
 class QtCamEvComp;
 class QtCamDevice;
 
-class EvComp : public QObject {
+class EvComp : public Capability {
   Q_OBJECT
 
   Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged);

diff --git a/declarative/exposure.cpp b/declarative/exposure.cpp
index 7196840..df820e4 100644 (file)
--- a/declarative/exposure.cpp
+++ b/declarative/exposure.cpp
@@ -23,9 +23,11 @@
 #include "qtcamexposure.h"
 
 Exposure::Exposure(QtCamDevice *dev, QObject *parent) :
-  QObject(parent),
+  Capability(parent),
   m_exposure(new QtCamExposure(dev, this)) {
 
+  setCapability(m_exposure);
+
   QObject::connect(m_exposure, SIGNAL(valueChanged()), this, SIGNAL(valueChanged()));
   QObject::connect(m_exposure, SIGNAL(minimumValueChanged()), this, SIGNAL(minimumChanged()));
   QObject::connect(m_exposure, SIGNAL(maximumValueChanged()), this, SIGNAL(maximunmChanged()));

diff --git a/declarative/exposure.h b/declarative/exposure.h
index 1d4c2be..421b993 100644 (file)
--- a/declarative/exposure.h
+++ b/declarative/exposure.h
@@ -23,12 +23,12 @@
 #ifndef EXPOSURE_H
 #define EXPOSURE_H
 
-#include <QObject>
+#include "capability.h"
 
 class QtCamExposure;
 class QtCamDevice;
 
-class Exposure : public QObject {
+class Exposure : public Capability {
   Q_OBJECT
 
   Q_PROPERTY(unsigned int value READ value WRITE setValue NOTIFY valueChanged);

diff --git a/declarative/flash.cpp b/declarative/flash.cpp
index 9af7fbd..2ce93c4 100644 (file)
--- a/declarative/flash.cpp
+++ b/declarative/flash.cpp
@@ -21,9 +21,11 @@
 #include "flash.h"
 
 Flash::Flash(QtCamDevice *dev, QObject *parent) :
-  QObject(parent),
+  Capability(parent),
   m_flash(new QtCamFlash(dev, this)) {
 
+  setCapability(m_flash);
+
   QObject::connect(m_flash, SIGNAL(valueChanged()), this, SIGNAL(valueChanged()));
   QObject::connect(m_flash, SIGNAL(flashReadyChanged()), this, SIGNAL(readyChanged()));
 }

diff --git a/declarative/flash.h b/declarative/flash.h
index 343ed3d..bece520 100644 (file)
--- a/declarative/flash.h
+++ b/declarative/flash.h
@@ -23,12 +23,12 @@
 #ifndef FLASH_H
 #define FLASH_H
 
-#include <QObject>
+#include "capability.h"
 #include "qtcamflash.h"
 
 class QtCamDevice;
 
-class Flash : public QObject {
+class Flash : public Capability {
   Q_OBJECT
 
   Q_PROPERTY(FlashMode value READ value WRITE setValue NOTIFY valueChanged);

diff --git a/declarative/flickerreduction.cpp b/declarative/flickerreduction.cpp
index 7deeee9..7d49d67 100644 (file)
--- a/declarative/flickerreduction.cpp
+++ b/declarative/flickerreduction.cpp
@@ -21,9 +21,11 @@
 #include "flickerreduction.h"
 
 FlickerReduction::FlickerReduction(QtCamDevice *dev, QObject *parent) :
-  QObject(parent),
+  Capability(parent),
   m_fr(new QtCamFlickerReduction(dev, this)) {
 
+  setCapability(m_fr);
+
   QObject::connect(m_fr, SIGNAL(valueChanged()), this, SIGNAL(valueChanged()));
 }
 

diff --git a/declarative/flickerreduction.h b/declarative/flickerreduction.h
index 6cfe5ef..d82ccf9 100644 (file)
--- a/declarative/flickerreduction.h
+++ b/declarative/flickerreduction.h
@@ -23,12 +23,12 @@
 #ifndef FLICKER_REDUCTION_H
 #define FLICKER_REDUCTION_H
 
-#include <QObject>
+#include "capability.h"
 #include "qtcamflickerreduction.h"
 
 class QtCamDevice;
 
-class FlickerReduction : public QObject {
+class FlickerReduction : public Capability {
   Q_OBJECT
 
   Q_PROPERTY(FlickerReductionMode value READ value WRITE setValue NOTIFY valueChanged);

diff --git a/declarative/focus.cpp b/declarative/focus.cpp
index 7a93fd4..31c88f3 100644 (file)
--- a/declarative/focus.cpp
+++ b/declarative/focus.cpp
@@ -21,9 +21,11 @@
 #include "focus.h"
 
 Focus::Focus(QtCamDevice *dev, QObject *parent) :
-  QObject(parent),
+  Capability(parent),
   m_f(new QtCamFocus(dev, this)) {
 
+  setCapability(m_f);
+
   QObject::connect(m_f, SIGNAL(valueChanged()), this, SIGNAL(valueChanged()));
 }
 

diff --git a/declarative/focus.h b/declarative/focus.h
index ba21f5c..b5dbe49 100644 (file)
--- a/declarative/focus.h
+++ b/declarative/focus.h
@@ -23,12 +23,12 @@
 #ifndef FOCUS_H
 #define FOCUS_H
 
-#include <QObject>
+#include "capability.h"
 #include "qtcamfocus.h"
 
 class QtCamDevice;
 
-class Focus : public QObject {
+class Focus : public Capability {
   Q_OBJECT
 
   Q_PROPERTY(FocusMode value READ value WRITE setValue NOTIFY valueChanged);

diff --git a/declarative/iso.cpp b/declarative/iso.cpp
index c5d6088..af39af6 100644 (file)
--- a/declarative/iso.cpp
+++ b/declarative/iso.cpp
@@ -22,9 +22,11 @@
 #include "qtcamiso.h"
 
 Iso::Iso(QtCamDevice *dev, QObject *parent) :
-  QObject(parent),
+  Capability(parent),
   m_iso(new QtCamIso(dev, this)) {
 
+  setCapability(m_iso);
+
   QObject::connect(m_iso, SIGNAL(valueChanged()), this, SIGNAL(valueChanged()));
   QObject::connect(m_iso, SIGNAL(minimumValueChanged()), this, SIGNAL(minimumChanged()));
   QObject::connect(m_iso, SIGNAL(maximumValueChanged()), this, SIGNAL(maximunmChanged()));

diff --git a/declarative/iso.h b/declarative/iso.h
index 7e6669c..9055ae6 100644 (file)
--- a/declarative/iso.h
+++ b/declarative/iso.h
@@ -23,12 +23,12 @@
 #ifndef ISO_H
 #define ISO_H
 
-#include <QObject>
+#include "capability.h"
 
 class QtCamIso;
 class QtCamDevice;
 
-class Iso : public QObject {
+class Iso : public Capability {
   Q_OBJECT
 
   Q_PROPERTY(unsigned int value READ value WRITE setValue NOTIFY valueChanged);

diff --git a/declarative/noisereduction.cpp b/declarative/noisereduction.cpp
index a16de30..b7affe6 100644 (file)
--- a/declarative/noisereduction.cpp
+++ b/declarative/noisereduction.cpp
@@ -21,9 +21,11 @@
 #include "noisereduction.h"
 
 NoiseReduction::NoiseReduction(QtCamDevice *dev, QObject *parent) :
-  QObject(parent),
+  Capability(parent),
   m_nr(new QtCamNoiseReduction(dev, this)) {
 
+  setCapability(m_nr);
+
   QObject::connect(m_nr, SIGNAL(valueChanged()), this, SIGNAL(valueChanged()));
 }
 

diff --git a/declarative/noisereduction.h b/declarative/noisereduction.h
index 55263d0..964faca 100644 (file)
--- a/declarative/noisereduction.h
+++ b/declarative/noisereduction.h
@@ -23,12 +23,12 @@
 #ifndef NOISE_REDUCTION_H
 #define NOISE_REDUCTION_H
 
-#include <QObject>
+#include "capability.h"
 #include "qtcamnoisereduction.h"
 
 class QtCamDevice;
 
-class NoiseReduction : public QObject {
+class NoiseReduction : public Capability {
   Q_OBJECT
 
   Q_PROPERTY(NoiseReductionMode value READ value WRITE setValue NOTIFY valueChanged);

diff --git a/declarative/plugin.cpp b/declarative/plugin.cpp
index a295da0..dbc34ff 100644 (file)
--- a/declarative/plugin.cpp
+++ b/declarative/plugin.cpp
@@ -48,6 +48,7 @@
 #include "cameraconfig.h"
 #include "videoplayer.h"
 #include "viewfinder.h"
+#include "capability.h"
 #if defined(QT4)
 #include <QDeclarativeEngine>
 #elif defined(QT5)
@@ -120,6 +121,7 @@ void Plugin::registerTypes(const char *uri) {
 
   qmlRegisterType<VideoPlayer>("QtCameraExtras", MAJOR, MINOR, "VideoPlayer");
   qmlRegisterType<Viewfinder>(uri, MAJOR, MINOR, "Viewfinder");
+  qmlRegisterType<Capability>();
 }
 
 #if defined(QT4)

diff --git a/declarative/scene.cpp b/declarative/scene.cpp
index 3eca58f..b08fd61 100644 (file)
--- a/declarative/scene.cpp
+++ b/declarative/scene.cpp
@@ -21,9 +21,11 @@
 #include "scene.h"
 
 Scene::Scene(QtCamDevice *dev, QObject *parent) :
-  QObject(parent),
+  Capability(parent),
   m_scene(new QtCamScene(dev, this)) {
 
+  setCapability(m_scene);
+
   QObject::connect(m_scene, SIGNAL(valueChanged()), this, SIGNAL(valueChanged()));
 }
 

diff --git a/declarative/scene.h b/declarative/scene.h
index 6327af4..d7d6c31 100644 (file)
--- a/declarative/scene.h
+++ b/declarative/scene.h
@@ -23,12 +23,12 @@
 #ifndef SCENE_H
 #define SCENE_H
 
-#include <QObject>
+#include "capability.h"
 #include "qtcamscene.h"
 
 class QtCamDevice;
 
-class Scene : public QObject {
+class Scene : public Capability {
   Q_OBJECT
 
   Q_PROPERTY(SceneMode value READ value WRITE setValue NOTIFY valueChanged);

diff --git a/declarative/whitebalance.cpp b/declarative/whitebalance.cpp
index bc6ed5a..3957274 100644 (file)
--- a/declarative/whitebalance.cpp
+++ b/declarative/whitebalance.cpp
@@ -21,9 +21,11 @@
 #include "whitebalance.h"
 
 WhiteBalance::WhiteBalance(QtCamDevice *dev, QObject *parent) :
-  QObject(parent),
+  Capability(parent),
   m_wb(new QtCamWhiteBalance(dev, this)) {
 
+  setCapability(m_wb);
+
   QObject::connect(m_wb, SIGNAL(valueChanged()), this, SIGNAL(valueChanged()));
 }
 

diff --git a/declarative/whitebalance.h b/declarative/whitebalance.h
index 3ca7d01..adab5c6 100644 (file)
--- a/declarative/whitebalance.h
+++ b/declarative/whitebalance.h
@@ -23,12 +23,12 @@
 #ifndef WHITE_BALANCE_H
 #define WHITE_BALANCE_H
 
-#include <QObject>
+#include "capability.h"
 #include "qtcamwhitebalance.h"
 
 class QtCamDevice;
 
-class WhiteBalance : public QObject {
+class WhiteBalance : public Capability {
   Q_OBJECT
 
   Q_PROPERTY(WhiteBalanceMode value READ value WRITE setValue NOTIFY valueChanged);

diff --git a/declarative/zoom.cpp b/declarative/zoom.cpp
index 879bbfa..2d05ba6 100644 (file)
--- a/declarative/zoom.cpp
+++ b/declarative/zoom.cpp
@@ -22,9 +22,11 @@
 #include "qtcamzoom.h"
 
 Zoom::Zoom(QtCamDevice *dev, QObject *parent) :
-  QObject(parent),
+  Capability(parent),
   m_zoom(new QtCamZoom(dev, this)) {
 
+  setCapability(m_zoom);
+
   QObject::connect(m_zoom, SIGNAL(valueChanged()), this, SIGNAL(valueChanged()));
   QObject::connect(m_zoom, SIGNAL(minimumValueChanged()), this, SIGNAL(minimumChanged()));
   QObject::connect(m_zoom, SIGNAL(maximumValueChanged()), this, SIGNAL(maximunmChanged()));

diff --git a/declarative/zoom.h b/declarative/zoom.h
index 0042a59..2f847e0 100644 (file)
--- a/declarative/zoom.h
+++ b/declarative/zoom.h
@@ -23,12 +23,12 @@
 #ifndef ZOOM_H
 #define ZOOM_H
 
-#include <QObject>
+#include "capability.h"
 
 class QtCamZoom;
 class QtCamDevice;
 
-class Zoom : public QObject {
+class Zoom : public Capability {
   Q_OBJECT
 
   Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged);