diff options
author | mitchell <unknown> | 2018-05-06 21:22:30 -0400 |
---|---|---|
committer | mitchell <unknown> | 2018-05-06 21:22:30 -0400 |
commit | 724309f4b71d1d991a754d0ad821de3861b6a211 (patch) | |
tree | f24a11e3c550ad8ba46b92089a2ef1d3aff34663 /qt/ScintillaEditBase/PlatQt.cpp | |
parent | 8971ac9fe89f01e717ad21126213ac8887fe373d (diff) | |
download | scintilla-mirror-724309f4b71d1d991a754d0ad821de3861b6a211.tar.gz |
Backport: Use <chrono> for platform-independent timing and remove ElapsedTime. Also use #if for painting measurement as there are 7 sections of code to enable.
Backport of changeset 6741:af5d9064c25c.
Diffstat (limited to 'qt/ScintillaEditBase/PlatQt.cpp')
-rw-r--r-- | qt/ScintillaEditBase/PlatQt.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp index fb7904f05..f1857e662 100644 --- a/qt/ScintillaEditBase/PlatQt.cpp +++ b/qt/ScintillaEditBase/PlatQt.cpp @@ -35,7 +35,6 @@ #include <QTextLayout> #include <QTextLine> #include <QLibrary> -#include <QElapsedTimer> #include <cstdio> namespace Scintilla { @@ -1210,30 +1209,4 @@ void Platform::Assert(const char *c, const char *file, int line) } } -//---------------------------------------------------------------------- - -static QElapsedTimer timer; - -ElapsedTime::ElapsedTime() : bigBit(0), littleBit(0) -{ - if (!timer.isValid()) { - timer.start(); - } - qint64 ns64Now = timer.nsecsElapsed(); - bigBit = static_cast<unsigned long>(ns64Now >> 32); - littleBit = static_cast<unsigned long>(ns64Now & 0xFFFFFFFF); -} - -double ElapsedTime::Duration(bool reset) -{ - qint64 ns64Now = timer.nsecsElapsed(); - qint64 ns64Start = (static_cast<qint64>(static_cast<unsigned long>(bigBit)) << 32) + static_cast<unsigned long>(littleBit); - double result = ns64Now - ns64Start; - if (reset) { - bigBit = static_cast<unsigned long>(ns64Now >> 32); - littleBit = static_cast<unsigned long>(ns64Now & 0xFFFFFFFF); - } - return result / 1000000000.0; // 1 billion nanoseconds in a second -} - } |