Fixed Q_PROPERTY parsing to handle all possible cases.

1 files changed, 4 insertions, 27 deletions

diff --git a/src/shared/cplusplus/AST.cpp b/src/shared/cplusplus/AST.cpp
index 9a8312eaba..c85e4a7b6f 100644
--- a/src/shared/cplusplus/AST.cpp
+++ b/src/shared/cplusplus/AST.cpp
@@ -144,42 +144,19 @@ unsigned AccessDeclarationAST::lastToken() const
     return access_specifier_token + 1;
 }
 
-unsigned QtPropertyDeclarationNamingItemAST::firstToken() const
+unsigned QtPropertyDeclarationItemAST::firstToken() const
 {
     return item_name_token;
 }
 
-unsigned QtPropertyDeclarationNamingItemAST::lastToken() const
+unsigned QtPropertyDeclarationItemAST::lastToken() const
 {
-    if (name_value)
-        return name_value->lastToken();
-    else
-        return item_name_token + 1;
-}
-
-unsigned QtPropertyDeclarationBoolItemAST::firstToken() const
-{
-    return item_name_token;
-}
-
-unsigned QtPropertyDeclarationBoolItemAST::lastToken() const
-{
-    if (bool_value)
-        return bool_value->lastToken();
+    if (expression)
+        return expression->lastToken();
     else
         return item_name_token + 1;
 }
 
-unsigned QtPropertyDeclarationFlaggingItemAST::firstToken() const
-{
-    return item_name_token;
-}
-
-unsigned QtPropertyDeclarationFlaggingItemAST::lastToken() const
-{
-    return item_name_token + 1;
-}
-
 unsigned QtPropertyDeclarationAST::firstToken() const
 {
     return property_specifier_token;