From ebcc802d9c04a2adb31aef8f31467693219dc08b Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Wed, 7 Nov 2018 12:51:32 -0500 Subject: [PATCH] Fix warnings --- src/FlightDisplay/VideoManager.cc | 4 ++-- src/VideoStreaming/VideoReceiver.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/FlightDisplay/VideoManager.cc b/src/FlightDisplay/VideoManager.cc index 4011ed613..f9c0fd3fb 100644 --- a/src/FlightDisplay/VideoManager.cc +++ b/src/FlightDisplay/VideoManager.cc @@ -32,8 +32,8 @@ QGC_LOGGING_CATEGORY(VideoManagerLog, "VideoManagerLog") //----------------------------------------------------------------------------- VideoManager::VideoManager(QGCApplication* app, QGCToolbox* toolbox) : QGCTool(app, toolbox) - , _videoReceiver(NULL) - , _videoSettings(NULL) + , _videoReceiver(nullptr) + , _videoSettings(nullptr) , _fullScreen(false) { } diff --git a/src/VideoStreaming/VideoReceiver.h b/src/VideoStreaming/VideoReceiver.h index 04e344e09..65ee942fb 100644 --- a/src/VideoStreaming/VideoReceiver.h +++ b/src/VideoStreaming/VideoReceiver.h @@ -44,7 +44,7 @@ public: Q_PROPERTY(QString videoFile READ videoFile NOTIFY videoFileChanged) Q_PROPERTY(bool showFullScreen READ showFullScreen WRITE setShowFullScreen NOTIFY showFullScreenChanged) - explicit VideoReceiver(QObject* parent = 0); + explicit VideoReceiver(QObject* parent = nullptr); ~VideoReceiver(); #if defined(QGC_GST_STREAMING) -- 2.22.0