QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-05-05 23:39:34 +00:00
Code Issues Projects Releases Wiki Activity

QTime -> QElapsedTimer

Browse Source
This commit is contained in:
Albert Astals Cid 2020-01-19 17:32:15 +01:00
parent d71f4c279b
commit 83c23c7a3a
4 changed files with 11 additions and 11 deletions
plugins
qca-botan
qca-botan.cpp
qca-gcrypt
qca-gcrypt.cpp
qca-ossl
qca-ossl.cpp
src/support
synchronizer.cpp

4
plugins/qca-botan/qca-botan.cpp

@ -18,7 +18,7 @@
*
*/
#include <QtCrypto>
#include <QTime>
#include <QElapsedTimer>
#include <QtPlugin>
#include <qstringlist.h>
@ -209,7 +209,7 @@ public:
{
Q_ASSERT(iterationCount != NULL);
Botan::OctetString key;
QTime timer;
QElapsedTimer timer;
std::string secretString(secret.data(), secret.size() );
*iterationCount = 0;

6
plugins/qca-gcrypt/qca-gcrypt.cpp

@ -21,7 +21,7 @@
#include <QtCore/qplugin.h>
#include <QTime>
#include <QElapsedTimer>
#include <qstringlist.h>
#include <gcrypt.h>
@ -350,7 +350,7 @@ public:
unsigned int *iterationCount) override
{
Q_ASSERT(iterationCount != NULL);
QTime timer;
QElapsedTimer timer;
/*
from RFC2898:
@ -449,7 +449,7 @@ public:
{
Q_ASSERT(iterationCount != NULL);
QCA::SymmetricKey result(keyLength);
QTime timer;
QElapsedTimer timer;
*iterationCount = 0;
timer.start();

6
plugins/qca-ossl/qca-ossl.cpp

@ -23,8 +23,8 @@
#include <QtCrypto>
#include <qcaprovider.h>
#include <QDebug>
#include <QElapsedTimer>
#include <QScopedPointer>
#include <QTime>
#include <QtPlugin>
#include <openssl/evp.h>
@ -1164,7 +1164,7 @@ public:
unsigned int *iterationCount) override
{
Q_ASSERT(iterationCount != NULL);
QTime timer;
QElapsedTimer timer;
/* from RFC2898:
Steps:
@ -1250,7 +1250,7 @@ public:
unsigned int *iterationCount) override
{
Q_ASSERT(iterationCount != NULL);
QTime timer;
QElapsedTimer timer;
SecureArray out(keyLength);
*iterationCount = 0;

6
src/support/synchronizer.cpp

@ -23,10 +23,10 @@
#include <QAbstractEventDispatcher>
#include <QCoreApplication>
#include <QElapsedTimer>
#include <QEvent>
#include <QMutex>
#include <QPair>
#include <QTime>
#include <QWaitCondition>
//#define TIMERFIXER_DEBUG
@ -48,7 +48,7 @@ public:
{
int id;
int interval;
QTime time;
QElapsedTimer time;
bool fixInterval;
TimerInfo() : fixInterval(false) {}
@ -182,7 +182,7 @@ private slots:
QThread *objectThread = target->thread();
QAbstractEventDispatcher *ed = QAbstractEventDispatcher::instance(objectThread);
int timeLeft = qMax(info.interval - info.time.elapsed(), 0);
int timeLeft = qMax(info.interval - static_cast<int>(info.time.elapsed()), 0);
info.fixInterval = true;
ed->unregisterTimer(info.id);
#if QT_VERSION >= 0x050000