[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdev-clang] /: Revert "Also aquire the foregroundLock and reset the tracker"
From:       Olivier JG <olivier.jg () gmail ! com>
Date:       2015-10-08 13:40:16
Message-ID: E1ZkBQe-0005qY-P7 () scm ! kde ! org
[Download RAW message or body]

Git commit ddec6f7ea0c89a47f586825b693c43af51c17bbe by Olivier JG.
Committed on 08/10/2015 at 13:44.
Pushed by olivierjg into branch 'master'.

Revert "Also aquire the foregroundLock and reset the tracker"

This reverts commit 8f50342dc667a57af8d18a36627065ae7c509637.

M  +4    -9    clangparsejob.cpp

http://commits.kde.org/kdev-clang/ddec6f7ea0c89a47f586825b693c43af51c17bbe

diff --git a/clangparsejob.cpp b/clangparsejob.cpp
index a551e37..215e393 100644
--- a/clangparsejob.cpp
+++ b/clangparsejob.cpp
@@ -52,7 +52,6 @@
 #include "duchain/clangparsingenvironmentfile.h"
 #include "util/clangdebug.h"
 #include "util/clangtypes.h"
-#include "util/foregroundlock.h"
 
 #include "clangsupport.h"
 #include "documentfinderhelpers.h"
@@ -321,15 +320,11 @@ void ClangParseJob::run(ThreadWeaver::JobPointer /*self*/, ThreadWeaver::Thread
             // prefer the editor modification revision, instead of the on-disk revision
             auto it = m_unsavedRevisions.find(url);
             if (it != m_unsavedRevisions.end()) {
-                {
-                    DUChainWriteLocker lock;
-                    auto file = parsingEnvironmentFile(context);
-                    Q_ASSERT(file);
-                    file->setModificationRevision(it.value());
-                }
+                DUChainWriteLocker lock;
+                auto file = parsingEnvironmentFile(context);
+                Q_ASSERT(file);
+                file->setModificationRevision(it.value());
                 if (tracker) {
-                    ForegroundLock lock;
-                    tracker->reset();
                     tracker->acquireRevision(it.value().revision);
                 }
             }

[prev in list] [next in list] [prev in thread] [next in thread]