From f6a465c9116eee978094b1928de5b4cb2cc59eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9ven=20Car?= Date: Tue, 8 Dec 2020 23:09:52 +0100 Subject: [PATCH] Review feedback --- src/views/versioncontrol/kversioncontrolplugin.h | 1 + src/views/versioncontrol/versioncontrolobserver.cpp | 6 +++--- src/views/versioncontrol/versioncontrolobserver.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h index a8894ac17d..aeac5ad290 100644 --- 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 outOfVersionControlActions(const KFileItemList& items) const = 0; diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index 5f7c34194c..ad1d53a247 100644 --- 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 f6b4d9b5fd..6760401f0e 100644 --- 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;