From 88d3f92dff4f153308092d8301b57c2bb8e4b03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9ven=20Car?= Date: Sun, 27 Dec 2020 14:14:06 +0100 Subject: [PATCH] Apply sugestions --- src/views/versioncontrol/versioncontrolobserver.cpp | 10 +++++----- src/views/versioncontrol/versioncontrolobserver.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index ad1d53a247..709d98e426 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_localeRepoRoot) || !QFile::exists(m_localeRepoRoot + '/' + m_plugin->fileName())) { + if (!rootItem.url().path().startsWith(m_localRepoRoot) || !QFile::exists(m_localRepoRoot + '/' + 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_localeRepoRoot = directory.path(); + m_localRepoRoot = directory.path(); return plugin; } - auto wcRoot = plugin->localRepositoryRoot(directory.path()); - if (!wcRoot.isEmpty()) { - m_localeRepoRoot = wcRoot; + auto root = plugin->localRepositoryRoot(directory.path()); + if (!root.isEmpty()) { + m_localRepoRoot = root; return plugin; } } diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h index 6760401f0e..d9cc90cc6d 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_localeRepoRoot; + QString m_localRepoRoot; DolphinView* m_view; KFileItemModel* m_model;