Commit c2a5c5bb authored by Mario Hlawitschka's avatar Mario Hlawitschka

[STYLE] removed many includes that seem not to make sense and just increase...

[STYLE] removed many includes that seem not to make sense and just increase compile time of the core. Added then missing includes to the modules I compile here. Most are removed using comments for now to make it easier to find the problem if something is wrong but should be removed entirely, soon.
parent 31121062
......@@ -32,8 +32,8 @@
#include <boost/thread/thread.hpp>
#include <osg/Drawable>
#include <osg/ShapeDrawable>
#include <osg/Group>
//#include <osg/ShapeDrawable>
//#include <osg/Group>
#include "WExportWGE.h"
......
......@@ -23,7 +23,7 @@
//---------------------------------------------------------------------------
#include <iostream>
#include <set>
//#include <set>
#include <osg/ShapeDrawable>
#include <osg/MatrixTransform>
......
......@@ -26,14 +26,14 @@
#define WGEGROUPNODE_H
#include <queue>
#include <utility>
//#include <utility>
#include <boost/thread.hpp>
#include <osg/MatrixTransform>
#include <osg/NodeCallback>
#include "../common/WCondition.h"
//#include "../common/WCondition.h"
#include "../common/WPredicateHelper.h"
#include "WExportWGE.h"
......
......@@ -43,11 +43,14 @@
#include "exceptions/WGEInitFailed.h"
#include "WGE2DManipulator.h"
#include "WGEGroupNode.h"
#include "WGENoOpManipulator.h"
#include "WGEZoomTrackballManipulator.h"
#include "WPickHandler.h"
#include "../common/WConditionOneShot.h"
#include "../common/WThreadedRunner.h"
#include "WGEViewer.h"
WGEViewer::WGEViewer( std::string name, osg::ref_ptr<osg::Referenced> wdata, int x, int y,
......
......@@ -32,11 +32,8 @@
#include <osg/Node>
#include <osg/Version>
#include <osgGA/DriveManipulator>
#include <osgGA/FlightManipulator>
#include <osgGA/TerrainManipulator>
#include <osgGA/UFOManipulator>
#include <osgViewer/View>
#include <osgViewer/Viewer>
// OSG interface changed in 2.9.7, to make it compile also with those versions we do this:
// OSG_MIN_VERSION_REQUIRED(2, 9, 8) macro is not available in e.g. OSG 2.8.1, hence we use the old way
......@@ -53,13 +50,14 @@
#include "../common/WColor.h"
#include "../common/WFlag.h"
#include "../common/WThreadedRunner.h"
#include "WExportWGE.h"
#include "WGECamera.h"
#include "WGEGraphicsWindow.h"
#include "WGEGroupNode.h"
//#include "WGEGroupNode.h"
class WGEGroupNode;
#include "WGEScreenCapture.h"
#include "WPickHandler.h"
//#include "WPickHandler.h"
class WPickHandler;
#include "animation/WGEAnimationManipulator.h"
/**
......
......@@ -27,13 +27,13 @@
#include <map>
#include <string>
#include <vector>
//#include <vector>
#include <boost/shared_ptr.hpp>
#include <boost/signals2/signal.hpp>
#include <boost/function.hpp>
//#include <boost/function.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/thread.hpp>
//#include <boost/thread/thread.hpp>
#include <osg/Camera>
#include <osg/Texture3D>
......@@ -41,8 +41,8 @@
#include <osg/Vec4>
#include <osg/ref_ptr>
#include <osgViewer/CompositeViewer>
#include <osgViewer/View>
#include <osgViewer/Viewer>
//#include <osgViewer/View>
//#include <osgViewer/Viewer>
#include "../common/WThreadedRunner.h"
#include "../common/WConditionOneShot.h"
......
......@@ -22,15 +22,14 @@
//
//---------------------------------------------------------------------------
#include <iostream>
//#include <iostream>
#include <string>
#include <osg/Vec3>
//#include <osg/Vec3>
#include "../common/math/linearAlgebra/WLinearAlgebra.h"
//#include "../common/math/linearAlgebra/WLinearAlgebra.h"
#include "WPickHandler.h"
#include "WPickInfo.h"
WPickHandler::WPickHandler()
: m_hitResult( WPickInfo() ),
......
......@@ -25,26 +25,26 @@
#ifndef WPICKHANDLER_H
#define WPICKHANDLER_H
#include <sstream>
//#include <sstream>
#include <string>
#include <boost/signals2/signal.hpp>
#include <osgUtil/Optimizer>
#include <osgDB/ReadFile>
#include <osgViewer/Viewer>
#include <osgViewer/CompositeViewer>
#include <osg/Material>
#include <osg/Geode>
#include <osg/BlendFunc>
#include <osg/Depth>
#include <osg/Projection>
#include <osg/MatrixTransform>
#include <osg/Camera>
#include <osg/io_utils>
#include <osg/ShapeDrawable>
#include <osgText/Text>
//#include <osgUtil/Optimizer>
//#include <osgDB/ReadFile>
#include <osgViewer/View>
//#include <osgViewer/CompositeViewer>
//#include <osg/Material>
//#include <osg/Geode>
//#include <osg/BlendFunc>
//#include <osg/Depth>
//#include <osg/Projection>
//#include <osg/MatrixTransform>
//#include <osg/Camera>
//#include <osg/io_utils>
//#include <osg/ShapeDrawable>
//#include <osgText/Text>
#include "WPickInfo.h"
#include "WExportWGE.h"
......
......@@ -30,9 +30,10 @@
#include <boost/thread.hpp>
#include "../common/math/linearAlgebra/WLinearAlgebra.h"
//#include "../common/math/linearAlgebra/WLinearAlgebra.h"
#include "WPickHandler.h"
#include "WGEViewer.h"
//#include "WGEViewer.h"
class WGEViewer;
#include "WROI.h"
#include "WExportWGE.h"
......
......@@ -23,9 +23,11 @@
//---------------------------------------------------------------------------
#include <string>
#include <sstream>
#include <utility>
#include <osg/LightModel>
//#include <osg/LightModel>
#include <osg/ShapeDrawable>
#include "callbacks/WGEFunctorCallback.h"
......
......@@ -25,7 +25,7 @@
#ifndef WROISPHERE_H
#define WROISPHERE_H
#include <string>
//#include <string>
#include <utility>
#include <boost/thread.hpp>
......
......@@ -26,6 +26,7 @@
#include <ostream>
#include <sstream>
#include <string>
#include <fstream>
#include <boost/algorithm/string.hpp>
// Use filesystem version 2 for compatibility with newer boost versions.
......
......@@ -25,7 +25,7 @@
#ifndef WGESHADER_H
#define WGESHADER_H
#include <list>
//#include <list>
#include <map>
#include <string>
......
......@@ -30,7 +30,9 @@
#include "../graphicsEngine/WGEViewer.h"
#include "../graphicsEngine/WGEZoomTrackballManipulator.h"
#include "../graphicsEngine/WGraphicsEngine.h"
#include "../graphicsEngine/WPickHandler.h"
#include "WKernel.h"
#include "WSelectionManager.h"
......
......@@ -27,6 +27,7 @@
//#include "../../../graphicsEngine/WGraphicsEngine.h"
#include "../graphicsEngine/WROIBox.h"
#include "../graphicsEngine/WROIArbitrary.h"
#include "WKdTree.h"
#include "WSelectorRoi.h"
......
......@@ -31,7 +31,9 @@
#include "../graphicsEngine/WROI.h"
#include "WKdTree.h"
//#include "WKdTree.h"
class WKdTree;
/**
* class implements the updating of a bitfield for a roi
*/
......
......@@ -23,6 +23,7 @@
//---------------------------------------------------------------------------
#include <string>
#include <fstream>
#include <vector>
#include <utility>
......
......@@ -41,7 +41,7 @@
#include "core/kernel/WKernel.h"
#include "core/kernel/WROIManager.h"
#include "WMClusterDisplay.h"
#include "WMClusterDisplay.xpm" // Please put a real icon here.
#include "WMClusterDisplay.xpm"
// This line is needed by the module loader to actually find your module. Do not remove. Do NOT add a ";" here.
W_LOADABLE_MODULE( WMClusterDisplay )
......
......@@ -25,7 +25,7 @@
#ifndef WMCLUSTERDISPLAY_H
#define WMCLUSTERDISPLAY_H
#include <queue>
//#include <queue>
#include <string>
#include <vector>
......@@ -36,6 +36,8 @@
#include "core/graphicsEngine/WFiberDrawable.h"
#include "core/graphicsEngine/WGEManagedGroupNode.h"
#include "core/graphicsEngine/widgets/WOSGButton.h"
#include "core/graphicsEngine/WPickHandler.h"
#include "core/graphicsEngine/WPickInfo.h"
#include "core/kernel/WFiberSelector.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleInputData.h"
......
......@@ -40,6 +40,7 @@
#include "core/graphicsEngine/geodes/WDendrogramGeode.h"
#include "core/graphicsEngine/WGEManagedGroupNode.h"
#include "core/graphicsEngine/widgets/WOSGButton.h"
#include "core/graphicsEngine/WPickHandler.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
......
......@@ -26,6 +26,7 @@
#include <vector>
#include <osg/LightModel>
#include <osg/ShapeDrawable>
#include <osgSim/ColorRange>
#include "core/dataHandler/WEEG2.h"
......
......@@ -25,6 +25,11 @@
#include <vector>
#include <string>
#include <osg/Depth>
#include <osg/Drawable>
#include <osg/Geometry>
#include <osg/Geode>
#include "core/common/WPropertyHelper.h"
#include "core/common/WPropertyObserver.h"
#include "core/dataHandler/WDataHandler.h"
......
......@@ -23,6 +23,7 @@
//---------------------------------------------------------------------------
#include <string>
#include <fstream>
#include "core/dataHandler/WFiberAccumulator.h"
......
......@@ -32,6 +32,7 @@
#include "core/common/WPathHelper.h"
#include "core/kernel/WKernel.h"
#include "core/graphicsEngine/WGEViewer.h"
#include "core/graphicsEngine/WPickHandler.h"
#include "WMHud.h"
#include "WMHud.xpm"
......
......@@ -35,6 +35,7 @@
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
#include "core/graphicsEngine/WGEViewer.h"
#include "core/graphicsEngine/WPickHandler.h"
// forward declarations
class WFiberCluster;
......
......@@ -40,6 +40,7 @@
#include "core/graphicsEngine/shaders/WGEShaderPropertyDefineOptions.h"
#include "core/kernel/WSelectionManager.h"
#include "core/graphicsEngine/WGraphicsEngine.h"
#include "core/graphicsEngine/WPickHandler.h"
#include "core/kernel/WKernel.h"
#include "WMNavigationSlices.h"
......
......@@ -24,6 +24,7 @@
#include <string>
#include <vector>
#include <fstream>
#include "core/common/WPathHelper.h"
#include "core/common/WPropertyHelper.h"
......
......@@ -33,6 +33,7 @@
#include <osg/Geode>
#include <osg/Geometry>
#include <osg/Depth>
#include "core/common/datastructures/WFiber.h"
#include "core/common/WColor.h"
......
......@@ -24,6 +24,7 @@
#include <string>
#include <sstream>
#include <fstream>
#include "core/common/WPropertyHelper.h"
#include "core/graphicsEngine/WTriangleMesh.h"
......
......@@ -23,6 +23,7 @@
//---------------------------------------------------------------------------
#include <string>
#include <fstream>
#include "core/common/math/WMath.h"
#include "core/common/WPathHelper.h"
......
......@@ -23,6 +23,7 @@
//---------------------------------------------------------------------------
#include <string>
#include <fstream>
#include "core/common/WPropertyHelper.h"
#include "core/dataHandler/io/WWriterFiberVTK.h"
......
......@@ -23,6 +23,7 @@
//---------------------------------------------------------------------------
#include <iostream>
#include <fstream>
#include <string>
#include <vector>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment