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