feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ExtensionSystem: Remove one deprecated use of QTime

Browse Source 
Change-Id: I6bb4657127fdc1d79631059d26a1e35672af87e4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-07-22 15:29:04 +02:00
parent b2602b3555
commit eb67ab31e7
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/extensionsystem/pluginmanager.cpp
View File

@@ -31,20 +31,19 @@
#include "iplugin.h" #include "iplugin.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QEventLoop>
#include <QDateTime> #include <QDateTime>
#include <QDebug>
#include <QDir> #include <QDir>
#include <QEventLoop>
#include <QFile> #include <QFile>
#include <QLibrary> #include <QLibrary>
#include <QLibraryInfo> #include <QLibraryInfo>
#include <QMetaProperty> #include <QMetaProperty>
#include <QSettings> #include <QSettings>
#include <QTextStream>
#include <QTime>
#include <QWriteLocker>
#include <QDebug>
#include <QTimer>
#include <QSysInfo> #include <QSysInfo>
#include <QTextStream>
#include <QTimer>
#include <QWriteLocker>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/benchmarker.h> #include <utils/benchmarker.h>
@@ -1174,7 +1173,7 @@ void PluginManagerPrivate::addObject(QObject *obj)
if (m_profilingVerbosity && !m_profileTimer.isNull()) { if (m_profilingVerbosity && !m_profileTimer.isNull()) {
// Report a timestamp when adding an object. Useful for profiling // Report a timestamp when adding an object. Useful for profiling
// its initialization time. // its initialization time.
const int absoluteElapsedMS = m_profileTimer->elapsed(); const int absoluteElapsedMS = int(m_profileTimer->elapsed());
qDebug(" %-43s %8dms", obj->metaObject()->className(), absoluteElapsedMS); qDebug(" %-43s %8dms", obj->metaObject()->className(), absoluteElapsedMS);
} }
@@ -1517,7 +1516,7 @@ PluginSpec *PluginManagerPrivate::pluginByName(const QString &name) const
void PluginManagerPrivate::initProfiling() void PluginManagerPrivate::initProfiling()
{ {
if (m_profileTimer.isNull()) { if (m_profileTimer.isNull()) {
m_profileTimer.reset(new QTime); m_profileTimer.reset(new QElapsedTimer);
m_profileTimer->start(); m_profileTimer->start();
m_profileElapsedMS = 0; m_profileElapsedMS = 0;
qDebug("Profiling started"); qDebug("Profiling started");
@@ -1529,7 +1528,7 @@ void PluginManagerPrivate::initProfiling()
void PluginManagerPrivate::profilingReport(const char *what, const PluginSpec *spec /* = 0 */) void PluginManagerPrivate::profilingReport(const char *what, const PluginSpec *spec /* = 0 */)
{ {
if (!m_profileTimer.isNull()) { if (!m_profileTimer.isNull()) {
const int absoluteElapsedMS = m_profileTimer->elapsed(); const int absoluteElapsedMS = int(m_profileTimer->elapsed());
const int elapsedMS = absoluteElapsedMS - m_profileElapsedMS; const int elapsedMS = absoluteElapsedMS - m_profileElapsedMS;
m_profileElapsedMS = absoluteElapsedMS; m_profileElapsedMS = absoluteElapsedMS;
if (spec) if (spec)

9
src/libs/extensionsystem/pluginmanager_p.h
View File

@@ -29,11 +29,12 @@
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <QElapsedTimer>
#include <QObject>
#include <QReadWriteLock>
#include <QScopedPointer>
#include <QSet> #include <QSet>
#include <QStringList> #include <QStringList>
#include <QObject>
#include <QScopedPointer>
#include <QReadWriteLock>
#include <queue> #include <queue>
@@ -117,7 +118,7 @@ public:
QEventLoop *shutdownEventLoop = nullptr; // used for async shutdown QEventLoop *shutdownEventLoop = nullptr; // used for async shutdown
QStringList arguments; QStringList arguments;
QScopedPointer<QTime> m_profileTimer; QScopedPointer<QElapsedTimer> m_profileTimer;
QHash<const PluginSpec *, int> m_profileTotal; QHash<const PluginSpec *, int> m_profileTotal;
int m_profileElapsedMS = 0; int m_profileElapsedMS = 0;
unsigned m_profilingVerbosity = 0; unsigned m_profilingVerbosity = 0;