[QGIS Commit] r14932 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-12-16 14:19:38 -0800 (Thu, 16 Dec 2010)
New Revision: 14932

Modified:
   trunk/qgis/src/core/qgssearchtreenode.cpp
   trunk/qgis/src/core/qgsvectordataprovider.cpp
   trunk/qgis/src/core/qgsvectorlayer.cpp
Log:
Use case insensitive comparison for column names. Fixes #3298


Modified: trunk/qgis/src/core/qgssearchtreenode.cpp
===================================================================
--- trunk/qgis/src/core/qgssearchtreenode.cpp	2010-12-16 21:06:35 UTC (rev 14931)
+++ trunk/qgis/src/core/qgssearchtreenode.cpp	2010-12-16 22:19:38 UTC (rev 14932)
@@ -602,7 +602,7 @@
       QgsFieldMap::const_iterator it;
       for ( it = fields.begin(); it != fields.end(); it++ )
       {
-        if ( it->name().toLower() == mText.toLower() ) // TODO: optimize
+        if ( QString::compare( it->name(), mText, Qt::CaseInsensitive ) == 0 )
           break;
       }
 

Modified: trunk/qgis/src/core/qgsvectordataprovider.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectordataprovider.cpp	2010-12-16 21:06:35 UTC (rev 14931)
+++ trunk/qgis/src/core/qgsvectordataprovider.cpp	2010-12-16 22:19:38 UTC (rev 14932)
@@ -221,7 +221,7 @@
 
   for ( QgsFieldMap::const_iterator it = theFields.constBegin(); it != theFields.constEnd(); ++it )
   {
-    if ( it->name() == fieldName )
+    if ( QString::compare( it->name(), fieldName, Qt::CaseInsensitive ) == 0 )
     {
       return it.key();
     }

Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2010-12-16 21:06:35 UTC (rev 14931)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2010-12-16 22:19:38 UTC (rev 14932)
@@ -4720,7 +4720,7 @@
 
   for ( QgsFieldMap::const_iterator it = theFields.constBegin(); it != theFields.constEnd(); ++it )
   {
-    if ( it->name() == fieldName )
+    if ( QString::compare( it->name(), fieldName, Qt::CaseInsensitive ) == 0 )
     {
       return it.key();
     }