kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply sugestions

Browse source
This commit is contained in:
Méven Car 2020-12-27 14:14:06 +01:00 committed by Elvis Angelaccio
parent f6a465c911
commit 88d3f92dff
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/views/versioncontrol/versioncontrolobserver.cpp
View file

@ -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;
}
}

2
src/views/versioncontrol/versioncontrolobserver.h
View file

@ -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;