src: converted NodeType to a class

NodeType internally still uses the Type enum

src/lib_gui/qt/view/QtGraphView.cpp

@@ -661,27 +661,27 @@ MessageActivateTrail QtGraphView::getMessageActivateTrail(bool forward)
 	QtGraphNodeData* node = nullptr;
 	if (m_oldActiveNode && (node = dynamic_cast<QtGraphNodeData*>(m_oldActiveNode)))
 	{
-		Edge::EdgeTypeMask trailType;
+		Edge::TypeMask trailType;
 		bool horizontalLayout = true;
 
-		switch (node->getData()->getType())
+		switch (node->getData()->getType().getType())
 		{
-			case Node::NODE_NON_INDEXED:
-			case Node::NODE_CLASS:
-			case Node::NODE_STRUCT:
-			case Node::NODE_INTERFACE:
+			case NodeType::NODE_NON_INDEXED:
+			case NodeType::NODE_CLASS:
+			case NodeType::NODE_STRUCT:
+			case NodeType::NODE_INTERFACE:
 				trailType = Edge::EDGE_INHERITANCE;
 				horizontalLayout = false;
 				break;
 
-			case Node::NODE_FUNCTION:
-			case Node::NODE_METHOD:
+			case NodeType::NODE_FUNCTION:
+			case NodeType::NODE_METHOD:
 				trailType = Edge::EDGE_CALL | Edge::EDGE_OVERRIDE |
 					Edge::EDGE_TEMPLATE_SPECIALIZATION | Edge::EDGE_TEMPLATE_MEMBER_SPECIALIZATION;
 				horizontalLayout = true;
 				break;
 
-			case Node::NODE_FILE:
+			case NodeType::NODE_FILE:
 				trailType = Edge::EDGE_INCLUDE;
 				horizontalLayout = true;
 				break;

src/lib_gui/qt/view/QtGraphViewStyleImpl.cpp

@@ -9,12 +9,12 @@ QtGraphViewStyleImpl::~QtGraphViewStyleImpl()
 {
 }
 
-float QtGraphViewStyleImpl::getCharWidthForNodeType(Node::NodeType type)
+float QtGraphViewStyleImpl::getCharWidthForNodeType(NodeType type)
 {
 	return QFontMetrics(QtGraphNode::getFontForNodeType(type)).width("QtGraphNode::QtGraphNode::QtGraphNode") / 37.0f;
 }
 
-float QtGraphViewStyleImpl::getCharHeightForNodeType(Node::NodeType type)
+float QtGraphViewStyleImpl::getCharHeightForNodeType(NodeType type)
 {
 	return QFontMetrics(QtGraphNode::getFontForNodeType(type)).height();
 }

src/lib_gui/qt/view/QtGraphViewStyleImpl.h

@@ -8,8 +8,8 @@ class QtGraphViewStyleImpl
 {
 public:
 	virtual ~QtGraphViewStyleImpl();
-	virtual float getCharWidthForNodeType(Node::NodeType type);
-	virtual float getCharHeightForNodeType(Node::NodeType type);
+	virtual float getCharWidthForNodeType(NodeType type);
+	virtual float getCharHeightForNodeType(NodeType type);
 	virtual float getGraphViewZoomDifferenceForPlatform();
 };
 

src/lib_gui/qt/view/graphElements/QtGraphNode.cpp

@@ -34,9 +34,9 @@ void QtGraphNode::hideNode()
 	this->hide();
 }
 
-QFont QtGraphNode::getFontForNodeType(Node::NodeType type)
+QFont QtGraphNode::getFontForNodeType(NodeType type)
 {
-	QFont font(GraphViewStyle::getFontNameForNodeType(type).c_str());
+	QFont font(GraphViewStyle::getFontNameForDataNode().c_str());
 	font.setPixelSize(GraphViewStyle::getFontSizeForNodeType(type));
 	return font;
 }

src/lib_gui/qt/view/graphElements/QtGraphNode.h

@@ -31,7 +31,7 @@ public slots:
 	void hideNode();
 
 public:
-	static QFont getFontForNodeType(Node::NodeType type);
+	static QFont getFontForNodeType(NodeType type);
 
 	QtGraphNode();
 	virtual ~QtGraphNode();

src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.cpp

@@ -9,7 +9,7 @@
 #include "component/view/GraphViewStyle.h"
 #include "qt/graphics/QtCountCircleItem.h"
 
-QtGraphNodeBundle::QtGraphNodeBundle(Id tokenId, size_t nodeCount, Node::NodeType type, std::string name)
+QtGraphNodeBundle::QtGraphNodeBundle(Id tokenId, size_t nodeCount, NodeType type, std::string name)
 	: QtGraphNode()
 	, m_tokenId(tokenId)
 	, m_type(type)
@@ -42,8 +42,8 @@ void QtGraphNodeBundle::onClick()
 {
 	MessageGraphNodeBundleSplit(
 		m_tokenId,
-		m_type != Node::NODE_NON_INDEXED && getName() != "Anonymous Namespaces",
-		m_type != Node::NODE_NON_INDEXED
+		m_type.getType() != NodeType::NODE_NON_INDEXED && getName() != "Anonymous Namespaces",
+		m_type.getType() != NodeType::NODE_NON_INDEXED
 	).dispatch();
 }
 
@@ -57,7 +57,7 @@ void QtGraphNodeBundle::moved(const Vec2i& oldPosition)
 void QtGraphNodeBundle::updateStyle()
 {
 	GraphViewStyle::NodeStyle style;
-	if (m_type != Node::NODE_NON_INDEXED)
+	if (m_type.getType() != NodeType::NODE_NON_INDEXED)
 	{
 		style = GraphViewStyle::getStyleForNodeType(m_type, true, false, m_isHovering, false, false);
 	}

src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.h

@@ -11,7 +11,7 @@ class QtGraphNodeBundle
 {
 	Q_OBJECT
 public:
-	QtGraphNodeBundle(Id tokenId, size_t nodeCount, Node::NodeType type, std::string name);
+	QtGraphNodeBundle(Id tokenId, size_t nodeCount, NodeType type, std::string name);
 	virtual ~QtGraphNodeBundle();
 
 	// QtGraphNode implementation
@@ -29,7 +29,7 @@ protected:
 private:
 	QtCountCircleItem* m_circle;
 	Id m_tokenId;
-	Node::NodeType m_type;
+	NodeType m_type;
 };
 
 #endif // QT_GRAPH_NODE_BUNDLE_H

src/lib_gui/qt/view/graphElements/QtGraphNodeData.cpp

@@ -30,7 +30,7 @@ const Node* QtGraphNodeData::getData() const
 
 FilePath QtGraphNodeData::getFilePath() const
 {
-	if (m_data->isType(Node::NODE_FILE))
+	if (m_data->getType().isFile())
 	{
 		return m_data->getComponent<TokenComponentFilePath>()->getFilePath();
 	}

src/lib_gui/qt/view/graphElements/QtGraphNodeQualifier.cpp

@@ -21,7 +21,7 @@ QtGraphNodeQualifier::QtGraphNodeQualifier(const NameHierarchy& name)
 	m_rightArrowSmall = new QGraphicsPolygonItem(this);
 
 	QFont font;
-	font.setFamily(GraphViewStyle::getFontNameForNodeType(Node::NODE_NON_INDEXED).c_str());
+	font.setFamily(GraphViewStyle::getFontNameForDataNode().c_str());
 	font.setPixelSize(GraphViewStyle::getFontSizeOfQualifier());
 	font.setWeight(QFont::Normal);