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

List:       kde-commits
Subject:    branches/kdevelop/3.4/languages/cpp
From:       David Nolden <david.nolden.kde () art-master ! de>
Date:       2007-01-22 10:44:45
Message-ID: 1169462685.803557.10437.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 626154 by zwabel:

Show locally defined functions in the class-view again

 M  +8 -3      store_walker.cpp  


--- branches/kdevelop/3.4/languages/cpp/store_walker.cpp #626153:626154
@@ -366,8 +366,13 @@
 	QString id = d->declaratorId() ->unqualifiedName() ->text().stripWhiteSpace();
 	
 	QStringList scope = scopeOfDeclarator( d, m_currentScope );
-	ClassDom c = findClassFromScope( scope );
-	if( c ){
+	ClassDom c; ///c should be nonzero if it is a function-definition for a function \
within another class +	if( !m_currentClass.top() ) {
+		///It is not a local definition within a class, so search the scope so it can be \
corrected using imports +		c = findClassFromScope( scope );
+	}
+	
+	if( c ) {
 		scope = c->scope();
 		scope << c->name();
 	}
@@ -406,7 +411,7 @@
 		method->setVirtual( isVirtual );
 		
 		if ( m_currentClass.top() )
-			m_currentClass.top() ->addFunction( model_cast<FunctionDom>( method ) );
+			m_currentClass.top() ->addFunction( model_cast<FunctionDom>( method ) ); 
 		else
 			m_file->addFunction( model_cast<FunctionDom>( method ) );
 	}


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