From 0b923ca8d2dbe68489d40144c62991100961cefd Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Mon, 5 Jun 2017 14:13:39 -0400 Subject: [PATCH] =?UTF-8?q?The=20use=20of=20=E2=80=9CMEMBER=E2=80=9D=20pre?= =?UTF-8?q?vents=20(simple)=20access=20from=20c++.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/FlightDisplay/VideoManager.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/FlightDisplay/VideoManager.h b/src/FlightDisplay/VideoManager.h index 9a93b5cc1..b1ecfa17f 100644 --- a/src/FlightDisplay/VideoManager.h +++ b/src/FlightDisplay/VideoManager.h @@ -37,8 +37,8 @@ public: Q_PROPERTY(QString videoSourceID READ videoSourceID NOTIFY videoSourceIDChanged) Q_PROPERTY(bool videoRunning READ videoRunning NOTIFY videoRunningChanged) Q_PROPERTY(bool uvcEnabled READ uvcEnabled CONSTANT) - Q_PROPERTY(VideoSurface* videoSurface MEMBER _videoSurface CONSTANT) - Q_PROPERTY(VideoReceiver* videoReceiver MEMBER _videoReceiver CONSTANT) + Q_PROPERTY(VideoSurface* videoSurface READ videoSurface CONSTANT) + Q_PROPERTY(VideoReceiver* videoReceiver READ videoReceiver CONSTANT) Q_PROPERTY(QString imageFile READ imageFile NOTIFY imageFileChanged) Q_PROPERTY(bool showFullScreen READ showFullScreen WRITE setShowFullScreen NOTIFY showFullScreenChanged) @@ -49,6 +49,9 @@ public: QString imageFile () { return _imageFile; } bool showFullScreen () { return _showFullScreen; } + VideoSurface* videoSurface () { return _videoSurface; } + VideoReceiver* videoReceiver () { return _videoReceiver; } + #if defined(QGC_DISABLE_UVC) bool uvcEnabled () { return false; } #else -- 2.22.0