From bfb4ae4c6601fd93caa5219a7b73f3e39057cba1 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sat, 12 Oct 2013 12:40:35 +0200 Subject: Bug 709921 - position of linebreak in template argument list affects inheritance relation --- src/scanner.l | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/scanner.l b/src/scanner.l index 5a1f306..113ef03 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -5776,21 +5776,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) *specName += *yytext; if (roundCount==0 && --sharpCount<=0) { - if (1 /*!insideCS*/) - { - baseName+=*specName; - } - else - { - if (current->tArgLists==0) - { - current->tArgLists = new QList; - current->tArgLists->setAutoDelete(TRUE); - } - ArgumentList *al = new ArgumentList; - current->tArgLists->append(al); - stringToArgumentList(*specName,al); - } + baseName+=removeRedundantWhiteSpace(*specName); BEGIN(lastSkipSharpContext); } } -- cgit v0.12