SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / views / versioncontrol / versioncontrolobserver.cpp

diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 6766aa479a0b57dd2c7454ec40d6ddc2d0dedc88..02ed216d116e6dd9ea90adb5fe87ed88789997aa 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -14,7 +14,6 @@
 
 #include <KLocalizedString>
 #include <KPluginFactory>
 
 #include <KLocalizedString>
 #include <KPluginFactory>

-#include <KPluginLoader>

 #include <KPluginMetaData>
 
 #include <QTimer>
 #include <KPluginMetaData>
 
 #include <QTimer>


@@ -136,7 +135,7 @@ void VersionControlObserver::slotItemsChanged(const KItemRangeList& itemRanges,
 {
     Q_UNUSED(itemRanges)
 
 {
     Q_UNUSED(itemRanges)
 

-    // Because "version" role is emitted by VCS plugin (ourselfs) we don't need to
+    // Because "version" role is emitted by VCS plugin (ourselves) we don't need to

     // analyze it and update directory item states information. So lets check if
     // there is only "version".
     if ( !(roles.count() == 1 && roles.contains("version")) ) {
     // analyze it and update directory item states information. So lets check if
     // there is only "version".
     if ( !(roles.count() == 1 && roles.contains("version")) ) {


@@ -164,7 +163,7 @@ void VersionControlObserver::verifyDirectory()
             // by an immediate verification.
             m_dirVerificationTimer->setInterval(500);
         } else {
             // by an immediate verification.
             m_dirVerificationTimer->setInterval(500);
         } else {

-            // View was versionned but should not be anymore
+            // View was versioned but should not be anymore

             updateItemStates();
         }
     } else if ((m_plugin = searchPlugin(rootItem.url()))) {
             updateItemStates();
         }
     } else if ((m_plugin = searchPlugin(rootItem.url()))) {


@@ -280,15 +279,13 @@ void VersionControlObserver::initPlugins()
         // all fileview version control plugins and remember them in 'plugins'.
         const QStringList enabledPlugins = VersionControlSettings::enabledPlugins();
 
         // all fileview version control plugins and remember them in 'plugins'.
         const QStringList enabledPlugins = VersionControlSettings::enabledPlugins();
 

-        const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("dolphin/vcs"));
+        const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("dolphin/vcs"));

 
         QSet<QString> loadedPlugins;
 
         for (const auto &p : plugins) {
             if (enabledPlugins.contains(p.name())) {
 
         QSet<QString> loadedPlugins;
 
         for (const auto &p : plugins) {
             if (enabledPlugins.contains(p.name())) {

-                KPluginLoader loader(p.fileName());
-                KPluginFactory *factory = loader.factory();
-                KVersionControlPlugin *plugin = factory->create<KVersionControlPlugin>();
+                auto plugin = KPluginFactory::instantiatePlugin<KVersionControlPlugin>(p, parent()).plugin;

                 if (plugin) {
                     m_plugins.append(plugin);
                     loadedPlugins += p.name();
                 if (plugin) {
                     m_plugins.append(plugin);
                     loadedPlugins += p.name();