Browse Source

Merge pull request #8352 from patrickelectric/reprecated_time

Remove deprecated QTime::start function and use QELapsedTimer
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
8ae259b411
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/AutoPilotPlugins/Common/RadioComponentController.cc
  2. 2
      src/AutoPilotPlugins/Common/RadioComponentController.h
  3. 3
      src/Vehicle/Vehicle.h
  4. 4
      src/VehicleSetup/Bootloader.cc
  5. 4
      src/VehicleSetup/JoystickConfigController.h

1
src/AutoPilotPlugins/Common/RadioComponentController.cc

@ -15,6 +15,7 @@
#include "RadioComponentController.h" #include "RadioComponentController.h"
#include "QGCApplication.h" #include "QGCApplication.h"
#include <QElapsedTimer>
#include <QSettings> #include <QSettings>
QGC_LOGGING_CATEGORY(RadioComponentControllerLog, "RadioComponentControllerLog") QGC_LOGGING_CATEGORY(RadioComponentControllerLog, "RadioComponentControllerLog")

2
src/AutoPilotPlugins/Common/RadioComponentController.h

@ -310,7 +310,7 @@ private:
int _stickDetectInitialValue; int _stickDetectInitialValue;
int _stickDetectValue; int _stickDetectValue;
bool _stickDetectSettleStarted; bool _stickDetectSettleStarted;
QTime _stickDetectSettleElapsed; QElapsedTimer _stickDetectSettleElapsed;
static const int _stickDetectSettleMSecs; static const int _stickDetectSettleMSecs;
bool _unitTestMode = false; bool _unitTestMode = false;

3
src/Vehicle/Vehicle.h

@ -9,6 +9,7 @@
#pragma once #pragma once
#include <QElapsedTimer>
#include <QObject> #include <QObject>
#include <QVariantList> #include <QVariantList>
#include <QGeoCoordinate> #include <QGeoCoordinate>
@ -1519,7 +1520,7 @@ private:
QString _gitHash; QString _gitHash;
quint64 _uid; quint64 _uid;
QTime _lastBatteryAnnouncement; QElapsedTimer _lastBatteryAnnouncement;
int _lastAnnouncedLowBatteryPercent; int _lastAnnouncedLowBatteryPercent;
SharedLinkInterfacePointer _priorityLink; // We always keep a reference to the priority link to manage shutdown ordering SharedLinkInterfacePointer _priorityLink; // We always keep a reference to the priority link to manage shutdown ordering

4
src/VehicleSetup/Bootloader.cc

@ -18,7 +18,7 @@
#include <QFile> #include <QFile>
#include <QSerialPortInfo> #include <QSerialPortInfo>
#include <QDebug> #include <QDebug>
#include <QTime> #include <QElapsedTimer>
#include "QGC.h" #include "QGC.h"
@ -56,7 +56,7 @@ bool Bootloader::_read(QSerialPort* port, uint8_t* data, qint64 maxSize, int rea
qint64 bytesAlreadyRead = 0; qint64 bytesAlreadyRead = 0;
while (bytesAlreadyRead < maxSize) { while (bytesAlreadyRead < maxSize) {
QTime timeout; QElapsedTimer timeout;
timeout.start(); timeout.start();
while (port->bytesAvailable() < 1) { while (port->bytesAvailable() < 1) {
if (timeout.elapsed() > readTimeout) { if (timeout.elapsed() > readTimeout) {

4
src/VehicleSetup/JoystickConfigController.h

@ -14,7 +14,7 @@
#ifndef JoystickConfigController_H #ifndef JoystickConfigController_H
#define JoystickConfigController_H #define JoystickConfigController_H
#include <QTimer> #include <QElapsedTimer>
#include "FactPanelController.h" #include "FactPanelController.h"
#include "QGCLoggingCategory.h" #include "QGCLoggingCategory.h"
@ -273,7 +273,7 @@ private:
int _stickDetectInitialValue; int _stickDetectInitialValue;
int _stickDetectValue; int _stickDetectValue;
bool _stickDetectSettleStarted; bool _stickDetectSettleStarted;
QTime _stickDetectSettleElapsed; QElapsedTimer _stickDetectSettleElapsed;
static const int _stickDetectSettleMSecs; static const int _stickDetectSettleMSecs;

Loading…
Cancel
Save