[MERGE]

src/core/common/WHierarchicalTree.cpp

@@ -22,6 +22,9 @@
 //
 //---------------------------------------------------------------------------
 
+#include <list>
+#include <vector>
+
 #include "WHierarchicalTree.h"
 
 WHierarchicalTree::WHierarchicalTree() :
@@ -126,9 +129,9 @@ std::vector< size_t > WHierarchicalTree::downXLevelsFromTop( size_t level, bool
         level = m_maxLevel -1;
     }
 
-    std::vector<size_t>returnVector;
+    std::vector< size_t > returnVector;
 
-    std::list<size_t>worklist;
+    std::list< size_t > worklist;
     worklist.push_back( m_clusterCount - 1 );
 
     for( size_t i = 0; i < level; ++i )

src/core/common/WLogEntry.cpp

@@ -22,14 +22,14 @@
 //
 //---------------------------------------------------------------------------
 
-#include <string>
+#include <algorithm>
 #include <sstream>
+#include <string>
 
 #include <boost/algorithm/string.hpp>
 
-#include "WTerminalColor.h"
-
 #include "WLogEntry.h"
+#include "WTerminalColor.h"
 
 LogLevel logLevelFromString( const std::string& str )
 {

src/core/common/WPropertyTypes.cpp

@@ -23,6 +23,7 @@
 //---------------------------------------------------------------------------
 
 #include <string>
+#include <vector>
 
 #include "WPropertyTypes.h"
 #include "WTransferFunction.h"

src/core/common/WThreadedRunner.cpp

@@ -23,13 +23,13 @@
 //---------------------------------------------------------------------------
 
 #include <iostream>
+#include <string>
 
 #include "exceptions/WSignalSubscriptionFailed.h"
-#include "WConditionOneShot.h"
 #include "WCondition.h"
+#include "WConditionOneShot.h"
 #include "WException.h"
 #include "WLogger.h"
-
 #include "WThreadedRunner.h"
 
 WThreadedRunner::WThreadedRunner():

src/core/common/WTransferFunction.cpp

@@ -22,12 +22,12 @@
 //
 //---------------------------------------------------------------------------
 
+#include <algorithm>
 #include <cmath>
 #include <iostream>
-#include <algorithm>
+#include <vector>
 
 #include "WAssert.h"
-
 #include "WTransferFunction.h"
 
 bool WTransferFunction::operator==( const WTransferFunction &rhs ) const

src/core/common/datastructures/WDendrogram.cpp

@@ -23,11 +23,12 @@
 //---------------------------------------------------------------------------
 
 #include <algorithm>
-#include <iterator>
 #include <fstream>
+#include <iterator>
 #include <map>
 #include <set>
 #include <sstream>
+#include <string>
 #include <vector>
 
 #include "../exceptions/WOutOfBounds.h"

src/core/common/test/WPropertyStruct_test.h

@@ -26,9 +26,6 @@
 #define WPROPERTYSTRUCT_TEST_H
 
 #include <string>
-// NOTE: this is only included because the stylechecker wants this, although we never use std::vector. It thinks the mpl::vector is an
-// std::vector and NOLINT does not work there (why?)
-#include <vector>
 
 #include <cxxtest/TestSuite.h>
 

src/core/dataHandler/WDataSetFiberClustering.cpp

@@ -22,6 +22,8 @@
 //
 //---------------------------------------------------------------------------
 
+#include <string>
+
 #include "WDataSetFiberClustering.h"
 
 // The prototype as singleton. Created during first getPrototype() call

src/core/dataHandler/WDataTexture3D.cpp

@@ -22,13 +22,12 @@
 //
 //---------------------------------------------------------------------------
 
-#include "../common/math/linearAlgebra/WLinearAlgebra.h"
-
-#include "WValueSet.h"
+#include <string>
 
+#include "../common/math/linearAlgebra/WLinearAlgebra.h"
 #include "../graphicsEngine/WGETextureUtils.h"
-
 #include "WDataTexture3D.h"
+#include "WValueSet.h"
 
 WDataTexture3D::WDataTexture3D( boost::shared_ptr< WValueSetBase > valueSet, boost::shared_ptr< WGridRegular3D > grid ):
     WGETexture3D( static_cast< float >( valueSet->getMaximumValue() - valueSet->getMinimumValue() ),

src/core/dataHandler/WEEG.h

@@ -27,11 +27,13 @@
 
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
-#include "WRecording.h"
-#include "../common/WPrototyped.h"
+
 #include "../common/math/linearAlgebra/WLinearAlgebra.h"
+#include "../common/WPrototyped.h"
 #include "WExportDataHandler.h"
+#include "WRecording.h"
 
 /**
  * An incomplete implementation to store information about electrodes of EEG data

src/core/graphicsEngine/WGEGeodeUtils.cpp

@@ -22,27 +22,29 @@
 //
 //---------------------------------------------------------------------------
 
+#include <map>
 #include <string>
+#include <vector>
 
 #include <osg/Array>
 #include <osg/Geode>
 #include <osg/Geometry>
+#include <osg/LightModel>
 #include <osg/LineWidth>
+#include <osg/Material>
 #include <osg/MatrixTransform>
 #include <osg/ShapeDrawable>
 #include <osg/Vec3>
-#include <osg/LightModel>
-#include <osg/Material>
 
 #include "../common/math/linearAlgebra/WLinearAlgebra.h"
-#include "../common/WPathHelper.h"
 #include "../common/math/WMath.h"
-#include "WGESubdividedPlane.h"
+#include "../common/WPathHelper.h"
+#include "shaders/WGEShader.h"
 #include "WGEGeodeUtils.h"
 #include "WGEGeometryUtils.h"
-#include "WGEUtils.h"
 #include "WGEGroupNode.h"
-#include "shaders/WGEShader.h"
+#include "WGESubdividedPlane.h"
+#include "WGEUtils.h"
 #include "widgets/labeling/WGELabel.h"
 
 osg::ref_ptr< osg::Geode > wge::generateBoundingBoxGeode( const WBoundingBox& bb, const WColor& color )

src/core/graphicsEngine/WROI.cpp

@@ -22,8 +22,9 @@
 //
 //---------------------------------------------------------------------------
 
-#include "WROI.h"
+#include <list>
 
+#include "WROI.h"
 #include "WPickHandler.h"
 
 WROI::WROI() :

src/core/graphicsEngine/WTriangleMesh.cpp

@@ -27,6 +27,7 @@
 #include <map>
 #include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <osg/io_utils>

src/core/graphicsEngine/algorithms/WMarchingLegoAlgorithm.cpp

@@ -22,6 +22,8 @@
 //
 //---------------------------------------------------------------------------
 
+#include <vector>
+
 #include "WMarchingLegoAlgorithm.h"
 
 WMarchingLegoAlgorithm::WMarchingLegoAlgorithm()

src/core/graphicsEngine/geodes/WGEGridNode.cpp

@@ -23,13 +23,13 @@
 //---------------------------------------------------------------------------
 
 #include <sstream>
+#include <string>
 
 #include <osg/LineWidth>
 
-#include "../callbacks/WGEFunctorCallback.h"
 #include "../../common/math/linearAlgebra/WLinearAlgebra.h"
+#include "../callbacks/WGEFunctorCallback.h"
 #include "../WGEGeodeUtils.h"
-
 #include "WGEGridNode.h"
 
 WGEGridNode::WGEGridNode( WGridRegular3D::ConstSPtr grid ):

src/core/graphicsEngine/postprocessing/WGEPostprocessingNode.cpp

@@ -22,11 +22,12 @@
 //
 //---------------------------------------------------------------------------
 
-#include "../../common/WPropertyHelper.h"
+#include <string>
+#include <vector>
 
+#include "../../common/WPropertyHelper.h"
 #include "../shaders/WGEShaderPropertyDefineOptions.h"
 #include "../WGEUtils.h"
-
 #include "WGEPostprocessingNode.h"
 
 WGEPostprocessingNode::WGEPostprocessingNode( osg::ref_ptr< osg::Camera > reference, size_t width, size_t height, bool noHud ):

src/core/graphicsEngine/shaders/WGEShaderDefineOptions.cpp

@@ -25,9 +25,10 @@
 #include <stdarg.h>
 
 #include <algorithm>
+#include <string>
+#include <vector>
 
 #include "../../common/exceptions/WPreconditionNotMet.h"
-
 #include "WGEShaderDefineOptions.h"
 
 WGEShaderDefineOptions::WGEShaderDefineOptions( std::string first,

src/core/graphicsEngine/shaders/WGEShaderPropertyDefineOptions.cpp

@@ -22,6 +22,9 @@
 //
 //---------------------------------------------------------------------------
 
+#include <string>
+#include <vector>
+
 #include "WGEShaderPropertyDefineOptions.h"
 
 WGEShaderPropertyDefineOptions< WPropSelection >::SPtr WGEShaderPropertyDefineOptionsTools::createSelection(

src/core/graphicsEngine/shaders/WGEShaderVersionPreprocessor.cpp

@@ -22,14 +22,14 @@
 //
 //---------------------------------------------------------------------------
 
-#include <string>
-#include <sstream>
+#include <algorithm>
 #include <ostream>
+#include <sstream>
+#include <string>
 
 #include <boost/regex.hpp>
 
 #include "../../common/WLogger.h"
-
 #include "WGEShaderVersionPreprocessor.h"
 
 WGEShaderVersionPreprocessor::WGEShaderVersionPreprocessor()

src/core/gui/WCustomWidget.cpp

@@ -22,6 +22,8 @@
 //
 //---------------------------------------------------------------------------
 
+#include <string>
+
 #include "WCustomWidget.h"
 
 WCustomWidget::WCustomWidget( std::string title ):