comparison transform/TransformDescription.h @ 1546:9c14dee72329

Use locale-aware comparators for user-visible string sorting

     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.  See the file
     COPYING included with this distribution for more information.
 */
 
-#ifndef _TRANSFORM_DESCRIPTION_H_
-#define _TRANSFORM_DESCRIPTION_H_
+#ifndef SV_TRANSFORM_DESCRIPTION_H
+#define SV_TRANSFORM_DESCRIPTION_H
 
 #include "Transform.h"
 
 #include <QString>
 

     QString longDescription; // description "using" plugin name "by" maker
     QString maker;
     QString infoUrl;
     QString units;
     bool configurable;
+
+    // User-visible strings (name, maker etc) should be sorted in a
+    // locale-aware way
+    static bool compareUserStrings(QString s1, QString s2) {
+        return QString::localeAwareCompare(s1, s2) < 0;
+    };
     
     bool operator<(const TransformDescription &od) const {
-        return
-            (name <  od.name) ||
-            (name == od.name && identifier < od.identifier);
+        if (name == od.name) {
+            return identifier < od.identifier;
+        } else {
+            return compareUserStrings(name, od.name);
+        }
     };
 };
 
 typedef std::vector<TransformDescription> TransformList;