diff --git a/src/lib/component/controller/GraphController.cpp b/src/lib/component/controller/GraphController.cpp index 9999fc08..9ca1804c 100644 --- a/src/lib/component/controller/GraphController.cpp +++ b/src/lib/component/controller/GraphController.cpp @@ -1433,7 +1433,7 @@ void GraphController::bundleNodesByType() bool hasNonFileBundle = false; - for (const NodeType& nodeType: NodeType::getOverviewBundleNodeTypesOrdered()) + for (const NodeType& nodeType: NodeType::overviewBundleNodeTypesOrdered) { Tree bundleInfoTree = nodeType.getOverviewBundleTree(); if (bundleInfoTree.data.isValid()) diff --git a/src/lib/data/NodeType.cpp b/src/lib/data/NodeType.cpp index 0b5bba8a..bcc01263 100644 --- a/src/lib/data/NodeType.cpp +++ b/src/lib/data/NodeType.cpp @@ -3,25 +3,24 @@ #include "ResourcePaths.h" #include "utilityString.h" -std::vector NodeType::getOverviewBundleNodeTypesOrdered() +std::vector const NodeType::overviewBundleNodeTypesOrdered = { - return { - NodeType(NodeType::NODE_FILE), - NodeType(NodeType::NODE_MACRO), - NodeType(NodeType::NODE_ANNOTATION), - NodeType(NodeType::NODE_MODULE), - NodeType(NodeType::NODE_NAMESPACE), - NodeType(NodeType::NODE_PACKAGE), - NodeType(NodeType::NODE_CLASS), - NodeType(NodeType::NODE_INTERFACE), - NodeType(NodeType::NODE_STRUCT), - NodeType(NodeType::NODE_UNION), - NodeType(NodeType::NODE_FUNCTION), - NodeType(NodeType::NODE_GLOBAL_VARIABLE), - NodeType(NodeType::NODE_TYPE), - NodeType(NodeType::NODE_TYPEDEF), - NodeType(NodeType::NODE_ENUM)}; -} + NodeType(NodeType::NODE_FILE), + NodeType(NodeType::NODE_MACRO), + NodeType(NodeType::NODE_ANNOTATION), + NodeType(NodeType::NODE_MODULE), + NodeType(NodeType::NODE_NAMESPACE), + NodeType(NodeType::NODE_PACKAGE), + NodeType(NodeType::NODE_CLASS), + NodeType(NodeType::NODE_INTERFACE), + NodeType(NodeType::NODE_STRUCT), + NodeType(NodeType::NODE_UNION), + NodeType(NodeType::NODE_FUNCTION), + NodeType(NodeType::NODE_GLOBAL_VARIABLE), + NodeType(NodeType::NODE_TYPE), + NodeType(NodeType::NODE_TYPEDEF), + NodeType(NodeType::NODE_ENUM) +}; int NodeType::typeToInt(NodeType::Type type) { diff --git a/src/lib/data/NodeType.h b/src/lib/data/NodeType.h index 638da724..67726f7b 100644 --- a/src/lib/data/NodeType.h +++ b/src/lib/data/NodeType.h @@ -118,6 +118,7 @@ public: std::wstring getUnderscoredTypeWString() const; std::wstring getReadableTypeWString() const; + static std::vector const overviewBundleNodeTypesOrdered; private: Type m_type; };