← Back to branch summary

~ubuntu-branches/ubuntu/raring/kdevelop-php/raring

« back to all changes in this revision

Viewing changes to duchain/builders/typebuilder.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-08-16 12:04:42 UTC
  • mfrom: (1.2.14)
  • Revision ID: package-import@ubuntu.com-20120816120442-vlz0zrna32hj7qfi
Tags: 1.3.80-0ubuntu1
* New upstream release
* Make kdevelop-php depend on kdevelop-php-l10n, kdevelop-php-doc

Show diffs side-by-side

added added

removed removed

Lines of Context:
duchain/builders/typebuilder.cpp
87
87
        }
88
88
        //don't use openTypeFromName as it uses cursor for findDeclarations
89
89
        DeclarationPointer decl = findDeclarationImport(ClassDeclarationType,
90
 
                                                        QualifiedIdentifier(type.toLower()), node);
 
90
                                                        QualifiedIdentifier(type.toLower()));
91
91
        if (decl && decl->abstractType()) {
92
92
            return decl->abstractType();
93
93
        }
344
344
    if (node->parameterType) {
345
345
        //don't use openTypeFromName as it uses cursor for findDeclarations
346
346
        DeclarationPointer decl = findDeclarationImport(ClassDeclarationType,
347
 
                                                  identifierForNamespace(node->parameterType, editor()),
348
 
                                                  node->parameterType);
 
347
                                                  identifierForNamespace(node->parameterType, editor()));
349
348
        if (decl) {
350
349
            type = decl->abstractType();
351
350
        }
519
518
            /// Qualified identifier for 'iterator'
520
519
            static const QualifiedIdentifier iteratorQId("iterator");
521
520
            ClassDeclaration* iteratorDecl = dynamic_cast<ClassDeclaration*>(
522
 
                findDeclarationImport(ClassDeclarationType, iteratorQId, 0).data()
 
521
                findDeclarationImport(ClassDeclarationType, iteratorQId).data()
523
522
            );
524
523
            Q_ASSERT(iteratorDecl);
525
524
            if (classDec->isPublicBaseClass(iteratorDecl, currentContext()->topContext())) {
544
543
{
545
544
    TypeBuilderBase::visitCatchItem(node);
546
545
    DeclarationPointer dec = findDeclarationImport(ClassDeclarationType,
547
 
                                                   identifierForNamespace(node->catchClass, m_editor),
548
 
                                                   node->catchClass);
 
546
                                                   identifierForNamespace(node->catchClass, m_editor));
549
547
    if (dec && dec->abstractType()) {
550
548
        openAbstractType(dec->abstractType());
551
549
        closeType();