diff --git a/src/osgPlugins/ive/AlphaFunc.h b/src/osgPlugins/ive/AlphaFunc.h index ef3a27bb1..d3d08c802 100644 --- a/src/osgPlugins/ive/AlphaFunc.h +++ b/src/osgPlugins/ive/AlphaFunc.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ - class AlphaFunc : public osg::AlphaFunc, public ReadWrite { + class AlphaFunc : public osg::AlphaFunc { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/AnimationPath.h b/src/osgPlugins/ive/AnimationPath.h index f839ea1c7..af542db52 100644 --- a/src/osgPlugins/ive/AnimationPath.h +++ b/src/osgPlugins/ive/AnimationPath.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class AnimationPath : public osg::AnimationPath, public ReadWrite { +class AnimationPath : public osg::AnimationPath { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/AnimationPathCallback.h b/src/osgPlugins/ive/AnimationPathCallback.h index 4e34f3df5..3544c1afd 100644 --- a/src/osgPlugins/ive/AnimationPathCallback.h +++ b/src/osgPlugins/ive/AnimationPathCallback.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class AnimationPathCallback : public osg::AnimationPathCallback, public ReadWrite { +class AnimationPathCallback : public osg::AnimationPathCallback { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/AnisotropicLighting.h b/src/osgPlugins/ive/AnisotropicLighting.h index a56d19311..c3467b110 100644 --- a/src/osgPlugins/ive/AnisotropicLighting.h +++ b/src/osgPlugins/ive/AnisotropicLighting.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class AnisotropicLighting : public osgFX::AnisotropicLighting, public ReadWrite { +class AnisotropicLighting : public osgFX::AnisotropicLighting { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/AutoTransform.h b/src/osgPlugins/ive/AutoTransform.h index 5fae4df99..06e9b1084 100644 --- a/src/osgPlugins/ive/AutoTransform.h +++ b/src/osgPlugins/ive/AutoTransform.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class AutoTransform : public osg::AutoTransform, public ReadWrite { +class AutoTransform : public osg::AutoTransform { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/AzimElevationSector.h b/src/osgPlugins/ive/AzimElevationSector.h index 0f6ef7722..3228113d2 100644 --- a/src/osgPlugins/ive/AzimElevationSector.h +++ b/src/osgPlugins/ive/AzimElevationSector.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class AzimElevationSector : public osgSim::AzimElevationSector, public ReadWrite { +class AzimElevationSector : public osgSim::AzimElevationSector { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/AzimSector.h b/src/osgPlugins/ive/AzimSector.h index f428b8ef8..2a3553890 100644 --- a/src/osgPlugins/ive/AzimSector.h +++ b/src/osgPlugins/ive/AzimSector.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class AzimSector : public osgSim::AzimSector, public ReadWrite { +class AzimSector : public osgSim::AzimSector { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Billboard.h b/src/osgPlugins/ive/Billboard.h index 0237b6ffb..accc68889 100644 --- a/src/osgPlugins/ive/Billboard.h +++ b/src/osgPlugins/ive/Billboard.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Billboard : public osg::Billboard, public ReadWrite { +class Billboard : public osg::Billboard { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/BlendColor.h b/src/osgPlugins/ive/BlendColor.h index 7315d01c9..aa7e51456 100644 --- a/src/osgPlugins/ive/BlendColor.h +++ b/src/osgPlugins/ive/BlendColor.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ - class BlendColor : public osg::BlendColor, public ReadWrite { + class BlendColor : public osg::BlendColor { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/BlendEquation.h b/src/osgPlugins/ive/BlendEquation.h index d883819d2..b6346256d 100644 --- a/src/osgPlugins/ive/BlendEquation.h +++ b/src/osgPlugins/ive/BlendEquation.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class BlendEquation : public osg::BlendEquation, public ReadWrite { +class BlendEquation : public osg::BlendEquation { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/BlendFunc.h b/src/osgPlugins/ive/BlendFunc.h index 9aef5f6f2..702b860f8 100644 --- a/src/osgPlugins/ive/BlendFunc.h +++ b/src/osgPlugins/ive/BlendFunc.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class BlendFunc : public osg::BlendFunc, public ReadWrite { +class BlendFunc : public osg::BlendFunc { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/BlinkSequence.h b/src/osgPlugins/ive/BlinkSequence.h index e2442de0a..1532dc023 100644 --- a/src/osgPlugins/ive/BlinkSequence.h +++ b/src/osgPlugins/ive/BlinkSequence.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class BlinkSequence : public osgSim::BlinkSequence, public ReadWrite { +class BlinkSequence : public osgSim::BlinkSequence { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/BumpMapping.h b/src/osgPlugins/ive/BumpMapping.h index 24560e06a..ddb9b3313 100644 --- a/src/osgPlugins/ive/BumpMapping.h +++ b/src/osgPlugins/ive/BumpMapping.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class BumpMapping : public osgFX::BumpMapping, public ReadWrite { +class BumpMapping : public osgFX::BumpMapping { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Camera.h b/src/osgPlugins/ive/Camera.h index 1a0e2fd41..4593165e5 100644 --- a/src/osgPlugins/ive/Camera.h +++ b/src/osgPlugins/ive/Camera.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Camera : public osg::Camera, public ReadWrite { +class Camera : public osg::Camera { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/CameraView.h b/src/osgPlugins/ive/CameraView.h index 3e9710bff..0d4fa3a94 100644 --- a/src/osgPlugins/ive/CameraView.h +++ b/src/osgPlugins/ive/CameraView.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class CameraView : public osg::CameraView, public ReadWrite { +class CameraView : public osg::CameraView { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Cartoon.h b/src/osgPlugins/ive/Cartoon.h index c5ab8aad7..e79221f39 100644 --- a/src/osgPlugins/ive/Cartoon.h +++ b/src/osgPlugins/ive/Cartoon.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Cartoon : public osgFX::Cartoon, public ReadWrite { +class Cartoon : public osgFX::Cartoon { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ClipNode.h b/src/osgPlugins/ive/ClipNode.h index 9b53e006f..468cc2f48 100644 --- a/src/osgPlugins/ive/ClipNode.h +++ b/src/osgPlugins/ive/ClipNode.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class ClipNode : public osg::ClipNode, public ReadWrite { +class ClipNode : public osg::ClipNode { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ClipPlane.h b/src/osgPlugins/ive/ClipPlane.h index 0c234638a..bc78eea4f 100644 --- a/src/osgPlugins/ive/ClipPlane.h +++ b/src/osgPlugins/ive/ClipPlane.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ - class ClipPlane : public osg::ClipPlane, public ReadWrite { + class ClipPlane : public osg::ClipPlane { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ClusterCullingCallback.h b/src/osgPlugins/ive/ClusterCullingCallback.h index 6a9278bb9..fbb1f370d 100644 --- a/src/osgPlugins/ive/ClusterCullingCallback.h +++ b/src/osgPlugins/ive/ClusterCullingCallback.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class ClusterCullingCallback : public osg::ClusterCullingCallback, public ReadWrite { +class ClusterCullingCallback : public osg::ClusterCullingCallback { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ColorMask.h b/src/osgPlugins/ive/ColorMask.h index c607d5868..3d4b1b2af 100644 --- a/src/osgPlugins/ive/ColorMask.h +++ b/src/osgPlugins/ive/ColorMask.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class ColorMask : public osg::ColorMask, public ReadWrite { +class ColorMask : public osg::ColorMask { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/CompositeLayer.h b/src/osgPlugins/ive/CompositeLayer.h index 63425f3b9..243f26a89 100644 --- a/src/osgPlugins/ive/CompositeLayer.h +++ b/src/osgPlugins/ive/CompositeLayer.h @@ -7,7 +7,7 @@ namespace ive { -class CompositeLayer : public osgTerrain::CompositeLayer, public ReadWrite +class CompositeLayer : public osgTerrain::CompositeLayer { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/ConeSector.h b/src/osgPlugins/ive/ConeSector.h index c56e21ba6..6450a3115 100644 --- a/src/osgPlugins/ive/ConeSector.h +++ b/src/osgPlugins/ive/ConeSector.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class ConeSector : public osgSim::ConeSector, public ReadWrite { +class ConeSector : public osgSim::ConeSector { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ConvexPlanarOccluder.h b/src/osgPlugins/ive/ConvexPlanarOccluder.h index cc6afb79b..85ebb6ccb 100644 --- a/src/osgPlugins/ive/ConvexPlanarOccluder.h +++ b/src/osgPlugins/ive/ConvexPlanarOccluder.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class ConvexPlanarOccluder : public osg::ConvexPlanarOccluder, public ReadWrite { +class ConvexPlanarOccluder : public osg::ConvexPlanarOccluder { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ConvexPlanarPolygon.h b/src/osgPlugins/ive/ConvexPlanarPolygon.h index 26c4945d8..042340f21 100644 --- a/src/osgPlugins/ive/ConvexPlanarPolygon.h +++ b/src/osgPlugins/ive/ConvexPlanarPolygon.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class ConvexPlanarPolygon : public osg::ConvexPlanarPolygon, public ReadWrite { +class ConvexPlanarPolygon : public osg::ConvexPlanarPolygon { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/CoordinateSystemNode.h b/src/osgPlugins/ive/CoordinateSystemNode.h index d65eaf35d..fc9b9c68c 100644 --- a/src/osgPlugins/ive/CoordinateSystemNode.h +++ b/src/osgPlugins/ive/CoordinateSystemNode.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class CoordinateSystemNode : public osg::CoordinateSystemNode, public ReadWrite { +class CoordinateSystemNode : public osg::CoordinateSystemNode { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/CullFace.h b/src/osgPlugins/ive/CullFace.h index 58c943b26..f0d2bce41 100644 --- a/src/osgPlugins/ive/CullFace.h +++ b/src/osgPlugins/ive/CullFace.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class CullFace : public osg::CullFace, public ReadWrite { +class CullFace : public osg::CullFace { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/DOFTransform.h b/src/osgPlugins/ive/DOFTransform.h index 57b6d9a35..4b994f15c 100644 --- a/src/osgPlugins/ive/DOFTransform.h +++ b/src/osgPlugins/ive/DOFTransform.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class DOFTransform : public osgSim::DOFTransform, public ReadWrite { +class DOFTransform : public osgSim::DOFTransform { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Depth.h b/src/osgPlugins/ive/Depth.h index 97d7ee4a5..de22e54fc 100644 --- a/src/osgPlugins/ive/Depth.h +++ b/src/osgPlugins/ive/Depth.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Depth : public osg::Depth, public ReadWrite { +class Depth : public osg::Depth { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/DirectionalSector.h b/src/osgPlugins/ive/DirectionalSector.h index d268030b7..4a141da39 100644 --- a/src/osgPlugins/ive/DirectionalSector.h +++ b/src/osgPlugins/ive/DirectionalSector.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class DirectionalSector : public osgSim::DirectionalSector, public ReadWrite { +class DirectionalSector : public osgSim::DirectionalSector { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/DrawArrayLengths.h b/src/osgPlugins/ive/DrawArrayLengths.h index 922608250..d2679998b 100644 --- a/src/osgPlugins/ive/DrawArrayLengths.h +++ b/src/osgPlugins/ive/DrawArrayLengths.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class DrawArrayLengths : public osg::DrawArrayLengths, public ReadWrite { +class DrawArrayLengths : public osg::DrawArrayLengths { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/DrawArrays.h b/src/osgPlugins/ive/DrawArrays.h index 4ec059cd1..c8ce11928 100644 --- a/src/osgPlugins/ive/DrawArrays.h +++ b/src/osgPlugins/ive/DrawArrays.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class DrawArrays : public ReadWrite, public osg::DrawArrays{ +class DrawArrays : public osg::DrawArrays{ public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/DrawElementsUByte.h b/src/osgPlugins/ive/DrawElementsUByte.h index d6e1ebeda..40708a944 100644 --- a/src/osgPlugins/ive/DrawElementsUByte.h +++ b/src/osgPlugins/ive/DrawElementsUByte.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class DrawElementsUByte : public osg::DrawElementsUByte, public ReadWrite { +class DrawElementsUByte : public osg::DrawElementsUByte { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/DrawElementsUInt.h b/src/osgPlugins/ive/DrawElementsUInt.h index 43f98c35e..ec06023de 100644 --- a/src/osgPlugins/ive/DrawElementsUInt.h +++ b/src/osgPlugins/ive/DrawElementsUInt.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class DrawElementsUInt : public osg::DrawElementsUInt, public ReadWrite { +class DrawElementsUInt : public osg::DrawElementsUInt { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/DrawElementsUShort.h b/src/osgPlugins/ive/DrawElementsUShort.h index e7c1a67f9..be393186a 100644 --- a/src/osgPlugins/ive/DrawElementsUShort.h +++ b/src/osgPlugins/ive/DrawElementsUShort.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class DrawElementsUShort : public osg::DrawElementsUShort, public ReadWrite { +class DrawElementsUShort : public osg::DrawElementsUShort { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Drawable.h b/src/osgPlugins/ive/Drawable.h index d60a66aec..3935028f4 100644 --- a/src/osgPlugins/ive/Drawable.h +++ b/src/osgPlugins/ive/Drawable.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Drawable : public ReadWrite, public osg::Drawable{ +class Drawable : public osg::Drawable{ public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Effect.h b/src/osgPlugins/ive/Effect.h index 929abf15e..821505e43 100644 --- a/src/osgPlugins/ive/Effect.h +++ b/src/osgPlugins/ive/Effect.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Effect : public osgFX::Effect, public ReadWrite { +class Effect : public osgFX::Effect { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ElevationSector.h b/src/osgPlugins/ive/ElevationSector.h index af99810e4..a27094c31 100644 --- a/src/osgPlugins/ive/ElevationSector.h +++ b/src/osgPlugins/ive/ElevationSector.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class ElevationSector : public osgSim::ElevationSector, public ReadWrite { +class ElevationSector : public osgSim::ElevationSector { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/EllipsoidModel.h b/src/osgPlugins/ive/EllipsoidModel.h index 2162245d0..b66acfaba 100644 --- a/src/osgPlugins/ive/EllipsoidModel.h +++ b/src/osgPlugins/ive/EllipsoidModel.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class EllipsoidModel : public osg::EllipsoidModel, public ReadWrite { +class EllipsoidModel : public osg::EllipsoidModel { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/FadeText.h b/src/osgPlugins/ive/FadeText.h index 255c7c2f8..58d4bf160 100644 --- a/src/osgPlugins/ive/FadeText.h +++ b/src/osgPlugins/ive/FadeText.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class FadeText : public osgText::FadeText, public ReadWrite { +class FadeText : public osgText::FadeText { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Fog.h b/src/osgPlugins/ive/Fog.h index 431b28450..796a795e4 100644 --- a/src/osgPlugins/ive/Fog.h +++ b/src/osgPlugins/ive/Fog.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ - class Fog : public osg::Fog, public ReadWrite { + class Fog : public osg::Fog { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/FragmentProgram.h b/src/osgPlugins/ive/FragmentProgram.h index 399ad4767..8c17c57da 100644 --- a/src/osgPlugins/ive/FragmentProgram.h +++ b/src/osgPlugins/ive/FragmentProgram.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class FragmentProgram : public osg::FragmentProgram, public ReadWrite { +class FragmentProgram : public osg::FragmentProgram { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/FrontFace.h b/src/osgPlugins/ive/FrontFace.h index 5c99d7ead..19453208b 100644 --- a/src/osgPlugins/ive/FrontFace.h +++ b/src/osgPlugins/ive/FrontFace.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class FrontFace : public osg::FrontFace, public ReadWrite { +class FrontFace : public osg::FrontFace { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Geode.h b/src/osgPlugins/ive/Geode.h index 5841969f7..da39c7c86 100644 --- a/src/osgPlugins/ive/Geode.h +++ b/src/osgPlugins/ive/Geode.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Geode : public ReadWrite, public osg::Geode{ +class Geode : public osg::Geode{ public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Geometry.h b/src/osgPlugins/ive/Geometry.h index e203faef6..327b95ac1 100644 --- a/src/osgPlugins/ive/Geometry.h +++ b/src/osgPlugins/ive/Geometry.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Geometry : public ReadWrite, public deprecated_osg::Geometry { +class Geometry : public deprecated_osg::Geometry { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Group.h b/src/osgPlugins/ive/Group.h index f2cd2117a..a40fa881d 100644 --- a/src/osgPlugins/ive/Group.h +++ b/src/osgPlugins/ive/Group.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Group : public osg::Group, public ReadWrite{ +class Group : public osg::Group{ public: void write(DataOutputStream* out); void read(DataInputStream* out); diff --git a/src/osgPlugins/ive/HeightFieldLayer.h b/src/osgPlugins/ive/HeightFieldLayer.h index 7aafb88cd..b8bfbdac9 100644 --- a/src/osgPlugins/ive/HeightFieldLayer.h +++ b/src/osgPlugins/ive/HeightFieldLayer.h @@ -20,7 +20,7 @@ namespace ive { -class HeightFieldLayer : public osgTerrain::HeightFieldLayer, public ReadWrite +class HeightFieldLayer : public osgTerrain::HeightFieldLayer { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/Image.h b/src/osgPlugins/ive/Image.h index 07b8c62b5..121fcfe6c 100644 --- a/src/osgPlugins/ive/Image.h +++ b/src/osgPlugins/ive/Image.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Image : public osg::Image, public ReadWrite { +class Image : public osg::Image { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ImageLayer.h b/src/osgPlugins/ive/ImageLayer.h index a7243471e..88ae60751 100644 --- a/src/osgPlugins/ive/ImageLayer.h +++ b/src/osgPlugins/ive/ImageLayer.h @@ -21,7 +21,7 @@ namespace ive { -class ImageLayer : public osgTerrain::ImageLayer, public ReadWrite +class ImageLayer : public osgTerrain::ImageLayer { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/ImageSequence.h b/src/osgPlugins/ive/ImageSequence.h index 0f6311995..b9d606b33 100644 --- a/src/osgPlugins/ive/ImageSequence.h +++ b/src/osgPlugins/ive/ImageSequence.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class ImageSequence : public osg::ImageSequence, public ReadWrite { +class ImageSequence : public osg::ImageSequence { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Impostor.h b/src/osgPlugins/ive/Impostor.h index 43b97b79b..cbc83a438 100644 --- a/src/osgPlugins/ive/Impostor.h +++ b/src/osgPlugins/ive/Impostor.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Impostor : public osgSim::Impostor, public ReadWrite { +class Impostor : public osgSim::Impostor { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/LOD.h b/src/osgPlugins/ive/LOD.h index 4917c799e..8d0b1a8fe 100644 --- a/src/osgPlugins/ive/LOD.h +++ b/src/osgPlugins/ive/LOD.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class LOD : public osg::LOD, public ReadWrite { +class LOD : public osg::LOD { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Layer.h b/src/osgPlugins/ive/Layer.h index a333de3de..35232796d 100644 --- a/src/osgPlugins/ive/Layer.h +++ b/src/osgPlugins/ive/Layer.h @@ -33,7 +33,7 @@ class LayerHelper osgTerrain::Locator* readLocator(DataInputStream* in); }; -class Layer : public osgTerrain::Layer, public ReadWrite +class Layer : public osgTerrain::Layer { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/Light.h b/src/osgPlugins/ive/Light.h index 033e10708..3b94d78b8 100644 --- a/src/osgPlugins/ive/Light.h +++ b/src/osgPlugins/ive/Light.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Light : public osg::Light, public ReadWrite { +class Light : public osg::Light { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/LightModel.h b/src/osgPlugins/ive/LightModel.h index 6e92a09de..b4a0414b1 100644 --- a/src/osgPlugins/ive/LightModel.h +++ b/src/osgPlugins/ive/LightModel.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ - class LightModel : public osg::LightModel, public ReadWrite { + class LightModel : public osg::LightModel { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/LightPoint.h b/src/osgPlugins/ive/LightPoint.h index 8382a0e59..54c469c18 100644 --- a/src/osgPlugins/ive/LightPoint.h +++ b/src/osgPlugins/ive/LightPoint.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class LightPoint : public osgSim::LightPoint, public ReadWrite { +class LightPoint : public osgSim::LightPoint { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/LightPointNode.h b/src/osgPlugins/ive/LightPointNode.h index 7c5f29b7c..613c8bc20 100644 --- a/src/osgPlugins/ive/LightPointNode.h +++ b/src/osgPlugins/ive/LightPointNode.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class LightPointNode : public osgSim::LightPointNode, public ReadWrite { +class LightPointNode : public osgSim::LightPointNode { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/LightSource.h b/src/osgPlugins/ive/LightSource.h index b03b8afb7..153176534 100644 --- a/src/osgPlugins/ive/LightSource.h +++ b/src/osgPlugins/ive/LightSource.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class LightSource : public osg::LightSource, public ReadWrite { +class LightSource : public osg::LightSource { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/LineStipple.h b/src/osgPlugins/ive/LineStipple.h index 78f2e39e6..da904b904 100644 --- a/src/osgPlugins/ive/LineStipple.h +++ b/src/osgPlugins/ive/LineStipple.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class LineStipple : public osg::LineStipple, public ReadWrite { +class LineStipple : public osg::LineStipple { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/LineWidth.h b/src/osgPlugins/ive/LineWidth.h index f99c8bae7..768089156 100644 --- a/src/osgPlugins/ive/LineWidth.h +++ b/src/osgPlugins/ive/LineWidth.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class LineWidth : public osg::LineWidth, public ReadWrite { +class LineWidth : public osg::LineWidth { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Locator.h b/src/osgPlugins/ive/Locator.h index ac13ab742..f34722331 100644 --- a/src/osgPlugins/ive/Locator.h +++ b/src/osgPlugins/ive/Locator.h @@ -18,7 +18,7 @@ #include "ReadWrite.h" namespace ive{ -class Locator : public osgTerrain::Locator, public ReadWrite { +class Locator : public osgTerrain::Locator { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Material.h b/src/osgPlugins/ive/Material.h index 341708e33..ec97bd43d 100644 --- a/src/osgPlugins/ive/Material.h +++ b/src/osgPlugins/ive/Material.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Material : public osg::Material, public ReadWrite { +class Material : public osg::Material { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/MatrixTransform.h b/src/osgPlugins/ive/MatrixTransform.h index 1b59cafb8..3ee6ade19 100644 --- a/src/osgPlugins/ive/MatrixTransform.h +++ b/src/osgPlugins/ive/MatrixTransform.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class MatrixTransform : public osg::MatrixTransform, public ReadWrite { +class MatrixTransform : public osg::MatrixTransform { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/MultiSwitch.h b/src/osgPlugins/ive/MultiSwitch.h index c1ae42d25..0f7eac00d 100644 --- a/src/osgPlugins/ive/MultiSwitch.h +++ b/src/osgPlugins/ive/MultiSwitch.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class MultiSwitch : public osgSim::MultiSwitch, public ReadWrite { +class MultiSwitch : public osgSim::MultiSwitch { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/MultiTextureControl.h b/src/osgPlugins/ive/MultiTextureControl.h index d2e87d747..674467c50 100644 --- a/src/osgPlugins/ive/MultiTextureControl.h +++ b/src/osgPlugins/ive/MultiTextureControl.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class MultiTextureControl : public osgFX::MultiTextureControl, public ReadWrite { +class MultiTextureControl : public osgFX::MultiTextureControl { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Multisample.h b/src/osgPlugins/ive/Multisample.h index 0ea45775a..29aad2d8a 100644 --- a/src/osgPlugins/ive/Multisample.h +++ b/src/osgPlugins/ive/Multisample.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Multisample : public osg::Multisample, public ReadWrite { +class Multisample : public osg::Multisample { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Node.h b/src/osgPlugins/ive/Node.h index 3f7b37fad..fce58bc27 100644 --- a/src/osgPlugins/ive/Node.h +++ b/src/osgPlugins/ive/Node.h @@ -6,7 +6,7 @@ #include namespace ive{ -class Node : public osg::Node, public ReadWrite{ +class Node : public osg::Node{ public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Object.h b/src/osgPlugins/ive/Object.h index dcde6115c..c33c0e58e 100644 --- a/src/osgPlugins/ive/Object.h +++ b/src/osgPlugins/ive/Object.h @@ -7,7 +7,7 @@ namespace ive{ -class Object : public ReadWrite, public osg::Object{ +class Object : public osg::Object{ public: void write(DataOutputStream* out); void read(DataInputStream* out); diff --git a/src/osgPlugins/ive/OccluderNode.h b/src/osgPlugins/ive/OccluderNode.h index 7e560f654..885ce621b 100644 --- a/src/osgPlugins/ive/OccluderNode.h +++ b/src/osgPlugins/ive/OccluderNode.h @@ -6,7 +6,7 @@ #include "ReadWrite.h" namespace ive{ -class OccluderNode : public osg::OccluderNode, public ReadWrite { +class OccluderNode : public osg::OccluderNode { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/OcclusionQueryNode.h b/src/osgPlugins/ive/OcclusionQueryNode.h index 6ad0c9348..2886237af 100644 --- a/src/osgPlugins/ive/OcclusionQueryNode.h +++ b/src/osgPlugins/ive/OcclusionQueryNode.h @@ -6,7 +6,7 @@ #include "ReadWrite.h" namespace ive{ -class OcclusionQueryNode : public osg::OcclusionQueryNode, public ReadWrite { +class OcclusionQueryNode : public osg::OcclusionQueryNode { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/PagedLOD.h b/src/osgPlugins/ive/PagedLOD.h index f2c88ff5d..ca58daefe 100644 --- a/src/osgPlugins/ive/PagedLOD.h +++ b/src/osgPlugins/ive/PagedLOD.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class PagedLOD : public osg::PagedLOD, public ReadWrite { +class PagedLOD : public osg::PagedLOD { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Point.h b/src/osgPlugins/ive/Point.h index 84d2354f2..25f1e29f5 100644 --- a/src/osgPlugins/ive/Point.h +++ b/src/osgPlugins/ive/Point.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Point : public osg::Point, public ReadWrite { +class Point : public osg::Point { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/PointSprite.h b/src/osgPlugins/ive/PointSprite.h index 53ae8f21d..05bdd9b42 100644 --- a/src/osgPlugins/ive/PointSprite.h +++ b/src/osgPlugins/ive/PointSprite.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class PointSprite : public osg::PointSprite, public ReadWrite { +class PointSprite : public osg::PointSprite { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/PolygonMode.h b/src/osgPlugins/ive/PolygonMode.h index b5f3c441d..1298f03cc 100644 --- a/src/osgPlugins/ive/PolygonMode.h +++ b/src/osgPlugins/ive/PolygonMode.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class PolygonMode : public osg::PolygonMode, public ReadWrite { +class PolygonMode : public osg::PolygonMode { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/PolygonOffset.h b/src/osgPlugins/ive/PolygonOffset.h index 9751ffe29..5f08ca1cd 100644 --- a/src/osgPlugins/ive/PolygonOffset.h +++ b/src/osgPlugins/ive/PolygonOffset.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class PolygonOffset : public osg::PolygonOffset, public ReadWrite { +class PolygonOffset : public osg::PolygonOffset { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/PolygonStipple.h b/src/osgPlugins/ive/PolygonStipple.h index b3badf1e4..d21b4566e 100644 --- a/src/osgPlugins/ive/PolygonStipple.h +++ b/src/osgPlugins/ive/PolygonStipple.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class PolygonStipple : public osg::PolygonStipple, public ReadWrite { +class PolygonStipple : public osg::PolygonStipple { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/PositionAttitudeTransform.h b/src/osgPlugins/ive/PositionAttitudeTransform.h index b38d31973..04f25f7e5 100644 --- a/src/osgPlugins/ive/PositionAttitudeTransform.h +++ b/src/osgPlugins/ive/PositionAttitudeTransform.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class PositionAttitudeTransform : public osg::PositionAttitudeTransform, public ReadWrite { +class PositionAttitudeTransform : public osg::PositionAttitudeTransform { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/PrimitiveSet.h b/src/osgPlugins/ive/PrimitiveSet.h index 04202d461..e3daf8438 100644 --- a/src/osgPlugins/ive/PrimitiveSet.h +++ b/src/osgPlugins/ive/PrimitiveSet.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class PrimitiveSet : public ReadWrite, public osg::PrimitiveSet{ +class PrimitiveSet : public osg::PrimitiveSet{ public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Program.h b/src/osgPlugins/ive/Program.h index 856c2d40a..8005673df 100644 --- a/src/osgPlugins/ive/Program.h +++ b/src/osgPlugins/ive/Program.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Program : public osg::Program, public ReadWrite { +class Program : public osg::Program { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ProxyNode.h b/src/osgPlugins/ive/ProxyNode.h index 7beefc920..761c23f97 100644 --- a/src/osgPlugins/ive/ProxyNode.h +++ b/src/osgPlugins/ive/ProxyNode.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class ProxyNode : public osg::ProxyNode, public ReadWrite { +class ProxyNode : public osg::ProxyNode { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ReadWrite.h b/src/osgPlugins/ive/ReadWrite.h index 73e22b016..e12c600d3 100644 --- a/src/osgPlugins/ive/ReadWrite.h +++ b/src/osgPlugins/ive/ReadWrite.h @@ -179,9 +179,5 @@ namespace ive { #define IVETEXT3D 0x10000002 #define IVEFADETEXT 0x10000003 -class ReadWrite{ -public: -}; - } #endif // IVE_READWRITE diff --git a/src/osgPlugins/ive/Scissor.h b/src/osgPlugins/ive/Scissor.h index 51784a84b..9a2670cde 100644 --- a/src/osgPlugins/ive/Scissor.h +++ b/src/osgPlugins/ive/Scissor.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Scissor : public osg::Scissor, public ReadWrite { +class Scissor : public osg::Scissor { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Scribe.h b/src/osgPlugins/ive/Scribe.h index 6964f3be1..0f3a2bb78 100644 --- a/src/osgPlugins/ive/Scribe.h +++ b/src/osgPlugins/ive/Scribe.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Scribe : public osgFX::Scribe, public ReadWrite { +class Scribe : public osgFX::Scribe { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Sequence.h b/src/osgPlugins/ive/Sequence.h index 61655d610..f2ef07ece 100644 --- a/src/osgPlugins/ive/Sequence.h +++ b/src/osgPlugins/ive/Sequence.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Sequence : public osg::Sequence, public ReadWrite { +class Sequence : public osg::Sequence { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ShadeModel.h b/src/osgPlugins/ive/ShadeModel.h index 113d46dce..c201ed64a 100644 --- a/src/osgPlugins/ive/ShadeModel.h +++ b/src/osgPlugins/ive/ShadeModel.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class ShadeModel : public osg::ShadeModel, public ReadWrite { +class ShadeModel : public osg::ShadeModel { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Shader.h b/src/osgPlugins/ive/Shader.h index 1d25349d7..6e9222127 100644 --- a/src/osgPlugins/ive/Shader.h +++ b/src/osgPlugins/ive/Shader.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Shader : public osg::Shader, public ReadWrite { +class Shader : public osg::Shader { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Shape.h b/src/osgPlugins/ive/Shape.h index 0f453d67b..2f3e92a1f 100644 --- a/src/osgPlugins/ive/Shape.h +++ b/src/osgPlugins/ive/Shape.h @@ -6,37 +6,37 @@ namespace ive{ -class Sphere : public osg::Sphere, public ReadWrite { +class Sphere : public osg::Sphere { public: void write(DataOutputStream* out); void read(DataInputStream* in); }; -class Box : public osg::Box, public ReadWrite { +class Box : public osg::Box { public: void write(DataOutputStream* out); void read(DataInputStream* in); }; -class Cone : public osg::Cone, public ReadWrite { +class Cone : public osg::Cone { public: void write(DataOutputStream* out); void read(DataInputStream* in); }; -class Cylinder : public osg::Cylinder, public ReadWrite { +class Cylinder : public osg::Cylinder { public: void write(DataOutputStream* out); void read(DataInputStream* in); }; -class Capsule : public osg::Capsule, public ReadWrite { +class Capsule : public osg::Capsule { public: void write(DataOutputStream* out); void read(DataInputStream* in); }; -class HeightField : public osg::HeightField, public ReadWrite { +class HeightField : public osg::HeightField { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ShapeAttributeList.h b/src/osgPlugins/ive/ShapeAttributeList.h index 6aac4d988..a26b3aafd 100644 --- a/src/osgPlugins/ive/ShapeAttributeList.h +++ b/src/osgPlugins/ive/ShapeAttributeList.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class ShapeAttributeList : public osgSim::ShapeAttributeList, public ReadWrite { +class ShapeAttributeList : public osgSim::ShapeAttributeList { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/ShapeDrawable.h b/src/osgPlugins/ive/ShapeDrawable.h index 8e0645d9f..5487a9ecc 100644 --- a/src/osgPlugins/ive/ShapeDrawable.h +++ b/src/osgPlugins/ive/ShapeDrawable.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class ShapeDrawable : public osg::ShapeDrawable, public ReadWrite { +class ShapeDrawable : public osg::ShapeDrawable { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/SpecularHighlights.h b/src/osgPlugins/ive/SpecularHighlights.h index 919d9814e..df8e527dc 100644 --- a/src/osgPlugins/ive/SpecularHighlights.h +++ b/src/osgPlugins/ive/SpecularHighlights.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class SpecularHighlights : public osgFX::SpecularHighlights, public ReadWrite { +class SpecularHighlights : public osgFX::SpecularHighlights { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/StateSet.h b/src/osgPlugins/ive/StateSet.h index 204af7802..706751f13 100644 --- a/src/osgPlugins/ive/StateSet.h +++ b/src/osgPlugins/ive/StateSet.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class StateSet : public ReadWrite, public osg::StateSet{ +class StateSet : public osg::StateSet { public: void write(DataOutputStream* out); void read(DataInputStream* out); diff --git a/src/osgPlugins/ive/Stencil.h b/src/osgPlugins/ive/Stencil.h index 8fec542fd..b1fa44973 100644 --- a/src/osgPlugins/ive/Stencil.h +++ b/src/osgPlugins/ive/Stencil.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Stencil : public osg::Stencil, public ReadWrite { +class Stencil : public osg::Stencil { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/StencilTwoSided.h b/src/osgPlugins/ive/StencilTwoSided.h index 496954471..5de53da86 100644 --- a/src/osgPlugins/ive/StencilTwoSided.h +++ b/src/osgPlugins/ive/StencilTwoSided.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class StencilTwoSided : public osg::StencilTwoSided, public ReadWrite { +class StencilTwoSided : public osg::StencilTwoSided { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Switch.h b/src/osgPlugins/ive/Switch.h index d34c31e30..79f95b287 100644 --- a/src/osgPlugins/ive/Switch.h +++ b/src/osgPlugins/ive/Switch.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Switch : public osg::Switch, public ReadWrite { +class Switch : public osg::Switch { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/SwitchLayer.h b/src/osgPlugins/ive/SwitchLayer.h index 05f4dcacc..5e6e2c513 100644 --- a/src/osgPlugins/ive/SwitchLayer.h +++ b/src/osgPlugins/ive/SwitchLayer.h @@ -7,7 +7,7 @@ namespace ive { -class SwitchLayer : public osgTerrain::SwitchLayer, public ReadWrite +class SwitchLayer : public osgTerrain::SwitchLayer { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/Terrain.h b/src/osgPlugins/ive/Terrain.h index d8d3dc46b..d39cab77b 100644 --- a/src/osgPlugins/ive/Terrain.h +++ b/src/osgPlugins/ive/Terrain.h @@ -21,7 +21,7 @@ namespace ive { -class Terrain : public osgTerrain::Terrain, public ReadWrite +class Terrain : public osgTerrain::Terrain { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/TerrainTile.h b/src/osgPlugins/ive/TerrainTile.h index 37444ebae..328de1a44 100644 --- a/src/osgPlugins/ive/TerrainTile.h +++ b/src/osgPlugins/ive/TerrainTile.h @@ -21,7 +21,7 @@ namespace ive { -class TerrainTile : public osgTerrain::TerrainTile, public ReadWrite +class TerrainTile : public osgTerrain::TerrainTile { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/TexEnv.h b/src/osgPlugins/ive/TexEnv.h index bf6a6ba08..42cc26e35 100644 --- a/src/osgPlugins/ive/TexEnv.h +++ b/src/osgPlugins/ive/TexEnv.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class TexEnv : public osg::TexEnv, public ReadWrite { +class TexEnv : public osg::TexEnv { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/TexEnvCombine.h b/src/osgPlugins/ive/TexEnvCombine.h index 35b4576b5..9515537da 100644 --- a/src/osgPlugins/ive/TexEnvCombine.h +++ b/src/osgPlugins/ive/TexEnvCombine.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class TexEnvCombine : public osg::TexEnvCombine, public ReadWrite { +class TexEnvCombine : public osg::TexEnvCombine { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/TexGen.h b/src/osgPlugins/ive/TexGen.h index 141989271..30cff3489 100644 --- a/src/osgPlugins/ive/TexGen.h +++ b/src/osgPlugins/ive/TexGen.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class TexGen : public osg::TexGen, public ReadWrite { +class TexGen : public osg::TexGen { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/TexGenNode.h b/src/osgPlugins/ive/TexGenNode.h index 47ee0e010..297f657e7 100644 --- a/src/osgPlugins/ive/TexGenNode.h +++ b/src/osgPlugins/ive/TexGenNode.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class TexGenNode : public osg::TexGenNode, public ReadWrite { +class TexGenNode : public osg::TexGenNode { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/TexMat.h b/src/osgPlugins/ive/TexMat.h index 5eaed11b2..a2ad7a444 100644 --- a/src/osgPlugins/ive/TexMat.h +++ b/src/osgPlugins/ive/TexMat.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class TexMat : public osg::TexMat, public ReadWrite { +class TexMat : public osg::TexMat { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Text.h b/src/osgPlugins/ive/Text.h index 93c9f1bbb..724a606cc 100644 --- a/src/osgPlugins/ive/Text.h +++ b/src/osgPlugins/ive/Text.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Text : public osgText::Text, public ReadWrite { +class Text : public osgText::Text { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Text3D.h b/src/osgPlugins/ive/Text3D.h index 405c949b9..fabf45f8d 100644 --- a/src/osgPlugins/ive/Text3D.h +++ b/src/osgPlugins/ive/Text3D.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Text3D : public osgText::Text3D, public ReadWrite { +class Text3D : public osgText::Text3D { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Texture.h b/src/osgPlugins/ive/Texture.h index 9e779aab0..e9ab55662 100644 --- a/src/osgPlugins/ive/Texture.h +++ b/src/osgPlugins/ive/Texture.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Texture : public osg::Texture, public ReadWrite { +class Texture : public osg::Texture { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Texture1D.h b/src/osgPlugins/ive/Texture1D.h index 9de0996fc..e7c75b8c1 100644 --- a/src/osgPlugins/ive/Texture1D.h +++ b/src/osgPlugins/ive/Texture1D.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Texture1D : public osg::Texture1D, public ReadWrite { +class Texture1D : public osg::Texture1D { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Texture2D.h b/src/osgPlugins/ive/Texture2D.h index 2047b4ac1..18f15830f 100644 --- a/src/osgPlugins/ive/Texture2D.h +++ b/src/osgPlugins/ive/Texture2D.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Texture2D : public osg::Texture2D, public ReadWrite { +class Texture2D : public osg::Texture2D { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Texture2DArray.h b/src/osgPlugins/ive/Texture2DArray.h index 55c71c102..a163c27bf 100644 --- a/src/osgPlugins/ive/Texture2DArray.h +++ b/src/osgPlugins/ive/Texture2DArray.h @@ -7,7 +7,7 @@ namespace ive { -class Texture2DArray : public osg::Texture2DArray, public ReadWrite +class Texture2DArray : public osg::Texture2DArray { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/Texture3D.h b/src/osgPlugins/ive/Texture3D.h index 2d6c7fed5..56493d37a 100644 --- a/src/osgPlugins/ive/Texture3D.h +++ b/src/osgPlugins/ive/Texture3D.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Texture3D : public osg::Texture3D, public ReadWrite { +class Texture3D : public osg::Texture3D { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/TextureCubeMap.h b/src/osgPlugins/ive/TextureCubeMap.h index a3bfda496..0bc6bdd53 100644 --- a/src/osgPlugins/ive/TextureCubeMap.h +++ b/src/osgPlugins/ive/TextureCubeMap.h @@ -7,7 +7,7 @@ namespace ive { -class TextureCubeMap : public osg::TextureCubeMap, public ReadWrite +class TextureCubeMap : public osg::TextureCubeMap { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/TextureRectangle.h b/src/osgPlugins/ive/TextureRectangle.h index 39eec7b74..64a2a8e97 100644 --- a/src/osgPlugins/ive/TextureRectangle.h +++ b/src/osgPlugins/ive/TextureRectangle.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class TextureRectangle : public osg::TextureRectangle, public ReadWrite { +class TextureRectangle : public osg::TextureRectangle { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Transform.h b/src/osgPlugins/ive/Transform.h index b5a51ef69..a050329a5 100644 --- a/src/osgPlugins/ive/Transform.h +++ b/src/osgPlugins/ive/Transform.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Transform : public osg::Transform, public ReadWrite { +class Transform : public osg::Transform { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Uniform.h b/src/osgPlugins/ive/Uniform.h index 16b6bf853..ba11f2496 100644 --- a/src/osgPlugins/ive/Uniform.h +++ b/src/osgPlugins/ive/Uniform.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Uniform : public osg::Uniform, public ReadWrite { +class Uniform : public osg::Uniform { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/VertexProgram.h b/src/osgPlugins/ive/VertexProgram.h index 96121c443..69c91ca30 100644 --- a/src/osgPlugins/ive/VertexProgram.h +++ b/src/osgPlugins/ive/VertexProgram.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class VertexProgram : public osg::VertexProgram, public ReadWrite { +class VertexProgram : public osg::VertexProgram { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Viewport.h b/src/osgPlugins/ive/Viewport.h index bd8d9c506..3c2acb2c8 100644 --- a/src/osgPlugins/ive/Viewport.h +++ b/src/osgPlugins/ive/Viewport.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class Viewport : public osg::Viewport, public ReadWrite { +class Viewport : public osg::Viewport { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/VisibilityGroup.h b/src/osgPlugins/ive/VisibilityGroup.h index 4c467e54d..68e711113 100644 --- a/src/osgPlugins/ive/VisibilityGroup.h +++ b/src/osgPlugins/ive/VisibilityGroup.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class VisibilityGroup : public osgSim::VisibilityGroup, public ReadWrite { +class VisibilityGroup : public osgSim::VisibilityGroup { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/Volume.h b/src/osgPlugins/ive/Volume.h index 5d0e3ab27..5aec05c76 100644 --- a/src/osgPlugins/ive/Volume.h +++ b/src/osgPlugins/ive/Volume.h @@ -21,7 +21,7 @@ namespace ive { -class Volume : public osgVolume::Volume, public ReadWrite +class Volume : public osgVolume::Volume { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/VolumeCompositeLayer.h b/src/osgPlugins/ive/VolumeCompositeLayer.h index 567bef11e..c511ae2c5 100644 --- a/src/osgPlugins/ive/VolumeCompositeLayer.h +++ b/src/osgPlugins/ive/VolumeCompositeLayer.h @@ -7,7 +7,7 @@ namespace ive { -class VolumeCompositeLayer : public osgVolume::CompositeLayer, public ReadWrite +class VolumeCompositeLayer : public osgVolume::CompositeLayer { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/VolumeCompositeProperty.h b/src/osgPlugins/ive/VolumeCompositeProperty.h index ec0ce6083..be38d8011 100644 --- a/src/osgPlugins/ive/VolumeCompositeProperty.h +++ b/src/osgPlugins/ive/VolumeCompositeProperty.h @@ -21,7 +21,7 @@ namespace ive { -class VolumeCompositeProperty : public osgVolume::CompositeProperty, public ReadWrite +class VolumeCompositeProperty : public osgVolume::CompositeProperty { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/VolumeImageLayer.h b/src/osgPlugins/ive/VolumeImageLayer.h index 29a1a09d4..7206f4172 100644 --- a/src/osgPlugins/ive/VolumeImageLayer.h +++ b/src/osgPlugins/ive/VolumeImageLayer.h @@ -21,7 +21,7 @@ namespace ive { -class VolumeImageLayer : public osgVolume::ImageLayer, public ReadWrite +class VolumeImageLayer : public osgVolume::ImageLayer { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/VolumeLayer.h b/src/osgPlugins/ive/VolumeLayer.h index 04da2dea1..b1bca9343 100644 --- a/src/osgPlugins/ive/VolumeLayer.h +++ b/src/osgPlugins/ive/VolumeLayer.h @@ -20,7 +20,7 @@ namespace ive { -class VolumeLayer : public osgVolume::Layer, public ReadWrite +class VolumeLayer : public osgVolume::Layer { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/VolumeLocator.h b/src/osgPlugins/ive/VolumeLocator.h index d26e3d99b..d0ade1d0c 100644 --- a/src/osgPlugins/ive/VolumeLocator.h +++ b/src/osgPlugins/ive/VolumeLocator.h @@ -18,7 +18,7 @@ #include "ReadWrite.h" namespace ive{ -class VolumeLocator : public osgVolume::Locator, public ReadWrite { +class VolumeLocator : public osgVolume::Locator { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/VolumeProperty.h b/src/osgPlugins/ive/VolumeProperty.h index 04da2dea1..b1bca9343 100644 --- a/src/osgPlugins/ive/VolumeProperty.h +++ b/src/osgPlugins/ive/VolumeProperty.h @@ -20,7 +20,7 @@ namespace ive { -class VolumeLayer : public osgVolume::Layer, public ReadWrite +class VolumeLayer : public osgVolume::Layer { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/VolumePropertyAdjustmentCallback.h b/src/osgPlugins/ive/VolumePropertyAdjustmentCallback.h index f3c839b18..02ef8b869 100644 --- a/src/osgPlugins/ive/VolumePropertyAdjustmentCallback.h +++ b/src/osgPlugins/ive/VolumePropertyAdjustmentCallback.h @@ -5,7 +5,7 @@ #include "ReadWrite.h" namespace ive{ -class VolumePropertyAdjustmentCallback : public osgVolume::PropertyAdjustmentCallback, public ReadWrite { +class VolumePropertyAdjustmentCallback : public osgVolume::PropertyAdjustmentCallback { public: void write(DataOutputStream* out); void read(DataInputStream* in); diff --git a/src/osgPlugins/ive/VolumeScalarProperty.h b/src/osgPlugins/ive/VolumeScalarProperty.h index 5cab12aa9..0e658c2a0 100644 --- a/src/osgPlugins/ive/VolumeScalarProperty.h +++ b/src/osgPlugins/ive/VolumeScalarProperty.h @@ -21,7 +21,7 @@ namespace ive { -class VolumeScalarProperty : public osgVolume::ScalarProperty, public ReadWrite +class VolumeScalarProperty : public osgVolume::ScalarProperty { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/VolumeSwitchProperty.h b/src/osgPlugins/ive/VolumeSwitchProperty.h index 170a8b9fd..012eb3b81 100644 --- a/src/osgPlugins/ive/VolumeSwitchProperty.h +++ b/src/osgPlugins/ive/VolumeSwitchProperty.h @@ -21,7 +21,7 @@ namespace ive { -class VolumeSwitchProperty : public osgVolume::SwitchProperty, public ReadWrite +class VolumeSwitchProperty : public osgVolume::SwitchProperty { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/VolumeTile.h b/src/osgPlugins/ive/VolumeTile.h index ba9669fc8..1b722b928 100644 --- a/src/osgPlugins/ive/VolumeTile.h +++ b/src/osgPlugins/ive/VolumeTile.h @@ -21,7 +21,7 @@ namespace ive { -class VolumeTile : public osgVolume::VolumeTile, public ReadWrite +class VolumeTile : public osgVolume::VolumeTile { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/ive/VolumeTransferFunctionProperty.h b/src/osgPlugins/ive/VolumeTransferFunctionProperty.h index b17333307..50f1a2cce 100644 --- a/src/osgPlugins/ive/VolumeTransferFunctionProperty.h +++ b/src/osgPlugins/ive/VolumeTransferFunctionProperty.h @@ -21,7 +21,7 @@ namespace ive { -class VolumeTransferFunctionProperty : public osgVolume::TransferFunctionProperty, public ReadWrite +class VolumeTransferFunctionProperty : public osgVolume::TransferFunctionProperty { public: void write(DataOutputStream* out);