From 9b6e5c9097b2bcf384a1ec8a449fa7e867e3e99d Mon Sep 17 00:00:00 2001
From: Scott Klum <scott.klum@gmail.com>
Date: Tue, 4 Oct 2016 11:13:00 -0600
Subject: [PATCH] Removed natural sort, made FilesWithLabel a br typedef

---
 openbr/core/utility.cpp          | 10 +++++-----
 openbr/core/utility.h            |  2 ++
 openbr/plugins/gallery/empty.cpp |  4 +---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/openbr/core/utility.cpp b/openbr/core/utility.cpp
index 8d96b20..9c6db3a 100644
--- a/openbr/core/utility.cpp
+++ b/openbr/core/utility.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));
diff --git a/openbr/core/utility.h b/openbr/core/utility.h
index ac9642c..3f69bf3 100644
--- a/openbr/core/utility.h
+++ b/openbr/core/utility.h
@@ -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);
diff --git a/openbr/plugins/gallery/empty.cpp b/openbr/plugins/gallery/empty.cpp
index 8d96107..b488d3d 100644
--- a/openbr/plugins/gallery/empty.cpp
+++ b/openbr/plugins/gallery/empty.cpp
@@ -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));
--
libgit2 0.21.4