From bc9cfcd08acd439c85fee5ffa1a768f8aebeff6f Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Tue, 28 Jul 2015 16:26:25 -0700
Subject: Fix warnings about unused private fields

avfaudioinputselectorcontrol.h:68:23: warning: private field 'm_service' is not used [-Wunused-private-field]

Change-Id: I5722a2d1bf592862af3a4d36554419a653662892
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
---
 src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.h  | 2 --
 src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.mm | 2 +-
 src/plugins/avfoundation/camera/avfcameracontrol.h              | 1 -
 src/plugins/avfoundation/camera/avfcameracontrol.mm             | 2 +-
 src/plugins/avfoundation/camera/avfcamerametadatacontrol.h      | 1 -
 src/plugins/avfoundation/camera/avfcamerametadatacontrol.mm     | 3 ++-
 src/plugins/avfoundation/camera/avfimagecapturecontrol.h        | 1 -
 src/plugins/avfoundation/camera/avfimagecapturecontrol.mm       | 2 +-
 8 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.h b/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.h
index 8ad89bcc2..5d629f664 100644
--- a/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.h
+++ b/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.h
@@ -65,8 +65,6 @@ public:
     AVCaptureDevice *createCaptureDevice();
 
 private:
-    AVFCameraService *m_service;
-
     QString m_activeInput;
     bool m_dirty;
     QString m_defaultDevice;
diff --git a/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.mm b/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.mm
index d0d0c8209..d06ae1990 100644
--- a/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.mm
+++ b/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.mm
@@ -41,9 +41,9 @@ QT_USE_NAMESPACE
 
 AVFAudioInputSelectorControl::AVFAudioInputSelectorControl(AVFCameraService *service, QObject *parent)
    : QAudioInputSelectorControl(parent)
-   , m_service(service)
    , m_dirty(true)
 {
+    Q_UNUSED(service);
     NSArray *videoDevices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
     for (AVCaptureDevice *device in videoDevices) {
         QString deviceId = QString::fromUtf8([[device uniqueID] UTF8String]);
diff --git a/src/plugins/avfoundation/camera/avfcameracontrol.h b/src/plugins/avfoundation/camera/avfcameracontrol.h
index 4d146537e..bbbc8d61f 100644
--- a/src/plugins/avfoundation/camera/avfcameracontrol.h
+++ b/src/plugins/avfoundation/camera/avfcameracontrol.h
@@ -65,7 +65,6 @@ private Q_SLOTS:
     void updateStatus();
 
 private:
-    AVFCameraService *m_service;
     AVFCameraSession *m_session;
 
     QCamera::State m_state;
diff --git a/src/plugins/avfoundation/camera/avfcameracontrol.mm b/src/plugins/avfoundation/camera/avfcameracontrol.mm
index bfd14a20e..bef952e6f 100644
--- a/src/plugins/avfoundation/camera/avfcameracontrol.mm
+++ b/src/plugins/avfoundation/camera/avfcameracontrol.mm
@@ -40,12 +40,12 @@ QT_USE_NAMESPACE
 
 AVFCameraControl::AVFCameraControl(AVFCameraService *service, QObject *parent)
    : QCameraControl(parent)
-   , m_service(service)
    , m_session(service->session())
    , m_state(QCamera::UnloadedState)
    , m_lastStatus(QCamera::UnloadedStatus)
    , m_captureMode(QCamera::CaptureStillImage)
 {
+    Q_UNUSED(service);
     connect(m_session, SIGNAL(stateChanged(QCamera::State)), SLOT(updateStatus()));
 }
 
diff --git a/src/plugins/avfoundation/camera/avfcamerametadatacontrol.h b/src/plugins/avfoundation/camera/avfcamerametadatacontrol.h
index 8e73e677f..6cc9d74e3 100644
--- a/src/plugins/avfoundation/camera/avfcamerametadatacontrol.h
+++ b/src/plugins/avfoundation/camera/avfcamerametadatacontrol.h
@@ -55,7 +55,6 @@ public:
     QStringList availableMetaData() const;
 
 private:
-    AVFCameraService *m_service;
     QMap<QString, QVariant> m_tags;
 };
 
diff --git a/src/plugins/avfoundation/camera/avfcamerametadatacontrol.mm b/src/plugins/avfoundation/camera/avfcamerametadatacontrol.mm
index a13f6e91f..36d318ef8 100644
--- a/src/plugins/avfoundation/camera/avfcamerametadatacontrol.mm
+++ b/src/plugins/avfoundation/camera/avfcamerametadatacontrol.mm
@@ -40,8 +40,9 @@ QT_USE_NAMESPACE
 //metadata support is not implemented yet
 
 AVFCameraMetaDataControl::AVFCameraMetaDataControl(AVFCameraService *service, QObject *parent)
-    :QMetaDataWriterControl(parent), m_service(service)
+    :QMetaDataWriterControl(parent)
 {
+    Q_UNUSED(service);
 }
 
 AVFCameraMetaDataControl::~AVFCameraMetaDataControl()
diff --git a/src/plugins/avfoundation/camera/avfimagecapturecontrol.h b/src/plugins/avfoundation/camera/avfimagecapturecontrol.h
index c27abd39b..993725653 100644
--- a/src/plugins/avfoundation/camera/avfimagecapturecontrol.h
+++ b/src/plugins/avfoundation/camera/avfimagecapturecontrol.h
@@ -66,7 +66,6 @@ private Q_SLOTS:
     void updateReadyStatus();
 
 private:
-    AVFCameraService *m_service;
     AVFCameraSession *m_session;
     AVFCameraControl *m_cameraControl;
     bool m_ready;
diff --git a/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm b/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
index 0d245fc57..c28ccef8e 100644
--- a/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
+++ b/src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
@@ -46,13 +46,13 @@ QT_USE_NAMESPACE
 
 AVFImageCaptureControl::AVFImageCaptureControl(AVFCameraService *service, QObject *parent)
    : QCameraImageCaptureControl(parent)
-   , m_service(service)
    , m_session(service->session())
    , m_cameraControl(service->cameraControl())
    , m_ready(false)
    , m_lastCaptureId(0)
    , m_videoConnection(nil)
 {
+    Q_UNUSED(service);
     m_stillImageOutput = [[AVCaptureStillImageOutput alloc] init];
 
     NSDictionary *outputSettings = [[NSDictionary alloc] initWithObjectsAndKeys:
-- 
cgit v1.2.3