src: switch to using forward declarations for NodeType and NodeTypeSet where possible

src/lib/data/NodeTypeSet.cpp

@@ -1,5 +1,6 @@
 #include "data/NodeTypeSet.h"
 
+#include "data/NodeType.h"
 #include "utility/utility.h"
 #include "utility/utilityMath.h"
 

src/lib/data/NodeTypeSet.h

@@ -1,12 +1,13 @@
 #ifndef NODE_TYPE_SET_H
 #define NODE_TYPE_SET_H
 
-#include <unordered_set>
-#include <unordered_set>
+#include <functional>
+#include <vector>
 
-#include "data/NodeType.h"
 #include "utility/types.h"
 
+class NodeType;
+
 class NodeTypeSet
 {
 public:
@@ -43,7 +44,6 @@ private:
 	static const std::vector<NodeType> s_allNodeTypes;
 
 	MaskType m_nodeTypeMask;
-	//std::set<NodeType> m_nodeTypes;
 };
 
 #endif // NODE_TYPE_SET_H

src/lib/data/access/StorageAccess.h

@@ -19,10 +19,10 @@
 #include "data/ErrorCountInfo.h"
 #include "data/ErrorFilter.h"
 #include "data/ErrorInfo.h"
-#include "data/NodeTypeSet.h"
 
 class FilePath;
 class Graph;
+class NodeTypeSet;
 class SourceLocationCollection;
 class SourceLocationFile;
 class TextAccess;

src/lib/data/access/StorageAccessProxy.cpp

@@ -3,6 +3,7 @@
 #include "data/graph/Graph.h"
 #include "data/location/SourceLocationCollection.h"
 #include "data/location/SourceLocationFile.h"
+#include "data/NodeTypeSet.h"
 
 #include "utility/file/FileInfo.h"
 #include "utility/file/FilePath.h"

src/lib/data/search/SearchMatch.cpp

@@ -2,6 +2,7 @@
 
 #include <sstream>
 
+#include "data/NodeTypeSet.h"
 #include "utility/logging/logging.h"
 
 void SearchMatch::log(const std::vector<SearchMatch>& matches, const std::string& query)

src/lib/data/search/SearchMatch.h

@@ -7,9 +7,10 @@
 #include <vector>
 
 #include "data/graph/Node.h"
-#include "data/NodeTypeSet.h"
 #include "utility/types.h"
 
+class NodeTypeSet;
+
 struct SearchMatch
 {
 	enum SearchType

src/lib/data/storage/PersistentStorage.cpp

@@ -3,17 +3,6 @@
 #include <sstream>
 #include <queue>
 
-#include "utility/Cache.h"
-#include "utility/file/FileInfo.h"
-#include "utility/file/FilePath.h"
-#include "utility/logging/logging.h"
-#include "utility/messaging/type/MessageNewErrors.h"
-#include "utility/messaging/type/MessageStatus.h"
-#include "utility/text/TextAccess.h"
-#include "utility/TimeStamp.h"
-#include "utility/tracing.h"
-#include "utility/utility.h"
-
 #include "data/graph/token_component/TokenComponentAccess.h"
 #include "data/graph/token_component/TokenComponentAggregation.h"
 #include "data/graph/token_component/TokenComponentFilePath.h"
@@ -23,7 +12,18 @@
 #include "data/location/SourceLocationFile.h"
 #include "data/parser/AccessKind.h"
 #include "data/parser/ParseLocation.h"
+#include "data/NodeTypeSet.h"
 #include "settings/ApplicationSettings.h"
+#include "utility/Cache.h"
+#include "utility/file/FileInfo.h"
+#include "utility/file/FilePath.h"
+#include "utility/logging/logging.h"
+#include "utility/messaging/type/MessageNewErrors.h"
+#include "utility/messaging/type/MessageStatus.h"
+#include "utility/text/TextAccess.h"
+#include "utility/TimeStamp.h"
+#include "utility/tracing.h"
+#include "utility/utility.h"
 
 PersistentStorage::PersistentStorage(const FilePath& dbPath, const FilePath& bookmarkPath)
 	: m_sqliteIndexStorage(dbPath)

src/lib/utility/messaging/type/MessageSearch.h

@@ -3,6 +3,7 @@
 
 #include "utility/messaging/Message.h"
 
+#include "data/NodeTypeSet.h"
 #include "data/search/SearchMatch.h"
 
 class MessageSearch

src/lib_gui/qt/element/QtSmartSearchBox.cpp

@@ -6,15 +6,15 @@
 #include <QClipboard>
 #include <QKeyEvent>
 
+#include "component/view/GraphViewStyle.h"
+#include "data/NodeTypeSet.h"
+#include "settings/ColorScheme.h"
 #include "utility/messaging/type/MessageSearch.h"
 #include "utility/messaging/type/MessageSearchFullText.h"
 #include "utility/messaging/type/MessageSearchAutocomplete.h"
 #include "utility/utility.h"
 #include "utility/utilityString.h"
 
-#include "component/view/GraphViewStyle.h"
-#include "settings/ColorScheme.h"
-
 QtSearchElement::QtSearchElement(const QString& text, QWidget* parent)
 	: QPushButton(text, parent)
 {
@@ -1058,13 +1058,13 @@ std::deque<SearchMatch> QtSmartSearchBox::getMatchesForInput(const std::string&
 
 NodeTypeSet QtSmartSearchBox::getMatchAcceptedNodeTypes() const
 {
-	NodeTypeSet types;
+	NodeTypeSet acceptedTypes;
 
 	for (const SearchMatch& match : m_matches)
 	{
 		if (match.isFilterCommand())
 		{
-			types.add(match.nodeType);
+			acceptedTypes.add(match.nodeType);
 		}
 		else
 		{
@@ -1072,12 +1072,12 @@ NodeTypeSet QtSmartSearchBox::getMatchAcceptedNodeTypes() const
 		}
 	}
 
-	if (types.isEmpty())
+	if (acceptedTypes.isEmpty())
 	{
-		types.invert();
+		acceptedTypes.invert();
 	}
 
-	return types;
+	return acceptedTypes;
 }
 
 bool QtSmartSearchBox::lastMatchIsNoFilter() const

src/lib_gui/qt/element/QtSmartSearchBox.h

@@ -8,9 +8,10 @@
 #include <QPushButton>
 
 #include "data/search/SearchMatch.h"
-#include "data/NodeTypeSet.h"
 #include "qt/element/QtAutocompletionList.h"
 
+class NodeTypeSet;
+
 class QtSearchElement
 	: public QPushButton
 {