Use local aware comparison for sorting in attribute table

mhugent · mhugent · commit 87a8e8d86c7e · 2009-01-07T08:04:00.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@9934 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsattributetable.cpp b/src/app/qgsattributetable.cpp
@@ -241,7 +241,8 @@ int QgsAttributeTable::compareItems( QString s1, QString s2, bool ascending, boo
 {
   if ( alphanumeric )
   {
-    if ( s1 > s2 )
+    int compareValue = QString::localeAwareCompare(s1, s2);
+    if ( compareValue > 0 )
     {
       if ( ascending )
       {
@@ -252,7 +253,7 @@ int QgsAttributeTable::compareItems( QString s1, QString s2, bool ascending, boo
         return -1;
       }
     }
-    else if ( s1 < s2 )
+    else if ( compareValue < 0 )
     {
       if ( ascending )
       {
@@ -263,7 +264,7 @@ int QgsAttributeTable::compareItems( QString s1, QString s2, bool ascending, boo
         return 1;
       }
     }
-    else if ( s1 == s2 )
+    else if ( compareValue = 0 )
     {
       return 0;
     }

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,8 @@ int QgsAttributeTable::compareItems( QString s1, QString s2, bool ascending, boo`
`241`	`241`	`{`
`242`	`242`	`if ( alphanumeric )`
`243`	`243`	`{`
`244`		`- if ( s1 > s2 )`
	`244`	`+ int compareValue = QString::localeAwareCompare(s1, s2);`
	`245`	`+ if ( compareValue > 0 )`
`245`	`246`	`{`
`246`	`247`	`if ( ascending )`
`247`	`248`	`{`
`@@ -252,7 +253,7 @@ int QgsAttributeTable::compareItems( QString s1, QString s2, bool ascending, boo`
`252`	`253`	`return -1;`
`253`	`254`	`}`
`254`	`255`	`}`
`255`		`- else if ( s1 < s2 )`
	`256`	`+ else if ( compareValue < 0 )`
`256`	`257`	`{`
`257`	`258`	`if ( ascending )`
`258`	`259`	`{`
`@@ -263,7 +264,7 @@ int QgsAttributeTable::compareItems( QString s1, QString s2, bool ascending, boo`
`263`	`264`	`return 1;`
`264`	`265`	`}`
`265`	`266`	`}`
`266`		`- else if ( s1 == s2 )`
	`267`	`+ else if ( compareValue = 0 )`
`267`	`268`	`{`
`268`	`269`	`return 0;`
`269`	`270`	`}`