From d7bbf8a477c2511e5dbd96a438c838228579ede8 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Mon, 27 Jul 2020 18:27:17 +0200
Subject: rbutil: Use QElapsedTimer for measuring time.

The timing functions in QTime are deprecated and have been removed for
Qt6. Use QElapsedTimer, which is the replacement for this.

Change-Id: Ib262753fe99aff83f1952337eb64cd44439cafdd
---
 rbutil/rbutilqt/base/bootloaderinstalls5l.cpp | 19 ++++++++++---------
 rbutil/rbutilqt/base/bootloaderinstalls5l.h   |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp b/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp
index 2442970655..ef1ab1077c 100644
--- a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp
@@ -115,7 +115,7 @@ void BootloaderInstallS5l::installStageMkdfu(void)
     LOG_INFO() << "preparing installStageWaitForEject";
     emit logItem(tr("Ejecting iPod..."), LOGINFO);
     setProgress(10);
-    scanTimer = QTime();
+    scanTimer.invalidate();
     installStageWaitForEject();
 }
 
@@ -125,7 +125,7 @@ void BootloaderInstallS5l::installStageWaitForEject(void)
     if (!updateProgress())
         return; /* aborted */
 
-    if (scanTimer.isNull() || (scanTimer.elapsed() > 3000)) {
+    if (!scanTimer.isValid() || (scanTimer.elapsed() > 3000)) {
         scanSuccess = Utils::ejectDevice(mntpoint);
         if (!scanSuccess) {
             scanSuccess = !Utils::mountpoints(
@@ -149,7 +149,7 @@ void BootloaderInstallS5l::installStageWaitForEject(void)
 
     LOG_INFO() << "preparing installStageWaitForProcs";
     setProgress(40, 18);
-    scanTimer = QTime();
+    scanTimer.invalidate();
     installStageWaitForProcs();
 }
 
@@ -159,7 +159,7 @@ void BootloaderInstallS5l::installStageWaitForProcs(void)
     if (!updateProgress())
         return; /* aborted */
 
-    if (scanTimer.isNull() || (scanTimer.elapsed() > 1000)) {
+    if (!scanTimer.isValid() || (scanTimer.elapsed() > 1000)) {
         scanSuccess = Utils::findRunningProcess(QStringList("iTunes")).isEmpty();
         scanTimer.start();
     }
@@ -217,7 +217,7 @@ void BootloaderInstallS5l::installStageWaitForSpindown(void)
                     "  about 12 seconds a new action will require\n"
                     "  you to release the buttons, DO IT QUICKLY,\n"
                     "  otherwise the process could fail."), LOGWARNING);
-    scanTimer = QTime();
+    scanTimer.invalidate();
     installStageWaitForDfu();
 }
 
@@ -227,7 +227,7 @@ void BootloaderInstallS5l::installStageWaitForDfu(void)
     if (!updateProgress())
         return; /* aborted */
 
-    if (scanTimer.isNull() || (scanTimer.elapsed() > 2000)) {
+    if (!scanTimer.isValid() || (scanTimer.elapsed() > 2000)) {
         scanSuccess = System::listUsbIds().contains(0x05ac1223);
         scanTimer.start();
     }
@@ -298,7 +298,7 @@ void BootloaderInstallS5l::installStageSendDfu(void)
     LOG_INFO() << "preparing installStageWaitForRemount";
     emit logItem(tr("Restarting iPod, waiting for remount..."), LOGINFO);
     setProgress(99, 45);
-    scanTimer = QTime();
+    scanTimer.invalidate();
     installStageWaitForRemount();
 }
 
@@ -308,7 +308,7 @@ void BootloaderInstallS5l::installStageWaitForRemount(void)
     if (!updateProgress())
         return; /* aborted */
 
-    if (scanTimer.isNull() || (scanTimer.elapsed() > 5000)) {
+    if (!scanTimer.isValid() || (scanTimer.elapsed() > 5000)) {
         scanSuccess = Utils::mountpoints(
                     Utils::MountpointsSupported).contains(mntpoint);
         scanTimer.start();
@@ -381,7 +381,8 @@ bool BootloaderInstallS5l::updateProgress(void)
 {
     if (progressTimeout) {
         progCurrent = qMin(progTarget, progOrigin +
-            progressTimer.elapsed()*(progTarget-progOrigin)/progressTimeout);
+            static_cast<int>(progressTimer.elapsed())
+                           * (progTarget - progOrigin) / progressTimeout);
     }
     else {
         progCurrent = progTarget;
diff --git a/rbutil/rbutilqt/base/bootloaderinstalls5l.h b/rbutil/rbutilqt/base/bootloaderinstalls5l.h
index a59e5d378b..e2a44a031f 100644
--- a/rbutil/rbutilqt/base/bootloaderinstalls5l.h
+++ b/rbutil/rbutilqt/base/bootloaderinstalls5l.h
@@ -55,10 +55,10 @@ class BootloaderInstallS5l : public BootloaderInstallBase
         QList<int> suspendedPids;
         bool aborted;
         bool abortDetected(void);
-        QTime scanTimer;
+        QElapsedTimer scanTimer;
         bool scanSuccess;
         // progress
-        QTime progressTimer;
+        QElapsedTimer progressTimer;
         int progressTimeout;
         int progCurrent;
         int progOrigin;
-- 
cgit v1.2.3