Fixed Q_PROPERTY parsing to handle all possible cases.

1 files changed, 5 insertions, 24 deletions

diff --git a/src/shared/cplusplus/ASTMatcher.cpp b/src/shared/cplusplus/ASTMatcher.cpp
index c3e04a0d4e..e891d606ce 100644
--- a/src/shared/cplusplus/ASTMatcher.cpp
+++ b/src/shared/cplusplus/ASTMatcher.cpp
@@ -206,40 +206,21 @@ bool ASTMatcher::match(AccessDeclarationAST *node, AccessDeclarationAST *pattern
     return true;
 }
 
-bool ASTMatcher::match(QtPropertyDeclarationNamingItemAST *node, QtPropertyDeclarationNamingItemAST *pattern)
+bool ASTMatcher::match(QtPropertyDeclarationItemAST *node, QtPropertyDeclarationItemAST *pattern)
 {
     (void) node;
     (void) pattern;
 
-    if (! pattern->name_value)
-        pattern->name_value = node->name_value;
-    else if (! AST::match(node->name_value, pattern->name_value, this))
-        return false;
+    pattern->item_name_token = node->item_name_token;
 
-    return true;
-}
-
-bool ASTMatcher::match(QtPropertyDeclarationBoolItemAST *node, QtPropertyDeclarationBoolItemAST *pattern)
-{
-    (void) node;
-    (void) pattern;
-
-    if (! pattern->bool_value)
-        pattern->bool_value = node->bool_value;
-    else if (! AST::match(node->bool_value, pattern->bool_value, this))
+    if (! pattern->expression)
+        pattern->expression = node->expression;
+    else if (! AST::match(node->expression, pattern->expression, this))
         return false;
 
     return true;
 }
 
-bool ASTMatcher::match(QtPropertyDeclarationFlaggingItemAST *node, QtPropertyDeclarationFlaggingItemAST *pattern)
-{
-    (void) node;
-    (void) pattern;
-
-    return true;
-}
-
 bool ASTMatcher::match(QtPropertyDeclarationAST *node, QtPropertyDeclarationAST *pattern)
 {
     (void) node;