← Back to branch summary

~ubuntu-branches/ubuntu/utopic/kdevelop-php/utopic

« back to all changes in this revision

Viewing changes to duchain/builders/typebuilder.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Fathi Boudra
  • Date: 2010-05-18 12:21:48 UTC
  • mto: (5.1.1 squeeze) (1.1.5)
  • mto: This revision was merged to the branch mainline in revision 7.
  • Revision ID: james.westby@ubuntu.com-20100518122148-04mq5800fnjfbs48
Tags: upstream-1.0.0
Import upstream version 1.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
duchain/builders/typebuilder.cpp
480
480
            Q_ASSERT(classDec);
481
481
            lock.unlock();
482
482
            ClassDeclaration* iteratorDecl = dynamic_cast<ClassDeclaration*>(
483
 
                findDeclarationImport(ClassDeclarationType, QualifiedIdentifier("iterator"), 0)
 
483
                findDeclarationImport(ClassDeclarationType, iteratorQId, 0)
484
484
            );
485
485
            lock.lock();
486
486
            Q_ASSERT(iteratorDecl);
487
487
            if (classDec->isPublicBaseClass(iteratorDecl, currentContext()->topContext())) {
488
 
                foreach (Declaration *d, classDec->internalContext()->findDeclarations(QualifiedIdentifier("current"))) {
 
488
                foreach (Declaration *d, classDec->internalContext()->findDeclarations(currentQId)) {
489
489
                    if (!dynamic_cast<ClassMethodDeclaration*>(d)) continue;
490
490
                    Q_ASSERT(d->type<FunctionType>());
491
491
                    injectType(d->type<FunctionType>()->returnType());