logic: handling of multiple files with the same name

* implemented storing symbols and files in completely different tables
2017-01-17 11:27:20 +01:00
parent ecbc703261
commit e7d2ddbd2d
14 changed files with 574 additions and 429 deletions
@@ -22,7 +22,26 @@ public:

 	std::string getMatchesAsString() const
 	{
-		return SearchMatch::searchMatchesToString(m_matches);
+		std::stringstream ss;
+
+		for (size_t i = 0; i < m_matches.size(); i++)
+		{
+			ss << '@';
+			if (m_matches[i].nodeType == Node::NODE_FILE)
+			{
+				ss << m_matches[i].subtext;
+			}
+			else
+			{
+				if (!m_matches[i].subtext.empty())
+				{
+					ss << m_matches[i].subtext << NameHierarchy::getDelimiter();
+				}
+				ss << m_matches[i].name;
+			}
+		}
+
+		return ss.str();
 	}

 	const std::vector<SearchMatch>& getMatches() const