[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [akonadi] src: Minor optimization. Use Q_NULLPTR, remove unused variable
From: Montel Laurent <null () kde ! org>
Date: 2016-12-31 14:10:39
Message-ID: E1cNKMp-0006K6-Tn () code ! kde ! org
[Download RAW message or body]
Git commit 5fac42a35dbb7e51f98eb8731781915d35e7fe37 by Montel Laurent.
Committed on 31/12/2016 at 14:10.
Pushed by mlaurent into branch 'master'.
Minor optimization. Use Q_NULLPTR, remove unused variable
M +8 -8 src/agentbase/agentbase.cpp
M +3 -6 src/agentbase/resourcescheduler.cpp
M +2 -2 src/agentserver/agentlauncher.cpp
M +2 -2 src/agentserver/agentpluginloader.cpp
M +1 -1 src/agentserver/agentserver.cpp
M +1 -1 src/agentserver/agentthread.cpp
M +1 -1 src/akonadicontrol/agentinstance.cpp
M +4 -4 src/akonadicontrol/agentmanager.cpp
M +1 -1 src/akonadicontrol/agentprocessinstance.cpp
M +2 -2 src/akonadicontrol/agenttype.cpp
M +3 -4 src/akonadicontrol/main.cpp
M +1 -1 src/core/jobs/invalidatecachejob.cpp
M +2 -2 src/core/jobs/itemfetchjob.cpp
M +0 -1 src/core/jobs/itemmodifyjob.cpp
https://commits.kde.org/akonadi/5fac42a35dbb7e51f98eb8731781915d35e7fe37
diff --git a/src/agentbase/agentbase.cpp b/src/agentbase/agentbase.cpp
index 47c8e78d0..9a4816ec1 100644
--- a/src/agentbase/agentbase.cpp
+++ b/src/agentbase/agentbase.cpp
@@ -62,7 +62,7 @@
using namespace Akonadi;
-static AgentBase *sAgentBase = 0;
+static AgentBase *sAgentBase = Q_NULLPTR;
AgentBase::Observer::Observer()
{
@@ -338,13 +338,13 @@ AgentBasePrivate::AgentBasePrivate(AgentBase *parent)
, mNeedsNetwork(false)
, mOnline(false)
, mDesiredOnlineState(false)
- , mSettings(0)
- , mChangeRecorder(0)
- , mTracer(0)
- , mObserver(0)
- , mPowerInterface(0)
- , mTemporaryOfflineTimer(0)
- , mEventLoopLocker(0)
+ , mSettings(Q_NULLPTR)
+ , mChangeRecorder(Q_NULLPTR)
+ , mTracer(Q_NULLPTR)
+ , mObserver(Q_NULLPTR)
+ , mPowerInterface(Q_NULLPTR)
+ , mTemporaryOfflineTimer(Q_NULLPTR)
+ , mEventLoopLocker(Q_NULLPTR)
, mNetworkManager(Q_NULLPTR)
{
Internal::setClientType(Internal::Agent);
diff --git a/src/agentbase/resourcescheduler.cpp b/src/agentbase/resourcescheduler.cpp
index 0a5459655..c36ed7158 100644
--- a/src/agentbase/resourcescheduler.cpp
+++ b/src/agentbase/resourcescheduler.cpp
@@ -32,7 +32,7 @@
using namespace Akonadi;
qint64 ResourceScheduler::Task::latestSerial = 0;
-static QDBusAbstractInterface *s_resourcetracker = 0;
+static QDBusAbstractInterface *s_resourcetracker = Q_NULLPTR;
//@cond PRIVATE
@@ -296,9 +296,7 @@ void ResourceScheduler::taskDone()
}
if (s_resourcetracker) {
- QList<QVariant> argumentList;
- argumentList << QString::number(mCurrentTask.serial)
- << QString();
+ const QList<QVariant> argumentList = { QString::number(mCurrentTask.serial), QString() };
s_resourcetracker->asyncCallWithArgumentList(QStringLiteral("jobEnded"), argumentList);
}
@@ -403,8 +401,7 @@ void ResourceScheduler::executeNext()
}
if (s_resourcetracker) {
- QList<QVariant> argumentList;
- argumentList << QString::number(mCurrentTask.serial);
+ const QList<QVariant> argumentList = { QString::number(mCurrentTask.serial) };
s_resourcetracker->asyncCallWithArgumentList(QStringLiteral("jobStarted"), argumentList);
}
diff --git a/src/agentserver/agentlauncher.cpp b/src/agentserver/agentlauncher.cpp
index cc94cc9d9..c05593005 100644
--- a/src/agentserver/agentlauncher.cpp
+++ b/src/agentserver/agentlauncher.cpp
@@ -38,11 +38,11 @@ int main(int argc, char *argv[])
AgentPluginLoader loader;
QPluginLoader *factory = loader.load(agentPluginName);
- if (factory == 0) {
+ if (!factory) {
return 1;
}
- QObject *instance = 0;
+ QObject *instance = Q_NULLPTR;
const bool invokeSucceeded = QMetaObject::invokeMethod(factory->instance(),
"createInstance",
Qt::DirectConnection,
diff --git a/src/agentserver/agentpluginloader.cpp b/src/agentserver/agentpluginloader.cpp
index 5d94d274d..716aa4954 100644
--- a/src/agentserver/agentpluginloader.cpp
+++ b/src/agentserver/agentpluginloader.cpp
@@ -39,7 +39,7 @@ QPluginLoader *AgentPluginLoader::load(const QString &pluginName)
const QString pluginFile = XdgBaseDirs::findPluginFile(pluginName);
if (pluginFile.isEmpty()) {
qCWarning(AKONADIAGENTSERVER_LOG) << "plugin file:" << pluginName << "not found!";
- return 0;
+ return Q_NULLPTR;
}
if (m_pluginLoaders.contains(pluginFile)) {
@@ -49,7 +49,7 @@ QPluginLoader *AgentPluginLoader::load(const QString &pluginName)
if (!loader->load()) {
qCWarning(AKONADIAGENTSERVER_LOG) << "Failed to load agent: " << loader->errorString();
delete loader;
- return 0;
+ return Q_NULLPTR;
}
m_pluginLoaders.insert(pluginFile, loader);
return loader;
diff --git a/src/agentserver/agentserver.cpp b/src/agentserver/agentserver.cpp
index 194fa31b7..91be53e88 100644
--- a/src/agentserver/agentserver.cpp
+++ b/src/agentserver/agentserver.cpp
@@ -77,7 +77,7 @@ void AgentServer::startAgent(const QString &identifier, const QString &typeIdent
}
QPluginLoader *loader = m_agentLoader.load(fileName);
- if (loader == 0) {
+ if (!loader) {
return; // No plugin found, debug output in AgentLoader.
}
diff --git a/src/agentserver/agentthread.cpp b/src/agentserver/agentthread.cpp
index 9e1d2adc6..0919465ba 100644
--- a/src/agentserver/agentthread.cpp
+++ b/src/agentserver/agentthread.cpp
@@ -33,7 +33,7 @@ AgentThread::AgentThread(const QString &identifier, QObject *factory, QObject *p
: QThread(parent)
, m_identifier(identifier)
, m_factory(factory)
- , m_instance(0)
+ , m_instance(Q_NULLPTR)
{
}
diff --git a/src/akonadicontrol/agentinstance.cpp b/src/akonadicontrol/agentinstance.cpp
index 2f23a8244..1ae038190 100644
--- a/src/akonadicontrol/agentinstance.cpp
+++ b/src/akonadicontrol/agentinstance.cpp
@@ -225,7 +225,7 @@ T *AgentInstance::findInterface(Akonadi::DBus::AgentType agentType, const char *
<< mIdentifier << ", error message:"
<< (iface ? iface->lastError().message() : QString());
delete iface;
- return 0;
+ return Q_NULLPTR;
}
return iface;
}
diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
index 0e06503f6..78ab82783 100644
--- a/src/akonadicontrol/agentmanager.cpp
+++ b/src/akonadicontrol/agentmanager.cpp
@@ -169,10 +169,10 @@ void AgentManager::cleanup()
}
delete mStorageController;
- mStorageController = 0;
+ mStorageController = Q_NULLPTR;
delete mAgentServer;
- mAgentServer = 0;
+ mAgentServer = Q_NULLPTR;
}
QStringList AgentManager::agentTypes() const
@@ -481,7 +481,7 @@ void AgentManager::updatePluginInfos()
const QHash<QString, AgentType> oldInfos = mAgents;
readPluginInfos();
- Q_FOREACH (const AgentType &oldInfo, oldInfos) {
+ for (const AgentType &oldInfo : oldInfos) {
if (!mAgents.contains(oldInfo.identifier)) {
Q_EMIT agentTypeRemoved(oldInfo.identifier);
}
@@ -506,7 +506,7 @@ void AgentManager::readPluginInfos()
const QStringList pathList = pluginInfoPathList();
- Q_FOREACH (const QString &path, pathList) {
+ for (const QString &path : pathList) {
const QDir directory(path, QStringLiteral("*.desktop"));
readPluginInfos(directory);
}
diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
index f7be9a75e..c61936514 100644
--- a/src/akonadicontrol/agentprocessinstance.cpp
+++ b/src/akonadicontrol/agentprocessinstance.cpp
@@ -29,7 +29,7 @@ using namespace Akonadi;
AgentProcessInstance::AgentProcessInstance(AgentManager *manager)
: AgentInstance(manager)
- , mController(0)
+ , mController(Q_NULLPTR)
{
}
diff --git a/src/akonadicontrol/agenttype.cpp b/src/akonadicontrol/agenttype.cpp
index 90173a607..5b68aece7 100644
--- a/src/akonadicontrol/agenttype.cpp
+++ b/src/akonadicontrol/agenttype.cpp
@@ -55,8 +55,8 @@ bool AgentType::load(const QString &fileName, AgentManager *manager)
const QStringList keyList(group.keyList());
for (const QString &key : keyList) {
if (key.startsWith(QLatin1String("X-Akonadi-Custom-"))) {
- QString customKey = key.mid(17, key.length());
- QStringList val = group.readEntry(key, QStringList());
+ const QString customKey = key.mid(17, key.length());
+ const QStringList val = group.readEntry(key, QStringList());
if (val.size() == 1) {
custom[customKey] = QVariant(val[0]);
} else {
diff --git a/src/akonadicontrol/main.cpp b/src/akonadicontrol/main.cpp
index 2ba6c65ac..40c205034 100644
--- a/src/akonadicontrol/main.cpp
+++ b/src/akonadicontrol/main.cpp
@@ -38,7 +38,7 @@
# include <unistd.h>
#endif
-static AgentManager *sAgentManager = 0;
+static AgentManager *sAgentManager = Q_NULLPTR;
void crashHandler(int)
{
@@ -79,9 +79,8 @@ int main(int argc, char **argv)
sAgentManager = new AgentManager(app.commandLineArguments().isSet(QStringLiteral("verbose")));
KCrash::setEmergencySaveFunction(crashHandler);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
QGuiApplication::setFallbackSessionManagementEnabled(false);
-#endif
+
// akonadi_control is started on-demand, no need to auto restart by session.
auto disableSessionManagement = [](QSessionManager &sm) {
sm.setRestartHint(QSessionManager::RestartNever);
@@ -92,7 +91,7 @@ int main(int argc, char **argv)
int retval = app.exec();
delete sAgentManager;
- sAgentManager = 0;
+ sAgentManager = Q_NULLPTR;
return retval;
}
diff --git a/src/core/jobs/invalidatecachejob.cpp b/src/core/jobs/invalidatecachejob.cpp
index 5fcf89d2d..05e81e325 100644
--- a/src/core/jobs/invalidatecachejob.cpp
+++ b/src/core/jobs/invalidatecachejob.cpp
@@ -85,7 +85,7 @@ void InvalidateCacheJobPrivate::itemFetchResult(KJob *job)
return;
}
- ItemModifyJob *modJob = 0;
+ ItemModifyJob *modJob = Q_NULLPTR;
foreach (Item item, fetchJob->items()) { //krazy:exclude=foreach, item cannot be const
item.clearPayload();
modJob = new ItemModifyJob(item, q);
diff --git a/src/core/jobs/itemfetchjob.cpp b/src/core/jobs/itemfetchjob.cpp
index 7bd5027ba..22c4d4380 100644
--- a/src/core/jobs/itemfetchjob.cpp
+++ b/src/core/jobs/itemfetchjob.cpp
@@ -39,8 +39,8 @@ class Akonadi::ItemFetchJobPrivate : public JobPrivate
public:
ItemFetchJobPrivate(ItemFetchJob *parent)
: JobPrivate(parent)
- , mEmitTimer(0)
- , mValuePool(0)
+ , mEmitTimer(Q_NULLPTR)
+ , mValuePool(Q_NULLPTR)
, mCount(0)
{
mCollection = Collection::root();
diff --git a/src/core/jobs/itemmodifyjob.cpp b/src/core/jobs/itemmodifyjob.cpp
index 528d02afb..c414f350c 100644
--- a/src/core/jobs/itemmodifyjob.cpp
+++ b/src/core/jobs/itemmodifyjob.cpp
@@ -145,7 +145,6 @@ Protocol::Command ItemModifyJobPrivate::fullCommand() const
Protocol::ModifyItemsCommand cmd;
const Akonadi::Item item = mItems.first();
- QList<QByteArray> changes;
foreach (int op, mOperations) {
switch (op) {
case ItemModifyJobPrivate::RemoteId:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic