will you ever learn to run prepare-commit.sh before commiting?

jef · jef · commit 50e9f9f7fda2 · 2009-10-14T12:43:57.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11805 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgssearchtreenode.cpp b/src/core/qgssearchtreenode.cpp
@@ -252,7 +252,7 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib
     case opLike:
     {
       if ( !getValue( value1, mLeft, fields, attributes ) ||
-				   !getValue( value2, mRight, fields, attributes ) )
+           !getValue( value2, mRight, fields, attributes ) )
         return false;
 
       // value1 is string to be matched
@@ -274,11 +274,7 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib
         str.replace( "_", "." );
       }
 
-      QRegExp re( str );
-			res = re.exactMatch( value1.string() );
-      QgsDebugMsgLevel( "REGEXP: " + str + " ~ " + value2.string(), 2 );
-      QgsDebugMsgLevel( "   res: " + res, 2 );
-      return res;
+      return QRegExp( str ).exactMatch( value1.string() );
     }
 
     default:

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib`
`252`	`252`	`case opLike:`
`253`	`253`	`{`
`254`	`254`	`if ( !getValue( value1, mLeft, fields, attributes ) \|\|`
`255`		`- !getValue( value2, mRight, fields, attributes ) )`
	`255`	`+ !getValue( value2, mRight, fields, attributes ) )`
`256`	`256`	`return false;`
`257`	`257`
`258`	`258`	`// value1 is string to be matched`
`@@ -274,11 +274,7 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib`
`274`	`274`	`str.replace( "_", "." );`
`275`	`275`	`}`
`276`	`276`
`277`		`- QRegExp re( str );`
`278`		`- res = re.exactMatch( value1.string() );`
`279`		`- QgsDebugMsgLevel( "REGEXP: " + str + " ~ " + value2.string(), 2 );`
`280`		`- QgsDebugMsgLevel( " res: " + res, 2 );`
`281`		`- return res;`
	`277`	`+ return QRegExp( str ).exactMatch( value1.string() );`
`282`	`278`	`}`
`283`	`279`
`284`	`280`	`default:`