Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 18:32:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: replace use of QTime as timer with QElapsedTimer

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-07 13:17:28 +03:00
parent 8d435fefa0
commit 5ff9f32fb2
10 changed files with 36 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gwenview/tests/manual/imageloadbench.cpp
View file

@ -4,14 +4,14 @@
#include <QFile> #include <QFile>
#include <QImage> #include <QImage>
#include <QImageReader> #include <QImageReader>
#include <QtCore/qdatetime.h> #include <QElapsedTimer>
const int ITERATIONS = 2; const int ITERATIONS = 2;
const QSize SCALED_SIZE(1280, 800); const QSize SCALED_SIZE(1280, 800);
static void bench(QIODevice* device, const QString& outputName) static void bench(QIODevice* device, const QString& outputName)
{ {
QTime chrono; QElapsedTimer chrono;
chrono.start(); chrono.start();
for (int iteration = 0; iteration < ITERATIONS; ++iteration) { for (int iteration = 0; iteration < ITERATIONS; ++iteration) {
qDebug() << "Iteration:" << iteration; qDebug() << "Iteration:" << iteration;

4
kdeplasma-addons/applets/bball/bball.cpp
View file

@ -164,7 +164,7 @@ void bballApplet::mousePressEvent(QGraphicsSceneMouseEvent * event)
// reset timing // reset timing
m_timer.stop(); m_timer.stop();
m_time = QTime(); m_time.invalidate();
update(); update();
// reset physics // reset physics
@ -310,7 +310,7 @@ void bballApplet::configChanged()
void bballApplet::updatePhysics() void bballApplet::updatePhysics()
{ {
// find out the delta-time since the last call // find out the delta-time since the last call
if (m_time.isNull()) if (!m_time.isValid())
m_time.start(); m_time.start();
qreal dT = qMin((qreal)m_time.restart() / 1000.0, 0.5); qreal dT = qMin((qreal)m_time.restart() / 1000.0, 0.5);

3
kdeplasma-addons/applets/bball/bball.h
View file

@ -23,7 +23,6 @@
#include <QtCore/QBasicTimer> #include <QtCore/QBasicTimer>
#include <QtCore/QElapsedTimer> #include <QtCore/QElapsedTimer>
#include <QtCore/QDateTime>
#include <QtGui/QVector2D> #include <QtGui/QVector2D>
#include <QGraphicsSceneMouseEvent> #include <QGraphicsSceneMouseEvent>
#include <QtDBus/QDBusInterface> #include <QtDBus/QDBusInterface>
@ -88,7 +87,7 @@ private:
// status // status
QBasicTimer m_timer; QBasicTimer m_timer;
QTime m_time; QElapsedTimer m_time;
QRectF m_screenRect; QRectF m_screenRect;

10
kdeplasma-addons/applets/icontasks/abstracttaskitem.h
View file

@ -30,10 +30,10 @@
// Own // Own
#include "taskmanager/taskgroup.h" #include "taskmanager/taskgroup.h"
// Qt // Katie
#include <QtCore/qdatetime.h> #include <QElapsedTimer>
#include <QIcon> #include <QIcon>
#include <QtGui/qevent.h> #include <QGraphicsSceneDragDropEvent>
#include <QGraphicsWidget> #include <QGraphicsWidget>
#include <QPropertyAnimation> #include <QPropertyAnimation>
@ -264,8 +264,8 @@ protected:
private: private:
QRectF m_activeRect; QRectF m_activeRect;
QTime m_lastGeometryUpdate; QElapsedTimer m_lastGeometryUpdate;
QTime m_lastUpdate; QElapsedTimer m_lastUpdate;
QSize m_lastIconSize; QSize m_lastIconSize;
int m_activateTimerId; int m_activateTimerId;
int m_updateGeometryTimerId; int m_updateGeometryTimerId;

17
kget/core/transfer.cpp
View file

@ -23,6 +23,15 @@
#include <QtXml/qdom.h> #include <QtXml/qdom.h>
#include <QtCore/qdatetime.h> #include <QtCore/qdatetime.h>
// FIXME: this is jumpy
static int elapsedSecs(const QTime &time)
{
const int msecs = time.msecsTo(QTime::currentTime());
if (msecs <= 0) {
return 0;
}
return (msecs / 1000);
}
struct StatusStrings struct StatusStrings
{ {
@ -94,7 +103,7 @@ bool Transfer::setDirectory(const KUrl& newDirectory)
int Transfer::elapsedTime() const int Transfer::elapsedTime() const
{ {
if (status() == Job::Running) if (status() == Job::Running)
return m_runningTime.elapsed() / 1000; return elapsedSecs(m_runningTime);
return m_runningSeconds; return m_runningSeconds;
} }
@ -219,7 +228,7 @@ void Transfer::save(const QDomElement &element)
e.setAttribute("UploadedSize", m_uploadedSize); e.setAttribute("UploadedSize", m_uploadedSize);
e.setAttribute("DownloadLimit", m_visibleDownloadLimit); e.setAttribute("DownloadLimit", m_visibleDownloadLimit);
e.setAttribute("UploadLimit", m_visibleUploadLimit); e.setAttribute("UploadLimit", m_visibleUploadLimit);
e.setAttribute("ElapsedTime", status() == Job::Running ? m_runningTime.elapsed() / 1000 : m_runningSeconds); e.setAttribute("ElapsedTime", status() == Job::Running ? elapsedSecs(m_runningTime) : m_runningSeconds);
e.setAttribute("Policy", policy() == Job::Start ? "Start" : (policy() == Job::Stop ? "Stop" : "None")); e.setAttribute("Policy", policy() == Job::Start ? "Start" : (policy() == Job::Stop ? "Stop" : "None"));
} }
@ -290,11 +299,11 @@ void Transfer::setStatus(Job::Status jobStatus, const QString &text, const QPixm
if (jobStatus == Job::Running && status() != Job::Running) if (jobStatus == Job::Running && status() != Job::Running)
{ {
m_runningTime.restart(); m_runningTime = QTime::currentTime();
m_runningTime.addSecs(m_runningSeconds); m_runningTime.addSecs(m_runningSeconds);
} }
if (jobStatus != Job::Running && status() == Job::Running) if (jobStatus != Job::Running && status() == Job::Running)
m_runningSeconds = m_runningTime.elapsed() / 1000; m_runningSeconds = elapsedSecs(m_runningTime);
/** /**
* It's important to call job::setStatus AFTER having changed the * It's important to call job::setStatus AFTER having changed the
* icon or the text or whatever. * icon or the text or whatever.

4
krdc/main.cpp
View file

@ -30,11 +30,11 @@
#include <KAboutData> #include <KAboutData>
#include <KDebug> #include <KDebug>
#include <QtCore/qdatetime.h> #include <QElapsedTimer>
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
QTime startupTimer; QElapsedTimer startupTimer;
startupTimer.start(); startupTimer.start();
KAboutData aboutData("krdc", 0, ki18n("KRDC"), KDE_VERSION_STRING, KAboutData aboutData("krdc", 0, ki18n("KRDC"), KDE_VERSION_STRING,
ki18n("KDE Remote Desktop Client"), KAboutData::License_GPL, ki18n("KDE Remote Desktop Client"), KAboutData::License_GPL,

2
okular/tests/searchtest.cpp
View file

@ -178,7 +178,7 @@ void SearchTest::test311232()
const int searchId = 0; const int searchId = 0;
d.searchText(searchId, " i ", true, Qt::CaseSensitive, Okular::Document::NextMatch, false, QColor()); d.searchText(searchId, " i ", true, Qt::CaseSensitive, Okular::Document::NextMatch, false, QColor());
QTime t; QElapsedTimer t;
t.start(); t.start();
while (spy.count() != 1 && t.elapsed() < 500) while (spy.count() != 1 && t.elapsed() < 500)
qApp->processEvents(); qApp->processEvents();

3
okular/ui/pageview.cpp
View file

@ -25,6 +25,7 @@
#include <qimage.h> #include <qimage.h>
#include <qpainter.h> #include <qpainter.h>
#include <qtimer.h> #include <qtimer.h>
#include <qelapsedtimer.h>
#include <qset.h> #include <qset.h>
#include <qscrollbar.h> #include <qscrollbar.h>
#include <qtooltip.h> #include <qtooltip.h>
@ -148,7 +149,7 @@ public:
// viewport move // viewport move
bool viewportMoveActive; bool viewportMoveActive;
QTime viewportMoveTime; QElapsedTimer viewportMoveTime;
QPoint viewportMoveDest; QPoint viewportMoveDest;
int lastSourceLocationViewportPageNumber; int lastSourceLocationViewportPageNumber;
double lastSourceLocationViewportNormalizedX; double lastSourceLocationViewportNormalizedX;

14
partitionmanager/src/gui/applyprogressdialog.h
View file

@ -24,8 +24,11 @@
#include <kdialog.h> #include <kdialog.h>
#include <QTimer> #include <QTimer>
#include <QtCore/qdatetime.h> #include <QElapsedTimer>
#include <QString> #include <QString>
#include <QTreeWidgetItem>
#include <QCloseEvent>
#include <QKeyEvent>
class OperationRunner; class OperationRunner;
class Operation; class Operation;
@ -34,11 +37,6 @@ class ApplyProgressDialogWidget;
class ApplyProgressDetailsWidget; class ApplyProgressDetailsWidget;
class Report; class Report;
#include <QTreeWidgetItem>
#include <QCloseEvent>
#include <QKeyEvent>
/** Show progress. /** Show progress.
The progress dialog telling the user about the progress of the Operations that are being applied. The progress dialog telling the user about the progress of the Operations that are being applied.
@ -104,7 +102,7 @@ class ApplyProgressDialog : public KDialog
void allOpsDone(const QString& msg); void allOpsDone(const QString& msg);
QTime& time() { return m_Time; } QElapsedTimer& time() { return m_Time; }
QTimer& timer() { return m_Timer; } QTimer& timer() { return m_Timer; }
const QTimer& timer() const { return m_Timer; } const QTimer& timer() const { return m_Timer; }
@ -129,7 +127,7 @@ class ApplyProgressDialog : public KDialog
Report* m_Report; Report* m_Report;
QString m_SavedParentTitle; QString m_SavedParentTitle;
QTimer m_Timer; QTimer m_Timer;
QTime m_Time; QElapsedTimer m_Time;
QTreeWidgetItem* m_CurrentOpItem; QTreeWidgetItem* m_CurrentOpItem;
QTreeWidgetItem* m_CurrentJobItem; QTreeWidgetItem* m_CurrentJobItem;
int m_LastReportUpdate; int m_LastReportUpdate;

4
partitionmanager/src/jobs/job.cpp
View file

@ -28,7 +28,7 @@
#include "util/report.h" #include "util/report.h"
#include <QIcon> #include <QIcon>
#include <QtCore/qdatetime.h> #include <QElapsedTimer>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
@ -70,7 +70,7 @@ bool Job::copyBlocks(Report& report, CopyTarget& target, CopySource& source)
void* buffer = malloc(blockSize * source.sectorSize()); void* buffer = malloc(blockSize * source.sectorSize());
int percent = 0; int percent = 0;
QTime t; QElapsedTimer t;
t.start(); t.start();
while (blocksCopied < blocksToCopy) while (blocksCopied < blocksToCopy)