From a195ad506fdab1773c1138b8fabe81cf72ce8317 Mon Sep 17 00:00:00 2001 From: David Faure <faure@kde.org> Date: Sun, 24 Jan 2016 10:56:57 +0100 Subject: [PATCH 30/47] Use KSharedConfig::openConfig("kmail2rc") to try and optimize away reparsing. Backport from b3e1fb500d91a in kidentitymanagement.git --- kpimidentities/identitymanager.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kpimidentities/identitymanager.cpp b/kpimidentities/identitymanager.cpp index b4b4d8b24..e92e67653 100644 --- a/kpimidentities/identitymanager.cpp +++ b/kpimidentities/identitymanager.cpp @@ -31,6 +31,7 @@ static const char configKeyDefaultIdentity[] = "Default Identity"; #include <kglobal.h> #include <kdebug.h> #include <kconfig.h> +#include <ksharedconfig.h> #include <kuser.h> #include <kconfiggroup.h> @@ -90,11 +91,11 @@ IdentityManager::IdentityManager( bool readonly, QObject *parent, commit(); } - KConfig kmailConf( QLatin1String("kmail2rc") ); + KSharedConfig::Ptr kmailConf(KSharedConfig::openConfig(QLatin1String("kmail2rc"))); if (!mReadOnly) { bool needCommit = false; - if (kmailConf.hasGroup(QLatin1String("Composer"))) { - KConfigGroup composerGroup = kmailConf.group(QLatin1String("Composer")); + if (kmailConf->hasGroup(QLatin1String("Composer"))) { + KConfigGroup composerGroup = kmailConf->group(QLatin1String("Composer")); if (composerGroup.hasKey(QLatin1String("pgp-auto-sign"))) { const bool pgpAutoSign = composerGroup.readEntry(QLatin1String("pgp-auto-sign"), false); QList<Identity>::iterator end = mIdentities.end(); @@ -106,8 +107,8 @@ IdentityManager::IdentityManager( bool readonly, QObject *parent, needCommit = true; } } - if (kmailConf.hasGroup(QLatin1String("General"))) { - KConfigGroup generalGroup = kmailConf.group(QLatin1String("General")); + if (kmailConf->hasGroup(QLatin1String("General"))) { + KConfigGroup generalGroup = kmailConf->group(QLatin1String("General")); if (generalGroup.hasKey(QLatin1String("Default domain"))) { QString defaultDomain = generalGroup.readEntry(QLatin1String("Default domain")); if (defaultDomain.isEmpty()) { -- 2.14.1