Unverified Commit 8ae259b4 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #8352 from patrickelectric/reprecated_time

Remove deprecated QTime::start function and use QELapsedTimer
parents 52a10716 248fef23
......@@ -15,6 +15,7 @@
#include "RadioComponentController.h"
#include "QGCApplication.h"
#include <QElapsedTimer>
#include <QSettings>
QGC_LOGGING_CATEGORY(RadioComponentControllerLog, "RadioComponentControllerLog")
......
......@@ -310,7 +310,7 @@ private:
int _stickDetectInitialValue;
int _stickDetectValue;
bool _stickDetectSettleStarted;
QTime _stickDetectSettleElapsed;
QElapsedTimer _stickDetectSettleElapsed;
static const int _stickDetectSettleMSecs;
bool _unitTestMode = false;
......
......@@ -9,6 +9,7 @@
#pragma once
#include <QElapsedTimer>
#include <QObject>
#include <QVariantList>
#include <QGeoCoordinate>
......@@ -1519,7 +1520,7 @@ private:
QString _gitHash;
quint64 _uid;
QTime _lastBatteryAnnouncement;
QElapsedTimer _lastBatteryAnnouncement;
int _lastAnnouncedLowBatteryPercent;
SharedLinkInterfacePointer _priorityLink; // We always keep a reference to the priority link to manage shutdown ordering
......
......@@ -18,7 +18,7 @@
#include <QFile>
#include <QSerialPortInfo>
#include <QDebug>
#include <QTime>
#include <QElapsedTimer>
#include "QGC.h"
......@@ -56,7 +56,7 @@ bool Bootloader::_read(QSerialPort* port, uint8_t* data, qint64 maxSize, int rea
qint64 bytesAlreadyRead = 0;
while (bytesAlreadyRead < maxSize) {
QTime timeout;
QElapsedTimer timeout;
timeout.start();
while (port->bytesAvailable() < 1) {
if (timeout.elapsed() > readTimeout) {
......
......@@ -14,7 +14,7 @@
#ifndef JoystickConfigController_H
#define JoystickConfigController_H
#include <QTimer>
#include <QElapsedTimer>
#include "FactPanelController.h"
#include "QGCLoggingCategory.h"
......@@ -273,7 +273,7 @@ private:
int _stickDetectInitialValue;
int _stickDetectValue;
bool _stickDetectSettleStarted;
QTime _stickDetectSettleElapsed;
QElapsedTimer _stickDetectSettleElapsed;
static const int _stickDetectSettleMSecs;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment