aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/corelib/feedback/mfeedbackplayer_p.h4
-rw-r--r--src/corelib/layout/mbasiclayoutanimation_p.cpp3
-rw-r--r--src/corelib/layout/mbasiclayoutanimation_p.h4
-rwxr-xr-xsrc/corelib/widgets/mtextedit.cpp4
-rw-r--r--src/extensions/applicationextension/mextensionhandle_p.h4
-rw-r--r--src/views/msliderview_p.h4
6 files changed, 11 insertions, 12 deletions
diff --git a/src/corelib/feedback/mfeedbackplayer_p.h b/src/corelib/feedback/mfeedbackplayer_p.h
index 112f4a6e..e0e328cc 100644
--- a/src/corelib/feedback/mfeedbackplayer_p.h
+++ b/src/corelib/feedback/mfeedbackplayer_p.h
@@ -23,7 +23,7 @@
#include <QLocalSocket>
#include <QMap>
#include <QTimer>
-#include <QTime>
+#include <QElapsedTimer>
#include <QDataStream>
#include <QObject>
@@ -64,7 +64,7 @@ public:
// Contains time (in milliseconds) from the previous successfull connection
// to the feedback daemon.
- QTime previousSuccessfullConnection;
+ QElapsedTimer previousSuccessfullConnection;
// Contains number of successive successfull connections to feedback daemon
// that have happened in less than fastReconnectionTime.
diff --git a/src/corelib/layout/mbasiclayoutanimation_p.cpp b/src/corelib/layout/mbasiclayoutanimation_p.cpp
index a5eac860..1511c0c3 100644
--- a/src/corelib/layout/mbasiclayoutanimation_p.cpp
+++ b/src/corelib/layout/mbasiclayoutanimation_p.cpp
@@ -31,8 +31,7 @@ MBasicLayoutAnimationPrivate::~MBasicLayoutAnimationPrivate()
void MBasicLayoutAnimationPrivate::tick()
{
Q_Q(MBasicLayoutAnimation);
- recordedTimeSinceLastUpdate = timeSinceLastUpdate.elapsed();
- timeSinceLastUpdate.restart();
+ recordedTimeSinceLastUpdate = timeSinceLastUpdate.restart();
bool layout_is_done(true);
for(int i = states.count() - 1; i >= 0; --i) {
MItemState &state = states[i];
diff --git a/src/corelib/layout/mbasiclayoutanimation_p.h b/src/corelib/layout/mbasiclayoutanimation_p.h
index e0043107..bbcc0d52 100644
--- a/src/corelib/layout/mbasiclayoutanimation_p.h
+++ b/src/corelib/layout/mbasiclayoutanimation_p.h
@@ -24,7 +24,7 @@
#include "mlayoutanimation_p.h"
#include "mitemstate_p.h"
-#include <QtCore/QTime>
+#include <QElapsedTimer>
/** Private animator class. */
class MBasicLayoutAnimationPrivate : public MLayoutAnimationPrivate
@@ -68,7 +68,7 @@ public:
/** Keep track of the time elapsed since the last update.
* This is used because we may miss some timer events.
*/
- QTime timeSinceLastUpdate;
+ QElapsedTimer timeSinceLastUpdate;
/** The number of milliseconds elapsed since last update
*
* This records the value of timeSinceLastUpdate when an update happens
diff --git a/src/corelib/widgets/mtextedit.cpp b/src/corelib/widgets/mtextedit.cpp
index 91687349..62debe0f 100755
--- a/src/corelib/widgets/mtextedit.cpp
+++ b/src/corelib/widgets/mtextedit.cpp
@@ -38,7 +38,7 @@
#include <QGraphicsItem>
#include <QGraphicsScene>
#include <QPointer>
-#include <QTime>
+#include <QElapsedTimer>
#include "mapplication.h"
#include "mapplicationwindow.h"
@@ -139,7 +139,7 @@ public:
}
private:
- QTime time;
+ QElapsedTimer time;
bool skipNext;
bool haveSeenAnyKeyEvent;
diff --git a/src/extensions/applicationextension/mextensionhandle_p.h b/src/extensions/applicationextension/mextensionhandle_p.h
index 2e9a2288..56056438 100644
--- a/src/extensions/applicationextension/mextensionhandle_p.h
+++ b/src/extensions/applicationextension/mextensionhandle_p.h
@@ -24,7 +24,7 @@
#include "private/mwidgetcontroller_p.h"
#include "mappletserver.h"
-#include <QTime>
+#include <QElapsedTimer>
#include <QTimer>
#include <QProcess>
@@ -69,7 +69,7 @@ public:
int restartCount;
//! Time since the process was started, for checking how long the remote process could run before breaking
- QTime processStartTime;
+ QElapsedTimer processStartTime;
//! A server for IPC communication between the processes
MAppletServer communicator;
diff --git a/src/views/msliderview_p.h b/src/views/msliderview_p.h
index bb87bc05..a2a890ce 100644
--- a/src/views/msliderview_p.h
+++ b/src/views/msliderview_p.h
@@ -23,7 +23,7 @@
#include "msliderview.h"
#include <MWidget>
-#include <QTime>
+#include <QElapsedTimer>
#include "mslidermodel.h"
class MSlider;
@@ -289,7 +289,7 @@ public:
QPropertyAnimation *positionAnimation;
- QTime feedbackTimer;
+ QElapsedTimer feedbackTimer;
int valueWhenFeedback;
int pressTimerId;