From ae0ee18a77e81cb9c8dbb5a5798a44d5d135d0b7 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Thu, 4 Feb 2010 12:03:34 +0100
Subject: Removed #ifdefs so all AST nodes are always there.

Also removed the (conditional) invoke_token from DeclarationAST and use
the qt_invokable_token to store the Q_INVOKABLE, and fixed the ASTMatch
code generation.
---
 src/shared/cplusplus/Token.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/shared/cplusplus/Token.h')

diff --git a/src/shared/cplusplus/Token.h b/src/shared/cplusplus/Token.h
index 1a24eb52b6..c915e31f4e 100644
--- a/src/shared/cplusplus/Token.h
+++ b/src/shared/cplusplus/Token.h
@@ -238,16 +238,13 @@ enum Kind {
     T_Q_FOREACH,
     T_Q_D,
     T_Q_Q,
-#ifndef ICHECK_BUILD
-    T_LAST_KEYWORD = T_Q_Q,
-#else
     T_Q_INVOKABLE,
     T_Q_PROPERTY,
     T_Q_ENUMS,
     T_Q_FLAGS,
     T_Q_DECLARE_FLAGS,
     T_LAST_KEYWORD = T_Q_DECLARE_FLAGS,
-#endif
+
     // aliases
     T_OR = T_PIPE_PIPE,
     T_AND = T_AMPER_AMPER,
-- 
cgit v1.2.1