From 2d49f6c6656c24e8302dad387f45047f5d8a7da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 9 Jan 2022 20:32:41 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20the=20mismatch=20of=20tokens=20TK=5FTQOBJ?=
 =?UTF-8?q?ECT=20=C3=97=20TK=5FQOBJECT=20and=20TK=5FTQCHAR=20=C3=97=20TK?=
 =?UTF-8?q?=5FQCHAR=20between=20lexer=20and=20parser.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit c1d6f4a527723728aeb28026f62461c146e3b716)
---
 sipgen/parser.y | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sipgen/parser.y b/sipgen/parser.y
index 86885c3..0c4d803 100644
--- a/sipgen/parser.y
+++ b/sipgen/parser.y
@@ -262,13 +262,13 @@ static int isEnabledFeature(const char *name);
 %token          TK_PLATFORMS
 %token          TK_FEATURE
 %token          TK_LICENSE
-%token <qchar>  TK_QCHAR
+%token <qchar>  TK_TQCHAR
 %token          TK_TRUE
 %token          TK_FALSE
 %token          TK_NULL
 %token          TK_OPERATOR
 %token          TK_THROW
-%token          TK_QOBJECT
+%token          TK_TQOBJECT
 %token          TK_EXCEPTION
 %token          TK_RAISECODE
 %token          TK_EXPLICIT
@@ -1403,7 +1403,7 @@ simplevalue:    scopedname {
             $$.vtype = string_value;
             $$.u.vstr = $1;
         }
-    |   TK_QCHAR {
+    |   TK_TQCHAR {
             $$.vtype = qchar_value;
             $$.u.vqchar = $1;
         }
@@ -2355,7 +2355,7 @@ argvalue:   TK_SIPSIGNAL optname optflags optassign {
 
             currentSpec -> sigslots = TRUE;
         }
-    |   TK_QOBJECT optname optflags {
+    |   TK_TQOBJECT optname optflags {
             $$.atype = qobject_type;
             $$.argflags = 0;
             $$.nrderefs = 0;