Adapt to new api

CMakeLists.txt

@@ -66,7 +66,7 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widget
 set(LIBGRAVATAR_VERSION_LIB "5.9.40")
 set(MAILCOMMON_LIB_VERSION_LIB "5.9.41")
 set(KDEPIM_APPS_LIB_VERSION_LIB "5.9.40")
-set(MESSAGELIB_LIB_VERSION_LIB "5.9.52")
+set(MESSAGELIB_LIB_VERSION_LIB "5.9.53")
 set(LIBKLEO_LIB_VERSION_LIB "5.9.40")
 set(PIMCOMMON_LIB_VERSION_LIB "5.9.42")
 set(LIBKDEPIM_LIB_VERSION_LIB "5.9.40")

src/editor/kmcomposereditorng.cpp

@@ -155,10 +155,12 @@ void KMComposerEditorNg::showSpellConfigDialog(const QString &configFileName)
     delete dialog;
 }
 
-bool KMComposerEditorNg::convertPlainText(MessageComposer::TextPart *textPart)
+MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus KMComposerEditorNg::convertPlainText(MessageComposer::TextPart *textPart)
 {
+#if 0  //FIXME
     if (mComposerWin->convertPlainText(textPart)) {
         return true;
     }
-    return false;
+#endif
+    return MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus::NotConverted;
 }

src/editor/kmcomposereditorng.h

@@ -36,7 +36,7 @@ public:
 
     void showSpellConfigDialog(const QString &configFileName);
 
-    bool convertPlainText(MessageComposer::TextPart *textPart) override;
+    MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus convertPlainText(MessageComposer::TextPart *textPart) override;
 Q_SIGNALS:
     void insertSnippet();
 

src/editor/kmcomposerwin.cpp

@@ -3352,7 +3352,7 @@ void KMComposerWin::addExtraCustomHeaders(const QMap<QByteArray, QString> &heade
     mExtraHeaders = headers;
 }
 
-bool KMComposerWin::convertPlainText(MessageComposer::TextPart *textPart)
+MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus KMComposerWin::convertPlainText(MessageComposer::TextPart *textPart)
 {
     return mPluginEditorConvertTextManagerInterface->convertTextToFormat(textPart);
 }

src/editor/kmcomposerwin.h

@@ -28,7 +28,7 @@
 // KMail includes
 #include "editor/composer.h"
 #include "MessageComposer/RecipientsEditor"
-
+#include <MessageComposer/PluginEditorConvertTextInterface>
 // Qt includes
 #include <QFont>
 #include <QList>
@@ -215,7 +215,7 @@ public: // kmkernel, kmcommands, callback
 
     void addExtraCustomHeaders(const QMap<QByteArray, QString> &header) override;
 
-    bool convertPlainText(MessageComposer::TextPart *textPart);
+    MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus convertPlainText(MessageComposer::TextPart *textPart);
 private:
     /**
     * Write settings to app's config file.

src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.cpp

@@ -44,24 +44,23 @@ void KMailPluginEditorConvertTextManagerInterface::reformatText()
     Q_EMIT reformatingTextDone();
 }
 
-bool KMailPluginEditorConvertTextManagerInterface::convertTextToFormat(MessageComposer::TextPart *textPart)
+MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus KMailPluginEditorConvertTextManagerInterface::convertTextToFormat(MessageComposer::TextPart *textPart)
 {
-    bool converted = false;
+    MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus status = MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus::NotConverted;
     for (MessageComposer::PluginEditorConvertTextInterface *interface : qAsConst(mListPluginInterface)) {
         switch(interface->convertTextToFormat(textPart)) {
         case MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus::NotConverted:
-            converted = false;
+            status = MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus::NotConverted;
             break;
         case MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus::Converted:
-            converted = true;
+            status = MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus::Converted;
             break;
         case MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus::Error:
-            converted = false;
-            break;
+            status = MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus::Error;
+            return status;
         }
     }
-    //TODO improve it
-    return converted;
+    return status;
 }
 
 void KMailPluginEditorConvertTextManagerInterface::setInitialData(const MessageComposer::PluginEditorConverterInitialData &data)

src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.h

@@ -49,7 +49,7 @@ public:
     QList<QAction *> actionsType(MessageComposer::PluginActionType::Type type);
 
     void reformatText();
-    bool convertTextToFormat(MessageComposer::TextPart *textPart);
+    MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus convertTextToFormat(MessageComposer::TextPart *textPart);
 
     void setInitialData(const MessageComposer::PluginEditorConverterInitialData &data);
     void setDataBeforeConvertingText(const MessageComposer::PluginEditorConverterBeforeConvertingData &data);