Port KGlobalSettings::*Font

configuredialog/configureappearancepage.cpp

@@ -74,6 +74,7 @@ using KMime::DateFormatter;
 #include <QButtonGroup>
 #include <QSpinBox>
 #include <QLabel>
+#include <QFontDatabase>
 using namespace MailCommon;
 
 QString AppearancePage::helpAnchor() const
@@ -254,8 +255,8 @@ void AppearancePage::FontsTab::doLoadOther()
         KConfigGroup fonts( KMKernel::self()->config(), "Fonts" );
         KConfigGroup messagelistFont( KMKernel::self()->config(), "MessageListView::Fonts" );
 
-        mFont[0] = KGlobalSettings::generalFont();
-        QFont fixedFont = KGlobalSettings::fixedFont();
+        mFont[0] = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
+        QFont fixedFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
 
         for ( int i = 0 ; i < numFontNames ; ++i ) {
             const QString configName = QLatin1String(fontNames[i].configName);

editor/kmcomposewin.cpp

@@ -172,6 +172,7 @@
 #include <KHelpClient>
 #include <KCharsets>
 #include <QStandardPaths>
+#include <QFontDatabase>
 
 using Sonnet::DictionaryComboBox;
 using MailTransport::TransportManager;
@@ -582,8 +583,8 @@ void KMComposeWin::readConfig( bool reload /* = false */ )
     mEdtReplyTo->setCompletionMode( (KCompletion::CompletionMode)GlobalSettings::self()->completionMode() );
 
     if ( MessageCore::GlobalSettings::self()->useDefaultFonts() ) {
-        mBodyFont = KGlobalSettings::generalFont();
-        mFixedFont = KGlobalSettings::fixedFont();
+        mBodyFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
+        mFixedFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
     } else {
         mBodyFont = GlobalSettings::self()->composerFont();
         mFixedFont = MessageViewer::GlobalSettings::self()->fixedFont();

identity/xfaceconfigurator.cpp

@@ -55,6 +55,7 @@
 #include <QVBoxLayout>
 
 // #include <assert.h>
+#include <QFontDatabase>
 using namespace KABC;
 using namespace KIO;
 using namespace KMail;
@@ -184,7 +185,7 @@ XFaceConfigurator::XFaceConfigurator( QWidget * parent )
     mTextEdit = new PimCommon::PlainTextEditor( page );
     page_vlay->addWidget( mTextEdit );
     mTextEdit->setWhatsThis( i18n( "Use this field to enter an arbitrary X-Face string." ) );
-    mTextEdit->setFont( KGlobalSettings::fixedFont() );
+    mTextEdit->setFont( QFontDatabase::systemFont(QFontDatabase::FixedFont) );
     mTextEdit->setWordWrapMode( QTextOption::WrapAnywhere);
     mTextEdit->setSearchSupport(false);
     label2 = new QLabel( i18n("Examples are available at <a "