[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kxmlgui] src: Use KEMailSettings, instead of parsing configurations directly
From:       Alex Merry <alex.merry () kde ! org>
Date:       2014-04-01 0:52:23
Message-ID: E1WUmwB-0001Bb-5f () scm ! kde ! org
[Download RAW message or body]

Git commit 4034430158a5253cb57f3327db3f5d1f186837ef by Alex Merry.
Committed on 31/03/2014 at 23:23.
Pushed by alexmerry into branch 'master'.

Use KEMailSettings, instead of parsing configurations directly

It turns out KEMailSettings is no longer in KIO, as the comment
complains, but in KConfig where it belongs.

REVIEW: 117269

M  +4    -12   src/kbugreport.cpp

http://commits.kde.org/kxmlgui/4034430158a5253cb57f3327db3f5d1f186837ef

diff --git a/src/kbugreport.cpp b/src/kbugreport.cpp
index bb37fdf..f24297a 100644
--- a/src/kbugreport.cpp
+++ b/src/kbugreport.cpp
@@ -40,6 +40,7 @@
 #include <kaboutdata.h>
 #include <kconfig.h>
 #include <kconfiggroup.h>
+#include <kemailsettings.h>
 #include <klocalizedstring.h>
 #include <kmessagebox.h>
 #include <ktextedit.h>
@@ -390,21 +391,12 @@ void KBugReportPrivate::_k_slotSetFrom()
     m_process = 0;
     m_configureEmail->setEnabled(true);
 
-    // ### KDE4: why oh why is KEMailSettings in kio?
-    KConfig emailConf(QString::fromLatin1("emaildefaults"));
-
-    KConfigGroup cg(&emailConf, "Defaults");
-    // find out the default profile
-    QString profile = QString::fromLatin1("PROFILE_");
-    profile += cg.readEntry(QString::fromLatin1("Profile"),
-                            QString::fromLatin1("Default"));
-
-    KConfigGroup profileGrp(&emailConf, profile);
-    QString fromaddr = profileGrp.readEntry("EmailAddress");
+    KEMailSettings emailSettings;
+    QString fromaddr = emailSettings.getSetting(KEMailSettings::EmailAddress);
     if (fromaddr.isEmpty()) {
         fromaddr = SystemInformation::userName();
     } else {
-        QString name = profileGrp.readEntry("FullName");
+        QString name = emailSettings.getSetting(KEMailSettings::RealName);
         if (!name.isEmpty()) {
             fromaddr = name + QString::fromLatin1(" <") + fromaddr + QString::fromLatin1(">");
         }
[prev in list] [next in list] [prev in thread] [next in thread]