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 > br::getFilesWithLabels(QDir dir) +QList 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 > filesWithLabels; - filesWithLabels.append(QPair(dir.dirName(),files)); + QList 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 FilesWithLabel; + BR_EXPORT QStringList getFiles(QDir dir, bool recursive); BR_EXPORT QList > getFilesWithLabels(QDir dir); BR_EXPORT QStringList getFiles(const QString ®exp); 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 #include -typedef QPair FilesWithLabel; - namespace br { @@ -116,7 +114,7 @@ class EmptyGallery : public Gallery static TemplateList getTemplates(const QDir &dir) { const QList 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));