← Back to branch summary

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

« back to all changes in this revision

Viewing changes to duchain/helper.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/helper.cpp
78
78
        DeclarationType declarationType, AstNode* node, EditorIntegrator* editor)
79
79
{
80
80
    ifDebug(kDebug() << id.toString() << declarationType;)
81
 
    if (declarationType == ClassDeclarationType && id == QualifiedIdentifier("self")) {
 
81
    if (declarationType == ClassDeclarationType && id == selfQId) {
82
82
        DUChainReadLocker lock(DUChain::lock());
83
83
        if (currentContext->parentContext()) {
84
84
            Declaration* declaration = currentContext->parentContext()->owner();
85
85
            return declaration;
86
86
        }
87
 
    } else if (declarationType == ClassDeclarationType && id == QualifiedIdentifier("parent")) {
 
87
    } else if (declarationType == ClassDeclarationType && id == parentQId) {
88
88
        //there can be just one Class-Context imported
89
89
        DUChainReadLocker lock(DUChain::lock());
90
90
        if (currentContext->parentContext()) {
122
122
                    ifDebug(kDebug() << "skipping declaration, missing meta-data";)
123
123
                    continue;
124
124
                }
125
 
                if(env->language() != IndexedString("Php")) {
 
125
                if(env->language() != phpLangString) {
126
126
                    ifDebug(kDebug() << "skipping declaration, invalid language" << env->language().str();)
127
127
                    continue;
128
128
                }