diff --git a/GUI/Model/Util/String.cpp b/GUI/Model/Util/String.cpp index ce2a93580133bf625ef3fefa4225efbcff7bc29b..a831570522b910d3a46d58504f5c0dcfcd37fad4 100644 --- a/GUI/Model/Util/String.cpp +++ b/GUI/Model/Util/String.cpp @@ -24,34 +24,3 @@ QStringList GUI::Util::String::fromStdStrings(const std::vector<std::string>& co result.append(QString::fromStdString(str)); return result; } - -QString GUI::Util::String::suggestName(const QStringList& existingNames, const QString& name) -{ - int newNumber = -1; - QRegularExpression regexp(R"(\((\d+)\))"); - - QString baseName = name; - { - QRegularExpressionMatch matched{regexp.match(baseName)}; - if (matched.hasMatch()) { - newNumber = matched.captured(1).toInt(); - baseName.replace(matched.captured(0), ""); - baseName = baseName.trimmed(); - } - } - - for (const auto& n : existingNames) { - if (n == baseName) - newNumber = std::max(newNumber, 2); - else { - QRegularExpressionMatch matched{regexp.match(n)}; - if (matched.hasMatch()) - newNumber = std::max(newNumber, matched.captured(1).toInt() + 1); - } - } - - if (newNumber == -1) - return baseName; - - return QString("%1 (%2)").arg(baseName).arg(newNumber); -} diff --git a/GUI/Model/Util/String.h b/GUI/Model/Util/String.h index 68404e3c08592def39865a16ef0e32ccce80a44c..4a7e7044ad146db1152c3fd64f354781825c9d23 100644 --- a/GUI/Model/Util/String.h +++ b/GUI/Model/Util/String.h @@ -20,15 +20,8 @@ namespace GUI::Util::String { -//! Returns a name suggestion based on the given name. -//! -//! Tries to add a reasonable numbering in brackets if necessary (e.g. "GISAS" -> "GISAS (2)") -QString suggestName(const QStringList& existingNames, const QString& name); - QStringList fromStdStrings(const std::vector<std::string>& container); -QString readTextFile(const QString& fname); - } // namespace GUI::Util::String #endif // BORNAGAIN_GUI_MODEL_UTIL_STRING_H diff --git a/Tests/Unit/GUI/TestString.cpp b/Tests/Unit/GUI/TestString.cpp deleted file mode 100644 index da0323bc9eb11049a79cfc040cc1c371ca8f5167..0000000000000000000000000000000000000000 --- a/Tests/Unit/GUI/TestString.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "GUI/Model/Util/String.h" - -#include "Tests/GTestWrapper/google_test.h" -#include <QStringList> -#include <QVector> - -TEST(StringUtil, suggestName) -{ - EXPECT_EQ(GUI::Util::String::suggestName({"A", "B", "C"}, "A"), "A (2)"); - EXPECT_EQ(GUI::Util::String::suggestName({"A", "B", "C"}, "D"), "D"); - EXPECT_EQ(GUI::Util::String::suggestName({"A (1)", "A (19)"}, "A"), "A (20)"); - EXPECT_EQ(GUI::Util::String::suggestName({"A (x)"}, "A"), "A"); - - EXPECT_EQ(GUI::Util::String::suggestName({"A", "A (2)"}, "A (2)"), "A (3)"); - EXPECT_EQ(GUI::Util::String::suggestName({"A", "A (X)"}, "A (X)"), "A (X) (2)"); - EXPECT_EQ(GUI::Util::String::suggestName({"A", "A (3)"}, "A (2)"), "A (4)"); - EXPECT_EQ(GUI::Util::String::suggestName({"A"}, "A (2)"), "A (2)"); - EXPECT_EQ(GUI::Util::String::suggestName({"A"}, "A (7)"), "A (7)"); - - EXPECT_EQ(GUI::Util::String::suggestName({"A (0)"}, "A"), "A (1)"); - EXPECT_EQ(GUI::Util::String::suggestName({"A, A (0)"}, "A"), "A (1)"); -}