diff --git a/src/lib/data/name/NameHierarchy.cpp b/src/lib/data/name/NameHierarchy.cpp index 118b19d0..65a73464 100644 --- a/src/lib/data/name/NameHierarchy.cpp +++ b/src/lib/data/name/NameHierarchy.cpp @@ -37,6 +37,11 @@ NameHierarchy NameHierarchy::deserialize(const std::string& serializedName) return nameHierarchy; } +const std::string& NameHierarchy::getDelimiter() +{ + return s_delimiter; +} + void NameHierarchy::setDelimiter(const std::string& delimiter) { s_delimiter = delimiter; diff --git a/src/lib/data/name/NameHierarchy.h b/src/lib/data/name/NameHierarchy.h index 11d41ad4..2ec5d5a2 100644 --- a/src/lib/data/name/NameHierarchy.h +++ b/src/lib/data/name/NameHierarchy.h @@ -12,6 +12,8 @@ class NameHierarchy public: static std::string serialize(NameHierarchy nameHierarchy); static NameHierarchy deserialize(const std::string& serializedName); + + static const std::string& getDelimiter(); static void setDelimiter(const std::string& delimiter); NameHierarchy(); diff --git a/src/lib_gui/qt/element/QtSmartSearchBox.cpp b/src/lib_gui/qt/element/QtSmartSearchBox.cpp index 696df644..6e48ad1f 100644 --- a/src/lib_gui/qt/element/QtSmartSearchBox.cpp +++ b/src/lib_gui/qt/element/QtSmartSearchBox.cpp @@ -17,8 +17,6 @@ #include "component/view/GraphViewStyle.h" #include "settings/ColorScheme.h" -std::string QtSmartSearchBox::s_delimiter = "::"; - QtSearchElement::QtSearchElement(const QString& text, QWidget* parent) : QPushButton(text, parent) { @@ -148,7 +146,7 @@ bool QtSmartSearchBox::event(QEvent *event) { if (m_highlightedMatch.hasChildren) { - setEditText((m_highlightedMatch.text + s_delimiter).c_str()); + setEditText((m_highlightedMatch.text + NameHierarchy::getDelimiter()).c_str()); } else { @@ -219,7 +217,7 @@ void QtSmartSearchBox::keyPressEvent(QKeyEvent* event) } else { - std::vector names = utility::splitToVector(text().toStdString(), s_delimiter); + std::vector names = utility::splitToVector(text().toStdString(), NameHierarchy::getDelimiter()); if (names.back() == "") { names.pop_back(); @@ -232,7 +230,7 @@ void QtSmartSearchBox::keyPressEvent(QKeyEvent* event) else { names.back() = ""; - setEditText(utility::join(names, s_delimiter).c_str()); + setEditText(utility::join(names, NameHierarchy::getDelimiter()).c_str()); } requestAutoCompletions(); diff --git a/src/lib_gui/qt/element/QtSmartSearchBox.h b/src/lib_gui/qt/element/QtSmartSearchBox.h index f971d6c0..c3361f20 100644 --- a/src/lib_gui/qt/element/QtSmartSearchBox.h +++ b/src/lib_gui/qt/element/QtSmartSearchBox.h @@ -66,8 +66,6 @@ private slots: void onElementSelected(QtSearchElement* element); private: - static std::string s_delimiter; - void moveCursor(int offset); void moveCursorTo(int goal);