From 451bdd16caba3483139ed49f035caa1731510bf7 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Wed, 12 Jun 2019 18:35:10 +0200
Subject: Convert uses of QTime as a timer to QElapsedTimer

It was deprecated by qtbase/ed99a591a83a399458f12341d0a1c0b3152f247a.

Change-Id: I87bf219c05a62e1deeb9d3df558e5084318a2a69
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
---
 examples/multimedia/spectrum/app/levelmeter.h    | 6 +++---
 src/plugins/alsa/qalsaaudioinput.h               | 6 +++---
 src/plugins/alsa/qalsaaudiooutput.h              | 6 +++---
 src/plugins/pulseaudio/qaudioinput_pulse.h       | 6 +++---
 src/plugins/windowsaudio/qwindowsaudioinput.cpp  | 1 +
 src/plugins/windowsaudio/qwindowsaudioinput.h    | 6 +++---
 src/plugins/windowsaudio/qwindowsaudiooutput.cpp | 1 +
 src/plugins/windowsaudio/qwindowsaudiooutput.h   | 6 +++---
 8 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/examples/multimedia/spectrum/app/levelmeter.h b/examples/multimedia/spectrum/app/levelmeter.h
index 860e07ffc..987f90e8f 100644
--- a/examples/multimedia/spectrum/app/levelmeter.h
+++ b/examples/multimedia/spectrum/app/levelmeter.h
@@ -51,7 +51,7 @@
 #ifndef LEVELMETER_H
 #define LEVELMETER_H
 
-#include <QTime>
+#include <QElapsedTimer>
 #include <QWidget>
 
 /**
@@ -99,7 +99,7 @@ private:
     /**
      * Time at which m_peakLevel was last changed.
      */
-    QTime m_peakLevelChanged;
+    QElapsedTimer m_peakLevelChanged;
 
     /**
      * Rate at which peak level bar decays.
@@ -116,7 +116,7 @@ private:
     /**
      * Time at which m_peakHoldLevel was last changed.
      */
-    QTime m_peakHoldLevelChanged;
+    QElapsedTimer m_peakHoldLevelChanged;
 
     QTimer *m_redrawTimer;
 
diff --git a/src/plugins/alsa/qalsaaudioinput.h b/src/plugins/alsa/qalsaaudioinput.h
index 09f615fea..fa9c954d7 100644
--- a/src/plugins/alsa/qalsaaudioinput.h
+++ b/src/plugins/alsa/qalsaaudioinput.h
@@ -59,7 +59,7 @@
 #include <QtCore/qtimer.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
-#include <QtCore/qdatetime.h>
+#include <QtCore/qelapsedtimer.h>
 #include <QtCore/qiodevice.h>
 
 #include <QtMultimedia/qaudio.h>
@@ -144,8 +144,8 @@ private:
     void drain();
 
     QTimer* timer;
-    QTime timeStamp;
-    QTime clockStamp;
+    QElapsedTimer timeStamp;
+    QElapsedTimer clockStamp;
     qint64 elapsedTimeOffset;
     int intervalTime;
     RingBuffer ringBuffer;
diff --git a/src/plugins/alsa/qalsaaudiooutput.h b/src/plugins/alsa/qalsaaudiooutput.h
index d38e3d5d4..8002322cb 100644
--- a/src/plugins/alsa/qalsaaudiooutput.h
+++ b/src/plugins/alsa/qalsaaudiooutput.h
@@ -58,7 +58,7 @@
 #include <QtCore/qtimer.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
-#include <QtCore/qdatetime.h>
+#include <QtCore/qelapsedtimer.h>
 #include <QtCore/qiodevice.h>
 
 #include <QtMultimedia/qaudio.h>
@@ -132,8 +132,8 @@ private:
     QTimer* timer;
     QByteArray m_device;
     int bytesAvailable;
-    QTime timeStamp;
-    QTime clockStamp;
+    QElapsedTimer timeStamp;
+    QElapsedTimer clockStamp;
     qint64 elapsedTimeOffset;
     char* audioBuffer;
     snd_pcm_t* handle;
diff --git a/src/plugins/pulseaudio/qaudioinput_pulse.h b/src/plugins/pulseaudio/qaudioinput_pulse.h
index 32a2c031c..3a6cf03c4 100644
--- a/src/plugins/pulseaudio/qaudioinput_pulse.h
+++ b/src/plugins/pulseaudio/qaudioinput_pulse.h
@@ -55,7 +55,7 @@
 #include <QtCore/qtimer.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
-#include <QtCore/qdatetime.h>
+#include <QtCore/qelapsedtimer.h>
 #include <QtCore/qiodevice.h>
 
 #include "qaudio.h"
@@ -132,8 +132,8 @@ private:
     QTimer *m_timer;
     qint64 m_elapsedTimeOffset;
     pa_stream *m_stream;
-    QTime m_timeStamp;
-    QTime m_clockStamp;
+    QElapsedTimer m_timeStamp;
+    QElapsedTimer m_clockStamp;
     QByteArray m_streamName;
     QByteArray m_device;
     QByteArray m_tempBuffer;
diff --git a/src/plugins/windowsaudio/qwindowsaudioinput.cpp b/src/plugins/windowsaudio/qwindowsaudioinput.cpp
index 717baaff0..3332e3067 100644
--- a/src/plugins/windowsaudio/qwindowsaudioinput.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudioinput.cpp
@@ -52,6 +52,7 @@
 #include "qwindowsaudioinput.h"
 
 #include <QtCore/QDataStream>
+#include <QtCore/qtimer.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/windowsaudio/qwindowsaudioinput.h b/src/plugins/windowsaudio/qwindowsaudioinput.h
index a0feae257..817176731 100644
--- a/src/plugins/windowsaudio/qwindowsaudioinput.h
+++ b/src/plugins/windowsaudio/qwindowsaudioinput.h
@@ -55,7 +55,7 @@
 
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>
-#include <QtCore/qtimer.h>
+#include <QtCore/qelapsedtimer.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qdatetime.h>
@@ -120,9 +120,9 @@ private:
     QByteArray m_device;
     int bytesAvailable;
     int intervalTime;
-    QTime timeStamp;
+    QElapsedTimer timeStamp;
     qint64 elapsedTimeOffset;
-    QTime timeStampOpened;
+    QElapsedTimer timeStampOpened;
     qint64 totalTimeValue;
     bool pullMode;
     bool resuming;
diff --git a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
index f39e1694b..1182647fc 100644
--- a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
@@ -53,6 +53,7 @@
 #include "qwindowsaudioutils.h"
 #include <QtEndian>
 #include <QtCore/QDataStream>
+#include <QtCore/qtimer.h>
 #include <private/qaudiohelpers_p.h>
 
 //#define DEBUG_AUDIO 1
diff --git a/src/plugins/windowsaudio/qwindowsaudiooutput.h b/src/plugins/windowsaudio/qwindowsaudiooutput.h
index 30ee1defe..d6e6998ec 100644
--- a/src/plugins/windowsaudio/qwindowsaudiooutput.h
+++ b/src/plugins/windowsaudio/qwindowsaudiooutput.h
@@ -54,7 +54,7 @@
 #include "qwindowsaudioutils.h"
 
 #include <QtCore/qdebug.h>
-#include <QtCore/qtimer.h>
+#include <QtCore/qelapsedtimer.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qdatetime.h>
@@ -118,9 +118,9 @@ private:
     void pauseAndSleep();
     QByteArray m_device;
     int bytesAvailable;
-    QTime timeStamp;
+    QElapsedTimer timeStamp;
     qint64 elapsedTimeOffset;
-    QTime timeStampOpened;
+    QElapsedTimer timeStampOpened;
     qint32 buffer_size;
     qint32 period_size;
     qint32 blocks_count;
-- 
cgit v1.2.3