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

List:       kde-commits
Subject:    [kdev-ruby/experimental_duchain_work] duchain: Get rid of double
From:       Alexander Dymo <adymo () kdevelop ! org>
Date:       2011-08-09 17:12:16
Message-ID: 20110809171216.D0956A60C4 () git ! kde ! org
[Download RAW message or body]

Git commit 649d827473d769f5fd898d97569e323bcdd17c72 by Alexander Dymo.
Committed on 09/08/2011 at 18:27.
Pushed by dymo into branch 'experimental_duchain_work'.

Get rid of double duchain building, we don't do pre-building

M  +0    -3    duchain/declarationbuilder.h
M  +2    -14   duchain/declarationbuilder.cpp

http://commits.kde.org/kdev-ruby/649d827473d769f5fd898d97569e323bcdd17c72

diff --git a/duchain/declarationbuilder.cpp b/duchain/declarationbuilder.cpp
index 924f91f..48990a4 100644
--- a/duchain/declarationbuilder.cpp
+++ b/duchain/declarationbuilder.cpp
@@ -31,13 +31,13 @@ namespace Ruby
 {
 
 DeclarationBuilder::DeclarationBuilder()
-    : DeclarationBuilderBase(), m_preBuilding(false)
+    : DeclarationBuilderBase()
 {
     /* There's nothing to do here! */
 }
 
 DeclarationBuilder::DeclarationBuilder(EditorIntegrator *editor):
-    DeclarationBuilderBase(), m_preBuilding(false)
+    DeclarationBuilderBase()
 {
     setEditor(editor);
 }
@@ -49,21 +49,9 @@ DeclarationBuilder::~DeclarationBuilder()
 
 ReferencedTopDUContext DeclarationBuilder::build(const IndexedString &url, RubyAst \
*node, ReferencedTopDUContext updateContext)  {
-    if (!m_preBuilding) {
-        kDebug() << "Pre-building";
-        DeclarationBuilder *preBuilder = new DeclarationBuilder(editor());
-        preBuilder->setPreBuilding(true);
-        updateContext = preBuilder->build(url, node, updateContext);
-    }
-
     return DeclarationBuilderBase::build(url, node, updateContext);
 }
 
-void DeclarationBuilder::setPreBuilding(bool preBuilding)
-{
-    m_preBuilding = preBuilding;
-}
-
 void DeclarationBuilder::visitClassStatement(RubyAst *node)
 {
     openClassDeclaration(node, true);
diff --git a/duchain/declarationbuilder.h b/duchain/declarationbuilder.h
index 9e2322e..ea6c358 100644
--- a/duchain/declarationbuilder.h
+++ b/duchain/declarationbuilder.h
@@ -54,7 +54,6 @@ public:
 
     virtual KDevelop::ReferencedTopDUContext build(const KDevelop::IndexedString& \
                url, RubyAst * node,
         KDevelop::ReferencedTopDUContext updateContext = \
                KDevelop::ReferencedTopDUContext());
-    void setPreBuilding(bool preBuilding);
 
 protected:
     virtual KDevelop::QualifiedIdentifier identifierForNode(NameAst *node);
@@ -73,8 +72,6 @@ private:
     void openMethodDeclaration(RubyAst *node);
     void openClassDeclaration(RubyAst *node, bool isClass);
 
-private:
-    bool m_preBuilding;
 };
 
 }


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