From 1a9d2b8eabd51e2e995d1853fc2f2af4c65d6636 Mon Sep 17 00:00:00 2001
From: mlangkabel <malte.langkabel@gmail.com>
Date: Thu, 23 Nov 2017 17:56:47 +0100
Subject: [PATCH] src: replaced usage of NodeType::Type in MessageActivateTrail
 creation

---
 src/lib_gui/qt/view/QtGraphView.cpp | 45 +++++++++++++----------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/lib_gui/qt/view/QtGraphView.cpp b/src/lib_gui/qt/view/QtGraphView.cpp
index 71a8bf84..5b53b01b 100644
--- a/src/lib_gui/qt/view/QtGraphView.cpp
+++ b/src/lib_gui/qt/view/QtGraphView.cpp
@@ -658,36 +658,31 @@ MessageActivateTrail QtGraphView::getMessageActivateTrail(bool forward)
 {
 	MessageActivateTrail message(0, 0, 0, 0, false);
 
-	QtGraphNodeData* node = nullptr;
-	if (m_oldActiveNode && (node = dynamic_cast<QtGraphNodeData*>(m_oldActiveNode)))
+	QtGraphNodeData* node = dynamic_cast<QtGraphNodeData*>(m_oldActiveNode);
+	if (node)
 	{
 		Edge::TypeMask trailType;
 		bool horizontalLayout = true;
 
-		switch (node->getData()->getType().getType())
+		if (node->getData()->getType().isInheritable())
 		{
-			case NodeType::NODE_SYMBOL:
-			case NodeType::NODE_CLASS:
-			case NodeType::NODE_STRUCT:
-			case NodeType::NODE_INTERFACE:
-				trailType = Edge::EDGE_INHERITANCE;
-				horizontalLayout = false;
-				break;
-
-			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 NodeType::NODE_FILE:
-				trailType = Edge::EDGE_INCLUDE;
-				horizontalLayout = true;
-				break;
-
-			default:
-				return message;
+			trailType = Edge::EDGE_INHERITANCE;
+			horizontalLayout = false;
+		}
+		else if (node->getData()->getType().isCallable())
+		{
+			trailType = Edge::EDGE_CALL | Edge::EDGE_OVERRIDE |
+				Edge::EDGE_TEMPLATE_SPECIALIZATION | Edge::EDGE_TEMPLATE_MEMBER_SPECIALIZATION;
+			horizontalLayout = true;
+		}
+		else if (node->getData()->getType().isFile())
+		{
+			trailType = Edge::EDGE_INCLUDE;
+			horizontalLayout = true;
+		}
+		else
+		{
+			return message;
 		}
 
 		Id tokenId = node->getData()->getId();