Merge pull request #1426 from simonsonc/qgsvaluemapconfigdlg-deprecated-api

wonder-sk · wonder-sk · commit 563f5211dbf9 · 2014-06-06T13:37:56.000+07:00
Replace deprecated QRexExp API
diff --git a/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp b/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp
@@ -192,12 +192,12 @@ void QgsValueMapConfigDlg::loadFromCSVButtonPushed()
     QString l = s.readLine().trimmed();
 
     QString key, val;
-    if ( re0.indexIn( l ) >= 0 && re0.numCaptures() == 2 )
+    if ( re0.indexIn( l ) >= 0 && re0.captureCount() == 2 )
     {
       key = re0.cap( 1 ).trimmed();
       val = re0.cap( 2 ).trimmed();
     }
-    else if ( re1.indexIn( l ) >= 0 && re1.numCaptures() == 2 )
+    else if ( re1.indexIn( l ) >= 0 && re1.captureCount() == 2 )
     {
       key = re1.cap( 1 ).trimmed();
       val = re1.cap( 2 ).trimmed();

Original file line number	Diff line number	Diff line change
`@@ -192,12 +192,12 @@ void QgsValueMapConfigDlg::loadFromCSVButtonPushed()`
`192`	`192`	`QString l = s.readLine().trimmed();`
`193`	`193`
`194`	`194`	`QString key, val;`
`195`		`- if ( re0.indexIn( l ) >= 0 && re0.numCaptures() == 2 )`
	`195`	`+ if ( re0.indexIn( l ) >= 0 && re0.captureCount() == 2 )`
`196`	`196`	`{`
`197`	`197`	`key = re0.cap( 1 ).trimmed();`
`198`	`198`	`val = re0.cap( 2 ).trimmed();`
`199`	`199`	`}`
`200`		`- else if ( re1.indexIn( l ) >= 0 && re1.numCaptures() == 2 )`
	`200`	`+ else if ( re1.indexIn( l ) >= 0 && re1.captureCount() == 2 )`
`201`	`201`	`{`
`202`	`202`	`key = re1.cap( 1 ).trimmed();`
`203`	`203`	`val = re1.cap( 2 ).trimmed();`