From 460b23b1ebeb3ab86763aedaf35f7fead2099e95 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Wed, 22 Jul 2015 23:54:39 +0200
Subject: [PATCH] Use QElapsedTimer everywhere.

---
 src/core/Tools.cpp        | 10 +---------
 src/keys/CompositeKey.cpp |  6 +++---
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/core/Tools.cpp b/src/core/Tools.cpp
index eb8f58672..3d5ee997f 100644
--- a/src/core/Tools.cpp
+++ b/src/core/Tools.cpp
@@ -23,11 +23,7 @@
 #include <QLocale>
 #include <QStringList>
 
-#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
 #include <QElapsedTimer>
-#else
-#include <QTime>
-#endif
 
 #ifdef Q_OS_WIN
 #include <windows.h> // for Sleep()
@@ -177,11 +173,7 @@ void wait(int ms)
         return;
     }
 
-#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
     QElapsedTimer timer;
-#else
-    QTime timer;
-#endif
     timer.start();
 
     if (ms <= 50) {
@@ -196,7 +188,7 @@ void wait(int ms)
                 QCoreApplication::processEvents(QEventLoop::AllEvents, timeLeft);
                 sleep(10);
             }
-        } while (timer.elapsed() < ms);
+        } while (!timer.hasExpired(ms));
     }
 }
 
diff --git a/src/keys/CompositeKey.cpp b/src/keys/CompositeKey.cpp
index 6297017ca..17ab1e391 100644
--- a/src/keys/CompositeKey.cpp
+++ b/src/keys/CompositeKey.cpp
@@ -19,7 +19,7 @@
 #include "CompositeKey_p.h"
 
 #include <QtConcurrent>
-#include <QTime>
+#include <QElapsedTimer>
 
 #include "crypto/CryptoHash.h"
 #include "crypto/SymmetricCipher.h"
@@ -182,7 +182,7 @@ void TransformKeyBenchmarkThread::run()
                            SymmetricCipher::Encrypt);
     cipher.init(seed, iv);
 
-    QTime t;
+    QElapsedTimer t;
     t.start();
 
     do {
@@ -191,5 +191,5 @@ void TransformKeyBenchmarkThread::run()
             return;
         }
         m_rounds += 10000;
-    } while (t.elapsed() < m_msec);
+    } while (!t.hasExpired(m_msec));
 }