Add more category plugins

importwizard.categories

 org.kde.pim.importwizard importwizard (importwizard)
 org.kde.pim.importwizard.balsaplugin importwizard (balsa plugin)
 org.kde.pim.importwizard.evolutionplugin importwizard (evolution v3 plugin)
-
+org.kde.pim.importwizard.gearyplugin importwizard (geary plugin)
+org.kde.pim.importwizard.operaplugin importwizard (opera plugin)

src/plugins/geary/CMakeLists.txt

@@ -4,6 +4,7 @@ set(gearyimporter_SRCS
    gearysettings.cpp
 )
 
+ecm_qt_declare_logging_category(gearyimporter_SRCS HEADER gearyplugin_debug.h IDENTIFIER EVOLUTIONPLUGIN_LOG CATEGORY_NAME org.kde.pim.importwizard.gearyplugin)
 kcoreaddons_add_plugin(gearyimporterplugin JSON gearyimporter.json SOURCES
     ${gearyimporter_SRCS} INSTALL_NAMESPACE importwizard)
 

src/plugins/geary/gearyimportdata.cpp

@@ -24,7 +24,7 @@
 #include "mailimporter/othermailerutil.h"
 #include "importfilterinfogui.h"
 #include "importwizard.h"
-//#include "importwizard_debug.h"
+#include "gearyplugin_debug.h"
 #include <kpluginfactory.h>
 #include <QDir>
 
@@ -63,7 +63,7 @@ bool GearyImportData::importSettings()
 {
     QDir directory(mPath);
     const QStringList lstDir = directory.entryList(QDir::AllDirs);
-    //qCDebug(IMPORTWIZARD_LOG) << "Number of directory " << lstDir.count();
+    qCDebug(EVOLUTIONPLUGIN_LOG) << "Number of directory " << lstDir.count();
     const QString configName = QStringLiteral("geary.ini");
     for (int i = 0; i < lstDir.count(); ++i) {
         const QString fullPath = lstDir.at(i) + QDir::separator() + configName;

src/plugins/opera/CMakeLists.txt

@@ -4,6 +4,7 @@ set(operaimporter_SRCS
    operasettings.cpp
 )
 
+ecm_qt_declare_logging_category(operaimporter_SRCS HEADER operaplugin_debug.h IDENTIFIER OPERAPLUGIN_LOG CATEGORY_NAME org.kde.pim.importwizard.operaplugin)
 kcoreaddons_add_plugin(operaimporterplugin JSON operaimporter.json SOURCES
     ${operaimporter_SRCS} INSTALL_NAMESPACE importwizard)
 

src/plugins/opera/operaaddressbook.cpp

@@ -21,7 +21,7 @@
 
 #include <KContacts/Addressee>
 #include <QUrl>
-//#include "importwizard_debug.h"
+#include "operaplugin_debug.h"
 #include <QFile>
 
 OperaAddressBook::OperaAddressBook(const QString &filename, ImportWizard *parent)
@@ -34,7 +34,7 @@ void OperaAddressBook::importAddressBook()
 {
     QFile file(mFileName);
     if (!file.open(QIODevice::ReadOnly)) {
-        //FIXME qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << mFileName;
+        qCDebug(OPERAPLUGIN_LOG) << " We can't open file" << mFileName;
         return;
     }
 

src/plugins/opera/operasettings.cpp

@@ -18,7 +18,7 @@
 */
 
 #include "operasettings.h"
-//#include "importwizard_debug.h"
+#include "operaplugin_debug.h"
 #include "mailimporter/filteropera.h"
 
 #include <mailtransport/transportmanager.h>
@@ -116,7 +116,7 @@ void OperaSettings::readAccount(const KConfigGroup &grp)
         } else if (leaveOnServer == 0) {
             settings.insert(QStringLiteral("LeaveOnServer"), false);
         } else {
-            //FIXME qCDebug(IMPORTWIZARD_LOG) << " leave on server option unknown : " << leaveOnServer;
+            qCDebug(OPERAPLUGIN_LOG) << " leave on server option unknown : " << leaveOnServer;
         }
 
         const int removeMailFromSever = grp.readEntry(QStringLiteral("Remove From Server Delay Enabled"), -1);
@@ -164,7 +164,7 @@ void OperaSettings::readAccount(const KConfigGroup &grp)
             settings.insert(QStringLiteral("AuthenticationMethod"), MailTransport::Transport::EnumAuthenticationType::APOP);   //TODO: verify
             break;
         default:
-            //FIXME qCDebug(IMPORTWIZARD_LOG) << " unknown authentication method :" << authMethod;
+            qCDebug(OPERAPLUGIN_LOG) << " unknown authentication method :" << authMethod;
             break;
         }
 
@@ -173,7 +173,7 @@ void OperaSettings::readAccount(const KConfigGroup &grp)
         addCheckMailOnStartup(agentIdentifyName, enableManualCheck);
         addToManualCheck(agentIdentifyName, enableManualCheck);
     } else {
-        //FIXME qCDebug(IMPORTWIZARD_LOG) << " protocol unknown : " << incomingProtocol;
+        qCDebug(OPERAPLUGIN_LOG) << " protocol unknown : " << incomingProtocol;
     }
 }
 
@@ -219,7 +219,7 @@ void OperaSettings::readTransport(const KConfigGroup &grp)
             mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN); //Don't know... Verify
             break;
         default:
-            //FIXME qCDebug(IMPORTWIZARD_LOG) << " authMethod unknown :" << authMethod;
+            qCDebug(OPERAPLUGIN_LOG) << " authMethod unknown :" << authMethod;
             ;
         }
 
@@ -281,7 +281,7 @@ void OperaSettings::readIdentity(const KConfigGroup &grp)
                     signature.setText(QString(sigText));
                     break;
                 default:
-                    //FIXME qCDebug(IMPORTWIZARD_LOG) << " pb with Signature is HTML " << signatureHtml;
+                    qCDebug(OPERAPLUGIN_LOG) << " pb with Signature is HTML " << signatureHtml;
                     break;
                 }
                 newIdentity->setSignature(signature);