1 files changed, 20 insertions, 17 deletions

diff --git a/src/plugincontainer.cpp b/src/plugincontainer.cpp
index 2126c5ef..767d3eb8 100644
--- a/src/plugincontainer.cpp
+++ b/src/plugincontainer.cpp
@@ -3,6 +3,7 @@
 #include "organizerproxy.h"

 #include "report.h"

 #include <ipluginproxy.h>

+#include <iuserinterface.h>

 #include <idownloadmanager.h>

 #include <appconfig.h>

 #include <QAction>

@@ -69,7 +70,7 @@ bool PluginContainer::verifyPlugin(IPlugin *plugin)
   if (plugin == nullptr) {

     return false;

   } else if (!plugin->init(new OrganizerProxy(m_Organizer, this, plugin->name()))) {

-    qWarning("plugin failed to initialize");

+    log::warn("plugin failed to initialize");

     return false;

   }

   return true;

@@ -91,11 +92,11 @@ bool PluginContainer::registerPlugin(QObject *plugin, const QString &fileName)
   { // generic treatment for all plugins

     IPlugin *pluginObj = qobject_cast<IPlugin*>(plugin);

     if (pluginObj == nullptr) {

-      qDebug("not an IPlugin");

+      log::debug("not an IPlugin");

       return false;

     }

     plugin->setProperty("filename", fileName);

-    m_Organizer->settings().registerPlugin(pluginObj);

+    m_Organizer->settings().plugins().registerPlugin(pluginObj);

   }

 

   { // diagnosis plugin

@@ -164,12 +165,13 @@ bool PluginContainer::registerPlugin(QObject *plugin, const QString &fileName)
           for (QObject *proxiedPlugin : matchingPlugins) {

             if (proxiedPlugin != nullptr) {

               if (registerPlugin(proxiedPlugin, pluginName)) {

-                qDebug("loaded plugin \"%s\"", qUtf8Printable(QFileInfo(pluginName).fileName()));

+                log::debug("loaded plugin \"{}\"", QFileInfo(pluginName).fileName());

               }

               else {

-                qWarning("plugin \"%s\" failed to load. If this plugin is for an older version of MO "

-                         "you have to update it or delete it if no update exists.",

-                         qUtf8Printable(pluginName));

+                log::warn(

+                  "plugin \"{}\" failed to load. If this plugin is for an older version of MO "

+                  "you have to update it or delete it if no update exists.",

+                  pluginName);

               }

             }

           }

@@ -190,7 +192,7 @@ bool PluginContainer::registerPlugin(QObject *plugin, const QString &fileName)
     }

   }

 

-  qDebug("no matching plugin interface");

+  log::debug("no matching plugin interface");

 

   return false;

 }

@@ -224,7 +226,7 @@ void PluginContainer::unloadPlugins()
     QPluginLoader *loader = m_PluginLoaders.back();

     m_PluginLoaders.pop_back();

     if ((loader != nullptr) && !loader->unload()) {

-      qDebug("failed to unload %s: %s", qUtf8Printable(loader->fileName()), qUtf8Printable(loader->errorString()));

+      log::debug("failed to unload {}: {}", loader->fileName(), loader->errorString());

     }

     delete loader;

   }

@@ -265,7 +267,7 @@ void PluginContainer::loadPlugins()
          "(Please note: If this is the first time you see this message for this plugin you may want to give it another try. "

          "The plugin may be able to recover from the problem)").arg(fileName),

           QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) {

-      m_Organizer->settings().addBlacklistPlugin(fileName);

+      m_Organizer->settings().plugins().addBlacklist(fileName);

     }

     loadCheck.close();

   }

@@ -273,13 +275,13 @@ void PluginContainer::loadPlugins()
   loadCheck.open(QIODevice::WriteOnly);

 

   QString pluginPath = qApp->applicationDirPath() + "/" + ToQString(AppConfig::pluginPath());

-  qDebug("looking for plugins in %s", QDir::toNativeSeparators(pluginPath).toUtf8().constData());

+  log::debug("looking for plugins in {}", QDir::toNativeSeparators(pluginPath));

   QDirIterator iter(pluginPath, QDir::Files | QDir::NoDotAndDotDot);

 

   while (iter.hasNext()) {

     iter.next();

-    if (m_Organizer->settings().pluginBlacklisted(iter.fileName())) {

-      qDebug("plugin \"%s\" blacklisted", qUtf8Printable(iter.fileName()));

+    if (m_Organizer->settings().plugins().blacklisted(iter.fileName())) {

+      log::debug("plugin \"{}\" blacklisted", iter.fileName());

       continue;

     }

     loadCheck.write(iter.fileName().toUtf8());

@@ -290,15 +292,16 @@ void PluginContainer::loadPlugins()
       std::unique_ptr<QPluginLoader> pluginLoader(new QPluginLoader(pluginName, this));

       if (pluginLoader->instance() == nullptr) {

         m_FailedPlugins.push_back(pluginName);

-        qCritical("failed to load plugin %s: %s",

-                  qUtf8Printable(pluginName), qUtf8Printable(pluginLoader->errorString()));

+        log::error(

+          "failed to load plugin {}: {}",

+          pluginName, pluginLoader->errorString());

       } else {

         if (registerPlugin(pluginLoader->instance(), pluginName)) {

-          qDebug("loaded plugin \"%s\"", qUtf8Printable(QFileInfo(pluginName).fileName()));

+          log::debug("loaded plugin \"{}\"", QFileInfo(pluginName).fileName());

           m_PluginLoaders.push_back(pluginLoader.release());

         } else {

           m_FailedPlugins.push_back(pluginName);

-          qWarning("plugin \"%s\" failed to load (may be outdated)", qUtf8Printable(pluginName));

+          log::warn("plugin \"{}\" failed to load (may be outdated)", pluginName);

         }

       }

     }