← Back to branch summary

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

« back to all changes in this revision

Viewing changes to duchain/expressionevaluationresult.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:
duchain/expressionevaluationresult.cpp
41
41
{
42
42
}
43
43
 
44
 
void ExpressionEvaluationResult::setDeclaration(Declaration* declaration)
45
 
{
46
 
    QList<Declaration*> decs;
 
44
void ExpressionEvaluationResult::setDeclaration( Declaration* declaration )
 
45
{
 
46
    ENSURE_CHAIN_READ_LOCKED
 
47
    setDeclaration(DeclarationPointer(declaration));
 
48
}
 
49
 
 
50
void ExpressionEvaluationResult::setDeclaration( DeclarationPointer declaration)
 
51
{
 
52
    QList<DeclarationPointer> decs;
47
53
    if (declaration) {
48
54
        decs << declaration;
49
55
    }
50
56
    setDeclarations(decs);
51
57
}
52
58
 
53
 
void ExpressionEvaluationResult::setDeclarations(QList<Declaration*> declarations)
 
59
void ExpressionEvaluationResult::setDeclarations( QList< Declaration* > declarations )
 
60
{
 
61
    ENSURE_CHAIN_READ_LOCKED
 
62
    QList<DeclarationPointer> decs;
 
63
    foreach(Declaration* dec, declarations) {
 
64
        decs << DeclarationPointer(dec);
 
65
    }
 
66
    setDeclarations(decs);
 
67
}
 
68
 
 
69
void ExpressionEvaluationResult::setDeclarations(QList<DeclarationPointer> declarations)
54
70
{
55
71
    ifDebug(kDebug() << "setting declarations" << declarations.size();)
56
72
 
62
78
    }
63
79
    m_allDeclarationIds.clear();
64
80
    DUChainReadLocker lock(DUChain::lock());
65
 
    foreach(Declaration* dec, m_allDeclarations) {
 
81
    foreach(const DeclarationPointer& dec, m_allDeclarations) {
66
82
        m_allDeclarationIds << dec->id();
67
83
        ifDebug(kDebug() << dec->toString();)
68
84
    }
73
89
    return m_type;
74
90
}
75
91
 
76
 
QList<Declaration*> ExpressionEvaluationResult::allDeclarations() const
 
92
QList<DeclarationPointer> ExpressionEvaluationResult::allDeclarations() const
77
93
{
78
94
    return m_allDeclarations;
79
95
}