From fb318086e2c694f2a4872ef80cf71bfec2fbfa6d Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Wed, 5 Oct 2016 22:58:45 +0200
Subject: [PATCH] Use new api

---
 src/configuredialog/configureappearancepage.cpp   | 6 +++---
 src/editor/kmcomposereditorng.cpp                 | 8 ++++----
 src/editor/widgets/cryptostateindicatorwidget.cpp | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/configuredialog/configureappearancepage.cpp b/src/configuredialog/configureappearancepage.cpp
index b968e871f..87ba9d0ce 100644
--- a/src/configuredialog/configureappearancepage.cpp
+++ b/src/configuredialog/configureappearancepage.cpp
@@ -415,9 +415,9 @@ void AppearancePage::ColorsTab::loadColor(bool loadFromConfig)
         KConfigGroup collectionFolderView(KMKernel::self()->config(), "CollectionFolderView");
 
         static const QColor defaultColor[ numColorNames ] = {
-            MessageCore::Util::quoteLevel1DefaultTextColor(),
-            MessageCore::Util::quoteLevel2DefaultTextColor(),
-            MessageCore::Util::quoteLevel3DefaultTextColor(),
+            MessageCore::ColorUtil::self()->quoteLevel1DefaultTextColor(),
+            MessageCore::ColorUtil::self()->quoteLevel2DefaultTextColor(),
+            MessageCore::ColorUtil::self()->quoteLevel3DefaultTextColor(),
             scheme.foreground(KColorScheme::LinkText).color(),   // link
             MessageList::Util::unreadDefaultMessageColor(), // unread mgs
             MessageList::Util::importantDefaultMessageColor(), // important msg
diff --git a/src/editor/kmcomposereditorng.cpp b/src/editor/kmcomposereditorng.cpp
index 7d1396cb8..3f85c19e6 100644
--- a/src/editor/kmcomposereditorng.cpp
+++ b/src/editor/kmcomposereditorng.cpp
@@ -97,10 +97,10 @@ void KMComposerEditorNg::insertFromMimeData(const QMimeData *source)
 
 void KMComposerEditorNg::setHighlighterColors(KPIMTextEdit::RichTextComposerEmailQuoteHighlighter *highlighter)
 {
-    QColor color1 = MessageCore::Util::quoteLevel1DefaultTextColor();
-    QColor color2 = MessageCore::Util::quoteLevel2DefaultTextColor();
-    QColor color3 = MessageCore::Util::quoteLevel3DefaultTextColor();
-    QColor misspelled = MessageCore::Util::misspelledDefaultTextColor();
+    QColor color1 = MessageCore::ColorUtil::self()->quoteLevel1DefaultTextColor();
+    QColor color2 = MessageCore::ColorUtil::self()->quoteLevel2DefaultTextColor();
+    QColor color3 = MessageCore::ColorUtil::self()->quoteLevel3DefaultTextColor();
+    QColor misspelled = MessageCore::ColorUtil::self()->misspelledDefaultTextColor();
 
     if (!MessageCore::MessageCoreSettings::self()->useDefaultColors()) {
         color1 = MessageCore::MessageCoreSettings::self()->quotedText1();
diff --git a/src/editor/widgets/cryptostateindicatorwidget.cpp b/src/editor/widgets/cryptostateindicatorwidget.cpp
index c8f391b47..e0eb2f189 100644
--- a/src/editor/widgets/cryptostateindicatorwidget.cpp
+++ b/src/editor/widgets/cryptostateindicatorwidget.cpp
@@ -39,8 +39,8 @@ CryptoStateIndicatorWidget::CryptoStateIndicatorWidget(QWidget *parent)
     hbox->addWidget(mSignatureStateIndicator);
     mSignatureStateIndicator->setObjectName(QStringLiteral("signatureindicator"));
     QPalette p(mSignatureStateIndicator->palette());
-    p.setColor(QPalette::Window, MessageCore::Util::pgpSignedTrustedMessageColor());
-    p.setColor(QPalette::Text, MessageCore::Util::pgpSignedTrustedTextColor());
+    p.setColor(QPalette::Window, MessageCore::ColorUtil::self()->pgpSignedTrustedMessageColor());
+    p.setColor(QPalette::Text, MessageCore::ColorUtil::self()->pgpSignedTrustedTextColor());
     mSignatureStateIndicator->setPalette(p);
     mSignatureStateIndicator->setAutoFillBackground(true);
 
@@ -48,8 +48,8 @@ CryptoStateIndicatorWidget::CryptoStateIndicatorWidget(QWidget *parent)
     mEncryptionStateIndicator->setAlignment(Qt::AlignHCenter);
     hbox->addWidget(mEncryptionStateIndicator);
     p = mEncryptionStateIndicator->palette();
-    p.setColor(QPalette::Window, MessageCore::Util::pgpEncryptedMessageColor());
-    p.setColor(QPalette::Text, MessageCore::Util::pgpEncryptedTextColor());
+    p.setColor(QPalette::Window, MessageCore::ColorUtil::self()->pgpEncryptedMessageColor());
+    p.setColor(QPalette::Text, MessageCore::ColorUtil::self()->pgpEncryptedTextColor());
     mEncryptionStateIndicator->setPalette(p);
     mEncryptionStateIndicator->setAutoFillBackground(true);
     mEncryptionStateIndicator->setObjectName(QStringLiteral("encryptionindicator"));