From 2eeee80e1357919f1a2008f9c2332bce0efa54a6 Mon Sep 17 00:00:00 2001
From: Gus Grubba <mavlink@grubba.com>
Date: Wed, 19 Jul 2017 16:00:15 -0400
Subject: [PATCH] Move init to constructor

---
 src/Camera/QGCCameraControl.cc | 25 +++++++++----------------
 src/Camera/QGCCameraControl.h  |  1 -
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/Camera/QGCCameraControl.cc b/src/Camera/QGCCameraControl.cc
index f94a6dd..cbe8ea1 100644
--- a/src/Camera/QGCCameraControl.cc
+++ b/src/Camera/QGCCameraControl.cc
@@ -115,7 +115,15 @@ QGCCameraControl::QGCCameraControl(const mavlink_camera_information_t *info, Veh
     , _cameraMode(CAMERA_MODE_UNDEFINED)
     , _video_status(VIDEO_CAPTURE_STATUS_UNDEFINED)
 {
-    _processCameraInfo(info);
+    memcpy(&_info, &info, sizeof(mavlink_camera_information_t));
+    connect(this, &QGCCameraControl::dataReady, this, &QGCCameraControl::_dataReady);
+    if(_info.cam_definition_uri[0]) {
+        //-- Process camera definition file
+        const char* url = (const char*)info->cam_definition_uri;
+        _httpRequest(url);
+    } else {
+        _initWhenReady();
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -134,21 +142,6 @@ QGCCameraControl::~QGCCameraControl()
 
 //-----------------------------------------------------------------------------
 void
-QGCCameraControl::_processCameraInfo(const mavlink_camera_information_t* info)
-{
-    memcpy(&_info, &info, sizeof(mavlink_camera_information_t));
-    connect(this, &QGCCameraControl::dataReady, this, &QGCCameraControl::_dataReady);
-    if(_info.cam_definition_uri[0]) {
-        //-- Process camera definition file
-        const char* url = (const char*)info->cam_definition_uri;
-        _httpRequest(url);
-    } else {
-        _initWhenReady();
-    }
-}
-
-//-----------------------------------------------------------------------------
-void
 QGCCameraControl::_initWhenReady()
 {
     qCDebug(CameraControlLog) << "_initWhenReady()";
diff --git a/src/Camera/QGCCameraControl.h b/src/Camera/QGCCameraControl.h
index a6bdcde..41c3375 100644
--- a/src/Camera/QGCCameraControl.h
+++ b/src/Camera/QGCCameraControl.h
@@ -155,7 +155,6 @@ signals:
 protected:
     virtual void    _setVideoStatus         (VideoStatus status);
     virtual void    _setCameraMode          (CameraMode mode);
-    virtual void    _processCameraInfo      (const mavlink_camera_information_t* info);
 
 private slots:
     void    _initWhenReady                  ();