diff --git a/src/osg/AlphaFunc.cpp b/src/osg/AlphaFunc.cpp index 7c74e7b9f..671347859 100644 --- a/src/osg/AlphaFunc.cpp +++ b/src/osg/AlphaFunc.cpp @@ -1,4 +1,4 @@ -#include "osg/AlphaFunc" +#include using namespace osg; diff --git a/src/osg/BoundingBox.cpp b/src/osg/BoundingBox.cpp index e817791d3..c313d623a 100644 --- a/src/osg/BoundingBox.cpp +++ b/src/osg/BoundingBox.cpp @@ -1,5 +1,5 @@ -#include "osg/BoundingBox" -#include "osg/BoundingSphere" +#include +#include using namespace osg; diff --git a/src/osg/BoundingSphere.cpp b/src/osg/BoundingSphere.cpp index 4729e7ead..8aab06e79 100644 --- a/src/osg/BoundingSphere.cpp +++ b/src/osg/BoundingSphere.cpp @@ -1,4 +1,4 @@ -#include "osg/BoundingSphere" +#include using namespace osg; diff --git a/src/osg/CullFace.cpp b/src/osg/CullFace.cpp index 6b05e61d5..a08e5be7f 100644 --- a/src/osg/CullFace.cpp +++ b/src/osg/CullFace.cpp @@ -1,5 +1,5 @@ -#include "osg/GL" -#include "osg/CullFace" +#include +#include using namespace osg; diff --git a/src/osg/EarthSky.cpp b/src/osg/EarthSky.cpp index fc8f0a481..ed6666933 100644 --- a/src/osg/EarthSky.cpp +++ b/src/osg/EarthSky.cpp @@ -1,4 +1,4 @@ -#include "osg/EarthSky" +#include #include diff --git a/src/osg/Fog.cpp b/src/osg/Fog.cpp index 44b2a485c..2c2bf7228 100644 --- a/src/osg/Fog.cpp +++ b/src/osg/Fog.cpp @@ -1,4 +1,4 @@ -#include "osg/Fog" +#include using namespace osg; diff --git a/src/osg/FrontFace.cpp b/src/osg/FrontFace.cpp index f361eefbb..39a84755b 100644 --- a/src/osg/FrontFace.cpp +++ b/src/osg/FrontFace.cpp @@ -1,5 +1,5 @@ -#include "osg/GL" -#include "osg/FrontFace" +#include +#include using namespace osg; diff --git a/src/osg/GLExtensions.cpp b/src/osg/GLExtensions.cpp index 68a46b73c..3654a583b 100644 --- a/src/osg/GLExtensions.cpp +++ b/src/osg/GLExtensions.cpp @@ -4,9 +4,9 @@ #include #endif -#include "osg/GL" -#include "osg/GLExtensions" -#include "osg/Notify" +#include +#include +#include #include diff --git a/src/osg/GeoSet.cpp b/src/osg/GeoSet.cpp index 7de912fe8..76891fbb4 100644 --- a/src/osg/GeoSet.cpp +++ b/src/osg/GeoSet.cpp @@ -6,10 +6,10 @@ #include #include -#include "osg/GeoSet" -#include "osg/Notify" +#include +#include -//#include "osg/mem_ptr" +//#include using namespace osg; diff --git a/src/osg/GeoSet_ogl.cpp b/src/osg/GeoSet_ogl.cpp index 73dba0df3..ee5f47ac4 100644 --- a/src/osg/GeoSet_ogl.cpp +++ b/src/osg/GeoSet_ogl.cpp @@ -3,9 +3,9 @@ #endif #include -#include "osg/GL" -#include "osg/GeoSet" -#include "osg/Notify" +#include +#include +#include using namespace osg; diff --git a/src/osg/Geode.cpp b/src/osg/Geode.cpp index af6ac6373..3a1b7b4de 100644 --- a/src/osg/Geode.cpp +++ b/src/osg/Geode.cpp @@ -1,6 +1,6 @@ #include #include -#include "osg/Geode" +#include #define square(x) ((x)*(x)) diff --git a/src/osg/Group.cpp b/src/osg/Group.cpp index 7a7f57120..012345b1c 100644 --- a/src/osg/Group.cpp +++ b/src/osg/Group.cpp @@ -1,7 +1,7 @@ #include #include -#include "osg/Group" -#include "osg/BoundingBox" +#include +#include #include diff --git a/src/osg/Impostor.cpp b/src/osg/Impostor.cpp index 4308e7520..9832726cb 100644 --- a/src/osg/Impostor.cpp +++ b/src/osg/Impostor.cpp @@ -1,4 +1,4 @@ -#include "osg/Impostor" +#include #include diff --git a/src/osg/LOD.cpp b/src/osg/LOD.cpp index 3dc1ec92c..762041f8f 100644 --- a/src/osg/LOD.cpp +++ b/src/osg/LOD.cpp @@ -1,4 +1,4 @@ -#include "osg/LOD" +#include #include diff --git a/src/osg/Light.cpp b/src/osg/Light.cpp index ab3ccaf9c..bd88aa509 100644 --- a/src/osg/Light.cpp +++ b/src/osg/Light.cpp @@ -1,5 +1,5 @@ -#include "osg/Light" -#include "osg/Notify" +#include +#include using namespace osg; diff --git a/src/osg/LightSource.cpp b/src/osg/LightSource.cpp index 5052ea4dd..5ebd3158e 100644 --- a/src/osg/LightSource.cpp +++ b/src/osg/LightSource.cpp @@ -1,4 +1,4 @@ -#include "osg/LightSource" +#include using namespace osg; diff --git a/src/osg/LineSegment.cpp b/src/osg/LineSegment.cpp index 7ed9ebe70..1432e073c 100644 --- a/src/osg/LineSegment.cpp +++ b/src/osg/LineSegment.cpp @@ -1,4 +1,4 @@ -#include "osg/LineSegment" +#include using namespace osg; diff --git a/src/osg/Material.cpp b/src/osg/Material.cpp index 6b441aea4..d63e65e8a 100644 --- a/src/osg/Material.cpp +++ b/src/osg/Material.cpp @@ -1,5 +1,5 @@ -#include "osg/Material" -#include "osg/BoundsChecking" +#include +#include using namespace osg; diff --git a/src/osg/Node.cpp b/src/osg/Node.cpp index 36258db1f..58c21e7c3 100644 --- a/src/osg/Node.cpp +++ b/src/osg/Node.cpp @@ -1,8 +1,8 @@ -#include "osg/Node" -#include "osg/Group" -#include "osg/NodeVisitor" +#include +#include +#include -#include "osg/Notify" +#include #include diff --git a/src/osg/NodeVisitor.cpp b/src/osg/NodeVisitor.cpp index 9134d71cb..3f9832bb1 100644 --- a/src/osg/NodeVisitor.cpp +++ b/src/osg/NodeVisitor.cpp @@ -1,4 +1,4 @@ -#include "osg/NodeVisitor" +#include #include using namespace osg; diff --git a/src/osg/Notify.cpp b/src/osg/Notify.cpp index 46a65a995..8693d38db 100644 --- a/src/osg/Notify.cpp +++ b/src/osg/Notify.cpp @@ -1,4 +1,4 @@ -#include "osg/Notify" +#include #include osg::NotifySeverity osg::g_NotifyLevel = osg::NOTICE; diff --git a/src/osg/Object.cpp b/src/osg/Object.cpp index 1b5d2dd28..50bc920e4 100644 --- a/src/osg/Object.cpp +++ b/src/osg/Object.cpp @@ -1,4 +1,4 @@ -#include "osg/Object" +#include using namespace osg; diff --git a/src/osg/Point.cpp b/src/osg/Point.cpp index 88341c035..ae9fe3b8b 100644 --- a/src/osg/Point.cpp +++ b/src/osg/Point.cpp @@ -1,10 +1,10 @@ // Ideas and code borrowed from GLUT pointburst demo // written by Mark J. Kilgard -#include "osg/GL" -#include "osg/GLExtensions" -#include "osg/Point" -#include "osg/Notify" +#include +#include +#include +#include using namespace osg; diff --git a/src/osg/PolygonMode.cpp b/src/osg/PolygonMode.cpp index 7ad33c43a..8cd59dd9f 100644 --- a/src/osg/PolygonMode.cpp +++ b/src/osg/PolygonMode.cpp @@ -1,6 +1,6 @@ -#include "osg/GL" -#include "osg/PolygonMode" -#include "osg/Notify" +#include +#include +#include using namespace osg; diff --git a/src/osg/PolygonOffset.cpp b/src/osg/PolygonOffset.cpp index 740d47437..79bee3049 100644 --- a/src/osg/PolygonOffset.cpp +++ b/src/osg/PolygonOffset.cpp @@ -1,5 +1,5 @@ -#include "osg/GL" -#include "osg/PolygonOffset" +#include +#include using namespace osg; diff --git a/src/osg/Quat.cpp b/src/osg/Quat.cpp index ec1b529e2..4e13bfded 100644 --- a/src/osg/Quat.cpp +++ b/src/osg/Quat.cpp @@ -1,8 +1,8 @@ #include -#include "osg/Quat" -#include "osg/Vec4" -#include "osg/Vec3" -#include "osg/Types" +#include +#include +#include +#include #include diff --git a/src/osg/Switch.cpp b/src/osg/Switch.cpp index bf5f39403..1dc5a68b2 100644 --- a/src/osg/Switch.cpp +++ b/src/osg/Switch.cpp @@ -1,4 +1,4 @@ -#include "osg/Switch" +#include #include diff --git a/src/osg/TexEnv.cpp b/src/osg/TexEnv.cpp index 089b1b357..ed079552b 100644 --- a/src/osg/TexEnv.cpp +++ b/src/osg/TexEnv.cpp @@ -1,4 +1,4 @@ -#include "osg/TexEnv" +#include using namespace osg; diff --git a/src/osg/TexGen.cpp b/src/osg/TexGen.cpp index 3b72d917e..edf42468f 100644 --- a/src/osg/TexGen.cpp +++ b/src/osg/TexGen.cpp @@ -1,5 +1,5 @@ -#include "osg/TexGen" -#include "osg/Notify" +#include +#include using namespace osg; diff --git a/src/osg/TexMat.cpp b/src/osg/TexMat.cpp index 67400b439..21144a24e 100644 --- a/src/osg/TexMat.cpp +++ b/src/osg/TexMat.cpp @@ -1,5 +1,5 @@ -#include "osg/GL" -#include "osg/TexMat" +#include +#include using namespace osg; diff --git a/src/osg/Transform.cpp b/src/osg/Transform.cpp index 863f4e4e6..95ee61663 100644 --- a/src/osg/Transform.cpp +++ b/src/osg/Transform.cpp @@ -1,4 +1,4 @@ -#include "osg/Transform" +#include using namespace osg; diff --git a/src/osg/Transparency.cpp b/src/osg/Transparency.cpp index a241e576d..34814efe5 100644 --- a/src/osg/Transparency.cpp +++ b/src/osg/Transparency.cpp @@ -1,4 +1,4 @@ -#include "osg/Transparency" +#include using namespace osg; diff --git a/src/osg/Version.cpp b/src/osg/Version.cpp index 885473c29..7cd6b9eda 100644 --- a/src/osg/Version.cpp +++ b/src/osg/Version.cpp @@ -1,4 +1,4 @@ -#include "osg/Version" +#include const char* osgGetVersion() { diff --git a/src/osgDB/DynamicLibrary.cpp b/src/osgDB/DynamicLibrary.cpp index 4fb0e81bb..03fc5e0eb 100644 --- a/src/osgDB/DynamicLibrary.cpp +++ b/src/osgDB/DynamicLibrary.cpp @@ -12,10 +12,10 @@ using namespace std; #endif -#include "osg/Notify" +#include -#include "osgDB/DynamicLibrary" -#include "osgDB/FileUtils" +#include +#include using namespace osg; using namespace osgDB; diff --git a/src/osgDB/FieldReader.cpp b/src/osgDB/FieldReader.cpp index 31575a5d8..0c5dd8513 100644 --- a/src/osgDB/FieldReader.cpp +++ b/src/osgDB/FieldReader.cpp @@ -1,5 +1,5 @@ -#include "osgDB/Field" -#include "osgDB/FieldReader" +#include +#include using namespace osgDB; diff --git a/src/osgDB/FileNameUtils.cpp b/src/osgDB/FileNameUtils.cpp index abe9d3904..5ebc8d694 100644 --- a/src/osgDB/FileNameUtils.cpp +++ b/src/osgDB/FileNameUtils.cpp @@ -1,4 +1,4 @@ -#include "osgDB/FileNameUtils" +#include // mac requires std::tolower, but IRIX MipsPro doesn't like it, diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp index 098208145..eaff1545c 100644 --- a/src/osgDB/FileUtils.cpp +++ b/src/osgDB/FileUtils.cpp @@ -10,14 +10,14 @@ #include #include -#include "osg/Notify" -#include "osg/Node" -#include "osg/Geode" -#include "osg/Group" +#include +#include +#include +#include -#include "osgDB/FileUtils" -#include "osgDB/FileNameUtils" -#include "osgDB/Registry" +#include +#include +#include using namespace osg; using namespace osgDB; @@ -319,8 +319,8 @@ std::string osgDB::findFileInDirectory(const std::string& fileName,const std::st #ifdef WIN32 -#include "io.h" -#include "direct.h" +#include +#include osgDB::DirectoryContents osgDB::getDirectoryContents(const std::string& dirName) { diff --git a/src/osgDB/ReadFile.cpp b/src/osgDB/ReadFile.cpp index 43a56596d..f6e375697 100644 --- a/src/osgDB/ReadFile.cpp +++ b/src/osgDB/ReadFile.cpp @@ -1,10 +1,10 @@ -#include "osg/Notify" -#include "osg/Object" -#include "osg/Image" -#include "osg/Node" +#include +#include +#include +#include -#include "osgDB/Registry" -#include "osgDB/ReadFile" +#include +#include using namespace osg; using namespace osgDB; diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp index 7f21a2f7e..7d396b3c1 100644 --- a/src/osgDB/Registry.cpp +++ b/src/osgDB/Registry.cpp @@ -1,14 +1,14 @@ -#include "osg/Notify" -#include "osg/Object" -#include "osg/Image" -#include "osg/Node" -#include "osg/Group" -#include "osg/Geode" +#include +#include +#include +#include +#include +#include -#include "osgDB/Registry" -#include "osgDB/FileUtils" -#include "osgDB/FileNameUtils" +#include +#include +#include #include diff --git a/src/osgDB/Version.cpp b/src/osgDB/Version.cpp index f7a9b9499..74328992d 100644 --- a/src/osgDB/Version.cpp +++ b/src/osgDB/Version.cpp @@ -1,4 +1,4 @@ -#include "osgDB/Version" +#include const char* osgDBGetVersion() { diff --git a/src/osgDB/WriteFile.cpp b/src/osgDB/WriteFile.cpp index a4c6bf00b..7bb4a39e7 100644 --- a/src/osgDB/WriteFile.cpp +++ b/src/osgDB/WriteFile.cpp @@ -1,13 +1,13 @@ -#include "osg/Notify" -#include "osg/Object" -#include "osg/Image" -#include "osg/Node" -#include "osg/Group" -#include "osg/Geode" +#include +#include +#include +#include +#include +#include -#include "osgDB/Registry" -#include "osgDB/WriteFile" +#include +#include using namespace osg; using namespace osgDB; diff --git a/src/osgGLUT/GLUTEventAdapter.cpp b/src/osgGLUT/GLUTEventAdapter.cpp index b777abdcd..fd6ea201e 100644 --- a/src/osgGLUT/GLUTEventAdapter.cpp +++ b/src/osgGLUT/GLUTEventAdapter.cpp @@ -1,4 +1,4 @@ -#include "osgGLUT/GLUTEventAdapter" +#include #include using namespace osgGLUT; diff --git a/src/osgGLUT/Version.cpp b/src/osgGLUT/Version.cpp index cb53aa913..5f0c5fcb3 100755 --- a/src/osgGLUT/Version.cpp +++ b/src/osgGLUT/Version.cpp @@ -1,4 +1,4 @@ -#include "osgGLUT/Version" +#include const char* osgGLUTGetVersion() { diff --git a/src/osgGLUT/Viewer.cpp b/src/osgGLUT/Viewer.cpp index 428c18baf..a94a3a373 100644 --- a/src/osgGLUT/Viewer.cpp +++ b/src/osgGLUT/Viewer.cpp @@ -12,8 +12,8 @@ #include -#include "osgGLUT/Viewer" -#include "osgGLUT/GLUTEventAdapter" +#include +#include #include #include diff --git a/src/osgUtil/CullViewState.cpp b/src/osgUtil/CullViewState.cpp index 5c0104dd4..9292b8a68 100644 --- a/src/osgUtil/CullViewState.cpp +++ b/src/osgUtil/CullViewState.cpp @@ -1,13 +1,13 @@ -#include "osg/Transform" -#include "osg/Geode" -#include "osg/LOD" -#include "osg/Billboard" -#include "osg/LightSource" -#include "osg/Impostor" -#include "osg/Notify" +#include +#include +#include +#include +#include +#include +#include -#include "osgUtil/CullViewState" +#include #include diff --git a/src/osgUtil/DisplayListVisitor.cpp b/src/osgUtil/DisplayListVisitor.cpp index 69c51d3ce..97026821e 100644 --- a/src/osgUtil/DisplayListVisitor.cpp +++ b/src/osgUtil/DisplayListVisitor.cpp @@ -1,5 +1,5 @@ -#include "osgUtil/DisplayListVisitor" -#include "osg/Drawable" +#include +#include using namespace osg; using namespace osgUtil; diff --git a/src/osgUtil/DriveManipulator.cpp b/src/osgUtil/DriveManipulator.cpp index 48241db81..76863166b 100644 --- a/src/osgUtil/DriveManipulator.cpp +++ b/src/osgUtil/DriveManipulator.cpp @@ -2,9 +2,9 @@ #pragma warning( disable : 4786 ) #endif -#include "osgUtil/DriveManipulator" -#include "osgUtil/IntersectVisitor" -#include "osg/Notify" +#include +#include +#include using namespace osg; using namespace osgUtil; diff --git a/src/osgUtil/IntersectVisitor.cpp b/src/osgUtil/IntersectVisitor.cpp index 449d5646f..7b1530e2a 100644 --- a/src/osgUtil/IntersectVisitor.cpp +++ b/src/osgUtil/IntersectVisitor.cpp @@ -1,9 +1,9 @@ -#include "osgUtil/IntersectVisitor" -#include "osg/Transform" -#include "osg/Geode" -#include "osg/LOD" -#include "osg/Billboard" -#include "osg/Notify" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/osgUtil/RenderGraph.cpp b/src/osgUtil/RenderGraph.cpp index 7f30feaad..3271c2ae9 100644 --- a/src/osgUtil/RenderGraph.cpp +++ b/src/osgUtil/RenderGraph.cpp @@ -1,6 +1,6 @@ -#include "osgUtil/RenderGraph" +#include -#include "osg/Notify" +#include using namespace osg; using namespace osgUtil; diff --git a/src/osgUtil/Version.cpp b/src/osgUtil/Version.cpp index 0a107b95a..32ad36500 100644 --- a/src/osgUtil/Version.cpp +++ b/src/osgUtil/Version.cpp @@ -1,4 +1,4 @@ -#include "osgUtil/Version" +#include const char* osgUtilGetVersion() { diff --git a/src/osgWX/Version.cpp b/src/osgWX/Version.cpp index 8bfe7066e..4229dc809 100644 --- a/src/osgWX/Version.cpp +++ b/src/osgWX/Version.cpp @@ -1,4 +1,4 @@ -#include "osgWX/Version" +#include const char* osgWXGetVersion() { diff --git a/src/osgWX/WXEventAdapter.cpp b/src/osgWX/WXEventAdapter.cpp index 888052587..ab3dc8c35 100644 --- a/src/osgWX/WXEventAdapter.cpp +++ b/src/osgWX/WXEventAdapter.cpp @@ -3,13 +3,13 @@ // // For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" +#include #ifndef WX_PRECOMP -#include "wx/wx.h" +#include #endif -#include "osgWX/WXEventAdapter" +#include using namespace osgWX;