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

Extensionsystem: Modernize

Browse Source 
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-equals-default

Change-Id: I20b4508e98ad3f8d6cd0ca2339bfc4c7dcb2ef2c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2018-07-19 23:19:33 +02:00
parent 6655f37259
commit e21b146776
8 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,8 +256,8 @@ namespace ExtensionSystem {
using namespace Internal;
static Internal::PluginManagerPrivate *d = 0;
static PluginManager *m_instance = 0;
static Internal::PluginManagerPrivate *d = nullptr;
static PluginManager *m_instance = nullptr;
/*!
Gets the unique plugin manager instance.
@@ -282,7 +282,7 @@ PluginManager::PluginManager()
PluginManager::~PluginManager()
{
delete d;
d = 0;
d = nullptr;
}
/*!
@@ -625,7 +625,7 @@ void PluginManager::remoteArguments(const QString &serializedArgument, QObject *
arguments);
if (socketParent && socket) {
socket->setParent(socketParent);
socket = 0;
socket = nullptr;
}
}
}
@@ -829,7 +829,7 @@ void PluginManagerPrivate::nextDelayedInitialize()
if (delayedInitializeQueue.isEmpty()) {
m_isInitializationDone = true;
delete delayedInitializeTimer;
delayedInitializeTimer = 0;
delayedInitializeTimer = nullptr;
profilingSummary();
emit q->initializationDone();
#ifdef WITH_TESTS
@@ -845,12 +845,6 @@ void PluginManagerPrivate::nextDelayedInitialize()
\internal
*/
PluginManagerPrivate::PluginManagerPrivate(PluginManager *pluginManager) :
delayedInitializeTimer(0),
shutdownEventLoop(0),
m_profileElapsedMS(0),
m_profilingVerbosity(0),
settings(0),
globalSettings(0),
q(pluginManager)
{
}
@@ -907,7 +901,7 @@ void PluginManagerPrivate::stopAll()
if (delayedInitializeTimer && delayedInitializeTimer->isActive()) {
delayedInitializeTimer->stop();
delete delayedInitializeTimer;
delayedInitializeTimer = 0;
delayedInitializeTimer = nullptr;
}
QList<PluginSpec *> queue = loadQueue();
foreach (PluginSpec *spec, queue) {
@@ -927,8 +921,8 @@ void PluginManagerPrivate::deleteAll()
#ifdef WITH_TESTS
typedef QMap<QObject *, QStringList> TestPlan; // Object -> selected test functions
typedef QMapIterator<QObject *, QStringList> TestPlanIterator;
using TestPlan = QMap<QObject *, QStringList>; // Object -> selected test functions
using TestPlanIterator = QMapIterator<QObject *, QStringList>;
static bool isTestFunction(const QMetaMethod &metaMethod)
{
@@ -999,7 +993,7 @@ static QStringList matchingTestFunctions(const QStringList &testFunctions,
static QObject *objectWithClassName(const QList<QObject *> &objects, const QString &className)
{
return Utils::findOr(objects, 0, [className] (QObject *object) -> bool {
return Utils::findOr(objects, nullptr, [className] (QObject *object) -> bool {
QString candidate = QString::fromUtf8(object->metaObject()->className());
const int colonIndex = candidate.lastIndexOf(QLatin1Char(':'));
if (colonIndex != -1 && colonIndex < candidate.size() - 1)
@@ -1159,7 +1153,7 @@ void PluginManagerPrivate::addObject(QObject *obj)
{
{
QWriteLocker lock(&m_lock);
if (obj == 0) {
if (obj == nullptr) {
qWarning() << "PluginManagerPrivate::addObject(): trying to add null object";
return;
}
@@ -1188,7 +1182,7 @@ void PluginManagerPrivate::addObject(QObject *obj)
*/
void PluginManagerPrivate::removeObject(QObject *obj)
{
if (obj == 0) {
if (obj == nullptr) {
qWarning() << "PluginManagerPrivate::removeObject(): trying to remove null object";
return;
}
@@ -1265,7 +1259,7 @@ void PluginManagerPrivate::shutdown()
*/
void PluginManagerPrivate::asyncShutdownFinished()
{
IPlugin *plugin = qobject_cast<IPlugin *>(sender());
auto *plugin = qobject_cast<IPlugin *>(sender());
Q_ASSERT(plugin);
asynchronousPlugins.removeAll(plugin->pluginSpec());
if (asynchronousPlugins.isEmpty())
@@ -1442,7 +1436,7 @@ void PluginManagerPrivate::readPluginPaths()
pluginCategories.insert(QString(), QList<PluginSpec *>());
foreach (const QString &pluginFile, pluginFiles(pluginPaths)) {
PluginSpec *spec = new PluginSpec;
auto *spec = new PluginSpec;
if (!spec->d->read(pluginFile)) { // not a Qt Creator plugin
delete spec;
continue;
@@ -1505,7 +1499,7 @@ PluginSpec *PluginManagerPrivate::pluginForOption(const QString &option, bool *r
return spec;
}
}
return 0;
return nullptr;
}
PluginSpec *PluginManagerPrivate::pluginByName(const QString &name) const