Review feedback

diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h
index a8894ac17d4c9c09014170ba3374d883de15fe03..aeac5ad2905d84447dbbbdbff0bfd8e0b3d12f60 100644 (file)
--- a/src/views/versioncontrol/kversioncontrolplugin.h
+++ b/src/views/versioncontrol/kversioncontrolplugin.h
@@ -183,6 +183,7 @@ public:
      * @return List of actions that are available for the out of version control
      *         items \p items. It's opposed to the \p versionedActions. Common usage
      *         is for clone/checkout actions.
+     * @since 21.04
      */
     virtual QList<QAction*> outOfVersionControlActions(const KFileItemList& items) const = 0;
 

diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 5f7c34194cd43022f2e667dd66124ac69173db21..ad1d53a247d77064be067890ccc9072ea7fad222 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -155,7 +155,7 @@ void VersionControlObserver::verifyDirectory()
     }
 
     if (m_plugin != nullptr) {
-        if (!rootItem.url().path().startsWith(m_wcRoot) || !QFile::exists(m_wcRoot + '/' + m_plugin->fileName())) {
+        if (!rootItem.url().path().startsWith(m_localeRepoRoot) || !QFile::exists(m_localeRepoRoot + '/' + m_plugin->fileName())) {
             m_plugin = nullptr;
 
             // The directory is not versioned. Reset the verification timer to a higher
@@ -310,12 +310,12 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& director
         // first naively check if we are at working copy root
         const QString fileName = directory.path() + '/' + plugin->fileName();
         if (QFile::exists(fileName)) {
-            m_wcRoot = directory.path();
+            m_localeRepoRoot = directory.path();
             return plugin;
         }
         auto wcRoot = plugin->localRepositoryRoot(directory.path());
         if (!wcRoot.isEmpty()) {
-            m_wcRoot = wcRoot;
+            m_localeRepoRoot = wcRoot;
             return plugin;
         }
     }

diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h
index f6b4d9b5fd4233efc01e30c1e835ffee3db05fcb..6760401f0eac58e167ba3d8f2bc4bb8f56a1f6f1 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.h
+++ b/src/views/versioncontrol/versioncontrolobserver.h
@@ -137,7 +137,7 @@ private:
     bool m_pendingItemStatesUpdate;
     bool m_silentUpdate; // if true, no messages will be send during the update
                          // of version states
-    QString m_wcRoot;
+    QString m_localeRepoRoot;
 
     DolphinView* m_view;
     KFileItemModel* m_model;