← Back to branch summary

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

« back to all changes in this revision

Viewing changes to completion/context.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-12-20 14:59:02 UTC
  • mfrom: (1.2.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20101220145902-a6cmovse1qmue52p
Tags: 1.1.80-0ubuntu1
* New upstream release
* Build-dep on kdevplatform >= 1.1.80
* Get rid of l10n packages, not relevant in Ubuntu, put locale files into main package

Show diffs side-by-side

added added

removed removed

Lines of Context:
completion/context.cpp
226
226
 
227
227
int completionRecursionDepth = 0;
228
228
 
229
 
CodeCompletionContext::CodeCompletionContext(KDevelop::DUContextPointer context, const QString& text, const QString& followingText, const KDevelop::SimpleCursor& position, int depth)
 
229
CodeCompletionContext::CodeCompletionContext(KDevelop::DUContextPointer context, const QString& text, const QString& followingText, const KDevelop::CursorInRevision& position, int depth)
230
230
        : KDevelop::CodeCompletionContext(context, text, position, depth)
231
231
        , m_memberAccessOperation(NoMemberAccess), m_parentAccess(false), m_isFileCompletionAfterDirname(false)
232
232
{
755
755
    evaluateExpression(lastToken);
756
756
}
757
757
 
758
 
CodeCompletionContext::CodeCompletionContext(KDevelop::DUContextPointer context, const KDevelop::SimpleCursor& position,
 
758
CodeCompletionContext::CodeCompletionContext(KDevelop::DUContextPointer context, const KDevelop::CursorInRevision& position,
759
759
                                             TokenAccess& lastToken,  int depth)
760
760
        : KDevelop::CodeCompletionContext(context, QString(), position, depth)
761
761
        , m_memberAccessOperation(NoMemberAccess), m_parentAccess(false), m_isFileCompletionAfterDirname(false)
961
961
    QualifiedIdentifier id(identifier.toLower());
962
962
 
963
963
    ClassDeclaration *dec = dynamic_cast<ClassDeclaration*>(
964
 
                                findDeclarationImportHelper(m_duContext.data(), id, ClassDeclarationType, 0, 0)
 
964
                                findDeclarationImportHelper(m_duContext.data(), id,
 
965
                                                            ClassDeclarationType, 0, 0).data()
965
966
                            );
966
967
    if (dec) {
967
968
        forbidIdentifier(dec);
1428
1429
        //Show all visible declarations
1429
1430
        QSet<uint> existingIdentifiers;
1430
1431
        QList<DeclarationDepthPair> decls = m_duContext->allDeclarations(
1431
 
            SimpleCursor::invalid(),
 
1432
            CursorInRevision::invalid(),
1432
1433
            m_duContext->topContext()
1433
1434
        );
1434
1435