Merge branch 'master' into kf6

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

diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index cf5be3c9163355429d04a9870037e4ed2c8c7432..64f8843d29f22ae5ebdfceda48a854f61a3c4493 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -8,26 +8,26 @@
 
 #include "dolphin_versioncontrolsettings.h"
 #include "dolphindebug.h"
 
 #include "dolphin_versioncontrolsettings.h"
 #include "dolphindebug.h"

-#include "views/dolphinview.h"

 #include "kitemviews/kfileitemmodel.h"
 #include "updateitemstatesthread.h"
 #include "kitemviews/kfileitemmodel.h"
 #include "updateitemstatesthread.h"

+#include "views/dolphinview.h"

 
 #include <KLocalizedString>
 
 #include <KLocalizedString>

-#include <KService>
-#include <KServiceTypeTrader>
+#include <KPluginFactory>
+#include <KPluginMetaData>

 
 #include <QTimer>
 
 
 #include <QTimer>
 

-VersionControlObserver::VersionControlObserver(QObject* parent) :
-    QObject(parent),
-    m_pendingItemStatesUpdate(false),
-    m_silentUpdate(false),
-    m_view(nullptr),
-    m_model(nullptr),
-    m_dirVerificationTimer(nullptr),
-    m_pluginsInitialized(false),
-    m_plugin(nullptr),
-    m_updateItemStatesThread(nullptr)
+VersionControlObserver::VersionControlObserver(QObject *parent)
+    : QObject(parent)
+    , m_pendingItemStatesUpdate(false)
+    , m_silentUpdate(false)
+    , m_view(nullptr)
+    , m_model(nullptr)
+    , m_dirVerificationTimer(nullptr)
+    , m_pluginsInitialized(false)
+    , m_plugin(nullptr)
+    , m_updateItemStatesThread(nullptr)

 {
     // The verification timer specifies the timeout until the shown directory
     // is checked whether it is versioned. Per default it is assumed that users
 {
     // The verification timer specifies the timeout until the shown directory
     // is checked whether it is versioned. Per default it is assumed that users


@@ -37,8 +37,7 @@ VersionControlObserver::VersionControlObserver(QObject* parent) :
     m_dirVerificationTimer = new QTimer(this);
     m_dirVerificationTimer->setSingleShot(true);
     m_dirVerificationTimer->setInterval(500);
     m_dirVerificationTimer = new QTimer(this);
     m_dirVerificationTimer->setSingleShot(true);
     m_dirVerificationTimer->setInterval(500);

-    connect(m_dirVerificationTimer, &QTimer::timeout,
-            this, &VersionControlObserver::verifyDirectory);
+    connect(m_dirVerificationTimer, &QTimer::timeout, this, &VersionControlObserver::verifyDirectory);

 }
 
 VersionControlObserver::~VersionControlObserver()
 }
 
 VersionControlObserver::~VersionControlObserver()


@@ -49,54 +48,48 @@ VersionControlObserver::~VersionControlObserver()
     }
 }
 
     }
 }
 

-void VersionControlObserver::setModel(KFileItemModel* model)
+void VersionControlObserver::setModel(KFileItemModel *model)

 {
     if (m_model) {
 {
     if (m_model) {

-        disconnect(m_model, &KFileItemModel::itemsInserted,
-                   this, &VersionControlObserver::delayedDirectoryVerification);
-        disconnect(m_model, &KFileItemModel::itemsChanged,
-                   this, &VersionControlObserver::slotItemsChanged);
+        disconnect(m_model, &KFileItemModel::itemsInserted, this, &VersionControlObserver::delayedDirectoryVerification);
+        disconnect(m_model, &KFileItemModel::itemsChanged, this, &VersionControlObserver::slotItemsChanged);

     }
 
     m_model = model;
 
     if (model) {
     }
 
     m_model = model;
 
     if (model) {

-        connect(m_model, &KFileItemModel::itemsInserted,
-                this, &VersionControlObserver::delayedDirectoryVerification);
-        connect(m_model, &KFileItemModel::itemsChanged,
-                this, &VersionControlObserver::slotItemsChanged);
+        connect(m_model, &KFileItemModel::itemsInserted, this, &VersionControlObserver::delayedDirectoryVerification);
+        connect(m_model, &KFileItemModel::itemsChanged, this, &VersionControlObserver::slotItemsChanged);

     }
 }
 
     }
 }
 

-KFileItemModel* VersionControlObserver::model() const
+KFileItemModel *VersionControlObserver::model() const

 {
     return m_model;
 }
 
 {
     return m_model;
 }
 

-void VersionControlObserver::setView(DolphinView* view)
+void VersionControlObserver::setView(DolphinView *view)

 {
     if (m_view) {
 {
     if (m_view) {

-        disconnect(m_view, &DolphinView::activated,
-                   this, &VersionControlObserver::delayedDirectoryVerification);
+        disconnect(m_view, &DolphinView::activated, this, &VersionControlObserver::delayedDirectoryVerification);

     }
 
     m_view = view;
 
     if (m_view) {
     }
 
     m_view = view;
 
     if (m_view) {

-        connect(m_view, &DolphinView::activated,
-                this, &VersionControlObserver::delayedDirectoryVerification);
+        connect(m_view, &DolphinView::activated, this, &VersionControlObserver::delayedDirectoryVerification);

     }
 }
 
     }
 }
 

-DolphinView* VersionControlObserver::view() const
+DolphinView *VersionControlObserver::view() const

 {
     return m_view;
 }
 
 {
     return m_view;
 }
 

-QList<QAction*> VersionControlObserver::actions(const KFileItemList& items) const
+QList<QAction *> VersionControlObserver::actions(const KFileItemList &items) const

 {
     bool hasNullItems = false;
 {
     bool hasNullItems = false;

-    for (const KFileItem& item : items) {
+    for (const KFileItem &item : items) {

         if (item.isNull()) {
             qCWarning(DolphinDebug) << "Requesting version-control-actions for empty items";
             hasNullItems = true;
         if (item.isNull()) {
             qCWarning(DolphinDebug) << "Requesting version-control-actions for empty items";
             hasNullItems = true;


@@ -111,8 +104,8 @@ QList<QAction*> VersionControlObserver::actions(const KFileItemList& items) cons
     if (isVersionControlled()) {
         return m_plugin->versionControlActions(items);
     } else {
     if (isVersionControlled()) {
         return m_plugin->versionControlActions(items);
     } else {

-        QList<QAction*> actions;
-        for (const QPointer<KVersionControlPlugin> &plugin : qAsConst(m_plugins)) {
+        QList<QAction *> actions;
+        for (const QPointer<KVersionControlPlugin> &plugin : std::as_const(m_plugins)) {

             actions << plugin->outOfVersionControlActions(items);
         }
         return actions;
             actions << plugin->outOfVersionControlActions(items);
         }
         return actions;


@@ -131,14 +124,14 @@ void VersionControlObserver::silentDirectoryVerification()
     m_dirVerificationTimer->start();
 }
 
     m_dirVerificationTimer->start();
 }
 

-void VersionControlObserver::slotItemsChanged(const KItemRangeList& itemRanges, const QSet<QByteArray>& roles)
+void VersionControlObserver::slotItemsChanged(const KItemRangeList &itemRanges, const QSet<QByteArray> &roles)

 {
     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".
     // analyze it and update directory item states information. So lets check if
     // there is only "version".

-    if ( !(roles.count() == 1 && roles.contains("version")) ) {
+    if (!(roles.count() == 1 && roles.contains("version"))) {

         delayedDirectoryVerification();
     }
 }
         delayedDirectoryVerification();
     }
 }


@@ -163,7 +156,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()))) {


@@ -176,20 +169,20 @@ void VersionControlObserver::verifyDirectory()
 
 void VersionControlObserver::slotThreadFinished()
 {
 
 void VersionControlObserver::slotThreadFinished()
 {

-    UpdateItemStatesThread* thread = m_updateItemStatesThread;
+    UpdateItemStatesThread *thread = m_updateItemStatesThread;

     m_updateItemStatesThread = nullptr; // The thread deletes itself automatically (see updateItemStates())
 
     if (!m_plugin || !thread) {
         return;
     }
 
     m_updateItemStatesThread = nullptr; // The thread deletes itself automatically (see updateItemStates())
 
     if (!m_plugin || !thread) {
         return;
     }
 

-    const QMap<QString, QVector<ItemState> >& itemStates = thread->itemStates();
-    QMap<QString, QVector<ItemState> >::const_iterator it = itemStates.constBegin();
+    const QMap<QString, QVector<ItemState>> &itemStates = thread->itemStates();
+    QMap<QString, QVector<ItemState>>::const_iterator it = itemStates.constBegin();

     for (; it != itemStates.constEnd(); ++it) {
     for (; it != itemStates.constEnd(); ++it) {

-        const QVector<ItemState>& items = it.value();
+        const QVector<ItemState> &items = it.value();

 
 

-        for (const ItemState& item : items) {
-            const KFileItem& fileItem = item.first;
+        for (const ItemState &item : items) {
+            const KFileItem &fileItem = item.first;

             const KVersionControlPlugin::ItemVersion version = item.second;
             QHash<QByteArray, QVariant> values;
             values.insert("version", QVariant(version));
             const KVersionControlPlugin::ItemVersion version = item.second;
             QHash<QByteArray, QVariant> values;
             values.insert("version", QVariant(version));


@@ -220,25 +213,22 @@ void VersionControlObserver::updateItemStates()
         return;
     }
 
         return;
     }
 

-    QMap<QString, QVector<ItemState> > itemStates;
+    QMap<QString, QVector<ItemState>> itemStates;

     createItemStatesList(itemStates);
 
     if (!itemStates.isEmpty()) {
         if (!m_silentUpdate) {
     createItemStatesList(itemStates);
 
     if (!itemStates.isEmpty()) {
         if (!m_silentUpdate) {

-            Q_EMIT infoMessage(i18nc("@info:status", "Updating version information..."));
+            Q_EMIT infoMessage(i18nc("@info:status", "Updating version information…"));

         }
         m_updateItemStatesThread = new UpdateItemStatesThread(m_plugin, itemStates);
         }
         m_updateItemStatesThread = new UpdateItemStatesThread(m_plugin, itemStates);

-        connect(m_updateItemStatesThread, &UpdateItemStatesThread::finished,
-                this, &VersionControlObserver::slotThreadFinished);
-        connect(m_updateItemStatesThread, &UpdateItemStatesThread::finished,
-                m_updateItemStatesThread, &UpdateItemStatesThread::deleteLater);
+        connect(m_updateItemStatesThread, &UpdateItemStatesThread::finished, this, &VersionControlObserver::slotThreadFinished);
+        connect(m_updateItemStatesThread, &UpdateItemStatesThread::finished, m_updateItemStatesThread, &UpdateItemStatesThread::deleteLater);

 
         m_updateItemStatesThread->start(); // slotThreadFinished() is called when finished
     }
 }
 
 
         m_updateItemStatesThread->start(); // slotThreadFinished() is called when finished
     }
 }
 

-int VersionControlObserver::createItemStatesList(QMap<QString, QVector<ItemState> >& itemStates,
-                                                 const int firstIndex)
+int VersionControlObserver::createItemStatesList(QMap<QString, QVector<ItemState>> &itemStates, const int firstIndex)

 {
     const int itemCount = m_model->count();
     const int currentExpansionLevel = m_model->expandedParentsCount(firstIndex);
 {
     const int itemCount = m_model->count();
     const int currentExpansionLevel = m_model->expandedParentsCount(firstIndex);


@@ -265,7 +255,7 @@ int VersionControlObserver::createItemStatesList(QMap<QString, QVector<ItemState
     }
 
     if (!items.isEmpty()) {
     }
 
     if (!items.isEmpty()) {

-        const QUrl& url = items.first().first.url();
+        const QUrl &url = items.first().first.url();

         itemStates.insert(url.adjusted(QUrl::RemoveFilename).path(), items);
     }
 
         itemStates.insert(url.adjusted(QUrl::RemoveFilename).path(), items);
     }
 


@@ -275,38 +265,41 @@ 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 QStringList enabledPlugins = VersionControlSettings::enabledPlugins();
 

-        const KService::List pluginServices = KServiceTypeTrader::self()->query(QStringLiteral("FileViewVersionControlPlugin"));
-        for (KService::List::ConstIterator it = pluginServices.constBegin(); it != pluginServices.constEnd(); ++it) {
-            if (enabledPlugins.contains((*it)->name())) {
-                KVersionControlPlugin* plugin = (*it)->createInstance<KVersionControlPlugin>(this);
-                if (plugin) {
-                    connect(plugin, &KVersionControlPlugin::itemVersionsChanged,
-                            this, &VersionControlObserver::silentDirectoryVerification);
-                    connect(plugin, &KVersionControlPlugin::infoMessage,
-                            this, &VersionControlObserver::infoMessage);
-                    connect(plugin, &KVersionControlPlugin::errorMessage,
-                            this, &VersionControlObserver::errorMessage);
-                    connect(plugin, &KVersionControlPlugin::operationCompletedMessage,
-                            this, &VersionControlObserver::operationCompletedMessage);
+        const QVector<KPluginMetaData> plugins = KPluginMetaData::findPlugins(QStringLiteral("dolphin/vcs"));
+
+        QSet<QString> loadedPlugins;

 
 

+        for (const auto &p : plugins) {
+            if (enabledPlugins.contains(p.name())) {
+                auto plugin = KPluginFactory::instantiatePlugin<KVersionControlPlugin>(p, parent()).plugin;
+                if (plugin) {

                     m_plugins.append(plugin);
                     m_plugins.append(plugin);

+                    loadedPlugins += p.name();

                 }
             }
         }
                 }
             }
         }

+
+        for (auto &plugin : std::as_const(m_plugins)) {
+            connect(plugin, &KVersionControlPlugin::itemVersionsChanged, this, &VersionControlObserver::silentDirectoryVerification);
+            connect(plugin, &KVersionControlPlugin::infoMessage, this, &VersionControlObserver::infoMessage);
+            connect(plugin, &KVersionControlPlugin::errorMessage, this, &VersionControlObserver::errorMessage);
+            connect(plugin, &KVersionControlPlugin::operationCompletedMessage, this, &VersionControlObserver::operationCompletedMessage);
+        }
+

         m_pluginsInitialized = true;
     }
 }
 
         m_pluginsInitialized = true;
     }
 }
 

-KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& directory)
+KVersionControlPlugin *VersionControlObserver::searchPlugin(const QUrl &directory)

 {
     initPlugins();
 
     // Verify whether the current directory is under a version system
 {
     initPlugins();
 
     // Verify whether the current directory is under a version system

-    for (const QPointer<KVersionControlPlugin> &plugin : qAsConst(m_plugins)) {
+    for (const QPointer<KVersionControlPlugin> &plugin : std::as_const(m_plugins)) {

         if (!plugin) {
             continue;
         }
         if (!plugin) {
             continue;
         }


@@ -331,3 +324,4 @@ bool VersionControlObserver::isVersionControlled() const
     return m_plugin != nullptr;
 }
 
     return m_plugin != nullptr;
 }
 

+#include "moc_versioncontrolobserver.cpp"