src: converted NodeType to a class

NodeType internally still uses the Type enum
This commit is contained in:
mlangkabel
2017-11-23 17:05:15 +01:00
parent c512992e2c
commit 90e17c5868
52 changed files with 779 additions and 656 deletions
@@ -8,7 +8,7 @@ class MessageActivateAll
: public Message<MessageActivateAll>
{
public:
MessageActivateAll(Node::NodeTypeMask filter = 0)
MessageActivateAll(NodeType::TypeMask filter = 0)
: filter(filter)
{
setIsParallel(true);
@@ -19,7 +19,7 @@ public:
return "MessageActivateAll";
}
Node::NodeTypeMask filter;
NodeType::TypeMask filter;
};
#endif // MESSAGE_ACTIVATE_ALL_H
@@ -8,7 +8,7 @@ class MessageActivateTrail
: public Message<MessageActivateTrail>
{
public:
MessageActivateTrail(Id originId, Id targetId, Edge::EdgeTypeMask trailType, size_t depth, bool horizontalLayout)
MessageActivateTrail(Id originId, Id targetId, Edge::TypeMask trailType, size_t depth, bool horizontalLayout)
: originId(originId)
, targetId(targetId)
, trailType(trailType)
@@ -24,7 +24,7 @@ public:
const Id originId;
const Id targetId;
const Edge::EdgeTypeMask trailType;
const Edge::TypeMask trailType;
const size_t depth;
const bool horizontalLayout;
};
@@ -9,7 +9,7 @@ class MessageSearch
: public Message<MessageSearch>
{
public:
MessageSearch(const std::vector<SearchMatch>& matches, Node::NodeTypeMask filter = 0)
MessageSearch(const std::vector<SearchMatch>& matches, NodeType::TypeMask filter = 0)
: isFromSearch(true)
, filter(filter)
, m_matches(matches)
@@ -28,7 +28,7 @@ public:
for (size_t i = 0; i < m_matches.size(); i++)
{
ss << '@';
if (m_matches[i].nodeType == Node::NODE_FILE)
if (m_matches[i].nodeType.getType() == NodeType::NODE_FILE)
{
ss << m_matches[i].subtext;
}
@@ -72,7 +72,7 @@ public:
}
bool isFromSearch;
Node::NodeTypeMask filter;
NodeType::TypeMask filter;
private:
const std::vector<SearchMatch> m_matches;
@@ -8,7 +8,7 @@ class MessageSearchAutocomplete
: public Message<MessageSearchAutocomplete>
{
public:
MessageSearchAutocomplete(const std::string& query, Node::NodeTypeMask filter)
MessageSearchAutocomplete(const std::string& query, NodeType::TypeMask filter)
: query(query)
, filter(filter)
{
@@ -25,7 +25,7 @@ public:
}
const std::string query;
const Node::NodeTypeMask filter;
const NodeType::TypeMask filter;
};
#endif // MESSAGE_SEARCH_AUTOCOMPLETE_H