ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src: fixed clang warnings, fixed undefined symbols logs, fixed code convention violations

Browse Source
This commit is contained in:
Eberhard Graether
2014-07-21 01:26:35 +02:00
parent 0c570d54af
commit 0d46de871a
30 changed files with 166 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/GraphController.cpp
+38 -41
View File
@@ -6,7 +6,6 @@
#include "component/view/graphElements/GraphNode.h"
#include "component/view/GraphView.h"
#include "data/access/GraphAccess.h"
#include "utility/logging/logging.h"
GraphController::GraphController(GraphAccess* graphAccess)
@@ -35,7 +34,7 @@ void GraphController::createDummyGraph(const Id activeId, const LayoutFunction l
{
std::vector<DummyNode> nodes;
if(m_graphAccess->checkTokenIsNode(activeId))
if (m_graphAccess->checkTokenIsNode(activeId))
{
nodes.push_back(createDummyNode(activeId));
std::vector<DummyNode> neighbours = createNeighbourNodes(nodes[0]);
@@ -72,9 +71,9 @@ Id GraphController::findTopLevelNode(const Id nodeId)
{
std::vector<std::tuple<Id, Id, Id>> memberEdges = m_graphAccess->getMemberEdgesOfNode(nodeId);
for(unsigned int i = 0; i < memberEdges.size(); i++)
for (unsigned int i = 0; i < memberEdges.size(); i++)
{
if(std::get<0>(memberEdges[i]) != nodeId)
if (std::get<0>(memberEdges[i]) != nodeId)
{
return findTopLevelNode(std::get<0>(memberEdges[i]));
}
@@ -91,9 +90,9 @@ DummyNode GraphController::buildNodeTopDown(const Id nodeId)
result.tokenId = nodeId;
std::vector<std::tuple<Id, Id, Id>> memberEdges = m_graphAccess->getMemberEdgesOfNode(nodeId);
for(unsigned int i = 0; i < memberEdges.size(); i++)
for (unsigned int i = 0; i < memberEdges.size(); i++)
{
if(std::get<1>(memberEdges[i]) != nodeId)
if (std::get<1>(memberEdges[i]) != nodeId)
{
result.subNodes.push_back(buildNodeTopDown(std::get<1>(memberEdges[i])));
}
@@ -114,34 +113,34 @@ std::vector<DummyNode> GraphController::createNeighbourNodes(const Id nodeId)
std::vector<std::tuple<Id, Id, Id>> parameterEdges = m_graphAccess->getParameterOfEdgesOfNode(nodeId);
std::vector<std::tuple<Id, Id, Id>> inheritanceEdges = m_graphAccess->getInheritanceEdgesOfNode(nodeId);
if(callEdges.size() > 0)
if (callEdges.size() > 0)
{
edges.insert(edges.end(), callEdges.begin(), callEdges.end());
}
if(usageEdges.size() > 0)
if (usageEdges.size() > 0)
{
edges.insert(edges.end(), usageEdges.begin(), usageEdges.end());
}
if(typeOfEdges.size() > 0)
if (typeOfEdges.size() > 0)
{
edges.insert(edges.end(), typeOfEdges.begin(), typeOfEdges.end());
}
if(returnTypeEdges.size() > 0)
if (returnTypeEdges.size() > 0)
{
edges.insert(edges.end(), returnTypeEdges.begin(), returnTypeEdges.end());
}
if(parameterEdges.size() > 0)
if (parameterEdges.size() > 0)
{
edges.insert(edges.end(), parameterEdges.begin(), parameterEdges.end());
}
if(inheritanceEdges.size() > 0)
if (inheritanceEdges.size() > 0)
{
edges.insert(edges.end(), inheritanceEdges.begin(), inheritanceEdges.end());
}
for(unsigned int i = 0; i < edges.size(); i++)
for (unsigned int i = 0; i < edges.size(); i++)
{
if(std::get<0>(edges[i]) == nodeId)
if (std::get<0>(edges[i]) == nodeId)
{
result.push_back(createDummyNode(std::get<1>(edges[i])));
}
@@ -161,23 +160,23 @@ std::vector<DummyNode> GraphController::createNeighbourNodes(const DummyNode& no
std::set<DummyNode> tmpNodes; // to make it easier to keep the nodes unique
result = createNeighbourNodes(node.tokenId);
for(unsigned int i = 0; i < result.size(); i++)
for (unsigned int i = 0; i < result.size(); i++)
{
tmpNodes.insert(result[i]);
}
for(unsigned int i = 0; i < node.subNodes.size(); i++)
for (unsigned int i = 0; i < node.subNodes.size(); i++)
{
std::vector<DummyNode> tmpNeighbours = createNeighbourNodes(node.subNodes[i].tokenId);
for(unsigned int j = 0; j < tmpNeighbours.size(); j++)
for (unsigned int j = 0; j < tmpNeighbours.size(); j++)
{
tmpNodes.insert(tmpNeighbours[j]);
}
}
result.clear();
std::set<DummyNode>::iterator it = tmpNodes.begin();
for(it; it != tmpNodes.end(); it++)
for (std::set<DummyNode>::iterator it = tmpNodes.begin(); it != tmpNodes.end(); it++)
{
result.push_back(*it);
}
@@ -191,17 +190,17 @@ std::vector<DummyEdge> GraphController::createEdges(const std::vector<DummyNode>
std::unordered_set<Id> nodeIds; // to help discard edges that point to non-existing nodes in the sub-graph
std::queue<DummyNode> nodeQueue;
for(unsigned int i = 0; i < nodes.size(); i++)
for (unsigned int i = 0; i < nodes.size(); i++)
{
nodeQueue.push(nodes[i]);
}
while(nodeQueue.size() > 0)
while (nodeQueue.size() > 0)
{
DummyNode n = nodeQueue.front();
nodeQueue.pop();
for(unsigned int i = 0; i < n.subNodes.size(); i++)
for (unsigned int i = 0; i < n.subNodes.size(); i++)
{
nodeQueue.push(n.subNodes[i]);
}
@@ -210,22 +209,20 @@ std::vector<DummyEdge> GraphController::createEdges(const std::vector<DummyNode>
}
std::set<DummyEdge> tmpEdges; // to make it easier to keep the edges unique
for(unsigned int i = 0; i < nodes.size(); i++)
for (unsigned int i = 0; i < nodes.size(); i++)
{
std::set<DummyEdge> tmp = getNeighbourEdgesOfNode(nodes[i]);
std::set<DummyEdge>::iterator it = tmp.begin();
for(it; it != tmp.end(); it++)
for (std::set<DummyEdge>::iterator it = tmp.begin(); it != tmp.end(); it++)
{
if(nodeIds.find(it->ownerId) != nodeIds.end() && nodeIds.find(it->targetId) != nodeIds.end())
if (nodeIds.find(it->ownerId) != nodeIds.end() && nodeIds.find(it->targetId) != nodeIds.end())
{
tmpEdges.insert(tmp.begin(), tmp.end());
}
}
}
std::set<DummyEdge>::iterator it = tmpEdges.begin();
for(it; it != tmpEdges.end(); it++)
for (std::set<DummyEdge>::iterator it = tmpEdges.begin(); it != tmpEdges.end(); it++)
{
result.push_back(*it);
}
@@ -244,32 +241,32 @@ std::set<DummyEdge> GraphController::getNeighbourEdgesOfNode(const DummyNode& no
std::vector<std::tuple<Id, Id, Id>> parameterEdges = m_graphAccess->getParameterOfEdgesOfNode(node.tokenId);
std::vector<std::tuple<Id, Id, Id>> inheritanceEdges = m_graphAccess->getInheritanceEdgesOfNode(node.tokenId);
for(unsigned int i = 0; i < callEdges.size(); i++)
for (unsigned int i = 0; i < callEdges.size(); i++)
{
result.insert(DummyEdge(std::get<0>(callEdges[i]), std::get<1>(callEdges[i]), std::get<2>(callEdges[i]), Edge::EdgeType::EDGE_CALL));
result.insert(DummyEdge(std::get<0>(callEdges[i]), std::get<1>(callEdges[i]), std::get<2>(callEdges[i]), Edge::EDGE_CALL));
}
for(unsigned int i = 0; i < usageEdges.size(); i++)
for (unsigned int i = 0; i < usageEdges.size(); i++)
{
result.insert(DummyEdge(std::get<0>(usageEdges[i]), std::get<1>(usageEdges[i]), std::get<2>(usageEdges[i]), Edge::EdgeType::EDGE_USAGE));
result.insert(DummyEdge(std::get<0>(usageEdges[i]), std::get<1>(usageEdges[i]), std::get<2>(usageEdges[i]), Edge::EDGE_USAGE));
}
for(unsigned int i = 0; i < typeOfEdges.size(); i++)
for (unsigned int i = 0; i < typeOfEdges.size(); i++)
{
result.insert(DummyEdge(std::get<0>(typeOfEdges[i]), std::get<1>(typeOfEdges[i]), std::get<2>(typeOfEdges[i]), Edge::EdgeType::EDGE_TYPE_OF));
result.insert(DummyEdge(std::get<0>(typeOfEdges[i]), std::get<1>(typeOfEdges[i]), std::get<2>(typeOfEdges[i]), Edge::EDGE_TYPE_OF));
}
for(unsigned int i = 0; i < returnTypeEdges.size(); i++)
for (unsigned int i = 0; i < returnTypeEdges.size(); i++)
{
result.insert(DummyEdge(std::get<0>(returnTypeEdges[i]), std::get<1>(returnTypeEdges[i]), std::get<2>(returnTypeEdges[i]), Edge::EdgeType::EDGE_RETURN_TYPE_OF));
result.insert(DummyEdge(std::get<0>(returnTypeEdges[i]), std::get<1>(returnTypeEdges[i]), std::get<2>(returnTypeEdges[i]), Edge::EDGE_RETURN_TYPE_OF));
}
for(unsigned int i = 0; i < parameterEdges.size(); i++)
for (unsigned int i = 0; i < parameterEdges.size(); i++)
{
result.insert(DummyEdge(std::get<0>(parameterEdges[i]), std::get<1>(parameterEdges[i]), std::get<2>(parameterEdges[i]), Edge::EdgeType::EDGE_PARAMETER_TYPE_OF));
result.insert(DummyEdge(std::get<0>(parameterEdges[i]), std::get<1>(parameterEdges[i]), std::get<2>(parameterEdges[i]), Edge::EDGE_PARAMETER_TYPE_OF));
}
for(unsigned int i = 0; i < inheritanceEdges.size(); i++)
for (unsigned int i = 0; i < inheritanceEdges.size(); i++)
{
result.insert(DummyEdge(std::get<0>(inheritanceEdges[i]), std::get<1>(inheritanceEdges[i]), std::get<2>(inheritanceEdges[i]), Edge::EdgeType::EDGE_INHERITANCE));
result.insert(DummyEdge(std::get<0>(inheritanceEdges[i]), std::get<1>(inheritanceEdges[i]), std::get<2>(inheritanceEdges[i]), Edge::EDGE_INHERITANCE));
}
for(unsigned int i = 0; i < node.subNodes.size(); i++)
for (unsigned int i = 0; i < node.subNodes.size(); i++)
{
std::set<DummyEdge> tmpNeighbours = getNeighbourEdgesOfNode(node.subNodes[i]);
result.insert(tmpNeighbours.begin(), tmpNeighbours.end());