slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix warnings about unused private fields

Browse Source 
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>
This commit is contained in:
Thiago Macieira
2015-07-28 16:26:25 -07:00
committed by Yoann Lopes
parent b048f26281
commit bc9cfcd08a
8 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.h
View File

@@ -65,8 +65,6 @@ public:
AVCaptureDevice *createCaptureDevice(); AVCaptureDevice *createCaptureDevice();
private: private:
AVFCameraService *m_service;
QString m_activeInput; QString m_activeInput;
bool m_dirty; bool m_dirty;
QString m_defaultDevice; QString m_defaultDevice;

2
src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.mm
View File

@@ -41,9 +41,9 @@ QT_USE_NAMESPACE
AVFAudioInputSelectorControl::AVFAudioInputSelectorControl(AVFCameraService *service, QObject *parent) AVFAudioInputSelectorControl::AVFAudioInputSelectorControl(AVFCameraService *service, QObject *parent)
: QAudioInputSelectorControl(parent) : QAudioInputSelectorControl(parent)
, m_service(service)
, m_dirty(true) , m_dirty(true)
{ {
Q_UNUSED(service);
NSArray *videoDevices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio]; NSArray *videoDevices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeAudio];
for (AVCaptureDevice *device in videoDevices) { for (AVCaptureDevice *device in videoDevices) {
QString deviceId = QString::fromUtf8([[device uniqueID] UTF8String]); QString deviceId = QString::fromUtf8([[device uniqueID] UTF8String]);

1
src/plugins/avfoundation/camera/avfcameracontrol.h
View File

@@ -65,7 +65,6 @@ private Q_SLOTS:
void updateStatus(); void updateStatus();
private: private:
AVFCameraService *m_service;
AVFCameraSession *m_session; AVFCameraSession *m_session;
QCamera::State m_state; QCamera::State m_state;

2
src/plugins/avfoundation/camera/avfcameracontrol.mm
View File

@@ -40,12 +40,12 @@ QT_USE_NAMESPACE
AVFCameraControl::AVFCameraControl(AVFCameraService *service, QObject *parent) AVFCameraControl::AVFCameraControl(AVFCameraService *service, QObject *parent)
: QCameraControl(parent) : QCameraControl(parent)
, m_service(service)
, m_session(service->session()) , m_session(service->session())
, m_state(QCamera::UnloadedState) , m_state(QCamera::UnloadedState)
, m_lastStatus(QCamera::UnloadedStatus) , m_lastStatus(QCamera::UnloadedStatus)
, m_captureMode(QCamera::CaptureStillImage) , m_captureMode(QCamera::CaptureStillImage)
{ {
Q_UNUSED(service);
connect(m_session, SIGNAL(stateChanged(QCamera::State)), SLOT(updateStatus())); connect(m_session, SIGNAL(stateChanged(QCamera::State)), SLOT(updateStatus()));
} }

1
src/plugins/avfoundation/camera/avfcamerametadatacontrol.h
View File

@@ -55,7 +55,6 @@ public:
QStringList availableMetaData() const; QStringList availableMetaData() const;
private: private:
AVFCameraService *m_service;
QMap<QString, QVariant> m_tags; QMap<QString, QVariant> m_tags;
}; };

3
src/plugins/avfoundation/camera/avfcamerametadatacontrol.mm
View File

@@ -40,8 +40,9 @@ QT_USE_NAMESPACE
//metadata support is not implemented yet //metadata support is not implemented yet
AVFCameraMetaDataControl::AVFCameraMetaDataControl(AVFCameraService *service, QObject *parent) AVFCameraMetaDataControl::AVFCameraMetaDataControl(AVFCameraService *service, QObject *parent)
:QMetaDataWriterControl(parent), m_service(service) :QMetaDataWriterControl(parent)
{ {
Q_UNUSED(service);
} }
AVFCameraMetaDataControl::~AVFCameraMetaDataControl() AVFCameraMetaDataControl::~AVFCameraMetaDataControl()

1
src/plugins/avfoundation/camera/avfimagecapturecontrol.h
View File

@@ -66,7 +66,6 @@ private Q_SLOTS:
void updateReadyStatus(); void updateReadyStatus();
private: private:
AVFCameraService *m_service;
AVFCameraSession *m_session; AVFCameraSession *m_session;
AVFCameraControl *m_cameraControl; AVFCameraControl *m_cameraControl;
bool m_ready; bool m_ready;

2
src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
View File

@@ -46,13 +46,13 @@ QT_USE_NAMESPACE
AVFImageCaptureControl::AVFImageCaptureControl(AVFCameraService *service, QObject *parent) AVFImageCaptureControl::AVFImageCaptureControl(AVFCameraService *service, QObject *parent)
: QCameraImageCaptureControl(parent) : QCameraImageCaptureControl(parent)
, m_service(service)
, m_session(service->session()) , m_session(service->session())
, m_cameraControl(service->cameraControl()) , m_cameraControl(service->cameraControl())
, m_ready(false) , m_ready(false)
, m_lastCaptureId(0) , m_lastCaptureId(0)
, m_videoConnection(nil) , m_videoConnection(nil)
{ {
Q_UNUSED(service);
m_stillImageOutput = [[AVCaptureStillImageOutput alloc] init]; m_stillImageOutput = [[AVCaptureStillImageOutput alloc] init];
NSDictionary *outputSettings = [[NSDictionary alloc] initWithObjectsAndKeys: NSDictionary *outputSettings = [[NSDictionary alloc] initWithObjectsAndKeys: