Prep work for ticket #25 (case sensitivity for attribute table search)

g_j_m · g_j_m · commit 8f65621b91c8 · 2007-02-28T09:46:25.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6728 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgssearchtreenode.cpp b/src/core/qgssearchtreenode.cpp
@@ -395,7 +395,7 @@ QgsSearchTreeValue QgsSearchTreeNode::valueAgainst(const QgsAttributeMap& attrib
 }
 
 
-int QgsSearchTreeValue::compare(QgsSearchTreeValue& value1, QgsSearchTreeValue& value2)
+int QgsSearchTreeValue::compare(QgsSearchTreeValue& value1, QgsSearchTreeValue& value2, Qt::CaseSensitivity cs)
 {
   if (value1.isNumeric() || value2.isNumeric())
   {
@@ -424,6 +424,6 @@ int QgsSearchTreeValue::compare(QgsSearchTreeValue& value1, QgsSearchTreeValue&
   else
   {
     // string comparison
-    return value1.string().compare(value2.string());
+    return value1.string().compare(value2.string(), cs);
   }
 }
diff --git a/src/core/qgssearchtreenode.h b/src/core/qgssearchtreenode.h
@@ -166,7 +166,8 @@ class QgsSearchTreeValue
   QgsSearchTreeValue(double number) { mType = valNumber; mNumber = number; }
   QgsSearchTreeValue(int error, QString errorMsg) { mType = valError; mNumber = error; mString = errorMsg; }
 
-  static int compare(QgsSearchTreeValue& value1, QgsSearchTreeValue& value2);
+  static int compare(QgsSearchTreeValue& value1, QgsSearchTreeValue& value2,
+                     Qt::CaseSensitivity = Qt::CaseSensitive);
 
   bool isNumeric() { return mType == valNumber; }
   bool isError() { return mType == valError; }

Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ QgsSearchTreeValue QgsSearchTreeNode::valueAgainst(const QgsAttributeMap& attrib`
`395`	`395`	`}`
`396`	`396`
`397`	`397`
`398`		`-int QgsSearchTreeValue::compare(QgsSearchTreeValue& value1, QgsSearchTreeValue& value2)`
	`398`	`+int QgsSearchTreeValue::compare(QgsSearchTreeValue& value1, QgsSearchTreeValue& value2, Qt::CaseSensitivity cs)`
`399`	`399`	`{`
`400`	`400`	`if (value1.isNumeric() \|\| value2.isNumeric())`
`401`	`401`	`{`
`@@ -424,6 +424,6 @@ int QgsSearchTreeValue::compare(QgsSearchTreeValue& value1, QgsSearchTreeValue&`
`424`	`424`	`else`
`425`	`425`	`{`
`426`	`426`	`// string comparison`
`427`		`- return value1.string().compare(value2.string());`
	`427`	`+ return value1.string().compare(value2.string(), cs);`
`428`	`428`	`}`
`429`	`429`	`}`