summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vrátil <dvratil@kde.org>2016-10-13 09:57:42 (GMT)
committerDaniel Vrátil <dvratil@kde.org>2016-10-13 10:08:54 (GMT)
commit88eeb24aaa9757f680f332e6895337adeb00f7b7 (patch)
treeffe417a00b91ffcc1b2097a512ec1bdc00f70693
parentf5f49f9163e02fd20fbce5bcbbea729f22f7dd55 (diff)
Fix Krazy issues
-rw-r--r--KF5AkonadiMacros.cmake2
-rw-r--r--autotests/libs/CMakeLists.txt10
-rw-r--r--autotests/libs/attributefactorytest.h2
-rw-r--r--autotests/libs/autoincrementtest.h2
-rw-r--r--autotests/libs/changerecordertest.cpp4
-rw-r--r--autotests/libs/collectionattributetest.h2
-rw-r--r--autotests/libs/collectioncolorattributetest.cpp2
-rw-r--r--autotests/libs/collectioncopytest.cpp2
-rw-r--r--autotests/libs/collectionjobtest.h2
-rw-r--r--autotests/libs/collectionpathresolvertest.h2
-rw-r--r--autotests/libs/collectionsynctest.cpp2
-rw-r--r--autotests/libs/entitydisplayattributetest.cpp2
-rw-r--r--autotests/libs/fakeakonadiservercommand.cpp2
-rw-r--r--autotests/libs/fakeentitycache.h2
-rw-r--r--autotests/libs/fakemonitor.h2
-rw-r--r--autotests/libs/gidtest.cpp4
-rw-r--r--autotests/libs/gidtest.h2
-rw-r--r--autotests/libs/imapparsertest.cpp4
-rw-r--r--autotests/libs/imapparsertest.h2
-rw-r--r--autotests/libs/imapsettest.h2
-rw-r--r--autotests/libs/inspectablechangerecorder.h2
-rw-r--r--autotests/libs/inspectablemonitor.h2
-rw-r--r--autotests/libs/itemappendtest.cpp2
-rw-r--r--autotests/libs/itemappendtest.h2
-rw-r--r--autotests/libs/itembenchmark.cpp2
-rw-r--r--autotests/libs/itemcopytest.cpp2
-rw-r--r--autotests/libs/itemdeletetest.cpp2
-rw-r--r--autotests/libs/itemfetchtest.h2
-rw-r--r--autotests/libs/itemmovetest.cpp2
-rw-r--r--autotests/libs/itemserializertest.h2
-rw-r--r--autotests/libs/itemstoretest.h2
-rw-r--r--autotests/libs/itemsynctest.cpp2
-rw-r--r--autotests/libs/itemtest.h2
-rw-r--r--autotests/libs/linktest.cpp2
-rw-r--r--autotests/libs/mimetypecheckertest.h4
-rw-r--r--autotests/libs/modelspy.h2
-rw-r--r--autotests/libs/monitorfiltertest.cpp2
-rw-r--r--autotests/libs/monitortest.cpp4
-rw-r--r--autotests/libs/monitortest.h2
-rw-r--r--autotests/libs/referencetest.h2
-rw-r--r--autotests/libs/resourceschedulertest.h4
-rw-r--r--autotests/libs/resourcetest.cpp4
-rw-r--r--autotests/libs/searchjobtest.h2
-rw-r--r--autotests/libs/servermanagertest.cpp2
-rw-r--r--autotests/libs/subscriptiontest.cpp2
-rw-r--r--autotests/libs/tagmodeltest.cpp2
-rw-r--r--autotests/libs/tagsynctest.cpp2
-rw-r--r--autotests/libs/testresource/knutresource.cpp8
-rw-r--r--autotests/libs/testresource/knutresource.h2
-rw-r--r--autotests/libs/testrunner/config.cpp14
-rw-r--r--autotests/libs/testrunner/config.h6
-rw-r--r--autotests/libs/testrunner/setup.cpp10
-rw-r--r--autotests/libs/testrunner/setup.h2
-rw-r--r--autotests/libs/testrunner/shellscript.cpp4
-rw-r--r--autotests/libs/testrunner/shellscript.h2
-rw-r--r--autotests/libs/testrunner/testrunner.cpp4
-rw-r--r--autotests/libs/testrunner/testrunner.h8
-rw-r--r--autotests/libs/transactiontest.cpp4
-rw-r--r--autotests/libs/transactiontest.h2
-rw-r--r--autotests/libs/virtualresource.h2
-rw-r--r--autotests/private/akdbustest.cpp2
-rw-r--r--autotests/private/akstandarddirstest.cpp2
-rw-r--r--autotests/private/externalpartstoragetest.cpp4
-rw-r--r--autotests/private/notificationmessagetest.cpp2
-rw-r--r--autotests/private/notificationmessagetest.h2
-rw-r--r--autotests/private/protocoltest.cpp2
-rw-r--r--autotests/private/protocoltest.h4
-rw-r--r--autotests/server/akappendhandlertest.cpp2
-rw-r--r--autotests/server/collectionreferencetest.cpp2
-rw-r--r--autotests/server/createhandlertest.cpp2
-rw-r--r--autotests/server/dbconfigtest.cpp2
-rw-r--r--autotests/server/dbinitializer.cpp6
-rw-r--r--autotests/server/dbinitializertest.cpp4
-rw-r--r--autotests/server/dbinitializertest.h4
-rw-r--r--autotests/server/dbintrospectortest.cpp2
-rw-r--r--autotests/server/dbtypetest.cpp2
-rw-r--r--autotests/server/dbupdatertest.cpp4
-rw-r--r--autotests/server/dbupdatertest.h4
-rw-r--r--autotests/server/fakeakonadiserver.h2
-rw-r--r--autotests/server/fakeclient.h3
-rw-r--r--autotests/server/fakeconnection.h4
-rw-r--r--autotests/server/fetchhandlertest.cpp2
-rw-r--r--autotests/server/handlertest.cpp2
-rw-r--r--autotests/server/itemretrievertest.cpp2
-rw-r--r--autotests/server/linkhandlertest.cpp2
-rw-r--r--autotests/server/listhandlertest.cpp4
-rw-r--r--autotests/server/modifyhandlertest.cpp2
-rw-r--r--autotests/server/movehandlertest.cpp2
-rw-r--r--autotests/server/notificationmanagertest.cpp6
-rw-r--r--autotests/server/parthelpertest.cpp2
-rw-r--r--autotests/server/partstreamertest.cpp2
-rw-r--r--autotests/server/querybuildertest.cpp2
-rw-r--r--autotests/server/querybuildertest.h2
-rw-r--r--autotests/server/relationhandlertest.cpp2
-rw-r--r--autotests/server/taghandlertest.cpp2
-rw-r--r--src/.krazy1
-rw-r--r--src/agentbase/agentbase.cpp12
-rw-r--r--src/agentbase/agentbase.h4
-rw-r--r--src/agentbase/agentfactory.cpp4
-rw-r--r--src/agentbase/agentfactory.h4
-rw-r--r--src/agentbase/resourcebase.cpp10
-rw-r--r--src/agentbase/resourcescheduler.cpp6
-rw-r--r--src/agentbase/resourcescheduler_p.h6
-rw-r--r--src/agentbase/transportresourcebase.cpp2
-rw-r--r--src/agentbase/transportresourcebase.h2
-rw-r--r--src/agentbase/transportresourcebase_p.h2
-rw-r--r--src/agentserver/agentlauncher.cpp2
-rw-r--r--src/agentserver/agentpluginloader.h4
-rw-r--r--src/agentserver/agentserver.cpp10
-rw-r--r--src/agentserver/agentserver.h6
-rw-r--r--src/agentserver/agentthread.cpp4
-rw-r--r--src/agentserver/agentthread.h2
-rw-r--r--src/agentserver/main.cpp6
-rw-r--r--src/akonadicontrol/agentmanager.cpp12
-rw-r--r--src/akonadicontrol/agentmanager.h8
-rw-r--r--src/akonadicontrol/agentthreadinstance.cpp2
-rw-r--r--src/akonadicontrol/agentthreadinstance.h2
-rw-r--r--src/akonadicontrol/controlmanager.cpp4
-rw-r--r--src/akonadicontrol/controlmanager.h2
-rw-r--r--src/akonadicontrol/main.cpp8
-rw-r--r--src/akonadicontrol/processcontrol.cpp2
-rw-r--r--src/akonadicontrol/processcontrol.h4
-rw-r--r--src/akonadictl/akonadistarter.cpp10
-rw-r--r--src/akonadictl/akonadistarter.h2
-rw-r--r--src/akonadictl/main.cpp14
-rw-r--r--src/core/CMakeLists.txt2
-rw-r--r--src/core/agentinstance.h6
-rw-r--r--src/core/agentinstance_p.h4
-rw-r--r--src/core/agentmanager.cpp2
-rw-r--r--src/core/agentmanager.h2
-rw-r--r--src/core/agentmanager_p.h4
-rw-r--r--src/core/agenttype.h6
-rw-r--r--src/core/agenttype_p.h6
-rw-r--r--src/core/asyncselectionhandler_p.h2
-rw-r--r--src/core/attribute.h2
-rw-r--r--src/core/attributefactory.cpp2
-rw-r--r--src/core/cachepolicy.h4
-rw-r--r--src/core/changemediator_p.h6
-rw-r--r--src/core/changerecorder.cpp2
-rw-r--r--src/core/changerecorder_p.cpp12
-rw-r--r--src/core/collection.cpp8
-rw-r--r--src/core/collection.h6
-rw-r--r--src/core/collectioncolorattribute.cpp2
-rw-r--r--src/core/collectioncolorattribute.h2
-rw-r--r--src/core/collectionfetchscope.h4
-rw-r--r--src/core/collectionpathresolver.cpp2
-rw-r--r--src/core/collectionquotaattribute.cpp2
-rw-r--r--src/core/collectionstatistics.cpp4
-rw-r--r--src/core/collectionstatistics.h4
-rw-r--r--src/core/collectionsync.cpp6
-rw-r--r--src/core/collectionutils.h2
-rw-r--r--src/core/conflicthandler_p.h2
-rw-r--r--src/core/connection.cpp16
-rw-r--r--src/core/connection_p.h8
-rw-r--r--src/core/control.cpp8
-rw-r--r--src/core/control.h2
-rw-r--r--src/core/differencesalgorithminterface.h2
-rw-r--r--src/core/entitycache_p.h2
-rw-r--r--src/core/entitydeletedattribute.cpp4
-rw-r--r--src/core/entityhiddenattribute.cpp2
-rw-r--r--src/core/exception.h6
-rw-r--r--src/core/firstrun.cpp12
-rw-r--r--src/core/gidextractor_p.h2
-rw-r--r--src/core/gidextractorinterface.h2
-rw-r--r--src/core/indexpolicyattribute.cpp2
-rw-r--r--src/core/item.cpp4
-rw-r--r--src/core/item.h6
-rw-r--r--src/core/item_p.h6
-rw-r--r--src/core/itemfetchscope.cpp2
-rw-r--r--src/core/itemfetchscope.h2
-rw-r--r--src/core/itemfetchscope_p.h4
-rw-r--r--src/core/itemmonitor.cpp2
-rw-r--r--src/core/itemmonitor_p.h2
-rw-r--r--src/core/itempayloadinternals_p.h6
-rw-r--r--src/core/itemserializer.cpp8
-rw-r--r--src/core/itemserializer_p.h4
-rw-r--r--src/core/itemserializerplugin.cpp2
-rw-r--r--src/core/itemserializerplugin.h6
-rw-r--r--src/core/itemsync.cpp2
-rw-r--r--src/core/jobs/agentinstancecreatejob.cpp2
-rw-r--r--src/core/jobs/collectionfetchjob.cpp8
-rw-r--r--src/core/jobs/itemcreatejob.cpp4
-rw-r--r--src/core/jobs/itemfetchjob.cpp4
-rw-r--r--src/core/jobs/itemmodifyjob_p.h2
-rw-r--r--src/core/jobs/itemsearchjob.cpp2
-rw-r--r--src/core/jobs/itemsearchjob.h2
-rw-r--r--src/core/jobs/job.cpp10
-rw-r--r--src/core/jobs/kjobprivatebase_p.h2
-rw-r--r--src/core/jobs/recursiveitemfetchjob.cpp4
-rw-r--r--src/core/jobs/specialcollectionshelperjobs.cpp12
-rw-r--r--src/core/jobs/specialcollectionshelperjobs_p.h2
-rw-r--r--src/core/jobs/specialcollectionsrequestjob.cpp2
-rw-r--r--src/core/jobs/specialcollectionsrequestjob.h2
-rw-r--r--src/core/jobs/subscriptionjob.cpp4
-rw-r--r--src/core/jobs/transactionsequence.cpp4
-rw-r--r--src/core/mimetypechecker.h2
-rw-r--r--src/core/mimetypechecker_p.h4
-rw-r--r--src/core/models/agentfilterproxymodel.cpp6
-rw-r--r--src/core/models/agentinstancemodel.cpp2
-rw-r--r--src/core/models/agentinstancemodel.h2
-rw-r--r--src/core/models/agenttypemodel.cpp2
-rw-r--r--src/core/models/agenttypemodel.h2
-rw-r--r--src/core/models/collectionfilterproxymodel.cpp4
-rw-r--r--src/core/models/collectionmodel.cpp2
-rw-r--r--src/core/models/collectionmodel.h2
-rw-r--r--src/core/models/collectionmodel_p.cpp2
-rw-r--r--src/core/models/collectionmodel_p.h10
-rw-r--r--src/core/models/entitymimetypefiltermodel.cpp4
-rw-r--r--src/core/models/entityorderproxymodel.h2
-rw-r--r--src/core/models/entitytreemodel.cpp6
-rw-r--r--src/core/models/entitytreemodel.h4
-rw-r--r--src/core/models/entitytreemodel_p.cpp2
-rw-r--r--src/core/models/favoritecollectionsmodel.cpp2
-rw-r--r--src/core/models/itemmodel.cpp2
-rw-r--r--src/core/models/itemmodel.h2
-rw-r--r--src/core/models/recursivecollectionfilterproxymodel.h2
-rw-r--r--src/core/models/subscriptionmodel.cpp2
-rw-r--r--src/core/monitor.cpp6
-rw-r--r--src/core/monitor.h2
-rw-r--r--src/core/monitor_p.h4
-rw-r--r--src/core/notificationsource_p.h4
-rw-r--r--src/core/pastehelper.cpp8
-rw-r--r--src/core/pastehelper_p.h2
-rw-r--r--src/core/persistentsearchattribute.cpp6
-rw-r--r--src/core/pluginloader_p.h6
-rw-r--r--src/core/protocolhelper.cpp10
-rw-r--r--src/core/qtest_akonadi.h6
-rw-r--r--src/core/relationsync.h2
-rw-r--r--src/core/searchquery.cpp2
-rw-r--r--src/core/searchquery.h4
-rw-r--r--src/core/servermanager.cpp7
-rw-r--r--src/core/servermanager.h4
-rw-r--r--src/core/session.cpp18
-rw-r--r--src/core/session.h2
-rw-r--r--src/core/session_p.h8
-rw-r--r--src/core/specialcollectionattribute.h2
-rw-r--r--src/core/specialcollections.cpp6
-rw-r--r--src/core/specialcollections.h2
-rw-r--r--src/core/specialcollections_p.h4
-rw-r--r--src/core/std_exception.h.in2
-rw-r--r--src/core/tagsync.cpp6
-rw-r--r--src/core/tagsync.h2
-rw-r--r--src/core/typepluginloader.cpp12
-rw-r--r--src/core/typepluginloader_p.h2
-rw-r--r--src/private/datastream_p_p.h6
-rw-r--r--src/private/dbus.cpp6
-rw-r--r--src/private/externalpartstorage.cpp8
-rw-r--r--src/private/externalpartstorage_p.h8
-rw-r--r--src/private/imapparser.cpp4
-rw-r--r--src/private/imapparser_p.h6
-rw-r--r--src/private/imapset.cpp2
-rw-r--r--src/private/imapset_p.h18
-rw-r--r--src/private/instance.cpp2
-rw-r--r--src/private/protocol_exception_p.h6
-rw-r--r--src/private/protocol_p.h10
-rw-r--r--src/private/scope.cpp2
-rw-r--r--src/private/scope_p.h18
-rw-r--r--src/private/tristate_p.h4
-rw-r--r--src/private/xdgbasedirs.cpp12
-rw-r--r--src/private/xdgbasedirs_p.h4
-rw-r--r--src/rds/bridgeconnection.cpp12
-rw-r--r--src/rds/bridgeserver.h4
-rw-r--r--src/rds/exception.h2
-rw-r--r--src/rds/main.cpp4
-rw-r--r--src/server/aklocalserver.h2
-rw-r--r--src/server/akonadi.cpp18
-rw-r--r--src/server/akonadi.h6
-rw-r--r--src/server/cachecleaner.cpp6
-rw-r--r--src/server/cachecleaner.h4
-rw-r--r--src/server/collectionreferencemanager.cpp2
-rw-r--r--src/server/collectionscheduler.h2
-rw-r--r--src/server/connection.cpp4
-rw-r--r--src/server/connection.h12
-rw-r--r--src/server/dbustracer.h2
-rw-r--r--src/server/debuginterface.cpp3
-rw-r--r--src/server/exception.h6
-rw-r--r--src/server/filetracer.cpp4
-rw-r--r--src/server/filetracer.h2
-rw-r--r--src/server/handler.h4
-rw-r--r--src/server/handler/fetchhelper.cpp20
-rw-r--r--src/server/handler/fetchhelper.h2
-rw-r--r--src/server/handler/move.cpp2
-rw-r--r--src/server/handler/search.h4
-rw-r--r--src/server/handler/searchhelper.h4
-rw-r--r--src/server/handler/tagfetchhelper.h4
-rw-r--r--src/server/handlerhelper.h8
-rw-r--r--src/server/intervalcheck.h2
-rw-r--r--src/server/main.cpp8
-rw-r--r--src/server/notificationmanager.h2
-rw-r--r--src/server/preprocessorinstance.cpp2
-rw-r--r--src/server/preprocessorinstance.h4
-rw-r--r--src/server/preprocessormanager.cpp6
-rw-r--r--src/server/preprocessormanager.h6
-rw-r--r--src/server/resourcemanager.cpp4
-rw-r--r--src/server/resourcemanager.h4
-rw-r--r--src/server/search/abstractsearchplugin.h2
-rw-r--r--src/server/search/agentsearchinstance.h2
-rw-r--r--src/server/search/searchrequest.h2
-rw-r--r--src/server/storage/datastore.cpp40
-rw-r--r--src/server/storage/datastore.h14
-rw-r--r--src/server/storage/dbconfig.cpp4
-rw-r--r--src/server/storage/dbconfig.h4
-rw-r--r--src/server/storage/dbconfigmysql.cpp14
-rw-r--r--src/server/storage/dbconfigpostgresql.cpp10
-rw-r--r--src/server/storage/dbconfigsqlite.cpp8
-rw-r--r--src/server/storage/dbconfigsqlite.h2
-rw-r--r--src/server/storage/dbinitializer.cpp16
-rw-r--r--src/server/storage/dbinitializer.h10
-rw-r--r--src/server/storage/dbinitializer_p.h6
-rw-r--r--src/server/storage/dbintrospector_impl.h6
-rw-r--r--src/server/storage/dbupdater.cpp10
-rw-r--r--src/server/storage/dbupdater.h8
-rw-r--r--src/server/storage/entity.cpp10
-rw-r--r--src/server/storage/entity.h9
-rw-r--r--src/server/storage/itemretrievalmanager.h4
-rw-r--r--src/server/storage/itemretriever.cpp2
-rw-r--r--src/server/storage/itemretriever.h2
-rw-r--r--src/server/storage/notificationcollector.cpp2
-rw-r--r--src/server/storage/notificationcollector.h12
-rw-r--r--src/server/storage/parttypehelper.cpp2
-rw-r--r--src/server/storage/query.h8
-rw-r--r--src/server/storage/querybuilder.h12
-rw-r--r--src/server/storage/querycache.cpp4
-rw-r--r--src/server/storage/schematypes.h2
-rw-r--r--src/server/storage/storagedebugger.cpp10
-rw-r--r--src/server/storage/storagedebugger.h8
-rw-r--r--src/server/storagejanitor.cpp10
-rw-r--r--src/server/storagejanitor.h2
-rw-r--r--src/server/tracer.cpp4
-rw-r--r--src/server/tracer.h4
-rw-r--r--src/server/utils.cpp10
-rw-r--r--src/server/utils.h8
-rw-r--r--src/shared/akapplication.cpp2
-rw-r--r--src/shared/akapplication.h4
-rw-r--r--src/widgets/agentactionmanager.h2
-rw-r--r--src/widgets/agentinstancewidget.cpp2
-rw-r--r--src/widgets/collectioncombobox.cpp4
-rw-r--r--src/widgets/collectionrequester.cpp2
-rw-r--r--src/widgets/collectionview.cpp2
-rw-r--r--src/widgets/controlgui.cpp8
-rw-r--r--src/widgets/controlgui.h2
-rw-r--r--src/widgets/entitylistview.cpp2
-rw-r--r--src/widgets/entitytreeview.cpp4
-rw-r--r--src/widgets/erroroverlay.cpp2
-rw-r--r--src/widgets/erroroverlay_p.h2
-rw-r--r--src/widgets/etmviewstatesaver.cpp2
-rw-r--r--src/widgets/etmviewstatesaver.h2
-rw-r--r--src/widgets/selftestdialog.cpp13
-rw-r--r--src/widgets/standardactionmanager.cpp2
-rw-r--r--src/widgets/standardactionmanager.h2
-rw-r--r--src/xml/autotests/collectiontest.h2
-rw-r--r--src/xml/autotests/xmldocumenttest.cpp2
-rw-r--r--src/xml/xmldocument.h4
-rw-r--r--src/xml/xmlreader.h2
-rw-r--r--src/xml/xmlwriter.h2
-rw-r--r--tests/libs/collectiondialog.cpp2
-rw-r--r--tests/libs/pluginloadertest.cpp4
357 files changed, 808 insertions, 788 deletions
diff --git a/KF5AkonadiMacros.cmake b/KF5AkonadiMacros.cmake
index 9e35c3c..0d48750 100644
--- a/KF5AkonadiMacros.cmake
+++ b/KF5AkonadiMacros.cmake
@@ -24,7 +24,7 @@ macro(add_akonadi_isolated_test_advanced _source _additionalsources _linklibrari
add_executable( ${_name} ${_test} ${_additionalsources})
ecm_mark_as_test(${_name})
target_link_libraries(${_name}
- Qt5::Test Qt5::Gui Qt5::Widgets KF5::KIOCore KF5::AkonadiCore KF5::DBusAddons
+ Qt5::Test Qt5::Gui Qt5::Widgets Qt5::Network KF5::KIOCore KF5::AkonadiCore KF5::DBusAddons
${_linklibraries})
if (NOT DEFINED _testrunner)
diff --git a/autotests/libs/CMakeLists.txt b/autotests/libs/CMakeLists.txt
index 2769956..c987676 100644
--- a/autotests/libs/CMakeLists.txt
+++ b/autotests/libs/CMakeLists.txt
@@ -71,7 +71,15 @@ add_library(akonaditestfake SHARED
generate_export_header(akonaditestfake BASE_NAME akonaditestfake)
-target_link_libraries(akonaditestfake Qt5::DBus KF5::AkonadiCore Qt5::Test Qt5::Widgets KF5::DBusAddons KF5::AkonadiPrivate)
+target_link_libraries(akonaditestfake
+ Qt5::DBus
+ KF5::AkonadiCore
+ Qt5::Test
+ Qt5::Widgets
+ Qt5::Network
+ KF5::DBusAddons
+ KF5::AkonadiPrivate
+)
add_executable(akonadi-firstrun
../../src/core/firstrun.cpp
diff --git a/autotests/libs/attributefactorytest.h b/autotests/libs/attributefactorytest.h
index 337a758..3e706ca 100644
--- a/autotests/libs/attributefactorytest.h
+++ b/autotests/libs/attributefactorytest.h
@@ -20,7 +20,7 @@
#ifndef ATTRIBUTEFACTORYTEST_H
#define ATTRIBUTEFACTORYTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class AttributeFactoryTest : public QObject
{
diff --git a/autotests/libs/autoincrementtest.h b/autotests/libs/autoincrementtest.h
index 7f17ef3..0c50c9c 100644
--- a/autotests/libs/autoincrementtest.h
+++ b/autotests/libs/autoincrementtest.h
@@ -21,7 +21,7 @@
#include "collection.h"
-#include <QtCore/QObject>
+#include <QObject>
namespace Akonadi
{
diff --git a/autotests/libs/changerecordertest.cpp b/autotests/libs/changerecordertest.cpp
index 46ec03e..29e4f19 100644
--- a/autotests/libs/changerecordertest.cpp
+++ b/autotests/libs/changerecordertest.cpp
@@ -25,8 +25,8 @@
#include <itemdeletejob.h>
#include <agentmanager.h>
-#include <QtCore/QObject>
-#include <QtCore/QSettings>
+#include <QObject>
+#include <QSettings>
#include <qtest_akonadi.h>
diff --git a/autotests/libs/collectionattributetest.h b/autotests/libs/collectionattributetest.h
index a5f4239..e3f7b28 100644
--- a/autotests/libs/collectionattributetest.h
+++ b/autotests/libs/collectionattributetest.h
@@ -20,7 +20,7 @@
#ifndef COLLECTIONATTRIBUTETEST_H
#define COLLECTIONATTRIBUTETEST_H
-#include <QtCore/QObject>
+#include <QObject>
class CollectionAttributeTest : public QObject
{
diff --git a/autotests/libs/collectioncolorattributetest.cpp b/autotests/libs/collectioncolorattributetest.cpp
index 5dddd98..d462cbb 100644
--- a/autotests/libs/collectioncolorattributetest.cpp
+++ b/autotests/libs/collectioncolorattributetest.cpp
@@ -19,7 +19,7 @@
#include "collectioncolorattribute.h"
-#include <QtCore/QObject>
+#include <QObject>
#include <QTest>
diff --git a/autotests/libs/collectioncopytest.cpp b/autotests/libs/collectioncopytest.cpp
index 81aff45..90afb60 100644
--- a/autotests/libs/collectioncopytest.cpp
+++ b/autotests/libs/collectioncopytest.cpp
@@ -26,7 +26,7 @@
#include <itemfetchjob.h>
#include <itemfetchscope.h>
-#include <QtCore/QObject>
+#include <QObject>
#include "test_utils.h"
diff --git a/autotests/libs/collectionjobtest.h b/autotests/libs/collectionjobtest.h
index 066c963..672dcb7 100644
--- a/autotests/libs/collectionjobtest.h
+++ b/autotests/libs/collectionjobtest.h
@@ -20,7 +20,7 @@
#ifndef COLLECTIONJOBTEST_H
#define COLLECTIONJOBTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class CollectionJobTest : public QObject
{
diff --git a/autotests/libs/collectionpathresolvertest.h b/autotests/libs/collectionpathresolvertest.h
index 73ec2ac..f86afb1 100644
--- a/autotests/libs/collectionpathresolvertest.h
+++ b/autotests/libs/collectionpathresolvertest.h
@@ -20,7 +20,7 @@
#ifndef COLLECTIONPATHRESOLVER_TEST_H
#define COLLECTIONPATHRESOLVER_TEST_H
-#include <QtCore/QObject>
+#include <QObject>
class CollectionPathResolverTest : public QObject
{
diff --git a/autotests/libs/collectionsynctest.cpp b/autotests/libs/collectionsynctest.cpp
index c0b694d..e72115b 100644
--- a/autotests/libs/collectionsynctest.cpp
+++ b/autotests/libs/collectionsynctest.cpp
@@ -33,7 +33,7 @@
#include <krandom.h>
-#include <QtCore/QObject>
+#include <QObject>
#include <QSignalSpy>
#include <QEventLoop>
diff --git a/autotests/libs/entitydisplayattributetest.cpp b/autotests/libs/entitydisplayattributetest.cpp
index 1fcf9ca..f839d23 100644
--- a/autotests/libs/entitydisplayattributetest.cpp
+++ b/autotests/libs/entitydisplayattributetest.cpp
@@ -19,7 +19,7 @@
#include "entitydisplayattribute.h"
-#include <QtCore/QObject>
+#include <QObject>
#include <qtest.h>
diff --git a/autotests/libs/fakeakonadiservercommand.cpp b/autotests/libs/fakeakonadiservercommand.cpp
index 9955e8e..2ca0e09 100644
--- a/autotests/libs/fakeakonadiservercommand.cpp
+++ b/autotests/libs/fakeakonadiservercommand.cpp
@@ -329,7 +329,7 @@ void FakeJobResponse::parseEntityString(QList<FakeJobResponse *> &collectionResp
}
tag.setId(fakeServerData->nextTagId());
- tag.setRemoteId("RID_" + QByteArray::number(tag.id()) + " " + type.toLatin1());
+ tag.setRemoteId("RID_" + QByteArray::number(tag.id()) + ' ' + type.toLatin1());
tag.setType(type.toLatin1());
if (depth == 0) {
diff --git a/autotests/libs/fakeentitycache.h b/autotests/libs/fakeentitycache.h
index b12b214..ee95833 100644
--- a/autotests/libs/fakeentitycache.h
+++ b/autotests/libs/fakeentitycache.h
@@ -79,7 +79,7 @@ class AKONADITESTFAKE_EXPORT FakeNotificationSource : public QObject
{
Q_OBJECT
public:
- FakeNotificationSource(QObject *parent = Q_NULLPTR)
+ explicit FakeNotificationSource(QObject *parent = Q_NULLPTR)
: QObject(parent)
{
}
diff --git a/autotests/libs/fakemonitor.h b/autotests/libs/fakemonitor.h
index b758055..da08211 100644
--- a/autotests/libs/fakemonitor.h
+++ b/autotests/libs/fakemonitor.h
@@ -31,7 +31,7 @@ class AKONADITESTFAKE_EXPORT FakeMonitor : public Akonadi::ChangeRecorder
{
Q_OBJECT
public:
- FakeMonitor(QObject *parent = Q_NULLPTR);
+ explicit FakeMonitor(QObject *parent = Q_NULLPTR);
private:
Q_DECLARE_PRIVATE(FakeMonitor)
diff --git a/autotests/libs/gidtest.cpp b/autotests/libs/gidtest.cpp
index f99e93e..1adb2d4 100644
--- a/autotests/libs/gidtest.cpp
+++ b/autotests/libs/gidtest.cpp
@@ -116,7 +116,7 @@ void GidTest::testSetAndFetch()
QFETCH(Item, toFetch);
QFETCH(Item::List, expected);
- foreach (Item item, input) {
+ Q_FOREACH (const Item &item, input) {
fetchAndSetGid(item);
}
@@ -125,7 +125,7 @@ void GidTest::testSetAndFetch()
AKVERIFYEXEC(fetch);
Item::List fetched = fetch->items();
QCOMPARE(fetched.count(), expected.size());
- foreach (Item item, expected) {
+ Q_FOREACH (const Item &item, expected) {
QVERIFY(expected.removeOne(item));
}
QVERIFY(expected.isEmpty());
diff --git a/autotests/libs/gidtest.h b/autotests/libs/gidtest.h
index f37f1be..0a1d33f 100644
--- a/autotests/libs/gidtest.h
+++ b/autotests/libs/gidtest.h
@@ -20,7 +20,7 @@
#ifndef GIDTEST_H
#define GIDTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class GidTest : public QObject
{
diff --git a/autotests/libs/imapparsertest.cpp b/autotests/libs/imapparsertest.cpp
index 428a2f4..f83c1f6 100644
--- a/autotests/libs/imapparsertest.cpp
+++ b/autotests/libs/imapparsertest.cpp
@@ -21,8 +21,8 @@
#include "private/imapparser_p.h"
#include <qtest.h>
-#include <QtCore/QDebug>
-#include <QtCore/QVariant>
+#include <QDebug>
+#include <QVariant>
#include <QBuffer>
Q_DECLARE_METATYPE(QList<QByteArray>)
diff --git a/autotests/libs/imapparsertest.h b/autotests/libs/imapparsertest.h
index fdd4b71..d16d797 100644
--- a/autotests/libs/imapparsertest.h
+++ b/autotests/libs/imapparsertest.h
@@ -20,7 +20,7 @@
#ifndef IMAPPARSER_TEST_H
#define IMAPPARSER_TEST_H
-#include <QtCore/QObject>
+#include <QObject>
class ImapParserTest : public QObject
{
diff --git a/autotests/libs/imapsettest.h b/autotests/libs/imapsettest.h
index cb06285..a0b6898 100644
--- a/autotests/libs/imapsettest.h
+++ b/autotests/libs/imapsettest.h
@@ -20,7 +20,7 @@
#ifndef AKONADI_IMAPSETTEST_H
#define AKONADI_IMAPSETTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class ImapSetTest : public QObject
{
diff --git a/autotests/libs/inspectablechangerecorder.h b/autotests/libs/inspectablechangerecorder.h
index a742350..cec4483 100644
--- a/autotests/libs/inspectablechangerecorder.h
+++ b/autotests/libs/inspectablechangerecorder.h
@@ -48,7 +48,7 @@ class AKONADITESTFAKE_EXPORT InspectableChangeRecorder : public Akonadi::ChangeR
{
Q_OBJECT
public:
- InspectableChangeRecorder(FakeMonitorDependeciesFactory *dependenciesFactory, QObject *parent = Q_NULLPTR);
+ explicit InspectableChangeRecorder(FakeMonitorDependeciesFactory *dependenciesFactory, QObject *parent = Q_NULLPTR);
FakeNotificationConnection *notificationConnection() const
{
diff --git a/autotests/libs/inspectablemonitor.h b/autotests/libs/inspectablemonitor.h
index 68c6567..7f4b222 100644
--- a/autotests/libs/inspectablemonitor.h
+++ b/autotests/libs/inspectablemonitor.h
@@ -48,7 +48,7 @@ class AKONADITESTFAKE_EXPORT InspectableMonitor : public Akonadi::Monitor
{
Q_OBJECT
public:
- InspectableMonitor(FakeMonitorDependeciesFactory *dependenciesFactory, QObject *parent = Q_NULLPTR);
+ explicit InspectableMonitor(FakeMonitorDependeciesFactory *dependenciesFactory, QObject *parent = Q_NULLPTR);
FakeNotificationConnection *notificationConnection() const
{
diff --git a/autotests/libs/itemappendtest.cpp b/autotests/libs/itemappendtest.cpp
index e1626fe..773c15e 100644
--- a/autotests/libs/itemappendtest.cpp
+++ b/autotests/libs/itemappendtest.cpp
@@ -32,7 +32,7 @@
#include <itemfetchscope.h>
#include <itemdeletejob.h>
-#include <QtCore/QDebug>
+#include <QDebug>
using namespace Akonadi;
diff --git a/autotests/libs/itemappendtest.h b/autotests/libs/itemappendtest.h
index 77b9ff7..d1ff576 100644
--- a/autotests/libs/itemappendtest.h
+++ b/autotests/libs/itemappendtest.h
@@ -20,7 +20,7 @@
#ifndef ITEMAPPENDTEST_H
#define ITEMAPPENDTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class ItemAppendTest : public QObject
{
diff --git a/autotests/libs/itembenchmark.cpp b/autotests/libs/itembenchmark.cpp
index a18ffb0..826f0f1 100644
--- a/autotests/libs/itembenchmark.cpp
+++ b/autotests/libs/itembenchmark.cpp
@@ -29,7 +29,7 @@
#include "qtest_akonadi.h"
#include "test_utils.h"
-#include <QtCore/QDebug>
+#include <QDebug>
using namespace Akonadi;
diff --git a/autotests/libs/itemcopytest.cpp b/autotests/libs/itemcopytest.cpp
index 7772674..e52c4ad 100644
--- a/autotests/libs/itemcopytest.cpp
+++ b/autotests/libs/itemcopytest.cpp
@@ -26,7 +26,7 @@
#include <itemfetchjob.h>
#include <itemfetchscope.h>
-#include <QtCore/QObject>
+#include <QObject>
#include "test_utils.h"
#include <qtest_akonadi.h>
diff --git a/autotests/libs/itemdeletetest.cpp b/autotests/libs/itemdeletetest.cpp
index 9e014ed..64c8527 100644
--- a/autotests/libs/itemdeletetest.cpp
+++ b/autotests/libs/itemdeletetest.cpp
@@ -30,7 +30,7 @@
#include <monitor.h>
#include "test_utils.h"
-#include <QtCore/QObject>
+#include <QObject>
#include <sys/types.h>
diff --git a/autotests/libs/itemfetchtest.h b/autotests/libs/itemfetchtest.h
index afbf345..39c0e56 100644
--- a/autotests/libs/itemfetchtest.h
+++ b/autotests/libs/itemfetchtest.h
@@ -20,7 +20,7 @@
#ifndef ITEMFETCHTEST_H
#define ITEMFETCHTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class ItemFetchTest : public QObject
{
diff --git a/autotests/libs/itemmovetest.cpp b/autotests/libs/itemmovetest.cpp
index 2e2965b..015bca2 100644
--- a/autotests/libs/itemmovetest.cpp
+++ b/autotests/libs/itemmovetest.cpp
@@ -28,7 +28,7 @@
#include "monitor.h"
#include "session.h"
-#include <QtCore/QObject>
+#include <QObject>
#include <qtest_akonadi.h>
#include <resourceselectjob_p.h>
diff --git a/autotests/libs/itemserializertest.h b/autotests/libs/itemserializertest.h
index bf43b75..745eef1 100644
--- a/autotests/libs/itemserializertest.h
+++ b/autotests/libs/itemserializertest.h
@@ -20,7 +20,7 @@
#ifndef ITEMSERIALIZERTEST_H
#define ITEMSERIALIZERTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class ItemSerializerTest : public QObject
{
diff --git a/autotests/libs/itemstoretest.h b/autotests/libs/itemstoretest.h
index dc661be..1121408 100644
--- a/autotests/libs/itemstoretest.h
+++ b/autotests/libs/itemstoretest.h
@@ -21,7 +21,7 @@
#ifndef ITEMSTORETEST_H
#define ITEMSTORETEST_H
-#include <QtCore/QObject>
+#include <QObject>
class ItemStoreTest : public QObject
{
diff --git a/autotests/libs/itemsynctest.cpp b/autotests/libs/itemsynctest.cpp
index a55fbea..ece8c09 100644
--- a/autotests/libs/itemsynctest.cpp
+++ b/autotests/libs/itemsynctest.cpp
@@ -32,7 +32,7 @@
#include <krandom.h>
-#include <QtCore/QObject>
+#include <QObject>
#include <QSignalSpy>
#include <qtest_akonadi.h>
diff --git a/autotests/libs/itemtest.h b/autotests/libs/itemtest.h
index 7af8d9e..3fdb9c7 100644
--- a/autotests/libs/itemtest.h
+++ b/autotests/libs/itemtest.h
@@ -20,7 +20,7 @@
#ifndef AKONADI_ITEMTEST_H
#define AKONADI_ITEMTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class ItemTest : public QObject
{
diff --git a/autotests/libs/linktest.cpp b/autotests/libs/linktest.cpp
index 138ea7a..b0746b8 100644
--- a/autotests/libs/linktest.cpp
+++ b/autotests/libs/linktest.cpp
@@ -28,7 +28,7 @@
#include <searchcreatejob.h>
#include <searchquery.h>
-#include <QtCore/QObject>
+#include <QObject>
#include <qtest_akonadi.h>
diff --git a/autotests/libs/mimetypecheckertest.h b/autotests/libs/mimetypecheckertest.h
index 063813f..0a2bf0d 100644
--- a/autotests/libs/mimetypecheckertest.h
+++ b/autotests/libs/mimetypecheckertest.h
@@ -22,8 +22,8 @@
#include "mimetypechecker.h"
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QStringList>
class MimeTypeCheckerTest : public QObject
{
diff --git a/autotests/libs/modelspy.h b/autotests/libs/modelspy.h
index 28a806c..cdff8c3 100644
--- a/autotests/libs/modelspy.h
+++ b/autotests/libs/modelspy.h
@@ -52,7 +52,7 @@ class AKONADITESTFAKE_EXPORT ModelSpy : public QObject, public QList<QVariantLis
{
Q_OBJECT
public:
- ModelSpy(QObject *parent);
+ explicit ModelSpy(QObject *parent);
void setModel(QAbstractItemModel *model);
diff --git a/autotests/libs/monitorfiltertest.cpp b/autotests/libs/monitorfiltertest.cpp
index 6dbab20..f505b53 100644
--- a/autotests/libs/monitorfiltertest.cpp
+++ b/autotests/libs/monitorfiltertest.cpp
@@ -17,7 +17,7 @@
02110-1301, USA.
*/
-#include <QtCore/QObject>
+#include <QObject>
#include "monitor_p.h"
#include <qtest.h>
diff --git a/autotests/libs/monitortest.cpp b/autotests/libs/monitortest.cpp
index cccd5ce..9b0a0bb 100644
--- a/autotests/libs/monitortest.cpp
+++ b/autotests/libs/monitortest.cpp
@@ -40,8 +40,8 @@
#include <searchquery.h>
#include <subscriptionjob_p.h>
-#include <QtCore/QVariant>
-#include <QtTest/QSignalSpy>
+#include <QVariant>
+#include <QSignalSpy>
#include <qtest_akonadi.h>
using namespace Akonadi;
diff --git a/autotests/libs/monitortest.h b/autotests/libs/monitortest.h
index e7cd1d5..3d9960b 100644
--- a/autotests/libs/monitortest.h
+++ b/autotests/libs/monitortest.h
@@ -20,7 +20,7 @@
#ifndef MONITORTEST_H
#define MONITORTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class MonitorTest : public QObject
{
diff --git a/autotests/libs/referencetest.h b/autotests/libs/referencetest.h
index afd4ea9..70291cc 100644
--- a/autotests/libs/referencetest.h
+++ b/autotests/libs/referencetest.h
@@ -20,7 +20,7 @@
#ifndef REFERENCETEST_H
#define REFERENCETEST_H
-#include <QtCore/QObject>
+#include <QObject>
class ReferenceTest : public QObject
{
diff --git a/autotests/libs/resourceschedulertest.h b/autotests/libs/resourceschedulertest.h
index 10d6082..a90d9a4 100644
--- a/autotests/libs/resourceschedulertest.h
+++ b/autotests/libs/resourceschedulertest.h
@@ -19,8 +19,8 @@
#ifndef RESOURCESCHEDULERTEST_H
#define RESOURCESCHEDULERTEST_H
-#include <QtCore/QObject>
-#include <QtCore/QVariant>
+#include <QObject>
+#include <QVariant>
class ResourceSchedulerTest : public QObject
{
diff --git a/autotests/libs/resourcetest.cpp b/autotests/libs/resourcetest.cpp
index e673680..4c0991e 100644
--- a/autotests/libs/resourcetest.cpp
+++ b/autotests/libs/resourcetest.cpp
@@ -17,8 +17,8 @@
02110-1301, USA.
*/
-#include <QtCore/QMetaType>
-#include <QtCore/QObject>
+#include <QMetaType>
+#include <QObject>
#include <qtest_akonadi.h>
diff --git a/autotests/libs/searchjobtest.h b/autotests/libs/searchjobtest.h
index 7ae9707..23b3696 100644
--- a/autotests/libs/searchjobtest.h
+++ b/autotests/libs/searchjobtest.h
@@ -20,7 +20,7 @@
#ifndef AKONADI_SEARCHJOBTEST_H
#define AKONADI_SEARCHJOBTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class SearchJobTest : public QObject
{
diff --git a/autotests/libs/servermanagertest.cpp b/autotests/libs/servermanagertest.cpp
index ed983c1..d39cfa1 100644
--- a/autotests/libs/servermanagertest.cpp
+++ b/autotests/libs/servermanagertest.cpp
@@ -20,7 +20,7 @@
#include <control.h>
#include <servermanager.h>
-#include <QtCore/QObject>
+#include <QObject>
#include <qtest_akonadi.h>
diff --git a/autotests/libs/subscriptiontest.cpp b/autotests/libs/subscriptiontest.cpp
index bc48c8b..25ea662 100644
--- a/autotests/libs/subscriptiontest.cpp
+++ b/autotests/libs/subscriptiontest.cpp
@@ -25,7 +25,7 @@
#include <collectionfetchscope.h>
#include <subscriptionjob_p.h>
-#include <QtCore/QObject>
+#include <QObject>
#include <qtest_akonadi.h>
diff --git a/autotests/libs/tagmodeltest.cpp b/autotests/libs/tagmodeltest.cpp
index 9c7244b..133cdf6 100644
--- a/autotests/libs/tagmodeltest.cpp
+++ b/autotests/libs/tagmodeltest.cpp
@@ -379,4 +379,4 @@ void TagModelTest::testTagMoved()
#include "tagmodeltest.moc"
-QTEST_MAIN(TagModelTest) \ No newline at end of file
+QTEST_MAIN(TagModelTest)
diff --git a/autotests/libs/tagsynctest.cpp b/autotests/libs/tagsynctest.cpp
index 89cc2e5..1b64aac 100644
--- a/autotests/libs/tagsynctest.cpp
+++ b/autotests/libs/tagsynctest.cpp
@@ -32,7 +32,7 @@
#include <itemfetchjob.h>
#include <itemfetchscope.h>
-#include <QtCore/QObject>
+#include <QObject>
#include <QSignalSpy>
#include <qtest_akonadi.h>
diff --git a/autotests/libs/testresource/knutresource.cpp b/autotests/libs/testresource/knutresource.cpp
index 00dd95f..bb4896a 100644
--- a/autotests/libs/testresource/knutresource.cpp
+++ b/autotests/libs/testresource/knutresource.cpp
@@ -37,13 +37,13 @@
#include <QFileDialog>
#include <KLocalizedString>
-#include <QtCore/QFile>
+#include <QFile>
#include <QFileSystemWatcher>
-#include <QtCore/QDir>
-#include <QtCore/QUuid>
+#include <QDir>
+#include <QUuid>
#include <QStandardPaths>
#include <QDebug>
-#include <QtWidgets/QFileDialog>
+#include <QFileDialog>
using namespace Akonadi;
diff --git a/autotests/libs/testresource/knutresource.h b/autotests/libs/testresource/knutresource.h
index d70c778..1046725 100644
--- a/autotests/libs/testresource/knutresource.h
+++ b/autotests/libs/testresource/knutresource.h
@@ -41,7 +41,7 @@ class KnutResource : public Akonadi::ResourceBase,
public:
using Akonadi::AgentBase::ObserverV2::collectionChanged; // So we don't trigger -Woverloaded-virtual
- KnutResource(const QString &id);
+ explicit KnutResource(const QString &id);
~KnutResource();
public Q_SLOTS:
diff --git a/autotests/libs/testrunner/config.cpp b/autotests/libs/testrunner/config.cpp
index 2402fa8..e183278 100644
--- a/autotests/libs/testrunner/config.cpp
+++ b/autotests/libs/testrunner/config.cpp
@@ -19,13 +19,13 @@
#include <QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QPair>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
-#include <QtXml/QDomNode>
+#include <QDir>
+#include <QPair>
+#include <QFile>
+#include <QFileInfo>
+#include <QDomDocument>
+#include <QDomElement>
+#include <QDomNode>
Q_GLOBAL_STATIC(Config, globalConfig)
diff --git a/autotests/libs/testrunner/config.h b/autotests/libs/testrunner/config.h
index 8bcd77c..c95e1fe 100644
--- a/autotests/libs/testrunner/config.h
+++ b/autotests/libs/testrunner/config.h
@@ -18,9 +18,9 @@
#ifndef CONFIG_H
#define CONFIG_H
-#include <QtCore/QHash>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QHash>
+#include <QString>
+#include <QStringList>
class Config
{
diff --git a/autotests/libs/testrunner/setup.cpp b/autotests/libs/testrunner/setup.cpp
index 9b371e5..91a1f78 100644
--- a/autotests/libs/testrunner/setup.cpp
+++ b/autotests/libs/testrunner/setup.cpp
@@ -28,11 +28,11 @@
#include <qdebug.h>
#include <KProcess>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QTimer>
#include <QDBusConnection>
bool SetupTest::startAkonadiDaemon()
diff --git a/autotests/libs/testrunner/setup.h b/autotests/libs/testrunner/setup.h
index 5ad50d0..8f68d1f 100644
--- a/autotests/libs/testrunner/setup.h
+++ b/autotests/libs/testrunner/setup.h
@@ -20,7 +20,7 @@
#include <servermanager.h>
-#include <QtCore/QObject>
+#include <QObject>
#include <QVector>
#include <QPair>
diff --git a/autotests/libs/testrunner/shellscript.cpp b/autotests/libs/testrunner/shellscript.cpp
index f037305..3b18a59 100644
--- a/autotests/libs/testrunner/shellscript.cpp
+++ b/autotests/libs/testrunner/shellscript.cpp
@@ -21,8 +21,8 @@
#include <QDebug>
#include <QCoreApplication>
-#include <QtCore/QFile>
-#include <QtCore/QHashIterator>
+#include <QFile>
+#include <QHashIterator>
ShellScript::ShellScript()
{
diff --git a/autotests/libs/testrunner/shellscript.h b/autotests/libs/testrunner/shellscript.h
index 8d7199a..9119591 100644
--- a/autotests/libs/testrunner/shellscript.h
+++ b/autotests/libs/testrunner/shellscript.h
@@ -18,7 +18,7 @@
#ifndef SHELLSCRIPT_H
#define SHELLSCRIPT_H
-#include <QtCore/QString>
+#include <QString>
#include <QVector>
#include <QPair>
diff --git a/autotests/libs/testrunner/testrunner.cpp b/autotests/libs/testrunner/testrunner.cpp
index cf45de4..d25160e 100644
--- a/autotests/libs/testrunner/testrunner.cpp
+++ b/autotests/libs/testrunner/testrunner.cpp
@@ -20,8 +20,8 @@
#include <QDebug>
#include <KProcess>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QTimer>
TestRunner::TestRunner(const QStringList &args, QObject *parent)
: QObject(parent)
diff --git a/autotests/libs/testrunner/testrunner.h b/autotests/libs/testrunner/testrunner.h
index 3f520ce..240ada8 100644
--- a/autotests/libs/testrunner/testrunner.h
+++ b/autotests/libs/testrunner/testrunner.h
@@ -18,9 +18,9 @@
#ifndef TESTRUNNER_H
#define TESTRUNNER_H
-#include <QtCore/QObject>
-#include <QtCore/QProcess>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QProcess>
+#include <QStringList>
class KProcess;
@@ -29,7 +29,7 @@ class TestRunner : public QObject
Q_OBJECT
public:
- TestRunner(const QStringList &args, QObject *parent = Q_NULLPTR);
+ explicit TestRunner(const QStringList &args, QObject *parent = Q_NULLPTR);
int exitCode() const;
void terminate();
diff --git a/autotests/libs/transactiontest.cpp b/autotests/libs/transactiontest.cpp
index 0b8cad8..3472e80 100644
--- a/autotests/libs/transactiontest.cpp
+++ b/autotests/libs/transactiontest.cpp
@@ -28,8 +28,8 @@
#include <session.h>
#include <transactionjobs.h>
-#include <QtCore/QVariant>
-#include <QtTest/QSignalSpy>
+#include <QVariant>
+#include <QSignalSpy>
#include <qtest_akonadi.h>
using namespace Akonadi;
diff --git a/autotests/libs/transactiontest.h b/autotests/libs/transactiontest.h
index 52986ff..a260c5d 100644
--- a/autotests/libs/transactiontest.h
+++ b/autotests/libs/transactiontest.h
@@ -20,7 +20,7 @@
#ifndef TRANSACTIONTEST_H
#define TRANSACTIONTEST_H
-#include <QtCore/QObject>
+#include <QObject>
class TransactionTest : public QObject
{
diff --git a/autotests/libs/virtualresource.h b/autotests/libs/virtualresource.h
index 092deda..b617988 100644
--- a/autotests/libs/virtualresource.h
+++ b/autotests/libs/virtualresource.h
@@ -35,7 +35,7 @@ class AKONADI_EXPORT VirtualResource : public QObject
{
Q_OBJECT
public:
- VirtualResource(const QString &name, QObject *parent = 0);
+ explicit VirtualResource(const QString &name, QObject *parent = 0);
~VirtualResource();
Akonadi::Collection createCollection(const Akonadi::Collection &collection);
diff --git a/autotests/private/akdbustest.cpp b/autotests/private/akdbustest.cpp
index 3d6c068..a85a977 100644
--- a/autotests/private/akdbustest.cpp
+++ b/autotests/private/akdbustest.cpp
@@ -18,7 +18,7 @@
*/
#include <QObject>
-#include <QtTest/QTest>
+#include <QTest>
#include <private/dbus_p.h>
diff --git a/autotests/private/akstandarddirstest.cpp b/autotests/private/akstandarddirstest.cpp
index 8ff9d77..a229f90 100644
--- a/autotests/private/akstandarddirstest.cpp
+++ b/autotests/private/akstandarddirstest.cpp
@@ -21,7 +21,7 @@
#include <aktest.h>
#include <QObject>
-#include <QtTest/QTest>
+#include <QTest>
#include <QDebug>
#define QL1S(x) QStringLiteral(x)
diff --git a/autotests/private/externalpartstoragetest.cpp b/autotests/private/externalpartstoragetest.cpp
index 9025695..47a2627 100644
--- a/autotests/private/externalpartstoragetest.cpp
+++ b/autotests/private/externalpartstoragetest.cpp
@@ -21,8 +21,8 @@
#include <private/standarddirs_p.h>
#include <shared/aktest.h>
-#include <QtCore/QObject>
-#include <QtCore/QFile>
+#include <QObject>
+#include <QFile>
#include <QDir>
using namespace Akonadi;
diff --git a/autotests/private/notificationmessagetest.cpp b/autotests/private/notificationmessagetest.cpp
index 4a93d3c..fe8668b 100644
--- a/autotests/private/notificationmessagetest.cpp
+++ b/autotests/private/notificationmessagetest.cpp
@@ -21,7 +21,7 @@
#include <private/protocol_p.h>
#include <QSet>
-#include <QtTest/QTest>
+#include <QTest>
QTEST_APPLESS_MAIN(NotificationMessageTest)
diff --git a/autotests/private/notificationmessagetest.h b/autotests/private/notificationmessagetest.h
index aa244ea..ba15e74 100644
--- a/autotests/private/notificationmessagetest.h
+++ b/autotests/private/notificationmessagetest.h
@@ -20,7 +20,7 @@
#ifndef AKONADI_NOTIFICATIONMESSAGETEST_H
#define AKONADI_NOTIFICATIONMESSAGETEST_H
-#include <QtCore/QObject>
+#include <QObject>
class NotificationMessageTest : public QObject
{
diff --git a/autotests/private/protocoltest.cpp b/autotests/private/protocoltest.cpp
index 860f6fb..393f8f4 100644
--- a/autotests/private/protocoltest.cpp
+++ b/autotests/private/protocoltest.cpp
@@ -21,7 +21,7 @@
#include "private/scope_p.h"
-#include <QtTest/QTest>
+#include <QTest>
using namespace Akonadi;
using namespace Akonadi::Protocol;
diff --git a/autotests/private/protocoltest.h b/autotests/private/protocoltest.h
index 2d7978d..4c7a478 100644
--- a/autotests/private/protocoltest.h
+++ b/autotests/private/protocoltest.h
@@ -20,8 +20,8 @@
#ifndef PROTOCOLTEST_H
#define PROTOCOLTEST_H
-#include <QtCore/QObject>
-#include <QtCore/QBuffer>
+#include <QObject>
+#include <QBuffer>
#include <private/protocol_p.h>
#include <private/datastream_p_p.h>
diff --git a/autotests/server/akappendhandlertest.cpp b/autotests/server/akappendhandlertest.cpp
index 4fd6881..e014582 100644
--- a/autotests/server/akappendhandlertest.cpp
+++ b/autotests/server/akappendhandlertest.cpp
@@ -31,7 +31,7 @@
#include <shared/aktest.h>
-#include <QtTest/QTest>
+#include <QTest>
#include <QSignalSpy>
using namespace Akonadi;
diff --git a/autotests/server/collectionreferencetest.cpp b/autotests/server/collectionreferencetest.cpp
index 4387033..d29292a 100644
--- a/autotests/server/collectionreferencetest.cpp
+++ b/autotests/server/collectionreferencetest.cpp
@@ -30,7 +30,7 @@
#include <private/scope_p.h>
-#include <QtTest/QTest>
+#include <QTest>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/autotests/server/createhandlertest.cpp b/autotests/server/createhandlertest.cpp
index 8c5ded8..9ca2655 100644
--- a/autotests/server/createhandlertest.cpp
+++ b/autotests/server/createhandlertest.cpp
@@ -28,7 +28,7 @@
#include <private/scope_p.h>
-#include <QtTest/QTest>
+#include <QTest>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/autotests/server/dbconfigtest.cpp b/autotests/server/dbconfigtest.cpp
index 6ddc18b..516aae3 100644
--- a/autotests/server/dbconfigtest.cpp
+++ b/autotests/server/dbconfigtest.cpp
@@ -18,7 +18,7 @@
*/
#include <QObject>
-#include <QtTest/QTest>
+#include <QTest>
#include <QSettings>
#include <aktest.h>
diff --git a/autotests/server/dbinitializer.cpp b/autotests/server/dbinitializer.cpp
index 8b34790..6ec871f 100644
--- a/autotests/server/dbinitializer.cpp
+++ b/autotests/server/dbinitializer.cpp
@@ -186,7 +186,7 @@ Collection DbInitializer::collection(const char *name)
void DbInitializer::cleanup()
{
- Q_FOREACH (Collection col, mResource.collections()) {
+ Q_FOREACH (Collection col, mResource.collections()) { //krazy:exclude=foreach
if (!col.isVirtual()) {
col.remove();
}
@@ -208,10 +208,10 @@ void DbInitializer::cleanup()
}
}
- Q_FOREACH(Part part, Part::retrieveAll()) {
+ Q_FOREACH(Part part, Part::retrieveAll()) { //krazy:exclude=foreach
part.remove();
}
- Q_FOREACH(PimItem item, PimItem::retrieveAll()) {
+ Q_FOREACH(PimItem item, PimItem::retrieveAll()) { //krazy:exclude=foreach
item.remove();
}
}
diff --git a/autotests/server/dbinitializertest.cpp b/autotests/server/dbinitializertest.cpp
index 82ea175..b2a5d9b 100644
--- a/autotests/server/dbinitializertest.cpp
+++ b/autotests/server/dbinitializertest.cpp
@@ -21,8 +21,8 @@
#include "dbinitializertest.h"
#include "unittestschema.h"
-#include <QtCore/QDebug>
-#include <QtCore/QVariant>
+#include <QDebug>
+#include <QVariant>
#define DBINITIALIZER_UNITTEST
#include "storage/dbinitializer.cpp"
diff --git a/autotests/server/dbinitializertest.h b/autotests/server/dbinitializertest.h
index 3c54116..242c5a4 100644
--- a/autotests/server/dbinitializertest.h
+++ b/autotests/server/dbinitializertest.h
@@ -20,8 +20,8 @@
#ifndef DBINITIALIZERTEST_H
#define DBINITIALIZERTEST_H
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QTest>
class DbInitializerTest : public QObject
{
diff --git a/autotests/server/dbintrospectortest.cpp b/autotests/server/dbintrospectortest.cpp
index 62f63eb..18386e3 100644
--- a/autotests/server/dbintrospectortest.cpp
+++ b/autotests/server/dbintrospectortest.cpp
@@ -18,7 +18,7 @@
*/
#include <QObject>
-#include <QtTest/QTest>
+#include <QTest>
#include <QDebug>
#include <aktest.h>
diff --git a/autotests/server/dbtypetest.cpp b/autotests/server/dbtypetest.cpp
index 8ecb965..daac57a 100644
--- a/autotests/server/dbtypetest.cpp
+++ b/autotests/server/dbtypetest.cpp
@@ -18,7 +18,7 @@
*/
#include <QObject>
-#include <QtTest/QTest>
+#include <QTest>
#include <aktest.h>
#include <storage/dbtype.h>
diff --git a/autotests/server/dbupdatertest.cpp b/autotests/server/dbupdatertest.cpp
index 7a880c9..06554b6 100644
--- a/autotests/server/dbupdatertest.cpp
+++ b/autotests/server/dbupdatertest.cpp
@@ -19,8 +19,8 @@
#include "dbupdatertest.h"
-#include <QtCore/QDebug>
-#include <QtCore/QVariant>
+#include <QDebug>
+#include <QVariant>
#include <QBuffer>
#include <QDir>
diff --git a/autotests/server/dbupdatertest.h b/autotests/server/dbupdatertest.h
index 3da1b2c..54452b6 100644
--- a/autotests/server/dbupdatertest.h
+++ b/autotests/server/dbupdatertest.h
@@ -20,8 +20,8 @@
#ifndef DBUPDATERTEST_H
#define DBUPDATERTEST_H
-#include <QtCore/QObject>
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QTest>
class DbUpdaterTest : public QObject
{
diff --git a/autotests/server/fakeakonadiserver.h b/autotests/server/fakeakonadiserver.h
index ddfc32c..7ac7225 100644
--- a/autotests/server/fakeakonadiserver.h
+++ b/autotests/server/fakeakonadiserver.h
@@ -25,7 +25,7 @@
#include <QSignalSpy>
#include <QBuffer>
#include <QDataStream>
-#include <QtTest/QTest>
+#include <QTest>
#include <QSharedPointer>
#include <type_traits>
diff --git a/autotests/server/fakeclient.h b/autotests/server/fakeclient.h
index c167f14..34a6df3 100644
--- a/autotests/server/fakeclient.h
+++ b/autotests/server/fakeclient.h
@@ -36,8 +36,7 @@ class FakeClient : public QThread
Q_OBJECT
public:
-
- FakeClient(QObject *parent = Q_NULLPTR);
+ explicit FakeClient(QObject *parent = Q_NULLPTR);
~FakeClient();
void setScenarios(const TestScenario::List &scenarios);
diff --git a/autotests/server/fakeconnection.h b/autotests/server/fakeconnection.h
index cf37eb5..c9ae59d 100644
--- a/autotests/server/fakeconnection.h
+++ b/autotests/server/fakeconnection.h
@@ -32,8 +32,8 @@ class FakeConnection : public Connection
Q_OBJECT
public:
- FakeConnection(quintptr socketDescriptor, QObject *parent = Q_NULLPTR);
- FakeConnection(QObject *parent = Q_NULLPTR);
+ explicit FakeConnection(quintptr socketDescriptor, QObject *parent = Q_NULLPTR);
+ explicit FakeConnection(QObject *parent = Q_NULLPTR);
virtual ~FakeConnection();
DataStore *storageBackend() Q_DECL_OVERRIDE;
diff --git a/autotests/server/fetchhandlertest.cpp b/autotests/server/fetchhandlertest.cpp
index 3e2dd63..92bbde8 100644
--- a/autotests/server/fetchhandlertest.cpp
+++ b/autotests/server/fetchhandlertest.cpp
@@ -27,7 +27,7 @@
#include "entities.h"
#include "dbinitializer.h"
-#include <QtTest/QTest>
+#include <QTest>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/autotests/server/handlertest.cpp b/autotests/server/handlertest.cpp
index 06a57a8..9698dd6 100644
--- a/autotests/server/handlertest.cpp
+++ b/autotests/server/handlertest.cpp
@@ -18,7 +18,7 @@
*/
#include <QObject>
-#include <QtTest/QTest>
+#include <QTest>
#include <aktest.h>
#include <private/protocol_p.h>
diff --git a/autotests/server/itemretrievertest.cpp b/autotests/server/itemretrievertest.cpp
index 9aa46b6..fb4468d 100644
--- a/autotests/server/itemretrievertest.cpp
+++ b/autotests/server/itemretrievertest.cpp
@@ -18,7 +18,7 @@
*/
#include <QObject>
-#include <QtTest/QTest>
+#include <QTest>
#include <QTimer>
#include "storage/itemretriever.h"
diff --git a/autotests/server/linkhandlertest.cpp b/autotests/server/linkhandlertest.cpp
index 0967966..138835d 100644
--- a/autotests/server/linkhandlertest.cpp
+++ b/autotests/server/linkhandlertest.cpp
@@ -28,7 +28,7 @@
#include <private/scope_p.h>
#include <private/imapset_p.h>
-#include <QtTest/QTest>
+#include <QTest>
#include <QSignalSpy>
using namespace Akonadi;
diff --git a/autotests/server/listhandlertest.cpp b/autotests/server/listhandlertest.cpp
index 85bf000..60c9e77 100644
--- a/autotests/server/listhandlertest.cpp
+++ b/autotests/server/listhandlertest.cpp
@@ -30,7 +30,7 @@
#include "dbinitializer.h"
#include <storage/storagedebugger.h>
-#include <QtTest/QTest>
+#include <QTest>
using namespace Akonadi;
using namespace Akonadi::Server;
@@ -489,7 +489,7 @@ private Q_SLOTS:
FakeAkonadiServer::instance()->runTest();
}
-//No point in running the benchmark everytime
+//No point in running the benchmark every time
#if 0
void testListEnabledBenchmark_data()
diff --git a/autotests/server/modifyhandlertest.cpp b/autotests/server/modifyhandlertest.cpp
index da22c32..2a59c45 100644
--- a/autotests/server/modifyhandlertest.cpp
+++ b/autotests/server/modifyhandlertest.cpp
@@ -28,7 +28,7 @@
#include <private/scope_p.h>
#include <private/imapset_p.h>
-#include <QtTest/QTest>
+#include <QTest>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/autotests/server/movehandlertest.cpp b/autotests/server/movehandlertest.cpp
index 22973cf..640d4f2 100644
--- a/autotests/server/movehandlertest.cpp
+++ b/autotests/server/movehandlertest.cpp
@@ -28,7 +28,7 @@
#include <private/scope_p.h>
#include <private/imapset_p.h>
-#include <QtTest/QTest>
+#include <QTest>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/autotests/server/notificationmanagertest.cpp b/autotests/server/notificationmanagertest.cpp
index 1b66c05..216497a 100644
--- a/autotests/server/notificationmanagertest.cpp
+++ b/autotests/server/notificationmanagertest.cpp
@@ -23,10 +23,10 @@
#include "notificationmanager.h"
#include "notificationsubscriber.h"
-#include <QtCore/QObject>
-#include <QtTest/QTest>
+#include <QObject>
+#include <QTest>
#include <QSignalSpy>
-#include <QtCore/QDebug>
+#include <QDebug>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/autotests/server/parthelpertest.cpp b/autotests/server/parthelpertest.cpp
index 097fecb..578968a 100644
--- a/autotests/server/parthelpertest.cpp
+++ b/autotests/server/parthelpertest.cpp
@@ -22,7 +22,7 @@
#include "storage/parthelper.h"
#include <QObject>
-#include <QtTest/QTest>
+#include <QTest>
#include <QDebug>
#include <QDir>
diff --git a/autotests/server/partstreamertest.cpp b/autotests/server/partstreamertest.cpp
index 4588125..9e28550 100644
--- a/autotests/server/partstreamertest.cpp
+++ b/autotests/server/partstreamertest.cpp
@@ -30,7 +30,7 @@
#include "storage/partstreamer.h"
#include <storage/parthelper.h>
-#include <QtTest>
+#include <QTest>
#include <QSettings>
#include <private/scope_p.h>
diff --git a/autotests/server/querybuildertest.cpp b/autotests/server/querybuildertest.cpp
index 7df5cc9..49b0f9e 100644
--- a/autotests/server/querybuildertest.cpp
+++ b/autotests/server/querybuildertest.cpp
@@ -25,7 +25,7 @@
#include "storage/query.cpp"
#include "storage/querybuilder.cpp"
-#include <QtTest/QtTest>
+#include <QTest>
QTEST_MAIN(QueryBuilderTest)
diff --git a/autotests/server/querybuildertest.h b/autotests/server/querybuildertest.h
index b377198..397cace 100644
--- a/autotests/server/querybuildertest.h
+++ b/autotests/server/querybuildertest.h
@@ -22,7 +22,7 @@
#undef QT_NO_CAST_FROM_ASCII
-#include <QtCore/QObject>
+#include <QObject>
namespace Akonadi {
namespace Server {
diff --git a/autotests/server/relationhandlertest.cpp b/autotests/server/relationhandlertest.cpp
index 0d4c0f1..ed8c678 100644
--- a/autotests/server/relationhandlertest.cpp
+++ b/autotests/server/relationhandlertest.cpp
@@ -27,7 +27,7 @@
#include "entities.h"
#include "dbinitializer.h"
-#include <QtTest/QTest>
+#include <QTest>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/autotests/server/taghandlertest.cpp b/autotests/server/taghandlertest.cpp
index 88a7cfc..0003c94 100644
--- a/autotests/server/taghandlertest.cpp
+++ b/autotests/server/taghandlertest.cpp
@@ -29,7 +29,7 @@
#include <private/scope_p.h>
-#include <QtTest/QTest>
+#include <QTest>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/src/.krazy b/src/.krazy
new file mode 100644
index 0000000..f22ca66
--- /dev/null
+++ b/src/.krazy
@@ -0,0 +1 @@
+SKIP qsqlite
diff --git a/src/agentbase/agentbase.cpp b/src/agentbase/agentbase.cpp
index c7c2f90..69743fd 100644
--- a/src/agentbase/agentbase.cpp
+++ b/src/agentbase/agentbase.cpp
@@ -44,13 +44,13 @@
#include <Kdelibs4ConfigMigrator>
-#include <QtCore/QDir>
-#include <QtCore/QSettings>
-#include <QtCore/QTimer>
-#include <QtDBus/QtDBus>
+#include <QDir>
+#include <QSettings>
+#include <QTimer>
+#include <QDBusConnection>
#include <QApplication>
-#include <QtCore/QCommandLineParser>
-#include <QtNetwork/QNetworkConfiguration>
+#include <QCommandLineParser>
+#include <QNetworkConfiguration>
#include <QNetworkConfigurationManager>
#include <signal.h>
diff --git a/src/agentbase/agentbase.h b/src/agentbase/agentbase.h
index 5271a06..4e631a3 100644
--- a/src/agentbase/agentbase.h
+++ b/src/agentbase/agentbase.h
@@ -31,8 +31,8 @@
#include <KSharedConfig>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusContext>
+#include <QDBusConnection>
+#include <QDBusContext>
class Akonadi__ControlAdaptor;
class Akonadi__StatusAdaptor;
diff --git a/src/agentbase/agentfactory.cpp b/src/agentbase/agentfactory.cpp
index c5c6ed2..75a4ede 100644
--- a/src/agentbase/agentfactory.cpp
+++ b/src/agentbase/agentfactory.cpp
@@ -27,8 +27,8 @@
#include <KLocalizedString>
#include <kglobal.h>
-#include <QtCore/QThread>
-#include <QtCore/QThreadStorage>
+#include <QThread>
+#include <QThreadStorage>
QThreadStorage<KComponentData *> s_agentComponentDatas;
diff --git a/src/agentbase/agentfactory.h b/src/agentbase/agentfactory.h
index 190263a..2f0cc72 100644
--- a/src/agentbase/agentfactory.h
+++ b/src/agentbase/agentfactory.h
@@ -26,8 +26,8 @@
#include "akonadiagentbase_export.h"
#include "agentbase.h"
-#include <QtCore/QObject>
-#include <QtCore/QtPlugin>
+#include <QObject>
+#include <QtPlugin>
namespace Akonadi
{
diff --git a/src/agentbase/resourcebase.cpp b/src/agentbase/resourcebase.cpp
index 6b10bf6..64be61e 100644
--- a/src/agentbase/resourcebase.cpp
+++ b/src/agentbase/resourcebase.cpp
@@ -53,12 +53,12 @@
#include "akonadiagentbase_debug.h"
#include <KLocalizedString>
-#include <QtCore/QDir>
-#include <QtCore/QHash>
-#include <QtCore/QSettings>
-#include <QtCore/QTimer>
+#include <QDir>
+#include <QHash>
+#include <QSettings>
+#include <QTimer>
#include <QApplication>
-#include <QtDBus/QtDBus>
+#include <QDBusConnection>
using namespace Akonadi;
diff --git a/src/agentbase/resourcescheduler.cpp b/src/agentbase/resourcescheduler.cpp
index e4f181c..cad6fc3 100644
--- a/src/agentbase/resourcescheduler.cpp
+++ b/src/agentbase/resourcescheduler.cpp
@@ -25,9 +25,9 @@
#include "akonadiagentbase_debug.h"
#include <KLocalizedString>
-#include <QtCore/QTimer>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusConnectionInterface>
+#include <QTimer>
+#include <QDBusInterface>
+#include <QDBusConnectionInterface>
using namespace Akonadi;
diff --git a/src/agentbase/resourcescheduler_p.h b/src/agentbase/resourcescheduler_p.h
index d4fa78e..0452b9a 100644
--- a/src/agentbase/resourcescheduler_p.h
+++ b/src/agentbase/resourcescheduler_p.h
@@ -25,9 +25,9 @@
#include "item.h"
#include "resourcebase.h"
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtDBus/QDBusMessage>
+#include <QObject>
+#include <QStringList>
+#include <QDBusMessage>
namespace Akonadi
{
diff --git a/src/agentbase/transportresourcebase.cpp b/src/agentbase/transportresourcebase.cpp
index 6c627b4..8d8c701 100644
--- a/src/agentbase/transportresourcebase.cpp
+++ b/src/agentbase/transportresourcebase.cpp
@@ -26,7 +26,7 @@
#include "itemfetchjob.h"
#include "itemfetchscope.h"
-#include <QtDBus/QDBusConnection>
+#include <QDBusConnection>
using namespace Akonadi;
diff --git a/src/agentbase/transportresourcebase.h b/src/agentbase/transportresourcebase.h
index 831ebe7..586fb66 100644
--- a/src/agentbase/transportresourcebase.h
+++ b/src/agentbase/transportresourcebase.h
@@ -23,7 +23,7 @@
#include "akonadiagentbase_export.h"
#include "item.h"
-#include <QtCore/QString>
+#include <QString>
namespace Akonadi
{
diff --git a/src/agentbase/transportresourcebase_p.h b/src/agentbase/transportresourcebase_p.h
index 900f4eb..4b896d6 100644
--- a/src/agentbase/transportresourcebase_p.h
+++ b/src/agentbase/transportresourcebase_p.h
@@ -22,7 +22,7 @@
#include "transportresourcebase.h"
-#include <QtCore/QObject>
+#include <QObject>
class Akonadi__TransportAdaptor;
diff --git a/src/agentserver/agentlauncher.cpp b/src/agentserver/agentlauncher.cpp
index a7359f4..cc94cc9 100644
--- a/src/agentserver/agentlauncher.cpp
+++ b/src/agentserver/agentlauncher.cpp
@@ -20,7 +20,7 @@
#include "agentpluginloader.h"
#include "akonadiagentserver_debug.h"
-#include <QtCore/QStringList>
+#include <QStringList>
#include <QApplication>
int main(int argc, char *argv[])
diff --git a/src/agentserver/agentpluginloader.h b/src/agentserver/agentpluginloader.h
index 63dadba..7e0d7cc 100644
--- a/src/agentserver/agentpluginloader.h
+++ b/src/agentserver/agentpluginloader.h
@@ -19,8 +19,8 @@
#ifndef AGENTPLUGINLOADER_H
#define AGENTPLUGINLOADER_H
-#include <QtCore/QHash>
-#include <QtCore/QPluginLoader>
+#include <QHash>
+#include <QPluginLoader>
class AgentPluginLoader
{
diff --git a/src/agentserver/agentserver.cpp b/src/agentserver/agentserver.cpp
index 9e9a033..194fa31 100644
--- a/src/agentserver/agentserver.cpp
+++ b/src/agentserver/agentserver.cpp
@@ -24,11 +24,11 @@
#include <private/xdgbasedirs_p.h>
#include <private/dbus_p.h>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QPluginLoader>
-#include <QtCore/QTimer>
-#include <QtDBus/QDBusConnection>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QPluginLoader>
+#include <QTimer>
+#include <QDBusConnection>
using namespace Akonadi;
diff --git a/src/agentserver/agentserver.h b/src/agentserver/agentserver.h
index 23b5e5c..080a940 100644
--- a/src/agentserver/agentserver.h
+++ b/src/agentserver/agentserver.h
@@ -22,9 +22,9 @@
#include "agentpluginloader.h"
-#include <QtCore/QHash>
-#include <QtCore/QObject>
-#include <QtCore/QQueue>
+#include <QHash>
+#include <QObject>
+#include <QQueue>
namespace Akonadi {
diff --git a/src/agentserver/agentthread.cpp b/src/agentserver/agentthread.cpp
index 8175e3e..9e1d2ad 100644
--- a/src/agentserver/agentthread.cpp
+++ b/src/agentserver/agentthread.cpp
@@ -20,8 +20,8 @@
#include "agentthread.h"
#include "akonadiagentserver_debug.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QPluginLoader>
+#include <QCoreApplication>
+#include <QPluginLoader>
#include <QWidget> // Needed for WId
#include <shared/akdebug.h>
diff --git a/src/agentserver/agentthread.h b/src/agentserver/agentthread.h
index 7d4b055..3ba5380 100644
--- a/src/agentserver/agentthread.h
+++ b/src/agentserver/agentthread.h
@@ -20,7 +20,7 @@
#ifndef AKONADI_AGENTTHREAD_H
#define AKONADI_AGENTTHREAD_H
-#include <QtCore/QThread>
+#include <QThread>
namespace Akonadi {
diff --git a/src/agentserver/main.cpp b/src/agentserver/main.cpp
index 58dfe94..a4692d6 100644
--- a/src/agentserver/main.cpp
+++ b/src/agentserver/main.cpp
@@ -24,9 +24,9 @@
#include <shared/akapplication.h>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusConnectionInterface>
-#include <QtDBus/QDBusError>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusError>
#include <QApplication>
int main(int argc, char **argv)
diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
index b596e63..540cc4f 100644
--- a/src/akonadicontrol/agentmanager.cpp
+++ b/src/akonadicontrol/agentmanager.cpp
@@ -39,15 +39,15 @@
#include <shared/akapplication.h>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
+#include <QCoreApplication>
+#include <QDir>
#ifndef QT_NO_DEBUG
-#include <QtCore/QFileSystemWatcher>
+#include <QFileSystemWatcher>
#endif
#include <QScopedPointer>
-#include <QtCore/QSettings>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusError>
+#include <QSettings>
+#include <QDBusConnection>
+#include <QDBusError>
using Akonadi::ProcessControl;
diff --git a/src/akonadicontrol/agentmanager.h b/src/akonadicontrol/agentmanager.h
index 5abeaf7..74c4e78 100644
--- a/src/akonadicontrol/agentmanager.h
+++ b/src/akonadicontrol/agentmanager.h
@@ -21,9 +21,9 @@
#ifndef AGENTMANAGER_H
#define AGENTMANAGER_H
-#include <QtCore/QHash>
-#include <QtCore/QMap>
-#include <QtCore/QStringList>
+#include <QHash>
+#include <QMap>
+#include <QStringList>
#include "agenttype.h"
#include "agentinstance.h"
@@ -53,7 +53,7 @@ public:
*
* @param parent The parent object.
*/
- AgentManager(bool verbose, QObject *parent = Q_NULLPTR);
+ explicit AgentManager(bool verbose, QObject *parent = Q_NULLPTR);
/**
* Destroys the agent manager.
diff --git a/src/akonadicontrol/agentthreadinstance.cpp b/src/akonadicontrol/agentthreadinstance.cpp
index ba60937..d125ebf 100644
--- a/src/akonadicontrol/agentthreadinstance.cpp
+++ b/src/akonadicontrol/agentthreadinstance.cpp
@@ -24,7 +24,7 @@
#include <private/dbus_p.h>
-#include <QtDBus/QDBusServiceWatcher>
+#include <QDBusServiceWatcher>
using namespace Akonadi;
diff --git a/src/akonadicontrol/agentthreadinstance.h b/src/akonadicontrol/agentthreadinstance.h
index d213a07..9079500 100644
--- a/src/akonadicontrol/agentthreadinstance.h
+++ b/src/akonadicontrol/agentthreadinstance.h
@@ -28,7 +28,7 @@ class AgentThreadInstance : public AgentInstance
{
Q_OBJECT
public:
- AgentThreadInstance(AgentManager *manager);
+ explicit AgentThreadInstance(AgentManager *manager);
bool start(const AgentType &agentInfo) Q_DECL_OVERRIDE;
void quit() Q_DECL_OVERRIDE;
diff --git a/src/akonadicontrol/controlmanager.cpp b/src/akonadicontrol/controlmanager.cpp
index f9f868b..281e90b 100644
--- a/src/akonadicontrol/controlmanager.cpp
+++ b/src/akonadicontrol/controlmanager.cpp
@@ -19,8 +19,8 @@
#include "controlmanager.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QTimer>
#include "controlmanageradaptor.h"
diff --git a/src/akonadicontrol/controlmanager.h b/src/akonadicontrol/controlmanager.h
index d38ccde..541c57d 100644
--- a/src/akonadicontrol/controlmanager.h
+++ b/src/akonadicontrol/controlmanager.h
@@ -20,7 +20,7 @@
#ifndef CONTROLMANAGER_H
#define CONTROLMANAGER_H
-#include <QtCore/QObject>
+#include <QObject>
/**
* The control manager provides a dbus method to shutdown
diff --git a/src/akonadicontrol/main.cpp b/src/akonadicontrol/main.cpp
index dd8510f..2ba6c65 100644
--- a/src/akonadicontrol/main.cpp
+++ b/src/akonadicontrol/main.cpp
@@ -26,10 +26,10 @@
#include <private/dbus_p.h>
-#include <QtGui/QGuiApplication>
-#include <QtGui/QSessionManager>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusError>
+#include <QGuiApplication>
+#include <QSessionManager>
+#include <QDBusConnection>
+#include <QDBusError>
#include <KCrash/KCrash>
diff --git a/src/akonadicontrol/processcontrol.cpp b/src/akonadicontrol/processcontrol.cpp
index 9b31716..18d8bdb 100644
--- a/src/akonadicontrol/processcontrol.cpp
+++ b/src/akonadicontrol/processcontrol.cpp
@@ -24,7 +24,7 @@
#include <private/instance_p.h>
-#include <QtCore/QTimer>
+#include <QTimer>
#ifdef Q_OS_UNIX
#include <sys/types.h>
diff --git a/src/akonadicontrol/processcontrol.h b/src/akonadicontrol/processcontrol.h
index 6f8f5ea..6d2b9f7 100644
--- a/src/akonadicontrol/processcontrol.h
+++ b/src/akonadicontrol/processcontrol.h
@@ -20,8 +20,8 @@
#ifndef AKONADI_PROCESSCONTROL_H
#define AKONADI_PROCESSCONTROL_H
-#include <QtCore/QObject>
-#include <QtCore/QProcess>
+#include <QObject>
+#include <QProcess>
namespace Akonadi {
diff --git a/src/akonadictl/akonadistarter.cpp b/src/akonadictl/akonadistarter.cpp
index 31af596..fca404b 100644
--- a/src/akonadictl/akonadistarter.cpp
+++ b/src/akonadictl/akonadistarter.cpp
@@ -25,11 +25,11 @@
#include <private/dbus_p.h>
#include <private/instance_p.h>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QProcess>
-#include <QtCore/QTimer>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusServiceWatcher>
+#include <QCoreApplication>
+#include <QProcess>
+#include <QTimer>
+#include <QDBusConnection>
+#include <QDBusServiceWatcher>
#include <iostream>
diff --git a/src/akonadictl/akonadistarter.h b/src/akonadictl/akonadistarter.h
index 0cc007d..f717e49 100644
--- a/src/akonadictl/akonadistarter.h
+++ b/src/akonadictl/akonadistarter.h
@@ -20,7 +20,7 @@
#ifndef AKONADISTARTER_H
#define AKONADISTARTER_H
-#include <QtCore/QObject>
+#include <QObject>
class AkonadiStarter : public QObject
{
diff --git a/src/akonadictl/main.cpp b/src/akonadictl/main.cpp
index 685732f..97d808c 100644
--- a/src/akonadictl/main.cpp
+++ b/src/akonadictl/main.cpp
@@ -17,13 +17,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QSettings>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusConnectionInterface>
+#include <QCoreApplication>
+#include <QDir>
+#include <QString>
+#include <QStringList>
+#include <QSettings>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
#include <shared/akapplication.h>
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 88fd461..72589cd 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -310,8 +310,8 @@ PUBLIC
KF5::ItemModels
Qt5::Gui # for QColor
PRIVATE
- Qt5::Widgets
Qt5::Network
+ Qt5::Widgets
KF5::AkonadiPrivate
KF5::DBusAddons
KF5::I18n
diff --git a/src/core/agentinstance.h b/src/core/agentinstance.h
index afe25a9..048d729 100644
--- a/src/core/agentinstance.h
+++ b/src/core/agentinstance.h
@@ -22,9 +22,9 @@
#include "akonadicore_export.h"
-#include <QtCore/QList>
-#include <QtCore/QMetaType>
-#include <QtCore/QSharedDataPointer>
+#include <QList>
+#include <QMetaType>
+#include <QSharedDataPointer>
class QString;
class QWidget;
diff --git a/src/core/agentinstance_p.h b/src/core/agentinstance_p.h
index 3410372..3149737 100644
--- a/src/core/agentinstance_p.h
+++ b/src/core/agentinstance_p.h
@@ -22,8 +22,8 @@
#include "agenttype.h"
-#include <QtCore/QSharedData>
-#include <QtCore/QString>
+#include <QSharedData>
+#include <QString>
namespace Akonadi
{
diff --git a/src/core/agentmanager.cpp b/src/core/agentmanager.cpp
index d1d1b68..ffb2b17 100644
--- a/src/core/agentmanager.cpp
+++ b/src/core/agentmanager.cpp
@@ -28,7 +28,7 @@
#include "collection.h"
-#include <QtDBus/QDBusServiceWatcher>
+#include <QDBusServiceWatcher>
#include <QWidget>
diff --git a/src/core/agentmanager.h b/src/core/agentmanager.h
index 16a10ba..5b4acfb 100644
--- a/src/core/agentmanager.h
+++ b/src/core/agentmanager.h
@@ -25,7 +25,7 @@
#include "agenttype.h"
#include "agentinstance.h"
-#include <QtCore/QObject>
+#include <QObject>
namespace Akonadi
{
diff --git a/src/core/agentmanager_p.h b/src/core/agentmanager_p.h
index 2ed3c68..2fb6bde 100644
--- a/src/core/agentmanager_p.h
+++ b/src/core/agentmanager_p.h
@@ -25,7 +25,7 @@
#include "agenttype.h"
#include "agentinstance.h"
-#include <QtCore/QHash>
+#include <QHash>
namespace Akonadi
{
@@ -40,7 +40,7 @@ class AgentManagerPrivate
friend class AgentManager;
public:
- AgentManagerPrivate(AgentManager *parent)
+ explicit AgentManagerPrivate(AgentManager *parent)
: mParent(parent)
, mManager(0)
{
diff --git a/src/core/agenttype.h b/src/core/agenttype.h
index 893a9a1..a16aa23 100644
--- a/src/core/agenttype.h
+++ b/src/core/agenttype.h
@@ -22,9 +22,9 @@
#include "akonadicore_export.h"
-#include <QtCore/QList>
-#include <QtCore/QMetaType>
-#include <QtCore/QSharedDataPointer>
+#include <QList>
+#include <QMetaType>
+#include <QSharedDataPointer>
class QIcon;
class QString;
diff --git a/src/core/agenttype_p.h b/src/core/agenttype_p.h
index d4d8da0..589f9c8 100644
--- a/src/core/agenttype_p.h
+++ b/src/core/agenttype_p.h
@@ -20,9 +20,9 @@
#ifndef AKONADI_AGENTTYPE_P_H
#define AKONADI_AGENTTYPE_P_H
-#include <QtCore/QSharedData>
-#include <QtCore/QStringList>
-#include <QtCore/QVariantMap>
+#include <QSharedData>
+#include <QStringList>
+#include <QVariantMap>
namespace Akonadi
{
diff --git a/src/core/asyncselectionhandler_p.h b/src/core/asyncselectionhandler_p.h
index a3dfc58..52823b3 100644
--- a/src/core/asyncselectionhandler_p.h
+++ b/src/core/asyncselectionhandler_p.h
@@ -20,7 +20,7 @@
#ifndef AKONADI_ASYNCSELECTIONHANDLER_P_H
#define AKONADI_ASYNCSELECTIONHANDLER_P_H
-#include <QtCore/QObject>
+#include <QObject>
#include "akonadicore_export.h"
#include "collection.h"
diff --git a/src/core/attribute.h b/src/core/attribute.h
index 831eb25..a313086 100644
--- a/src/core/attribute.h
+++ b/src/core/attribute.h
@@ -22,7 +22,7 @@
#include "akonadicore_export.h"
-#include <QtCore/QList>
+#include <QList>
namespace Akonadi
{
diff --git a/src/core/attributefactory.cpp b/src/core/attributefactory.cpp
index b2777f4..9a2046b 100644
--- a/src/core/attributefactory.cpp
+++ b/src/core/attributefactory.cpp
@@ -29,7 +29,7 @@
#include "tagattribute.h"
#include "entityannotationsattribute.h"
-#include <QtCore/QHash>
+#include <QHash>
using namespace Akonadi;
diff --git a/src/core/cachepolicy.h b/src/core/cachepolicy.h
index cb3cdcb..378c42e 100644
--- a/src/core/cachepolicy.h
+++ b/src/core/cachepolicy.h
@@ -22,8 +22,8 @@
#include "akonadicore_export.h"
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QStringList>
+#include <QSharedDataPointer>
+#include <QStringList>
namespace Akonadi
{
diff --git a/src/core/changemediator_p.h b/src/core/changemediator_p.h
index eca0dfc..f218d72 100644
--- a/src/core/changemediator_p.h
+++ b/src/core/changemediator_p.h
@@ -21,9 +21,9 @@
#ifndef AKONADI_CHANGEMEDIATOR_P_H
#define AKONADI_CHANGEMEDIATOR_P_H
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QSet>
+#include <QList>
+#include <QObject>
+#include <QSet>
#include "item.h"
diff --git a/src/core/changerecorder.cpp b/src/core/changerecorder.cpp
index 17b2e18..e210db2 100644
--- a/src/core/changerecorder.cpp
+++ b/src/core/changerecorder.cpp
@@ -21,7 +21,7 @@
#include "changerecorder_p.h"
#include <qdebug.h>
-#include <QtCore/QSettings>
+#include <QSettings>
using namespace Akonadi;
diff --git a/src/core/changerecorder_p.cpp b/src/core/changerecorder_p.cpp
index 68cb16e..6dacd25 100644
--- a/src/core/changerecorder_p.cpp
+++ b/src/core/changerecorder_p.cpp
@@ -20,11 +20,11 @@
#include "changerecorder_p.h"
#include "akonadicore_debug.h"
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QSettings>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDataStream>
+#include <QFile>
+#include <QDir>
+#include <QSettings>
+#include <QFileInfo>
+#include <QDataStream>
using namespace Akonadi;
@@ -500,7 +500,7 @@ QSet<QByteArray> ChangeRecorderPrivate::encodeRelations(const QSet<Protocol::Ite
{
QSet<QByteArray> rv;
Q_FOREACH (const auto &rel, relations) {
- rv.insert("RELATION " + rel.type.toLatin1() + " " + QByteArray::number(rel.leftId) + " " + QByteArray::number(rel.rightId));
+ rv.insert("RELATION " + rel.type.toLatin1() + ' ' + QByteArray::number(rel.leftId) + ' ' + QByteArray::number(rel.rightId));
}
return rv;
}
diff --git a/src/core/collection.cpp b/src/core/collection.cpp
index 0e95b78..05a0797 100644
--- a/src/core/collection.cpp
+++ b/src/core/collection.cpp
@@ -26,10 +26,10 @@
#include "collectionstatistics.h"
#include "entitydisplayattribute.h"
-#include <QtCore/QDebug>
-#include <QtCore/QHash>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QDebug>
+#include <QHash>
+#include <QString>
+#include <QStringList>
#include <QUrl>
#include <QUrlQuery>
diff --git a/src/core/collection.h b/src/core/collection.h
index 4bd50b5..a80b5dd 100644
--- a/src/core/collection.h
+++ b/src/core/collection.h
@@ -23,9 +23,9 @@
#include "akonadicore_export.h"
#include "attribute.h"
-#include <QtCore/QMetaType>
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QDebug>
+#include <QMetaType>
+#include <QSharedDataPointer>
+#include <QDebug>
class QUrl;
diff --git a/src/core/collectioncolorattribute.cpp b/src/core/collectioncolorattribute.cpp
index 6e16faa..7dab83b 100644
--- a/src/core/collectioncolorattribute.cpp
+++ b/src/core/collectioncolorattribute.cpp
@@ -68,4 +68,4 @@ QByteArray CollectionColorAttribute::serialized() const
void CollectionColorAttribute::deserialize(const QByteArray &data)
{
mColor = QColor(QString::fromUtf8(data));
-} \ No newline at end of file
+}
diff --git a/src/core/collectioncolorattribute.h b/src/core/collectioncolorattribute.h
index 7ba244b..2546227 100644
--- a/src/core/collectioncolorattribute.h
+++ b/src/core/collectioncolorattribute.h
@@ -41,7 +41,7 @@ class AKONADICORE_EXPORT CollectionColorAttribute : public Akonadi::Attribute
{
public:
CollectionColorAttribute();
- CollectionColorAttribute(const QColor &color);
+ explicit CollectionColorAttribute(const QColor &color);
virtual ~CollectionColorAttribute();
diff --git a/src/core/collectionfetchscope.h b/src/core/collectionfetchscope.h
index 3de2dc0..a71e4be 100644
--- a/src/core/collectionfetchscope.h
+++ b/src/core/collectionfetchscope.h
@@ -23,8 +23,8 @@
#include "akonadicore_export.h"
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QSet>
+#include <QSharedDataPointer>
+#include <QSet>
class QStringList;
diff --git a/src/core/collectionpathresolver.cpp b/src/core/collectionpathresolver.cpp
index f1d6f32..fb8bad7 100644
--- a/src/core/collectionpathresolver.cpp
+++ b/src/core/collectionpathresolver.cpp
@@ -26,7 +26,7 @@
#include <KLocalizedString>
-#include <QtCore/QStringList>
+#include <QStringList>
using namespace Akonadi;
diff --git a/src/core/collectionquotaattribute.cpp b/src/core/collectionquotaattribute.cpp
index 68f1ed8..bf2d52c 100644
--- a/src/core/collectionquotaattribute.cpp
+++ b/src/core/collectionquotaattribute.cpp
@@ -19,7 +19,7 @@
#include "collectionquotaattribute.h"
-#include <QtCore/QByteArray>
+#include <QByteArray>
using namespace Akonadi;
diff --git a/src/core/collectionstatistics.cpp b/src/core/collectionstatistics.cpp
index 51f2379..83e0f9a 100644
--- a/src/core/collectionstatistics.cpp
+++ b/src/core/collectionstatistics.cpp
@@ -19,8 +19,8 @@
#include "collectionstatistics.h"
-#include <QtCore/QSharedData>
-#include <QtCore/QDebug>
+#include <QSharedData>
+#include <QDebug>
using namespace Akonadi;
diff --git a/src/core/collectionstatistics.h b/src/core/collectionstatistics.h
index 7119a61..a9a5bb6 100644
--- a/src/core/collectionstatistics.h
+++ b/src/core/collectionstatistics.h
@@ -22,8 +22,8 @@
#include "akonadicore_export.h"
-#include <QtCore/QMetaType>
-#include <QtCore/QSharedDataPointer>
+#include <QMetaType>
+#include <QSharedDataPointer>
namespace Akonadi
{
diff --git a/src/core/collectionsync.cpp b/src/core/collectionsync.cpp
index d4c9e34..a942272 100644
--- a/src/core/collectionsync.cpp
+++ b/src/core/collectionsync.cpp
@@ -30,7 +30,7 @@
#include "cachepolicy.h"
#include <KLocalizedString>
-#include <QtCore/QVariant>
+#include <QVariant>
#include <QTime>
#include <QHash>
@@ -322,7 +322,7 @@ public:
// At this point remoteChildren contains collections that don't exist locally yet
if (!remoteChildren.isEmpty()) {
- Q_FOREACH (Collection c, remoteChildren) {
+ Q_FOREACH (Collection c, remoteChildren) { //krazy:exclude=foreach
c.setParentCollection(parentCollection);
remoteCollectionsToCreate.append(c);
}
@@ -482,7 +482,7 @@ public:
if (collectionsToCreate.isEmpty() && !hierarchicalRIDs) {
collectionsToCreate = remoteCollections.take(RemoteId(newLocal.remoteId()));
}
- Q_FOREACH (Collection col, collectionsToCreate) {
+ Q_FOREACH (Collection col, collectionsToCreate) { //krazy:exclude=foreach
col.setParentCollection(newLocal);
remoteCollectionsToCreate.append(col);
}
diff --git a/src/core/collectionutils.h b/src/core/collectionutils.h
index c3e6458..d0efa58 100644
--- a/src/core/collectionutils.h
+++ b/src/core/collectionutils.h
@@ -20,7 +20,7 @@
#ifndef AKONADI_COLLECTIONUTILS_P_H
#define AKONADI_COLLECTIONUTILS_P_H
-#include <QtCore/QStringList>
+#include <QStringList>
#include "entitydisplayattribute.h"
#include "collectionstatistics.h"
diff --git a/src/core/conflicthandler_p.h b/src/core/conflicthandler_p.h
index 5962a25..15d22c6 100644
--- a/src/core/conflicthandler_p.h
+++ b/src/core/conflicthandler_p.h
@@ -21,7 +21,7 @@
#ifndef AKONADI_CONFLICTHANDLER_P_H
#define AKONADI_CONFLICTHANDLER_P_H
-#include <QtCore/QObject>
+#include <QObject>
#include "item.h"
diff --git a/src/core/connection.cpp b/src/core/connection.cpp
index 17db780..231aea4 100644
--- a/src/core/connection.cpp
+++ b/src/core/connection.cpp
@@ -22,14 +22,14 @@
#include "servermanager_p.h"
#include "akonadicore_debug.h"
-#include <QtCore/QDataStream>
-#include <QtCore/QFile>
-#include <QtCore/QAbstractEventDispatcher>
-#include <QtCore/QTimer>
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtCore/QElapsedTimer>
-#include <QtWidgets/QApplication>
+#include <QDataStream>
+#include <QFile>
+#include <QAbstractEventDispatcher>
+#include <QTimer>
+#include <QFileInfo>
+#include <QSettings>
+#include <QElapsedTimer>
+#include <QApplication>
#include <private/xdgbasedirs_p.h>
#include <private/protocol_exception_p.h>
diff --git a/src/core/connection_p.h b/src/core/connection_p.h
index 9724a20..9d335c9 100644
--- a/src/core/connection_p.h
+++ b/src/core/connection_p.h
@@ -20,10 +20,10 @@
#ifndef CONNECTIONTHREAD_P_H
#define CONNECTIONTHREAD_P_H
-#include <QtCore/QThread>
-#include <QtCore/QMutex>
-#include <QtCore/QQueue>
-#include <QtNetwork/QLocalSocket>
+#include <QThread>
+#include <QMutex>
+#include <QQueue>
+#include <QLocalSocket>
#include <private/protocol_p.h>
diff --git a/src/core/control.cpp b/src/core/control.cpp
index b867e4f..ac7edaf 100644
--- a/src/core/control.cpp
+++ b/src/core/control.cpp
@@ -21,10 +21,10 @@
#include "servermanager.h"
#include "akonadicore_debug.h"
-#include <QtCore/QEventLoop>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTimer>
-#include <QtCore/QPointer>
+#include <QEventLoop>
+#include <QCoreApplication>
+#include <QTimer>
+#include <QPointer>
using namespace Akonadi;
diff --git a/src/core/control.h b/src/core/control.h
index 7f65a48..7f57d3f 100644
--- a/src/core/control.h
+++ b/src/core/control.h
@@ -22,7 +22,7 @@
#include "akonadicore_export.h"
-#include <QtCore/QObject>
+#include <QObject>
namespace Akonadi
{
diff --git a/src/core/differencesalgorithminterface.h b/src/core/differencesalgorithminterface.h
index 18430f7..8a390d2 100644
--- a/src/core/differencesalgorithminterface.h
+++ b/src/core/differencesalgorithminterface.h
@@ -21,7 +21,7 @@
#ifndef DIFFERENCESALGORITHMINTERFACE_P_H
#define DIFFERENCESALGORITHMINTERFACE_P_H
-#include <QtCore/QObject>
+#include <QObject>
namespace Akonadi
{
diff --git a/src/core/entitycache_p.h b/src/core/entitycache_p.h
index 8142c82..aa57c73 100644
--- a/src/core/entitycache_p.h
+++ b/src/core/entitycache_p.h
@@ -37,7 +37,7 @@
#include <QQueue>
#include <QVariant>
#include <QHash>
-#include <QtCore/QQueue>
+#include <QQueue>
class KJob;
diff --git a/src/core/entitydeletedattribute.cpp b/src/core/entitydeletedattribute.cpp
index 469cde8..2c32857 100644
--- a/src/core/entitydeletedattribute.cpp
+++ b/src/core/entitydeletedattribute.cpp
@@ -23,8 +23,8 @@
#include "akonadicore_debug.h"
-#include <QtCore/QByteArray>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QString>
using namespace Akonadi;
diff --git a/src/core/entityhiddenattribute.cpp b/src/core/entityhiddenattribute.cpp
index 854f1d8..2849e9c 100644
--- a/src/core/entityhiddenattribute.cpp
+++ b/src/core/entityhiddenattribute.cpp
@@ -21,7 +21,7 @@
#include "entityhiddenattribute.h"
-#include <QtCore/QByteArray>
+#include <QByteArray>
using namespace Akonadi;
diff --git a/src/core/exception.h b/src/core/exception.h
index 2410f6a..d07ca71 100644
--- a/src/core/exception.h
+++ b/src/core/exception.h
@@ -49,17 +49,17 @@ public:
/**
Creates a new exception with the error message @p what.
*/
- Exception(const char *what) throw();
+ explicit Exception(const char *what) throw();
/**
Creates a new exception with the error message @p what.
*/
- Exception(const QByteArray &what) throw();
+ explicit Exception(const QByteArray &what) throw();
/**
Creates a new exception with the error message @p what.
*/
- Exception(const QString &what) throw();
+ explicit Exception(const QString &what) throw();
/**
Copy constructor.
diff --git a/src/core/firstrun.cpp b/src/core/firstrun.cpp
index cfc3d6d..cd113c6 100644
--- a/src/core/firstrun.cpp
+++ b/src/core/firstrun.cpp
@@ -31,12 +31,12 @@
#include <KConfig>
#include <KConfigGroup>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusReply>
-#include <QtCore/QDir>
-#include <QtCore/QMetaMethod>
-#include <QtCore/QMetaObject>
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusReply>
+#include <QDir>
+#include <QMetaMethod>
+#include <QMetaObject>
#include <QStandardPaths>
#include <QCoreApplication>
diff --git a/src/core/gidextractor_p.h b/src/core/gidextractor_p.h
index 4b2fcc5..80b1b0b 100644
--- a/src/core/gidextractor_p.h
+++ b/src/core/gidextractor_p.h
@@ -20,7 +20,7 @@
#ifndef GIDEXTRACTOR_H
#define GIDEXTRACTOR_H
-#include <QtCore/QString>
+#include <QString>
namespace Akonadi
{
diff --git a/src/core/gidextractorinterface.h b/src/core/gidextractorinterface.h
index 1d5bd79..efd6f46 100644
--- a/src/core/gidextractorinterface.h
+++ b/src/core/gidextractorinterface.h
@@ -20,7 +20,7 @@
#ifndef GIDEXTRACTORINTERFACE_H
#define GIDEXTRACTORINTERFACE_H
-#include <QtCore/QObject>
+#include <QObject>
namespace Akonadi
{
diff --git a/src/core/indexpolicyattribute.cpp b/src/core/indexpolicyattribute.cpp
index 0805a32..5addce2 100644
--- a/src/core/indexpolicyattribute.cpp
+++ b/src/core/indexpolicyattribute.cpp
@@ -21,7 +21,7 @@
#include "private/imapparser_p.h"
-#include <QtCore/QString>
+#include <QString>
using namespace Akonadi;
diff --git a/src/core/item.cpp b/src/core/item.cpp
index 26bde62..793100b 100644
--- a/src/core/item.cpp
+++ b/src/core/item.cpp
@@ -26,8 +26,8 @@
#include <QUrl>
#include <QUrlQuery>
-#include <QtCore/QStringList>
-#include <QtCore/QReadWriteLock>
+#include <QStringList>
+#include <QReadWriteLock>
#include <algorithm>
#include <map>
diff --git a/src/core/item.h b/src/core/item.h
index 89af530..ecca531 100644
--- a/src/core/item.h
+++ b/src/core/item.h
@@ -30,9 +30,9 @@
#include "itempayloadinternals_p.h"
#include "job.h"
-#include <QtCore/QByteArray>
-#include <QtCore/QMetaType>
-#include <QtCore/QSet>
+#include <QByteArray>
+#include <QMetaType>
+#include <QSet>
#include <type_traits>
#include <typeinfo>
diff --git a/src/core/item_p.h b/src/core/item_p.h
index 012f1b1..f865c7b 100644
--- a/src/core/item_p.h
+++ b/src/core/item_p.h
@@ -20,9 +20,9 @@
#ifndef AKONADI_ITEM_P_H
#define AKONADI_ITEM_P_H
-#include <QtCore/QDateTime>
-#include <QtCore/QMap>
-#include <QtCore/QVarLengthArray>
+#include <QDateTime>
+#include <QMap>
+#include <QVarLengthArray>
#include "itempayloadinternals_p.h"
#include "itemchangelog_p.h"
diff --git a/src/core/itemfetchscope.cpp b/src/core/itemfetchscope.cpp
index 64afcbf..1f33a2d 100644
--- a/src/core/itemfetchscope.cpp
+++ b/src/core/itemfetchscope.cpp
@@ -21,7 +21,7 @@
#include "itemfetchscope_p.h"
-#include <QtCore/QStringList>
+#include <QStringList>
using namespace Akonadi;
diff --git a/src/core/itemfetchscope.h b/src/core/itemfetchscope.h
index 1e138da..a421957 100644
--- a/src/core/itemfetchscope.h
+++ b/src/core/itemfetchscope.h
@@ -24,7 +24,7 @@
#include <QMetaType>
#include <QSet>
-#include <QtCore/QSharedDataPointer>
+#include <QSharedDataPointer>
#include <QDateTime>
template <typename T> class QSet;
diff --git a/src/core/itemfetchscope_p.h b/src/core/itemfetchscope_p.h
index e5d1f3c..91a57b3 100644
--- a/src/core/itemfetchscope_p.h
+++ b/src/core/itemfetchscope_p.h
@@ -20,8 +20,8 @@
#ifndef ITEMFETCHSCOPE_P_H
#define ITEMFETCHSCOPE_P_H
-#include <QtCore/QSet>
-#include <QtCore/QString>
+#include <QSet>
+#include <QString>
#include <QDateTime>
#include "itemfetchscope.h"
#include "tagfetchscope.h"
diff --git a/src/core/itemmonitor.cpp b/src/core/itemmonitor.cpp
index a2435ea..3e41324 100644
--- a/src/core/itemmonitor.cpp
+++ b/src/core/itemmonitor.cpp
@@ -22,7 +22,7 @@
#include "itemfetchscope.h"
-#include <QtCore/QStringList>
+#include <QStringList>
using namespace Akonadi;
diff --git a/src/core/itemmonitor_p.h b/src/core/itemmonitor_p.h
index b03a9e7..20bb673 100644
--- a/src/core/itemmonitor_p.h
+++ b/src/core/itemmonitor_p.h
@@ -20,7 +20,7 @@
#ifndef AKONADI_ITEMMONITOR_P_H
#define AKONADI_ITEMMONITOR_P_H
-#include <QtCore/QObject>
+#include <QObject>
#include "itemfetchjob.h"
#include "monitor.h"
diff --git a/src/core/itempayloadinternals_p.h b/src/core/itempayloadinternals_p.h
index 5faa789..b2db6f5 100644
--- a/src/core/itempayloadinternals_p.h
+++ b/src/core/itempayloadinternals_p.h
@@ -22,9 +22,9 @@
#include "supertrait.h"
-#include <QtCore/QtGlobal>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QMetaType>
+#include <QtGlobal>
+#include <QSharedPointer>
+#include <QMetaType>
#include <type_traits>
#include <typeinfo>
diff --git a/src/core/itemserializer.cpp b/src/core/itemserializer.cpp
index 2ef5192..4df8b52 100644
--- a/src/core/itemserializer.cpp
+++ b/src/core/itemserializer.cpp
@@ -29,10 +29,10 @@
#include "akonadicore_debug.h"
// Qt
-#include <QtCore/QBuffer>
-#include <QtCore/QFile>
-#include <QtCore/QIODevice>
-#include <QtCore/QString>
+#include <QBuffer>
+#include <QFile>
+#include <QIODevice>
+#include <QString>
#include <string>
diff --git a/src/core/itemserializer_p.h b/src/core/itemserializer_p.h
index 37065f0..5ec30dd 100644
--- a/src/core/itemserializer_p.h
+++ b/src/core/itemserializer_p.h
@@ -21,8 +21,8 @@
#ifndef AKONADI_ITEM_SERIALIZER_P_H
#define AKONADI_ITEM_SERIALIZER_P_H
-#include <QtCore/QByteArray>
-#include <QtCore/QSet>
+#include <QByteArray>
+#include <QSet>
#include "akonaditests_export.h"
diff --git a/src/core/itemserializerplugin.cpp b/src/core/itemserializerplugin.cpp
index d371b00..afabe44 100644
--- a/src/core/itemserializerplugin.cpp
+++ b/src/core/itemserializerplugin.cpp
@@ -22,7 +22,7 @@
#include "item.h"
#include "itemserializer_p.h"
-#include <QtCore/QBuffer>
+#include <QBuffer>
using namespace Akonadi;
diff --git a/src/core/itemserializerplugin.h b/src/core/itemserializerplugin.h
index ab82915..eb9791c 100644
--- a/src/core/itemserializerplugin.h
+++ b/src/core/itemserializerplugin.h
@@ -21,8 +21,8 @@
#ifndef AKONADI_ITEMSERIALIZERPLUGIN_H
#define AKONADI_ITEMSERIALIZERPLUGIN_H
-#include <QtCore/QByteArray>
-#include <QtCore/QSet>
+#include <QByteArray>
+#include <QSet>
#include "item.h"
#include "akonadicore_export.h"
@@ -53,7 +53,7 @@ namespace Akonadi
*
* The serializer plugin code:
* @code
- * #include <QtCore/qplugin.h>
+ * #include <qplugin.h>
*
* class SerializerPluginPimNote : public QObject, public Akonadi::ItemSerializerPlugin
* {
diff --git a/src/core/itemsync.cpp b/src/core/itemsync.cpp
index 15fcda8..1ce7258 100644
--- a/src/core/itemsync.cpp
+++ b/src/core/itemsync.cpp
@@ -34,7 +34,7 @@
#include "akonadicore_debug.h"
-#include <QtCore/QStringList>
+#include <QStringList>
using namespace Akonadi;
diff --git a/src/core/jobs/agentinstancecreatejob.cpp b/src/core/jobs/agentinstancecreatejob.cpp
index effa21f..15a5211 100644
--- a/src/core/jobs/agentinstancecreatejob.cpp
+++ b/src/core/jobs/agentinstancecreatejob.cpp
@@ -30,7 +30,7 @@
#include <qdebug.h>
#include <KLocalizedString>
-#include <QtCore/QTimer>
+#include <QTimer>
#ifdef Q_OS_UNIX
#include <sys/types.h>
diff --git a/src/core/jobs/collectionfetchjob.cpp b/src/core/jobs/collectionfetchjob.cpp
index 6cec8de..9e43740 100644
--- a/src/core/jobs/collectionfetchjob.cpp
+++ b/src/core/jobs/collectionfetchjob.cpp
@@ -31,10 +31,10 @@
#include <KLocalizedString>
-#include <QtCore/QObject>
-#include <QtCore/QHash>
-#include <QtCore/QStringList>
-#include <QtCore/QTimer>
+#include <QObject>
+#include <QHash>
+#include <QStringList>
+#include <QTimer>
using namespace Akonadi;
diff --git a/src/core/jobs/itemcreatejob.cpp b/src/core/jobs/itemcreatejob.cpp
index e03e47f..0fe2248 100644
--- a/src/core/jobs/itemcreatejob.cpp
+++ b/src/core/jobs/itemcreatejob.cpp
@@ -30,8 +30,8 @@
#include "gidextractor_p.h"
#include "private/protocol_p.h"
-#include <QtCore/QDateTime>
-#include <QtCore/QFile>
+#include <QDateTime>
+#include <QFile>
#include <KLocalizedString>
diff --git a/src/core/jobs/itemfetchjob.cpp b/src/core/jobs/itemfetchjob.cpp
index 69cf651..7bd5027 100644
--- a/src/core/jobs/itemfetchjob.cpp
+++ b/src/core/jobs/itemfetchjob.cpp
@@ -29,8 +29,8 @@
#include <qdebug.h>
-#include <QtCore/QStringList>
-#include <QtCore/QTimer>
+#include <QStringList>
+#include <QTimer>
using namespace Akonadi;
diff --git a/src/core/jobs/itemmodifyjob_p.h b/src/core/jobs/itemmodifyjob_p.h
index 9237a2d..215da9e 100644
--- a/src/core/jobs/itemmodifyjob_p.h
+++ b/src/core/jobs/itemmodifyjob_p.h
@@ -45,7 +45,7 @@ public:
Dirty
};
- ItemModifyJobPrivate(ItemModifyJob *parent);
+ explicit ItemModifyJobPrivate(ItemModifyJob *parent);
void setClean();
Protocol::PartMetaData preparePart(const QByteArray &partName);
diff --git a/src/core/jobs/itemsearchjob.cpp b/src/core/jobs/itemsearchjob.cpp
index 81b63f7..f1f1c33 100644
--- a/src/core/jobs/itemsearchjob.cpp
+++ b/src/core/jobs/itemsearchjob.cpp
@@ -26,7 +26,7 @@
#include "private/protocol_p.h"
#include <QCoreApplication>
-#include <QtCore/QTimer>
+#include <QTimer>
#include <QThreadStorage>
using namespace Akonadi;
diff --git a/src/core/jobs/itemsearchjob.h b/src/core/jobs/itemsearchjob.h
index ebb7eab..7a82e16 100644
--- a/src/core/jobs/itemsearchjob.h
+++ b/src/core/jobs/itemsearchjob.h
@@ -25,7 +25,7 @@
#include "job.h"
#include "collection.h"
-#include <QtCore/QUrl>
+#include <QUrl>
namespace Akonadi
{
diff --git a/src/core/jobs/job.cpp b/src/core/jobs/job.cpp
index ac3cb01..7c45dbc 100644
--- a/src/core/jobs/job.cpp
+++ b/src/core/jobs/job.cpp
@@ -30,11 +30,11 @@
#include <KLocalizedString>
-#include <QtCore/QEventLoop>
-#include <QtCore/QTimer>
-#include <QtCore/QTextStream>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusConnectionInterface>
+#include <QEventLoop>
+#include <QTimer>
+#include <QTextStream>
+#include <QDBusInterface>
+#include <QDBusConnectionInterface>
using namespace Akonadi;
diff --git a/src/core/jobs/kjobprivatebase_p.h b/src/core/jobs/kjobprivatebase_p.h
index 9f9023e..9ebadfe 100644
--- a/src/core/jobs/kjobprivatebase_p.h
+++ b/src/core/jobs/kjobprivatebase_p.h
@@ -20,7 +20,7 @@
#ifndef AKONADI_KJOBPRIVATEBASE_P_H
#define AKONADI_KJOBPRIVATEBASE_P_H
-#include <QtCore/QObject>
+#include <QObject>
#include "servermanager.h"
diff --git a/src/core/jobs/recursiveitemfetchjob.cpp b/src/core/jobs/recursiveitemfetchjob.cpp
index 09e4efa..e189ffb 100644
--- a/src/core/jobs/recursiveitemfetchjob.cpp
+++ b/src/core/jobs/recursiveitemfetchjob.cpp
@@ -23,8 +23,8 @@
#include "itemfetchjob.h"
#include "itemfetchscope.h"
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
+#include <QStringList>
+#include <QVariant>
using namespace Akonadi;
diff --git a/src/core/jobs/specialcollectionshelperjobs.cpp b/src/core/jobs/specialcollectionshelperjobs.cpp
index 423fb19..27570b6 100644
--- a/src/core/jobs/specialcollectionshelperjobs.cpp
+++ b/src/core/jobs/specialcollectionshelperjobs.cpp
@@ -38,12 +38,12 @@
#include <KLocalizedString>
#include <kcoreconfigskeleton.h>
-#include <QtDBus/QDBusConnectionInterface>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusServiceWatcher>
-#include <QtCore/QMetaMethod>
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
+#include <QDBusConnectionInterface>
+#include <QDBusInterface>
+#include <QDBusServiceWatcher>
+#include <QMetaMethod>
+#include <QTime>
+#include <QTimer>
#define LOCK_WAIT_TIMEOUT_SECONDS 30
diff --git a/src/core/jobs/specialcollectionshelperjobs_p.h b/src/core/jobs/specialcollectionshelperjobs_p.h
index bcebd5a..11d4648 100644
--- a/src/core/jobs/specialcollectionshelperjobs_p.h
+++ b/src/core/jobs/specialcollectionshelperjobs_p.h
@@ -25,7 +25,7 @@
#include "specialcollections.h"
#include "transactionsequence.h"
-#include <QtCore/QVariant>
+#include <QVariant>
namespace Akonadi
{
diff --git a/src/core/jobs/specialcollectionsrequestjob.cpp b/src/core/jobs/specialcollectionsrequestjob.cpp
index 44ec3d1..d8a6fe9 100644
--- a/src/core/jobs/specialcollectionsrequestjob.cpp
+++ b/src/core/jobs/specialcollectionsrequestjob.cpp
@@ -30,7 +30,7 @@
#include "akonadicore_debug.h"
-#include <QtCore/QVariant>
+#include <QVariant>
using namespace Akonadi;
diff --git a/src/core/jobs/specialcollectionsrequestjob.h b/src/core/jobs/specialcollectionsrequestjob.h
index bb33ac3..9ea9814 100644
--- a/src/core/jobs/specialcollectionsrequestjob.h
+++ b/src/core/jobs/specialcollectionsrequestjob.h
@@ -25,7 +25,7 @@
#include "specialcollections.h"
#include "transactionsequence.h"
-#include <QtCore/QVariant>
+#include <QVariant>
namespace Akonadi
{
diff --git a/src/core/jobs/subscriptionjob.cpp b/src/core/jobs/subscriptionjob.cpp
index c091167..2a08210 100644
--- a/src/core/jobs/subscriptionjob.cpp
+++ b/src/core/jobs/subscriptionjob.cpp
@@ -68,11 +68,11 @@ void SubscriptionJob::doStart()
emitResult();
}
- Q_FOREACH (Collection col, d->mSub) {
+ Q_FOREACH (Collection col, d->mSub) { //krazy:exclude=foreach
col.setEnabled(true);
new CollectionModifyJob(col, this);
}
- Q_FOREACH (Collection col, d->mUnsub) {
+ Q_FOREACH (Collection col, d->mUnsub) { //krazy:exclude=foreach
col.setEnabled(false);
new CollectionModifyJob(col, this);
}
diff --git a/src/core/jobs/transactionsequence.cpp b/src/core/jobs/transactionsequence.cpp
index e5939e1..b39b9dd 100644
--- a/src/core/jobs/transactionsequence.cpp
+++ b/src/core/jobs/transactionsequence.cpp
@@ -22,8 +22,8 @@
#include "job_p.h"
-#include <QtCore/QSet>
-#include <QtCore/QVariant>
+#include <QSet>
+#include <QVariant>
using namespace Akonadi;
diff --git a/src/core/mimetypechecker.h b/src/core/mimetypechecker.h
index 0254214..f844f6b 100644
--- a/src/core/mimetypechecker.h
+++ b/src/core/mimetypechecker.h
@@ -22,7 +22,7 @@
#include "akonadicore_export.h"
-#include <QtCore/QSharedDataPointer>
+#include <QSharedDataPointer>
class QString;
class QStringList;
diff --git a/src/core/mimetypechecker_p.h b/src/core/mimetypechecker_p.h
index 7f58829..927169c 100644
--- a/src/core/mimetypechecker_p.h
+++ b/src/core/mimetypechecker_p.h
@@ -23,8 +23,8 @@
#include <QMimeType>
#include <QMimeDatabase>
-#include <QtCore/QSet>
-#include <QtCore/QStringList>
+#include <QSet>
+#include <QStringList>
namespace Akonadi
{
diff --git a/src/core/models/agentfilterproxymodel.cpp b/src/core/models/agentfilterproxymodel.cpp
index aaad7c8..f72c71d 100644
--- a/src/core/models/agentfilterproxymodel.cpp
+++ b/src/core/models/agentfilterproxymodel.cpp
@@ -24,9 +24,9 @@
#include <qdebug.h>
-#include <QtCore/QStringList>
-#include <QtCore/QMimeDatabase>
-#include <QtCore/QMimeType>
+#include <QStringList>
+#include <QMimeDatabase>
+#include <QMimeType>
using namespace Akonadi;
diff --git a/src/core/models/agentinstancemodel.cpp b/src/core/models/agentinstancemodel.cpp
index aeb54ba..b23dfd4 100644
--- a/src/core/models/agentinstancemodel.cpp
+++ b/src/core/models/agentinstancemodel.cpp
@@ -22,7 +22,7 @@
#include "agentinstance.h"
#include "agentmanager.h"
-#include <QtCore/QStringList>
+#include <QStringList>
#include <QIcon>
#include <KLocalizedString>
diff --git a/src/core/models/agentinstancemodel.h b/src/core/models/agentinstancemodel.h
index 3e32530..a09514f 100644
--- a/src/core/models/agentinstancemodel.h
+++ b/src/core/models/agentinstancemodel.h
@@ -22,7 +22,7 @@
#include "akonadicore_export.h"
-#include <QtCore/QAbstractItemModel>
+#include <QAbstractItemModel>
namespace Akonadi
{
diff --git a/src/core/models/agenttypemodel.cpp b/src/core/models/agenttypemodel.cpp
index 7ea0763..582d36e 100644
--- a/src/core/models/agenttypemodel.cpp
+++ b/src/core/models/agenttypemodel.cpp
@@ -21,7 +21,7 @@
#include "agenttype.h"
#include "agentmanager.h"
-#include <QtCore/QStringList>
+#include <QStringList>
#include <QIcon>
using namespace Akonadi;
diff --git a/src/core/models/agenttypemodel.h b/src/core/models/agenttypemodel.h
index da314e9..0891794 100644
--- a/src/core/models/agenttypemodel.h
+++ b/src/core/models/agenttypemodel.h
@@ -22,7 +22,7 @@
#include "akonadicore_export.h"
-#include <QtCore/QAbstractItemModel>
+#include <QAbstractItemModel>
namespace Akonadi
{
diff --git a/src/core/models/collectionfilterproxymodel.cpp b/src/core/models/collectionfilterproxymodel.cpp
index 316a309..3bb0659 100644
--- a/src/core/models/collectionfilterproxymodel.cpp
+++ b/src/core/models/collectionfilterproxymodel.cpp
@@ -22,8 +22,8 @@
#include "entitytreemodel.h"
#include "mimetypechecker.h"
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QString>
+#include <QStringList>
using namespace Akonadi;
diff --git a/src/core/models/collectionmodel.cpp b/src/core/models/collectionmodel.cpp
index d6fad62..d4e8fd5 100644
--- a/src/core/models/collectionmodel.cpp
+++ b/src/core/models/collectionmodel.cpp
@@ -31,7 +31,7 @@
#include <QIcon>
#include <QUrl>
-#include <QtCore/QMimeData>
+#include <QMimeData>
using namespace Akonadi;
diff --git a/src/core/models/collectionmodel.h b/src/core/models/collectionmodel.h
index 5bdd54d..08c9966 100644
--- a/src/core/models/collectionmodel.h
+++ b/src/core/models/collectionmodel.h
@@ -23,7 +23,7 @@
#include "akonadicore_export.h"
#include "collection.h"
-#include <QtCore/QAbstractItemModel>
+#include <QAbstractItemModel>
namespace Akonadi
{
diff --git a/src/core/models/collectionmodel_p.cpp b/src/core/models/collectionmodel_p.cpp
index 8f6280b..56d25cf 100644
--- a/src/core/models/collectionmodel_p.cpp
+++ b/src/core/models/collectionmodel_p.cpp
@@ -36,7 +36,7 @@
#include <kiconloader.h>
#include <QCoreApplication>
-#include <QtCore/QTimer>
+#include <QTimer>
using namespace Akonadi;
diff --git a/src/core/models/collectionmodel_p.h b/src/core/models/collectionmodel_p.h
index 612e9de..7c631eb 100644
--- a/src/core/models/collectionmodel_p.h
+++ b/src/core/models/collectionmodel_p.h
@@ -24,11 +24,11 @@
#include <KLocalizedString>
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtCore/QModelIndex>
-#include <QtCore/QStringList>
-#include <QtGui/QIcon>
+#include <QHash>
+#include <QList>
+#include <QModelIndex>
+#include <QStringList>
+#include <QIcon>
class KJob;
diff --git a/src/core/models/entitymimetypefiltermodel.cpp b/src/core/models/entitymimetypefiltermodel.cpp
index 0a8f669..c41efa5 100644
--- a/src/core/models/entitymimetypefiltermodel.cpp
+++ b/src/core/models/entitymimetypefiltermodel.cpp
@@ -23,8 +23,8 @@
#include "entitytreemodel.h"
#include "mimetypechecker.h"
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QString>
+#include <QStringList>
using namespace Akonadi;
diff --git a/src/core/models/entityorderproxymodel.h b/src/core/models/entityorderproxymodel.h
index c932520..c545e0a 100644
--- a/src/core/models/entityorderproxymodel.h
+++ b/src/core/models/entityorderproxymodel.h
@@ -51,7 +51,7 @@ public:
*
* @param parent The parent object.
*/
- EntityOrderProxyModel(QObject *parent = Q_NULLPTR);
+ explicit EntityOrderProxyModel(QObject *parent = Q_NULLPTR);
/**
* Destroys the entity order proxy model.
diff --git a/src/core/models/entitytreemodel.cpp b/src/core/models/entitytreemodel.cpp
index 039aaff..7d6455c 100644
--- a/src/core/models/entitytreemodel.cpp
+++ b/src/core/models/entitytreemodel.cpp
@@ -22,9 +22,9 @@
#include "akonadicore_debug.h"
#include "monitor_p.h"
-#include <QtCore/QHash>
-#include <QtCore/QMimeData>
-#include <QtCore/QTimer>
+#include <QHash>
+#include <QMimeData>
+#include <QTimer>
#include <QAbstractProxyModel>
#include <QMessageBox>
diff --git a/src/core/models/entitytreemodel.h b/src/core/models/entitytreemodel.h
index 1750545..ca5076a 100644
--- a/src/core/models/entitytreemodel.h
+++ b/src/core/models/entitytreemodel.h
@@ -25,8 +25,8 @@
#include "collectionfetchscope.h"
#include "item.h"
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QStringList>
+#include <QAbstractItemModel>
+#include <QStringList>
namespace Akonadi
{
diff --git a/src/core/models/entitytreemodel_p.cpp b/src/core/models/entitytreemodel_p.cpp
index 13ab9d3..6c7dfe6 100644
--- a/src/core/models/entitytreemodel_p.cpp
+++ b/src/core/models/entitytreemodel_p.cpp
@@ -50,7 +50,7 @@
#include "akonadicore_debug.h"
#include <QMessageBox>
-#include <QtGui/QIcon>
+#include <QIcon>
QHash<KJob *, QTime> jobTimeTracker;
diff --git a/src/core/models/favoritecollectionsmodel.cpp b/src/core/models/favoritecollectionsmodel.cpp
index d93e1e8..27a0014 100644
--- a/src/core/models/favoritecollectionsmodel.cpp
+++ b/src/core/models/favoritecollectionsmodel.cpp
@@ -20,7 +20,7 @@
#include "favoritecollectionsmodel.h"
#include "akonadicore_debug.h"
#include <QItemSelectionModel>
-#include <QtCore/QMimeData>
+#include <QMimeData>
#include <kconfiggroup.h>
#include <KLocalizedString>
diff --git a/src/core/models/itemmodel.cpp b/src/core/models/itemmodel.cpp
index 98393ae..7e6f9af 100644
--- a/src/core/models/itemmodel.cpp
+++ b/src/core/models/itemmodel.cpp
@@ -30,7 +30,7 @@
#include <QUrl>
#include <QCoreApplication>
-#include <QtCore/QMimeData>
+#include <QMimeData>
using namespace Akonadi;
diff --git a/src/core/models/itemmodel.h b/src/core/models/itemmodel.h
index c73f8e7..e7d5d1f 100644
--- a/src/core/models/itemmodel.h
+++ b/src/core/models/itemmodel.h
@@ -24,7 +24,7 @@
#include "item.h"
#include "job.h"
-#include <QtCore/QAbstractTableModel>
+#include <QAbstractTableModel>
namespace Akonadi
{
diff --git a/src/core/models/recursivecollectionfilterproxymodel.h b/src/core/models/recursivecollectionfilterproxymodel.h
index 69d9774..0b5b92c 100644
--- a/src/core/models/recursivecollectionfilterproxymodel.h
+++ b/src/core/models/recursivecollectionfilterproxymodel.h
@@ -46,7 +46,7 @@ public:
*
* @param parent The parent object.
*/
- RecursiveCollectionFilterProxyModel(QObject *parent = Q_NULLPTR);
+ explicit RecursiveCollectionFilterProxyModel(QObject *parent = Q_NULLPTR);
/**
* Destroys the recursive collection filter proxy model.
diff --git a/src/core/models/subscriptionmodel.cpp b/src/core/models/subscriptionmodel.cpp
index 45f9677..ce9ca29 100644
--- a/src/core/models/subscriptionmodel.cpp
+++ b/src/core/models/subscriptionmodel.cpp
@@ -26,7 +26,7 @@
#include "akonadicore_debug.h"
-#include <QtCore/QStringList>
+#include <QStringList>
#include <QFont>
using namespace Akonadi;
diff --git a/src/core/monitor.cpp b/src/core/monitor.cpp
index 035f8e2..9034308 100644
--- a/src/core/monitor.cpp
+++ b/src/core/monitor.cpp
@@ -27,10 +27,10 @@
#include <qdebug.h>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusConnection>
-#include <QtCore/QTimer>
+#include <QTimer>
#include <iterator>
using namespace Akonadi;
diff --git a/src/core/monitor.h b/src/core/monitor.h
index 59a9e31..c3a02fa 100644
--- a/src/core/monitor.h
+++ b/src/core/monitor.h
@@ -26,7 +26,7 @@
#include "item.h"
#include "relation.h"
-#include <QtCore/QObject>
+#include <QObject>
namespace Akonadi
{
diff --git a/src/core/monitor_p.h b/src/core/monitor_p.h
index 48a487c..2f165e7 100644
--- a/src/core/monitor_p.h
+++ b/src/core/monitor_p.h
@@ -36,8 +36,8 @@
#include "private/protocol_p.h"
-#include <QtCore/QObject>
-#include <QtCore/QTimer>
+#include <QObject>
+#include <QTimer>
#include <QMimeDatabase>
#include <QMimeType>
diff --git a/src/core/notificationsource_p.h b/src/core/notificationsource_p.h
index 037e05c..4bc18d3 100644
--- a/src/core/notificationsource_p.h
+++ b/src/core/notificationsource_p.h
@@ -20,7 +20,7 @@
#ifndef NOTIFICATIONSOURCE_P_H
#define NOTIFICATIONSOURCE_P_H
-#include <QtCore/QObject>
+#include <QObject>
#include "akonaditests_export.h"
@@ -38,7 +38,7 @@ class AKONADI_TESTS_EXPORT NotificationSource : public QObject
Q_OBJECT
public:
- NotificationSource(QObject *source);
+ explicit NotificationSource(QObject *source);
~NotificationSource();
QString identifier() const;
diff --git a/src/core/pastehelper.cpp b/src/core/pastehelper.cpp
index 999b509..b51c5f5 100644
--- a/src/core/pastehelper.cpp
+++ b/src/core/pastehelper.cpp
@@ -37,10 +37,10 @@
#include <QUrl>
#include <QUrlQuery>
-#include <QtCore/QByteArray>
-#include <QtCore/QMimeData>
-#include <QtCore/QStringList>
-#include <QtCore/QMutexLocker>
+#include <QByteArray>
+#include <QMimeData>
+#include <QStringList>
+#include <QMutexLocker>
#include <functional>
diff --git a/src/core/pastehelper_p.h b/src/core/pastehelper_p.h
index 4f751ca..cc1af5f 100644
--- a/src/core/pastehelper_p.h
+++ b/src/core/pastehelper_p.h
@@ -23,7 +23,7 @@
#include "akonadicore_export.h"
#include "collection.h"
-#include <QtCore/QList>
+#include <QList>
class KJob;
class QMimeData;
diff --git a/src/core/persistentsearchattribute.cpp b/src/core/persistentsearchattribute.cpp
index 6eefaa1..26f86a5 100644
--- a/src/core/persistentsearchattribute.cpp
+++ b/src/core/persistentsearchattribute.cpp
@@ -22,8 +22,8 @@
#include "private/imapparser_p.h"
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QString>
+#include <QStringList>
using namespace Akonadi;
@@ -129,7 +129,7 @@ QByteArray PersistentSearchAttribute::serialized() const
l.append("QUERYSTRING");
l.append(ImapParser::quote(d->queryString.toUtf8()));
l.append("QUERYCOLLECTIONS");
- l.append("(" + cols.join(QStringLiteral(" ")).toLatin1() + ")");
+ l.append("(" + cols.join(QStringLiteral(" ")).toLatin1() + ')');
if (d->remote) {
l.append("REMOTE");
}
diff --git a/src/core/pluginloader_p.h b/src/core/pluginloader_p.h
index 43df72e..d9dbeb7 100644
--- a/src/core/pluginloader_p.h
+++ b/src/core/pluginloader_p.h
@@ -22,9 +22,9 @@
#include "akonaditests_export.h"
-#include <QtCore/QHash>
-#include <QtCore/QString>
-#include <QtCore/QObject>
+#include <QHash>
+#include <QString>
+#include <QObject>
class QPluginLoader;
diff --git a/src/core/protocolhelper.cpp b/src/core/protocolhelper.cpp
index f873a50..e58f004 100644
--- a/src/core/protocolhelper.cpp
+++ b/src/core/protocolhelper.cpp
@@ -34,11 +34,11 @@
#include "private/xdgbasedirs_p.h"
#include "private/externalpartstorage_p.h"
-#include <QtCore/QDateTime>
-#include <QtCore/QFile>
-#include <QtCore/QVarLengthArray>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
+#include <QDateTime>
+#include <QFile>
+#include <QVarLengthArray>
+#include <QFileInfo>
+#include <QDir>
#include <KLocalizedString>
diff --git a/src/core/qtest_akonadi.h b/src/core/qtest_akonadi.h
index 56b3714..6410247 100644
--- a/src/core/qtest_akonadi.h
+++ b/src/core/qtest_akonadi.h
@@ -23,9 +23,9 @@
#include <agentinstance.h>
#include <agentmanager.h>
-#include <QtTest/QTest>
-#include <QtTest/QSignalSpy>
-#include <QtCore/QTimer>
+#include <QTest>
+#include <QSignalSpy>
+#include <QTimer>
/**
* \short Akonadi Replacement for QTEST_MAIN from QTestLib
diff --git a/src/core/relationsync.h b/src/core/relationsync.h
index 1f1e240..84bb88a 100644
--- a/src/core/relationsync.h
+++ b/src/core/relationsync.h
@@ -30,7 +30,7 @@ class AKONADICORE_EXPORT RelationSync : public Akonadi::Job
{
Q_OBJECT
public:
- RelationSync(QObject *parent = Q_NULLPTR);
+ explicit RelationSync(QObject *parent = Q_NULLPTR);
virtual ~RelationSync();
void setRemoteRelations(const Akonadi::Relation::List &relations);
diff --git a/src/core/searchquery.cpp b/src/core/searchquery.cpp
index c159706..10bfae3 100644
--- a/src/core/searchquery.cpp
+++ b/src/core/searchquery.cpp
@@ -20,7 +20,7 @@
#include "searchquery.h"
#include "akonadicore_debug.h"
-#include <QtCore/QVariant>
+#include <QVariant>
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonArray>
diff --git a/src/core/searchquery.h b/src/core/searchquery.h
index ad67092..9332788 100644
--- a/src/core/searchquery.h
+++ b/src/core/searchquery.h
@@ -56,7 +56,7 @@ public:
/**
* Constructs a term where all subterms will be in given relation
*/
- SearchTerm(SearchTerm::Relation relation = SearchTerm::RelAnd);
+ explicit SearchTerm(SearchTerm::Relation relation = SearchTerm::RelAnd);
/**
* Constructs an end term
@@ -131,7 +131,7 @@ public:
/**
* Constructs query where all added terms will be in given relation
*/
- SearchQuery(SearchTerm::Relation rel = SearchTerm::RelAnd);
+ explicit SearchQuery(SearchTerm::Relation rel = SearchTerm::RelAnd);
~SearchQuery();
SearchQuery(const SearchQuery &other);
diff --git a/src/core/servermanager.cpp b/src/core/servermanager.cpp
index f078553..95fe412 100644
--- a/src/core/servermanager.cpp
+++ b/src/core/servermanager.cpp
@@ -35,7 +35,12 @@
#include "private/dbus_p.h"
#include "private/instance_p.h"
-#include <QtDBus>
+#include <QDBusConnection>
+#include <QDBusServiceWatcher>
+#include <QDBusConnectionInterface>
+#include <QDBusInterface>
+#include <QDBusReply>
+#include <QProcess>
#include <QTimer>
#include <QScopedPointer>
diff --git a/src/core/servermanager.h b/src/core/servermanager.h
index 8031d1d..6568e2e 100644
--- a/src/core/servermanager.h
+++ b/src/core/servermanager.h
@@ -22,8 +22,8 @@
#include "akonadicore_export.h"
-#include <QtCore/QObject>
-#include <QtCore/QMetaType>
+#include <QObject>
+#include <QMetaType>
namespace Akonadi
{
diff --git a/src/core/session.cpp b/src/core/session.cpp
index 6a96668..18c352a 100644
--- a/src/core/session.cpp
+++ b/src/core/session.cpp
@@ -34,16 +34,16 @@
#include <KLocalizedString>
#include <QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QQueue>
-#include <QtCore/QThreadStorage>
-#include <QtCore/QTimer>
-#include <QtCore/QThread>
+#include <QDir>
+#include <QQueue>
+#include <QThreadStorage>
+#include <QTimer>
+#include <QThread>
#include <QSettings>
-#include <QtNetwork/QLocalSocket>
-#include <QtNetwork/QTcpSocket>
-#include <QtNetwork/QHostAddress>
+#include <QLocalSocket>
+#include <QTcpSocket>
+#include <QHostAddress>
#include <QApplication>
// ### FIXME pipelining got broken by switching result emission in JobPrivate::handleResponse to delayed emission
@@ -68,7 +68,7 @@ void SessionPrivate::reconnect()
mParent->connect(connection, &Connection::reconnected, mParent, &Session::reconnected,
Qt::QueuedConnection);
mParent->connect(connection, SIGNAL(commandReceived(qint64,Akonadi::Protocol::Command)),
- mParent, SLOT(handleCommand(qint64, Akonadi::Protocol::Command)),
+ mParent, SLOT(handleCommand(qint64,Akonadi::Protocol::Command)),
Qt::QueuedConnection);
mParent->connect(connection, SIGNAL(socketDisconnected()), mParent, SLOT(socketDisconnected()),
Qt::QueuedConnection);
diff --git a/src/core/session.h b/src/core/session.h
index 486313c..457817f 100644
--- a/src/core/session.h
+++ b/src/core/session.h
@@ -21,7 +21,7 @@
#define AKONADI_SESSION_H
#include "akonadicore_export.h"
-#include <QtCore/QObject>
+#include <QObject>
class KJob;
class FakeSession;
diff --git a/src/core/session_p.h b/src/core/session_p.h
index a55ad79..2eb430b 100644
--- a/src/core/session_p.h
+++ b/src/core/session_p.h
@@ -25,11 +25,11 @@
#include "item.h"
#include "servermanager.h"
-#include <QtNetwork/QLocalSocket>
+#include <QLocalSocket>
-#include <QtCore/QQueue>
-#include <QtCore/QThreadStorage>
-#include <QtCore/QMetaObject>
+#include <QQueue>
+#include <QThreadStorage>
+#include <QMetaObject>
#include <QFile>
class QIODevice;
diff --git a/src/core/specialcollectionattribute.h b/src/core/specialcollectionattribute.h
index 2e2b985..57fdb5f 100644
--- a/src/core/specialcollectionattribute.h
+++ b/src/core/specialcollectionattribute.h
@@ -23,7 +23,7 @@
#include "akonadicore_export.h"
#include "attribute.h"
-#include <QtCore/QByteArray>
+#include <QByteArray>
namespace Akonadi
{
diff --git a/src/core/specialcollections.cpp b/src/core/specialcollections.cpp
index 7417d7f..09ffd50 100644
--- a/src/core/specialcollections.cpp
+++ b/src/core/specialcollections.cpp
@@ -31,9 +31,9 @@
#include <kcoreconfigskeleton.h>
-#include <QtCore/QHash>
-#include <QtCore/QObject>
-#include <QtCore/QSet>
+#include <QHash>
+#include <QObject>
+#include <QSet>
using namespace Akonadi;
diff --git a/src/core/specialcollections.h b/src/core/specialcollections.h
index 596c122..a972abb 100644
--- a/src/core/specialcollections.h
+++ b/src/core/specialcollections.h
@@ -24,7 +24,7 @@
#include "collection.h"
#include "item.h"
-#include <QtCore/QObject>
+#include <QObject>
class KCoreConfigSkeleton;
class KJob;
diff --git a/src/core/specialcollections_p.h b/src/core/specialcollections_p.h
index 1eb13a4..ac621ff 100644
--- a/src/core/specialcollections_p.h
+++ b/src/core/specialcollections_p.h
@@ -20,8 +20,8 @@
#ifndef AKONADI_SPECIALCOLLECTIONS_P_H
#define AKONADI_SPECIALCOLLECTIONS_P_H
-#include <QtCore/QHash>
-#include <QtCore/QString>
+#include <QHash>
+#include <QString>
#include "akonaditests_export.h"
diff --git a/src/core/std_exception.h.in b/src/core/std_exception.h.in
index f2a4702..c2a3e8c 100644
--- a/src/core/std_exception.h.in
+++ b/src/core/std_exception.h.in
@@ -1 +1 @@
-#include "@std_exception_file@" \ No newline at end of file
+#include "@std_exception_file@"
diff --git a/src/core/tagsync.cpp b/src/core/tagsync.cpp
index 79f1c6a..1a1dd32 100644
--- a/src/core/tagsync.cpp
+++ b/src/core/tagsync.cpp
@@ -158,7 +158,7 @@ void TagSync::onCreateTagDone(KJob *job)
Akonadi::Tag tag = static_cast<Akonadi::TagCreateJob *>(job)->tag();
const Item::List remoteMembers = mRidMemberMap.value(QString::fromLatin1(tag.remoteId()));
- Q_FOREACH (Item item, remoteMembers) {
+ Q_FOREACH (Item item, remoteMembers) { //krazy:exclude=foreach
item.setTag(tag);
ItemModifyJob *modJob = new ItemModifyJob(item, this);
connect(modJob, &KJob::result, this, &TagSync::onJobDone);
@@ -212,14 +212,14 @@ void TagSync::onTagItemsFetchDone(KJob *job)
}
if (!merge) {
- Q_FOREACH (Item item, toRemove) {
+ Q_FOREACH (Item item, toRemove) { //krazy:exclude=foreach
item.clearTag(tag);
ItemModifyJob *modJob = new ItemModifyJob(item, this);
connect(modJob, &KJob::result, this, &TagSync::onJobDone);
qCDebug(AKONADICORE_LOG) << "removing tag " << item.remoteId();
}
}
- Q_FOREACH (Item item, toAdd) {
+ Q_FOREACH (Item item, toAdd) { //krazy:exclude=foreach
item.setTag(tag);
ItemModifyJob *modJob = new ItemModifyJob(item, this);
connect(modJob, &KJob::result, this, &TagSync::onJobDone);
diff --git a/src/core/tagsync.h b/src/core/tagsync.h
index 2bb8723..2234493 100644
--- a/src/core/tagsync.h
+++ b/src/core/tagsync.h
@@ -31,7 +31,7 @@ class AKONADICORE_EXPORT TagSync : public Akonadi::Job
{
Q_OBJECT
public:
- TagSync(QObject *parent = Q_NULLPTR);
+ explicit TagSync(QObject *parent = Q_NULLPTR);
virtual ~TagSync();
void setFullTagList(const Akonadi::Tag::List &tags);
diff --git a/src/core/typepluginloader.cpp b/src/core/typepluginloader.cpp
index 45f82da..898fc8e 100644
--- a/src/core/typepluginloader.cpp
+++ b/src/core/typepluginloader.cpp
@@ -27,12 +27,12 @@
#include "akonadicore_debug.h"
// Qt
-#include <QtCore/QHash>
-#include <QtCore/QString>
-#include <QtCore/QByteArray>
-#include <QtCore/QStringList>
-#include <QtCore/QMimeDatabase>
-#include <QtCore/QMimeType>
+#include <QHash>
+#include <QString>
+#include <QByteArray>
+#include <QStringList>
+#include <QMimeDatabase>
+#include <QMimeType>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/topological_sort.hpp>
diff --git a/src/core/typepluginloader_p.h b/src/core/typepluginloader_p.h
index c16acf8..6a6d531 100644
--- a/src/core/typepluginloader_p.h
+++ b/src/core/typepluginloader_p.h
@@ -21,7 +21,7 @@
#ifndef AKONADI_TYPEPLUGINLOADER_P_H
#define AKONADI_TYPEPLUGINLOADER_P_H
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
#include "akonadicore_export.h"
class QObject;
diff --git a/src/private/datastream_p_p.h b/src/private/datastream_p_p.h
index 4cc5a9d..3dbdd8c 100644
--- a/src/private/datastream_p_p.h
+++ b/src/private/datastream_p_p.h
@@ -24,9 +24,9 @@
#include "protocol_exception_p.h"
-#include <QtCore/QByteArray>
-#include <QtCore/QIODevice>
-#include <QtCore/QTimeZone>
+#include <QByteArray>
+#include <QIODevice>
+#include <QTimeZone>
namespace Akonadi {
namespace Protocol {
diff --git a/src/private/dbus.cpp b/src/private/dbus.cpp
index 5df6de3..a7ac797 100644
--- a/src/private/dbus.cpp
+++ b/src/private/dbus.cpp
@@ -20,9 +20,9 @@
#include "dbus_p.h"
#include "instance_p.h"
-#include <QtCore/QString>
-#include <QtCore/QStringBuilder>
-#include <QtCore/QStringList>
+#include <QString>
+#include <QStringBuilder>
+#include <QStringList>
using namespace Akonadi;
diff --git a/src/private/externalpartstorage.cpp b/src/private/externalpartstorage.cpp
index 4c2cbeb..ba91c1b 100644
--- a/src/private/externalpartstorage.cpp
+++ b/src/private/externalpartstorage.cpp
@@ -21,10 +21,10 @@
#include "standarddirs_p.h"
#include "akonadiprivate_debug.h"
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QMutexLocker>
-#include <QtCore/QThread>
+#include <QDir>
+#include <QFileInfo>
+#include <QMutexLocker>
+#include <QThread>
using namespace Akonadi;
diff --git a/src/private/externalpartstorage_p.h b/src/private/externalpartstorage_p.h
index 6c292bf..929716a 100644
--- a/src/private/externalpartstorage_p.h
+++ b/src/private/externalpartstorage_p.h
@@ -17,14 +17,16 @@
*
*/
+//krazy:excludeall=dpointer
+
#ifndef EXTERNALPARTSTORAGE_P_H
#define EXTERNALPARTSTORAGE_P_H
#include "akonadiprivate_export.h"
-#include <QtCore/QVector>
-#include <QtCore/QMutex>
-#include <QtCore/QHash>
+#include <QVector>
+#include <QMutex>
+#include <QHash>
class QString;
class QByteArray;
diff --git a/src/private/imapparser.cpp b/src/private/imapparser.cpp
index 93112a0..b73324f 100644
--- a/src/private/imapparser.cpp
+++ b/src/private/imapparser.cpp
@@ -19,8 +19,8 @@
#include "imapparser_p.h"
-#include <QtCore/QDateTime>
-#include <QtCore/QDebug>
+#include <QDateTime>
+#include <QDebug>
#include <ctype.h>
diff --git a/src/private/imapparser_p.h b/src/private/imapparser_p.h
index 88add05..f398d27 100644
--- a/src/private/imapparser_p.h
+++ b/src/private/imapparser_p.h
@@ -24,9 +24,9 @@
#include "imapset_p.h"
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QVarLengthArray>
+#include <QByteArray>
+#include <QList>
+#include <QVarLengthArray>
namespace Akonadi {
diff --git a/src/private/imapset.cpp b/src/private/imapset.cpp
index 15753f3..9127024 100644
--- a/src/private/imapset.cpp
+++ b/src/private/imapset.cpp
@@ -284,7 +284,7 @@ QByteArray ImapSet::toImapSequenceSet() const
QByteArray rv;
for (auto iter = d->intervals.cbegin(), end = d->intervals.cend(); iter != end; ++iter) {
if (iter != d->intervals.cbegin()) {
- rv += ",";
+ rv += ',';
}
rv += iter->toImapSequence();
}
diff --git a/src/private/imapset_p.h b/src/private/imapset_p.h
index e0613a2..0a143ba 100644
--- a/src/private/imapset_p.h
+++ b/src/private/imapset_p.h
@@ -22,11 +22,11 @@
#include "akonadiprivate_export.h"
-#include <QtCore/QByteArray>
-#include <QtCore/QDebug>
-#include <QtCore/QList>
-#include <QtCore/QMetaType>
-#include <QtCore/QSharedDataPointer>
+#include <QByteArray>
+#include <QDebug>
+#include <QList>
+#include <QMetaType>
+#include <QSharedDataPointer>
namespace Akonadi {
namespace Protocol {
@@ -154,13 +154,13 @@ public:
*/
ImapSet();
- ImapSet(qint64 Id);
+ ImapSet(qint64 Id); // krazy:exclude=explicit
- ImapSet(const QVector<qint64> &ids);
+ ImapSet(const QVector<qint64> &ids); // krazy:exclude=explicit
- ImapSet(const QList<qint64> &ids);
+ ImapSet(const QList<qint64> &ids); // krazy:exclude=explicit
- ImapSet(const ImapInterval &interval);
+ ImapSet(const ImapInterval &interval); // krazy:exclude=explicit
/**
Copy constructor.
diff --git a/src/private/instance.cpp b/src/private/instance.cpp
index a389284..b69b65f 100644
--- a/src/private/instance.cpp
+++ b/src/private/instance.cpp
@@ -19,7 +19,7 @@
#include "instance_p.h"
-#include <QtCore/QString>
+#include <QString>
using namespace Akonadi;
diff --git a/src/private/protocol_exception_p.h b/src/private/protocol_exception_p.h
index 54858a1..da76e13 100644
--- a/src/private/protocol_exception_p.h
+++ b/src/private/protocol_exception_p.h
@@ -17,6 +17,8 @@
02110-1301, USA.
*/
+//krazy:excludeall=dpointer,inline
+
#ifndef AKONADI_PROTOCOLEXCEPTION_P_H
#define AKONADI_PROTOCOLEXCEPTION_P_H
@@ -24,14 +26,14 @@
#include <exception>
-#include <QtCore/QByteArray>
+#include <QByteArray>
namespace Akonadi {
class AKONADIPRIVATE_EXPORT ProtocolException : public std::exception
{
public:
- ProtocolException(const char *what)
+ explicit ProtocolException(const char *what)
: std::exception()
, mWhat(what)
{}
diff --git a/src/private/protocol_p.h b/src/private/protocol_p.h
index 4da44cc..bf604c1 100644
--- a/src/private/protocol_p.h
+++ b/src/private/protocol_p.h
@@ -18,16 +18,18 @@
02110-1301, USA.
*/
+//krazy:excludeall=dpointer,explicit,inline
+
#ifndef AKONADI_PROTOCOL_P_H
#define AKONADI_PROTOCOL_P_H
#include "akonadiprivate_export.h"
-#include <QtCore/QFlags>
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QDebug>
-#include <QtDBus/QDBusArgument>
+#include <QFlags>
+#include <QSharedDataPointer>
+#include <QDebug>
+#include <QDBusArgument>
#include "tristate_p.h"
diff --git a/src/private/scope.cpp b/src/private/scope.cpp
index d8d09dc..39551a1 100644
--- a/src/private/scope.cpp
+++ b/src/private/scope.cpp
@@ -21,7 +21,7 @@
#include "scope_p.h"
#include "datastream_p_p.h"
-#include <QtCore/QStringList>
+#include <QStringList>
#include "imapset_p.h"
diff --git a/src/private/scope_p.h b/src/private/scope_p.h
index ec0dbf7..8a070b2 100644
--- a/src/private/scope_p.h
+++ b/src/private/scope_p.h
@@ -18,12 +18,14 @@
* 02110-1301, USA.
*/
+//krazy:excludeall=dpointer
+
#ifndef AKONADI_PRIVATE_SCOPE_P_H
#define AKONADI_PRIVATE_SCOPE_P_H
#include "akonadiprivate_export.h"
-#include <QtCore/QSharedDataPointer>
+#include <QSharedDataPointer>
class QString;
class QStringList;
@@ -53,8 +55,8 @@ public:
class AKONADIPRIVATE_EXPORT HRID {
public:
- explicit HRID();
- HRID(qint64 id, const QString &remoteId = QString());
+ HRID();
+ explicit HRID(qint64 id, const QString &remoteId = QString());
HRID(const HRID &other);
HRID(HRID &&other);
@@ -72,11 +74,11 @@ public:
Scope(SelectionScope scope, const QStringList &ids);
/* UID */
- Scope(qint64 id);
- Scope(const ImapSet &uidSet);
- Scope(const ImapInterval &interval);
- Scope(const QVector<qint64> &interval);
- Scope(const QVector<HRID> &hridChain);
+ Scope(qint64 id); //krazy:exclude=explicit
+ Scope(const ImapSet &uidSet); //krazy:exclude=explicit
+ Scope(const ImapInterval &interval); //krazy:exclude=explicit
+ Scope(const QVector<qint64> &interval); //krazy:exclude=explicit
+ Scope(const QVector<HRID> &hridChain); //krazy:exclude=explicit
Scope(const Scope &other);
Scope(Scope &&other);
diff --git a/src/private/tristate_p.h b/src/private/tristate_p.h
index 87ca711..885e471 100644
--- a/src/private/tristate_p.h
+++ b/src/private/tristate_p.h
@@ -20,8 +20,8 @@
#ifndef AKONADI_PRIVATE_TRISTATE_P_H_
#define AKONADI_PRIVATE_TRISTATE_P_H_
-#include <QtCore/QMetaType>
-#include <QtCore/QDebug>
+#include <QMetaType>
+#include <QDebug>
#include "akonadiprivate_export.h"
diff --git a/src/private/xdgbasedirs.cpp b/src/private/xdgbasedirs.cpp
index 7d9d314..a6f78ef 100644
--- a/src/private/xdgbasedirs.cpp
+++ b/src/private/xdgbasedirs.cpp
@@ -23,12 +23,12 @@
#include "akonadiprivate_debug.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtCore/QProcessEnvironment>
-#include <QtCore/QRegExp>
+#include <QCoreApplication>
+#include <QDir>
+#include <QFileInfo>
+#include <QSettings>
+#include <QProcessEnvironment>
+#include <QRegExp>
#include <cstdlib>
diff --git a/src/private/xdgbasedirs_p.h b/src/private/xdgbasedirs_p.h
index 61b6d01..7b92320 100644
--- a/src/private/xdgbasedirs_p.h
+++ b/src/private/xdgbasedirs_p.h
@@ -21,8 +21,8 @@
#define XDGBASEDIRS_H
// Qt includes
-#include <QtCore/QFlags>
-#include <QtCore/QStringList>
+#include <QFlags>
+#include <QStringList>
#include "akonadiprivate_export.h"
diff --git a/src/rds/bridgeconnection.cpp b/src/rds/bridgeconnection.cpp
index 017e091..2dfcff3 100644
--- a/src/rds/bridgeconnection.cpp
+++ b/src/rds/bridgeconnection.cpp
@@ -21,12 +21,12 @@
#include <private/standarddirs_p.h>
-#include <QtCore/QDebug>
-#include <QtCore/QMetaObject>
-#include <QtCore/QRegExp>
-#include <QtCore/QSettings>
-#include <QtNetwork/QLocalSocket>
-#include <QtNetwork/QTcpSocket>
+#include <QDebug>
+#include <QMetaObject>
+#include <QRegExp>
+#include <QSettings>
+#include <QLocalSocket>
+#include <QTcpSocket>
#ifdef Q_OS_UNIX
#include <sys/socket.h>
diff --git a/src/rds/bridgeserver.h b/src/rds/bridgeserver.h
index abfe80b..9876b80 100644
--- a/src/rds/bridgeserver.h
+++ b/src/rds/bridgeserver.h
@@ -20,8 +20,8 @@
#ifndef BRIDGESERVER_H
#define BRIDGESERVER_H
-#include <QtCore/QObject>
-#include <QtNetwork/QTcpServer>
+#include <QObject>
+#include <QTcpServer>
class BridgeServerBase : public QObject
{
diff --git a/src/rds/exception.h b/src/rds/exception.h
index 250d196..de8b6e5 100644
--- a/src/rds/exception.h
+++ b/src/rds/exception.h
@@ -19,7 +19,7 @@
#ifndef AKONADI_RDS_EXCEPTION_H
#define AKONADI_RDS_EXCEPTION_H
-#include <QtCore/QString>
+#include <QString>
#include <stdexcept>
template <typename Ex>
diff --git a/src/rds/main.cpp b/src/rds/main.cpp
index cee43ed..66e3b15 100644
--- a/src/rds/main.cpp
+++ b/src/rds/main.cpp
@@ -22,8 +22,8 @@
#include <shared/akapplication.h>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
+#include <QCoreApplication>
+#include <QDebug>
int main(int argc, char **argv)
{
diff --git a/src/server/aklocalserver.h b/src/server/aklocalserver.h
index 37ba4a1..d997024 100644
--- a/src/server/aklocalserver.h
+++ b/src/server/aklocalserver.h
@@ -29,7 +29,7 @@ class AkLocalServer : public QLocalServer
{
Q_OBJECT
public:
- AkLocalServer(QObject *parent = Q_NULLPTR);
+ explicit AkLocalServer(QObject *parent = Q_NULLPTR);
Q_SIGNALS:
void newConnection(quintptr socketDescriptor);
diff --git a/src/server/akonadi.cpp b/src/server/akonadi.cpp
index 4ee1130..d105914 100644
--- a/src/server/akonadi.cpp
+++ b/src/server/akonadi.cpp
@@ -47,15 +47,15 @@
#include <private/dbus_p.h>
#include <private/instance_p.h>
-#include <QtSql/QSqlQuery>
-#include <QtSql/QSqlError>
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QSettings>
-#include <QtCore/QTimer>
-#include <QtDBus/QDBusServiceWatcher>
-#include <QtNetwork/QLocalServer>
+#include <QSqlQuery>
+#include <QSqlError>
+
+#include <QCoreApplication>
+#include <QDir>
+#include <QSettings>
+#include <QTimer>
+#include <QDBusServiceWatcher>
+#include <QLocalServer>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/src/server/akonadi.h b/src/server/akonadi.h
index f7656b8..3085f51 100644
--- a/src/server/akonadi.h
+++ b/src/server/akonadi.h
@@ -20,9 +20,9 @@
#ifndef AKONADISERVER_H
#define AKONADISERVER_H
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtCore/QVector>
+#include <QObject>
+#include <QPointer>
+#include <QVector>
class QProcess;
diff --git a/src/server/cachecleaner.cpp b/src/server/cachecleaner.cpp
index 5e591de..f5591e2 100644
--- a/src/server/cachecleaner.cpp
+++ b/src/server/cachecleaner.cpp
@@ -127,8 +127,8 @@ void CacheCleaner::collectionExpired(const Collection &collection)
qb.addValueCondition(PimItem::dirtyFullColumnName(), Query::Equals, false);
QStringList localParts;
- QStringList partNames = collection.cachePolicyLocalParts().split(QStringLiteral(" "));
- Q_FOREACH (QString partName, partNames) {
+ const QStringList partNames = collection.cachePolicyLocalParts().split(QStringLiteral(" "));
+ Q_FOREACH (QString partName, partNames) { // krazy:exclude=foreach
if (partName.startsWith(QLatin1String(AKONADI_PARAM_PLD))) {
partName = partName.mid(4);
}
@@ -139,7 +139,7 @@ void CacheCleaner::collectionExpired(const Collection &collection)
if (!parts.isEmpty()) {
qCDebug(AKONADISERVER_LOG) << "found" << parts.count() << "item parts to expire in collection" << collection.name();
// clear data field
- Q_FOREACH (Part part, parts) {
+ Q_FOREACH (Part part, parts) { // krazy:exclude=foreach
try {
if (!PartHelper::truncate(part)) {
qCDebug(AKONADISERVER_LOG) << "failed to update item part" << part.id();
diff --git a/src/server/cachecleaner.h b/src/server/cachecleaner.h
index 532f2e0..ca1e257 100644
--- a/src/server/cachecleaner.h
+++ b/src/server/cachecleaner.h
@@ -42,7 +42,7 @@ class Collection;
class CacheCleanerInhibitor
{
public:
- CacheCleanerInhibitor(bool inhibit = true);
+ explicit CacheCleanerInhibitor(bool inhibit = true);
~CacheCleanerInhibitor();
void inhibit();
@@ -67,7 +67,7 @@ public:
Creates a new cache cleaner thread.
@param parent The parent object.
*/
- CacheCleaner(QObject *parent = Q_NULLPTR);
+ explicit CacheCleaner(QObject *parent = Q_NULLPTR);
~CacheCleaner();
protected:
diff --git a/src/server/collectionreferencemanager.cpp b/src/server/collectionreferencemanager.cpp
index ba54335..5ecf20a 100644
--- a/src/server/collectionreferencemanager.cpp
+++ b/src/server/collectionreferencemanager.cpp
@@ -100,7 +100,7 @@ void CollectionReferenceManager::cleanup()
qCCritical(AKONADISERVER_LOG) << "Failed to execute collection reference cleanup query.";
return;
}
- Q_FOREACH (Collection col, qb.result()) {
+ Q_FOREACH (Collection col, qb.result()) { // krazy:exclude=foreach
col.setReferenced(false);
col.update();
if (AkonadiServer::instance()->cacheCleaner()) {
diff --git a/src/server/collectionscheduler.h b/src/server/collectionscheduler.h
index 50fe3ef..71f52ac 100644
--- a/src/server/collectionscheduler.h
+++ b/src/server/collectionscheduler.h
@@ -39,7 +39,7 @@ class CollectionScheduler : public AkThread
Q_OBJECT
public:
- CollectionScheduler(QThread::Priority priority, QObject *parent = Q_NULLPTR);
+ explicit CollectionScheduler(QThread::Priority priority, QObject *parent = Q_NULLPTR);
virtual ~CollectionScheduler();
void collectionChanged(qint64 collectionId);
diff --git a/src/server/connection.cpp b/src/server/connection.cpp
index a77d1e4..d30d285 100644
--- a/src/server/connection.cpp
+++ b/src/server/connection.cpp
@@ -20,8 +20,8 @@
#include "connection.h"
#include "akonadiserver_debug.h"
-#include <QtCore/QEventLoop>
-#include <QtCore/QLatin1String>
+#include <QEventLoop>
+#include <QLatin1String>
#include <QSettings>
#include "storage/datastore.h"
diff --git a/src/server/connection.h b/src/server/connection.h
index 3e4a874..0e10757 100644
--- a/src/server/connection.h
+++ b/src/server/connection.h
@@ -20,11 +20,11 @@
#ifndef AKONADI_CONNECTION_H
#define AKONADI_CONNECTION_H
-#include <QtCore/QPointer>
-#include <QtCore/QThread>
-#include <QtCore/QTimer>
-#include <QtNetwork/QLocalSocket>
-#include <QtCore/QDataStream>
+#include <QPointer>
+#include <QThread>
+#include <QTimer>
+#include <QLocalSocket>
+#include <QDataStream>
#include "akthread.h"
#include "entities.h"
@@ -49,7 +49,7 @@ class Connection : public AkThread
{
Q_OBJECT
public:
- Connection(quintptr socketDescriptor, QObject *parent = Q_NULLPTR);
+ explicit Connection(quintptr socketDescriptor, QObject *parent = Q_NULLPTR);
virtual ~Connection();
virtual DataStore *storageBackend();
diff --git a/src/server/dbustracer.h b/src/server/dbustracer.h
index 3ed9c68..c2e7e62 100644
--- a/src/server/dbustracer.h
+++ b/src/server/dbustracer.h
@@ -20,7 +20,7 @@
#ifndef AKONADI_DBUSTRACER_H
#define AKONADI_DBUSTRACER_H
-#include <QtCore/QObject>
+#include <QObject>
#include "tracerinterface.h"
diff --git a/src/server/debuginterface.cpp b/src/server/debuginterface.cpp
index edb1ce6..c16849f 100644
--- a/src/server/debuginterface.cpp
+++ b/src/server/debuginterface.cpp
@@ -20,7 +20,8 @@
#include "debuginterface.h"
#include "debuginterfaceadaptor.h"
#include "tracer.h"
-#include <QtDBus>
+
+#include <QDBusConnection>
using namespace Akonadi::Server;
diff --git a/src/server/exception.h b/src/server/exception.h
index ae37a5c..f905643 100644
--- a/src/server/exception.h
+++ b/src/server/exception.h
@@ -33,17 +33,17 @@ namespace Server {
class Exception : public std::exception
{
public:
- Exception(const char *what) throw()
+ explicit Exception(const char *what) throw()
: mWhat(what)
{
}
- Exception(const QByteArray &what) throw()
+ explicit Exception(const QByteArray &what) throw()
: mWhat(what)
{
}
- Exception(const QString &what) throw()
+ explicit Exception(const QString &what) throw()
: mWhat(what.toUtf8())
{
}
diff --git a/src/server/filetracer.cpp b/src/server/filetracer.cpp
index cd58047..3103eb8 100644
--- a/src/server/filetracer.cpp
+++ b/src/server/filetracer.cpp
@@ -18,8 +18,8 @@
***************************************************************************/
#include "filetracer.h"
-#include <QtCore/QFile>
-#include <QtCore/QTime>
+#include <QFile>
+#include <QTime>
using namespace Akonadi::Server;
diff --git a/src/server/filetracer.h b/src/server/filetracer.h
index 86ee05b..1f9bb69 100644
--- a/src/server/filetracer.h
+++ b/src/server/filetracer.h
@@ -34,7 +34,7 @@ namespace Server {
class FileTracer : public TracerInterface
{
public:
- FileTracer(const QString &fileName);
+ explicit FileTracer(const QString &fileName);
virtual ~FileTracer();
virtual void beginConnection(const QString &identifier, const QString &msg);
diff --git a/src/server/handler.h b/src/server/handler.h
index f3f3a41..34e9531 100644
--- a/src/server/handler.h
+++ b/src/server/handler.h
@@ -19,8 +19,8 @@
#ifndef AKONADIHANDLER_H
#define AKONADIHANDLER_H
-#include <QtCore/QObject>
-#include <QtCore/QDataStream>
+#include <QObject>
+#include <QDataStream>
#include "global.h"
#include "exception.h"
diff --git a/src/server/handler/fetchhelper.cpp b/src/server/handler/fetchhelper.cpp
index 7f8fdfe..8f998d4 100644
--- a/src/server/handler/fetchhelper.cpp
+++ b/src/server/handler/fetchhelper.cpp
@@ -41,16 +41,16 @@
#include <private/scope_p.h>
#include <private/dbus_p.h>
-#include <QtCore/QLocale>
-#include <QtCore/QStringList>
-#include <QtCore/QUuid>
-#include <QtCore/QVariant>
-#include <QtCore/QDateTime>
-#include <QtSql/QSqlDatabase>
-#include <QtSql/QSqlError>
-#include <QtSql/QSqlQuery>
-
-#include <QtCore/QElapsedTimer>
+#include <QLocale>
+#include <QStringList>
+#include <QUuid>
+#include <QVariant>
+#include <QDateTime>
+#include <QSqlDatabase>
+#include <QSqlError>
+#include <QSqlQuery>
+
+#include <QElapsedTimer>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/src/server/handler/fetchhelper.h b/src/server/handler/fetchhelper.h
index e899871..cf8a78f 100644
--- a/src/server/handler/fetchhelper.h
+++ b/src/server/handler/fetchhelper.h
@@ -20,7 +20,7 @@
#ifndef AKONADI_FETCHHELPER_H
#define AKONADI_FETCHHELPER_H
-#include <QtCore/QStack>
+#include <QStack>
#include "storage/countquerybuilder.h"
#include "storage/datastore.h"
diff --git a/src/server/handler/move.cpp b/src/server/handler/move.cpp
index b63cf94..4328673 100644
--- a/src/server/handler/move.cpp
+++ b/src/server/handler/move.cpp
@@ -56,7 +56,7 @@ void Move::itemsRetrieved(const QList<qint64> &ids)
// Split the list by source collection
QMap<Entity::Id /* collection */, PimItem> toMove;
QMap<Entity::Id /* collection */, Collection> sources;
- Q_FOREACH (/*sic!*/ PimItem item, items) {
+ Q_FOREACH (/*sic!*/ PimItem item, items) { //krazy:exclude=foreach
if (!item.isValid()) {
failureResponse("Invalid item in result set!?");
return;
diff --git a/src/server/handler/search.h b/src/server/handler/search.h
index a5091ef..8c899e4 100644
--- a/src/server/handler/search.h
+++ b/src/server/handler/search.h
@@ -22,8 +22,8 @@
#include "handler.h"
-#include <QtCore/QVector>
-#include <QtCore/QSet>
+#include <QVector>
+#include <QSet>
namespace Akonadi {
namespace Server {
diff --git a/src/server/handler/searchhelper.h b/src/server/handler/searchhelper.h
index 55740c5..1085875 100644
--- a/src/server/handler/searchhelper.h
+++ b/src/server/handler/searchhelper.h
@@ -20,8 +20,8 @@
#ifndef AKONADISEARCHHELPER_H
#define AKONADISEARCHHELPER_H
-#include <QtCore/QVector>
-#include <QtCore/QStringList>
+#include <QVector>
+#include <QStringList>
namespace Akonadi {
namespace Server {
diff --git a/src/server/handler/tagfetchhelper.h b/src/server/handler/tagfetchhelper.h
index bc51cb7..f619578 100644
--- a/src/server/handler/tagfetchhelper.h
+++ b/src/server/handler/tagfetchhelper.h
@@ -20,8 +20,8 @@
#ifndef AKONADI_TAGFETCHHELPER_H
#define AKONADI_TAGFETCHHELPER_H
-#include <QtCore/QObject>
-#include <QtSql/QSqlQuery>
+#include <QObject>
+#include <QSqlQuery>
#include <private/scope_p.h>
diff --git a/src/server/handlerhelper.h b/src/server/handlerhelper.h
index 0005481..31a48a7 100644
--- a/src/server/handlerhelper.h
+++ b/src/server/handlerhelper.h
@@ -22,10 +22,10 @@
#include "entities.h"
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QStack>
+#include <QByteArray>
+#include <QList>
+#include <QString>
+#include <QStack>
namespace Akonadi {
diff --git a/src/server/intervalcheck.h b/src/server/intervalcheck.h
index cc0c238..0ec6869 100644
--- a/src/server/intervalcheck.h
+++ b/src/server/intervalcheck.h
@@ -36,7 +36,7 @@ class IntervalCheck : public CollectionScheduler
Q_OBJECT
public:
- IntervalCheck(QObject *parent = Q_NULLPTR);
+ explicit IntervalCheck(QObject *parent = Q_NULLPTR);
~IntervalCheck();
/**
diff --git a/src/server/main.cpp b/src/server/main.cpp
index 884227a..a9465a4 100644
--- a/src/server/main.cpp
+++ b/src/server/main.cpp
@@ -24,10 +24,10 @@
#include <private/dbus_p.h>
-#include <QtCore/QCoreApplication>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusConnectionInterface>
-#include <QtDBus/QDBusError>
+#include <QCoreApplication>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusError>
#include <QTimer>
#include <cstdlib>
diff --git a/src/server/notificationmanager.h b/src/server/notificationmanager.h
index 0a409bf..3756aae 100644
--- a/src/server/notificationmanager.h
+++ b/src/server/notificationmanager.h
@@ -24,7 +24,7 @@
#include <private/protocol_p.h>
-#include <QtCore/QTimer>
+#include <QTimer>
#include <QPointer>
class NotificationManagerTest;
diff --git a/src/server/preprocessorinstance.cpp b/src/server/preprocessorinstance.cpp
index 110f51f..acd33a4 100644
--- a/src/server/preprocessorinstance.cpp
+++ b/src/server/preprocessorinstance.cpp
@@ -37,7 +37,7 @@
#include <private/dbus_p.h>
-#include <QtCore/QTimer>
+#include <QTimer>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/src/server/preprocessorinstance.h b/src/server/preprocessorinstance.h
index 669a335..ba4026b 100644
--- a/src/server/preprocessorinstance.h
+++ b/src/server/preprocessorinstance.h
@@ -25,8 +25,8 @@
#ifndef AKONADI_PREPROCESSORINSTANCE_H
#define AKONADI_PREPROCESSORINSTANCE_H
-#include <QtCore/QObject>
-#include <QtCore/QDateTime>
+#include <QObject>
+#include <QDateTime>
#include <deque>
diff --git a/src/server/preprocessormanager.cpp b/src/server/preprocessormanager.cpp
index cb1c00e..04df0ac 100644
--- a/src/server/preprocessormanager.cpp
+++ b/src/server/preprocessormanager.cpp
@@ -422,9 +422,7 @@ void PreprocessorManager::heartbeat()
QList< PreprocessorInstance *> firedPreprocessors;
- PreprocessorInstance *instance;
-
- Q_FOREACH (instance, mPreprocessorChain) {
+ Q_FOREACH (PreprocessorInstance *instance, mPreprocessorChain) {
// In this loop we check for "stuck" preprocessors.
int elapsedTime = instance->currentProcessingTime();
@@ -482,7 +480,7 @@ void PreprocessorManager::heartbeat()
}
// Kill the fired preprocessors, if any.
- Q_FOREACH (instance, firedPreprocessors) {
+ Q_FOREACH (PreprocessorInstance *instance, firedPreprocessors) {
lockedUnregisterInstance(instance->id());
}
}
diff --git a/src/server/preprocessormanager.h b/src/server/preprocessormanager.h
index b22cde9..fe3b3f7 100644
--- a/src/server/preprocessormanager.h
+++ b/src/server/preprocessormanager.h
@@ -25,9 +25,9 @@
#ifndef AKONADI_PREPROCESSORMANAGER_H
#define AKONADI_PREPROCESSORMANAGER_H
-#include <QtCore/QObject>
-#include <QtCore/QList>
-#include <QtCore/QHash>
+#include <QObject>
+#include <QList>
+#include <QHash>
#include <deque>
diff --git a/src/server/resourcemanager.cpp b/src/server/resourcemanager.cpp
index 9c2c30e..c200f66 100644
--- a/src/server/resourcemanager.cpp
+++ b/src/server/resourcemanager.cpp
@@ -25,7 +25,7 @@
#include <private/capabilities_p.h>
-#include <QtDBus/QDBusConnection>
+#include <QDBusConnection>
using namespace Akonadi::Server;
@@ -64,7 +64,7 @@ void ResourceManager::removeResourceInstance(const QString &name)
Resource resource = Resource::retrieveByName(name);
if (resource.isValid()) {
const QVector<Collection> collections = resource.collections();
- Q_FOREACH (/*sic!*/ Collection collection, collections) {
+ Q_FOREACH (/*sic!*/ Collection collection, collections) { // krazy:exclude=foreach
db->cleanupCollection(collection);
}
diff --git a/src/server/resourcemanager.h b/src/server/resourcemanager.h
index 55d2460..009bc0e 100644
--- a/src/server/resourcemanager.h
+++ b/src/server/resourcemanager.h
@@ -20,7 +20,7 @@
#ifndef AKONADI_RESOURCEMANAGER_H
#define AKONADI_RESOURCEMANAGER_H
-#include <QtCore/QObject>
+#include <QObject>
namespace Akonadi {
namespace Server {
@@ -37,7 +37,7 @@ public:
static ResourceManager *self();
private:
- ResourceManager(QObject *parent = Q_NULLPTR);
+ explicit ResourceManager(QObject *parent = Q_NULLPTR);
public Q_SLOTS:
void addResourceInstance(const QString &name, const QStringList &capabilities);
diff --git a/src/server/search/abstractsearchplugin.h b/src/server/search/abstractsearchplugin.h
index eb480e7..b665579 100644
--- a/src/server/search/abstractsearchplugin.h
+++ b/src/server/search/abstractsearchplugin.h
@@ -20,7 +20,7 @@
#ifndef AKONADI_ABSTRACTSEARCHPLUGIN
#define AKONADI_ABSTRACTSEARCHPLUGIN
-#include <QtCore/QSet>
+#include <QSet>
#include <QObject>
#include <QStringList>
diff --git a/src/server/search/agentsearchinstance.h b/src/server/search/agentsearchinstance.h
index 95b2be7..dc17b71 100644
--- a/src/server/search/agentsearchinstance.h
+++ b/src/server/search/agentsearchinstance.h
@@ -33,7 +33,7 @@ class AgentSearchInstance : public QObject
{
Q_OBJECT
public:
- AgentSearchInstance(const QString &id);
+ explicit AgentSearchInstance(const QString &id);
virtual ~AgentSearchInstance();
bool init();
diff --git a/src/server/search/searchrequest.h b/src/server/search/searchrequest.h
index aff1cc8..6806e15 100644
--- a/src/server/search/searchrequest.h
+++ b/src/server/search/searchrequest.h
@@ -35,7 +35,7 @@ class SearchRequest : public QObject
Q_OBJECT
public:
- SearchRequest(const QByteArray &connectionId);
+ explicit SearchRequest(const QByteArray &connectionId);
~SearchRequest();
void setQuery(const QString &query);
diff --git a/src/server/storage/datastore.cpp b/src/server/storage/datastore.cpp
index dbc7f58..50b923c 100644
--- a/src/server/storage/datastore.cpp
+++ b/src/server/storage/datastore.cpp
@@ -42,22 +42,22 @@
#include <private/externalpartstorage_p.h>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QEventLoop>
-#include <QtCore/QSettings>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QThread>
-#include <QtCore/QThreadStorage>
-#include <QtCore/QTimer>
-#include <QtCore/QUuid>
-#include <QtCore/QVariant>
-#include <QtSql/QSqlDatabase>
-#include <QtSql/QSqlDriver>
-#include <QtSql/QSqlError>
-#include <QtSql/QSqlField>
-#include <QtSql/QSqlQuery>
+#include <QCoreApplication>
+#include <QDir>
+#include <QEventLoop>
+#include <QSettings>
+#include <QString>
+#include <QStringList>
+#include <QThread>
+#include <QThreadStorage>
+#include <QTimer>
+#include <QUuid>
+#include <QVariant>
+#include <QSqlDatabase>
+#include <QSqlDriver>
+#include <QSqlError>
+#include <QSqlField>
+#include <QSqlQuery>
using namespace Akonadi;
using namespace Akonadi::Server;
@@ -712,7 +712,7 @@ bool DataStore::removeItemParts(const PimItem &item, const QSet<QByteArray> &par
qb.exec();
Part::List existingParts = qb.result();
- Q_FOREACH (Part part, existingParts) {
+ Q_FOREACH (Part part, existingParts) { //krazy:exclude=foreach
if (!PartHelper::remove(&part)) {
return false;
}
@@ -739,7 +739,7 @@ bool DataStore::invalidateItemCache(const PimItem &item)
const Part::List parts = qb.result();
// clear data field
- Q_FOREACH (Part part, parts) {
+ Q_FOREACH (Part part, parts) { //krazy:exclude=foreach
if (!PartHelper::truncate(part)) {
return false;
}
@@ -836,7 +836,7 @@ bool DataStore::cleanupCollection_slow(Collection &collection)
Collection::clearPimItems(collection.id());
// delete attributes
- Q_FOREACH (CollectionAttribute attr, collection.attributes()) {
+ Q_FOREACH (CollectionAttribute attr, collection.attributes()) { //krazy:exclude=foreach
if (!attr.remove()) {
return false;
}
@@ -1204,7 +1204,7 @@ bool DataStore::removeCollectionAttribute(const Collection &col, const QByteArra
}
const QVector<CollectionAttribute> result = qb.result();
- Q_FOREACH (CollectionAttribute attr, result) {
+ Q_FOREACH (CollectionAttribute attr, result) { //krazy:exclude=foreach
if (!attr.remove()) {
throw HandlerException("Unable to remove collection attribute");
}
diff --git a/src/server/storage/datastore.h b/src/server/storage/datastore.h
index 840fb79..5a24a38 100644
--- a/src/server/storage/datastore.h
+++ b/src/server/storage/datastore.h
@@ -20,13 +20,13 @@
#ifndef DATASTORE_H
#define DATASTORE_H
-#include <QtCore/QObject>
-#include <QtCore/QList>
-#include <QtCore/QMutex>
-#include <QtCore/QVector>
-#include <QtCore/QWaitCondition>
-#include <QtCore/QThreadStorage>
-#include <QtSql/QSqlDatabase>
+#include <QObject>
+#include <QList>
+#include <QMutex>
+#include <QVector>
+#include <QWaitCondition>
+#include <QThreadStorage>
+#include <QSqlDatabase>
class QSqlQuery;
class QTimer;
diff --git a/src/server/storage/dbconfig.cpp b/src/server/storage/dbconfig.cpp
index e4fab94..e1172af 100644
--- a/src/server/storage/dbconfig.cpp
+++ b/src/server/storage/dbconfig.cpp
@@ -28,8 +28,8 @@
#include <private/xdgbasedirs_p.h>
#include <private/instance_p.h>
-#include <QtCore/QDir>
-#include <QtCore/QStringBuilder>
+#include <QDir>
+#include <QStringBuilder>
#include <QProcess>
using namespace Akonadi;
diff --git a/src/server/storage/dbconfig.h b/src/server/storage/dbconfig.h
index 82f1322..f7c24ab 100644
--- a/src/server/storage/dbconfig.h
+++ b/src/server/storage/dbconfig.h
@@ -20,8 +20,8 @@
#ifndef DBCONFIG_H
#define DBCONFIG_H
-#include <QtCore/QSettings>
-#include <QtSql/QSqlDatabase>
+#include <QSettings>
+#include <QSqlDatabase>
namespace Akonadi {
namespace Server {
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
index 5cfaa33..0962ccb 100644
--- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp
@@ -24,14 +24,14 @@
#include <private/standarddirs_p.h>
#include <private/xdgbasedirs_p.h>
-#include <QtCore/QDateTime>
-#include <QtCore/QDir>
-#include <QtCore/QProcess>
-#include <QtCore/QThread>
+#include <QDateTime>
+#include <QDir>
+#include <QProcess>
+#include <QThread>
#include <QRegularExpression>
-#include <QtSql/QSqlDriver>
-#include <QtSql/QSqlError>
-#include <QtSql/QSqlQuery>
+#include <QSqlDriver>
+#include <QSqlError>
+#include <QSqlQuery>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
index 052261c..8d82014 100644
--- a/src/server/storage/dbconfigpostgresql.cpp
+++ b/src/server/storage/dbconfigpostgresql.cpp
@@ -24,11 +24,11 @@
#include <private/xdgbasedirs_p.h>
#include <private/standarddirs_p.h>
-#include <QtCore/QDir>
-#include <QtCore/QProcess>
-#include <QtSql/QSqlDriver>
-#include <QtSql/QSqlError>
-#include <QtSql/QSqlQuery>
+#include <QDir>
+#include <QProcess>
+#include <QSqlDriver>
+#include <QSqlError>
+#include <QSqlQuery>
#include <config-akonadi.h>
#ifdef HAVE_UNISTD_H
diff --git a/src/server/storage/dbconfigsqlite.cpp b/src/server/storage/dbconfigsqlite.cpp
index d2fe113..96e8be8 100644
--- a/src/server/storage/dbconfigsqlite.cpp
+++ b/src/server/storage/dbconfigsqlite.cpp
@@ -24,10 +24,10 @@
#include <private/xdgbasedirs_p.h>
#include <private/standarddirs_p.h>
-#include <QtCore/QDir>
-#include <QtSql/QSqlDriver>
-#include <QtSql/QSqlError>
-#include <QtSql/QSqlQuery>
+#include <QDir>
+#include <QSqlDriver>
+#include <QSqlError>
+#include <QSqlQuery>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/src/server/storage/dbconfigsqlite.h b/src/server/storage/dbconfigsqlite.h
index a88038f..8dc354c 100644
--- a/src/server/storage/dbconfigsqlite.h
+++ b/src/server/storage/dbconfigsqlite.h
@@ -36,7 +36,7 @@ public:
};
public:
- DbConfigSqlite(Version driver);
+ explicit DbConfigSqlite(Version driver);
/**
* Returns the name of the used driver.
diff --git a/src/server/storage/dbinitializer.cpp b/src/server/storage/dbinitializer.cpp
index 7babe28..7cc456a 100644
--- a/src/server/storage/dbinitializer.cpp
+++ b/src/server/storage/dbinitializer.cpp
@@ -26,14 +26,14 @@
#include "entities.h"
#include "akonadiserver_debug.h"
-#include <QtCore/QFile>
-#include <QtCore/QPair>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtSql/QSqlField>
-#include <QtSql/QSqlRecord>
-#include <QtSql/QSqlQuery>
-#include <QtSql/QSqlError>
+#include <QFile>
+#include <QPair>
+#include <QStringList>
+#include <QVariant>
+#include <QSqlField>
+#include <QSqlRecord>
+#include <QSqlQuery>
+#include <QSqlError>
#include <algorithm>
diff --git a/src/server/storage/dbinitializer.h b/src/server/storage/dbinitializer.h
index 5b2936e..cc407f5 100644
--- a/src/server/storage/dbinitializer.h
+++ b/src/server/storage/dbinitializer.h
@@ -23,12 +23,12 @@
#include "dbintrospector.h"
#include "schematypes.h"
-#include <QtCore/QHash>
-#include <QtCore/QPair>
-#include <QtCore/QVector>
-#include <QtCore/QStringList>
+#include <QHash>
+#include <QPair>
+#include <QVector>
+#include <QStringList>
#include <QSharedPointer>
-#include <QtSql/QSqlDatabase>
+#include <QSqlDatabase>
class DbInitializerTest;
diff --git a/src/server/storage/dbinitializer_p.h b/src/server/storage/dbinitializer_p.h
index 08c476d..089e582 100644
--- a/src/server/storage/dbinitializer_p.h
+++ b/src/server/storage/dbinitializer_p.h
@@ -29,7 +29,7 @@ namespace Server {
class DbInitializerMySql : public DbInitializer
{
public:
- DbInitializerMySql(const QSqlDatabase &database);
+ explicit DbInitializerMySql(const QSqlDatabase &database);
protected:
QString sqlType(const QString &type, int size) const Q_DECL_OVERRIDE;
@@ -43,7 +43,7 @@ protected:
class DbInitializerSqlite : public DbInitializer
{
public:
- DbInitializerSqlite(const QSqlDatabase &database);
+ explicit DbInitializerSqlite(const QSqlDatabase &database);
protected:
QString buildCreateTableStatement(const TableDescription &tableDescription) const Q_DECL_OVERRIDE;
QString buildColumnStatement(const ColumnDescription &columnDescription, const TableDescription &tableDescription) const Q_DECL_OVERRIDE;
@@ -54,7 +54,7 @@ protected:
class DbInitializerPostgreSql : public DbInitializer
{
public:
- DbInitializerPostgreSql(const QSqlDatabase &database);
+ explicit DbInitializerPostgreSql(const QSqlDatabase &database);
protected:
QString sqlType(const QString &type, int size) const Q_DECL_OVERRIDE;
diff --git a/src/server/storage/dbintrospector_impl.h b/src/server/storage/dbintrospector_impl.h
index 958cbad..606759d 100644
--- a/src/server/storage/dbintrospector_impl.h
+++ b/src/server/storage/dbintrospector_impl.h
@@ -29,7 +29,7 @@ namespace Server {
class DbIntrospectorMySql : public DbIntrospector
{
public:
- DbIntrospectorMySql(const QSqlDatabase &database);
+ explicit DbIntrospectorMySql(const QSqlDatabase &database);
QVector<ForeignKey> foreignKeyConstraints(const QString &tableName) Q_DECL_OVERRIDE;
QString hasIndexQuery(const QString &tableName, const QString &indexName) Q_DECL_OVERRIDE;
};
@@ -37,14 +37,14 @@ public:
class DbIntrospectorSqlite : public DbIntrospector
{
public:
- DbIntrospectorSqlite(const QSqlDatabase &database);
+ explicit DbIntrospectorSqlite(const QSqlDatabase &database);
QString hasIndexQuery(const QString &tableName, const QString &indexName) Q_DECL_OVERRIDE;
};
class DbIntrospectorPostgreSql : public DbIntrospector
{
public:
- DbIntrospectorPostgreSql(const QSqlDatabase &database);
+ explicit DbIntrospectorPostgreSql(const QSqlDatabase &database);
QVector<ForeignKey> foreignKeyConstraints(const QString &tableName) Q_DECL_OVERRIDE;
QString hasIndexQuery(const QString &tableName, const QString &indexName) Q_DECL_OVERRIDE;
};
diff --git a/src/server/storage/dbupdater.cpp b/src/server/storage/dbupdater.cpp
index 4e17622..14eb107 100644
--- a/src/server/storage/dbupdater.cpp
+++ b/src/server/storage/dbupdater.cpp
@@ -33,16 +33,16 @@
#include <QCoreApplication>
#include <QMetaMethod>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusConnectionInterface>
-#include <QtSql/QSqlQuery>
-#include <QtSql/QSqlError>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QSqlQuery>
+#include <QSqlError>
#include <QThread>
#include <QDomDocument>
#include <QFile>
#include <QTime>
-#include <QtSql/qsqlresult.h>
+#include <qsqlresult.h>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/src/server/storage/dbupdater.h b/src/server/storage/dbupdater.h
index 868aaed..9122844 100644
--- a/src/server/storage/dbupdater.h
+++ b/src/server/storage/dbupdater.h
@@ -20,10 +20,10 @@
#ifndef AKONADI_DBUPDATER_H
#define AKONADI_DBUPDATER_H
-#include <QtCore/QObject>
-#include <QtCore/QMap>
-#include <QtCore/QStringList>
-#include <QtSql/QSqlDatabase>
+#include <QObject>
+#include <QMap>
+#include <QStringList>
+#include <QSqlDatabase>
class QDomElement;
class DbUpdaterTest;
diff --git a/src/server/storage/entity.cpp b/src/server/storage/entity.cpp
index 9ec4731..c7ff4d4 100644
--- a/src/server/storage/entity.cpp
+++ b/src/server/storage/entity.cpp
@@ -21,11 +21,11 @@
#include "datastore.h"
#include "countquerybuilder.h"
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtSql/QSqlQuery>
-#include <QtSql/QSqlDatabase>
-#include <QtSql/QSqlError>
+#include <QStringList>
+#include <QVariant>
+#include <QSqlQuery>
+#include <QSqlDatabase>
+#include <QSqlError>
using namespace Akonadi::Server;
diff --git a/src/server/storage/entity.h b/src/server/storage/entity.h
index 7982be2..0cbec6d 100644
--- a/src/server/storage/entity.h
+++ b/src/server/storage/entity.h
@@ -20,11 +20,10 @@
#ifndef ENTITY_H
#define ENTITY_H
-#include <QtCore/Qt>
-#include <QtCore/QDateTime>
-#include <QtCore/QDebug>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QDateTime>
+#include <QDebug>
+#include <QString>
+#include <QStringList>
class QVariant;
class QSqlDatabase;
diff --git a/src/server/storage/itemretrievalmanager.h b/src/server/storage/itemretrievalmanager.h
index ec8880f..03bde5b 100644
--- a/src/server/storage/itemretrievalmanager.h
+++ b/src/server/storage/itemretrievalmanager.h
@@ -54,8 +54,8 @@ class ItemRetrievalManager : public AkThread
{
Q_OBJECT
public:
- ItemRetrievalManager(QObject *parent = Q_NULLPTR);
- ItemRetrievalManager(AbstractItemRetrievalJobFactory *factory, QObject *parent = Q_NULLPTR);
+ explicit ItemRetrievalManager(QObject *parent = Q_NULLPTR);
+ explicit ItemRetrievalManager(AbstractItemRetrievalJobFactory *factory, QObject *parent = Q_NULLPTR);
~ItemRetrievalManager();
/**
diff --git a/src/server/storage/itemretriever.cpp b/src/server/storage/itemretriever.cpp
index 22994af..0ae3e91 100644
--- a/src/server/storage/itemretriever.cpp
+++ b/src/server/storage/itemretriever.cpp
@@ -399,7 +399,7 @@ void ItemRetriever::verifyCache()
}
const Part::List externalParts = qb.result();
- Q_FOREACH (Part part, externalParts) {
+ Q_FOREACH (Part part, externalParts) { // krazy:exclude=foreach
PartHelper::verify(part);
}
}
diff --git a/src/server/storage/itemretriever.h b/src/server/storage/itemretriever.h
index 8f44f7f..6fbe064 100644
--- a/src/server/storage/itemretriever.h
+++ b/src/server/storage/itemretriever.h
@@ -50,7 +50,7 @@ class ItemRetriever : public QObject
Q_OBJECT
public:
- ItemRetriever(Connection *connection = Q_NULLPTR);
+ explicit ItemRetriever(Connection *connection = Q_NULLPTR);
Connection *connection() const;
diff --git a/src/server/storage/notificationcollector.cpp b/src/server/storage/notificationcollector.cpp
index 1df0fef..deead37 100644
--- a/src/server/storage/notificationcollector.cpp
+++ b/src/server/storage/notificationcollector.cpp
@@ -28,7 +28,7 @@
#include "akonadi.h"
#include "handler/search.h"
-#include <QtCore/QDebug>
+#include <QDebug>
using namespace Akonadi;
using namespace Akonadi::Server;
diff --git a/src/server/storage/notificationcollector.h b/src/server/storage/notificationcollector.h
index c8622d7..ba9f6a7 100644
--- a/src/server/storage/notificationcollector.h
+++ b/src/server/storage/notificationcollector.h
@@ -24,10 +24,10 @@
#include <private/protocol_p.h>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QList>
+#include <QObject>
+#include <QString>
namespace Akonadi {
namespace Server {
@@ -48,13 +48,13 @@ public:
Create a new notification collector that is not attached to
a DataStore and just collects notifications until you emit them manually.
*/
- NotificationCollector(QObject *parent = Q_NULLPTR);
+ explicit NotificationCollector(QObject *parent = Q_NULLPTR);
/**
Create a new notification collector for the given DataStore @p db.
@param db The datastore using this notification collector.
*/
- NotificationCollector(DataStore *db);
+ explicit NotificationCollector(DataStore *db);
/**
Destroys this notification collector.
diff --git a/src/server/storage/parttypehelper.cpp b/src/server/storage/parttypehelper.cpp
index 7df2c3f..a3ab9da 100644
--- a/src/server/storage/parttypehelper.cpp
+++ b/src/server/storage/parttypehelper.cpp
@@ -22,7 +22,7 @@
#include "selectquerybuilder.h"
#include "entities.h"
-#include <QtCore/QStringList>
+#include <QStringList>
using namespace Akonadi::Server;
diff --git a/src/server/storage/query.h b/src/server/storage/query.h
index 1b4a6bf..5f50373 100644
--- a/src/server/storage/query.h
+++ b/src/server/storage/query.h
@@ -20,9 +20,9 @@
#ifndef AKONADI_QUERY_H
#define AKONADI_QUERY_H
-#include <QtCore/QString>
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
+#include <QString>
+#include <QVariant>
+#include <QVector>
namespace Akonadi {
namespace Server {
@@ -82,7 +82,7 @@ public:
Create an empty condition.
@param op how to combine sub queries.
*/
- Condition(LogicOperator op = And);
+ explicit Condition(LogicOperator op = And);
/**
Add a WHERE condition which compares a column with a given value.
diff --git a/src/server/storage/querybuilder.h b/src/server/storage/querybuilder.h
index 14af3a7..d0d4da6 100644
--- a/src/server/storage/querybuilder.h
+++ b/src/server/storage/querybuilder.h
@@ -23,12 +23,12 @@
#include "query.h"
#include "dbtype.h"
-#include <QtCore/QPair>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
-#include <QtSql/QSqlQuery>
+#include <QPair>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
+#include <QVector>
+#include <QSqlQuery>
#ifdef QUERYBUILDER_UNITTEST
class QueryBuilderTest;
diff --git a/src/server/storage/querycache.cpp b/src/server/storage/querycache.cpp
index c7f5d65..f430c88 100644
--- a/src/server/storage/querycache.cpp
+++ b/src/server/storage/querycache.cpp
@@ -23,8 +23,8 @@
#include <QSqlQuery>
#include <QThreadStorage>
-#include <QtCore/QHash>
-#include <QtCore/QTimer>
+#include <QHash>
+#include <QTimer>
using namespace Akonadi::Server;
diff --git a/src/server/storage/schematypes.h b/src/server/storage/schematypes.h
index a55b216..2ea9ade 100644
--- a/src/server/storage/schematypes.h
+++ b/src/server/storage/schematypes.h
@@ -122,7 +122,7 @@ public:
class RelationTableDescription : public TableDescription
{
public:
- RelationTableDescription(const RelationDescription &relation);
+ explicit RelationTableDescription(const RelationDescription &relation);
};
} // namespace Server
diff --git a/src/server/storage/storagedebugger.cpp b/src/server/storage/storagedebugger.cpp
index 07d16fc..fd7825e 100644
--- a/src/server/storage/storagedebugger.cpp
+++ b/src/server/storage/storagedebugger.cpp
@@ -20,12 +20,12 @@
#include "storagedebugger.h"
#include "storagedebuggeradaptor.h"
-#include <QtSql/QSqlQuery>
-#include <QtSql/QSqlRecord>
-#include <QtSql/QSqlError>
+#include <QSqlQuery>
+#include <QSqlRecord>
+#include <QSqlError>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMetaType>
+#include <QDBusConnection>
+#include <QDBusMetaType>
Akonadi::Server::StorageDebugger *Akonadi::Server::StorageDebugger::mSelf = 0;
QMutex Akonadi::Server::StorageDebugger::mMutex;
diff --git a/src/server/storage/storagedebugger.h b/src/server/storage/storagedebugger.h
index 91b6934..cc4504f 100644
--- a/src/server/storage/storagedebugger.h
+++ b/src/server/storage/storagedebugger.h
@@ -20,10 +20,10 @@
#ifndef STORAGEDEBUGGER_H
#define STORAGEDEBUGGER_H
-#include <QtCore/QObject>
-#include <QtCore/QMutex>
-#include <QtCore/QMap>
-#include <QtCore/QVariant>
+#include <QObject>
+#include <QMutex>
+#include <QMap>
+#include <QVariant>
#include <QFile>
#ifdef QT5_BUILD
diff --git a/src/server/storagejanitor.cpp b/src/server/storagejanitor.cpp
index 797d340..ec0746c 100644
--- a/src/server/storagejanitor.cpp
+++ b/src/server/storagejanitor.cpp
@@ -38,11 +38,11 @@
#include <private/externalpartstorage_p.h>
#include <QStringBuilder>
-#include <QtDBus/QDBusConnection>
-#include <QtSql/QSqlQuery>
-#include <QtSql/QSqlError>
-#include <QtCore/QDir>
-#include <QtCore/qdiriterator.h>
+#include <QDBusConnection>
+#include <QSqlQuery>
+#include <QSqlError>
+#include <QDir>
+#include <qdiriterator.h>
#include <QDateTime>
#include <algorithm>
diff --git a/src/server/storagejanitor.h b/src/server/storagejanitor.h
index 72172ff..858950c 100644
--- a/src/server/storagejanitor.h
+++ b/src/server/storagejanitor.h
@@ -22,7 +22,7 @@
#include "akthread.h"
-#include <QtDBus/QDBusConnection>
+#include <QDBusConnection>
namespace Akonadi {
namespace Server {
diff --git a/src/server/tracer.cpp b/src/server/tracer.cpp
index 679295f..cc6dd3b 100644
--- a/src/server/tracer.cpp
+++ b/src/server/tracer.cpp
@@ -18,8 +18,8 @@
***************************************************************************/
#include "tracer.h"
-#include <QtCore/QSettings>
-#include <QtCore/QString>
+#include <QSettings>
+#include <QString>
#include "traceradaptor.h"
diff --git a/src/server/tracer.h b/src/server/tracer.h
index 4dbfb4e..1620794 100644
--- a/src/server/tracer.h
+++ b/src/server/tracer.h
@@ -20,8 +20,8 @@
#ifndef AKONADI_TRACER_H
#define AKONADI_TRACER_H
-#include <QtCore/QObject>
-#include <QtCore/QMutex>
+#include <QObject>
+#include <QMutex>
#include "tracerinterface.h"
diff --git a/src/server/utils.cpp b/src/server/utils.cpp
index d517d6e..654f2b8 100644
--- a/src/server/utils.cpp
+++ b/src/server/utils.cpp
@@ -25,10 +25,10 @@
#include <private/standarddirs_p.h>
#include <private/xdgbasedirs_p.h>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtNetwork/QHostInfo>
+#include <QDir>
+#include <QFileInfo>
+#include <QSettings>
+#include <QHostInfo>
#if !defined(Q_OS_WIN)
#include <cstdlib>
@@ -155,7 +155,7 @@ static bool createSocketDirectory(const QString &link, const QString &tmpl)
{
QString directory = QStringLiteral("%1%2%3").arg(QDir::tempPath()).arg(QDir::separator()).arg(tmpl);
- QByteArray directoryString = directory.toLocal8Bit().data();
+ QByteArray directoryString = directory.toLocal8Bit();
if (!mkdtemp(directoryString.data())) {
qCCritical(AKONADISERVER_LOG) << "Creating socket directory with template" << directoryString << "failed:" << strerror(errno);
diff --git a/src/server/utils.h b/src/server/utils.h
index ccec4d5..7453fa0 100644
--- a/src/server/utils.h
+++ b/src/server/utils.h
@@ -21,10 +21,10 @@
#ifndef UTILS_H
#define UTILS_H
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
-#include <QtCore/QDateTime>
-#include <QtCore/QSet>
+#include <QVariant>
+#include <QVector>
+#include <QDateTime>
+#include <QSet>
#include "storage/datastore.h"
#include "storage/dbtype.h"
diff --git a/src/shared/akapplication.cpp b/src/shared/akapplication.cpp
index 1f10407..8757a44 100644
--- a/src/shared/akapplication.cpp
+++ b/src/shared/akapplication.cpp
@@ -26,7 +26,7 @@
#include <QDBusConnection>
#include <QTimer>
#include <QCommandLineParser>
-#include <QtCore/QCoreApplication>
+#include <QCoreApplication>
#include <iostream>
diff --git a/src/shared/akapplication.h b/src/shared/akapplication.h
index dbd4936..f402810 100644
--- a/src/shared/akapplication.h
+++ b/src/shared/akapplication.h
@@ -20,8 +20,8 @@
#ifndef AKAPPLICATION_H
#define AKAPPLICATION_H
-#include <QtCore/QObject>
-#include <QtCore/QCommandLineParser>
+#include <QObject>
+#include <QCommandLineParser>
#include <QLoggingCategory>
class QCoreApplication;
diff --git a/src/widgets/agentactionmanager.h b/src/widgets/agentactionmanager.h
index 5960862..5d6f0f1 100644
--- a/src/widgets/agentactionmanager.h
+++ b/src/widgets/agentactionmanager.h
@@ -23,7 +23,7 @@
#include "akonadiwidgets_export.h"
#include "agentinstance.h"
-#include <QtCore/QObject>
+#include <QObject>
class QAction;
class KActionCollection;
diff --git a/src/widgets/agentinstancewidget.cpp b/src/widgets/agentinstancewidget.cpp
index ed0c700..fe04a47 100644
--- a/src/widgets/agentinstancewidget.cpp
+++ b/src/widgets/agentinstancewidget.cpp
@@ -26,7 +26,7 @@
#include <QIcon>
#include <KIconLoader>
-#include <QtCore/QUrl>
+#include <QUrl>
#include <QApplication>
#include <QHBoxLayout>
#include <QListView>
diff --git a/src/widgets/collectioncombobox.cpp b/src/widgets/collectioncombobox.cpp
index bc9a48d..ac14350 100644
--- a/src/widgets/collectioncombobox.cpp
+++ b/src/widgets/collectioncombobox.cpp
@@ -34,8 +34,8 @@
#include <kdescendantsproxymodel.h>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QEvent>
+#include <QAbstractItemModel>
+#include <QEvent>
#include <QPointer>
#include <QMouseEvent>
diff --git a/src/widgets/collectionrequester.cpp b/src/widgets/collectionrequester.cpp
index 774a926..8c49981 100644
--- a/src/widgets/collectionrequester.cpp
+++ b/src/widgets/collectionrequester.cpp
@@ -27,7 +27,7 @@
#include <KLocalizedString>
#include <kstandardshortcut.h>
-#include <QtCore/QEvent>
+#include <QEvent>
#include <QAction>
#include <QPushButton>
#include <QHBoxLayout>
diff --git a/src/widgets/collectionview.cpp b/src/widgets/collectionview.cpp
index d14c542..67f7f6e 100644
--- a/src/widgets/collectionview.cpp
+++ b/src/widgets/collectionview.cpp
@@ -32,7 +32,7 @@
#include <kxmlguifactory.h>
#include <kxmlguiwindow.h>
-#include <QtCore/QTimer>
+#include <QTimer>
#include <QUrlQuery>
#include <QApplication>
#include <QDragMoveEvent>
diff --git a/src/widgets/controlgui.cpp b/src/widgets/controlgui.cpp
index e1a00bc..a07f82b 100644
--- a/src/widgets/controlgui.cpp
+++ b/src/widgets/controlgui.cpp
@@ -26,10 +26,10 @@
#include <KLocalizedString>
-#include <QtCore/QEventLoop>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTimer>
-#include <QtCore/QPointer>
+#include <QEventLoop>
+#include <QCoreApplication>
+#include <QTimer>
+#include <QPointer>
#include <QFrame>
using namespace Akonadi;
diff --git a/src/widgets/controlgui.h b/src/widgets/controlgui.h
index bc03d9b..41e6d7a 100644
--- a/src/widgets/controlgui.h
+++ b/src/widgets/controlgui.h
@@ -22,7 +22,7 @@
#include "akonadiwidgets_export.h"
-#include <QtCore/QObject>
+#include <QObject>
namespace Akonadi
{
diff --git a/src/widgets/entitylistview.cpp b/src/widgets/entitylistview.cpp
index 0171e9f..b70dce1 100644
--- a/src/widgets/entitylistview.cpp
+++ b/src/widgets/entitylistview.cpp
@@ -24,7 +24,7 @@
#include "dragdropmanager_p.h"
#include "favoritecollectionsmodel.h"
-#include <QtCore/QTimer>
+#include <QTimer>
#include <QDragMoveEvent>
#include <QMenu>
diff --git a/src/widgets/entitytreeview.cpp b/src/widgets/entitytreeview.cpp
index e370914..b4f2cf1 100644
--- a/src/widgets/entitytreeview.cpp
+++ b/src/widgets/entitytreeview.cpp
@@ -23,8 +23,8 @@
#include "dragdropmanager_p.h"
-#include <QtCore/QDebug>
-#include <QtCore/QTimer>
+#include <QDebug>
+#include <QTimer>
#include <QApplication>
#include <QDragMoveEvent>
#include <QHeaderView>
diff --git a/src/widgets/erroroverlay.cpp b/src/widgets/erroroverlay.cpp
index 8796f6d..3ec3dcf 100644
--- a/src/widgets/erroroverlay.cpp
+++ b/src/widgets/erroroverlay.cpp
@@ -27,7 +27,7 @@
#include <KLocalizedString>
#include <KStandardGuiItem>
-#include <QtCore/QEvent>
+#include <QEvent>
#include <QPalette>
using namespace Akonadi;
diff --git a/src/widgets/erroroverlay_p.h b/src/widgets/erroroverlay_p.h
index a62f46a..5e69f2b 100644
--- a/src/widgets/erroroverlay_p.h
+++ b/src/widgets/erroroverlay_p.h
@@ -22,7 +22,7 @@
#include "servermanager.h"
-#include <QtCore/QPointer>
+#include <QPointer>
#include <QWidget>
namespace Ui
diff --git a/src/widgets/etmviewstatesaver.cpp b/src/widgets/etmviewstatesaver.cpp
index 1ea2729..da37292 100644
--- a/src/widgets/etmviewstatesaver.cpp
+++ b/src/widgets/etmviewstatesaver.cpp
@@ -21,7 +21,7 @@
#include "etmviewstatesaver.h"
-#include <QtCore/QModelIndex>
+#include <QModelIndex>
#include "entitytreemodel.h"
diff --git a/src/widgets/etmviewstatesaver.h b/src/widgets/etmviewstatesaver.h
index 16efe64..bd1bec9 100644
--- a/src/widgets/etmviewstatesaver.h
+++ b/src/widgets/etmviewstatesaver.h
@@ -36,7 +36,7 @@ class AKONADIWIDGETS_EXPORT ETMViewStateSaver : public KConfigViewStateSaver //
{
Q_OBJECT
public:
- ETMViewStateSaver(QObject *parent = Q_NULLPTR);
+ explicit ETMViewStateSaver(QObject *parent = Q_NULLPTR);
void selectCollections(const Akonadi::Collection::List &list);
void selectCollections(const QList<Akonadi::Collection::Id> &list);
diff --git a/src/widgets/selftestdialog.cpp b/src/widgets/selftestdialog.cpp
index f1f52e5..88d9358 100644
--- a/src/widgets/selftestdialog.cpp
+++ b/src/widgets/selftestdialog.cpp
@@ -20,7 +20,6 @@
#include "selftestdialog.h"
#include "agentmanager.h"
#include "KDBusConnectionPool"
-#include "session_p.h"
#include "servermanager.h"
#include "servermanager_p.h"
#include "private/standarddirs_p.h"
@@ -36,11 +35,12 @@
#include <QSqlError>
#include <KUser>
-#include <QtCore/QFileInfo>
-#include <QtCore/QProcess>
-#include <QtCore/QSettings>
-#include <QtCore/QTextStream>
-#include <QtDBus/QtDBus>
+#include <QFileInfo>
+#include <QProcess>
+#include <QSettings>
+#include <QTextStream>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
#include <QApplication>
#include <QClipboard>
#include <QStandardItemModel>
@@ -48,6 +48,7 @@
#include <QDialogButtonBox>
#include <QPushButton>
#include <QVBoxLayout>
+#include <QDate>
// @cond PRIVATE
diff --git a/src/widgets/standardactionmanager.cpp b/src/widgets/standardactionmanager.cpp
index 4d1f062..c7abf9d 100644
--- a/src/widgets/standardactionmanager.cpp
+++ b/src/widgets/standardactionmanager.cpp
@@ -54,7 +54,7 @@
#include <KMessageBox>
#include <KToggleAction>
-#include <QtCore/QMimeData>
+#include <QMimeData>
#include <QApplication>
#include <QClipboard>
#include <QItemSelectionModel>
diff --git a/src/widgets/standardactionmanager.h b/src/widgets/standardactionmanager.h
index 215f936..7e1e37a 100644
--- a/src/widgets/standardactionmanager.h
+++ b/src/widgets/standardactionmanager.h
@@ -22,7 +22,7 @@
#include "akonadiwidgets_export.h"
-#include <QtCore/QObject>
+#include <QObject>
#include "collection.h"
#include "item.h"
diff --git a/src/xml/autotests/collectiontest.h b/src/xml/autotests/collectiontest.h
index 74ac718..9050c55 100644
--- a/src/xml/autotests/collectiontest.h
+++ b/src/xml/autotests/collectiontest.h
@@ -19,7 +19,7 @@
#ifndef COLLECTIONTEST_H
#define COLLECTIONTEST_H
-#include <QtCore/QObject>
+#include <QObject>
#include "collection.h"
class CollectionTest : public QObject
diff --git a/src/xml/autotests/xmldocumenttest.cpp b/src/xml/autotests/xmldocumenttest.cpp
index ce29cb0..c4ce167 100644
--- a/src/xml/autotests/xmldocumenttest.cpp
+++ b/src/xml/autotests/xmldocumenttest.cpp
@@ -19,7 +19,7 @@
#include "xmldocument.h"
-#include <QtCore/QObject>
+#include <QObject>
#include <qtest.h>
diff --git a/src/xml/xmldocument.h b/src/xml/xmldocument.h
index d867613..a14b049 100644
--- a/src/xml/xmldocument.h
+++ b/src/xml/xmldocument.h
@@ -25,7 +25,7 @@
#include "collection.h"
#include <item.h>
-#include <QtXml/QDomDocument>
+#include <QDomDocument>
namespace Akonadi
{
@@ -48,7 +48,7 @@ public:
@see loadFile()
*/
- XmlDocument(const QString &fileName);
+ explicit XmlDocument(const QString &fileName);
~XmlDocument();
/**
diff --git a/src/xml/xmlreader.h b/src/xml/xmlreader.h
index 9b8c5e4..e4f2278 100644
--- a/src/xml/xmlreader.h
+++ b/src/xml/xmlreader.h
@@ -26,7 +26,7 @@
#include "collection.h"
#include "item.h"
-#include <QtXml/QDomElement>
+#include <QDomElement>
namespace Akonadi
{
diff --git a/src/xml/xmlwriter.h b/src/xml/xmlwriter.h
index 99dcccc..374deea 100644
--- a/src/xml/xmlwriter.h
+++ b/src/xml/xmlwriter.h
@@ -23,7 +23,7 @@
#include "akonadi-xml_export.h"
-#include <QtXml/QDomElement>
+#include <QDomElement>
namespace Akonadi
{
diff --git a/tests/libs/collectiondialog.cpp b/tests/libs/collectiondialog.cpp
index 18ec18d..5e8a49e 100644
--- a/tests/libs/collectiondialog.cpp
+++ b/tests/libs/collectiondialog.cpp
@@ -19,7 +19,7 @@
#include "collectiondialog.h"
-#include <QtCore/QDebug>
+#include <QDebug>
#include <KLocalizedString>
#include <qapplication.h>
diff --git a/tests/libs/pluginloadertest.cpp b/tests/libs/pluginloadertest.cpp
index ddbdf82..3cb87f6 100644
--- a/tests/libs/pluginloadertest.cpp
+++ b/tests/libs/pluginloadertest.cpp
@@ -20,8 +20,8 @@
#include "pluginloader_p.h"
#include "itemserializerplugin.h"
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
+#include <QDebug>
+#include <QFile>
#include <QStringList>
#include <QApplication>