From b7abab113125edd413d8cc562f95aa851fa6396e Mon Sep 17 00:00:00 2001 From: DeepSOIC Date: Tue, 23 Jun 2015 22:01:16 +0300 Subject: [PATCH] Fix build on Windows --- src/Gui/DAGView/DAGModel.cpp | 12 ++++++------ src/Gui/DAGView/DAGModel.h | 1 + src/Gui/Qt4All.h | 2 ++ src/Mod/PartDesign/Gui/ViewProviderAddSub.cpp | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Gui/DAGView/DAGModel.cpp b/src/Gui/DAGView/DAGModel.cpp index 18da58d5c6..de3866f055 100644 --- a/src/Gui/DAGView/DAGModel.cpp +++ b/src/Gui/DAGView/DAGModel.cpp @@ -425,7 +425,7 @@ void Model::selectionChanged(const SelectionChanges& msg) //lamda for clearing selections. auto clearSelection = [this]() { - BGL_FORALL_VERTICES_T(currentVertex, *theGraph, Graph) + BGL_FORALL_VERTICES(currentVertex, *theGraph, Graph) { ViewEntryRectItem *rect = (*theGraph)[currentVertex].rectangle.get(); assert(rect); @@ -492,7 +492,7 @@ void Model::updateSlot() //empty outList means it is a root. //empty inList means it is a leaf. - BGL_FORALL_VERTICES_T(currentVertex, *theGraph, Graph) + BGL_FORALL_VERTICES(currentVertex, *theGraph, Graph) { const App::DocumentObject *currentDObject = findRecord(currentVertex).DObject; std::vector otherDObjects = currentDObject->getOutList(); @@ -722,7 +722,7 @@ void Model::removeAllItems() { if (theGraph) { - BGL_FORALL_VERTICES_T(currentVertex, *theGraph, Graph) + BGL_FORALL_VERTICES(currentVertex, *theGraph, Graph) { this->removeItem((*theGraph)[currentVertex].rectangle.get()); this->removeItem((*theGraph)[currentVertex].point.get()); @@ -730,7 +730,7 @@ void Model::removeAllItems() this->removeItem((*theGraph)[currentVertex].text.get()); } - BGL_FORALL_EDGES_T(currentEdge, *theGraph, Graph) + BGL_FORALL_EDGES(currentEdge, *theGraph, Graph) this->removeItem((*theGraph)[currentEdge].connector.get()); } } @@ -740,7 +740,7 @@ void Model::updateStates() //not sure I want to use the same pixmap merge for failing feature icons. //thinking maybe red background or another column of icons for state? - BGL_FORALL_VERTICES_T(currentVertex, *theGraph, Graph) + BGL_FORALL_VERTICES(currentVertex, *theGraph, Graph) { const GraphLinkRecord &record = findRecord(currentVertex); @@ -928,7 +928,7 @@ std::vector Model::getAllSelected() { std::vector out; - BGL_FORALL_VERTICES_T(currentVertex, *theGraph, Graph) + BGL_FORALL_VERTICES(currentVertex, *theGraph, Graph) { if ((*theGraph)[currentVertex].rectangle->isSelected()) out.push_back(currentVertex); diff --git a/src/Gui/DAGView/DAGModel.h b/src/Gui/DAGView/DAGModel.h index 331c6599ee..1d98529664 100644 --- a/src/Gui/DAGView/DAGModel.h +++ b/src/Gui/DAGView/DAGModel.h @@ -34,6 +34,7 @@ #include #include #include +#include #include #include diff --git a/src/Gui/Qt4All.h b/src/Gui/Qt4All.h index 4ab4ac46a7..5e7d38f918 100644 --- a/src/Gui/Qt4All.h +++ b/src/Gui/Qt4All.h @@ -77,8 +77,10 @@ #include #include #include +#include #include #include +#include #include #include #include diff --git a/src/Mod/PartDesign/Gui/ViewProviderAddSub.cpp b/src/Mod/PartDesign/Gui/ViewProviderAddSub.cpp index 714573228e..7efad5eec8 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderAddSub.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderAddSub.cpp @@ -44,6 +44,7 @@ #include #include #include +#include #include #include