diff options
| author | James Turner <james.turner@kdab.com> | 2015-01-12 17:15:28 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-01-15 10:45:11 +0100 |
| commit | 9a215d954b00b6d07568392a1894341027c1af5a (patch) | |
| tree | 9be69bb6567f2f89459c581d944fe48df9671f57 /src/plugins/avfoundation/camera/avfcamerasession.mm | |
| parent | fe21ee675e72f7cb3936db6aa01862cfd322ce50 (diff) | |
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>
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerasession.mm')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcamerasession.mm | 6 |
1 files changed, 3 insertions, 3 deletions
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) |