src: extract NoteType::Type to NodeKind (#925)

src/lib_gui/qt/element/search/QtAutocompletionList.cpp

@@ -63,7 +63,7 @@ QVariant QtAutocompletionModel::data(const QModelIndex& index, int role) const
 		return indices;
 	}
 	case 5:
-		return match.nodeType.getType();
+		return match.nodeType.getKind();
 	default:
 		return QVariant();
 	}
@@ -137,8 +137,7 @@ void QtAutocompletionDelegate::paint(
 	QString subtext = index.sibling(index.row(), index.column() + 2).data().toString();
 	QString type = index.sibling(index.row(), index.column() + 3).data().toString();
 	QList<QVariant> indices = index.sibling(index.row(), index.column() + 4).data().toList();
-	NodeType nodeType = NodeType::intToType(
-		index.sibling(index.row(), index.column() + 5).data().toInt());
+	NodeType nodeType(intToNodeKind(index.sibling(index.row(), index.column() + 5).data().toInt()));
 
 	// define highlight colors
 	ColorScheme* scheme = ColorScheme::getInstance().get();

src/lib_gui/qt/graphics/graph/QtGraphNodeData.cpp

@@ -88,7 +88,7 @@ void QtGraphNodeData::hoverEnterEvent(QGraphicsSceneHoverEvent* event)
 	if (!m_isInteractive)
 	{
 		TooltipInfo info;
-		info.title = NodeType::getReadableTypeWString(m_data->getType().getType());
+		info.title = getReadableNodeKindWString(m_data->getType().getKind());
 		info.offset = Vec2i(10, 20);
 
 		if (!m_data->isDefined())

src/lib_gui/qt/view/QtCustomTrailView.cpp

@@ -190,33 +190,33 @@ QtCustomTrailView::QtCustomTrailView(ViewLayout* viewLayout)
 		std::vector<QString> nodeFilters;
 		std::vector<QColor> nodeColors;
 
-		std::vector<NodeType::Type> nodeTypes = {// NodeType::NODE_SYMBOL,
-												 NodeType::NODE_TYPE,
-												 NodeType::NODE_BUILTIN_TYPE,
-												 // NodeType::NODE_MODULE,
-												 // NodeType::NODE_NAMESPACE,
-												 // NodeType::NODE_PACKAGE,
-												 NodeType::NODE_CLASS,
-												 NodeType::NODE_STRUCT,
-												 NodeType::NODE_UNION,
-												 NodeType::NODE_INTERFACE,
-												 NodeType::NODE_TYPEDEF,
-												 NodeType::NODE_TYPE_PARAMETER,
-												 NodeType::NODE_ENUM,
-												 NodeType::NODE_ENUM_CONSTANT,
-												 NodeType::NODE_GLOBAL_VARIABLE,
-												 NodeType::NODE_FIELD,
-												 NodeType::NODE_FUNCTION,
-												 NodeType::NODE_METHOD,
-												 NodeType::NODE_FILE,
-												 NodeType::NODE_MACRO,
-												 NodeType::NODE_ANNOTATION};
+		const std::vector<NodeKind> nodeKinds = {// NODE_SYMBOL,
+												 NODE_TYPE,
+												 NODE_BUILTIN_TYPE,
+												 // NODE_MODULE,
+												 // NODE_NAMESPACE,
+												 // NODE_PACKAGE,
+												 NODE_CLASS,
+												 NODE_STRUCT,
+												 NODE_UNION,
+												 NODE_INTERFACE,
+												 NODE_TYPEDEF,
+												 NODE_TYPE_PARAMETER,
+												 NODE_ENUM,
+												 NODE_ENUM_CONSTANT,
+												 NODE_GLOBAL_VARIABLE,
+												 NODE_FIELD,
+												 NODE_FUNCTION,
+												 NODE_METHOD,
+												 NODE_FILE,
+												 NODE_MACRO,
+												 NODE_ANNOTATION};
 
-		for (NodeType::Type t: nodeTypes)
+		for (NodeKind t: nodeKinds)
 		{
-			nodeFilters.push_back(QString::fromStdString(NodeType::getReadableTypeString(t)));
+			nodeFilters.push_back(QString::fromStdString(getReadableNodeKindString(t)));
 			nodeColors.push_back(
-				QColor(scheme->getNodeTypeColor(t, "fill", ColorScheme::FOCUS).c_str()));
+				QColor(scheme->getNodeTypeColor(NodeType(t), "fill", ColorScheme::FOCUS).c_str()));
 		}
 
 		QVBoxLayout* filterLayout = addFilters(
@@ -316,7 +316,7 @@ QtCustomTrailView::QtCustomTrailView(ViewLayout* viewLayout)
 				}
 			}
 
-			NodeType::TypeMask nodeTypes = getCheckedNodeTypes();
+			NodeKindMask nodeTypes = getCheckedNodeTypes();
 			Edge::TypeMask edgeTypes = getCheckedEdgeTypes();
 
 			if (!nodeTypes)
@@ -368,7 +368,7 @@ void QtCustomTrailView::clearView()
 	});
 }
 
-void QtCustomTrailView::setAvailableNodeAndEdgeTypes(NodeType::TypeMask nodeTypes, Edge::TypeMask edgeTypes)
+void QtCustomTrailView::setAvailableNodeAndEdgeTypes(NodeKindMask nodeTypes, Edge::TypeMask edgeTypes)
 {
 	m_onQtThread([this, nodeTypes, edgeTypes]() {
 		for (QCheckBox* filter: m_nodeFilters)
@@ -379,7 +379,7 @@ void QtCustomTrailView::setAvailableNodeAndEdgeTypes(NodeType::TypeMask nodeType
 			}
 
 			bool enabled = nodeTypes &
-				NodeType::getTypeForReadableTypeString(filter->text().toStdWString());
+				getNodeKindForReadableNodeKindString(filter->text().toStdWString());
 			filter->setEnabled(enabled);
 			filter->setVisible(enabled);
 		}
@@ -578,14 +578,14 @@ QHBoxLayout* QtCustomTrailView::addCheckButtons(const std::vector<QCheckBox*>& c
 	return buttonLayout;
 }
 
-NodeType::TypeMask QtCustomTrailView::getCheckedNodeTypes() const
+NodeKindMask QtCustomTrailView::getCheckedNodeTypes() const
 {
-	NodeType::TypeMask nodeTypes = 0;
+	NodeKindMask nodeTypes = 0;
 	for (const QCheckBox* filter: m_nodeFilters)
 	{
 		if (filter->isEnabled() && filter->isChecked() && filter != m_nodeNonIndexed)
 		{
-			nodeTypes |= NodeType::getTypeForReadableTypeString(filter->text().toStdWString());
+			nodeTypes |= getNodeKindForReadableNodeKindString(filter->text().toStdWString());
 		}
 	}
 	return nodeTypes;

src/lib_gui/qt/view/QtCustomTrailView.h

@@ -29,7 +29,7 @@ public:
 
 	// TrailView implementation
 	void clearView() override;
-	void setAvailableNodeAndEdgeTypes(NodeType::TypeMask nodeTypes, Edge::TypeMask edgeTypes) override;
+	void setAvailableNodeAndEdgeTypes(NodeKindMask nodeTypes, Edge::TypeMask edgeTypes) override;
 
 	void showView() override;
 	void hideView() override;
@@ -50,7 +50,7 @@ private:
 		size_t filtersInFirstColumn);
 	QHBoxLayout* addCheckButtons(const std::vector<QCheckBox*>& checkBoxes) const;
 
-	NodeType::TypeMask getCheckedNodeTypes() const;
+	NodeKindMask getCheckedNodeTypes() const;
 	Edge::TypeMask getCheckedEdgeTypes() const;
 
 	void setError(const QString& error);