Fix indexOf checks in setDisplayField, make sure they are case insensitive

nyalldawson · nyalldawson · commit eb114799d72e · 2013-08-13T11:13:21.000+10:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -267,21 +267,21 @@ void QgsVectorLayer::setDisplayField( QString fldName )
       // We assume that the user has organized the data with the
       // more "interesting" field names first. As such, name should
       // be selected before oldname, othername, etc.
-      if ( fldName.indexOf( "name", false ) > -1 )
+      if ( fldName.indexOf( "name", 0, Qt::CaseInsensitive ) > -1 )
       {
         if ( idxName.isEmpty() )
         {
           idxName = fldName;
         }
       }
-      if ( fldName.indexOf( "descrip", false ) > -1 )
+      if ( fldName.indexOf( "descrip", 0, Qt::CaseInsensitive ) > -1 )
       {
         if ( idxName.isEmpty() )
         {
           idxName = fldName;
         }
       }
-      if ( fldName.indexOf( "id", false ) > -1 )
+      if ( fldName.indexOf( "id", 0, Qt::CaseInsensitive ) > -1 )
       {
         if ( idxId.isEmpty() )
         {

Original file line number	Diff line number	Diff line change
`@@ -267,21 +267,21 @@ void QgsVectorLayer::setDisplayField( QString fldName )`
`267`	`267`	`// We assume that the user has organized the data with the`
`268`	`268`	`// more "interesting" field names first. As such, name should`
`269`	`269`	`// be selected before oldname, othername, etc.`
`270`		`- if ( fldName.indexOf( "name", false ) > -1 )`
	`270`	`+ if ( fldName.indexOf( "name", 0, Qt::CaseInsensitive ) > -1 )`
`271`	`271`	`{`
`272`	`272`	`if ( idxName.isEmpty() )`
`273`	`273`	`{`
`274`	`274`	`idxName = fldName;`
`275`	`275`	`}`
`276`	`276`	`}`
`277`		`- if ( fldName.indexOf( "descrip", false ) > -1 )`
	`277`	`+ if ( fldName.indexOf( "descrip", 0, Qt::CaseInsensitive ) > -1 )`
`278`	`278`	`{`
`279`	`279`	`if ( idxName.isEmpty() )`
`280`	`280`	`{`
`281`	`281`	`idxName = fldName;`
`282`	`282`	`}`
`283`	`283`	`}`
`284`		`- if ( fldName.indexOf( "id", false ) > -1 )`
	`284`	`+ if ( fldName.indexOf( "id", 0, Qt::CaseInsensitive ) > -1 )`
`285`	`285`	`{`
`286`	`286`	`if ( idxId.isEmpty() )`
`287`	`287`	`{`