feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix left-overs from merging icheck code.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-04-23 09:42:22 +02:00
parent 80068a31b3
commit 25837759ea
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/shared/cplusplus/Parser.cpp
View File

@@ -3556,9 +3556,6 @@ bool Parser::parseSimpleDeclaration(DeclarationAST *&node,
} }
SimpleDeclarationAST *ast = new (_pool) SimpleDeclarationAST; SimpleDeclarationAST *ast = new (_pool) SimpleDeclarationAST;
ast->qt_invokable_token = qt_invokable_token; ast->qt_invokable_token = qt_invokable_token;
#ifdef ICHECK_BUILD
ast->invoke_token = invoke_token;
#endif
ast->decl_specifier_list = decl_specifier_seq; ast->decl_specifier_list = decl_specifier_seq;
ast->declarator_list = declarator_list; ast->declarator_list = declarator_list;
match(T_SEMICOLON, &ast->semicolon_token); match(T_SEMICOLON, &ast->semicolon_token);
@@ -3588,9 +3585,6 @@ bool Parser::parseSimpleDeclaration(DeclarationAST *&node,
if (LA() == T_LBRACE || hasCtorInitializer) { if (LA() == T_LBRACE || hasCtorInitializer) {
FunctionDefinitionAST *ast = new (_pool) FunctionDefinitionAST; FunctionDefinitionAST *ast = new (_pool) FunctionDefinitionAST;
ast->qt_invokable_token = qt_invokable_token; ast->qt_invokable_token = qt_invokable_token;
#ifdef ICHECK_BUILD
ast->invoke_token = invoke_token;
#endif
ast->decl_specifier_list = decl_specifier_seq; ast->decl_specifier_list = decl_specifier_seq;
ast->declarator = firstDeclarator; ast->declarator = firstDeclarator;
ast->ctor_initializer = ctor_initializer; ast->ctor_initializer = ctor_initializer;
@@ -3600,9 +3594,6 @@ bool Parser::parseSimpleDeclaration(DeclarationAST *&node,
} else if (LA() == T_TRY) { } else if (LA() == T_TRY) {
FunctionDefinitionAST *ast = new (_pool) FunctionDefinitionAST; FunctionDefinitionAST *ast = new (_pool) FunctionDefinitionAST;
ast->qt_invokable_token = qt_invokable_token; ast->qt_invokable_token = qt_invokable_token;
#ifdef ICHECK_BUILD
ast->invoke_token = invoke_token;
#endif
ast->decl_specifier_list = decl_specifier_seq; ast->decl_specifier_list = decl_specifier_seq;
ast->declarator = firstDeclarator; ast->declarator = firstDeclarator;
ast->ctor_initializer = ctor_initializer; ast->ctor_initializer = ctor_initializer;

3
src/shared/cplusplus/Symbols.cpp
View File

@@ -189,6 +189,9 @@ bool Function::isSignal() const
bool Function::isSlot() const bool Function::isSlot() const
{ return f._methodKey == SlotMethod; } { return f._methodKey == SlotMethod; }
bool Function::isInvokable() const
{ return f._methodKey == InvokableMethod; }
int Function::methodKey() const int Function::methodKey() const
{ return f._methodKey; } { return f._methodKey; }

1
src/shared/cplusplus/Symbols.h
View File

@@ -313,6 +313,7 @@ public:
bool isNormal() const; bool isNormal() const;
bool isSignal() const; bool isSignal() const;
bool isSlot() const; bool isSlot() const;
bool isInvokable() const;
int methodKey() const; int methodKey() const;
void setMethodKey(int key); void setMethodKey(int key);

4
tests/auto/icheckbuild/ichecklib.pri
View File

@@ -1,7 +1,7 @@
# ---------------------------------------------------- # ----------------------------------------------------
# This file is generated by the Qt Visual Studio Add-in. # This file is generated by the Qt Visual Studio Add-in.
# ------------------------------------------------------ # ------------------------------------------------------
HEADERS += $$REL_PATH_TO_SRC/shared/cplusplus/Array.h \ HEADERS += \
$$REL_PATH_TO_SRC/shared/cplusplus/AST.h \ $$REL_PATH_TO_SRC/shared/cplusplus/AST.h \
$$REL_PATH_TO_SRC/shared/cplusplus/ASTMatcher.h \ $$REL_PATH_TO_SRC/shared/cplusplus/ASTMatcher.h \
$$REL_PATH_TO_SRC/shared/cplusplus/ASTVisitor.h \ $$REL_PATH_TO_SRC/shared/cplusplus/ASTVisitor.h \
@@ -58,7 +58,7 @@ HEADERS += $$REL_PATH_TO_SRC/shared/cplusplus/Array.h \
$$REL_PATH_TO_SRC/libs/cplusplus/TypePrettyPrinter.h \ $$REL_PATH_TO_SRC/libs/cplusplus/TypePrettyPrinter.h \
$$REL_PATH_TO_SRC/shared/cplusplus/TypeVisitor.h \ $$REL_PATH_TO_SRC/shared/cplusplus/TypeVisitor.h \
$$REL_PATH_TO_SRC/plugins/cpptools/cpptools_global.h $$REL_PATH_TO_SRC/plugins/cpptools/cpptools_global.h
SOURCES += $$REL_PATH_TO_SRC/shared/cplusplus/Array.cpp \ SOURCES += \
$$REL_PATH_TO_SRC/shared/cplusplus/AST.cpp \ $$REL_PATH_TO_SRC/shared/cplusplus/AST.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/ASTMatch0.cpp \ $$REL_PATH_TO_SRC/shared/cplusplus/ASTMatch0.cpp \
$$REL_PATH_TO_SRC/shared/cplusplus/ASTMatcher.cpp \ $$REL_PATH_TO_SRC/shared/cplusplus/ASTMatcher.cpp \