Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-09-24 14:48:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use QElapsedTimer everywhere.

Browse source
This commit is contained in:
Felix Geyer 2015-07-22 23:54:39 +02:00
parent 9882f16614
commit 460b23b1eb
2 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/core/Tools.cpp
View file

@ -23,11 +23,7 @@
#include <QLocale> #include <QLocale>
#include <QStringList> #include <QStringList>
#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
#include <QElapsedTimer> #include <QElapsedTimer>
#else
#include <QTime>
#endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <windows.h> // for Sleep() #include <windows.h> // for Sleep()
@ -177,11 +173,7 @@ void wait(int ms)
return; return;
} }
#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
QElapsedTimer timer; QElapsedTimer timer;
#else
QTime timer;
#endif
timer.start(); timer.start();
if (ms <= 50) { if (ms <= 50) {
@ -196,7 +188,7 @@ void wait(int ms)
QCoreApplication::processEvents(QEventLoop::AllEvents, timeLeft); QCoreApplication::processEvents(QEventLoop::AllEvents, timeLeft);
sleep(10); sleep(10);
} }
} while (timer.elapsed() < ms); } while (!timer.hasExpired(ms));
} }
} }

6
src/keys/CompositeKey.cpp
View file

@ -19,7 +19,7 @@
#include "CompositeKey_p.h" #include "CompositeKey_p.h"
#include <QtConcurrent> #include <QtConcurrent>
#include <QTime> #include <QElapsedTimer>
#include "crypto/CryptoHash.h" #include "crypto/CryptoHash.h"
#include "crypto/SymmetricCipher.h" #include "crypto/SymmetricCipher.h"
@ -182,7 +182,7 @@ void TransformKeyBenchmarkThread::run()
SymmetricCipher::Encrypt); SymmetricCipher::Encrypt);
cipher.init(seed, iv); cipher.init(seed, iv);
QTime t; QElapsedTimer t;
t.start(); t.start();
do { do {
@ -191,5 +191,5 @@ void TransformKeyBenchmarkThread::run()
return; return;
} }
m_rounds += 10000; m_rounds += 10000;
} while (t.elapsed() < m_msec); } while (!t.hasExpired(m_msec));
} }