Scan clut folder: use std::set<std::string> instead of std::set<Glib::ustring>
This commit is contained in:
parent
a2e2ace1c8
commit
1be40beafa
@ -8,6 +8,8 @@
|
|||||||
|
|
||||||
#include "../rtengine/clutstore.h"
|
#include "../rtengine/clutstore.h"
|
||||||
#include "../rtengine/procparams.h"
|
#include "../rtengine/procparams.h"
|
||||||
|
#define BENCHMARK
|
||||||
|
#include "../rtengine/StopWatch.h"
|
||||||
|
|
||||||
using namespace rtengine;
|
using namespace rtengine;
|
||||||
using namespace rtengine::procparams;
|
using namespace rtengine::procparams;
|
||||||
@ -305,6 +307,7 @@ ClutComboBox::ClutModel::ClutModel(const Glib::ustring &path)
|
|||||||
|
|
||||||
int ClutComboBox::ClutModel::parseDir(const Glib::ustring& path)
|
int ClutComboBox::ClutModel::parseDir(const Glib::ustring& path)
|
||||||
{
|
{
|
||||||
|
BENCHFUNMICRO
|
||||||
if (path.empty() || !Glib::file_test(path, Glib::FILE_TEST_IS_DIR)) {
|
if (path.empty() || !Glib::file_test(path, Glib::FILE_TEST_IS_DIR)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -364,7 +367,7 @@ int ClutComboBox::ClutModel::parseDir(const Glib::ustring& path)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Fill menu structure with CLUT files
|
// Fill menu structure with CLUT files
|
||||||
std::set<Glib::ustring> entries;
|
std::set<std::string> entries;
|
||||||
|
|
||||||
unsigned long fileCount = 0;
|
unsigned long fileCount = 0;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user