From 9a215d954b00b6d07568392a1894341027c1af5a Mon Sep 17 00:00:00 2001
From: James Turner <james.turner@kdab.com>
Date: Mon, 12 Jan 2015 17:15:28 +0000
Subject: Rename camera classes to avoid name clash.

Change-Id: I08fe8f7e75bdbf2c4975863642072061741b5bc6
Reviewed-by: Filipe Azevedo <filipe.azevedo@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
---
 src/plugins/avfoundation/camera/avfcamerasession.mm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/plugins/avfoundation/camera/avfcamerasession.mm')

diff --git a/src/plugins/avfoundation/camera/avfcamerasession.mm b/src/plugins/avfoundation/camera/avfcamerasession.mm
index 3c58c25d6..c1b896cf1 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.mm
+++ b/src/plugins/avfoundation/camera/avfcamerasession.mm
@@ -43,8 +43,8 @@
 #include "avfcamerasession.h"
 #include "avfcameraservice.h"
 #include "avfcameracontrol.h"
-#include "avfvideorenderercontrol.h"
-#include "avfvideodevicecontrol.h"
+#include "avfcamerarenderercontrol.h"
+#include "avfcameradevicecontrol.h"
 #include "avfaudioinputselectorcontrol.h"
 #include "avfmediavideoprobecontrol.h"
 
@@ -241,7 +241,7 @@ void AVFCameraSession::updateCameraDevices()
     }
 }
 
-void AVFCameraSession::setVideoOutput(AVFVideoRendererControl *output)
+void AVFCameraSession::setVideoOutput(AVFCameraRendererControl *output)
 {
     m_videoOutput = output;
     if (output)
-- 
cgit v1.2.3