Renamed QtCamWb to QtCamWhiteBalance

diff --git a/lib/lib.pro b/lib/lib.pro
index b63e0a8..0529d5b 100644 (file)
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -16,7 +16,7 @@ HEADERS += qtcamconfig.h qtcamera.h qtcamscanner.h qtcamdevice.h qtcamviewfinder
            qtcamviewfinderrenderergeneric.h qtcamimagesettings.h qtcamvideosettings.h \
            qtcamimagemode.h qtcamvideomode.h qtcammetadata.h qtcamcapability.h \
            qtcamzoom.h qtcamflash.h qtcamscene.h qtcamevcomp.h qtcamvideotorch.h \
-           qtcamwb.h
+           qtcamwhitebalance.h
 
 SOURCES += qtcamconfig.cpp qtcamera.cpp qtcamscanner.cpp qtcamdevice.cpp qtcamviewfinder.cpp \
            qtcammode.cpp qtcamgstreamermessagehandler.cpp qtcamgstreamermessagelistener.cpp \
@@ -24,7 +24,7 @@ SOURCES += qtcamconfig.cpp qtcamera.cpp qtcamscanner.cpp qtcamdevice.cpp qtcamvi
            qtcamviewfinderrenderergeneric.cpp qtcamimagesettings.cpp qtcamvideosettings.cpp \
            qtcamimagemode.cpp qtcamvideomode.cpp qtcammetadata.cpp qtcamcapability.cpp \
            qtcamzoom.cpp qtcamflash.cpp qtcamscene.cpp qtcamevcomp.cpp qtcamvideotorch.cpp \
-           qtcamwb.cpp
+           qtcamwhitebalance.cpp
 
 HEADERS += qtcammode_p.h qtcamdevice_p.h qtcamcapability_p.h
 

diff --git a/lib/qtcamcapability.h b/lib/qtcamcapability.h
index cc321da..03907b4 100644 (file)
--- a/lib/qtcamcapability.h
+++ b/lib/qtcamcapability.h
@@ -16,7 +16,7 @@ public:
   typedef enum {
     EvComp = (1 << 0),
     IsoSpeed = (1 << 1),
-    Wb = (1 << 2),
+    WhiteBalance = (1 << 2),
     ColourTone = (1 << 3),
     Scene = (1 << 4),
     Flash = (1 << 5),

diff --git a/lib/qtcamwb.cpp b/lib/qtcamwb.cpp
deleted file mode 100644 (file)
index a20db42..0000000
--- a/lib/qtcamwb.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "qtcamwb.h"
-#include "qtcamcapability_p.h"
-
-QtCamWb::QtCamWb(QtCamDevice *dev, QObject *parent) :
-  QtCamCapability(new QtCamCapabilityPrivate(dev, QtCamCapability::Wb, "white-balance-mode"),
-                 parent) {
-
-}
-
-QtCamWb::~QtCamWb() {
-
-}
-
-QtCamWb::WbMode QtCamWb::value() {
-  int val = 0;
-  if (!d_ptr->intValue(&val)) {
-    return QtCamWb::Auto;
-  }
-
-  switch (val) {
-  case QtCamWb::Daylight:
-  case QtCamWb::Cloudy:
-  case QtCamWb::Sunset:
-  case QtCamWb::Tungsten:
-  case QtCamWb::Flourescent:
-    return (QtCamWb::WbMode)val;
-
-  default:
-    return QtCamWb::Auto;
-  }
-}
-
-bool QtCamWb::setValue(const QtCamWb::WbMode& mode) {
-  return d_ptr->setIntValue(mode);
-}

diff --git a/lib/qtcamwb.h b/lib/qtcamwb.h
deleted file mode 100644 (file)
index 0ae2cfd..0000000
--- a/lib/qtcamwb.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- c++ -*-
-
-#ifndef QT_CAM_WB_H
-#define QT_CAM_WB_H
-
-#include "qtcamcapability.h"
-
-class QtCamWb : public QtCamCapability {
-  Q_OBJECT
-
-public:
-  typedef enum {
-    Auto = 0,
-    Daylight = 1,
-    Cloudy = 2,
-    Sunset = 3,
-    Tungsten = 4,
-    Flourescent = 5
-  } WbMode;
-
-  QtCamWb(QtCamDevice *dev, QObject *parent = 0);
-  ~QtCamWb();
-
-  WbMode value();
-  bool setValue(const WbMode& mode);
-};
-
-#endif /* QT_CAM_WB_H */

diff --git a/lib/qtcamwhitebalance.cpp b/lib/qtcamwhitebalance.cpp
new file mode 100644 (file)
index 0000000..665d91c
--- /dev/null
+++ b/lib/qtcamwhitebalance.cpp
@@ -0,0 +1,36 @@
+#include "qtcamwhitebalance.h"
+#include "qtcamcapability_p.h"
+
+QtCamWhiteBalance::QtCamWhiteBalance(QtCamDevice *dev, QObject *parent) :
+  QtCamCapability(new QtCamCapabilityPrivate(dev, QtCamCapability::WhiteBalance,
+                                            "white-balance-mode"),
+                 parent) {
+
+}
+
+QtCamWhiteBalance::~QtCamWhiteBalance() {
+
+}
+
+QtCamWhiteBalance::WhiteBalanceMode QtCamWhiteBalance::value() {
+  int val = 0;
+  if (!d_ptr->intValue(&val)) {
+    return QtCamWhiteBalance::Auto;
+  }
+
+  switch (val) {
+  case QtCamWhiteBalance::Daylight:
+  case QtCamWhiteBalance::Cloudy:
+  case QtCamWhiteBalance::Sunset:
+  case QtCamWhiteBalance::Tungsten:
+  case QtCamWhiteBalance::Flourescent:
+    return (QtCamWhiteBalance::WhiteBalanceMode)val;
+
+  default:
+    return QtCamWhiteBalance::Auto;
+  }
+}
+
+bool QtCamWhiteBalance::setValue(const QtCamWhiteBalance::WhiteBalanceMode& mode) {
+  return d_ptr->setIntValue(mode);
+}

diff --git a/lib/qtcamwhitebalance.h b/lib/qtcamwhitebalance.h
new file mode 100644 (file)
index 0000000..a4b19b5
--- /dev/null
+++ b/lib/qtcamwhitebalance.h
@@ -0,0 +1,28 @@
+// -*- c++ -*-
+
+#ifndef QT_CAM_WHITE_BALANCE_H
+#define QT_CAM_WHITE_BALANCE_H
+
+#include "qtcamcapability.h"
+
+class QtCamWhiteBalance : public QtCamCapability {
+  Q_OBJECT
+
+public:
+  typedef enum {
+    Auto = 0,
+    Daylight = 1,
+    Cloudy = 2,
+    Sunset = 3,
+    Tungsten = 4,
+    Flourescent = 5
+  } WhiteBalanceMode;
+
+  QtCamWhiteBalance(QtCamDevice *dev, QObject *parent = 0);
+  ~QtCamWhiteBalance();
+
+  WhiteBalanceMode value();
+  bool setValue(const WhiteBalanceMode& mode);
+};
+
+#endif /* QT_CAM_WHITE_BALANCE_H */