diff options
| author | Méven Car <[email protected]> | 2020-12-08 23:09:52 +0100 |
|---|---|---|
| committer | Elvis Angelaccio <[email protected]> | 2020-12-27 17:18:40 +0000 |
| commit | f6a465c9116eee978094b1928de5b4cb2cc59eae (patch) | |
| tree | 6810d0f71cbf0a15996bead281afdf8db6f94b15 /src | |
| parent | c1739d5c4d55401a03462467ed446763924be844 (diff) | |
Review feedback
Diffstat (limited to 'src')
| -rw-r--r-- | src/views/versioncontrol/kversioncontrolplugin.h | 1 | ||||
| -rw-r--r-- | src/views/versioncontrol/versioncontrolobserver.cpp | 6 | ||||
| -rw-r--r-- | 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 a8894ac17..aeac5ad29 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<QAction*> outOfVersionControlActions(const KFileItemList& items) const = 0; diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index 5f7c34194..ad1d53a24 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 f6b4d9b5f..6760401f0 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; |
