Merge pull request #8676 from patrickelectric/more_qtimer_qtime_fixes

Fix more QTime deprecated functions

src/Camera/QGCCameraControl.cc

@@ -770,7 +770,7 @@ QGCCameraControl::_setVideoStatus(VideoStatus status)
         emit videoStatusChanged();
         if(status == VIDEO_CAPTURE_STATUS_RUNNING) {
              _recordTime = 0;
-             _recTime.start();
+             _recTime = QTime::currentTime();
              _recTimer.start();
         } else {
              _recTimer.stop();
@@ -784,7 +784,7 @@ QGCCameraControl::_setVideoStatus(VideoStatus status)
 void
 QGCCameraControl::_recTimerHandler()
 {
-    _recordTime = static_cast<uint32_t>(_recTime.elapsed());
+    _recordTime = static_cast<uint32_t>(_recTime.msec());
     emit recordTimeChanged();
 }
 
@@ -1524,7 +1524,7 @@ QGCCameraControl::handleCaptureStatus(const mavlink_camera_capture_status_t& cap
     //-- Do we have recording time?
     if(cap.recording_time_ms) {
         _recordTime = cap.recording_time_ms;
-        _recTime = _recTime.addMSecs(_recTime.elapsed() - static_cast<int>(cap.recording_time_ms));
+        _recTime = _recTime.addMSecs(_recTime.msec() - static_cast<int>(cap.recording_time_ms));
         emit recordTimeChanged();
     }
     //-- Video/Image Capture Status

src/Camera/QGCCameraManager.h

@@ -91,7 +91,7 @@ protected:
     class CameraStruct : public QObject {
     public:
         CameraStruct(QObject* parent, uint8_t compID_);
-        QTime   lastHeartbeat;
+        QElapsedTimer lastHeartbeat;
         bool    infoReceived = false;
         bool    gaveUp       = false;
         int     tryCount     = 0;
@@ -105,8 +105,8 @@ protected:
     QmlObjectListModel  _cameras;
     QStringList         _cameraLabels;
     int                 _currentCamera      = 0;
-    QTime               _lastZoomChange;
-    QTime               _lastCameraChange;
+    QElapsedTimer       _lastZoomChange;
+    QElapsedTimer       _lastCameraChange;
     QTimer              _cameraTimer;
     QMap<QString, CameraStruct*> _cameraInfoRequest;
 };

src/Joystick/Joystick.h

@@ -28,7 +28,7 @@ class AssignedButtonAction : public QObject {
 public:
     AssignedButtonAction(QObject* parent, const QString name);
     QString action;
-    QTime   buttonTime;
+    QElapsedTimer buttonTime;
     bool    repeat = false;
 };
 
@@ -299,7 +299,7 @@ protected:
 
     static int          _transmitterMode;
     int                 _rgFunctionAxis[maxFunction] = {};
-    QTime               _axisTime;
+    QElapsedTimer       _axisTime;
 
     QmlObjectListModel              _assignableButtonActions;
     QList<AssignedButtonAction*>    _buttonActionArray;

src/Vehicle/Vehicle.h

@@ -1441,7 +1441,7 @@ private:
     QTimer                          _mavCommandAckTimer;
     int                             _mavCommandRetryCount;
     int                             _capabilitiesRetryCount =               0;
-    QTime                           _capabilitiesRetryElapsed;
+    QElapsedTimer                   _capabilitiesRetryElapsed;
     static const int                _mavCommandMaxRetryCount =              3;
     static const int                _mavCommandAckTimeoutMSecs =            3000;
     static const int                _mavCommandAckTimeoutMSecsHighLatency = 120000;
@@ -1490,7 +1490,7 @@ private:
     QTimer  _sendMultipleTimer;
     int     _nextSendMessageMultipleIndex;
 
-    QTime                           _flightTimer;
+    QElapsedTimer                   _flightTimer;
     QTimer                          _flightTimeUpdater;
     TrajectoryPoints*               _trajectoryPoints;
     QmlObjectListModel              _cameraTriggerPoints;

src/comm/MockLink.h

@@ -10,6 +10,7 @@
 
 #pragma once
 
+#include <QElapsedTimer>
 #include <QMap>
 #include <QLoggingCategory>
 #include <QGeoCoordinate>
@@ -230,7 +231,7 @@ private:
     uint32_t    _mavCustomMode;
     uint8_t     _mavState;
 
-    QTime       _runningTime;
+    QElapsedTimer _runningTime;
     int8_t      _batteryRemaining = 100;
 
     MAV_AUTOPILOT       _firmwareType;