Rename classname

configuredialog/configureappearancepage.cpp

@@ -273,7 +273,7 @@ void AppearancePage::FontsTab::doLoadOther()
                                            (fontNames[i].onlyFixed) ? fixedFont : mFont[0]);
             }
         }
-        mCustomFontCheck->setChecked(!MessageCore::GlobalSettings::self()->useDefaultFonts());
+        mCustomFontCheck->setChecked(!MessageCore::MessageCoreSettings::self()->useDefaultFonts());
         mFontLocationCombo->setCurrentIndex(0);
         slotFontSelectorChanged(0);
     } else {
@@ -292,7 +292,7 @@ void AppearancePage::FontsTab::save()
         }
 
         const bool customFonts = mCustomFontCheck->isChecked();
-        MessageCore::GlobalSettings::self()->setUseDefaultFonts(!customFonts);
+        MessageCore::MessageCoreSettings::self()->setUseDefaultFonts(!customFonts);
 
         for (int i = 0 ; i < numFontNames ; ++i) {
             const QString configName = QLatin1String(fontNames[i].configName);
@@ -404,7 +404,7 @@ AppearancePageColorsTab::AppearancePageColorsTab(QWidget *parent)
 
 void AppearancePage::ColorsTab::doLoadOther()
 {
-    mCustomColorCheck->setChecked(!MessageCore::GlobalSettings::self()->useDefaultColors());
+    mCustomColorCheck->setChecked(!MessageCore::MessageCoreSettings::self()->useDefaultColors());
     mRecycleColorCheck->setChecked(MessageViewer::MessageViewerSettings::self()->recycleQuoteColors());
     mCloseToQuotaThreshold->setValue(KMailSettings::self()->closeToQuotaThreshold());
     loadColor(true);
@@ -478,7 +478,7 @@ void AppearancePage::ColorsTab::save()
     KConfigGroup reader(KMKernel::self()->config(), "Reader");
     KConfigGroup collectionFolderView(KMKernel::self()->config(), "CollectionFolderView");
     bool customColors = mCustomColorCheck->isChecked();
-    MessageCore::GlobalSettings::self()->setUseDefaultColors(!customColors);
+    MessageCore::MessageCoreSettings::self()->setUseDefaultColors(!customColors);
 
     KColorScheme scheme(QPalette::Active, KColorScheme::View);
 
@@ -818,8 +818,8 @@ void AppearancePage::HeadersTab::doLoadOther()
     slotSelectDefaultTheme();
 
     // "Date Display":
-    setDateDisplay(MessageCore::GlobalSettings::self()->dateFormat(),
-                   MessageCore::GlobalSettings::self()->customDateFormat());
+    setDateDisplay(MessageCore::MessageCoreSettings::self()->dateFormat(),
+                   MessageCore::MessageCoreSettings::self()->customDateFormat());
 }
 
 void AppearancePage::HeadersTab::doLoadFromGlobalSettings()
@@ -833,8 +833,8 @@ void AppearancePage::HeadersTab::doLoadFromGlobalSettings()
     // "Theme":
     slotSelectDefaultTheme();
 
-    setDateDisplay(MessageCore::GlobalSettings::self()->dateFormat(),
-                   MessageCore::GlobalSettings::self()->customDateFormat());
+    setDateDisplay(MessageCore::MessageCoreSettings::self()->dateFormat(),
+                   MessageCore::MessageCoreSettings::self()->customDateFormat());
 }
 
 void AppearancePage::HeadersTab::setDateDisplay(int num, const QString &format)
@@ -870,8 +870,8 @@ void AppearancePage::HeadersTab::save()
     mThemeComboBox->writeDefaultConfig();
 
     const int dateDisplayID = mDateDisplay->checkedId();
-    MessageCore::GlobalSettings::self()->setDateFormat(dateDisplayID);
-    MessageCore::GlobalSettings::self()->setCustomDateFormat(mCustomDateFormatEdit->text());
+    MessageCore::MessageCoreSettings::self()->setDateFormat(dateDisplayID);
+    MessageCore::MessageCoreSettings::self()->setCustomDateFormat(mCustomDateFormatEdit->text());
 }
 
 //

configuredialog/configurecomposerpage.cpp

@@ -1309,8 +1309,8 @@ void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings()
     loadWidget(mOutlookCompatibleCheck, MessageComposer::MessageComposerSettings::self()->outlookCompatibleAttachmentsItem());
     loadWidget(mMissingAttachmentDetectionCheck, KMailSettings::self()->showForgottenAttachmentWarningItem());
     loadWidget(mAttachWordsListEditor, KMailSettings::self()->attachmentKeywordsItem());
-    const int maximumAttachmentSize(MessageCore::GlobalSettings::self()->maximumAttachmentSize());
-    mMaximumAttachmentSize->setValue(maximumAttachmentSize == -1 ? -1 : MessageCore::GlobalSettings::self()->maximumAttachmentSize() / 1024);
+    const int maximumAttachmentSize(MessageCore::MessageCoreSettings::self()->maximumAttachmentSize());
+    mMaximumAttachmentSize->setValue(maximumAttachmentSize == -1 ? -1 : MessageCore::MessageCoreSettings::self()->maximumAttachmentSize() / 1024);
     mStorageServiceWidget->doLoadFromGlobalSettings();
 }
 
@@ -1322,7 +1322,7 @@ void ComposerPage::AttachmentsTab::save()
 
     KMime::setUseOutlookAttachmentEncoding(mOutlookCompatibleCheck->isChecked());
     const int maximumAttachmentSize(mMaximumAttachmentSize->value());
-    MessageCore::GlobalSettings::self()->setMaximumAttachmentSize(maximumAttachmentSize == -1 ? -1 : maximumAttachmentSize * 1024);
+    MessageCore::MessageCoreSettings::self()->setMaximumAttachmentSize(maximumAttachmentSize == -1 ? -1 : maximumAttachmentSize * 1024);
     mStorageServiceWidget->save();
 }
 

editor/kmcomposereditorng.cpp

@@ -94,11 +94,11 @@ void KMComposerEditorNg::setHighlighterColors(MessageComposer::RichTextComposerE
     QColor color3 = MessageCore::Util::quoteLevel3DefaultTextColor();
     QColor misspelled = MessageCore::Util::misspelledDefaultTextColor();
 
-    if (!MessageCore::GlobalSettings::self()->useDefaultColors()) {
-        color1 = MessageCore::GlobalSettings::self()->quotedText1();
-        color2 = MessageCore::GlobalSettings::self()->quotedText2();
-        color3 = MessageCore::GlobalSettings::self()->quotedText3();
-        misspelled = MessageCore::GlobalSettings::self()->misspelledColor();
+    if (!MessageCore::MessageCoreSettings::self()->useDefaultColors()) {
+        color1 = MessageCore::MessageCoreSettings::self()->quotedText1();
+        color2 = MessageCore::MessageCoreSettings::self()->quotedText2();
+        color3 = MessageCore::MessageCoreSettings::self()->quotedText3();
+        misspelled = MessageCore::MessageCoreSettings::self()->misspelledColor();
     }
 
     highlighter->setQuoteColor(Qt::black /* ignored anyway */,

editor/kmcomposewin.cpp

@@ -591,7 +591,7 @@ void KMComposeWin::readConfig(bool reload /* = false */)
     mComposerBase->recipientsEditor()->setCompletionMode((KCompletion::CompletionMode)KMailSettings::self()->completionMode());
     mEdtReplyTo->setCompletionMode((KCompletion::CompletionMode)KMailSettings::self()->completionMode());
 
-    if (MessageCore::GlobalSettings::self()->useDefaultFonts()) {
+    if (MessageCore::MessageCoreSettings::self()->useDefaultFonts()) {
         mBodyFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
         mFixedFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
     } else {

kmcommands.cpp

@@ -1143,10 +1143,10 @@ KMPrintCommand::KMPrintCommand(QWidget *parent, const Akonadi::Item &msg,
       mPrintPreview(false)
 {
     fetchScope().fetchFullPayload(true);
-    if (MessageCore::GlobalSettings::useDefaultFonts()) {
+    if (MessageCore::MessageCoreSettings::useDefaultFonts()) {
         mOverrideFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont);
     } else {
-        mOverrideFont = MessageCore::GlobalSettings::self()->printFont();
+        mOverrideFont = MessageCore::MessageCoreSettings::self()->printFont();
     }
 }
 

kmkernel.cpp

@@ -977,7 +977,7 @@ bool KMKernel::showMail(qint64 serialNumber)
         if (job->exec()) {
             if (job->items().count() >= 1) {
                 KMReaderMainWin *win = new KMReaderMainWin(MessageViewer::Viewer::UseGlobalSetting, false);
-                win->showMessage(MessageCore::GlobalSettings::self()->overrideCharacterEncoding(),
+                win->showMessage(MessageCore::MessageCoreSettings::self()->overrideCharacterEncoding(),
                                  job->items().at(0));
                 win->show();
                 return true;
@@ -1475,7 +1475,7 @@ void KMKernel::slotRequestConfigSync()
 void KMKernel::slotSyncConfig()
 {
     PimCommon::PimCommonSettings::self()->save();
-    MessageCore::GlobalSettings::self()->save();
+    MessageCore::MessageCoreSettings::self()->save();
     MessageViewer::MessageViewerSettings::self()->save();
     MessageComposer::MessageComposerSettings::self()->save();
     TemplateParser::GlobalSettings::self()->save();
@@ -1485,7 +1485,7 @@ void KMKernel::slotSyncConfig()
     KMKernel::config()->sync();
     //Laurent investigate why we need to reload them.
     PimCommon::PimCommonSettings::self()->load();
-    MessageCore::GlobalSettings::self()->load();
+    MessageCore::MessageCoreSettings::self()->load();
     MessageViewer::MessageViewerSettings::self()->load();
     MessageComposer::MessageComposerSettings::self()->load();
     TemplateParser::GlobalSettings::self()->load();
@@ -1608,8 +1608,8 @@ KSharedConfig::Ptr KMKernel::config()
         TemplateParser::GlobalSettings::self()->load();
         MessageComposer::MessageComposerSettings::self()->setSharedConfig(mySelf->mConfig);
         MessageComposer::MessageComposerSettings::self()->load();
-        MessageCore::GlobalSettings::self()->setSharedConfig(mySelf->mConfig);
-        MessageCore::GlobalSettings::self()->load();
+        MessageCore::MessageCoreSettings::self()->setSharedConfig(mySelf->mConfig);
+        MessageCore::MessageCoreSettings::self()->load();
         MessageViewer::MessageViewerSettings::self()->setSharedConfig(mySelf->mConfig);
         MessageViewer::MessageViewerSettings::self()->load();
         MailCommon::MailCommonSettings::self()->setSharedConfig(mySelf->mConfig);

kmmainwidget.cpp

@@ -4219,7 +4219,7 @@ QString KMMainWidget::overrideEncoding() const
     if (mMsgView) {
         return mMsgView->overrideEncoding();
     } else {
-        return MessageCore::GlobalSettings::self()->overrideCharacterEncoding();
+        return MessageCore::MessageCoreSettings::self()->overrideCharacterEncoding();
     }
 }
 

kmreaderwin.cpp

@@ -748,7 +748,7 @@ void KMReaderWin::slotPrintComposeResult(KJob *job)
         printItem.setPayload<KMime::Message::Ptr>(composer->resultMessages().first());
         Akonadi::MessageFlags::copyMessageFlags(*(composer->resultMessages().first()), printItem);
         const bool useFixedFont = MessageViewer::MessageViewerSettings::self()->useFixedFont();
-        const QString overrideEncoding = MessageCore::GlobalSettings::self()->overrideCharacterEncoding();
+        const QString overrideEncoding = MessageCore::MessageCoreSettings::self()->overrideCharacterEncoding();
 
         KMPrintCommand *command = new KMPrintCommand(this, printItem, mViewer->headerStylePlugin(),
                 mViewer->displayFormatMessageOverwrite(), mViewer->htmlLoadExternal() , useFixedFont, overrideEncoding);

messageactions.cpp

@@ -579,7 +579,7 @@ void MessageActions::printMessage(bool preview)
     }
     if (!result) {
         const bool useFixedFont = MessageViewer::MessageViewerSettings::self()->useFixedFont();
-        const QString overrideEncoding = MessageCore::GlobalSettings::self()->overrideCharacterEncoding();
+        const QString overrideEncoding = MessageCore::MessageCoreSettings::self()->overrideCharacterEncoding();
 
         const Akonadi::Item message = mCurrentItem;
         KMPrintCommand *command =