Removed natural sort, made FilesWithLabel a br typedef

Scott Klum
1 parent baa5927d
Showing 3 changed files with 8 additions and 8 deletions
openbr/core/utility.cpp
openbr/core/utility.h
openbr/plugins/gallery/empty.cpp
@@ -19,18 +19,18 @@ QStringList br::getFiles(QDir dir, bool recursive)
     return files;
 }
-QList<QPair<QString,QStringList> > br::getFilesWithLabels(QDir dir)
+QList<br::FilesWithLabel> br::getFilesWithLabels(QDir dir)
 {
     dir = QDir(dir.canonicalPath());
     QStringList files;
-    foreach (const QString &file, QtUtils::naturalSort(dir.entryList(QDir::Files)))
+    foreach (const QString &file, dir.entryList(QDir::Files))
         files.append(dir.absoluteFilePath(file));
-    QList<QPair<QString,QStringList> > filesWithLabels;
-    filesWithLabels.append(QPair<QString,QStringList>(dir.dirName(),files));
+    QList<br::FilesWithLabel> filesWithLabels;
+    filesWithLabels.append(br::FilesWithLabel(dir.dirName(),files));
-    foreach (const QString &folder, QtUtils::naturalSort(dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))) {
+    foreach (const QString &folder, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
         QDir subdir(dir);
         bool success = subdir.cd(folder); if (!success) qFatal("cd failure.");
         filesWithLabels.append(getFilesWithLabels(subdir));
@@ -10,6 +10,8 @@
 namespace br
 {
+typedef QPair<QString,QStringList> FilesWithLabel;
+
 BR_EXPORT QStringList getFiles(QDir dir, bool recursive);
 BR_EXPORT QList<QPair<QString,QStringList> > getFilesWithLabels(QDir dir);
 BR_EXPORT QStringList getFiles(const QString &regexp);
@@ -20,8 +20,6 @@
 #include <openbr/core/qtutils.h>
 #include <openbr/core/utility.h>
-typedef QPair<QString,QStringList> FilesWithLabel;
-
 namespace br
 {
@@ -116,7 +114,7 @@ class EmptyGallery : public Gallery
     static TemplateList getTemplates(const QDir &dir)
     {
         const QList<FilesWithLabel> filesWithLabels = getFilesWithLabels(dir);
-        TemplateList templates; templates.reserve(filesWithLabels.size());
+        TemplateList templates;
         foreach (const FilesWithLabel &filesWithLabel, filesWithLabels)
             foreach (const QString &file, filesWithLabel.second)
                 templates.append(File(file, filesWithLabel.first));