diff --git a/GUI/Support/Util/ItemFileNameUtil.cpp b/GUI/Support/Util/ItemFileNameUtil.cpp index 5028180a5e67b520cc0401e704f1111cfdad7e24..319e9ce24f223f8842e5da6ae64e1f7cc85eb8dc 100644 --- a/GUI/Support/Util/ItemFileNameUtil.cpp +++ b/GUI/Support/Util/ItemFileNameUtil.cpp @@ -63,17 +63,3 @@ QString GUI::Model::FilenameUtil::nativeDataFileName(const QString& dataName) { return intensityDataFileName(dataName, nativedata_file_prefix); } - - -//! Returns list of fileName filters related to nonXML data stored by JobModel and RealModel. - -QStringList GUI::Model::FilenameUtil::nonXMLFileNameFilters() -{ - QStringList result = QStringList() << QString(jobdata_file_prefix + "_*.int.gz") - << QString(refdata_file_prefix + "_*.int.gz") - << QString(realdata_file_prefix + "_*.int.gz") - << QString(nativedata_file_prefix + "_*.int.gz") - << QString(instrument_file_prefix + "_*.int.gz"); - - return result; -} diff --git a/GUI/Support/Util/ItemFileNameUtil.h b/GUI/Support/Util/ItemFileNameUtil.h index fd0c8cec930c9f3ec37301770b7babb212e70d56..d51f5b3f42783e634ba676709cd2aa7983dbe91b 100644 --- a/GUI/Support/Util/ItemFileNameUtil.h +++ b/GUI/Support/Util/ItemFileNameUtil.h @@ -31,8 +31,6 @@ QString realDataFileName(const QString& dataName); QString nativeDataFileName(const QString& dataName); -QStringList nonXMLFileNameFilters(); - } // namespace GUI::Model::FilenameUtil #endif // BORNAGAIN_GUI_SUPPORT_UTIL_ITEMFILENAMEUTIL_H diff --git a/Tests/Unit/GUI/TestProjectUtils.cpp b/Tests/Unit/GUI/TestProjectUtils.cpp index fc597fa487cfc5ea668c74afe08cfd2e506bded8..235a69a26b00fbd132028487cc2f98e1681df5ee 100644 --- a/Tests/Unit/GUI/TestProjectUtils.cpp +++ b/Tests/Unit/GUI/TestProjectUtils.cpp @@ -16,7 +16,7 @@ QStringList nonXMLDataInDir(const QString& dirname) if (!dir.exists()) throw std::runtime_error("Error. Non existing directory '" + dirname.toLatin1() + "'."); - return dir.entryList(GUI::Model::FilenameUtil::nonXMLFileNameFilters()); + return dir.entryList({"*.int", "*.int.gz"}); } } // namespace diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp index 25272f8702e036573e6f16fa0f1205fdc1043000..faada70e65c3c2da00d4d0e6efc3b4a40dbe6e1c 100644 --- a/Tests/Unit/GUI/Utils.cpp +++ b/Tests/Unit/GUI/Utils.cpp @@ -35,7 +35,7 @@ void UTest::GUI::create_dir(const QString& dir_name) QDir(dir_name).removeRecursively(); if (!QDir(".").mkdir(dir_name)) - throw std::runtime_error("UTest::GUI::create_dir -> Error. Cannot create '" + throw std::runtime_error("Cannot create '" + dir_name.toLatin1() + "' in parent directory '.'."); }