This commit is contained in:
Roberto Raggi
2010-08-13 17:04:57 +02:00
parent 6b70342d7b
commit bc28e5d993
3 changed files with 19 additions and 21 deletions

View File

@@ -33,10 +33,10 @@
#include "Literals.h"
#include "Overview.h"
#include "Scope.h"
#include "Semantic.h"
#include "TranslationUnit.h"
#include "AST.h"
#include "Symbols.h"
#include "Bind.h"
#include <QDebug>
#include "Name.h"
#include "cpptools/cppmodelmanager.h"
@@ -401,7 +401,7 @@ void ParseManager::getElements(QList<FUNCTIONITEM*> &functionlist
SimpleDeclarationAST *pdecl = pmemberlist->value->asSimpleDeclaration();
if(pdecl){
for(List<Declaration*>* decllist = pdecl->symbols; decllist; decllist = decllist->next)
for(List<Symbol*>* decllist = pdecl->symbols; decllist; decllist = decllist->next)
{
Function* pfct = decllist->value->type()->asFunctionType();
if(pfct){
@@ -1355,8 +1355,8 @@ void ParseManager::assignFlagValues(QFLAGITEM* qflags, const QList<QList<QDECLAR
QString enumname;
//try to find if there is a deflare flag macro with the same name as in qflagname
Scope *classMembers = qflags->highestlevelclass->classspec->symbol->members();
Symbol *s = classMembers->lookat(qflags->name);
Scope *classMembers = qflags->highestlevelclass->classspec->symbol;
Symbol *s = classMembers->find(qflags->name);
if (s->isTypedef()) {
FullySpecifiedType ty = s->type();
if (Enum *e = ty->asEnumType()) {
@@ -1503,8 +1503,8 @@ PROPERTYITEM *PROPERTYITEM::create(QtPropertyDeclarationAST *ast, const CLASSLIS
item->trlUnit = clazz->trlUnit;
if (ast->type_id) {
Semantic mySem(item->trlUnit);
item->type = mySem.check(ast->type_id, clazz->classspec->symbol->asClass()->members());
Bind bind(item->trlUnit);
item->type = bind(ast->type_id, clazz->classspec->symbol);
}
for (QtPropertyDeclarationItemListAST *it = ast->property_declaration_items;

View File

@@ -33,7 +33,6 @@
#include <ASTMatcher.h>
#include <Control.h>
#include <Scope.h>
#include <Semantic.h>
#include <TranslationUnit.h>
#include <Literals.h>
#include <Symbols.h>

View File

@@ -33,7 +33,6 @@
#include <ASTMatcher.h>
#include <Control.h>
#include <Scope.h>
#include <Semantic.h>
#include <TranslationUnit.h>
#include <Literals.h>
#include <Symbols.h>