1 files changed, 13 insertions, 8 deletions
diff --git a/scripts/qdebug-odebug.py b/scripts/qdebug-odebug.py
index 636c1b2..7a417e1 100755
--- a/scripts/qdebug-odebug.py
+++ b/scripts/qdebug-odebug.py
@@ -11,7 +11,7 @@ import sys, sre
-qDebugExpression = sre.compile( '(.*)(qDebug)\(\s*(.*)\s*\);(.*)' )
+qDebugExpression = sre.compile( '(?P<head>.*)(?P<statement>qDebug)\(\s*(?P<content>.*)\s*\);(?P<tail>.*)' )
-qWarningExpression = sre.compile( '(.*)(qWarning)\(\s*(.*)\s*\);(.*)' )
+qWarningExpression = sre.compile( '(?P<head>.*)(?P<statement>qWarning)\(\s*(?P<content>.*)\s*\);(?P<tail>.*)' )
-qErrorExpression = sre.compile( '(.*)(qError)\(\s*(.*)\s*\);(.*)' )
+qErrorExpression = sre.compile( '(?P<head>.*)(?P<statement>qError)\(\s*(?P<content>.*)\s*\);(?P<tail>.*)' )
-qFatalExpression = sre.compile( '(.*)(qFatal)\(\s*(.*)\s*\);(.*)' )
+qFatalExpression = sre.compile( '(?P<head>.*)(?P<statement>qFatal)\(\s*(?P<content>.*)\s*\);(?P<tail>.*)' )
-printfExpression = sre.compile( '(.*)(printf)\(\s*(.*)\s*\);(.*)' )
+#printfExpression = sre.compile( '(?P<head>.*)(?![s\.])(?P<statement>printf)\(\s*(?P<content>.*)\s*\);(?P<tail>.*)' )
@@ -23,3 +23,3 @@ debugTable = { "qDebug" : "odebug",
-allExpressions = ( qDebugExpression, qWarningExpression, qErrorExpression, qFatalExpression, printfExpression )
+allExpressions = ( qDebugExpression, qWarningExpression, qErrorExpression, qFatalExpression ) #, printfExpression )
@@ -38,3 +38,8 @@ def convert( fname ):
                match = True
-                head, debug, content, tail = m.groups()
+                head = m.groupdict()["head"]
+                debug = m.groupdict()["statement"]
+                content = m.groupdict()["content"]
+                tail = m.groupdict()["tail"]
                print >>sys.stderr, "<NOTE>: Groups = ", m.groups()
@@ -97,3 +102,3 @@ def transform( s ):
            i += 1
-            while i < len( formatstring ) and formatstring[i] not in "%dDiouxXfegEscpn":
+            while i < len( formatstring ) and formatstring[i] not in "%dDiouxXfFegEscpn":
                i += 1

diff --git a/scripts/qdebug-odebug.py b/scripts/qdebug-odebug.py index 636c1b2..7a417e1 100755 --- a/scripts/qdebug-odebug.py +++ b/scripts/qdebug-odebug.py
@@ -11,7 +11,7 @@ import sys, sre
11		11
12	qDebugExpression = sre.compile( '(.)(qDebug)\(\s(.)\s\);(.*)' )	12	qDebugExpression = sre.compile( '(?P<head>.)(?P<statement>qDebug)\(\s(?P<content>.)\s\);(?P<tail>.*)' )
13	qWarningExpression = sre.compile( '(.)(qWarning)\(\s(.)\s\);(.*)' )	13	qWarningExpression = sre.compile( '(?P<head>.)(?P<statement>qWarning)\(\s(?P<content>.)\s\);(?P<tail>.*)' )
14	qErrorExpression = sre.compile( '(.)(qError)\(\s(.)\s\);(.*)' )	14	qErrorExpression = sre.compile( '(?P<head>.)(?P<statement>qError)\(\s(?P<content>.)\s\);(?P<tail>.*)' )
15	qFatalExpression = sre.compile( '(.)(qFatal)\(\s(.)\s\);(.*)' )	15	qFatalExpression = sre.compile( '(?P<head>.)(?P<statement>qFatal)\(\s(?P<content>.)\s\);(?P<tail>.*)' )
16	printfExpression = sre.compile( '(.)(printf)\(\s(.)\s\);(.*)' )	16	#printfExpression = sre.compile( '(?P<head>.)(?![s\.])(?P<statement>printf)\(\s(?P<content>.)\s\);(?P<tail>.*)' )
17		17
@@ -23,3 +23,3 @@ debugTable = { "qDebug" : "odebug",
23		23
24	allExpressions = ( qDebugExpression, qWarningExpression, qErrorExpression, qFatalExpression, printfExpression )	24	allExpressions = ( qDebugExpression, qWarningExpression, qErrorExpression, qFatalExpression ) #, printfExpression )
25		25
@@ -38,3 +38,8 @@ def convert( fname ):
38	match = True	38	match = True
39	head, debug, content, tail = m.groups()	39
		40	head = m.groupdict()["head"]
		41	debug = m.groupdict()["statement"]
		42	content = m.groupdict()["content"]
		43	tail = m.groupdict()["tail"]
		44
40	print >>sys.stderr, "<NOTE>: Groups = ", m.groups()	45	print >>sys.stderr, "<NOTE>: Groups = ", m.groups()
@@ -97,3 +102,3 @@ def transform( s ):
97	i += 1	102	i += 1
98	while i < len( formatstring ) and formatstring[i] not in "%dDiouxXfegEscpn":	103	while i < len( formatstring ) and formatstring[i] not in "%dDiouxXfFegEscpn":
99	i += 1	104	i += 1