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

List:       kde-commits
Subject:    KDE/kdevelop/plugins/languages/cpp
From:       David Nolden <david.nolden.kde () art-master ! de>
Date:       2009-01-31 21:18:58
Message-ID: 1233436738.775719.1238.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 919394 by zwabel:

- Make cppcodecompletiontest succeed again.


 M  +2 -2      codecompletioncontext.cpp  
 M  +3 -0      tests/test_cppcodecompletion.cpp  


--- trunk/KDE/kdevelop/plugins/languages/cpp/codecompletioncontext.cpp #919393:919394
@@ -1300,8 +1300,8 @@
 }
 
 bool  CodeCompletionContext::filterDeclaration(ClassMemberDeclaration* decl, \
                DUContext* declarationContext) {
-  if(doAccessFiltering && decl && m_localClass) {
-    if(!Cpp::isAccessible(m_localClass.data(), decl, m_duContext->topContext(), \
declarationContext)) +  if(doAccessFiltering && decl) {
+    if(!Cpp::isAccessible(m_localClass ? m_localClass.data() : m_duContext.data(), \
decl, m_duContext->topContext(), declarationContext))  return false;
   }
   return filterDeclaration((Declaration*)decl, declarationContext, false);
--- trunk/KDE/kdevelop/plugins/languages/cpp/tests/test_cppcodecompletion.cpp \
#919393:919394 @@ -252,9 +252,12 @@
   QVERIFY(top->childContexts()[1]->owner());
   QVERIFY(Cpp::localClassFromCodeContext(top->childContexts()[1]));
   //From within B, MyClass is visible, because of the protected inheritance
+  QCOMPARE(top->childContexts()[1]->localDeclarations().size(), 1);
+  QVERIFY(!Cpp::isAccessible(top, \
dynamic_cast<ClassMemberDeclaration*>(top->childContexts()[0]->localDeclarations()[0]), \
top, top->childContexts()[1]));  \
QCOMPARE(CompletionItemTester(top->childContexts()[1], "A::").names, QStringList() << \
"AMyClass");  QCOMPARE(CompletionItemTester(top->childContexts()[1]).names.toSet(), \
QSet<QString>() << "BMyClass" << "AMyClass" << "A" << "B" );  \
QCOMPARE(CompletionItemTester(top, "A::").names, QStringList() << "AMyClass"); +  \
kDebug() << "list:" << CompletionItemTester(top, "B::").names << \
CompletionItemTester(top, "A::").names.size();  QCOMPARE(CompletionItemTester(top, \
"B::").names, QStringList() << "BMyClass");  \
QCOMPARE(CompletionItemTester(top->childContexts()[2]).names.toSet(), QSet<QString>() \
<< "CMyClass" << "BMyClass" << "AMyClass" << "C" << "B" << "A");  \
QCOMPARE(CompletionItemTester(top, "C::").names.toSet(), QSet<QString>() << \
"CMyClass");


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