[Uml-devel] branches/KDE/4.9/kdesdk/umbrello/umbrello/codeimport/kdevcppparser

[Ralf Habacker]

SVN commit 1305124 by habacker:

Merged 1304802 from trunk.

Fixed assertation parsing #define <name>(<value>) #<value>.

 M  +6 -0      preprocesslexer.cpp  


--- branches/KDE/4.9/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.cpp #1305123:1305124
@@ -776,7 +776,13 @@
             Token tk;
             nextToken(tk);
 
+            if (tk == '#') {
+                nextToken(tk);
             if (tk.type() != -1) {
+                    body += '"' + tk.text() + '"';
+                }
+            }
+            else if (tk.type() != -1) {
                 QString s = tk.text();
                 body += s;
             }