Add Q_MOC_RUN check to all boost includes in headers to avoid issues with QT4 and boost.

GraspPlanning/GraspQuality/GraspEvaluationPoseUncertainty.h

@@ -30,8 +30,6 @@
 #include <string>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-
 namespace GraspStudio
 {
 

VirtualRobot/IK/ConstrainedHierarchicalIK.h

@@ -26,7 +26,6 @@
 #include "VirtualRobot/IK/ConstrainedIK.h"
 #include "VirtualRobot/IK/HierarchicalIK.h"
 
-#include <boost/shared_ptr.hpp>
 
 namespace VirtualRobot
 {

VirtualRobot/IK/ConstrainedIK.h

@@ -27,7 +27,6 @@
 #include "VirtualRobot/Robot.h"
 
 #include <vector>
-#include <boost/shared_ptr.hpp>
 
 namespace VirtualRobot
 {

VirtualRobot/IK/ConstrainedOptimizationIK.h

@@ -27,8 +27,6 @@
 #include "VirtualRobot/IK/ConstrainedIK.h"
 #include "VirtualRobot/IK/Constraint.h"
 
-#include <boost/shared_ptr.hpp>
-
 namespace nlopt
 {
     class opt;

VirtualRobot/IK/ConstrainedStackedIK.h

@@ -27,8 +27,6 @@
 #include "VirtualRobot/IK/JacobiProvider.h"
 #include "VirtualRobot/IK/StackedIK.h"
 
-#include <boost/shared_ptr.hpp>
-
 namespace VirtualRobot
 {
     class VIRTUAL_ROBOT_IMPORT_EXPORT ConstrainedStackedIK : public ConstrainedIK, public boost::enable_shared_from_this<ConstrainedStackedIK>

VirtualRobot/IK/Constraint.h

@@ -25,8 +25,6 @@
 #include "VirtualRobot/VirtualRobot.h"
 #include "VirtualRobot/IK/JacobiProvider.h"
 
-#include <boost/shared_ptr.hpp>
-
 class SoSeparator;
 
 namespace VirtualRobot

VirtualRobot/IK/constraints/BalanceConstraint.h

@@ -28,8 +28,6 @@
 #include <VirtualRobot/IK/CoMIK.h>
 #include <VirtualRobot/IK/SupportPolygon.h>
 
-#include <boost/shared_ptr.hpp>
-
 class SoSeparator;
 class SoNode;
 

VirtualRobot/IK/constraints/CoMConstraint.h

@@ -27,8 +27,6 @@
 #include "VirtualRobot/IK/Constraint.h"
 #include "VirtualRobot/IK/CoMIK.h"
 
-#include <boost/shared_ptr.hpp>
-
 namespace VirtualRobot
 {
     class VIRTUAL_ROBOT_IMPORT_EXPORT CoMConstraint : public Constraint, public boost::enable_shared_from_this<CoMConstraint>

VirtualRobot/IK/constraints/JointLimitAvoidanceConstraint.h

@@ -25,7 +25,6 @@
 
 #include "VirtualRobot/IK/constraints/ReferenceConfigurationConstraint.h"
 
-#include <boost/shared_ptr.hpp>
 
 namespace VirtualRobot
 {

VirtualRobot/IK/constraints/OrientationConstraint.h

@@ -27,8 +27,6 @@
 #include "VirtualRobot/IK/Constraint.h"
 #include "VirtualRobot/IK/DifferentialIK.h"
 
-#include <boost/shared_ptr.hpp>
-
 namespace VirtualRobot
 {
     class VIRTUAL_ROBOT_IMPORT_EXPORT OrientationConstraint : public Constraint, public boost::enable_shared_from_this<OrientationConstraint>

VirtualRobot/IK/constraints/PoseConstraint.h

@@ -27,8 +27,6 @@
 #include "VirtualRobot/IK/Constraint.h"
 #include "VirtualRobot/IK/DifferentialIK.h"
 
-#include <boost/shared_ptr.hpp>
-
 namespace VirtualRobot
 {
     class VIRTUAL_ROBOT_IMPORT_EXPORT PoseConstraint : public Constraint, public boost::enable_shared_from_this<PoseConstraint>

VirtualRobot/IK/constraints/PositionConstraint.h

@@ -27,8 +27,6 @@
 #include "VirtualRobot/IK/Constraint.h"
 #include "VirtualRobot/IK/DifferentialIK.h"
 
-#include <boost/shared_ptr.hpp>
-
 namespace VirtualRobot
 {
     class VIRTUAL_ROBOT_IMPORT_EXPORT PositionConstraint : public Constraint, public boost::enable_shared_from_this<PositionConstraint>

VirtualRobot/IK/constraints/ReferenceConfigurationConstraint.h

@@ -25,8 +25,6 @@
 
 #include "VirtualRobot/IK/Constraint.h"
 
-#include <boost/shared_ptr.hpp>
-
 namespace VirtualRobot
 {
     class VIRTUAL_ROBOT_IMPORT_EXPORT ReferenceConfigurationConstraint : public Constraint, public boost::enable_shared_from_this<ReferenceConfigurationConstraint>

VirtualRobot/IK/constraints/TSRConstraint.h

@@ -26,8 +26,6 @@
 #include "VirtualRobot/IK/Constraint.h"
 #include "VirtualRobot/IK/DifferentialIK.h"
 
-#include <boost/shared_ptr.hpp>
-
 namespace VirtualRobot
 {
     class VIRTUAL_ROBOT_IMPORT_EXPORT TSRConstraint : public Constraint, public boost::enable_shared_from_this<TSRConstraint>

VirtualRobot/Import/Legacy/COLLADA/ColladaIO.h

@@ -10,7 +10,6 @@
 #include <VirtualRobot/Nodes/RobotNodePrismaticFactory.h>
 #include <VirtualRobot/Nodes/PositionSensor.h>
 #include "ColladaParser.h"
-#include <boost/shared_ptr.hpp>
 #include <VirtualRobot/Visualization/TriMeshModel.h>
 #include <Eigen/Core>
 #include <Eigen/Geometry>

VirtualRobot/Import/Legacy/COLLADA/ColladaIterators.h

@@ -23,8 +23,10 @@
 
 #pragma once
 
-#include <boost/iterator/iterator_facade.hpp>
 
+#ifndef Q_MOC_RUN
+#include <boost/iterator/iterator_facade.hpp>
+#endif
 //namespace VirtualRobot {
 
 template <class T>

VirtualRobot/Import/Legacy/COLLADA/ColladaParser.h

@@ -25,12 +25,14 @@
 #include <1.5/dom/domCOLLADA.h>
 #include <1.5/dom/domInstance_kinematics_scene.h>
 #include <1.5/dom/domTechnique.h>
-#include <boost/foreach.hpp>
 #include "ColladaIterators.h"
+#ifndef Q_MOC_RUN
+#include <boost/foreach.hpp>
 #include <boost/range/adaptors.hpp>
 #include <boost/range/algorithm.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/shared_ptr.hpp>
+#endif
 #include <ostream>
 #include "../VirtualRobotImportExport.h"
 

VirtualRobot/Robot.h

@@ -28,7 +28,6 @@
 #include "Nodes/RobotNode.h"
 #include "Nodes/RobotNodeRevolute.h"
 #include "Nodes/ConditionedLock.h"
-#include <boost/pointer_cast.hpp>
 
 #include <string>
 #include <map>

VirtualRobot/math/MathForwardDefinitions.h

@@ -24,7 +24,9 @@
 //scale intern sizes to milimeters
 #define HAPTIC_EXPLORATION_SCALE 40
 
+#ifndef Q_MOC_RUN // workaround for some bug in some QT/boost versions
 #include <boost/shared_ptr.hpp>
+#endif
 #include <Eigen/Dense>
 #include <stdexcept>
 #include <vector>