QDialogButtonBox for the remaining dialogs.

[lyx.git] / src / frontends / qt4 / qt_helpers.cpp

diff --git a/src/frontends/qt4/qt_helpers.cpp b/src/frontends/qt4/qt_helpers.cpp
index 63125d8c5c277ace085b4f9052e6aabe06a8d5a7..bc15bc7d01fa29b316f9e00fc2337625225a1881 100644 (file)
--- a/src/frontends/qt4/qt_helpers.cpp
+++ b/src/frontends/qt4/qt_helpers.cpp
@@ -214,6 +214,12 @@ QString formatLocFPNumber(double d)
 }
 
 
+bool SortLocaleAware(QString const & lhs, QString const & rhs)
+{
+       return QString::localeAwareCompare(lhs, rhs) < 0;
+}
+
+
 bool ColorSorter(ColorCode lhs, ColorCode rhs)
 {
        return compare_no_case(lcolor.getGUIName(lhs), lcolor.getGUIName(rhs)) < 0;
@@ -321,12 +327,12 @@ QStringList texFileList(QString const & filename)
        // Normalise paths like /foo//bar ==> /foo/bar
        QSet<QString> set;
        for (size_t i = 0; i != doclist.size(); ++i) {
-               QString file = toqstr(doclist[i]);
-               file.replace("\r", "");
-               while (file.contains("//"))
-                       file.replace("//", "/");
-               if (!file.isEmpty())
-                       set.insert(file);
+               QString qfile = toqstr(doclist[i]);
+               qfile.replace("\r", "");
+               while (qfile.contains("//"))
+                       qfile.replace("//", "/");
+               if (!qfile.isEmpty())
+                       set.insert(qfile);
        }
 
        // remove duplicates