GIT_SILENT Sync po/docbooks with svn

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

diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index a773aef6b397be9e4e76f5a1075a6e585e12abc0..e0505675ac6fedbeb250b99708c9ce64dcc3f138 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -275,8 +275,8 @@ int VersionControlObserver::createItemStatesList(QMap<QString, QVector<ItemState
 void VersionControlObserver::initPlugins()
 {
     if (!m_pluginsInitialized) {
 void VersionControlObserver::initPlugins()
 {
     if (!m_pluginsInitialized) {

-        // No searching for plugins has been done yet. Query the KServiceTypeTrader for
-        // all fileview version control plugins and remember them in 'plugins'.
+        // No searching for plugins has been done yet. Query all fileview version control
+        // plugins and remember them in 'plugins'.

         const QStringList enabledPlugins = VersionControlSettings::enabledPlugins();
 
         const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("dolphin/vcs"));
         const QStringList enabledPlugins = VersionControlSettings::enabledPlugins();
 
         const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("dolphin/vcs"));


@@ -285,7 +285,7 @@ void VersionControlObserver::initPlugins()
 
         for (const auto &p : plugins) {
             if (enabledPlugins.contains(p.name())) {
 
         for (const auto &p : plugins) {
             if (enabledPlugins.contains(p.name())) {

-                auto plugin = KPluginFactory::instantiatePlugin<KVersionControlPlugin>(p).plugin;
+                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();