avfoundation: fix compiler warnings regarding Objective-C

warning: declaration of instance variables in the interface is deprecated [-Wobjc-interface-ivars]

Change-Id: I3763d207d916bc4f0355a282b47769d5404ea087
Reviewed-by: Christian Stromme <christian.stromme@qt.io>

6 files changed, 53 insertions, 51 deletions

diff --git a/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm b/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm
index 2ba5ab2b9..0359f5d0a 100644
--- a/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm
+++ b/src/plugins/avfoundation/camera/avfcamerarenderercontrol.mm
@@ -211,10 +211,6 @@ private:
 
 
 @interface AVFCaptureFramesDelegate : NSObject <AVCaptureVideoDataOutputSampleBufferDelegate>
-{
-@private
-    AVFCameraRendererControl *m_renderer;
-}
 
 - (AVFCaptureFramesDelegate *) initWithRenderer:(AVFCameraRendererControl*)renderer;
 
@@ -225,6 +221,10 @@ private:
 @end
 
 @implementation AVFCaptureFramesDelegate
+{
+@private
+    AVFCameraRendererControl *m_renderer;
+}
 
 - (AVFCaptureFramesDelegate *) initWithRenderer:(AVFCameraRendererControl*)renderer
 {
diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm
index dd6859f73..8ed627774 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.mm
+++ b/src/plugins/avfoundation/camera/avfcamerasession.mm
@@ -64,11 +64,6 @@ int AVFCameraSession::m_defaultCameraIndex;
 QList<AVFCameraInfo> AVFCameraSession::m_cameraDevices;
 
 @interface AVFCameraSessionObserver : NSObject
-{
-@private
-    AVFCameraSession *m_session;
-    AVCaptureSession *m_captureSession;
-}
 
 - (AVFCameraSessionObserver *) initWithCameraSession:(AVFCameraSession*)session;
 - (void) processRuntimeError:(NSNotification *)notification;
@@ -78,6 +73,11 @@ QList<AVFCameraInfo> AVFCameraSession::m_cameraDevices;
 @end
 
 @implementation AVFCameraSessionObserver
+{
+@private
+    AVFCameraSession *m_session;
+    AVCaptureSession *m_captureSession;
+}
 
 - (AVFCameraSessionObserver *) initWithCameraSession:(AVFCameraSession*)session
 {
diff --git a/src/plugins/avfoundation/camera/avfmediaassetwriter.h b/src/plugins/avfoundation/camera/avfmediaassetwriter.h
index 624906c85..9d61d5089 100644
--- a/src/plugins/avfoundation/camera/avfmediaassetwriter.h
+++ b/src/plugins/avfoundation/camera/avfmediaassetwriter.h
@@ -59,37 +59,8 @@ QT_END_NAMESPACE
 @interface QT_MANGLE_NAMESPACE(AVFMediaAssetWriter) : NSObject<AVCaptureVideoDataOutputSampleBufferDelegate,
                                                                AVCaptureAudioDataOutputSampleBufferDelegate>
 {
-@private
-    AVFCameraService *m_service;
-
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVAssetWriterInput> m_cameraWriterInput;
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVCaptureDeviceInput> m_audioInput;
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVCaptureAudioDataOutput> m_audioOutput;
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVAssetWriterInput> m_audioWriterInput;
-    AVCaptureDevice *m_audioCaptureDevice;
-
-    // Queue to write sample buffers:
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<dispatch_queue_t> m_writerQueue;
-    // High priority serial queue for video output:
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<dispatch_queue_t> m_videoQueue;
-    // Serial queue for audio output:
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<dispatch_queue_t> m_audioQueue;
-
-    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVAssetWriter> m_assetWriter;
-
-    QT_PREPEND_NAMESPACE(AVFMediaRecorderControlIOS) *m_delegate;
-
-    bool m_setStartTime;
-
-    QT_PREPEND_NAMESPACE(QAtomicInt) m_state;
 @public
     QT_PREPEND_NAMESPACE(AVFAtomicInt64) m_durationInMs;
-@private
-    CMTime m_startTime;
-    CMTime m_lastTimeStamp;
-
-    NSDictionary *m_audioSettings;
-    NSDictionary *m_videoSettings;
 }
 
 - (id)initWithDelegate:(QT_PREPEND_NAMESPACE(AVFMediaRecorderControlIOS) *)delegate;
diff --git a/src/plugins/avfoundation/camera/avfmediaassetwriter.mm b/src/plugins/avfoundation/camera/avfmediaassetwriter.mm
index 5a1257f6c..318d66117 100644
--- a/src/plugins/avfoundation/camera/avfmediaassetwriter.mm
+++ b/src/plugins/avfoundation/camera/avfmediaassetwriter.mm
@@ -89,6 +89,37 @@ enum WriterState
 @end
 
 @implementation QT_MANGLE_NAMESPACE(AVFMediaAssetWriter)
+{
+@private
+    AVFCameraService *m_service;
+
+    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVAssetWriterInput> m_cameraWriterInput;
+    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVCaptureDeviceInput> m_audioInput;
+    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVCaptureAudioDataOutput> m_audioOutput;
+    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVAssetWriterInput> m_audioWriterInput;
+    AVCaptureDevice *m_audioCaptureDevice;
+
+    // Queue to write sample buffers:
+    QT_PREPEND_NAMESPACE(AVFScopedPointer)<dispatch_queue_t> m_writerQueue;
+    // High priority serial queue for video output:
+    QT_PREPEND_NAMESPACE(AVFScopedPointer)<dispatch_queue_t> m_videoQueue;
+    // Serial queue for audio output:
+    QT_PREPEND_NAMESPACE(AVFScopedPointer)<dispatch_queue_t> m_audioQueue;
+
+    QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVAssetWriter> m_assetWriter;
+
+    QT_PREPEND_NAMESPACE(AVFMediaRecorderControlIOS) *m_delegate;
+
+    bool m_setStartTime;
+
+    QT_PREPEND_NAMESPACE(QAtomicInt) m_state;
+@private
+    CMTime m_startTime;
+    CMTime m_lastTimeStamp;
+
+    NSDictionary *m_audioSettings;
+    NSDictionary *m_videoSettings;
+}
 
 - (id)initWithDelegate:(AVFMediaRecorderControlIOS *)delegate
 {
diff --git a/src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm b/src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm
index 948db33ba..bae18bc0a 100644
--- a/src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfdisplaylink.mm
@@ -55,10 +55,6 @@ QT_USE_NAMESPACE
 
 #if defined(Q_OS_IOS) || defined(Q_OS_TVOS)
 @interface DisplayLinkObserver : NSObject
-{
-    AVFDisplayLink *m_avfDisplayLink;
-    CADisplayLink *m_displayLink;
-}
 
 - (void)start;
 - (void)stop;
@@ -67,6 +63,10 @@ QT_USE_NAMESPACE
 @end
 
 @implementation DisplayLinkObserver
+{
+    AVFDisplayLink *m_avfDisplayLink;
+    CADisplayLink *m_displayLink;
+}
 
 - (id)initWithAVFDisplayLink:(AVFDisplayLink *)link
 {
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
index bca4c85a5..2309221c2 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
@@ -67,15 +67,6 @@ static void *AVFMediaPlayerSessionObserverCurrentItemObservationContext = &AVFMe
 static void *AVFMediaPlayerSessionObserverCurrentItemDurationObservationContext = &AVFMediaPlayerSessionObserverCurrentItemDurationObservationContext;
 
 @interface AVFMediaPlayerSessionObserver : NSObject
-{
-@private
-    AVFMediaPlayerSession *m_session;
-    AVPlayer *m_player;
-    AVPlayerItem *m_playerItem;
-    AVPlayerLayer *m_playerLayer;
-    NSURL *m_URL;
-    BOOL m_bufferIsLikelyToKeepUp;
-}
 
 @property (readonly, getter=player) AVPlayer* m_player;
 @property (readonly, getter=playerItem) AVPlayerItem* m_playerItem;
@@ -96,6 +87,15 @@ static void *AVFMediaPlayerSessionObserverCurrentItemDurationObservationContext
 @end
 
 @implementation AVFMediaPlayerSessionObserver
+{
+@private
+    AVFMediaPlayerSession *m_session;
+    AVPlayer *m_player;
+    AVPlayerItem *m_playerItem;
+    AVPlayerLayer *m_playerLayer;
+    NSURL *m_URL;
+    BOOL m_bufferIsLikelyToKeepUp;
+}
 
 @synthesize m_player, m_playerItem, m_playerLayer, m_session;