From 405b18558670b1285381d0ee41d545efd402ab63 Mon Sep 17 00:00:00 2001 From: Shon Ferguson <shonferg@users.sourceforge.net> Date: Sat, 5 May 2007 19:40:39 +0000 Subject: [PATCH] Re-exposed TYPE constants and marked them NIFLIB_API, making the TypeConst function obsolete. You now must use NiObject::TYPE instead of NiObject::TypeConst() again. --- include/Ref.h | 2 +- include/obj/ABoneLODController.h | 5 +---- include/obj/AKeyedData.h | 5 +---- include/obj/APSysCtlr.h | 5 +---- include/obj/APSysData.h | 5 +---- include/obj/AParticleModifier.h | 5 +---- include/obj/AbhkConstraint.h | 5 +---- include/obj/AbhkRagdollConstraint.h | 5 +---- include/obj/AbhkShapeCollection.h | 5 +---- include/obj/AvoidNode.h | 5 +---- include/obj/BSBound.h | 5 +---- include/obj/BSFurnitureMarker.h | 5 +---- include/obj/BSKeyframeController.h | 5 +---- include/obj/BSPSysArrayEmitter.h | 5 +---- include/obj/BSParentVelocityModifier.h | 5 +---- include/obj/BSXFlags.h | 5 +---- include/obj/FxButton.h | 5 +---- include/obj/FxRadioButton.h | 5 +---- include/obj/FxWidget.h | 5 +---- include/obj/NiAVObject.h | 5 +---- include/obj/NiAlphaController.h | 5 +---- include/obj/NiAlphaProperty.h | 5 +---- include/obj/NiAmbientLight.h | 5 +---- include/obj/NiAutoNormalParticles.h | 5 +---- include/obj/NiAutoNormalParticlesData.h | 5 +---- include/obj/NiBSAnimationNode.h | 5 +---- include/obj/NiBSBoneLODController.h | 5 +---- include/obj/NiBSPArrayController.h | 5 +---- include/obj/NiBSParticleNode.h | 5 +---- include/obj/NiBSplineBasisData.h | 5 +---- include/obj/NiBSplineCompFloatInterpolator.h | 5 +---- include/obj/NiBSplineCompPoint3Interpolator.h | 5 +---- .../obj/NiBSplineCompTransformInterpolator.h | 5 +---- include/obj/NiBSplineData.h | 5 +---- include/obj/NiBSplineInterpolator.h | 5 +---- include/obj/NiBillboardNode.h | 5 +---- include/obj/NiBinaryExtraData.h | 5 +---- include/obj/NiBlendBoolInterpolator.h | 5 +---- include/obj/NiBlendFloatInterpolator.h | 5 +---- include/obj/NiBlendInterpolator.h | 5 +---- include/obj/NiBlendPoint3Interpolator.h | 5 +---- include/obj/NiBlendTransformInterpolator.h | 5 +---- include/obj/NiBoneLODController.h | 5 +---- include/obj/NiBoolData.h | 5 +---- include/obj/NiBoolInterpolator.h | 5 +---- include/obj/NiBoolTimelineInterpolator.h | 5 +---- include/obj/NiBooleanExtraData.h | 5 +---- include/obj/NiCamera.h | 5 +---- include/obj/NiClod.h | 5 +---- include/obj/NiClodData.h | 5 +---- include/obj/NiClodSkinInstance.h | 5 +---- include/obj/NiCollisionData.h | 5 +---- include/obj/NiCollisionObject.h | 5 +---- include/obj/NiColorData.h | 5 +---- include/obj/NiColorExtraData.h | 5 +---- include/obj/NiControllerManager.h | 5 +---- include/obj/NiControllerSequence.h | 5 +---- include/obj/NiDefaultAVObjectPalette.h | 5 +---- include/obj/NiDirectionalLight.h | 5 +---- include/obj/NiDitherProperty.h | 5 +---- include/obj/NiDynamicEffect.h | 5 +---- include/obj/NiExtraData.h | 5 +---- include/obj/NiFlipController.h | 5 +---- include/obj/NiFloatData.h | 5 +---- include/obj/NiFloatExtraData.h | 5 +---- include/obj/NiFloatExtraDataController.h | 5 +---- include/obj/NiFloatInterpolator.h | 5 +---- include/obj/NiFloatsExtraData.h | 5 +---- include/obj/NiFogProperty.h | 5 +---- include/obj/NiGeomMorpherController.h | 5 +---- include/obj/NiGeometry.h | 5 +---- include/obj/NiGeometryData.h | 5 +---- include/obj/NiGravity.h | 5 +---- include/obj/NiImage.h | 5 +---- include/obj/NiIntegerExtraData.h | 5 +---- include/obj/NiIntegersExtraData.h | 5 +---- include/obj/NiInterpolator.h | 5 +---- include/obj/NiKeyframeController.h | 5 +---- include/obj/NiKeyframeData.h | 5 +---- include/obj/NiLODData.h | 5 +---- include/obj/NiLODNode.h | 5 +---- include/obj/NiLight.h | 5 +---- include/obj/NiLightColorController.h | 5 +---- include/obj/NiLightDimmerController.h | 5 +---- include/obj/NiLookAtController.h | 5 +---- include/obj/NiLookAtInterpolator.h | 5 +---- include/obj/NiMaterialColorController.h | 5 +---- include/obj/NiMaterialProperty.h | 5 +---- include/obj/NiMeshPSysData.h | 5 +---- include/obj/NiMeshParticleSystem.h | 5 +---- include/obj/NiMorphData.h | 5 +---- .../obj/NiMultiTargetTransformController.h | 5 +---- include/obj/NiNode.h | 5 +---- include/obj/NiObject.h | 13 ++++-------- include/obj/NiObjectNET.h | 5 +---- include/obj/NiPSysAgeDeathModifier.h | 5 +---- include/obj/NiPSysBombModifier.h | 5 +---- include/obj/NiPSysBoundUpdateModifier.h | 5 +---- include/obj/NiPSysBoxEmitter.h | 5 +---- include/obj/NiPSysColliderManager.h | 5 +---- include/obj/NiPSysColorModifier.h | 5 +---- include/obj/NiPSysCylinderEmitter.h | 5 +---- include/obj/NiPSysData.h | 5 +---- include/obj/NiPSysDragModifier.h | 5 +---- include/obj/NiPSysEmitter.h | 5 +---- include/obj/NiPSysEmitterCtlr.h | 5 +---- include/obj/NiPSysEmitterCtlrData.h | 5 +---- include/obj/NiPSysEmitterDeclinationCtlr.h | 5 +---- include/obj/NiPSysEmitterDeclinationVarCtlr.h | 5 +---- include/obj/NiPSysEmitterInitialRadiusCtlr.h | 5 +---- include/obj/NiPSysEmitterLifeSpanCtlr.h | 5 +---- include/obj/NiPSysEmitterSpeedCtlr.h | 5 +---- include/obj/NiPSysGravityModifier.h | 5 +---- include/obj/NiPSysGravityStrengthCtlr.h | 5 +---- include/obj/NiPSysGrowFadeModifier.h | 5 +---- include/obj/NiPSysMeshEmitter.h | 5 +---- include/obj/NiPSysMeshUpdateModifier.h | 5 +---- include/obj/NiPSysModifier.h | 5 +---- include/obj/NiPSysModifierActiveCtlr.h | 5 +---- include/obj/NiPSysPlanarCollider.h | 5 +---- include/obj/NiPSysPositionModifier.h | 5 +---- include/obj/NiPSysResetOnLoopCtlr.h | 5 +---- include/obj/NiPSysRotationModifier.h | 5 +---- include/obj/NiPSysSpawnModifier.h | 5 +---- include/obj/NiPSysSphereEmitter.h | 5 +---- include/obj/NiPSysUpdateCtlr.h | 5 +---- include/obj/NiPSysVolumeEmitter.h | 5 +---- include/obj/NiPalette.h | 5 +---- include/obj/NiParticleBomb.h | 5 +---- include/obj/NiParticleColorModifier.h | 5 +---- include/obj/NiParticleGrowFade.h | 5 +---- include/obj/NiParticleMeshModifier.h | 5 +---- include/obj/NiParticleMeshes.h | 5 +---- include/obj/NiParticleMeshesData.h | 5 +---- include/obj/NiParticleRotation.h | 5 +---- include/obj/NiParticleSystem.h | 5 +---- include/obj/NiParticleSystemController.h | 5 +---- include/obj/NiParticles.h | 5 +---- include/obj/NiParticlesData.h | 5 +---- include/obj/NiPathController.h | 5 +---- include/obj/NiPathInterpolator.h | 5 +---- include/obj/NiPixelData.h | 5 +---- include/obj/NiPlanarCollider.h | 5 +---- include/obj/NiPoint3Interpolator.h | 5 +---- include/obj/NiPointLight.h | 5 +---- include/obj/NiPosData.h | 5 +---- include/obj/NiProperty.h | 5 +---- include/obj/NiRangeLODData.h | 5 +---- include/obj/NiRotatingParticles.h | 5 +---- include/obj/NiRotatingParticlesData.h | 5 +---- include/obj/NiScreenLODData.h | 5 +---- include/obj/NiSequenceStreamHelper.h | 5 +---- include/obj/NiShadeProperty.h | 5 +---- include/obj/NiSingleInterpolatorController.h | 5 +---- include/obj/NiSkinData.h | 5 +---- include/obj/NiSkinInstance.h | 5 +---- include/obj/NiSkinPartition.h | 5 +---- include/obj/NiSourceTexture.h | 5 +---- include/obj/NiSpecularProperty.h | 5 +---- include/obj/NiSphericalCollider.h | 5 +---- include/obj/NiSpotLight.h | 5 +---- include/obj/NiStencilProperty.h | 5 +---- include/obj/NiStringExtraData.h | 5 +---- include/obj/NiStringPalette.h | 5 +---- include/obj/NiStringsExtraData.h | 5 +---- include/obj/NiTextKeyExtraData.h | 5 +---- include/obj/NiTextureEffect.h | 5 +---- include/obj/NiTextureModeProperty.h | 5 +---- include/obj/NiTextureProperty.h | 5 +---- include/obj/NiTextureTransformController.h | 5 +---- include/obj/NiTexturingProperty.h | 5 +---- include/obj/NiTimeController.h | 5 +---- include/obj/NiTransformController.h | 5 +---- include/obj/NiTransformData.h | 5 +---- include/obj/NiTransformInterpolator.h | 5 +---- include/obj/NiTriBasedGeom.h | 5 +---- include/obj/NiTriBasedGeomData.h | 5 +---- include/obj/NiTriShape.h | 5 +---- include/obj/NiTriShapeData.h | 5 +---- include/obj/NiTriStrips.h | 5 +---- include/obj/NiTriStripsData.h | 5 +---- include/obj/NiUVController.h | 5 +---- include/obj/NiUVData.h | 5 +---- include/obj/NiVectorExtraData.h | 5 +---- include/obj/NiVertWeightsExtraData.h | 5 +---- include/obj/NiVertexColorProperty.h | 5 +---- include/obj/NiVisController.h | 5 +---- include/obj/NiVisData.h | 5 +---- include/obj/NiWireframeProperty.h | 5 +---- include/obj/NiZBufferProperty.h | 5 +---- include/obj/RootCollisionNode.h | 5 +---- include/obj/bhkBlendCollisionObject.h | 5 +---- include/obj/bhkBlendController.h | 5 +---- include/obj/bhkBoxShape.h | 5 +---- include/obj/bhkCapsuleShape.h | 5 +---- include/obj/bhkCollisionObject.h | 5 +---- include/obj/bhkConvexShape.h | 5 +---- include/obj/bhkConvexTransformShape.h | 5 +---- include/obj/bhkConvexVerticesShape.h | 5 +---- include/obj/bhkEntity.h | 5 +---- include/obj/bhkHingeConstraint.h | 5 +---- include/obj/bhkLimitedHingeConstraint.h | 5 +---- include/obj/bhkListShape.h | 5 +---- include/obj/bhkMalleableConstraint.h | 5 +---- include/obj/bhkMoppBvTreeShape.h | 5 +---- include/obj/bhkMultiSphereShape.h | 5 +---- include/obj/bhkNiTriStripsShape.h | 5 +---- include/obj/bhkPackedNiTriStripsShape.h | 5 +---- include/obj/bhkPrismaticConstraint.h | 5 +---- include/obj/bhkRagdollConstraint.h | 5 +---- include/obj/bhkRefObject.h | 5 +---- include/obj/bhkRigidBody.h | 5 +---- include/obj/bhkRigidBodyT.h | 5 +---- include/obj/bhkSPCollisionObject.h | 5 +---- include/obj/bhkSerializable.h | 5 +---- include/obj/bhkShape.h | 5 +---- include/obj/bhkSimpleShapePhantom.h | 5 +---- include/obj/bhkSphereRepShape.h | 5 +---- include/obj/bhkSphereShape.h | 5 +---- include/obj/bhkStiffSpringConstraint.h | 5 +---- include/obj/bhkTransformShape.h | 5 +---- include/obj/bhkWorldObject.h | 5 +---- include/obj/hkPackedNiTriStripsData.h | 5 +---- src/ComplexShape.cpp | 10 +++++----- src/niflib.cpp | 20 +++++++++---------- src/obj/ABoneLODController.cpp | 6 +----- src/obj/AKeyedData.cpp | 6 +----- src/obj/APSysCtlr.cpp | 6 +----- src/obj/APSysData.cpp | 6 +----- src/obj/AParticleModifier.cpp | 6 +----- src/obj/AbhkConstraint.cpp | 6 +----- src/obj/AbhkRagdollConstraint.cpp | 5 +---- src/obj/AbhkShapeCollection.cpp | 5 +---- src/obj/AvoidNode.cpp | 6 +----- src/obj/BSBound.cpp | 6 +----- src/obj/BSFurnitureMarker.cpp | 6 +----- src/obj/BSKeyframeController.cpp | 6 +----- src/obj/BSPSysArrayEmitter.cpp | 6 +----- src/obj/BSParentVelocityModifier.cpp | 6 +----- src/obj/BSXFlags.cpp | 6 +----- src/obj/FxButton.cpp | 6 +----- src/obj/FxRadioButton.cpp | 6 +----- src/obj/FxWidget.cpp | 6 +----- src/obj/NiAVObject.cpp | 6 +----- src/obj/NiAlphaController.cpp | 6 +----- src/obj/NiAlphaProperty.cpp | 6 +----- src/obj/NiAmbientLight.cpp | 6 +----- src/obj/NiAutoNormalParticles.cpp | 6 +----- src/obj/NiAutoNormalParticlesData.cpp | 6 +----- src/obj/NiBSAnimationNode.cpp | 6 +----- src/obj/NiBSBoneLODController.cpp | 6 +----- src/obj/NiBSPArrayController.cpp | 6 +----- src/obj/NiBSParticleNode.cpp | 6 +----- src/obj/NiBSplineBasisData.cpp | 6 +----- src/obj/NiBSplineCompFloatInterpolator.cpp | 6 +----- src/obj/NiBSplineCompPoint3Interpolator.cpp | 6 +----- .../NiBSplineCompTransformInterpolator.cpp | 6 +----- src/obj/NiBSplineData.cpp | 6 +----- src/obj/NiBSplineInterpolator.cpp | 6 +----- src/obj/NiBillboardNode.cpp | 6 +----- src/obj/NiBinaryExtraData.cpp | 6 +----- src/obj/NiBlendBoolInterpolator.cpp | 6 +----- src/obj/NiBlendFloatInterpolator.cpp | 6 +----- src/obj/NiBlendInterpolator.cpp | 6 +----- src/obj/NiBlendPoint3Interpolator.cpp | 6 +----- src/obj/NiBlendTransformInterpolator.cpp | 6 +----- src/obj/NiBoneLODController.cpp | 6 +----- src/obj/NiBoolData.cpp | 6 +----- src/obj/NiBoolInterpolator.cpp | 6 +----- src/obj/NiBoolTimelineInterpolator.cpp | 6 +----- src/obj/NiBooleanExtraData.cpp | 6 +----- src/obj/NiCamera.cpp | 6 +----- src/obj/NiClod.cpp | 6 +----- src/obj/NiClodData.cpp | 6 +----- src/obj/NiClodSkinInstance.cpp | 6 +----- src/obj/NiCollisionData.cpp | 6 +----- src/obj/NiCollisionObject.cpp | 6 +----- src/obj/NiColorData.cpp | 6 +----- src/obj/NiColorExtraData.cpp | 6 +----- src/obj/NiControllerManager.cpp | 6 +----- src/obj/NiControllerSequence.cpp | 6 +----- src/obj/NiDefaultAVObjectPalette.cpp | 6 +----- src/obj/NiDirectionalLight.cpp | 6 +----- src/obj/NiDitherProperty.cpp | 6 +----- src/obj/NiDynamicEffect.cpp | 6 +----- src/obj/NiExtraData.cpp | 6 +----- src/obj/NiFlipController.cpp | 6 +----- src/obj/NiFloatData.cpp | 6 +----- src/obj/NiFloatExtraData.cpp | 6 +----- src/obj/NiFloatExtraDataController.cpp | 6 +----- src/obj/NiFloatInterpolator.cpp | 6 +----- src/obj/NiFloatsExtraData.cpp | 6 +----- src/obj/NiFogProperty.cpp | 6 +----- src/obj/NiGeomMorpherController.cpp | 6 +----- src/obj/NiGeometry.cpp | 6 +----- src/obj/NiGeometryData.cpp | 6 +----- src/obj/NiGravity.cpp | 6 +----- src/obj/NiImage.cpp | 6 +----- src/obj/NiIntegerExtraData.cpp | 6 +----- src/obj/NiIntegersExtraData.cpp | 6 +----- src/obj/NiInterpolator.cpp | 6 +----- src/obj/NiKeyframeController.cpp | 6 +----- src/obj/NiKeyframeData.cpp | 6 +----- src/obj/NiLODData.cpp | 6 +----- src/obj/NiLODNode.cpp | 6 +----- src/obj/NiLight.cpp | 6 +----- src/obj/NiLightColorController.cpp | 6 +----- src/obj/NiLightDimmerController.cpp | 6 +----- src/obj/NiLookAtController.cpp | 6 +----- src/obj/NiLookAtInterpolator.cpp | 6 +----- src/obj/NiMaterialColorController.cpp | 6 +----- src/obj/NiMaterialProperty.cpp | 6 +----- src/obj/NiMeshPSysData.cpp | 6 +----- src/obj/NiMeshParticleSystem.cpp | 6 +----- src/obj/NiMorphData.cpp | 6 +----- src/obj/NiMultiTargetTransformController.cpp | 6 +----- src/obj/NiNode.cpp | 8 ++------ src/obj/NiObject.cpp | 4 ---- src/obj/NiObjectNET.cpp | 6 +----- src/obj/NiPSysAgeDeathModifier.cpp | 6 +----- src/obj/NiPSysBombModifier.cpp | 6 +----- src/obj/NiPSysBoundUpdateModifier.cpp | 6 +----- src/obj/NiPSysBoxEmitter.cpp | 6 +----- src/obj/NiPSysColliderManager.cpp | 6 +----- src/obj/NiPSysColorModifier.cpp | 6 +----- src/obj/NiPSysCylinderEmitter.cpp | 6 +----- src/obj/NiPSysData.cpp | 6 +----- src/obj/NiPSysDragModifier.cpp | 6 +----- src/obj/NiPSysEmitter.cpp | 6 +----- src/obj/NiPSysEmitterCtlr.cpp | 6 +----- src/obj/NiPSysEmitterCtlrData.cpp | 6 +----- src/obj/NiPSysEmitterDeclinationCtlr.cpp | 6 +----- src/obj/NiPSysEmitterDeclinationVarCtlr.cpp | 6 +----- src/obj/NiPSysEmitterInitialRadiusCtlr.cpp | 6 +----- src/obj/NiPSysEmitterLifeSpanCtlr.cpp | 6 +----- src/obj/NiPSysEmitterSpeedCtlr.cpp | 6 +----- src/obj/NiPSysGravityModifier.cpp | 6 +----- src/obj/NiPSysGravityStrengthCtlr.cpp | 6 +----- src/obj/NiPSysGrowFadeModifier.cpp | 6 +----- src/obj/NiPSysMeshEmitter.cpp | 6 +----- src/obj/NiPSysMeshUpdateModifier.cpp | 6 +----- src/obj/NiPSysModifier.cpp | 6 +----- src/obj/NiPSysModifierActiveCtlr.cpp | 6 +----- src/obj/NiPSysPlanarCollider.cpp | 6 +----- src/obj/NiPSysPositionModifier.cpp | 6 +----- src/obj/NiPSysResetOnLoopCtlr.cpp | 6 +----- src/obj/NiPSysRotationModifier.cpp | 6 +----- src/obj/NiPSysSpawnModifier.cpp | 6 +----- src/obj/NiPSysSphereEmitter.cpp | 6 +----- src/obj/NiPSysUpdateCtlr.cpp | 6 +----- src/obj/NiPSysVolumeEmitter.cpp | 6 +----- src/obj/NiPalette.cpp | 6 +----- src/obj/NiParticleBomb.cpp | 6 +----- src/obj/NiParticleColorModifier.cpp | 6 +----- src/obj/NiParticleGrowFade.cpp | 6 +----- src/obj/NiParticleMeshModifier.cpp | 6 +----- src/obj/NiParticleMeshes.cpp | 6 +----- src/obj/NiParticleMeshesData.cpp | 6 +----- src/obj/NiParticleRotation.cpp | 6 +----- src/obj/NiParticleSystem.cpp | 6 +----- src/obj/NiParticleSystemController.cpp | 6 +----- src/obj/NiParticles.cpp | 6 +----- src/obj/NiParticlesData.cpp | 6 +----- src/obj/NiPathController.cpp | 6 +----- src/obj/NiPathInterpolator.cpp | 6 +----- src/obj/NiPixelData.cpp | 6 +----- src/obj/NiPlanarCollider.cpp | 6 +----- src/obj/NiPoint3Interpolator.cpp | 6 +----- src/obj/NiPointLight.cpp | 6 +----- src/obj/NiPosData.cpp | 6 +----- src/obj/NiProperty.cpp | 6 +----- src/obj/NiRangeLODData.cpp | 6 +----- src/obj/NiRotatingParticles.cpp | 6 +----- src/obj/NiRotatingParticlesData.cpp | 6 +----- src/obj/NiScreenLODData.cpp | 6 +----- src/obj/NiSequenceStreamHelper.cpp | 6 +----- src/obj/NiShadeProperty.cpp | 6 +----- src/obj/NiSingleInterpolatorController.cpp | 6 +----- src/obj/NiSkinData.cpp | 6 +----- src/obj/NiSkinInstance.cpp | 6 +----- src/obj/NiSkinPartition.cpp | 6 +----- src/obj/NiSourceTexture.cpp | 6 +----- src/obj/NiSpecularProperty.cpp | 6 +----- src/obj/NiSphericalCollider.cpp | 6 +----- src/obj/NiSpotLight.cpp | 6 +----- src/obj/NiStencilProperty.cpp | 6 +----- src/obj/NiStringExtraData.cpp | 6 +----- src/obj/NiStringPalette.cpp | 6 +----- src/obj/NiStringsExtraData.cpp | 6 +----- src/obj/NiTextKeyExtraData.cpp | 6 +----- src/obj/NiTextureEffect.cpp | 6 +----- src/obj/NiTextureModeProperty.cpp | 6 +----- src/obj/NiTextureProperty.cpp | 6 +----- src/obj/NiTextureTransformController.cpp | 6 +----- src/obj/NiTexturingProperty.cpp | 6 +----- src/obj/NiTimeController.cpp | 6 +----- src/obj/NiTransformController.cpp | 6 +----- src/obj/NiTransformData.cpp | 6 +----- src/obj/NiTransformInterpolator.cpp | 6 +----- src/obj/NiTriBasedGeom.cpp | 6 +----- src/obj/NiTriBasedGeomData.cpp | 6 +----- src/obj/NiTriShape.cpp | 6 +----- src/obj/NiTriShapeData.cpp | 6 +----- src/obj/NiTriStrips.cpp | 6 +----- src/obj/NiTriStripsData.cpp | 6 +----- src/obj/NiUVController.cpp | 6 +----- src/obj/NiUVData.cpp | 6 +----- src/obj/NiVectorExtraData.cpp | 6 +----- src/obj/NiVertWeightsExtraData.cpp | 6 +----- src/obj/NiVertexColorProperty.cpp | 6 +----- src/obj/NiVisController.cpp | 6 +----- src/obj/NiVisData.cpp | 6 +----- src/obj/NiWireframeProperty.cpp | 7 +------ src/obj/NiZBufferProperty.cpp | 6 +----- src/obj/RootCollisionNode.cpp | 6 +----- src/obj/bhkBlendCollisionObject.cpp | 6 +----- src/obj/bhkBlendController.cpp | 6 +----- src/obj/bhkBoxShape.cpp | 6 +----- src/obj/bhkCapsuleShape.cpp | 6 +----- src/obj/bhkCollisionObject.cpp | 6 +----- src/obj/bhkConvexShape.cpp | 6 +----- src/obj/bhkConvexTransformShape.cpp | 6 +----- src/obj/bhkConvexVerticesShape.cpp | 6 +----- src/obj/bhkEntity.cpp | 6 +----- src/obj/bhkHingeConstraint.cpp | 6 +----- src/obj/bhkLimitedHingeConstraint.cpp | 6 +----- src/obj/bhkListShape.cpp | 6 +----- src/obj/bhkMalleableConstraint.cpp | 6 +----- src/obj/bhkMoppBvTreeShape.cpp | 6 +----- src/obj/bhkMultiSphereShape.cpp | 6 +----- src/obj/bhkNiTriStripsShape.cpp | 6 +----- src/obj/bhkPackedNiTriStripsShape.cpp | 6 +----- src/obj/bhkPrismaticConstraint.cpp | 6 +----- src/obj/bhkRagdollConstraint.cpp | 6 +----- src/obj/bhkRefObject.cpp | 6 +----- src/obj/bhkRigidBody.cpp | 6 +----- src/obj/bhkRigidBodyT.cpp | 6 +----- src/obj/bhkSPCollisionObject.cpp | 6 +----- src/obj/bhkSerializable.cpp | 6 +----- src/obj/bhkShape.cpp | 6 +----- src/obj/bhkSimpleShapePhantom.cpp | 6 +----- src/obj/bhkSphereRepShape.cpp | 6 +----- src/obj/bhkSphereShape.cpp | 6 +----- src/obj/bhkStiffSpringConstraint.cpp | 6 +----- src/obj/bhkTransformShape.cpp | 6 +----- src/obj/bhkWorldObject.cpp | 6 +----- src/obj/hkPackedNiTriStripsData.cpp | 6 +----- 447 files changed, 463 insertions(+), 2018 deletions(-) diff --git a/include/Ref.h b/include/Ref.h index 63255546..16c98080 100644 --- a/include/Ref.h +++ b/include/Ref.h @@ -23,7 +23,7 @@ public: #ifdef USE_NIFLIB_TEMPLATE_HELPERS template<typename U> Ref( const Ref<U>& other ) { - if ( (NULL != other._object) && other._object->IsDerivedType(T::TypeConst()) ) { + if ( (NULL != other._object) && other._object->IsDerivedType(T::TYPE) ) { _object = static_cast<T*>(other._object); if ( _object != NULL ) _object->AddRef(); diff --git a/include/obj/ABoneLODController.h b/include/obj/ABoneLODController.h index d23e6147..29127e8f 100644 --- a/include/obj/ABoneLODController.h +++ b/include/obj/ABoneLODController.h @@ -25,10 +25,7 @@ public: NIFLIB_API ABoneLODController(); NIFLIB_API ~ABoneLODController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/AKeyedData.h b/include/obj/AKeyedData.h index 394e9798..d9f60623 100644 --- a/include/obj/AKeyedData.h +++ b/include/obj/AKeyedData.h @@ -21,10 +21,7 @@ public: NIFLIB_API AKeyedData(); NIFLIB_API ~AKeyedData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/APSysCtlr.h b/include/obj/APSysCtlr.h index d525d806..39ecbc0b 100644 --- a/include/obj/APSysCtlr.h +++ b/include/obj/APSysCtlr.h @@ -22,10 +22,7 @@ public: NIFLIB_API APSysCtlr(); NIFLIB_API ~APSysCtlr(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/APSysData.h b/include/obj/APSysData.h index acbf4ef6..41191aca 100644 --- a/include/obj/APSysData.h +++ b/include/obj/APSysData.h @@ -21,10 +21,7 @@ public: NIFLIB_API APSysData(); NIFLIB_API ~APSysData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/AParticleModifier.h b/include/obj/AParticleModifier.h index 1227128a..e0cdcc20 100644 --- a/include/obj/AParticleModifier.h +++ b/include/obj/AParticleModifier.h @@ -27,10 +27,7 @@ public: NIFLIB_API AParticleModifier(); NIFLIB_API ~AParticleModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/AbhkConstraint.h b/include/obj/AbhkConstraint.h index 584daaae..b01bd53f 100644 --- a/include/obj/AbhkConstraint.h +++ b/include/obj/AbhkConstraint.h @@ -24,10 +24,7 @@ public: NIFLIB_API AbhkConstraint(); NIFLIB_API ~AbhkConstraint(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/AbhkRagdollConstraint.h b/include/obj/AbhkRagdollConstraint.h index 11f2a52c..6dcc7e81 100644 --- a/include/obj/AbhkRagdollConstraint.h +++ b/include/obj/AbhkRagdollConstraint.h @@ -22,10 +22,7 @@ public: NIFLIB_API AbhkRagdollConstraint(); NIFLIB_API ~AbhkRagdollConstraint(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/AbhkShapeCollection.h b/include/obj/AbhkShapeCollection.h index 3e13baf5..5b0c18ae 100644 --- a/include/obj/AbhkShapeCollection.h +++ b/include/obj/AbhkShapeCollection.h @@ -22,10 +22,7 @@ public: NIFLIB_API AbhkShapeCollection(); NIFLIB_API ~AbhkShapeCollection(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/AvoidNode.h b/include/obj/AvoidNode.h index 486ca001..9a4097b8 100644 --- a/include/obj/AvoidNode.h +++ b/include/obj/AvoidNode.h @@ -21,10 +21,7 @@ public: NIFLIB_API AvoidNode(); NIFLIB_API ~AvoidNode(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/BSBound.h b/include/obj/BSBound.h index 145e0342..0dccd0e2 100644 --- a/include/obj/BSBound.h +++ b/include/obj/BSBound.h @@ -22,10 +22,7 @@ public: NIFLIB_API BSBound(); NIFLIB_API ~BSBound(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/BSFurnitureMarker.h b/include/obj/BSFurnitureMarker.h index db58399e..7d128de4 100644 --- a/include/obj/BSFurnitureMarker.h +++ b/include/obj/BSFurnitureMarker.h @@ -25,10 +25,7 @@ public: NIFLIB_API BSFurnitureMarker(); NIFLIB_API ~BSFurnitureMarker(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/BSKeyframeController.h b/include/obj/BSKeyframeController.h index 961def42..0fc0f7fe 100644 --- a/include/obj/BSKeyframeController.h +++ b/include/obj/BSKeyframeController.h @@ -27,10 +27,7 @@ public: NIFLIB_API BSKeyframeController(); NIFLIB_API ~BSKeyframeController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/BSPSysArrayEmitter.h b/include/obj/BSPSysArrayEmitter.h index 2d56fdca..fa69f7bd 100644 --- a/include/obj/BSPSysArrayEmitter.h +++ b/include/obj/BSPSysArrayEmitter.h @@ -21,10 +21,7 @@ public: NIFLIB_API BSPSysArrayEmitter(); NIFLIB_API ~BSPSysArrayEmitter(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/BSParentVelocityModifier.h b/include/obj/BSParentVelocityModifier.h index 8a7ae38a..86cc9bfa 100644 --- a/include/obj/BSParentVelocityModifier.h +++ b/include/obj/BSParentVelocityModifier.h @@ -21,10 +21,7 @@ public: NIFLIB_API BSParentVelocityModifier(); NIFLIB_API ~BSParentVelocityModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/BSXFlags.h b/include/obj/BSXFlags.h index e6943b8e..b00f4759 100644 --- a/include/obj/BSXFlags.h +++ b/include/obj/BSXFlags.h @@ -21,10 +21,7 @@ public: NIFLIB_API BSXFlags(); NIFLIB_API ~BSXFlags(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/FxButton.h b/include/obj/FxButton.h index e7b1c3a9..a398e027 100644 --- a/include/obj/FxButton.h +++ b/include/obj/FxButton.h @@ -21,10 +21,7 @@ public: NIFLIB_API FxButton(); NIFLIB_API ~FxButton(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/FxRadioButton.h b/include/obj/FxRadioButton.h index 1f764ea8..88559fee 100644 --- a/include/obj/FxRadioButton.h +++ b/include/obj/FxRadioButton.h @@ -27,10 +27,7 @@ public: NIFLIB_API FxRadioButton(); NIFLIB_API ~FxRadioButton(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/FxWidget.h b/include/obj/FxWidget.h index a1e864ff..8bd4ad4f 100644 --- a/include/obj/FxWidget.h +++ b/include/obj/FxWidget.h @@ -21,10 +21,7 @@ public: NIFLIB_API FxWidget(); NIFLIB_API ~FxWidget(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiAVObject.h b/include/obj/NiAVObject.h index dbd6e4f3..20c2bfbf 100644 --- a/include/obj/NiAVObject.h +++ b/include/obj/NiAVObject.h @@ -30,10 +30,7 @@ public: NIFLIB_API NiAVObject(); NIFLIB_API ~NiAVObject(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiAlphaController.h b/include/obj/NiAlphaController.h index e4c3209b..f609fe31 100644 --- a/include/obj/NiAlphaController.h +++ b/include/obj/NiAlphaController.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiAlphaController(); NIFLIB_API ~NiAlphaController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiAlphaProperty.h b/include/obj/NiAlphaProperty.h index 874e453e..1aef9043 100644 --- a/include/obj/NiAlphaProperty.h +++ b/include/obj/NiAlphaProperty.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiAlphaProperty(); NIFLIB_API ~NiAlphaProperty(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiAmbientLight.h b/include/obj/NiAmbientLight.h index 4ede5052..5cbfb6f7 100644 --- a/include/obj/NiAmbientLight.h +++ b/include/obj/NiAmbientLight.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiAmbientLight(); NIFLIB_API ~NiAmbientLight(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiAutoNormalParticles.h b/include/obj/NiAutoNormalParticles.h index e51334ee..77a0ed0c 100644 --- a/include/obj/NiAutoNormalParticles.h +++ b/include/obj/NiAutoNormalParticles.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiAutoNormalParticles(); NIFLIB_API ~NiAutoNormalParticles(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiAutoNormalParticlesData.h b/include/obj/NiAutoNormalParticlesData.h index 9a59e385..f1afdc9e 100644 --- a/include/obj/NiAutoNormalParticlesData.h +++ b/include/obj/NiAutoNormalParticlesData.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiAutoNormalParticlesData(); NIFLIB_API ~NiAutoNormalParticlesData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBSAnimationNode.h b/include/obj/NiBSAnimationNode.h index 122ed7a7..5496e740 100644 --- a/include/obj/NiBSAnimationNode.h +++ b/include/obj/NiBSAnimationNode.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiBSAnimationNode(); NIFLIB_API ~NiBSAnimationNode(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBSBoneLODController.h b/include/obj/NiBSBoneLODController.h index e906e340..5ebce2ef 100644 --- a/include/obj/NiBSBoneLODController.h +++ b/include/obj/NiBSBoneLODController.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiBSBoneLODController(); NIFLIB_API ~NiBSBoneLODController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBSPArrayController.h b/include/obj/NiBSPArrayController.h index a16437ed..d147fd04 100644 --- a/include/obj/NiBSPArrayController.h +++ b/include/obj/NiBSPArrayController.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiBSPArrayController(); NIFLIB_API ~NiBSPArrayController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBSParticleNode.h b/include/obj/NiBSParticleNode.h index 2223fb3a..c4fe79b2 100644 --- a/include/obj/NiBSParticleNode.h +++ b/include/obj/NiBSParticleNode.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiBSParticleNode(); NIFLIB_API ~NiBSParticleNode(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBSplineBasisData.h b/include/obj/NiBSplineBasisData.h index cb3148e7..5db389ab 100644 --- a/include/obj/NiBSplineBasisData.h +++ b/include/obj/NiBSplineBasisData.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiBSplineBasisData(); NIFLIB_API ~NiBSplineBasisData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBSplineCompFloatInterpolator.h b/include/obj/NiBSplineCompFloatInterpolator.h index 9e7cf5e5..b150dfc4 100644 --- a/include/obj/NiBSplineCompFloatInterpolator.h +++ b/include/obj/NiBSplineCompFloatInterpolator.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiBSplineCompFloatInterpolator(); NIFLIB_API ~NiBSplineCompFloatInterpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBSplineCompPoint3Interpolator.h b/include/obj/NiBSplineCompPoint3Interpolator.h index 58a63ecc..1f0a41ca 100644 --- a/include/obj/NiBSplineCompPoint3Interpolator.h +++ b/include/obj/NiBSplineCompPoint3Interpolator.h @@ -24,10 +24,7 @@ public: NIFLIB_API NiBSplineCompPoint3Interpolator(); NIFLIB_API ~NiBSplineCompPoint3Interpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBSplineCompTransformInterpolator.h b/include/obj/NiBSplineCompTransformInterpolator.h index 005cee72..f67b7ae6 100644 --- a/include/obj/NiBSplineCompTransformInterpolator.h +++ b/include/obj/NiBSplineCompTransformInterpolator.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiBSplineCompTransformInterpolator(); NIFLIB_API ~NiBSplineCompTransformInterpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBSplineData.h b/include/obj/NiBSplineData.h index 7e586561..14b27ff8 100644 --- a/include/obj/NiBSplineData.h +++ b/include/obj/NiBSplineData.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiBSplineData(); NIFLIB_API ~NiBSplineData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBSplineInterpolator.h b/include/obj/NiBSplineInterpolator.h index 31e9a24d..68ffc586 100644 --- a/include/obj/NiBSplineInterpolator.h +++ b/include/obj/NiBSplineInterpolator.h @@ -25,10 +25,7 @@ public: NIFLIB_API NiBSplineInterpolator(); NIFLIB_API ~NiBSplineInterpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBillboardNode.h b/include/obj/NiBillboardNode.h index 635ad831..c32facf0 100644 --- a/include/obj/NiBillboardNode.h +++ b/include/obj/NiBillboardNode.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiBillboardNode(); NIFLIB_API ~NiBillboardNode(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBinaryExtraData.h b/include/obj/NiBinaryExtraData.h index 7e0624e5..696335ae 100644 --- a/include/obj/NiBinaryExtraData.h +++ b/include/obj/NiBinaryExtraData.h @@ -24,10 +24,7 @@ public: NIFLIB_API NiBinaryExtraData(); NIFLIB_API ~NiBinaryExtraData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBlendBoolInterpolator.h b/include/obj/NiBlendBoolInterpolator.h index 2a42abb6..30f99784 100644 --- a/include/obj/NiBlendBoolInterpolator.h +++ b/include/obj/NiBlendBoolInterpolator.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiBlendBoolInterpolator(); NIFLIB_API ~NiBlendBoolInterpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBlendFloatInterpolator.h b/include/obj/NiBlendFloatInterpolator.h index b66e2759..f783fc32 100644 --- a/include/obj/NiBlendFloatInterpolator.h +++ b/include/obj/NiBlendFloatInterpolator.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiBlendFloatInterpolator(); NIFLIB_API ~NiBlendFloatInterpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBlendInterpolator.h b/include/obj/NiBlendInterpolator.h index ef509b04..fd386fa9 100644 --- a/include/obj/NiBlendInterpolator.h +++ b/include/obj/NiBlendInterpolator.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiBlendInterpolator(); NIFLIB_API ~NiBlendInterpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBlendPoint3Interpolator.h b/include/obj/NiBlendPoint3Interpolator.h index b26ae902..c8a0d0e8 100644 --- a/include/obj/NiBlendPoint3Interpolator.h +++ b/include/obj/NiBlendPoint3Interpolator.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiBlendPoint3Interpolator(); NIFLIB_API ~NiBlendPoint3Interpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBlendTransformInterpolator.h b/include/obj/NiBlendTransformInterpolator.h index c0bfe09b..5dd7e8c4 100644 --- a/include/obj/NiBlendTransformInterpolator.h +++ b/include/obj/NiBlendTransformInterpolator.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiBlendTransformInterpolator(); NIFLIB_API ~NiBlendTransformInterpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBoneLODController.h b/include/obj/NiBoneLODController.h index 31022a4c..6bc472bd 100644 --- a/include/obj/NiBoneLODController.h +++ b/include/obj/NiBoneLODController.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiBoneLODController(); NIFLIB_API ~NiBoneLODController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBoolData.h b/include/obj/NiBoolData.h index 0d1e6456..c6a3b640 100644 --- a/include/obj/NiBoolData.h +++ b/include/obj/NiBoolData.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiBoolData(); NIFLIB_API ~NiBoolData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBoolInterpolator.h b/include/obj/NiBoolInterpolator.h index 9de1893d..b3d3bd9d 100644 --- a/include/obj/NiBoolInterpolator.h +++ b/include/obj/NiBoolInterpolator.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiBoolInterpolator(); NIFLIB_API ~NiBoolInterpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBoolTimelineInterpolator.h b/include/obj/NiBoolTimelineInterpolator.h index 6246834e..c2bd4689 100644 --- a/include/obj/NiBoolTimelineInterpolator.h +++ b/include/obj/NiBoolTimelineInterpolator.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiBoolTimelineInterpolator(); NIFLIB_API ~NiBoolTimelineInterpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiBooleanExtraData.h b/include/obj/NiBooleanExtraData.h index 8faae78b..c5ccb760 100644 --- a/include/obj/NiBooleanExtraData.h +++ b/include/obj/NiBooleanExtraData.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiBooleanExtraData(); NIFLIB_API ~NiBooleanExtraData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiCamera.h b/include/obj/NiCamera.h index 208d8783..0bc365a0 100644 --- a/include/obj/NiCamera.h +++ b/include/obj/NiCamera.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiCamera(); NIFLIB_API ~NiCamera(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiClod.h b/include/obj/NiClod.h index 16682663..7bb65198 100644 --- a/include/obj/NiClod.h +++ b/include/obj/NiClod.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiClod(); NIFLIB_API ~NiClod(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiClodData.h b/include/obj/NiClodData.h index a055295b..59c51185 100644 --- a/include/obj/NiClodData.h +++ b/include/obj/NiClodData.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiClodData(); NIFLIB_API ~NiClodData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiClodSkinInstance.h b/include/obj/NiClodSkinInstance.h index 95a8d752..8a1d8aea 100644 --- a/include/obj/NiClodSkinInstance.h +++ b/include/obj/NiClodSkinInstance.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiClodSkinInstance(); NIFLIB_API ~NiClodSkinInstance(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiCollisionData.h b/include/obj/NiCollisionData.h index 7b2a98f0..74ede186 100644 --- a/include/obj/NiCollisionData.h +++ b/include/obj/NiCollisionData.h @@ -24,10 +24,7 @@ public: NIFLIB_API NiCollisionData(); NIFLIB_API ~NiCollisionData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiCollisionObject.h b/include/obj/NiCollisionObject.h index 27a1fd64..07303f15 100644 --- a/include/obj/NiCollisionObject.h +++ b/include/obj/NiCollisionObject.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiCollisionObject(); NIFLIB_API ~NiCollisionObject(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiColorData.h b/include/obj/NiColorData.h index 5f3af773..8de64eec 100644 --- a/include/obj/NiColorData.h +++ b/include/obj/NiColorData.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiColorData(); NIFLIB_API ~NiColorData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiColorExtraData.h b/include/obj/NiColorExtraData.h index 6806dc73..2c034e93 100644 --- a/include/obj/NiColorExtraData.h +++ b/include/obj/NiColorExtraData.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiColorExtraData(); NIFLIB_API ~NiColorExtraData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiControllerManager.h b/include/obj/NiControllerManager.h index 1ad41d2a..264fdf57 100644 --- a/include/obj/NiControllerManager.h +++ b/include/obj/NiControllerManager.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiControllerManager(); NIFLIB_API ~NiControllerManager(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiControllerSequence.h b/include/obj/NiControllerSequence.h index 1158ccbb..c8d4a544 100644 --- a/include/obj/NiControllerSequence.h +++ b/include/obj/NiControllerSequence.h @@ -31,10 +31,7 @@ public: NIFLIB_API NiControllerSequence(); NIFLIB_API ~NiControllerSequence(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiDefaultAVObjectPalette.h b/include/obj/NiDefaultAVObjectPalette.h index 559a4668..527aa3a5 100644 --- a/include/obj/NiDefaultAVObjectPalette.h +++ b/include/obj/NiDefaultAVObjectPalette.h @@ -26,10 +26,7 @@ public: NIFLIB_API NiDefaultAVObjectPalette(); NIFLIB_API ~NiDefaultAVObjectPalette(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiDirectionalLight.h b/include/obj/NiDirectionalLight.h index 4a2bc6de..0fc79ddd 100644 --- a/include/obj/NiDirectionalLight.h +++ b/include/obj/NiDirectionalLight.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiDirectionalLight(); NIFLIB_API ~NiDirectionalLight(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiDitherProperty.h b/include/obj/NiDitherProperty.h index 9697cba3..aa124fe8 100644 --- a/include/obj/NiDitherProperty.h +++ b/include/obj/NiDitherProperty.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiDitherProperty(); NIFLIB_API ~NiDitherProperty(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiDynamicEffect.h b/include/obj/NiDynamicEffect.h index d9143366..f348ac36 100644 --- a/include/obj/NiDynamicEffect.h +++ b/include/obj/NiDynamicEffect.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiDynamicEffect(); NIFLIB_API ~NiDynamicEffect(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiExtraData.h b/include/obj/NiExtraData.h index 50339236..84916951 100644 --- a/include/obj/NiExtraData.h +++ b/include/obj/NiExtraData.h @@ -24,10 +24,7 @@ public: NIFLIB_API NiExtraData(); NIFLIB_API ~NiExtraData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiFlipController.h b/include/obj/NiFlipController.h index c37567bf..47efe7c1 100644 --- a/include/obj/NiFlipController.h +++ b/include/obj/NiFlipController.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiFlipController(); NIFLIB_API ~NiFlipController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiFloatData.h b/include/obj/NiFloatData.h index 35a9fb7c..5d0c0483 100644 --- a/include/obj/NiFloatData.h +++ b/include/obj/NiFloatData.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiFloatData(); NIFLIB_API ~NiFloatData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiFloatExtraData.h b/include/obj/NiFloatExtraData.h index 024ac43e..77284aff 100644 --- a/include/obj/NiFloatExtraData.h +++ b/include/obj/NiFloatExtraData.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiFloatExtraData(); NIFLIB_API ~NiFloatExtraData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiFloatExtraDataController.h b/include/obj/NiFloatExtraDataController.h index 16ca9fc3..2f7c9b39 100644 --- a/include/obj/NiFloatExtraDataController.h +++ b/include/obj/NiFloatExtraDataController.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiFloatExtraDataController(); NIFLIB_API ~NiFloatExtraDataController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiFloatInterpolator.h b/include/obj/NiFloatInterpolator.h index 08aaee1d..9e2f25c3 100644 --- a/include/obj/NiFloatInterpolator.h +++ b/include/obj/NiFloatInterpolator.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiFloatInterpolator(); NIFLIB_API ~NiFloatInterpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiFloatsExtraData.h b/include/obj/NiFloatsExtraData.h index 952a89cf..d0b6082c 100644 --- a/include/obj/NiFloatsExtraData.h +++ b/include/obj/NiFloatsExtraData.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiFloatsExtraData(); NIFLIB_API ~NiFloatsExtraData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiFogProperty.h b/include/obj/NiFogProperty.h index 3a73703f..b6d26ea5 100644 --- a/include/obj/NiFogProperty.h +++ b/include/obj/NiFogProperty.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiFogProperty(); NIFLIB_API ~NiFogProperty(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiGeomMorpherController.h b/include/obj/NiGeomMorpherController.h index acb93350..2cad8ec0 100644 --- a/include/obj/NiGeomMorpherController.h +++ b/include/obj/NiGeomMorpherController.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiGeomMorpherController(); NIFLIB_API ~NiGeomMorpherController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiGeometry.h b/include/obj/NiGeometry.h index 85f85717..f1f77c93 100644 --- a/include/obj/NiGeometry.h +++ b/include/obj/NiGeometry.h @@ -33,10 +33,7 @@ public: NIFLIB_API NiGeometry(); NIFLIB_API ~NiGeometry(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiGeometryData.h b/include/obj/NiGeometryData.h index aadd1a6e..e18a6cc1 100644 --- a/include/obj/NiGeometryData.h +++ b/include/obj/NiGeometryData.h @@ -31,10 +31,7 @@ public: NIFLIB_API NiGeometryData(); NIFLIB_API ~NiGeometryData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiGravity.h b/include/obj/NiGravity.h index dc7e2887..bec76a57 100644 --- a/include/obj/NiGravity.h +++ b/include/obj/NiGravity.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiGravity(); NIFLIB_API ~NiGravity(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiImage.h b/include/obj/NiImage.h index fff2826a..641a21e5 100644 --- a/include/obj/NiImage.h +++ b/include/obj/NiImage.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiImage(); NIFLIB_API ~NiImage(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiIntegerExtraData.h b/include/obj/NiIntegerExtraData.h index f96abc5d..93932ae2 100644 --- a/include/obj/NiIntegerExtraData.h +++ b/include/obj/NiIntegerExtraData.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiIntegerExtraData(); NIFLIB_API ~NiIntegerExtraData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiIntegersExtraData.h b/include/obj/NiIntegersExtraData.h index c76c9138..51421ecb 100644 --- a/include/obj/NiIntegersExtraData.h +++ b/include/obj/NiIntegersExtraData.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiIntegersExtraData(); NIFLIB_API ~NiIntegersExtraData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiInterpolator.h b/include/obj/NiInterpolator.h index 58e5c83a..97259320 100644 --- a/include/obj/NiInterpolator.h +++ b/include/obj/NiInterpolator.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiInterpolator(); NIFLIB_API ~NiInterpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiKeyframeController.h b/include/obj/NiKeyframeController.h index ac1799f5..2dfac325 100644 --- a/include/obj/NiKeyframeController.h +++ b/include/obj/NiKeyframeController.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiKeyframeController(); NIFLIB_API ~NiKeyframeController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiKeyframeData.h b/include/obj/NiKeyframeData.h index 24ad1eeb..f198f58e 100644 --- a/include/obj/NiKeyframeData.h +++ b/include/obj/NiKeyframeData.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiKeyframeData(); NIFLIB_API ~NiKeyframeData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiLODData.h b/include/obj/NiLODData.h index 3bb3381c..349c94c4 100644 --- a/include/obj/NiLODData.h +++ b/include/obj/NiLODData.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiLODData(); NIFLIB_API ~NiLODData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiLODNode.h b/include/obj/NiLODNode.h index 0930d12c..47c559d0 100644 --- a/include/obj/NiLODNode.h +++ b/include/obj/NiLODNode.h @@ -30,10 +30,7 @@ public: NIFLIB_API NiLODNode(); NIFLIB_API ~NiLODNode(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiLight.h b/include/obj/NiLight.h index 109abd2c..dbbaa8d2 100644 --- a/include/obj/NiLight.h +++ b/include/obj/NiLight.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiLight(); NIFLIB_API ~NiLight(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiLightColorController.h b/include/obj/NiLightColorController.h index 291a09d7..2544f8a0 100644 --- a/include/obj/NiLightColorController.h +++ b/include/obj/NiLightColorController.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiLightColorController(); NIFLIB_API ~NiLightColorController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiLightDimmerController.h b/include/obj/NiLightDimmerController.h index 99a33bcb..04d45aa0 100644 --- a/include/obj/NiLightDimmerController.h +++ b/include/obj/NiLightDimmerController.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiLightDimmerController(); NIFLIB_API ~NiLightDimmerController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiLookAtController.h b/include/obj/NiLookAtController.h index 0461f8fb..4f8dae86 100644 --- a/include/obj/NiLookAtController.h +++ b/include/obj/NiLookAtController.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiLookAtController(); NIFLIB_API ~NiLookAtController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiLookAtInterpolator.h b/include/obj/NiLookAtInterpolator.h index 3f49e6c6..e525e06c 100644 --- a/include/obj/NiLookAtInterpolator.h +++ b/include/obj/NiLookAtInterpolator.h @@ -29,10 +29,7 @@ public: NIFLIB_API NiLookAtInterpolator(); NIFLIB_API ~NiLookAtInterpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiMaterialColorController.h b/include/obj/NiMaterialColorController.h index c25776f9..2ca593b7 100644 --- a/include/obj/NiMaterialColorController.h +++ b/include/obj/NiMaterialColorController.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiMaterialColorController(); NIFLIB_API ~NiMaterialColorController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiMaterialProperty.h b/include/obj/NiMaterialProperty.h index 8dc2c93c..96bb073c 100644 --- a/include/obj/NiMaterialProperty.h +++ b/include/obj/NiMaterialProperty.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiMaterialProperty(); NIFLIB_API ~NiMaterialProperty(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiMeshPSysData.h b/include/obj/NiMeshPSysData.h index fc5fb7c3..d97b4041 100644 --- a/include/obj/NiMeshPSysData.h +++ b/include/obj/NiMeshPSysData.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiMeshPSysData(); NIFLIB_API ~NiMeshPSysData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiMeshParticleSystem.h b/include/obj/NiMeshParticleSystem.h index 45620e43..bcc234d1 100644 --- a/include/obj/NiMeshParticleSystem.h +++ b/include/obj/NiMeshParticleSystem.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiMeshParticleSystem(); NIFLIB_API ~NiMeshParticleSystem(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiMorphData.h b/include/obj/NiMorphData.h index 66f71667..cc95c43e 100644 --- a/include/obj/NiMorphData.h +++ b/include/obj/NiMorphData.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiMorphData(); NIFLIB_API ~NiMorphData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiMultiTargetTransformController.h b/include/obj/NiMultiTargetTransformController.h index 0fdf032e..9689358c 100644 --- a/include/obj/NiMultiTargetTransformController.h +++ b/include/obj/NiMultiTargetTransformController.h @@ -25,10 +25,7 @@ public: NIFLIB_API NiMultiTargetTransformController(); NIFLIB_API ~NiMultiTargetTransformController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiNode.h b/include/obj/NiNode.h index 98bd9e1c..910e4cfd 100644 --- a/include/obj/NiNode.h +++ b/include/obj/NiNode.h @@ -30,10 +30,7 @@ public: NIFLIB_API NiNode(); NIFLIB_API ~NiNode(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiObject.h b/include/obj/NiObject.h index d9311b1e..51c6eb8a 100644 --- a/include/obj/NiObject.h +++ b/include/obj/NiObject.h @@ -34,12 +34,6 @@ public: /*! Destructor */ NIFLIB_API virtual ~NiObject(); - /*! - * Fetches Run Time Type Information Constant which can be used in type comparision operations. - * \return The type constant that represents this type of object. This is a static function and is not dependent on any particular instance of the object. - */ - NIFLIB_API static const Type & TypeConst(); - /*! * Used to determine the type of a particular instance of this object. * \return The type constant for the actual type of the object. @@ -135,8 +129,9 @@ public: /*! NIFLIB_HIDDEN function. For internal use only. */ NIFLIB_HIDDEN virtual void FixLinks( const map<unsigned int,NiObjectRef> & objects, list<unsigned int> & link_stack, const NifInfo & info ) {} + NIFLIB_API static const Type TYPE; private: - static const Type TYPE; + mutable unsigned int _ref_count; list<NiObject*> _cross_refs; static unsigned int objectsInMemory; @@ -164,7 +159,7 @@ template <class T> Ref<const T> StaticCast (const NiObject * object) { #endif template <class T> Ref<T> DynamicCast( NiObject * object ) { - if ( object && object->IsDerivedType(T::TypeConst()) ) { + if ( object && object->IsDerivedType(T::TYPE) ) { return (T*)object; } else { return NULL; @@ -174,7 +169,7 @@ template <class T> Ref<T> DynamicCast( NiObject * object ) { //SWIG doesn't want two versions of the same thing #ifndef SWIG template <class T> Ref<const T> DynamicCast( const NiObject * object ) { - if ( object && object->IsDerivedType(T::TypeConst()) ) { + if ( object && object->IsDerivedType(T::TYPE) ) { return (const T*)object; } else { return NULL; diff --git a/include/obj/NiObjectNET.h b/include/obj/NiObjectNET.h index 9db6eb51..e06dd403 100644 --- a/include/obj/NiObjectNET.h +++ b/include/obj/NiObjectNET.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiObjectNET(); NIFLIB_API ~NiObjectNET(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysAgeDeathModifier.h b/include/obj/NiPSysAgeDeathModifier.h index 9c5cc75d..e604f686 100644 --- a/include/obj/NiPSysAgeDeathModifier.h +++ b/include/obj/NiPSysAgeDeathModifier.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiPSysAgeDeathModifier(); NIFLIB_API ~NiPSysAgeDeathModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysBombModifier.h b/include/obj/NiPSysBombModifier.h index 31aca5d9..0784f2b5 100644 --- a/include/obj/NiPSysBombModifier.h +++ b/include/obj/NiPSysBombModifier.h @@ -24,10 +24,7 @@ public: NIFLIB_API NiPSysBombModifier(); NIFLIB_API ~NiPSysBombModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysBoundUpdateModifier.h b/include/obj/NiPSysBoundUpdateModifier.h index 56723f34..91e67eb4 100644 --- a/include/obj/NiPSysBoundUpdateModifier.h +++ b/include/obj/NiPSysBoundUpdateModifier.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPSysBoundUpdateModifier(); NIFLIB_API ~NiPSysBoundUpdateModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysBoxEmitter.h b/include/obj/NiPSysBoxEmitter.h index 322baf14..3858e39d 100644 --- a/include/obj/NiPSysBoxEmitter.h +++ b/include/obj/NiPSysBoxEmitter.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPSysBoxEmitter(); NIFLIB_API ~NiPSysBoxEmitter(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysColliderManager.h b/include/obj/NiPSysColliderManager.h index c7210acf..61b95d1c 100644 --- a/include/obj/NiPSysColliderManager.h +++ b/include/obj/NiPSysColliderManager.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiPSysColliderManager(); NIFLIB_API ~NiPSysColliderManager(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysColorModifier.h b/include/obj/NiPSysColorModifier.h index 33615427..6ca73a1b 100644 --- a/include/obj/NiPSysColorModifier.h +++ b/include/obj/NiPSysColorModifier.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiPSysColorModifier(); NIFLIB_API ~NiPSysColorModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysCylinderEmitter.h b/include/obj/NiPSysCylinderEmitter.h index d58aeedc..c3f2c5c3 100644 --- a/include/obj/NiPSysCylinderEmitter.h +++ b/include/obj/NiPSysCylinderEmitter.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPSysCylinderEmitter(); NIFLIB_API ~NiPSysCylinderEmitter(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysData.h b/include/obj/NiPSysData.h index 96489fe0..8621b1dc 100644 --- a/include/obj/NiPSysData.h +++ b/include/obj/NiPSysData.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiPSysData(); NIFLIB_API ~NiPSysData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysDragModifier.h b/include/obj/NiPSysDragModifier.h index c1e42dfa..10cf987f 100644 --- a/include/obj/NiPSysDragModifier.h +++ b/include/obj/NiPSysDragModifier.h @@ -24,10 +24,7 @@ public: NIFLIB_API NiPSysDragModifier(); NIFLIB_API ~NiPSysDragModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysEmitter.h b/include/obj/NiPSysEmitter.h index 5b945e9d..91614700 100644 --- a/include/obj/NiPSysEmitter.h +++ b/include/obj/NiPSysEmitter.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPSysEmitter(); NIFLIB_API ~NiPSysEmitter(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysEmitterCtlr.h b/include/obj/NiPSysEmitterCtlr.h index 5260804f..cb74e99c 100644 --- a/include/obj/NiPSysEmitterCtlr.h +++ b/include/obj/NiPSysEmitterCtlr.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiPSysEmitterCtlr(); NIFLIB_API ~NiPSysEmitterCtlr(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysEmitterCtlrData.h b/include/obj/NiPSysEmitterCtlrData.h index c943d29b..ec7c66d0 100644 --- a/include/obj/NiPSysEmitterCtlrData.h +++ b/include/obj/NiPSysEmitterCtlrData.h @@ -25,10 +25,7 @@ public: NIFLIB_API NiPSysEmitterCtlrData(); NIFLIB_API ~NiPSysEmitterCtlrData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysEmitterDeclinationCtlr.h b/include/obj/NiPSysEmitterDeclinationCtlr.h index c5fa2169..2b811111 100644 --- a/include/obj/NiPSysEmitterDeclinationCtlr.h +++ b/include/obj/NiPSysEmitterDeclinationCtlr.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPSysEmitterDeclinationCtlr(); NIFLIB_API ~NiPSysEmitterDeclinationCtlr(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysEmitterDeclinationVarCtlr.h b/include/obj/NiPSysEmitterDeclinationVarCtlr.h index 89e5947a..6b6729a7 100644 --- a/include/obj/NiPSysEmitterDeclinationVarCtlr.h +++ b/include/obj/NiPSysEmitterDeclinationVarCtlr.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPSysEmitterDeclinationVarCtlr(); NIFLIB_API ~NiPSysEmitterDeclinationVarCtlr(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysEmitterInitialRadiusCtlr.h b/include/obj/NiPSysEmitterInitialRadiusCtlr.h index 11d6ced2..e567d29b 100644 --- a/include/obj/NiPSysEmitterInitialRadiusCtlr.h +++ b/include/obj/NiPSysEmitterInitialRadiusCtlr.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPSysEmitterInitialRadiusCtlr(); NIFLIB_API ~NiPSysEmitterInitialRadiusCtlr(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysEmitterLifeSpanCtlr.h b/include/obj/NiPSysEmitterLifeSpanCtlr.h index c787b627..01f54fc5 100644 --- a/include/obj/NiPSysEmitterLifeSpanCtlr.h +++ b/include/obj/NiPSysEmitterLifeSpanCtlr.h @@ -25,10 +25,7 @@ public: NIFLIB_API NiPSysEmitterLifeSpanCtlr(); NIFLIB_API ~NiPSysEmitterLifeSpanCtlr(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysEmitterSpeedCtlr.h b/include/obj/NiPSysEmitterSpeedCtlr.h index be5ab9de..8578233c 100644 --- a/include/obj/NiPSysEmitterSpeedCtlr.h +++ b/include/obj/NiPSysEmitterSpeedCtlr.h @@ -24,10 +24,7 @@ public: NIFLIB_API NiPSysEmitterSpeedCtlr(); NIFLIB_API ~NiPSysEmitterSpeedCtlr(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysGravityModifier.h b/include/obj/NiPSysGravityModifier.h index 79794fb1..e590eb08 100644 --- a/include/obj/NiPSysGravityModifier.h +++ b/include/obj/NiPSysGravityModifier.h @@ -24,10 +24,7 @@ public: NIFLIB_API NiPSysGravityModifier(); NIFLIB_API ~NiPSysGravityModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysGravityStrengthCtlr.h b/include/obj/NiPSysGravityStrengthCtlr.h index beffe909..6ea0d147 100644 --- a/include/obj/NiPSysGravityStrengthCtlr.h +++ b/include/obj/NiPSysGravityStrengthCtlr.h @@ -24,10 +24,7 @@ public: NIFLIB_API NiPSysGravityStrengthCtlr(); NIFLIB_API ~NiPSysGravityStrengthCtlr(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysGrowFadeModifier.h b/include/obj/NiPSysGrowFadeModifier.h index a4c930d8..970a0f2b 100644 --- a/include/obj/NiPSysGrowFadeModifier.h +++ b/include/obj/NiPSysGrowFadeModifier.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPSysGrowFadeModifier(); NIFLIB_API ~NiPSysGrowFadeModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysMeshEmitter.h b/include/obj/NiPSysMeshEmitter.h index 0c8f72b2..a6facb02 100644 --- a/include/obj/NiPSysMeshEmitter.h +++ b/include/obj/NiPSysMeshEmitter.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiPSysMeshEmitter(); NIFLIB_API ~NiPSysMeshEmitter(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysMeshUpdateModifier.h b/include/obj/NiPSysMeshUpdateModifier.h index 6a69d23c..e70660ac 100644 --- a/include/obj/NiPSysMeshUpdateModifier.h +++ b/include/obj/NiPSysMeshUpdateModifier.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiPSysMeshUpdateModifier(); NIFLIB_API ~NiPSysMeshUpdateModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysModifier.h b/include/obj/NiPSysModifier.h index af8770c1..f82b1ddc 100644 --- a/include/obj/NiPSysModifier.h +++ b/include/obj/NiPSysModifier.h @@ -24,10 +24,7 @@ public: NIFLIB_API NiPSysModifier(); NIFLIB_API ~NiPSysModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysModifierActiveCtlr.h b/include/obj/NiPSysModifierActiveCtlr.h index a0749ad7..de7a623b 100644 --- a/include/obj/NiPSysModifierActiveCtlr.h +++ b/include/obj/NiPSysModifierActiveCtlr.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPSysModifierActiveCtlr(); NIFLIB_API ~NiPSysModifierActiveCtlr(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysPlanarCollider.h b/include/obj/NiPSysPlanarCollider.h index fecc5bc5..3a24aef7 100644 --- a/include/obj/NiPSysPlanarCollider.h +++ b/include/obj/NiPSysPlanarCollider.h @@ -29,10 +29,7 @@ public: NIFLIB_API NiPSysPlanarCollider(); NIFLIB_API ~NiPSysPlanarCollider(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysPositionModifier.h b/include/obj/NiPSysPositionModifier.h index 9c02f193..ce5e0490 100644 --- a/include/obj/NiPSysPositionModifier.h +++ b/include/obj/NiPSysPositionModifier.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiPSysPositionModifier(); NIFLIB_API ~NiPSysPositionModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysResetOnLoopCtlr.h b/include/obj/NiPSysResetOnLoopCtlr.h index c331bfd0..a063da9e 100644 --- a/include/obj/NiPSysResetOnLoopCtlr.h +++ b/include/obj/NiPSysResetOnLoopCtlr.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPSysResetOnLoopCtlr(); NIFLIB_API ~NiPSysResetOnLoopCtlr(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysRotationModifier.h b/include/obj/NiPSysRotationModifier.h index 0c3ba6ca..0e1f7449 100644 --- a/include/obj/NiPSysRotationModifier.h +++ b/include/obj/NiPSysRotationModifier.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPSysRotationModifier(); NIFLIB_API ~NiPSysRotationModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysSpawnModifier.h b/include/obj/NiPSysSpawnModifier.h index dfd7b707..699b3f3b 100644 --- a/include/obj/NiPSysSpawnModifier.h +++ b/include/obj/NiPSysSpawnModifier.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPSysSpawnModifier(); NIFLIB_API ~NiPSysSpawnModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysSphereEmitter.h b/include/obj/NiPSysSphereEmitter.h index 43a0fe77..084d280d 100644 --- a/include/obj/NiPSysSphereEmitter.h +++ b/include/obj/NiPSysSphereEmitter.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPSysSphereEmitter(); NIFLIB_API ~NiPSysSphereEmitter(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysUpdateCtlr.h b/include/obj/NiPSysUpdateCtlr.h index 7e9995f4..33bc64ce 100644 --- a/include/obj/NiPSysUpdateCtlr.h +++ b/include/obj/NiPSysUpdateCtlr.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPSysUpdateCtlr(); NIFLIB_API ~NiPSysUpdateCtlr(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPSysVolumeEmitter.h b/include/obj/NiPSysVolumeEmitter.h index 31e5f18e..823848a8 100644 --- a/include/obj/NiPSysVolumeEmitter.h +++ b/include/obj/NiPSysVolumeEmitter.h @@ -24,10 +24,7 @@ public: NIFLIB_API NiPSysVolumeEmitter(); NIFLIB_API ~NiPSysVolumeEmitter(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPalette.h b/include/obj/NiPalette.h index e4ad0c25..e0351327 100644 --- a/include/obj/NiPalette.h +++ b/include/obj/NiPalette.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiPalette(); NIFLIB_API ~NiPalette(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiParticleBomb.h b/include/obj/NiParticleBomb.h index a78d396c..df1c2827 100644 --- a/include/obj/NiParticleBomb.h +++ b/include/obj/NiParticleBomb.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiParticleBomb(); NIFLIB_API ~NiParticleBomb(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiParticleColorModifier.h b/include/obj/NiParticleColorModifier.h index 4308f572..19d53eb9 100644 --- a/include/obj/NiParticleColorModifier.h +++ b/include/obj/NiParticleColorModifier.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiParticleColorModifier(); NIFLIB_API ~NiParticleColorModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiParticleGrowFade.h b/include/obj/NiParticleGrowFade.h index 4468e835..ff61ff6a 100644 --- a/include/obj/NiParticleGrowFade.h +++ b/include/obj/NiParticleGrowFade.h @@ -25,10 +25,7 @@ public: NIFLIB_API NiParticleGrowFade(); NIFLIB_API ~NiParticleGrowFade(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiParticleMeshModifier.h b/include/obj/NiParticleMeshModifier.h index d04d97fa..5c6cbfd8 100644 --- a/include/obj/NiParticleMeshModifier.h +++ b/include/obj/NiParticleMeshModifier.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiParticleMeshModifier(); NIFLIB_API ~NiParticleMeshModifier(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiParticleMeshes.h b/include/obj/NiParticleMeshes.h index d85a94cc..8df65504 100644 --- a/include/obj/NiParticleMeshes.h +++ b/include/obj/NiParticleMeshes.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiParticleMeshes(); NIFLIB_API ~NiParticleMeshes(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiParticleMeshesData.h b/include/obj/NiParticleMeshesData.h index 2c197114..defe206b 100644 --- a/include/obj/NiParticleMeshesData.h +++ b/include/obj/NiParticleMeshesData.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiParticleMeshesData(); NIFLIB_API ~NiParticleMeshesData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiParticleRotation.h b/include/obj/NiParticleRotation.h index 842c0495..f9a400fe 100644 --- a/include/obj/NiParticleRotation.h +++ b/include/obj/NiParticleRotation.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiParticleRotation(); NIFLIB_API ~NiParticleRotation(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiParticleSystem.h b/include/obj/NiParticleSystem.h index 08b38036..9332a7c2 100644 --- a/include/obj/NiParticleSystem.h +++ b/include/obj/NiParticleSystem.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiParticleSystem(); NIFLIB_API ~NiParticleSystem(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiParticleSystemController.h b/include/obj/NiParticleSystemController.h index 6afa7644..a02c2ed2 100644 --- a/include/obj/NiParticleSystemController.h +++ b/include/obj/NiParticleSystemController.h @@ -30,10 +30,7 @@ public: NIFLIB_API NiParticleSystemController(); NIFLIB_API ~NiParticleSystemController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiParticles.h b/include/obj/NiParticles.h index 72c0d0f7..08cfef00 100644 --- a/include/obj/NiParticles.h +++ b/include/obj/NiParticles.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiParticles(); NIFLIB_API ~NiParticles(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiParticlesData.h b/include/obj/NiParticlesData.h index 28889f81..e3b002d5 100644 --- a/include/obj/NiParticlesData.h +++ b/include/obj/NiParticlesData.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiParticlesData(); NIFLIB_API ~NiParticlesData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPathController.h b/include/obj/NiPathController.h index 776f8d7f..2cf97588 100644 --- a/include/obj/NiPathController.h +++ b/include/obj/NiPathController.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiPathController(); NIFLIB_API ~NiPathController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPathInterpolator.h b/include/obj/NiPathInterpolator.h index 57b2b7ec..0aedd3a8 100644 --- a/include/obj/NiPathInterpolator.h +++ b/include/obj/NiPathInterpolator.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiPathInterpolator(); NIFLIB_API ~NiPathInterpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPixelData.h b/include/obj/NiPixelData.h index e1b1c796..d323760e 100644 --- a/include/obj/NiPixelData.h +++ b/include/obj/NiPixelData.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiPixelData(); NIFLIB_API ~NiPixelData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPlanarCollider.h b/include/obj/NiPlanarCollider.h index a2e0d244..baf35fb4 100644 --- a/include/obj/NiPlanarCollider.h +++ b/include/obj/NiPlanarCollider.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiPlanarCollider(); NIFLIB_API ~NiPlanarCollider(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPoint3Interpolator.h b/include/obj/NiPoint3Interpolator.h index 9bdde06d..dfc9b5fc 100644 --- a/include/obj/NiPoint3Interpolator.h +++ b/include/obj/NiPoint3Interpolator.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiPoint3Interpolator(); NIFLIB_API ~NiPoint3Interpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPointLight.h b/include/obj/NiPointLight.h index 8fdc2c17..181f54b5 100644 --- a/include/obj/NiPointLight.h +++ b/include/obj/NiPointLight.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiPointLight(); NIFLIB_API ~NiPointLight(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiPosData.h b/include/obj/NiPosData.h index eaf4acff..b800ee8d 100644 --- a/include/obj/NiPosData.h +++ b/include/obj/NiPosData.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiPosData(); NIFLIB_API ~NiPosData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiProperty.h b/include/obj/NiProperty.h index 29012bf8..6f42d068 100644 --- a/include/obj/NiProperty.h +++ b/include/obj/NiProperty.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiProperty(); NIFLIB_API ~NiProperty(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiRangeLODData.h b/include/obj/NiRangeLODData.h index 2e39f382..238eca14 100644 --- a/include/obj/NiRangeLODData.h +++ b/include/obj/NiRangeLODData.h @@ -26,10 +26,7 @@ public: NIFLIB_API NiRangeLODData(); NIFLIB_API ~NiRangeLODData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiRotatingParticles.h b/include/obj/NiRotatingParticles.h index ab8a3240..63cf99d5 100644 --- a/include/obj/NiRotatingParticles.h +++ b/include/obj/NiRotatingParticles.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiRotatingParticles(); NIFLIB_API ~NiRotatingParticles(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiRotatingParticlesData.h b/include/obj/NiRotatingParticlesData.h index 52689a61..e8dd5576 100644 --- a/include/obj/NiRotatingParticlesData.h +++ b/include/obj/NiRotatingParticlesData.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiRotatingParticlesData(); NIFLIB_API ~NiRotatingParticlesData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiScreenLODData.h b/include/obj/NiScreenLODData.h index 3b92ce8b..b58fc7a3 100644 --- a/include/obj/NiScreenLODData.h +++ b/include/obj/NiScreenLODData.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiScreenLODData(); NIFLIB_API ~NiScreenLODData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiSequenceStreamHelper.h b/include/obj/NiSequenceStreamHelper.h index f41a39e1..e0a2d8bb 100644 --- a/include/obj/NiSequenceStreamHelper.h +++ b/include/obj/NiSequenceStreamHelper.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiSequenceStreamHelper(); NIFLIB_API ~NiSequenceStreamHelper(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiShadeProperty.h b/include/obj/NiShadeProperty.h index 4c2e83c3..5ee61161 100644 --- a/include/obj/NiShadeProperty.h +++ b/include/obj/NiShadeProperty.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiShadeProperty(); NIFLIB_API ~NiShadeProperty(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiSingleInterpolatorController.h b/include/obj/NiSingleInterpolatorController.h index 1e1e440e..7a99f2c7 100644 --- a/include/obj/NiSingleInterpolatorController.h +++ b/include/obj/NiSingleInterpolatorController.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiSingleInterpolatorController(); NIFLIB_API ~NiSingleInterpolatorController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiSkinData.h b/include/obj/NiSkinData.h index e26ba1cf..8d3ecff2 100644 --- a/include/obj/NiSkinData.h +++ b/include/obj/NiSkinData.h @@ -36,10 +36,7 @@ public: NIFLIB_API ~NiSkinData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiSkinInstance.h b/include/obj/NiSkinInstance.h index b0355b6c..c46927b6 100644 --- a/include/obj/NiSkinInstance.h +++ b/include/obj/NiSkinInstance.h @@ -38,10 +38,7 @@ public: NIFLIB_API ~NiSkinInstance(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiSkinPartition.h b/include/obj/NiSkinPartition.h index ae18808a..201e0788 100644 --- a/include/obj/NiSkinPartition.h +++ b/include/obj/NiSkinPartition.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiSkinPartition(); NIFLIB_API ~NiSkinPartition(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiSourceTexture.h b/include/obj/NiSourceTexture.h index d0feb007..1581fd0c 100644 --- a/include/obj/NiSourceTexture.h +++ b/include/obj/NiSourceTexture.h @@ -28,10 +28,7 @@ public: NIFLIB_API NiSourceTexture(); NIFLIB_API ~NiSourceTexture(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiSpecularProperty.h b/include/obj/NiSpecularProperty.h index 2cea539a..2795333d 100644 --- a/include/obj/NiSpecularProperty.h +++ b/include/obj/NiSpecularProperty.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiSpecularProperty(); NIFLIB_API ~NiSpecularProperty(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiSphericalCollider.h b/include/obj/NiSphericalCollider.h index 763317c1..50416284 100644 --- a/include/obj/NiSphericalCollider.h +++ b/include/obj/NiSphericalCollider.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiSphericalCollider(); NIFLIB_API ~NiSphericalCollider(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiSpotLight.h b/include/obj/NiSpotLight.h index ad379627..cf7e1cab 100644 --- a/include/obj/NiSpotLight.h +++ b/include/obj/NiSpotLight.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiSpotLight(); NIFLIB_API ~NiSpotLight(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiStencilProperty.h b/include/obj/NiStencilProperty.h index 28a159a0..713f5ec1 100644 --- a/include/obj/NiStencilProperty.h +++ b/include/obj/NiStencilProperty.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiStencilProperty(); NIFLIB_API ~NiStencilProperty(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiStringExtraData.h b/include/obj/NiStringExtraData.h index 41c430b2..e44a0800 100644 --- a/include/obj/NiStringExtraData.h +++ b/include/obj/NiStringExtraData.h @@ -24,10 +24,7 @@ public: NIFLIB_API NiStringExtraData(); NIFLIB_API ~NiStringExtraData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiStringPalette.h b/include/obj/NiStringPalette.h index 41ef592e..608f30da 100644 --- a/include/obj/NiStringPalette.h +++ b/include/obj/NiStringPalette.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiStringPalette(); NIFLIB_API ~NiStringPalette(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiStringsExtraData.h b/include/obj/NiStringsExtraData.h index 9092e567..6ea62a3e 100644 --- a/include/obj/NiStringsExtraData.h +++ b/include/obj/NiStringsExtraData.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiStringsExtraData(); NIFLIB_API ~NiStringsExtraData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTextKeyExtraData.h b/include/obj/NiTextKeyExtraData.h index ba61095f..4d693baf 100644 --- a/include/obj/NiTextKeyExtraData.h +++ b/include/obj/NiTextKeyExtraData.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiTextKeyExtraData(); NIFLIB_API ~NiTextKeyExtraData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTextureEffect.h b/include/obj/NiTextureEffect.h index 08e07112..019e4acb 100644 --- a/include/obj/NiTextureEffect.h +++ b/include/obj/NiTextureEffect.h @@ -30,10 +30,7 @@ public: NIFLIB_API NiTextureEffect(); NIFLIB_API ~NiTextureEffect(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTextureModeProperty.h b/include/obj/NiTextureModeProperty.h index 655622e1..161d5938 100644 --- a/include/obj/NiTextureModeProperty.h +++ b/include/obj/NiTextureModeProperty.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiTextureModeProperty(); NIFLIB_API ~NiTextureModeProperty(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTextureProperty.h b/include/obj/NiTextureProperty.h index 76fd82ed..20b6c475 100644 --- a/include/obj/NiTextureProperty.h +++ b/include/obj/NiTextureProperty.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiTextureProperty(); NIFLIB_API ~NiTextureProperty(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTextureTransformController.h b/include/obj/NiTextureTransformController.h index 486faadf..eaa73d4d 100644 --- a/include/obj/NiTextureTransformController.h +++ b/include/obj/NiTextureTransformController.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiTextureTransformController(); NIFLIB_API ~NiTextureTransformController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTexturingProperty.h b/include/obj/NiTexturingProperty.h index 64f99b4f..74cb5a19 100644 --- a/include/obj/NiTexturingProperty.h +++ b/include/obj/NiTexturingProperty.h @@ -24,10 +24,7 @@ public: NIFLIB_API NiTexturingProperty(); NIFLIB_API ~NiTexturingProperty(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTimeController.h b/include/obj/NiTimeController.h index 55ed84e0..711794df 100644 --- a/include/obj/NiTimeController.h +++ b/include/obj/NiTimeController.h @@ -26,10 +26,7 @@ public: NIFLIB_API NiTimeController(); NIFLIB_API ~NiTimeController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTransformController.h b/include/obj/NiTransformController.h index 5a0a1c74..1c0be2c4 100644 --- a/include/obj/NiTransformController.h +++ b/include/obj/NiTransformController.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiTransformController(); NIFLIB_API ~NiTransformController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTransformData.h b/include/obj/NiTransformData.h index 94f2dcb2..2b0e1f0d 100644 --- a/include/obj/NiTransformData.h +++ b/include/obj/NiTransformData.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiTransformData(); NIFLIB_API ~NiTransformData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTransformInterpolator.h b/include/obj/NiTransformInterpolator.h index 2bb8d78e..0e93ad3f 100644 --- a/include/obj/NiTransformInterpolator.h +++ b/include/obj/NiTransformInterpolator.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiTransformInterpolator(); NIFLIB_API ~NiTransformInterpolator(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTriBasedGeom.h b/include/obj/NiTriBasedGeom.h index bdbf292e..13d1a698 100644 --- a/include/obj/NiTriBasedGeom.h +++ b/include/obj/NiTriBasedGeom.h @@ -26,10 +26,7 @@ public: NIFLIB_API NiTriBasedGeom(); NIFLIB_API ~NiTriBasedGeom(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTriBasedGeomData.h b/include/obj/NiTriBasedGeomData.h index 930cefd4..269499b3 100644 --- a/include/obj/NiTriBasedGeomData.h +++ b/include/obj/NiTriBasedGeomData.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiTriBasedGeomData(); NIFLIB_API ~NiTriBasedGeomData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTriShape.h b/include/obj/NiTriShape.h index fb5ed0f9..9da6d1cb 100644 --- a/include/obj/NiTriShape.h +++ b/include/obj/NiTriShape.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiTriShape(); NIFLIB_API ~NiTriShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTriShapeData.h b/include/obj/NiTriShapeData.h index 3bdc0800..9c3f43ab 100644 --- a/include/obj/NiTriShapeData.h +++ b/include/obj/NiTriShapeData.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiTriShapeData(); NIFLIB_API ~NiTriShapeData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTriStrips.h b/include/obj/NiTriStrips.h index e3d71f47..21be4b11 100644 --- a/include/obj/NiTriStrips.h +++ b/include/obj/NiTriStrips.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiTriStrips(); NIFLIB_API ~NiTriStrips(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiTriStripsData.h b/include/obj/NiTriStripsData.h index 200db2bb..5a47319a 100644 --- a/include/obj/NiTriStripsData.h +++ b/include/obj/NiTriStripsData.h @@ -21,10 +21,7 @@ public: NIFLIB_API NiTriStripsData(); NIFLIB_API ~NiTriStripsData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiUVController.h b/include/obj/NiUVController.h index 8d4a8a33..88cd2e83 100644 --- a/include/obj/NiUVController.h +++ b/include/obj/NiUVController.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiUVController(); NIFLIB_API ~NiUVController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiUVData.h b/include/obj/NiUVData.h index 128b52e9..a91de141 100644 --- a/include/obj/NiUVData.h +++ b/include/obj/NiUVData.h @@ -24,10 +24,7 @@ public: NIFLIB_API NiUVData(); NIFLIB_API ~NiUVData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiVectorExtraData.h b/include/obj/NiVectorExtraData.h index 7cae3eb8..f2a580b7 100644 --- a/include/obj/NiVectorExtraData.h +++ b/include/obj/NiVectorExtraData.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiVectorExtraData(); NIFLIB_API ~NiVectorExtraData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiVertWeightsExtraData.h b/include/obj/NiVertWeightsExtraData.h index 5d732708..b6d2362e 100644 --- a/include/obj/NiVertWeightsExtraData.h +++ b/include/obj/NiVertWeightsExtraData.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiVertWeightsExtraData(); NIFLIB_API ~NiVertWeightsExtraData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiVertexColorProperty.h b/include/obj/NiVertexColorProperty.h index 7470f4b5..a75cc26a 100644 --- a/include/obj/NiVertexColorProperty.h +++ b/include/obj/NiVertexColorProperty.h @@ -25,10 +25,7 @@ public: NIFLIB_API NiVertexColorProperty(); NIFLIB_API ~NiVertexColorProperty(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiVisController.h b/include/obj/NiVisController.h index 93c16007..ee33e77f 100644 --- a/include/obj/NiVisController.h +++ b/include/obj/NiVisController.h @@ -27,10 +27,7 @@ public: NIFLIB_API NiVisController(); NIFLIB_API ~NiVisController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiVisData.h b/include/obj/NiVisData.h index d29dcf14..d3ccc21f 100644 --- a/include/obj/NiVisData.h +++ b/include/obj/NiVisData.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiVisData(); NIFLIB_API ~NiVisData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiWireframeProperty.h b/include/obj/NiWireframeProperty.h index 20c2d0f2..0bbabff6 100644 --- a/include/obj/NiWireframeProperty.h +++ b/include/obj/NiWireframeProperty.h @@ -22,10 +22,7 @@ public: NIFLIB_API NiWireframeProperty(); NIFLIB_API ~NiWireframeProperty(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/NiZBufferProperty.h b/include/obj/NiZBufferProperty.h index f72db174..1b173b4e 100644 --- a/include/obj/NiZBufferProperty.h +++ b/include/obj/NiZBufferProperty.h @@ -23,10 +23,7 @@ public: NIFLIB_API NiZBufferProperty(); NIFLIB_API ~NiZBufferProperty(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/RootCollisionNode.h b/include/obj/RootCollisionNode.h index 2b1755d6..cdb25cdc 100644 --- a/include/obj/RootCollisionNode.h +++ b/include/obj/RootCollisionNode.h @@ -21,10 +21,7 @@ public: NIFLIB_API RootCollisionNode(); NIFLIB_API ~RootCollisionNode(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkBlendCollisionObject.h b/include/obj/bhkBlendCollisionObject.h index fb04d64f..90888849 100644 --- a/include/obj/bhkBlendCollisionObject.h +++ b/include/obj/bhkBlendCollisionObject.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkBlendCollisionObject(); NIFLIB_API ~bhkBlendCollisionObject(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkBlendController.h b/include/obj/bhkBlendController.h index ade96a55..668664c9 100644 --- a/include/obj/bhkBlendController.h +++ b/include/obj/bhkBlendController.h @@ -22,10 +22,7 @@ public: NIFLIB_API bhkBlendController(); NIFLIB_API ~bhkBlendController(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkBoxShape.h b/include/obj/bhkBoxShape.h index 3a67f3ed..dc0c9cd1 100644 --- a/include/obj/bhkBoxShape.h +++ b/include/obj/bhkBoxShape.h @@ -22,10 +22,7 @@ public: NIFLIB_API bhkBoxShape(); NIFLIB_API ~bhkBoxShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkCapsuleShape.h b/include/obj/bhkCapsuleShape.h index 3f58d4fa..c1846858 100644 --- a/include/obj/bhkCapsuleShape.h +++ b/include/obj/bhkCapsuleShape.h @@ -22,10 +22,7 @@ public: NIFLIB_API bhkCapsuleShape(); NIFLIB_API ~bhkCapsuleShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkCollisionObject.h b/include/obj/bhkCollisionObject.h index db4d1b53..c677d3b4 100644 --- a/include/obj/bhkCollisionObject.h +++ b/include/obj/bhkCollisionObject.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkCollisionObject(); NIFLIB_API ~bhkCollisionObject(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; NIFLIB_API virtual string asString( bool verbose = false ) const; diff --git a/include/obj/bhkConvexShape.h b/include/obj/bhkConvexShape.h index 0ee275ab..57ab99ac 100644 --- a/include/obj/bhkConvexShape.h +++ b/include/obj/bhkConvexShape.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkConvexShape(); NIFLIB_API ~bhkConvexShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkConvexTransformShape.h b/include/obj/bhkConvexTransformShape.h index 46152171..b2132e6d 100644 --- a/include/obj/bhkConvexTransformShape.h +++ b/include/obj/bhkConvexTransformShape.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkConvexTransformShape(); NIFLIB_API ~bhkConvexTransformShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkConvexVerticesShape.h b/include/obj/bhkConvexVerticesShape.h index ae5b198b..c96bf167 100644 --- a/include/obj/bhkConvexVerticesShape.h +++ b/include/obj/bhkConvexVerticesShape.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkConvexVerticesShape(); NIFLIB_API ~bhkConvexVerticesShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkEntity.h b/include/obj/bhkEntity.h index c4d11867..381e3b98 100644 --- a/include/obj/bhkEntity.h +++ b/include/obj/bhkEntity.h @@ -27,10 +27,7 @@ public: NIFLIB_API bhkEntity(); NIFLIB_API ~bhkEntity(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkHingeConstraint.h b/include/obj/bhkHingeConstraint.h index 7e8f9ae5..c29b028f 100644 --- a/include/obj/bhkHingeConstraint.h +++ b/include/obj/bhkHingeConstraint.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkHingeConstraint(); NIFLIB_API ~bhkHingeConstraint(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkLimitedHingeConstraint.h b/include/obj/bhkLimitedHingeConstraint.h index cd8caf8b..31aa5da0 100644 --- a/include/obj/bhkLimitedHingeConstraint.h +++ b/include/obj/bhkLimitedHingeConstraint.h @@ -25,10 +25,7 @@ public: NIFLIB_API bhkLimitedHingeConstraint(); NIFLIB_API ~bhkLimitedHingeConstraint(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkListShape.h b/include/obj/bhkListShape.h index af8270f1..8e19ba45 100644 --- a/include/obj/bhkListShape.h +++ b/include/obj/bhkListShape.h @@ -27,10 +27,7 @@ public: NIFLIB_API bhkListShape(); NIFLIB_API ~bhkListShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkMalleableConstraint.h b/include/obj/bhkMalleableConstraint.h index 7975d1f4..ddf1cb5e 100644 --- a/include/obj/bhkMalleableConstraint.h +++ b/include/obj/bhkMalleableConstraint.h @@ -29,10 +29,7 @@ public: NIFLIB_API bhkMalleableConstraint(); NIFLIB_API ~bhkMalleableConstraint(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkMoppBvTreeShape.h b/include/obj/bhkMoppBvTreeShape.h index 5a8fa1d8..86f47fcc 100644 --- a/include/obj/bhkMoppBvTreeShape.h +++ b/include/obj/bhkMoppBvTreeShape.h @@ -28,10 +28,7 @@ public: NIFLIB_API bhkMoppBvTreeShape(); NIFLIB_API ~bhkMoppBvTreeShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkMultiSphereShape.h b/include/obj/bhkMultiSphereShape.h index 1fa49552..2526c995 100644 --- a/include/obj/bhkMultiSphereShape.h +++ b/include/obj/bhkMultiSphereShape.h @@ -24,10 +24,7 @@ public: NIFLIB_API bhkMultiSphereShape(); NIFLIB_API ~bhkMultiSphereShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkNiTriStripsShape.h b/include/obj/bhkNiTriStripsShape.h index 2f6acfc8..07d582c4 100644 --- a/include/obj/bhkNiTriStripsShape.h +++ b/include/obj/bhkNiTriStripsShape.h @@ -28,10 +28,7 @@ public: NIFLIB_API bhkNiTriStripsShape(); NIFLIB_API ~bhkNiTriStripsShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkPackedNiTriStripsShape.h b/include/obj/bhkPackedNiTriStripsShape.h index f006efa8..adc897fc 100644 --- a/include/obj/bhkPackedNiTriStripsShape.h +++ b/include/obj/bhkPackedNiTriStripsShape.h @@ -28,10 +28,7 @@ public: NIFLIB_API bhkPackedNiTriStripsShape(); NIFLIB_API ~bhkPackedNiTriStripsShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkPrismaticConstraint.h b/include/obj/bhkPrismaticConstraint.h index bbfff378..b83f6659 100644 --- a/include/obj/bhkPrismaticConstraint.h +++ b/include/obj/bhkPrismaticConstraint.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkPrismaticConstraint(); NIFLIB_API ~bhkPrismaticConstraint(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkRagdollConstraint.h b/include/obj/bhkRagdollConstraint.h index eb574d18..2e9825b2 100644 --- a/include/obj/bhkRagdollConstraint.h +++ b/include/obj/bhkRagdollConstraint.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkRagdollConstraint(); NIFLIB_API ~bhkRagdollConstraint(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkRefObject.h b/include/obj/bhkRefObject.h index 79b09667..6b6be611 100644 --- a/include/obj/bhkRefObject.h +++ b/include/obj/bhkRefObject.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkRefObject(); NIFLIB_API ~bhkRefObject(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkRigidBody.h b/include/obj/bhkRigidBody.h index 0de39e88..13b1b1d7 100644 --- a/include/obj/bhkRigidBody.h +++ b/include/obj/bhkRigidBody.h @@ -28,10 +28,7 @@ public: NIFLIB_API bhkRigidBody(); NIFLIB_API ~bhkRigidBody(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkRigidBodyT.h b/include/obj/bhkRigidBodyT.h index a634c6a4..b3f741c4 100644 --- a/include/obj/bhkRigidBodyT.h +++ b/include/obj/bhkRigidBodyT.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkRigidBodyT(); NIFLIB_API ~bhkRigidBodyT(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkSPCollisionObject.h b/include/obj/bhkSPCollisionObject.h index 46e8e34e..8be90ee1 100644 --- a/include/obj/bhkSPCollisionObject.h +++ b/include/obj/bhkSPCollisionObject.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkSPCollisionObject(); NIFLIB_API ~bhkSPCollisionObject(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkSerializable.h b/include/obj/bhkSerializable.h index ac35ec4e..9db9ecdc 100644 --- a/include/obj/bhkSerializable.h +++ b/include/obj/bhkSerializable.h @@ -22,10 +22,7 @@ public: NIFLIB_API bhkSerializable(); NIFLIB_API ~bhkSerializable(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkShape.h b/include/obj/bhkShape.h index 969e8029..9c47449c 100644 --- a/include/obj/bhkShape.h +++ b/include/obj/bhkShape.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkShape(); NIFLIB_API ~bhkShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkSimpleShapePhantom.h b/include/obj/bhkSimpleShapePhantom.h index bb2fa091..ed5a5556 100644 --- a/include/obj/bhkSimpleShapePhantom.h +++ b/include/obj/bhkSimpleShapePhantom.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkSimpleShapePhantom(); NIFLIB_API ~bhkSimpleShapePhantom(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkSphereRepShape.h b/include/obj/bhkSphereRepShape.h index 03dd1cdb..991b281f 100644 --- a/include/obj/bhkSphereRepShape.h +++ b/include/obj/bhkSphereRepShape.h @@ -23,10 +23,7 @@ public: NIFLIB_API bhkSphereRepShape(); NIFLIB_API ~bhkSphereRepShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkSphereShape.h b/include/obj/bhkSphereShape.h index a8cd0cdc..020f5f9e 100644 --- a/include/obj/bhkSphereShape.h +++ b/include/obj/bhkSphereShape.h @@ -22,10 +22,7 @@ public: NIFLIB_API bhkSphereShape(); NIFLIB_API ~bhkSphereShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkStiffSpringConstraint.h b/include/obj/bhkStiffSpringConstraint.h index 8328966e..1aa51ab9 100644 --- a/include/obj/bhkStiffSpringConstraint.h +++ b/include/obj/bhkStiffSpringConstraint.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkStiffSpringConstraint(); NIFLIB_API ~bhkStiffSpringConstraint(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkTransformShape.h b/include/obj/bhkTransformShape.h index 9eef8467..5d12b154 100644 --- a/include/obj/bhkTransformShape.h +++ b/include/obj/bhkTransformShape.h @@ -22,10 +22,7 @@ public: NIFLIB_API bhkTransformShape(); NIFLIB_API ~bhkTransformShape(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/bhkWorldObject.h b/include/obj/bhkWorldObject.h index ceb4e7b4..4f84705b 100644 --- a/include/obj/bhkWorldObject.h +++ b/include/obj/bhkWorldObject.h @@ -21,10 +21,7 @@ public: NIFLIB_API bhkWorldObject(); NIFLIB_API ~bhkWorldObject(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/include/obj/hkPackedNiTriStripsData.h b/include/obj/hkPackedNiTriStripsData.h index c22185cf..fb6cdf75 100644 --- a/include/obj/hkPackedNiTriStripsData.h +++ b/include/obj/hkPackedNiTriStripsData.h @@ -25,10 +25,7 @@ public: NIFLIB_API hkPackedNiTriStripsData(); NIFLIB_API ~hkPackedNiTriStripsData(); //Run-Time Type Information - NIFLIB_API static const Type & TypeConst(); -private: - static const Type TYPE; -public: + NIFLIB_API static const Type TYPE; NIFLIB_API virtual const Type & GetType() const; NIFLIB_HIDDEN virtual void Read( istream& in, list<unsigned int> & link_stack, const NifInfo & info ); NIFLIB_HIDDEN virtual void Write( ostream& out, const map<NiObjectRef,unsigned int> & link_map, const NifInfo & info ) const; diff --git a/src/ComplexShape.cpp b/src/ComplexShape.cpp index 8a39b6a9..283c185f 100644 --- a/src/ComplexShape.cpp +++ b/src/ComplexShape.cpp @@ -188,17 +188,17 @@ void ComplexShape::Merge( NiAVObject * root ) { vector<NiTriBasedGeomRef> shapes; //Determine root type - if ( root->IsDerivedType( NiTriBasedGeom::TypeConst() ) ) { + if ( root->IsDerivedType( NiTriBasedGeom::TYPE ) ) { //The function was called on a single shape. //Add it to the list shapes.push_back( DynamicCast<NiTriBasedGeom>(root) ); - } else if ( root->IsDerivedType( NiNode::TypeConst() ) ) { + } else if ( root->IsDerivedType( NiNode::TYPE ) ) { //The function was called on a NiNOde. Search for //shape children NiNodeRef nodeRoot = DynamicCast<NiNode>(root); vector<NiAVObjectRef> children = nodeRoot->GetChildren(); for ( unsigned int child = 0; child < children.size(); ++child ) { - if ( children[child]->IsDerivedType( NiTriBasedGeom::TypeConst() ) ) { + if ( children[child]->IsDerivedType( NiTriBasedGeom::TYPE ) ) { shapes.push_back( DynamicCast<NiTriBasedGeom>(children[child]) ); } } @@ -334,7 +334,7 @@ void ComplexShape::Merge( NiAVObject * root ) { for ( unsigned int tex = 0; tex < uvSetList.size(); ++tex ) { uvSetList[tex] = BASE_MAP; } - NiPropertyRef niProp = (*geom)->GetPropertyByType( NiTexturingProperty::TypeConst() ); + NiPropertyRef niProp = (*geom)->GetPropertyByType( NiTexturingProperty::TYPE ); NiTexturingPropertyRef niTexProp; if ( niProp != NULL ) { niTexProp = DynamicCast<NiTexturingProperty>(niProp); @@ -680,7 +680,7 @@ Ref<NiAVObject> ComplexShape::Split( NiNode * parent, Matrix44 & transform, int //Search for a NiTexturingProperty to build list of //texture cooridinate sets to create - NiPropertyRef niProp = shapes[shape_num]->GetPropertyByType( NiTexturingProperty::TypeConst() ); + NiPropertyRef niProp = shapes[shape_num]->GetPropertyByType( NiTexturingProperty::TYPE ); NiTexturingPropertyRef niTexProp; if ( niProp != NULL ) { niTexProp = DynamicCast<NiTexturingProperty>(niProp); diff --git a/src/niflib.cpp b/src/niflib.cpp index 5f372971..6a18a054 100644 --- a/src/niflib.cpp +++ b/src/niflib.cpp @@ -447,10 +447,10 @@ void WriteNifTree( ostream & out, list<NiObjectRef> const & roots, const NifInfo footer.numRoots = 0; if (roots.size() == 1) { const NiObjectRef& root = roots.front(); - if (root->IsDerivedType(NiControllerSequence::TypeConst())) { + if (root->IsDerivedType(NiControllerSequence::TYPE)) { // KF animation files allow for multiple roots of type NiControllerSequence for ( unsigned int i = 0; i < objects.size(); ++i ) { - if (objects[i]->IsDerivedType(NiControllerSequence::TypeConst())) { + if (objects[i]->IsDerivedType(NiControllerSequence::TYPE)) { footer.roots.push_back(objects[i]); } } @@ -515,8 +515,8 @@ void EnumerateObjects( NiObject * root, map<Type*,unsigned int> & type_map, map< // a more generic mechanism in the future. Type *t = (Type*)&(root->GetType()); if ( reverse - || t->IsDerivedType(bhkRigidBody::TypeConst()) - || t->IsDerivedType(bhkCollisionObject::TypeConst()) + || t->IsDerivedType(bhkRigidBody::TYPE) + || t->IsDerivedType(bhkCollisionObject::TYPE) ) { reverse = true; @@ -596,7 +596,7 @@ static std::string CreateFileName(std::string name) { static void SplitNifTree( NiObject * root_object, NiObject * xnif_root, list<NiObjectRef> & xkf_roots, Kfm & kfm, int kf_type, const NifInfo & info ) { // Do we have animation groups (a NiTextKeyExtraData object)? // If so, create XNif and XKf trees. - NiObjectRef txtkey = GetObjectByType( root_object, NiTextKeyExtraData::TypeConst() ); + NiObjectRef txtkey = GetObjectByType( root_object, NiTextKeyExtraData::TYPE ); NiTextKeyExtraDataRef txtkey_obj; if ( txtkey != NULL ) { txtkey_obj = DynamicCast<NiTextKeyExtraData>(txtkey); @@ -608,7 +608,7 @@ static void SplitNifTree( NiObject * root_object, NiObject * xnif_root, list<NiO xnif_root = CloneNifTree( root_object, info.version, info.userVersion ); // Now search and locate newer timeframe controllers and convert to keyframecontrollers - list<NiObjectRef> mgrs = GetAllObjectsByType( xnif_root, NiControllerManager::TypeConst() ); + list<NiObjectRef> mgrs = GetAllObjectsByType( xnif_root, NiControllerManager::TYPE ); for ( list<NiObjectRef>::iterator it = mgrs.begin(); it != mgrs.end(); ++it) { NiControllerManagerRef mgr = DynamicCast<NiControllerManager>(*it); if ( mgr == NULL ) { @@ -631,7 +631,7 @@ static void SplitNifTree( NiObject * root_object, NiObject * xnif_root, list<NiO // Append NiNodes with a NiKeyFrameController as NiStringExtraData objects. list< pair< NiNodeRef, NiKeyframeControllerRef> > node_controllers; - list<NiObjectRef> nodes = GetAllObjectsByType( xnif_root, NiNode::TypeConst() ); + list<NiObjectRef> nodes = GetAllObjectsByType( xnif_root, NiNode::TYPE ); for ( list<NiObjectRef>::iterator it = nodes.begin(); it != nodes.end(); ++it) { NiNodeRef node = DynamicCast<NiNode>(*it); if ( node == NULL ) { @@ -643,9 +643,9 @@ static void SplitNifTree( NiObject * root_object, NiObject * xnif_root, list<NiO NiKeyframeControllerRef key_controller; for ( list<NiTimeControllerRef>::iterator it = controllers.begin(); it != controllers.end(); ++it ) { - if ((*it)->IsDerivedType(NiKeyframeController::TypeConst())) { + if ((*it)->IsDerivedType(NiKeyframeController::TYPE)) { key_controller = StaticCast<NiKeyframeController>(*it); - } else if ((*it)->IsDerivedType(NiTransformController::TypeConst())) { + } else if ((*it)->IsDerivedType(NiTransformController::TYPE)) { NiTransformControllerRef trans = StaticCast<NiTransformController>(*it); NiTransformInterpolatorRef interp = DynamicCast<NiTransformInterpolator>(trans->GetInterpolator()); if (interp != NULL) { @@ -705,7 +705,7 @@ static void SplitNifTree( NiObject * root_object, NiObject * xnif_root, list<NiO // Construct the Nif file without transform controllers ... xnif_root = CloneNifTree( root_object, info.version, info.userVersion ); - list<NiObjectRef> mgrs = GetAllObjectsByType( xnif_root, NiControllerManager::TypeConst() ); + list<NiObjectRef> mgrs = GetAllObjectsByType( xnif_root, NiControllerManager::TYPE ); for ( list<NiObjectRef>::iterator it = mgrs.begin(); it != mgrs.end(); ++it) { NiControllerManagerRef mgr = DynamicCast<NiControllerManager>(*it); if ( mgr == NULL ) { diff --git a/src/obj/ABoneLODController.cpp b/src/obj/ABoneLODController.cpp index 21379ee1..057818a8 100644 --- a/src/obj/ABoneLODController.cpp +++ b/src/obj/ABoneLODController.cpp @@ -8,7 +8,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type ABoneLODController::TYPE("ABoneLODController", &A_BONE_L_O_D_CONTROLLER_PARENT::TypeConst() ); +const Type ABoneLODController::TYPE("ABoneLODController", &A_BONE_L_O_D_CONTROLLER_PARENT::TYPE ); ABoneLODController::ABoneLODController() A_BONE_L_O_D_CONTROLLER_CONSTRUCT {} @@ -99,7 +99,3 @@ void ABoneLODController::ClearNodeGroups() { nodeGroups.clear(); numNodeGroups2 = nodeGroups.size(); } - -const Type & ABoneLODController::TypeConst() { - return TYPE; -} diff --git a/src/obj/AKeyedData.cpp b/src/obj/AKeyedData.cpp index d40631c0..5c6ea998 100644 --- a/src/obj/AKeyedData.cpp +++ b/src/obj/AKeyedData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type AKeyedData::TYPE("AKeyedData", &A_KEYED_DATA_PARENT::TypeConst() ); +const Type AKeyedData::TYPE("AKeyedData", &A_KEYED_DATA_PARENT::TYPE ); AKeyedData::AKeyedData() A_KEYED_DATA_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> AKeyedData::GetRefs() const { const Type & AKeyedData::GetType() const { return TYPE; }; - -const Type & AKeyedData::TypeConst() { - return TYPE; -} diff --git a/src/obj/APSysCtlr.cpp b/src/obj/APSysCtlr.cpp index 492da492..e4002977 100644 --- a/src/obj/APSysCtlr.cpp +++ b/src/obj/APSysCtlr.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type APSysCtlr::TYPE("APSysCtlr", &A_P_SYS_CTLR_PARENT::TypeConst() ); +const Type APSysCtlr::TYPE("APSysCtlr", &A_P_SYS_CTLR_PARENT::TYPE ); APSysCtlr::APSysCtlr() A_P_SYS_CTLR_CONSTRUCT {} @@ -42,7 +42,3 @@ string APSysCtlr::GetModifierName() const { void APSysCtlr::SetModifierName( string value ) { modifierName = value; } - -const Type & APSysCtlr::TypeConst() { - return TYPE; -} diff --git a/src/obj/APSysData.cpp b/src/obj/APSysData.cpp index 759f3eba..794758e2 100644 --- a/src/obj/APSysData.cpp +++ b/src/obj/APSysData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type APSysData::TYPE("APSysData", &A_P_SYS_DATA_PARENT::TypeConst() ); +const Type APSysData::TYPE("APSysData", &A_P_SYS_DATA_PARENT::TYPE ); APSysData::APSysData() A_P_SYS_DATA_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> APSysData::GetRefs() const { const Type & APSysData::GetType() const { return TYPE; }; - -const Type & APSysData::TypeConst() { - return TYPE; -} diff --git a/src/obj/AParticleModifier.cpp b/src/obj/AParticleModifier.cpp index fc90e3ea..76c75a72 100644 --- a/src/obj/AParticleModifier.cpp +++ b/src/obj/AParticleModifier.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type AParticleModifier::TYPE("AParticleModifier", &A_PARTICLE_MODIFIER_PARENT::TypeConst() ); +const Type AParticleModifier::TYPE("AParticleModifier", &A_PARTICLE_MODIFIER_PARENT::TYPE ); AParticleModifier::AParticleModifier() A_PARTICLE_MODIFIER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> AParticleModifier::GetRefs() const { const Type & AParticleModifier::GetType() const { return TYPE; }; - -const Type & AParticleModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/AbhkConstraint.cpp b/src/obj/AbhkConstraint.cpp index ea67dcc5..cf17aa22 100644 --- a/src/obj/AbhkConstraint.cpp +++ b/src/obj/AbhkConstraint.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type AbhkConstraint::TYPE("AbhkConstraint", &ABHK_CONSTRAINT_PARENT::TypeConst() ); +const Type AbhkConstraint::TYPE("AbhkConstraint", &ABHK_CONSTRAINT_PARENT::TYPE ); AbhkConstraint::AbhkConstraint() ABHK_CONSTRAINT_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> AbhkConstraint::GetRefs() const { const Type & AbhkConstraint::GetType() const { return TYPE; }; - -const Type & AbhkConstraint::TypeConst() { - return TYPE; -} diff --git a/src/obj/AbhkRagdollConstraint.cpp b/src/obj/AbhkRagdollConstraint.cpp index b881c7f7..620b15db 100644 --- a/src/obj/AbhkRagdollConstraint.cpp +++ b/src/obj/AbhkRagdollConstraint.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type AbhkRagdollConstraint::TYPE("AbhkRagdollConstraint", &ABHK_RAGDOLL_CONSTRAINT_PARENT::TypeConst() ); +const Type AbhkRagdollConstraint::TYPE("AbhkRagdollConstraint", &ABHK_RAGDOLL_CONSTRAINT_PARENT::TYPE ); AbhkRagdollConstraint::AbhkRagdollConstraint() ABHK_RAGDOLL_CONSTRAINT_CONSTRUCT {} @@ -35,6 +35,3 @@ const Type & AbhkRagdollConstraint::GetType() const { return TYPE; }; -const Type & AbhkRagdollConstraint::TypeConst() { - return TYPE; -} diff --git a/src/obj/AbhkShapeCollection.cpp b/src/obj/AbhkShapeCollection.cpp index 1c022da7..9a2db0b2 100644 --- a/src/obj/AbhkShapeCollection.cpp +++ b/src/obj/AbhkShapeCollection.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type AbhkShapeCollection::TYPE("AbhkShapeCollection", &ABHK_SHAPE_COLLECTION_PARENT::TypeConst() ); +const Type AbhkShapeCollection::TYPE("AbhkShapeCollection", &ABHK_SHAPE_COLLECTION_PARENT::TYPE ); AbhkShapeCollection::AbhkShapeCollection() ABHK_SHAPE_COLLECTION_CONSTRUCT {} @@ -35,6 +35,3 @@ const Type & AbhkShapeCollection::GetType() const { return TYPE; }; -const Type & AbhkShapeCollection::TypeConst() { - return TYPE; -} diff --git a/src/obj/AvoidNode.cpp b/src/obj/AvoidNode.cpp index fafb4882..390e600d 100644 --- a/src/obj/AvoidNode.cpp +++ b/src/obj/AvoidNode.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type AvoidNode::TYPE("AvoidNode", &AVOID_NODE_PARENT::TypeConst() ); +const Type AvoidNode::TYPE("AvoidNode", &AVOID_NODE_PARENT::TYPE ); AvoidNode::AvoidNode() AVOID_NODE_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> AvoidNode::GetRefs() const { const Type & AvoidNode::GetType() const { return TYPE; }; - -const Type & AvoidNode::TypeConst() { - return TYPE; -} diff --git a/src/obj/BSBound.cpp b/src/obj/BSBound.cpp index 585b8bef..15479d56 100644 --- a/src/obj/BSBound.cpp +++ b/src/obj/BSBound.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type BSBound::TYPE("BSBound", &B_S_BOUND_PARENT::TypeConst() ); +const Type BSBound::TYPE("BSBound", &B_S_BOUND_PARENT::TYPE ); BSBound::BSBound() B_S_BOUND_CONSTRUCT {} @@ -50,7 +50,3 @@ Vector3 BSBound::GetDimensions() const { void BSBound::SetDimensions( const Vector3 & value ) { dimensions = value; } - -const Type & BSBound::TypeConst() { - return TYPE; -} diff --git a/src/obj/BSFurnitureMarker.cpp b/src/obj/BSFurnitureMarker.cpp index dc1061f6..14696e4c 100644 --- a/src/obj/BSFurnitureMarker.cpp +++ b/src/obj/BSFurnitureMarker.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type BSFurnitureMarker::TYPE("BSFurnitureMarker", &B_S_FURNITURE_MARKER_PARENT::TypeConst() ); +const Type BSFurnitureMarker::TYPE("BSFurnitureMarker", &B_S_FURNITURE_MARKER_PARENT::TYPE ); BSFurnitureMarker::BSFurnitureMarker() B_S_FURNITURE_MARKER_CONSTRUCT {} @@ -44,7 +44,3 @@ void BSFurnitureMarker::SetFurniturePositions( const vector<FurniturePosition> & numPositions = (unsigned int)(n.size()); positions = n; } - -const Type & BSFurnitureMarker::TypeConst() { - return TYPE; -} diff --git a/src/obj/BSKeyframeController.cpp b/src/obj/BSKeyframeController.cpp index 3fab29c7..c7268d46 100644 --- a/src/obj/BSKeyframeController.cpp +++ b/src/obj/BSKeyframeController.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type BSKeyframeController::TYPE("BSKeyframeController", &B_S_KEYFRAME_CONTROLLER_PARENT::TypeConst() ); +const Type BSKeyframeController::TYPE("BSKeyframeController", &B_S_KEYFRAME_CONTROLLER_PARENT::TYPE ); BSKeyframeController::BSKeyframeController() B_S_KEYFRAME_CONTROLLER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> BSKeyframeController::GetRefs() const { const Type & BSKeyframeController::GetType() const { return TYPE; }; - -const Type & BSKeyframeController::TypeConst() { - return TYPE; -} diff --git a/src/obj/BSPSysArrayEmitter.cpp b/src/obj/BSPSysArrayEmitter.cpp index a50cc500..bddbdc6d 100644 --- a/src/obj/BSPSysArrayEmitter.cpp +++ b/src/obj/BSPSysArrayEmitter.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type BSPSysArrayEmitter::TYPE("BSPSysArrayEmitter", &B_S_P_SYS_ARRAY_EMITTER_PARENT::TypeConst() ); +const Type BSPSysArrayEmitter::TYPE("BSPSysArrayEmitter", &B_S_P_SYS_ARRAY_EMITTER_PARENT::TYPE ); BSPSysArrayEmitter::BSPSysArrayEmitter() B_S_P_SYS_ARRAY_EMITTER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> BSPSysArrayEmitter::GetRefs() const { const Type & BSPSysArrayEmitter::GetType() const { return TYPE; }; - -const Type & BSPSysArrayEmitter::TypeConst() { - return TYPE; -} diff --git a/src/obj/BSParentVelocityModifier.cpp b/src/obj/BSParentVelocityModifier.cpp index 159d07d7..afc41ad9 100644 --- a/src/obj/BSParentVelocityModifier.cpp +++ b/src/obj/BSParentVelocityModifier.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type BSParentVelocityModifier::TYPE("BSParentVelocityModifier", &B_S_PARENT_VELOCITY_MODIFIER_PARENT::TypeConst() ); +const Type BSParentVelocityModifier::TYPE("BSParentVelocityModifier", &B_S_PARENT_VELOCITY_MODIFIER_PARENT::TYPE ); BSParentVelocityModifier::BSParentVelocityModifier() B_S_PARENT_VELOCITY_MODIFIER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> BSParentVelocityModifier::GetRefs() const { const Type & BSParentVelocityModifier::GetType() const { return TYPE; }; - -const Type & BSParentVelocityModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/BSXFlags.cpp b/src/obj/BSXFlags.cpp index 6cb205b4..bf8c8331 100644 --- a/src/obj/BSXFlags.cpp +++ b/src/obj/BSXFlags.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type BSXFlags::TYPE("BSXFlags", &B_S_X_FLAGS_PARENT::TypeConst() ); +const Type BSXFlags::TYPE("BSXFlags", &B_S_X_FLAGS_PARENT::TYPE ); BSXFlags::BSXFlags() B_S_X_FLAGS_CONSTRUCT {} @@ -42,7 +42,3 @@ unsigned int BSXFlags::GetFlags() const { void BSXFlags::SetFlags( unsigned int value ) { flags = value; } - -const Type & BSXFlags::TypeConst() { - return TYPE; -} diff --git a/src/obj/FxButton.cpp b/src/obj/FxButton.cpp index 45956020..3aeed02c 100644 --- a/src/obj/FxButton.cpp +++ b/src/obj/FxButton.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type FxButton::TYPE("FxButton", &FX_BUTTON_PARENT::TypeConst() ); +const Type FxButton::TYPE("FxButton", &FX_BUTTON_PARENT::TYPE ); FxButton::FxButton() FX_BUTTON_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> FxButton::GetRefs() const { const Type & FxButton::GetType() const { return TYPE; }; - -const Type & FxButton::TypeConst() { - return TYPE; -} diff --git a/src/obj/FxRadioButton.cpp b/src/obj/FxRadioButton.cpp index c9cd295f..6e1f9edf 100644 --- a/src/obj/FxRadioButton.cpp +++ b/src/obj/FxRadioButton.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type FxRadioButton::TYPE("FxRadioButton", &FX_RADIO_BUTTON_PARENT::TypeConst() ); +const Type FxRadioButton::TYPE("FxRadioButton", &FX_RADIO_BUTTON_PARENT::TYPE ); FxRadioButton::FxRadioButton() FX_RADIO_BUTTON_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> FxRadioButton::GetRefs() const { const Type & FxRadioButton::GetType() const { return TYPE; }; - -const Type & FxRadioButton::TypeConst() { - return TYPE; -} diff --git a/src/obj/FxWidget.cpp b/src/obj/FxWidget.cpp index 9f92fd4e..6ca7a9f6 100644 --- a/src/obj/FxWidget.cpp +++ b/src/obj/FxWidget.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type FxWidget::TYPE("FxWidget", &FX_WIDGET_PARENT::TypeConst() ); +const Type FxWidget::TYPE("FxWidget", &FX_WIDGET_PARENT::TYPE ); FxWidget::FxWidget() FX_WIDGET_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> FxWidget::GetRefs() const { const Type & FxWidget::GetType() const { return TYPE; }; - -const Type & FxWidget::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiAVObject.cpp b/src/obj/NiAVObject.cpp index e3150626..2eb517f3 100644 --- a/src/obj/NiAVObject.cpp +++ b/src/obj/NiAVObject.cpp @@ -9,7 +9,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiAVObject::TYPE("NiAVObject", &NI_A_V_OBJECT_PARENT::TypeConst() ); +const Type NiAVObject::TYPE("NiAVObject", &NI_A_V_OBJECT_PARENT::TYPE ); NiAVObject::NiAVObject() NI_A_V_OBJECT_CONSTRUCT, parent(NULL) {} @@ -239,7 +239,3 @@ void NiAVObject::SetBoundingBox( const BoundingBox & n ) { const Type & NiAVObject::GetType() const { return TYPE; }; - -const Type & NiAVObject::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiAlphaController.cpp b/src/obj/NiAlphaController.cpp index 41d8783c..94e7b638 100644 --- a/src/obj/NiAlphaController.cpp +++ b/src/obj/NiAlphaController.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiAlphaController::TYPE("NiAlphaController", &NI_ALPHA_CONTROLLER_PARENT::TypeConst() ); +const Type NiAlphaController::TYPE("NiAlphaController", &NI_ALPHA_CONTROLLER_PARENT::TYPE ); NiAlphaController::NiAlphaController() NI_ALPHA_CONTROLLER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiAlphaController::GetRefs() const { const Type & NiAlphaController::GetType() const { return TYPE; }; - -const Type & NiAlphaController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiAlphaProperty.cpp b/src/obj/NiAlphaProperty.cpp index 5d7bc1a8..87aee482 100644 --- a/src/obj/NiAlphaProperty.cpp +++ b/src/obj/NiAlphaProperty.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiAlphaProperty::TYPE("NiAlphaProperty", &NI_ALPHA_PROPERTY_PARENT::TypeConst() ); +const Type NiAlphaProperty::TYPE("NiAlphaProperty", &NI_ALPHA_PROPERTY_PARENT::TYPE ); NiAlphaProperty::NiAlphaProperty() NI_ALPHA_PROPERTY_CONSTRUCT {} @@ -103,7 +103,3 @@ bool NiAlphaProperty::GetTriangleSortMode() const { void NiAlphaProperty::SetTriangleSortMode(bool value) { flags = NIFLIB_MASK_FLAG(flags, value?0:1, 13, 0x1); } - -const Type & NiAlphaProperty::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiAmbientLight.cpp b/src/obj/NiAmbientLight.cpp index c78414ca..b584b732 100644 --- a/src/obj/NiAmbientLight.cpp +++ b/src/obj/NiAmbientLight.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiAmbientLight::TYPE("NiAmbientLight", &NI_AMBIENT_LIGHT_PARENT::TypeConst() ); +const Type NiAmbientLight::TYPE("NiAmbientLight", &NI_AMBIENT_LIGHT_PARENT::TYPE ); NiAmbientLight::NiAmbientLight() NI_AMBIENT_LIGHT_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiAmbientLight::GetRefs() const { const Type & NiAmbientLight::GetType() const { return TYPE; }; - -const Type & NiAmbientLight::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiAutoNormalParticles.cpp b/src/obj/NiAutoNormalParticles.cpp index a855b16e..b88e90ee 100644 --- a/src/obj/NiAutoNormalParticles.cpp +++ b/src/obj/NiAutoNormalParticles.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiAutoNormalParticles::TYPE("NiAutoNormalParticles", &NI_AUTO_NORMAL_PARTICLES_PARENT::TypeConst() ); +const Type NiAutoNormalParticles::TYPE("NiAutoNormalParticles", &NI_AUTO_NORMAL_PARTICLES_PARENT::TYPE ); NiAutoNormalParticles::NiAutoNormalParticles() NI_AUTO_NORMAL_PARTICLES_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiAutoNormalParticles::GetRefs() const { const Type & NiAutoNormalParticles::GetType() const { return TYPE; }; - -const Type & NiAutoNormalParticles::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiAutoNormalParticlesData.cpp b/src/obj/NiAutoNormalParticlesData.cpp index 494d5d2e..4f6a5085 100644 --- a/src/obj/NiAutoNormalParticlesData.cpp +++ b/src/obj/NiAutoNormalParticlesData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiAutoNormalParticlesData::TYPE("NiAutoNormalParticlesData", &NI_AUTO_NORMAL_PARTICLES_DATA_PARENT::TypeConst() ); +const Type NiAutoNormalParticlesData::TYPE("NiAutoNormalParticlesData", &NI_AUTO_NORMAL_PARTICLES_DATA_PARENT::TYPE ); NiAutoNormalParticlesData::NiAutoNormalParticlesData() NI_AUTO_NORMAL_PARTICLES_DATA_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiAutoNormalParticlesData::GetRefs() const { const Type & NiAutoNormalParticlesData::GetType() const { return TYPE; }; - -const Type & NiAutoNormalParticlesData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBSAnimationNode.cpp b/src/obj/NiBSAnimationNode.cpp index 6e841316..f6cc4eac 100644 --- a/src/obj/NiBSAnimationNode.cpp +++ b/src/obj/NiBSAnimationNode.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBSAnimationNode::TYPE("NiBSAnimationNode", &NI_B_S_ANIMATION_NODE_PARENT::TypeConst() ); +const Type NiBSAnimationNode::TYPE("NiBSAnimationNode", &NI_B_S_ANIMATION_NODE_PARENT::TYPE ); NiBSAnimationNode::NiBSAnimationNode() NI_B_S_ANIMATION_NODE_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiBSAnimationNode::GetRefs() const { const Type & NiBSAnimationNode::GetType() const { return TYPE; }; - -const Type & NiBSAnimationNode::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBSBoneLODController.cpp b/src/obj/NiBSBoneLODController.cpp index 7a455928..11c25770 100644 --- a/src/obj/NiBSBoneLODController.cpp +++ b/src/obj/NiBSBoneLODController.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBSBoneLODController::TYPE("NiBSBoneLODController", &NI_B_S_BONE_L_O_D_CONTROLLER_PARENT::TypeConst() ); +const Type NiBSBoneLODController::TYPE("NiBSBoneLODController", &NI_B_S_BONE_L_O_D_CONTROLLER_PARENT::TYPE ); NiBSBoneLODController::NiBSBoneLODController() NI_B_S_BONE_L_O_D_CONTROLLER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiBSBoneLODController::GetRefs() const { const Type & NiBSBoneLODController::GetType() const { return TYPE; }; - -const Type & NiBSBoneLODController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBSPArrayController.cpp b/src/obj/NiBSPArrayController.cpp index b07e561a..cf60d196 100644 --- a/src/obj/NiBSPArrayController.cpp +++ b/src/obj/NiBSPArrayController.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBSPArrayController::TYPE("NiBSPArrayController", &NI_B_S_P_ARRAY_CONTROLLER_PARENT::TypeConst() ); +const Type NiBSPArrayController::TYPE("NiBSPArrayController", &NI_B_S_P_ARRAY_CONTROLLER_PARENT::TYPE ); NiBSPArrayController::NiBSPArrayController() NI_B_S_P_ARRAY_CONTROLLER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiBSPArrayController::GetRefs() const { const Type & NiBSPArrayController::GetType() const { return TYPE; }; - -const Type & NiBSPArrayController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBSParticleNode.cpp b/src/obj/NiBSParticleNode.cpp index 84c93f9e..726459d9 100644 --- a/src/obj/NiBSParticleNode.cpp +++ b/src/obj/NiBSParticleNode.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBSParticleNode::TYPE("NiBSParticleNode", &NI_B_S_PARTICLE_NODE_PARENT::TypeConst() ); +const Type NiBSParticleNode::TYPE("NiBSParticleNode", &NI_B_S_PARTICLE_NODE_PARENT::TYPE ); NiBSParticleNode::NiBSParticleNode() NI_B_S_PARTICLE_NODE_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiBSParticleNode::GetRefs() const { const Type & NiBSParticleNode::GetType() const { return TYPE; }; - -const Type & NiBSParticleNode::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBSplineBasisData.cpp b/src/obj/NiBSplineBasisData.cpp index 24f010f1..b5ada2cb 100644 --- a/src/obj/NiBSplineBasisData.cpp +++ b/src/obj/NiBSplineBasisData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBSplineBasisData::TYPE("NiBSplineBasisData", &NI_B_SPLINE_BASIS_DATA_PARENT::TypeConst() ); +const Type NiBSplineBasisData::TYPE("NiBSplineBasisData", &NI_B_SPLINE_BASIS_DATA_PARENT::TYPE ); NiBSplineBasisData::NiBSplineBasisData() NI_B_SPLINE_BASIS_DATA_CONSTRUCT {} @@ -42,7 +42,3 @@ unsigned int NiBSplineBasisData::GetNumControlPt() const { void NiBSplineBasisData::SetNumControlPt( unsigned int value ) { numControlPt = value; } - -const Type & NiBSplineBasisData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBSplineCompFloatInterpolator.cpp b/src/obj/NiBSplineCompFloatInterpolator.cpp index b05bb04c..8b7306a9 100644 --- a/src/obj/NiBSplineCompFloatInterpolator.cpp +++ b/src/obj/NiBSplineCompFloatInterpolator.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBSplineCompFloatInterpolator::TYPE("NiBSplineCompFloatInterpolator", &NI_B_SPLINE_COMP_FLOAT_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiBSplineCompFloatInterpolator::TYPE("NiBSplineCompFloatInterpolator", &NI_B_SPLINE_COMP_FLOAT_INTERPOLATOR_PARENT::TYPE ); NiBSplineCompFloatInterpolator::NiBSplineCompFloatInterpolator() NI_B_SPLINE_COMP_FLOAT_INTERPOLATOR_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiBSplineCompFloatInterpolator::GetRefs() const { const Type & NiBSplineCompFloatInterpolator::GetType() const { return TYPE; }; - -const Type & NiBSplineCompFloatInterpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBSplineCompPoint3Interpolator.cpp b/src/obj/NiBSplineCompPoint3Interpolator.cpp index 73f988ce..3eb7ca3c 100644 --- a/src/obj/NiBSplineCompPoint3Interpolator.cpp +++ b/src/obj/NiBSplineCompPoint3Interpolator.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBSplineCompPoint3Interpolator::TYPE("NiBSplineCompPoint3Interpolator", &NI_B_SPLINE_COMP_POINT3_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiBSplineCompPoint3Interpolator::TYPE("NiBSplineCompPoint3Interpolator", &NI_B_SPLINE_COMP_POINT3_INTERPOLATOR_PARENT::TYPE ); NiBSplineCompPoint3Interpolator::NiBSplineCompPoint3Interpolator() NI_B_SPLINE_COMP_POINT3_INTERPOLATOR_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiBSplineCompPoint3Interpolator::GetRefs() const { const Type & NiBSplineCompPoint3Interpolator::GetType() const { return TYPE; }; - -const Type & NiBSplineCompPoint3Interpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBSplineCompTransformInterpolator.cpp b/src/obj/NiBSplineCompTransformInterpolator.cpp index 9fa3e064..1db53bcd 100644 --- a/src/obj/NiBSplineCompTransformInterpolator.cpp +++ b/src/obj/NiBSplineCompTransformInterpolator.cpp @@ -11,7 +11,7 @@ static const int SizeofTrans = 3; static const int SizeofScale = 1; //Definition of TYPE constant -const Type NiBSplineCompTransformInterpolator::TYPE("NiBSplineCompTransformInterpolator", &NI_B_SPLINE_COMP_TRANSFORM_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiBSplineCompTransformInterpolator::TYPE("NiBSplineCompTransformInterpolator", &NI_B_SPLINE_COMP_TRANSFORM_INTERPOLATOR_PARENT::TYPE ); NiBSplineCompTransformInterpolator::NiBSplineCompTransformInterpolator() NI_B_SPLINE_COMP_TRANSFORM_INTERPOLATOR_CONSTRUCT {} @@ -282,7 +282,3 @@ int NiBSplineCompTransformInterpolator::GetNumControlPt() const } return 0; } - -const Type & NiBSplineCompTransformInterpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBSplineData.cpp b/src/obj/NiBSplineData.cpp index 65b133fb..a5b8a27c 100644 --- a/src/obj/NiBSplineData.cpp +++ b/src/obj/NiBSplineData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBSplineData::TYPE("NiBSplineData", &NI_B_SPLINE_DATA_PARENT::TypeConst() ); +const Type NiBSplineData::TYPE("NiBSplineData", &NI_B_SPLINE_DATA_PARENT::TYPE ); NiBSplineData::NiBSplineData() NI_B_SPLINE_DATA_CONSTRUCT {} @@ -50,7 +50,3 @@ vector<short > NiBSplineData::GetControlPointRange(int offset, int count) const std::advance(srcend, offset + count); return vector<short>(srcbeg, srcend); } - -const Type & NiBSplineData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBSplineInterpolator.cpp b/src/obj/NiBSplineInterpolator.cpp index 5f0b9aa7..95b1d68d 100644 --- a/src/obj/NiBSplineInterpolator.cpp +++ b/src/obj/NiBSplineInterpolator.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBSplineInterpolator::TYPE("NiBSplineInterpolator", &NI_B_SPLINE_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiBSplineInterpolator::TYPE("NiBSplineInterpolator", &NI_B_SPLINE_INTERPOLATOR_PARENT::TYPE ); NiBSplineInterpolator::NiBSplineInterpolator() NI_B_SPLINE_INTERPOLATOR_CONSTRUCT {} @@ -167,7 +167,3 @@ void NiBSplineInterpolator::bspline(int n, int t, int l, float *control, float * delete [] u; delete [] calc; } - -const Type & NiBSplineInterpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBillboardNode.cpp b/src/obj/NiBillboardNode.cpp index 10a784f5..438fce32 100644 --- a/src/obj/NiBillboardNode.cpp +++ b/src/obj/NiBillboardNode.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBillboardNode::TYPE("NiBillboardNode", &NI_BILLBOARD_NODE_PARENT::TypeConst() ); +const Type NiBillboardNode::TYPE("NiBillboardNode", &NI_BILLBOARD_NODE_PARENT::TYPE ); NiBillboardNode::NiBillboardNode() NI_BILLBOARD_NODE_CONSTRUCT {} @@ -42,7 +42,3 @@ BillboardMode NiBillboardNode::GetBillboardMode() const { void NiBillboardNode::SetBillboardMode( BillboardMode value ) { billboardMode = value; } - -const Type & NiBillboardNode::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBinaryExtraData.cpp b/src/obj/NiBinaryExtraData.cpp index 7a129593..8d7bf168 100644 --- a/src/obj/NiBinaryExtraData.cpp +++ b/src/obj/NiBinaryExtraData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBinaryExtraData::TYPE("NiBinaryExtraData", &NI_BINARY_EXTRA_DATA_PARENT::TypeConst() ); +const Type NiBinaryExtraData::TYPE("NiBinaryExtraData", &NI_BINARY_EXTRA_DATA_PARENT::TYPE ); NiBinaryExtraData::NiBinaryExtraData() NI_BINARY_EXTRA_DATA_CONSTRUCT {} @@ -45,7 +45,3 @@ void NiBinaryExtraData::SetData( const vector<byte> & n ) { binaryData.dataSize = (unsigned int)(n.size()); binaryData.data = n; }; - -const Type & NiBinaryExtraData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBlendBoolInterpolator.cpp b/src/obj/NiBlendBoolInterpolator.cpp index 51b4975d..c08f8a4f 100644 --- a/src/obj/NiBlendBoolInterpolator.cpp +++ b/src/obj/NiBlendBoolInterpolator.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBlendBoolInterpolator::TYPE("NiBlendBoolInterpolator", &NI_BLEND_BOOL_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiBlendBoolInterpolator::TYPE("NiBlendBoolInterpolator", &NI_BLEND_BOOL_INTERPOLATOR_PARENT::TYPE ); NiBlendBoolInterpolator::NiBlendBoolInterpolator() NI_BLEND_BOOL_INTERPOLATOR_CONSTRUCT {} @@ -42,7 +42,3 @@ byte NiBlendBoolInterpolator::GetBoolValue() const { void NiBlendBoolInterpolator::SetBoolValue( byte value ) { boolValue = value; } - -const Type & NiBlendBoolInterpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBlendFloatInterpolator.cpp b/src/obj/NiBlendFloatInterpolator.cpp index 2b608a28..5baefbca 100644 --- a/src/obj/NiBlendFloatInterpolator.cpp +++ b/src/obj/NiBlendFloatInterpolator.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBlendFloatInterpolator::TYPE("NiBlendFloatInterpolator", &NI_BLEND_FLOAT_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiBlendFloatInterpolator::TYPE("NiBlendFloatInterpolator", &NI_BLEND_FLOAT_INTERPOLATOR_PARENT::TYPE ); NiBlendFloatInterpolator::NiBlendFloatInterpolator() NI_BLEND_FLOAT_INTERPOLATOR_CONSTRUCT {} @@ -42,7 +42,3 @@ float NiBlendFloatInterpolator::GetFloatValue() const { void NiBlendFloatInterpolator::SetFloatValue( float value ) { floatValue = value; } - -const Type & NiBlendFloatInterpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBlendInterpolator.cpp b/src/obj/NiBlendInterpolator.cpp index 7db942c4..febaf5a9 100644 --- a/src/obj/NiBlendInterpolator.cpp +++ b/src/obj/NiBlendInterpolator.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBlendInterpolator::TYPE("NiBlendInterpolator", &NI_BLEND_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiBlendInterpolator::TYPE("NiBlendInterpolator", &NI_BLEND_INTERPOLATOR_PARENT::TYPE ); NiBlendInterpolator::NiBlendInterpolator() NI_BLEND_INTERPOLATOR_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiBlendInterpolator::GetRefs() const { const Type & NiBlendInterpolator::GetType() const { return TYPE; }; - -const Type & NiBlendInterpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBlendPoint3Interpolator.cpp b/src/obj/NiBlendPoint3Interpolator.cpp index 39002a95..46685c4c 100644 --- a/src/obj/NiBlendPoint3Interpolator.cpp +++ b/src/obj/NiBlendPoint3Interpolator.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBlendPoint3Interpolator::TYPE("NiBlendPoint3Interpolator", &NI_BLEND_POINT3_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiBlendPoint3Interpolator::TYPE("NiBlendPoint3Interpolator", &NI_BLEND_POINT3_INTERPOLATOR_PARENT::TYPE ); NiBlendPoint3Interpolator::NiBlendPoint3Interpolator() NI_BLEND_POINT3_INTERPOLATOR_CONSTRUCT {} @@ -42,7 +42,3 @@ Vector3 NiBlendPoint3Interpolator::GetPointValue() const { void NiBlendPoint3Interpolator::SetPointValue( Vector3 value ) { pointValue = value; } - -const Type & NiBlendPoint3Interpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBlendTransformInterpolator.cpp b/src/obj/NiBlendTransformInterpolator.cpp index 9593c6e6..057aa0fc 100644 --- a/src/obj/NiBlendTransformInterpolator.cpp +++ b/src/obj/NiBlendTransformInterpolator.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBlendTransformInterpolator::TYPE("NiBlendTransformInterpolator", &NI_BLEND_TRANSFORM_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiBlendTransformInterpolator::TYPE("NiBlendTransformInterpolator", &NI_BLEND_TRANSFORM_INTERPOLATOR_PARENT::TYPE ); NiBlendTransformInterpolator::NiBlendTransformInterpolator() NI_BLEND_TRANSFORM_INTERPOLATOR_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiBlendTransformInterpolator::GetRefs() const { const Type & NiBlendTransformInterpolator::GetType() const { return TYPE; }; - -const Type & NiBlendTransformInterpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBoneLODController.cpp b/src/obj/NiBoneLODController.cpp index 7b07d746..c8a64d59 100644 --- a/src/obj/NiBoneLODController.cpp +++ b/src/obj/NiBoneLODController.cpp @@ -9,7 +9,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBoneLODController::TYPE("NiBoneLODController", &NI_BONE_L_O_D_CONTROLLER_PARENT::TypeConst() ); +const Type NiBoneLODController::TYPE("NiBoneLODController", &NI_BONE_L_O_D_CONTROLLER_PARENT::TYPE ); NiBoneLODController::NiBoneLODController() NI_BONE_L_O_D_CONTROLLER_CONSTRUCT {} @@ -38,7 +38,3 @@ list<NiObjectRef> NiBoneLODController::GetRefs() const { const Type & NiBoneLODController::GetType() const { return TYPE; }; - -const Type & NiBoneLODController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBoolData.cpp b/src/obj/NiBoolData.cpp index 35b6c7ce..eaf1d66f 100644 --- a/src/obj/NiBoolData.cpp +++ b/src/obj/NiBoolData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBoolData::TYPE("NiBoolData", &NI_BOOL_DATA_PARENT::TypeConst() ); +const Type NiBoolData::TYPE("NiBoolData", &NI_BOOL_DATA_PARENT::TYPE ); NiBoolData::NiBoolData() NI_BOOL_DATA_CONSTRUCT {} @@ -51,7 +51,3 @@ vector< Key<unsigned char> > NiBoolData::GetKeys() const { void NiBoolData::SetKeys( vector< Key<unsigned char> > const & keys ) { data.keys = keys; } - -const Type & NiBoolData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBoolInterpolator.cpp b/src/obj/NiBoolInterpolator.cpp index b0b63b45..ace48762 100644 --- a/src/obj/NiBoolInterpolator.cpp +++ b/src/obj/NiBoolInterpolator.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBoolInterpolator::TYPE("NiBoolInterpolator", &NI_BOOL_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiBoolInterpolator::TYPE("NiBoolInterpolator", &NI_BOOL_INTERPOLATOR_PARENT::TYPE ); NiBoolInterpolator::NiBoolInterpolator() NI_BOOL_INTERPOLATOR_CONSTRUCT {} @@ -51,7 +51,3 @@ Ref<NiBoolData > NiBoolInterpolator::GetData() const { void NiBoolInterpolator::SetData( NiBoolData * value ) { data = value; } - -const Type & NiBoolInterpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBoolTimelineInterpolator.cpp b/src/obj/NiBoolTimelineInterpolator.cpp index 24731e90..684cb246 100644 --- a/src/obj/NiBoolTimelineInterpolator.cpp +++ b/src/obj/NiBoolTimelineInterpolator.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBoolTimelineInterpolator::TYPE("NiBoolTimelineInterpolator", &NI_BOOL_TIMELINE_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiBoolTimelineInterpolator::TYPE("NiBoolTimelineInterpolator", &NI_BOOL_TIMELINE_INTERPOLATOR_PARENT::TYPE ); NiBoolTimelineInterpolator::NiBoolTimelineInterpolator() NI_BOOL_TIMELINE_INTERPOLATOR_CONSTRUCT {} @@ -51,7 +51,3 @@ Ref<NiBoolData> NiBoolTimelineInterpolator::GetData() const { void NiBoolTimelineInterpolator::SetData( NiBoolData * value ) { data = value; } - -const Type & NiBoolTimelineInterpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiBooleanExtraData.cpp b/src/obj/NiBooleanExtraData.cpp index 66115c92..df39e042 100644 --- a/src/obj/NiBooleanExtraData.cpp +++ b/src/obj/NiBooleanExtraData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiBooleanExtraData::TYPE("NiBooleanExtraData", &NI_BOOLEAN_EXTRA_DATA_PARENT::TypeConst() ); +const Type NiBooleanExtraData::TYPE("NiBooleanExtraData", &NI_BOOLEAN_EXTRA_DATA_PARENT::TYPE ); NiBooleanExtraData::NiBooleanExtraData() NI_BOOLEAN_EXTRA_DATA_CONSTRUCT {} @@ -42,7 +42,3 @@ bool NiBooleanExtraData::GetData() const { void NiBooleanExtraData::SetData( bool n ) { booleanData = n; } - -const Type & NiBooleanExtraData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiCamera.cpp b/src/obj/NiCamera.cpp index fabc19ed..83eeee15 100644 --- a/src/obj/NiCamera.cpp +++ b/src/obj/NiCamera.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiCamera::TYPE("NiCamera", &NI_CAMERA_PARENT::TypeConst() ); +const Type NiCamera::TYPE("NiCamera", &NI_CAMERA_PARENT::TYPE ); NiCamera::NiCamera() NI_CAMERA_CONSTRUCT {} @@ -131,7 +131,3 @@ float NiCamera::GetLodAdjust() const { void NiCamera::SetLodAdjust( float value ) { lodAdjust = value; } - -const Type & NiCamera::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiClod.cpp b/src/obj/NiClod.cpp index b298d99a..fc1c82f2 100644 --- a/src/obj/NiClod.cpp +++ b/src/obj/NiClod.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiClod::TYPE("NiClod", &NI_CLOD_PARENT::TypeConst() ); +const Type NiClod::TYPE("NiClod", &NI_CLOD_PARENT::TYPE ); NiClod::NiClod() NI_CLOD_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiClod::GetRefs() const { const Type & NiClod::GetType() const { return TYPE; }; - -const Type & NiClod::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiClodData.cpp b/src/obj/NiClodData.cpp index dac52627..9dc33489 100644 --- a/src/obj/NiClodData.cpp +++ b/src/obj/NiClodData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiClodData::TYPE("NiClodData", &NI_CLOD_DATA_PARENT::TypeConst() ); +const Type NiClodData::TYPE("NiClodData", &NI_CLOD_DATA_PARENT::TYPE ); NiClodData::NiClodData() NI_CLOD_DATA_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiClodData::GetRefs() const { const Type & NiClodData::GetType() const { return TYPE; }; - -const Type & NiClodData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiClodSkinInstance.cpp b/src/obj/NiClodSkinInstance.cpp index 2664fbc4..5aad23b1 100644 --- a/src/obj/NiClodSkinInstance.cpp +++ b/src/obj/NiClodSkinInstance.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiClodSkinInstance::TYPE("NiClodSkinInstance", &NI_CLOD_SKIN_INSTANCE_PARENT::TypeConst() ); +const Type NiClodSkinInstance::TYPE("NiClodSkinInstance", &NI_CLOD_SKIN_INSTANCE_PARENT::TYPE ); NiClodSkinInstance::NiClodSkinInstance() NI_CLOD_SKIN_INSTANCE_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiClodSkinInstance::GetRefs() const { const Type & NiClodSkinInstance::GetType() const { return TYPE; }; - -const Type & NiClodSkinInstance::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiCollisionData.cpp b/src/obj/NiCollisionData.cpp index c688d306..67c0ecc2 100644 --- a/src/obj/NiCollisionData.cpp +++ b/src/obj/NiCollisionData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiCollisionData::TYPE("NiCollisionData", &NI_COLLISION_DATA_PARENT::TypeConst() ); +const Type NiCollisionData::TYPE("NiCollisionData", &NI_COLLISION_DATA_PARENT::TYPE ); NiCollisionData::NiCollisionData() NI_COLLISION_DATA_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiCollisionData::GetRefs() const { const Type & NiCollisionData::GetType() const { return TYPE; }; - -const Type & NiCollisionData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiCollisionObject.cpp b/src/obj/NiCollisionObject.cpp index 8214223e..f8488a65 100644 --- a/src/obj/NiCollisionObject.cpp +++ b/src/obj/NiCollisionObject.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiCollisionObject::TYPE("NiCollisionObject", &NI_COLLISION_OBJECT_PARENT::TypeConst() ); +const Type NiCollisionObject::TYPE("NiCollisionObject", &NI_COLLISION_OBJECT_PARENT::TYPE ); NiCollisionObject::NiCollisionObject() NI_COLLISION_OBJECT_CONSTRUCT {} @@ -52,7 +52,3 @@ Ref<NiObject > NiCollisionObject::GetBody() const { void NiCollisionObject::SetBody( NiObject * value ) { body = value; } - -const Type & NiCollisionObject::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiColorData.cpp b/src/obj/NiColorData.cpp index 33d62372..4142b02e 100644 --- a/src/obj/NiColorData.cpp +++ b/src/obj/NiColorData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiColorData::TYPE("NiColorData", &NI_COLOR_DATA_PARENT::TypeConst() ); +const Type NiColorData::TYPE("NiColorData", &NI_COLOR_DATA_PARENT::TYPE ); NiColorData::NiColorData() NI_COLOR_DATA_CONSTRUCT {} @@ -51,7 +51,3 @@ vector< Key<Color4> > NiColorData::GetKeys() const { void NiColorData::SetKeys( vector< Key<Color4> > const & keys ) { data.keys = keys; } - -const Type & NiColorData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiColorExtraData.cpp b/src/obj/NiColorExtraData.cpp index 71d808c7..eb7b5eee 100644 --- a/src/obj/NiColorExtraData.cpp +++ b/src/obj/NiColorExtraData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiColorExtraData::TYPE("NiColorExtraData", &NI_COLOR_EXTRA_DATA_PARENT::TypeConst() ); +const Type NiColorExtraData::TYPE("NiColorExtraData", &NI_COLOR_EXTRA_DATA_PARENT::TYPE ); NiColorExtraData::NiColorExtraData() NI_COLOR_EXTRA_DATA_CONSTRUCT {} @@ -42,7 +42,3 @@ Color4 NiColorExtraData::GetData() const { void NiColorExtraData::SetData( const Color4 & n ) { data = n; } - -const Type & NiColorExtraData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiControllerManager.cpp b/src/obj/NiControllerManager.cpp index 31b02bbf..4029ae5d 100644 --- a/src/obj/NiControllerManager.cpp +++ b/src/obj/NiControllerManager.cpp @@ -8,7 +8,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiControllerManager::TYPE("NiControllerManager", &NI_CONTROLLER_MANAGER_PARENT::TypeConst() ); +const Type NiControllerManager::TYPE("NiControllerManager", &NI_CONTROLLER_MANAGER_PARENT::TYPE ); NiControllerManager::NiControllerManager() NI_CONTROLLER_MANAGER_CONSTRUCT {} @@ -93,7 +93,3 @@ Ref<NiDefaultAVObjectPalette > NiControllerManager::GetObjectPalette() const { void NiControllerManager::SetObjectPalette( NiDefaultAVObjectPalette * value ) { objectPalette = value; } - -const Type & NiControllerManager::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiControllerSequence.cpp b/src/obj/NiControllerSequence.cpp index c0c88f0b..d531fb31 100644 --- a/src/obj/NiControllerSequence.cpp +++ b/src/obj/NiControllerSequence.cpp @@ -17,7 +17,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiControllerSequence::TYPE("NiControllerSequence", &NI_CONTROLLER_SEQUENCE_PARENT::TypeConst() ); +const Type NiControllerSequence::TYPE("NiControllerSequence", &NI_CONTROLLER_SEQUENCE_PARENT::TYPE ); NiControllerSequence::NiControllerSequence() NI_CONTROLLER_SEQUENCE_CONSTRUCT {} @@ -223,7 +223,3 @@ float NiControllerSequence::GetWeight() const { void NiControllerSequence::SetWeight( const float value ) { weight = value; } - -const Type & NiControllerSequence::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiDefaultAVObjectPalette.cpp b/src/obj/NiDefaultAVObjectPalette.cpp index 1b8ede42..f7ddb9e2 100644 --- a/src/obj/NiDefaultAVObjectPalette.cpp +++ b/src/obj/NiDefaultAVObjectPalette.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiDefaultAVObjectPalette::TYPE("NiDefaultAVObjectPalette", &NI_DEFAULT_A_V_OBJECT_PALETTE_PARENT::TypeConst() ); +const Type NiDefaultAVObjectPalette::TYPE("NiDefaultAVObjectPalette", &NI_DEFAULT_A_V_OBJECT_PALETTE_PARENT::TYPE ); NiDefaultAVObjectPalette::NiDefaultAVObjectPalette() NI_DEFAULT_A_V_OBJECT_PALETTE_CONSTRUCT {} @@ -54,7 +54,3 @@ void NiDefaultAVObjectPalette::SetObjs( const vector<Ref<NiAVObject> >& value ) objs.push_back(obj); } } - -const Type & NiDefaultAVObjectPalette::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiDirectionalLight.cpp b/src/obj/NiDirectionalLight.cpp index fb60079d..10b0ea84 100644 --- a/src/obj/NiDirectionalLight.cpp +++ b/src/obj/NiDirectionalLight.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiDirectionalLight::TYPE("NiDirectionalLight", &NI_DIRECTIONAL_LIGHT_PARENT::TypeConst() ); +const Type NiDirectionalLight::TYPE("NiDirectionalLight", &NI_DIRECTIONAL_LIGHT_PARENT::TYPE ); NiDirectionalLight::NiDirectionalLight() NI_DIRECTIONAL_LIGHT_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiDirectionalLight::GetRefs() const { const Type & NiDirectionalLight::GetType() const { return TYPE; }; - -const Type & NiDirectionalLight::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiDitherProperty.cpp b/src/obj/NiDitherProperty.cpp index 02011a99..d1e1de36 100644 --- a/src/obj/NiDitherProperty.cpp +++ b/src/obj/NiDitherProperty.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiDitherProperty::TYPE("NiDitherProperty", &NI_DITHER_PROPERTY_PARENT::TypeConst() ); +const Type NiDitherProperty::TYPE("NiDitherProperty", &NI_DITHER_PROPERTY_PARENT::TYPE ); NiDitherProperty::NiDitherProperty() NI_DITHER_PROPERTY_CONSTRUCT {} @@ -42,7 +42,3 @@ unsigned short NiDitherProperty::GetFlags() const { void NiDitherProperty::SetFlags( unsigned short n ) { flags = n; } - -const Type & NiDitherProperty::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiDynamicEffect.cpp b/src/obj/NiDynamicEffect.cpp index 89ff11ca..dda7d991 100644 --- a/src/obj/NiDynamicEffect.cpp +++ b/src/obj/NiDynamicEffect.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiDynamicEffect::TYPE("NiDynamicEffect", &NI_DYNAMIC_EFFECT_PARENT::TypeConst() ); +const Type NiDynamicEffect::TYPE("NiDynamicEffect", &NI_DYNAMIC_EFFECT_PARENT::TYPE ); NiDynamicEffect::NiDynamicEffect() NI_DYNAMIC_EFFECT_CONSTRUCT {} @@ -51,7 +51,3 @@ vector<Ref<NiAVObject > > NiDynamicEffect::GetAffectedNodes() const { void NiDynamicEffect::SetAffectedNodes( const vector<Ref<NiAVObject > >& value ) { affectedNodes = value; } - -const Type & NiDynamicEffect::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiExtraData.cpp b/src/obj/NiExtraData.cpp index e88fdb84..689f8b50 100644 --- a/src/obj/NiExtraData.cpp +++ b/src/obj/NiExtraData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiExtraData::TYPE("NiExtraData", &NI_EXTRA_DATA_PARENT::TypeConst() ); +const Type NiExtraData::TYPE("NiExtraData", &NI_EXTRA_DATA_PARENT::TYPE ); NiExtraData::NiExtraData() NI_EXTRA_DATA_CONSTRUCT {} @@ -57,7 +57,3 @@ NiExtraDataRef NiExtraData::GetNextExtraData() const { void NiExtraData::SetNextExtraData( NiExtraData * obj ) { nextExtraData = obj; } - -const Type & NiExtraData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiFlipController.cpp b/src/obj/NiFlipController.cpp index c679abe9..9acbb95f 100644 --- a/src/obj/NiFlipController.cpp +++ b/src/obj/NiFlipController.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiFlipController::TYPE("NiFlipController", &NI_FLIP_CONTROLLER_PARENT::TypeConst() ); +const Type NiFlipController::TYPE("NiFlipController", &NI_FLIP_CONTROLLER_PARENT::TYPE ); NiFlipController::NiFlipController() NI_FLIP_CONTROLLER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiFlipController::GetRefs() const { const Type & NiFlipController::GetType() const { return TYPE; }; - -const Type & NiFlipController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiFloatData.cpp b/src/obj/NiFloatData.cpp index 4caf8a97..436296b3 100644 --- a/src/obj/NiFloatData.cpp +++ b/src/obj/NiFloatData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiFloatData::TYPE("NiFloatData", &NI_FLOAT_DATA_PARENT::TypeConst() ); +const Type NiFloatData::TYPE("NiFloatData", &NI_FLOAT_DATA_PARENT::TYPE ); NiFloatData::NiFloatData() NI_FLOAT_DATA_CONSTRUCT {} @@ -51,7 +51,3 @@ vector< Key<float> > NiFloatData::GetKeys() const { void NiFloatData::SetKeys( vector< Key<float> > const & keys ) { data.keys = keys; } - -const Type & NiFloatData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiFloatExtraData.cpp b/src/obj/NiFloatExtraData.cpp index 4500b9f1..92e9a283 100644 --- a/src/obj/NiFloatExtraData.cpp +++ b/src/obj/NiFloatExtraData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiFloatExtraData::TYPE("NiFloatExtraData", &NI_FLOAT_EXTRA_DATA_PARENT::TypeConst() ); +const Type NiFloatExtraData::TYPE("NiFloatExtraData", &NI_FLOAT_EXTRA_DATA_PARENT::TYPE ); NiFloatExtraData::NiFloatExtraData() NI_FLOAT_EXTRA_DATA_CONSTRUCT {} @@ -42,7 +42,3 @@ float NiFloatExtraData::GetData() const { void NiFloatExtraData::SetData( float n ) { floatData = n; } - -const Type & NiFloatExtraData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiFloatExtraDataController.cpp b/src/obj/NiFloatExtraDataController.cpp index d0fd9c0f..75ef2387 100644 --- a/src/obj/NiFloatExtraDataController.cpp +++ b/src/obj/NiFloatExtraDataController.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiFloatExtraDataController::TYPE("NiFloatExtraDataController", &NI_FLOAT_EXTRA_DATA_CONTROLLER_PARENT::TypeConst() ); +const Type NiFloatExtraDataController::TYPE("NiFloatExtraDataController", &NI_FLOAT_EXTRA_DATA_CONTROLLER_PARENT::TYPE ); NiFloatExtraDataController::NiFloatExtraDataController() NI_FLOAT_EXTRA_DATA_CONTROLLER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiFloatExtraDataController::GetRefs() const { const Type & NiFloatExtraDataController::GetType() const { return TYPE; }; - -const Type & NiFloatExtraDataController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiFloatInterpolator.cpp b/src/obj/NiFloatInterpolator.cpp index b606b562..84ebe777 100644 --- a/src/obj/NiFloatInterpolator.cpp +++ b/src/obj/NiFloatInterpolator.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiFloatInterpolator::TYPE("NiFloatInterpolator", &NI_FLOAT_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiFloatInterpolator::TYPE("NiFloatInterpolator", &NI_FLOAT_INTERPOLATOR_PARENT::TYPE ); NiFloatInterpolator::NiFloatInterpolator() NI_FLOAT_INTERPOLATOR_CONSTRUCT {} @@ -51,7 +51,3 @@ Ref<NiFloatData > NiFloatInterpolator::GetData() const { void NiFloatInterpolator::SetData( NiFloatData * value ) { data = value; } - -const Type & NiFloatInterpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiFloatsExtraData.cpp b/src/obj/NiFloatsExtraData.cpp index 9dfae420..6371ac37 100644 --- a/src/obj/NiFloatsExtraData.cpp +++ b/src/obj/NiFloatsExtraData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiFloatsExtraData::TYPE("NiFloatsExtraData", &NI_FLOATS_EXTRA_DATA_PARENT::TypeConst() ); +const Type NiFloatsExtraData::TYPE("NiFloatsExtraData", &NI_FLOATS_EXTRA_DATA_PARENT::TYPE ); NiFloatsExtraData::NiFloatsExtraData() NI_FLOATS_EXTRA_DATA_CONSTRUCT {} @@ -43,7 +43,3 @@ void NiFloatsExtraData::SetData( const vector<float> & n ) { numFloats = (unsigned int)(n.size()); data = n; } - -const Type & NiFloatsExtraData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiFogProperty.cpp b/src/obj/NiFogProperty.cpp index 4692fe31..bd851586 100644 --- a/src/obj/NiFogProperty.cpp +++ b/src/obj/NiFogProperty.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiFogProperty::TYPE("NiFogProperty", &NI_FOG_PROPERTY_PARENT::TypeConst() ); +const Type NiFogProperty::TYPE("NiFogProperty", &NI_FOG_PROPERTY_PARENT::TYPE ); NiFogProperty::NiFogProperty() NI_FOG_PROPERTY_CONSTRUCT {} @@ -59,7 +59,3 @@ Color3 NiFogProperty::GetFogColor() const { void NiFogProperty::SetFogColor(Color3 value) { fogColor = value; } - -const Type & NiFogProperty::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiGeomMorpherController.cpp b/src/obj/NiGeomMorpherController.cpp index 49b75502..872041b5 100644 --- a/src/obj/NiGeomMorpherController.cpp +++ b/src/obj/NiGeomMorpherController.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiGeomMorpherController::TYPE("NiGeomMorpherController", &NI_GEOM_MORPHER_CONTROLLER_PARENT::TypeConst() ); +const Type NiGeomMorpherController::TYPE("NiGeomMorpherController", &NI_GEOM_MORPHER_CONTROLLER_PARENT::TYPE ); NiGeomMorpherController::NiGeomMorpherController() NI_GEOM_MORPHER_CONTROLLER_CONSTRUCT {} @@ -53,7 +53,3 @@ Ref<NiMorphData> NiGeomMorpherController::GetData() const { void NiGeomMorpherController::SetData( NiMorphData * n ) { data = n; } - -const Type & NiGeomMorpherController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiGeometry.cpp b/src/obj/NiGeometry.cpp index 160eed52..1577f418 100644 --- a/src/obj/NiGeometry.cpp +++ b/src/obj/NiGeometry.cpp @@ -11,7 +11,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiGeometry::TYPE("NiGeometry", &NI_GEOMETRY_PARENT::TypeConst() ); +const Type NiGeometry::TYPE("NiGeometry", &NI_GEOMETRY_PARENT::TYPE ); NiGeometry::NiGeometry() NI_GEOMETRY_CONSTRUCT {} @@ -362,7 +362,3 @@ void NiGeometry::SetBoneWeights( unsigned int bone_index, const vector<SkinWeigh skinData->SetBoneWeights( bone_index, n, center, radius ); } - -const Type & NiGeometry::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiGeometryData.cpp b/src/obj/NiGeometryData.cpp index 875394ff..852ed168 100644 --- a/src/obj/NiGeometryData.cpp +++ b/src/obj/NiGeometryData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiGeometryData::TYPE("NiGeometryData", &NI_GEOMETRY_DATA_PARENT::TypeConst() ); +const Type NiGeometryData::TYPE("NiGeometryData", &NI_GEOMETRY_DATA_PARENT::TYPE ); NiGeometryData::NiGeometryData() NI_GEOMETRY_DATA_CONSTRUCT {} @@ -162,7 +162,3 @@ void NiGeometryData::Transform( const Matrix44 & transform ) { normals[i] = rotation * normals[i]; } } - -const Type & NiGeometryData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiGravity.cpp b/src/obj/NiGravity.cpp index 6bb76d42..3185e3ba 100644 --- a/src/obj/NiGravity.cpp +++ b/src/obj/NiGravity.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiGravity::TYPE("NiGravity", &NI_GRAVITY_PARENT::TypeConst() ); +const Type NiGravity::TYPE("NiGravity", &NI_GRAVITY_PARENT::TYPE ); NiGravity::NiGravity() NI_GRAVITY_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiGravity::GetRefs() const { const Type & NiGravity::GetType() const { return TYPE; }; - -const Type & NiGravity::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiImage.cpp b/src/obj/NiImage.cpp index ee9f0ce7..8d14b9f5 100644 --- a/src/obj/NiImage.cpp +++ b/src/obj/NiImage.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiImage::TYPE("NiImage", &NI_IMAGE_PARENT::TypeConst() ); +const Type NiImage::TYPE("NiImage", &NI_IMAGE_PARENT::TYPE ); NiImage::NiImage() NI_IMAGE_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiImage::GetRefs() const { const Type & NiImage::GetType() const { return TYPE; }; - -const Type & NiImage::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiIntegerExtraData.cpp b/src/obj/NiIntegerExtraData.cpp index d94fbe8a..2dfb9845 100644 --- a/src/obj/NiIntegerExtraData.cpp +++ b/src/obj/NiIntegerExtraData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiIntegerExtraData::TYPE("NiIntegerExtraData", &NI_INTEGER_EXTRA_DATA_PARENT::TypeConst() ); +const Type NiIntegerExtraData::TYPE("NiIntegerExtraData", &NI_INTEGER_EXTRA_DATA_PARENT::TYPE ); NiIntegerExtraData::NiIntegerExtraData() NI_INTEGER_EXTRA_DATA_CONSTRUCT {} @@ -42,7 +42,3 @@ unsigned int NiIntegerExtraData::GetData() const { void NiIntegerExtraData::SetData( unsigned int n ) { integerData = n; } - -const Type & NiIntegerExtraData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiIntegersExtraData.cpp b/src/obj/NiIntegersExtraData.cpp index 79804cc4..2e131b03 100644 --- a/src/obj/NiIntegersExtraData.cpp +++ b/src/obj/NiIntegersExtraData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiIntegersExtraData::TYPE("NiIntegersExtraData", &NI_INTEGERS_EXTRA_DATA_PARENT::TypeConst() ); +const Type NiIntegersExtraData::TYPE("NiIntegersExtraData", &NI_INTEGERS_EXTRA_DATA_PARENT::TYPE ); NiIntegersExtraData::NiIntegersExtraData() NI_INTEGERS_EXTRA_DATA_CONSTRUCT {} @@ -43,7 +43,3 @@ void NiIntegersExtraData::SetData( const vector<unsigned int> & n ) { numIntegers = (unsigned int)( n.size() ); data = n; }; - -const Type & NiIntegersExtraData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiInterpolator.cpp b/src/obj/NiInterpolator.cpp index 94fd4029..d8efbb5c 100644 --- a/src/obj/NiInterpolator.cpp +++ b/src/obj/NiInterpolator.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiInterpolator::TYPE("NiInterpolator", &NI_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiInterpolator::TYPE("NiInterpolator", &NI_INTERPOLATOR_PARENT::TYPE ); NiInterpolator::NiInterpolator() NI_INTERPOLATOR_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiInterpolator::GetRefs() const { const Type & NiInterpolator::GetType() const { return TYPE; }; - -const Type & NiInterpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiKeyframeController.cpp b/src/obj/NiKeyframeController.cpp index bff3f4c2..c889ddb3 100644 --- a/src/obj/NiKeyframeController.cpp +++ b/src/obj/NiKeyframeController.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiKeyframeController::TYPE("NiKeyframeController", &NI_KEYFRAME_CONTROLLER_PARENT::TypeConst() ); +const Type NiKeyframeController::TYPE("NiKeyframeController", &NI_KEYFRAME_CONTROLLER_PARENT::TYPE ); NiKeyframeController::NiKeyframeController() NI_KEYFRAME_CONTROLLER_CONSTRUCT {} @@ -43,7 +43,3 @@ Ref<NiKeyframeData> NiKeyframeController::GetData() const { void NiKeyframeController::SetData( NiKeyframeData * n ) { data = n; } - -const Type & NiKeyframeController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiKeyframeData.cpp b/src/obj/NiKeyframeData.cpp index d6348b3a..8bdf6e1f 100644 --- a/src/obj/NiKeyframeData.cpp +++ b/src/obj/NiKeyframeData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiKeyframeData::TYPE("NiKeyframeData", &NI_KEYFRAME_DATA_PARENT::TypeConst() ); +const Type NiKeyframeData::TYPE("NiKeyframeData", &NI_KEYFRAME_DATA_PARENT::TYPE ); NiKeyframeData::NiKeyframeData() NI_KEYFRAME_DATA_CONSTRUCT {} @@ -141,7 +141,3 @@ vector< Key<float> > NiKeyframeData::GetScaleKeys() const { void NiKeyframeData::SetScaleKeys( vector< Key<float> > const & keys ) { scales.keys = keys; } - -const Type & NiKeyframeData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiLODData.cpp b/src/obj/NiLODData.cpp index 6e0b6a76..022f3fe4 100644 --- a/src/obj/NiLODData.cpp +++ b/src/obj/NiLODData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiLODData::TYPE("NiLODData", &NI_L_O_D_DATA_PARENT::TypeConst() ); +const Type NiLODData::TYPE("NiLODData", &NI_L_O_D_DATA_PARENT::TYPE ); NiLODData::NiLODData() NI_L_O_D_DATA_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiLODData::GetRefs() const { const Type & NiLODData::GetType() const { return TYPE; }; - -const Type & NiLODData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiLODNode.cpp b/src/obj/NiLODNode.cpp index a8a0f0c6..12ac8a6b 100644 --- a/src/obj/NiLODNode.cpp +++ b/src/obj/NiLODNode.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiLODNode::TYPE("NiLODNode", &NI_L_O_D_NODE_PARENT::TypeConst() ); +const Type NiLODNode::TYPE("NiLODNode", &NI_L_O_D_NODE_PARENT::TYPE ); NiLODNode::NiLODNode() NI_L_O_D_NODE_CONSTRUCT {} @@ -60,7 +60,3 @@ Ref<NiLODData > NiLODNode::GetLODLevelData() const { void NiLODNode::SetLODLevelData( Ref<NiLODData > value ) { lodLevelData = value; } - -const Type & NiLODNode::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiLight.cpp b/src/obj/NiLight.cpp index 1321e2ae..de7f056e 100644 --- a/src/obj/NiLight.cpp +++ b/src/obj/NiLight.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiLight::TYPE("NiLight", &NI_LIGHT_PARENT::TypeConst() ); +const Type NiLight::TYPE("NiLight", &NI_LIGHT_PARENT::TYPE ); NiLight::NiLight() NI_LIGHT_CONSTRUCT {} @@ -66,7 +66,3 @@ Color3 NiLight::GetSpecularColor() const { void NiLight::SetSpecularColor( Color3 value ) { specularColor = value; } - -const Type & NiLight::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiLightColorController.cpp b/src/obj/NiLightColorController.cpp index f2c49b7c..cf4e3e78 100644 --- a/src/obj/NiLightColorController.cpp +++ b/src/obj/NiLightColorController.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiLightColorController::TYPE("NiLightColorController", &NI_LIGHT_COLOR_CONTROLLER_PARENT::TypeConst() ); +const Type NiLightColorController::TYPE("NiLightColorController", &NI_LIGHT_COLOR_CONTROLLER_PARENT::TYPE ); NiLightColorController::NiLightColorController() NI_LIGHT_COLOR_CONTROLLER_CONSTRUCT {} @@ -52,7 +52,3 @@ Ref<NiPoint3Interpolator > NiLightColorController::GetInterpolator() const { void NiLightColorController::SetInterpolator( NiPoint3Interpolator * value ) { interpolator = value; } - -const Type & NiLightColorController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiLightDimmerController.cpp b/src/obj/NiLightDimmerController.cpp index 2e021680..7d1b77dc 100644 --- a/src/obj/NiLightDimmerController.cpp +++ b/src/obj/NiLightDimmerController.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiLightDimmerController::TYPE("NiLightDimmerController", &NI_LIGHT_DIMMER_CONTROLLER_PARENT::TypeConst() ); +const Type NiLightDimmerController::TYPE("NiLightDimmerController", &NI_LIGHT_DIMMER_CONTROLLER_PARENT::TYPE ); NiLightDimmerController::NiLightDimmerController() NI_LIGHT_DIMMER_CONTROLLER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiLightDimmerController::GetRefs() const { const Type & NiLightDimmerController::GetType() const { return TYPE; }; - -const Type & NiLightDimmerController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiLookAtController.cpp b/src/obj/NiLookAtController.cpp index 807c8ba8..17d0fc48 100644 --- a/src/obj/NiLookAtController.cpp +++ b/src/obj/NiLookAtController.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiLookAtController::TYPE("NiLookAtController", &NI_LOOK_AT_CONTROLLER_PARENT::TypeConst() ); +const Type NiLookAtController::TYPE("NiLookAtController", &NI_LOOK_AT_CONTROLLER_PARENT::TYPE ); NiLookAtController::NiLookAtController() NI_LOOK_AT_CONTROLLER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiLookAtController::GetRefs() const { const Type & NiLookAtController::GetType() const { return TYPE; }; - -const Type & NiLookAtController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiLookAtInterpolator.cpp b/src/obj/NiLookAtInterpolator.cpp index 38000646..f056c64a 100644 --- a/src/obj/NiLookAtInterpolator.cpp +++ b/src/obj/NiLookAtInterpolator.cpp @@ -8,7 +8,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiLookAtInterpolator::TYPE("NiLookAtInterpolator", &NI_LOOK_AT_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiLookAtInterpolator::TYPE("NiLookAtInterpolator", &NI_LOOK_AT_INTERPOLATOR_PARENT::TYPE ); NiLookAtInterpolator::NiLookAtInterpolator() NI_LOOK_AT_INTERPOLATOR_CONSTRUCT {} @@ -69,7 +69,3 @@ float NiLookAtInterpolator::GetScale() const { void NiLookAtInterpolator::SetScale( float value ) { scale = value; } - -const Type & NiLookAtInterpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiMaterialColorController.cpp b/src/obj/NiMaterialColorController.cpp index 9261c5c5..f4dd8330 100644 --- a/src/obj/NiMaterialColorController.cpp +++ b/src/obj/NiMaterialColorController.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiMaterialColorController::TYPE("NiMaterialColorController", &NI_MATERIAL_COLOR_CONTROLLER_PARENT::TypeConst() ); +const Type NiMaterialColorController::TYPE("NiMaterialColorController", &NI_MATERIAL_COLOR_CONTROLLER_PARENT::TYPE ); NiMaterialColorController::NiMaterialColorController() NI_MATERIAL_COLOR_CONTROLLER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiMaterialColorController::GetRefs() const { const Type & NiMaterialColorController::GetType() const { return TYPE; }; - -const Type & NiMaterialColorController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiMaterialProperty.cpp b/src/obj/NiMaterialProperty.cpp index 2157e8fa..66142652 100644 --- a/src/obj/NiMaterialProperty.cpp +++ b/src/obj/NiMaterialProperty.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiMaterialProperty::TYPE("NiMaterialProperty", &NI_MATERIAL_PROPERTY_PARENT::TypeConst() ); +const Type NiMaterialProperty::TYPE("NiMaterialProperty", &NI_MATERIAL_PROPERTY_PARENT::TYPE ); NiMaterialProperty::NiMaterialProperty() NI_MATERIAL_PROPERTY_CONSTRUCT {} @@ -90,7 +90,3 @@ Color3 NiMaterialProperty::GetSpecularColor() const { void NiMaterialProperty::SetSpecularColor( const Color3 & n ) { specularColor = n; } - -const Type & NiMaterialProperty::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiMeshPSysData.cpp b/src/obj/NiMeshPSysData.cpp index 613a9fe2..9866b03c 100644 --- a/src/obj/NiMeshPSysData.cpp +++ b/src/obj/NiMeshPSysData.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiMeshPSysData::TYPE("NiMeshPSysData", &NI_MESH_P_SYS_DATA_PARENT::TypeConst() ); +const Type NiMeshPSysData::TYPE("NiMeshPSysData", &NI_MESH_P_SYS_DATA_PARENT::TYPE ); NiMeshPSysData::NiMeshPSysData() NI_MESH_P_SYS_DATA_CONSTRUCT {} @@ -36,7 +36,3 @@ list<NiObjectRef> NiMeshPSysData::GetRefs() const { const Type & NiMeshPSysData::GetType() const { return TYPE; }; - -const Type & NiMeshPSysData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiMeshParticleSystem.cpp b/src/obj/NiMeshParticleSystem.cpp index 940cad9e..2933f997 100644 --- a/src/obj/NiMeshParticleSystem.cpp +++ b/src/obj/NiMeshParticleSystem.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiMeshParticleSystem::TYPE("NiMeshParticleSystem", &NI_MESH_PARTICLE_SYSTEM_PARENT::TypeConst() ); +const Type NiMeshParticleSystem::TYPE("NiMeshParticleSystem", &NI_MESH_PARTICLE_SYSTEM_PARENT::TYPE ); NiMeshParticleSystem::NiMeshParticleSystem() NI_MESH_PARTICLE_SYSTEM_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiMeshParticleSystem::GetRefs() const { const Type & NiMeshParticleSystem::GetType() const { return TYPE; }; - -const Type & NiMeshParticleSystem::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiMorphData.cpp b/src/obj/NiMorphData.cpp index 55b79b42..d395af2e 100644 --- a/src/obj/NiMorphData.cpp +++ b/src/obj/NiMorphData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiMorphData::TYPE("NiMorphData", &NI_MORPH_DATA_PARENT::TypeConst() ); +const Type NiMorphData::TYPE("NiMorphData", &NI_MORPH_DATA_PARENT::TYPE ); NiMorphData::NiMorphData() NI_MORPH_DATA_CONSTRUCT {} @@ -90,7 +90,3 @@ void NiMorphData::SetMorphVerts( int n, const vector<Vector3> & in ) { //It's the right size, so go ahead and set it morphs[n].vectors = in; } - -const Type & NiMorphData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiMultiTargetTransformController.cpp b/src/obj/NiMultiTargetTransformController.cpp index bf4c08a8..e1e5d6b3 100644 --- a/src/obj/NiMultiTargetTransformController.cpp +++ b/src/obj/NiMultiTargetTransformController.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiMultiTargetTransformController::TYPE("NiMultiTargetTransformController", &NI_MULTI_TARGET_TRANSFORM_CONTROLLER_PARENT::TypeConst() ); +const Type NiMultiTargetTransformController::TYPE("NiMultiTargetTransformController", &NI_MULTI_TARGET_TRANSFORM_CONTROLLER_PARENT::TYPE ); NiMultiTargetTransformController::NiMultiTargetTransformController() NI_MULTI_TARGET_TRANSFORM_CONTROLLER_CONSTRUCT {} @@ -54,7 +54,3 @@ void NiMultiTargetTransformController::SetExtraTargets( const vector<NiNodeRef>& extraTargets.push_back( value[i] ); extraTargets.erase(std::remove(extraTargets.begin(), extraTargets.end(), (NiNode*)NULL), extraTargets.end()); } - -const Type & NiMultiTargetTransformController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiNode.cpp b/src/obj/NiNode.cpp index da13cfae..b35f136a 100644 --- a/src/obj/NiNode.cpp +++ b/src/obj/NiNode.cpp @@ -10,7 +10,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiNode::TYPE("NiNode", &NI_NODE_PARENT::TypeConst() ); +const Type NiNode::TYPE("NiNode", &NI_NODE_PARENT::TYPE ); NiNode::NiNode() NI_NODE_CONSTRUCT { //Set flag to default of 8: not a skin influence @@ -260,7 +260,7 @@ bool NiNode::IsSplitMeshProxy() const { } for ( unsigned i = 0; i < children.size(); ++i ) { - if ( children[i]->IsDerivedType( NiTriBasedGeom::TypeConst() ) == false ) { + if ( children[i]->IsDerivedType( NiTriBasedGeom::TYPE ) == false ) { return false; } if ( children[i]->GetLocalTransform() != Matrix44::IDENTITY ) { @@ -274,7 +274,3 @@ bool NiNode::IsSplitMeshProxy() const { //Made it all the way through the loop without returning false return true; } - -const Type & NiNode::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiObject.cpp b/src/obj/NiObject.cpp index 45e3c59f..351a6b7c 100644 --- a/src/obj/NiObject.cpp +++ b/src/obj/NiObject.cpp @@ -99,7 +99,3 @@ const Type & NiObject::GetType() const { unsigned int NiObject::GetNumRefs() { return _ref_count; } - -const Type & NiObject::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiObjectNET.cpp b/src/obj/NiObjectNET.cpp index c131ed20..205a45a0 100644 --- a/src/obj/NiObjectNET.cpp +++ b/src/obj/NiObjectNET.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiObjectNET::TYPE("NiObjectNET", &NI_OBJECT_N_E_T_PARENT::TypeConst() ); +const Type NiObjectNET::TYPE("NiObjectNET", &NI_OBJECT_N_E_T_PARENT::TYPE ); NiObjectNET::NiObjectNET() NI_OBJECT_N_E_T_CONSTRUCT {} @@ -187,7 +187,3 @@ list< Ref<NiTimeController> > NiObjectNET::GetControllers() const { const Type & NiObjectNET::GetType() const { return TYPE; }; - -const Type & NiObjectNET::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysAgeDeathModifier.cpp b/src/obj/NiPSysAgeDeathModifier.cpp index 79986b39..2d1f92b0 100644 --- a/src/obj/NiPSysAgeDeathModifier.cpp +++ b/src/obj/NiPSysAgeDeathModifier.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysAgeDeathModifier::TYPE("NiPSysAgeDeathModifier", &NI_P_SYS_AGE_DEATH_MODIFIER_PARENT::TypeConst() ); +const Type NiPSysAgeDeathModifier::TYPE("NiPSysAgeDeathModifier", &NI_P_SYS_AGE_DEATH_MODIFIER_PARENT::TYPE ); NiPSysAgeDeathModifier::NiPSysAgeDeathModifier() NI_P_SYS_AGE_DEATH_MODIFIER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysAgeDeathModifier::GetRefs() const { const Type & NiPSysAgeDeathModifier::GetType() const { return TYPE; }; - -const Type & NiPSysAgeDeathModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysBombModifier.cpp b/src/obj/NiPSysBombModifier.cpp index 24ed9667..20884626 100644 --- a/src/obj/NiPSysBombModifier.cpp +++ b/src/obj/NiPSysBombModifier.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysBombModifier::TYPE("NiPSysBombModifier", &NI_P_SYS_BOMB_MODIFIER_PARENT::TypeConst() ); +const Type NiPSysBombModifier::TYPE("NiPSysBombModifier", &NI_P_SYS_BOMB_MODIFIER_PARENT::TYPE ); NiPSysBombModifier::NiPSysBombModifier() NI_P_SYS_BOMB_MODIFIER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysBombModifier::GetRefs() const { const Type & NiPSysBombModifier::GetType() const { return TYPE; }; - -const Type & NiPSysBombModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysBoundUpdateModifier.cpp b/src/obj/NiPSysBoundUpdateModifier.cpp index 047009d1..ab9ea44f 100644 --- a/src/obj/NiPSysBoundUpdateModifier.cpp +++ b/src/obj/NiPSysBoundUpdateModifier.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysBoundUpdateModifier::TYPE("NiPSysBoundUpdateModifier", &NI_P_SYS_BOUND_UPDATE_MODIFIER_PARENT::TypeConst() ); +const Type NiPSysBoundUpdateModifier::TYPE("NiPSysBoundUpdateModifier", &NI_P_SYS_BOUND_UPDATE_MODIFIER_PARENT::TYPE ); NiPSysBoundUpdateModifier::NiPSysBoundUpdateModifier() NI_P_SYS_BOUND_UPDATE_MODIFIER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysBoundUpdateModifier::GetRefs() const { const Type & NiPSysBoundUpdateModifier::GetType() const { return TYPE; }; - -const Type & NiPSysBoundUpdateModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysBoxEmitter.cpp b/src/obj/NiPSysBoxEmitter.cpp index 54818a3f..4c45597c 100644 --- a/src/obj/NiPSysBoxEmitter.cpp +++ b/src/obj/NiPSysBoxEmitter.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysBoxEmitter::TYPE("NiPSysBoxEmitter", &NI_P_SYS_BOX_EMITTER_PARENT::TypeConst() ); +const Type NiPSysBoxEmitter::TYPE("NiPSysBoxEmitter", &NI_P_SYS_BOX_EMITTER_PARENT::TYPE ); NiPSysBoxEmitter::NiPSysBoxEmitter() NI_P_SYS_BOX_EMITTER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysBoxEmitter::GetRefs() const { const Type & NiPSysBoxEmitter::GetType() const { return TYPE; }; - -const Type & NiPSysBoxEmitter::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysColliderManager.cpp b/src/obj/NiPSysColliderManager.cpp index fc6d3503..e5b585c8 100644 --- a/src/obj/NiPSysColliderManager.cpp +++ b/src/obj/NiPSysColliderManager.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysColliderManager::TYPE("NiPSysColliderManager", &NI_P_SYS_COLLIDER_MANAGER_PARENT::TypeConst() ); +const Type NiPSysColliderManager::TYPE("NiPSysColliderManager", &NI_P_SYS_COLLIDER_MANAGER_PARENT::TYPE ); NiPSysColliderManager::NiPSysColliderManager() NI_P_SYS_COLLIDER_MANAGER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysColliderManager::GetRefs() const { const Type & NiPSysColliderManager::GetType() const { return TYPE; }; - -const Type & NiPSysColliderManager::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysColorModifier.cpp b/src/obj/NiPSysColorModifier.cpp index 4d9e2739..24ff666c 100644 --- a/src/obj/NiPSysColorModifier.cpp +++ b/src/obj/NiPSysColorModifier.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysColorModifier::TYPE("NiPSysColorModifier", &NI_P_SYS_COLOR_MODIFIER_PARENT::TypeConst() ); +const Type NiPSysColorModifier::TYPE("NiPSysColorModifier", &NI_P_SYS_COLOR_MODIFIER_PARENT::TYPE ); NiPSysColorModifier::NiPSysColorModifier() NI_P_SYS_COLOR_MODIFIER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysColorModifier::GetRefs() const { const Type & NiPSysColorModifier::GetType() const { return TYPE; }; - -const Type & NiPSysColorModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysCylinderEmitter.cpp b/src/obj/NiPSysCylinderEmitter.cpp index 59629687..1e77b207 100644 --- a/src/obj/NiPSysCylinderEmitter.cpp +++ b/src/obj/NiPSysCylinderEmitter.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysCylinderEmitter::TYPE("NiPSysCylinderEmitter", &NI_P_SYS_CYLINDER_EMITTER_PARENT::TypeConst() ); +const Type NiPSysCylinderEmitter::TYPE("NiPSysCylinderEmitter", &NI_P_SYS_CYLINDER_EMITTER_PARENT::TYPE ); NiPSysCylinderEmitter::NiPSysCylinderEmitter() NI_P_SYS_CYLINDER_EMITTER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysCylinderEmitter::GetRefs() const { const Type & NiPSysCylinderEmitter::GetType() const { return TYPE; }; - -const Type & NiPSysCylinderEmitter::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysData.cpp b/src/obj/NiPSysData.cpp index c2726694..5d325968 100644 --- a/src/obj/NiPSysData.cpp +++ b/src/obj/NiPSysData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysData::TYPE("NiPSysData", &NI_P_SYS_DATA_PARENT::TypeConst() ); +const Type NiPSysData::TYPE("NiPSysData", &NI_P_SYS_DATA_PARENT::TYPE ); NiPSysData::NiPSysData() NI_P_SYS_DATA_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysData::GetRefs() const { const Type & NiPSysData::GetType() const { return TYPE; }; - -const Type & NiPSysData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysDragModifier.cpp b/src/obj/NiPSysDragModifier.cpp index 93c16029..c69fab7a 100644 --- a/src/obj/NiPSysDragModifier.cpp +++ b/src/obj/NiPSysDragModifier.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysDragModifier::TYPE("NiPSysDragModifier", &NI_P_SYS_DRAG_MODIFIER_PARENT::TypeConst() ); +const Type NiPSysDragModifier::TYPE("NiPSysDragModifier", &NI_P_SYS_DRAG_MODIFIER_PARENT::TYPE ); NiPSysDragModifier::NiPSysDragModifier() NI_P_SYS_DRAG_MODIFIER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysDragModifier::GetRefs() const { const Type & NiPSysDragModifier::GetType() const { return TYPE; }; - -const Type & NiPSysDragModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysEmitter.cpp b/src/obj/NiPSysEmitter.cpp index 96382879..a7416fb4 100644 --- a/src/obj/NiPSysEmitter.cpp +++ b/src/obj/NiPSysEmitter.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysEmitter::TYPE("NiPSysEmitter", &NI_P_SYS_EMITTER_PARENT::TypeConst() ); +const Type NiPSysEmitter::TYPE("NiPSysEmitter", &NI_P_SYS_EMITTER_PARENT::TYPE ); NiPSysEmitter::NiPSysEmitter() NI_P_SYS_EMITTER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysEmitter::GetRefs() const { const Type & NiPSysEmitter::GetType() const { return TYPE; }; - -const Type & NiPSysEmitter::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysEmitterCtlr.cpp b/src/obj/NiPSysEmitterCtlr.cpp index 1267d9a2..d33939b7 100644 --- a/src/obj/NiPSysEmitterCtlr.cpp +++ b/src/obj/NiPSysEmitterCtlr.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysEmitterCtlr::TYPE("NiPSysEmitterCtlr", &NI_P_SYS_EMITTER_CTLR_PARENT::TypeConst() ); +const Type NiPSysEmitterCtlr::TYPE("NiPSysEmitterCtlr", &NI_P_SYS_EMITTER_CTLR_PARENT::TYPE ); NiPSysEmitterCtlr::NiPSysEmitterCtlr() NI_P_SYS_EMITTER_CTLR_CONSTRUCT {} @@ -52,7 +52,3 @@ Ref<NiInterpolator > NiPSysEmitterCtlr::GetVisibilityInterpolator() const { void NiPSysEmitterCtlr::SetVisibilityInterpolator( NiInterpolator * value ) { visibilityInterpolator = value; } - -const Type & NiPSysEmitterCtlr::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysEmitterCtlrData.cpp b/src/obj/NiPSysEmitterCtlrData.cpp index 15204fbf..cac4c441 100644 --- a/src/obj/NiPSysEmitterCtlrData.cpp +++ b/src/obj/NiPSysEmitterCtlrData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysEmitterCtlrData::TYPE("NiPSysEmitterCtlrData", &NI_P_SYS_EMITTER_CTLR_DATA_PARENT::TypeConst() ); +const Type NiPSysEmitterCtlrData::TYPE("NiPSysEmitterCtlrData", &NI_P_SYS_EMITTER_CTLR_DATA_PARENT::TYPE ); NiPSysEmitterCtlrData::NiPSysEmitterCtlrData() NI_P_SYS_EMITTER_CTLR_DATA_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysEmitterCtlrData::GetRefs() const { const Type & NiPSysEmitterCtlrData::GetType() const { return TYPE; }; - -const Type & NiPSysEmitterCtlrData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysEmitterDeclinationCtlr.cpp b/src/obj/NiPSysEmitterDeclinationCtlr.cpp index d29d1577..a9ce70dd 100644 --- a/src/obj/NiPSysEmitterDeclinationCtlr.cpp +++ b/src/obj/NiPSysEmitterDeclinationCtlr.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysEmitterDeclinationCtlr::TYPE("NiPSysEmitterDeclinationCtlr", &NI_P_SYS_EMITTER_DECLINATION_CTLR_PARENT::TypeConst() ); +const Type NiPSysEmitterDeclinationCtlr::TYPE("NiPSysEmitterDeclinationCtlr", &NI_P_SYS_EMITTER_DECLINATION_CTLR_PARENT::TYPE ); NiPSysEmitterDeclinationCtlr::NiPSysEmitterDeclinationCtlr() NI_P_SYS_EMITTER_DECLINATION_CTLR_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysEmitterDeclinationCtlr::GetRefs() const { const Type & NiPSysEmitterDeclinationCtlr::GetType() const { return TYPE; }; - -const Type & NiPSysEmitterDeclinationCtlr::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp b/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp index 7ce7972a..2da4240b 100644 --- a/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp +++ b/src/obj/NiPSysEmitterDeclinationVarCtlr.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysEmitterDeclinationVarCtlr::TYPE("NiPSysEmitterDeclinationVarCtlr", &NI_P_SYS_EMITTER_DECLINATION_VAR_CTLR_PARENT::TypeConst() ); +const Type NiPSysEmitterDeclinationVarCtlr::TYPE("NiPSysEmitterDeclinationVarCtlr", &NI_P_SYS_EMITTER_DECLINATION_VAR_CTLR_PARENT::TYPE ); NiPSysEmitterDeclinationVarCtlr::NiPSysEmitterDeclinationVarCtlr() NI_P_SYS_EMITTER_DECLINATION_VAR_CTLR_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysEmitterDeclinationVarCtlr::GetRefs() const { const Type & NiPSysEmitterDeclinationVarCtlr::GetType() const { return TYPE; }; - -const Type & NiPSysEmitterDeclinationVarCtlr::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp b/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp index 9a1017df..4422162a 100644 --- a/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp +++ b/src/obj/NiPSysEmitterInitialRadiusCtlr.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysEmitterInitialRadiusCtlr::TYPE("NiPSysEmitterInitialRadiusCtlr", &NI_P_SYS_EMITTER_INITIAL_RADIUS_CTLR_PARENT::TypeConst() ); +const Type NiPSysEmitterInitialRadiusCtlr::TYPE("NiPSysEmitterInitialRadiusCtlr", &NI_P_SYS_EMITTER_INITIAL_RADIUS_CTLR_PARENT::TYPE ); NiPSysEmitterInitialRadiusCtlr::NiPSysEmitterInitialRadiusCtlr() NI_P_SYS_EMITTER_INITIAL_RADIUS_CTLR_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysEmitterInitialRadiusCtlr::GetRefs() const { const Type & NiPSysEmitterInitialRadiusCtlr::GetType() const { return TYPE; }; - -const Type & NiPSysEmitterInitialRadiusCtlr::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysEmitterLifeSpanCtlr.cpp b/src/obj/NiPSysEmitterLifeSpanCtlr.cpp index c6687deb..2a6196dc 100644 --- a/src/obj/NiPSysEmitterLifeSpanCtlr.cpp +++ b/src/obj/NiPSysEmitterLifeSpanCtlr.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysEmitterLifeSpanCtlr::TYPE("NiPSysEmitterLifeSpanCtlr", &NI_P_SYS_EMITTER_LIFE_SPAN_CTLR_PARENT::TypeConst() ); +const Type NiPSysEmitterLifeSpanCtlr::TYPE("NiPSysEmitterLifeSpanCtlr", &NI_P_SYS_EMITTER_LIFE_SPAN_CTLR_PARENT::TYPE ); NiPSysEmitterLifeSpanCtlr::NiPSysEmitterLifeSpanCtlr() NI_P_SYS_EMITTER_LIFE_SPAN_CTLR_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysEmitterLifeSpanCtlr::GetRefs() const { const Type & NiPSysEmitterLifeSpanCtlr::GetType() const { return TYPE; }; - -const Type & NiPSysEmitterLifeSpanCtlr::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysEmitterSpeedCtlr.cpp b/src/obj/NiPSysEmitterSpeedCtlr.cpp index bdf13987..7b659990 100644 --- a/src/obj/NiPSysEmitterSpeedCtlr.cpp +++ b/src/obj/NiPSysEmitterSpeedCtlr.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysEmitterSpeedCtlr::TYPE("NiPSysEmitterSpeedCtlr", &NI_P_SYS_EMITTER_SPEED_CTLR_PARENT::TypeConst() ); +const Type NiPSysEmitterSpeedCtlr::TYPE("NiPSysEmitterSpeedCtlr", &NI_P_SYS_EMITTER_SPEED_CTLR_PARENT::TYPE ); NiPSysEmitterSpeedCtlr::NiPSysEmitterSpeedCtlr() NI_P_SYS_EMITTER_SPEED_CTLR_CONSTRUCT {} @@ -36,7 +36,3 @@ list<NiObjectRef> NiPSysEmitterSpeedCtlr::GetRefs() const { const Type & NiPSysEmitterSpeedCtlr::GetType() const { return TYPE; }; - -const Type & NiPSysEmitterSpeedCtlr::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysGravityModifier.cpp b/src/obj/NiPSysGravityModifier.cpp index 01eb1029..449e2847 100644 --- a/src/obj/NiPSysGravityModifier.cpp +++ b/src/obj/NiPSysGravityModifier.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysGravityModifier::TYPE("NiPSysGravityModifier", &NI_P_SYS_GRAVITY_MODIFIER_PARENT::TypeConst() ); +const Type NiPSysGravityModifier::TYPE("NiPSysGravityModifier", &NI_P_SYS_GRAVITY_MODIFIER_PARENT::TYPE ); NiPSysGravityModifier::NiPSysGravityModifier() NI_P_SYS_GRAVITY_MODIFIER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysGravityModifier::GetRefs() const { const Type & NiPSysGravityModifier::GetType() const { return TYPE; }; - -const Type & NiPSysGravityModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysGravityStrengthCtlr.cpp b/src/obj/NiPSysGravityStrengthCtlr.cpp index c9cf6253..2787ae4c 100644 --- a/src/obj/NiPSysGravityStrengthCtlr.cpp +++ b/src/obj/NiPSysGravityStrengthCtlr.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysGravityStrengthCtlr::TYPE("NiPSysGravityStrengthCtlr", &NI_P_SYS_GRAVITY_STRENGTH_CTLR_PARENT::TypeConst() ); +const Type NiPSysGravityStrengthCtlr::TYPE("NiPSysGravityStrengthCtlr", &NI_P_SYS_GRAVITY_STRENGTH_CTLR_PARENT::TYPE ); NiPSysGravityStrengthCtlr::NiPSysGravityStrengthCtlr() NI_P_SYS_GRAVITY_STRENGTH_CTLR_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysGravityStrengthCtlr::GetRefs() const { const Type & NiPSysGravityStrengthCtlr::GetType() const { return TYPE; }; - -const Type & NiPSysGravityStrengthCtlr::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysGrowFadeModifier.cpp b/src/obj/NiPSysGrowFadeModifier.cpp index 20de9aa6..f2533a3e 100644 --- a/src/obj/NiPSysGrowFadeModifier.cpp +++ b/src/obj/NiPSysGrowFadeModifier.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysGrowFadeModifier::TYPE("NiPSysGrowFadeModifier", &NI_P_SYS_GROW_FADE_MODIFIER_PARENT::TypeConst() ); +const Type NiPSysGrowFadeModifier::TYPE("NiPSysGrowFadeModifier", &NI_P_SYS_GROW_FADE_MODIFIER_PARENT::TYPE ); NiPSysGrowFadeModifier::NiPSysGrowFadeModifier() NI_P_SYS_GROW_FADE_MODIFIER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysGrowFadeModifier::GetRefs() const { const Type & NiPSysGrowFadeModifier::GetType() const { return TYPE; }; - -const Type & NiPSysGrowFadeModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysMeshEmitter.cpp b/src/obj/NiPSysMeshEmitter.cpp index ea1c4e2f..1f9cc452 100644 --- a/src/obj/NiPSysMeshEmitter.cpp +++ b/src/obj/NiPSysMeshEmitter.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysMeshEmitter::TYPE("NiPSysMeshEmitter", &NI_P_SYS_MESH_EMITTER_PARENT::TypeConst() ); +const Type NiPSysMeshEmitter::TYPE("NiPSysMeshEmitter", &NI_P_SYS_MESH_EMITTER_PARENT::TYPE ); NiPSysMeshEmitter::NiPSysMeshEmitter() NI_P_SYS_MESH_EMITTER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysMeshEmitter::GetRefs() const { const Type & NiPSysMeshEmitter::GetType() const { return TYPE; }; - -const Type & NiPSysMeshEmitter::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysMeshUpdateModifier.cpp b/src/obj/NiPSysMeshUpdateModifier.cpp index ae629ee8..2bca31c2 100644 --- a/src/obj/NiPSysMeshUpdateModifier.cpp +++ b/src/obj/NiPSysMeshUpdateModifier.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysMeshUpdateModifier::TYPE("NiPSysMeshUpdateModifier", &NI_P_SYS_MESH_UPDATE_MODIFIER_PARENT::TypeConst() ); +const Type NiPSysMeshUpdateModifier::TYPE("NiPSysMeshUpdateModifier", &NI_P_SYS_MESH_UPDATE_MODIFIER_PARENT::TYPE ); NiPSysMeshUpdateModifier::NiPSysMeshUpdateModifier() NI_P_SYS_MESH_UPDATE_MODIFIER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysMeshUpdateModifier::GetRefs() const { const Type & NiPSysMeshUpdateModifier::GetType() const { return TYPE; }; - -const Type & NiPSysMeshUpdateModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysModifier.cpp b/src/obj/NiPSysModifier.cpp index 9b769d1f..572b6a3e 100644 --- a/src/obj/NiPSysModifier.cpp +++ b/src/obj/NiPSysModifier.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysModifier::TYPE("NiPSysModifier", &NI_P_SYS_MODIFIER_PARENT::TypeConst() ); +const Type NiPSysModifier::TYPE("NiPSysModifier", &NI_P_SYS_MODIFIER_PARENT::TYPE ); NiPSysModifier::NiPSysModifier() NI_P_SYS_MODIFIER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysModifier::GetRefs() const { const Type & NiPSysModifier::GetType() const { return TYPE; }; - -const Type & NiPSysModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysModifierActiveCtlr.cpp b/src/obj/NiPSysModifierActiveCtlr.cpp index cb3aa4b8..db3d62ff 100644 --- a/src/obj/NiPSysModifierActiveCtlr.cpp +++ b/src/obj/NiPSysModifierActiveCtlr.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysModifierActiveCtlr::TYPE("NiPSysModifierActiveCtlr", &NI_P_SYS_MODIFIER_ACTIVE_CTLR_PARENT::TypeConst() ); +const Type NiPSysModifierActiveCtlr::TYPE("NiPSysModifierActiveCtlr", &NI_P_SYS_MODIFIER_ACTIVE_CTLR_PARENT::TYPE ); NiPSysModifierActiveCtlr::NiPSysModifierActiveCtlr() NI_P_SYS_MODIFIER_ACTIVE_CTLR_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysModifierActiveCtlr::GetRefs() const { const Type & NiPSysModifierActiveCtlr::GetType() const { return TYPE; }; - -const Type & NiPSysModifierActiveCtlr::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysPlanarCollider.cpp b/src/obj/NiPSysPlanarCollider.cpp index 0eeadf19..907a121c 100644 --- a/src/obj/NiPSysPlanarCollider.cpp +++ b/src/obj/NiPSysPlanarCollider.cpp @@ -8,7 +8,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysPlanarCollider::TYPE("NiPSysPlanarCollider", &NI_P_SYS_PLANAR_COLLIDER_PARENT::TypeConst() ); +const Type NiPSysPlanarCollider::TYPE("NiPSysPlanarCollider", &NI_P_SYS_PLANAR_COLLIDER_PARENT::TYPE ); NiPSysPlanarCollider::NiPSysPlanarCollider() NI_P_SYS_PLANAR_COLLIDER_CONSTRUCT {} @@ -37,7 +37,3 @@ list<NiObjectRef> NiPSysPlanarCollider::GetRefs() const { const Type & NiPSysPlanarCollider::GetType() const { return TYPE; }; - -const Type & NiPSysPlanarCollider::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysPositionModifier.cpp b/src/obj/NiPSysPositionModifier.cpp index f1c74582..c0c46187 100644 --- a/src/obj/NiPSysPositionModifier.cpp +++ b/src/obj/NiPSysPositionModifier.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysPositionModifier::TYPE("NiPSysPositionModifier", &NI_P_SYS_POSITION_MODIFIER_PARENT::TypeConst() ); +const Type NiPSysPositionModifier::TYPE("NiPSysPositionModifier", &NI_P_SYS_POSITION_MODIFIER_PARENT::TYPE ); NiPSysPositionModifier::NiPSysPositionModifier() NI_P_SYS_POSITION_MODIFIER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysPositionModifier::GetRefs() const { const Type & NiPSysPositionModifier::GetType() const { return TYPE; }; - -const Type & NiPSysPositionModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysResetOnLoopCtlr.cpp b/src/obj/NiPSysResetOnLoopCtlr.cpp index 47eb901d..53a61645 100644 --- a/src/obj/NiPSysResetOnLoopCtlr.cpp +++ b/src/obj/NiPSysResetOnLoopCtlr.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysResetOnLoopCtlr::TYPE("NiPSysResetOnLoopCtlr", &NI_P_SYS_RESET_ON_LOOP_CTLR_PARENT::TypeConst() ); +const Type NiPSysResetOnLoopCtlr::TYPE("NiPSysResetOnLoopCtlr", &NI_P_SYS_RESET_ON_LOOP_CTLR_PARENT::TYPE ); NiPSysResetOnLoopCtlr::NiPSysResetOnLoopCtlr() NI_P_SYS_RESET_ON_LOOP_CTLR_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysResetOnLoopCtlr::GetRefs() const { const Type & NiPSysResetOnLoopCtlr::GetType() const { return TYPE; }; - -const Type & NiPSysResetOnLoopCtlr::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysRotationModifier.cpp b/src/obj/NiPSysRotationModifier.cpp index 2d96e2a2..39c2c447 100644 --- a/src/obj/NiPSysRotationModifier.cpp +++ b/src/obj/NiPSysRotationModifier.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysRotationModifier::TYPE("NiPSysRotationModifier", &NI_P_SYS_ROTATION_MODIFIER_PARENT::TypeConst() ); +const Type NiPSysRotationModifier::TYPE("NiPSysRotationModifier", &NI_P_SYS_ROTATION_MODIFIER_PARENT::TYPE ); NiPSysRotationModifier::NiPSysRotationModifier() NI_P_SYS_ROTATION_MODIFIER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysRotationModifier::GetRefs() const { const Type & NiPSysRotationModifier::GetType() const { return TYPE; }; - -const Type & NiPSysRotationModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysSpawnModifier.cpp b/src/obj/NiPSysSpawnModifier.cpp index 3520f2f2..0750838c 100644 --- a/src/obj/NiPSysSpawnModifier.cpp +++ b/src/obj/NiPSysSpawnModifier.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysSpawnModifier::TYPE("NiPSysSpawnModifier", &NI_P_SYS_SPAWN_MODIFIER_PARENT::TypeConst() ); +const Type NiPSysSpawnModifier::TYPE("NiPSysSpawnModifier", &NI_P_SYS_SPAWN_MODIFIER_PARENT::TYPE ); NiPSysSpawnModifier::NiPSysSpawnModifier() NI_P_SYS_SPAWN_MODIFIER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysSpawnModifier::GetRefs() const { const Type & NiPSysSpawnModifier::GetType() const { return TYPE; }; - -const Type & NiPSysSpawnModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysSphereEmitter.cpp b/src/obj/NiPSysSphereEmitter.cpp index 38d7a070..cc554fa7 100644 --- a/src/obj/NiPSysSphereEmitter.cpp +++ b/src/obj/NiPSysSphereEmitter.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysSphereEmitter::TYPE("NiPSysSphereEmitter", &NI_P_SYS_SPHERE_EMITTER_PARENT::TypeConst() ); +const Type NiPSysSphereEmitter::TYPE("NiPSysSphereEmitter", &NI_P_SYS_SPHERE_EMITTER_PARENT::TYPE ); NiPSysSphereEmitter::NiPSysSphereEmitter() NI_P_SYS_SPHERE_EMITTER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysSphereEmitter::GetRefs() const { const Type & NiPSysSphereEmitter::GetType() const { return TYPE; }; - -const Type & NiPSysSphereEmitter::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysUpdateCtlr.cpp b/src/obj/NiPSysUpdateCtlr.cpp index 7fedf06a..24f8c5f8 100644 --- a/src/obj/NiPSysUpdateCtlr.cpp +++ b/src/obj/NiPSysUpdateCtlr.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysUpdateCtlr::TYPE("NiPSysUpdateCtlr", &NI_P_SYS_UPDATE_CTLR_PARENT::TypeConst() ); +const Type NiPSysUpdateCtlr::TYPE("NiPSysUpdateCtlr", &NI_P_SYS_UPDATE_CTLR_PARENT::TYPE ); NiPSysUpdateCtlr::NiPSysUpdateCtlr() NI_P_SYS_UPDATE_CTLR_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPSysUpdateCtlr::GetRefs() const { const Type & NiPSysUpdateCtlr::GetType() const { return TYPE; }; - -const Type & NiPSysUpdateCtlr::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPSysVolumeEmitter.cpp b/src/obj/NiPSysVolumeEmitter.cpp index cfaa05a8..f62d2b96 100644 --- a/src/obj/NiPSysVolumeEmitter.cpp +++ b/src/obj/NiPSysVolumeEmitter.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPSysVolumeEmitter::TYPE("NiPSysVolumeEmitter", &NI_P_SYS_VOLUME_EMITTER_PARENT::TypeConst() ); +const Type NiPSysVolumeEmitter::TYPE("NiPSysVolumeEmitter", &NI_P_SYS_VOLUME_EMITTER_PARENT::TYPE ); NiPSysVolumeEmitter::NiPSysVolumeEmitter() NI_P_SYS_VOLUME_EMITTER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiPSysVolumeEmitter::GetRefs() const { const Type & NiPSysVolumeEmitter::GetType() const { return TYPE; }; - -const Type & NiPSysVolumeEmitter::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPalette.cpp b/src/obj/NiPalette.cpp index 5cc31e4a..2445fcc6 100644 --- a/src/obj/NiPalette.cpp +++ b/src/obj/NiPalette.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPalette::TYPE("NiPalette", &NI_PALETTE_PARENT::TypeConst() ); +const Type NiPalette::TYPE("NiPalette", &NI_PALETTE_PARENT::TYPE ); NiPalette::NiPalette() NI_PALETTE_CONSTRUCT {} @@ -61,7 +61,3 @@ void NiPalette::SetPalette( const vector<Color4> & new_pal ) { palette[i][3] = int( new_pal[i].a * 255.0f ); } } - -const Type & NiPalette::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiParticleBomb.cpp b/src/obj/NiParticleBomb.cpp index aea20b39..ebf148ac 100644 --- a/src/obj/NiParticleBomb.cpp +++ b/src/obj/NiParticleBomb.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiParticleBomb::TYPE("NiParticleBomb", &NI_PARTICLE_BOMB_PARENT::TypeConst() ); +const Type NiParticleBomb::TYPE("NiParticleBomb", &NI_PARTICLE_BOMB_PARENT::TYPE ); NiParticleBomb::NiParticleBomb() NI_PARTICLE_BOMB_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiParticleBomb::GetRefs() const { const Type & NiParticleBomb::GetType() const { return TYPE; }; - -const Type & NiParticleBomb::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiParticleColorModifier.cpp b/src/obj/NiParticleColorModifier.cpp index 2d50f417..75778265 100644 --- a/src/obj/NiParticleColorModifier.cpp +++ b/src/obj/NiParticleColorModifier.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiParticleColorModifier::TYPE("NiParticleColorModifier", &NI_PARTICLE_COLOR_MODIFIER_PARENT::TypeConst() ); +const Type NiParticleColorModifier::TYPE("NiParticleColorModifier", &NI_PARTICLE_COLOR_MODIFIER_PARENT::TYPE ); NiParticleColorModifier::NiParticleColorModifier() NI_PARTICLE_COLOR_MODIFIER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiParticleColorModifier::GetRefs() const { const Type & NiParticleColorModifier::GetType() const { return TYPE; }; - -const Type & NiParticleColorModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiParticleGrowFade.cpp b/src/obj/NiParticleGrowFade.cpp index 8ac1f794..4f5425fa 100644 --- a/src/obj/NiParticleGrowFade.cpp +++ b/src/obj/NiParticleGrowFade.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiParticleGrowFade::TYPE("NiParticleGrowFade", &NI_PARTICLE_GROW_FADE_PARENT::TypeConst() ); +const Type NiParticleGrowFade::TYPE("NiParticleGrowFade", &NI_PARTICLE_GROW_FADE_PARENT::TYPE ); NiParticleGrowFade::NiParticleGrowFade() NI_PARTICLE_GROW_FADE_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiParticleGrowFade::GetRefs() const { const Type & NiParticleGrowFade::GetType() const { return TYPE; }; - -const Type & NiParticleGrowFade::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiParticleMeshModifier.cpp b/src/obj/NiParticleMeshModifier.cpp index 24812ea7..bcc2a276 100644 --- a/src/obj/NiParticleMeshModifier.cpp +++ b/src/obj/NiParticleMeshModifier.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiParticleMeshModifier::TYPE("NiParticleMeshModifier", &NI_PARTICLE_MESH_MODIFIER_PARENT::TypeConst() ); +const Type NiParticleMeshModifier::TYPE("NiParticleMeshModifier", &NI_PARTICLE_MESH_MODIFIER_PARENT::TYPE ); NiParticleMeshModifier::NiParticleMeshModifier() NI_PARTICLE_MESH_MODIFIER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiParticleMeshModifier::GetRefs() const { const Type & NiParticleMeshModifier::GetType() const { return TYPE; }; - -const Type & NiParticleMeshModifier::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiParticleMeshes.cpp b/src/obj/NiParticleMeshes.cpp index dc78081a..1b7573b5 100644 --- a/src/obj/NiParticleMeshes.cpp +++ b/src/obj/NiParticleMeshes.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiParticleMeshes::TYPE("NiParticleMeshes", &NI_PARTICLE_MESHES_PARENT::TypeConst() ); +const Type NiParticleMeshes::TYPE("NiParticleMeshes", &NI_PARTICLE_MESHES_PARENT::TYPE ); NiParticleMeshes::NiParticleMeshes() NI_PARTICLE_MESHES_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiParticleMeshes::GetRefs() const { const Type & NiParticleMeshes::GetType() const { return TYPE; }; - -const Type & NiParticleMeshes::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiParticleMeshesData.cpp b/src/obj/NiParticleMeshesData.cpp index 2bcb9ab5..0d916e38 100644 --- a/src/obj/NiParticleMeshesData.cpp +++ b/src/obj/NiParticleMeshesData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiParticleMeshesData::TYPE("NiParticleMeshesData", &NI_PARTICLE_MESHES_DATA_PARENT::TypeConst() ); +const Type NiParticleMeshesData::TYPE("NiParticleMeshesData", &NI_PARTICLE_MESHES_DATA_PARENT::TYPE ); NiParticleMeshesData::NiParticleMeshesData() NI_PARTICLE_MESHES_DATA_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiParticleMeshesData::GetRefs() const { const Type & NiParticleMeshesData::GetType() const { return TYPE; }; - -const Type & NiParticleMeshesData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiParticleRotation.cpp b/src/obj/NiParticleRotation.cpp index a55791a5..bc5a1f84 100644 --- a/src/obj/NiParticleRotation.cpp +++ b/src/obj/NiParticleRotation.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiParticleRotation::TYPE("NiParticleRotation", &NI_PARTICLE_ROTATION_PARENT::TypeConst() ); +const Type NiParticleRotation::TYPE("NiParticleRotation", &NI_PARTICLE_ROTATION_PARENT::TYPE ); NiParticleRotation::NiParticleRotation() NI_PARTICLE_ROTATION_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiParticleRotation::GetRefs() const { const Type & NiParticleRotation::GetType() const { return TYPE; }; - -const Type & NiParticleRotation::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiParticleSystem.cpp b/src/obj/NiParticleSystem.cpp index 2866766a..c7435bba 100644 --- a/src/obj/NiParticleSystem.cpp +++ b/src/obj/NiParticleSystem.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiParticleSystem::TYPE("NiParticleSystem", &NI_PARTICLE_SYSTEM_PARENT::TypeConst() ); +const Type NiParticleSystem::TYPE("NiParticleSystem", &NI_PARTICLE_SYSTEM_PARENT::TYPE ); NiParticleSystem::NiParticleSystem() NI_PARTICLE_SYSTEM_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiParticleSystem::GetRefs() const { const Type & NiParticleSystem::GetType() const { return TYPE; }; - -const Type & NiParticleSystem::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiParticleSystemController.cpp b/src/obj/NiParticleSystemController.cpp index b7ab5a10..6c9ef36d 100644 --- a/src/obj/NiParticleSystemController.cpp +++ b/src/obj/NiParticleSystemController.cpp @@ -8,7 +8,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiParticleSystemController::TYPE("NiParticleSystemController", &NI_PARTICLE_SYSTEM_CONTROLLER_PARENT::TypeConst() ); +const Type NiParticleSystemController::TYPE("NiParticleSystemController", &NI_PARTICLE_SYSTEM_CONTROLLER_PARENT::TYPE ); NiParticleSystemController::NiParticleSystemController() NI_PARTICLE_SYSTEM_CONTROLLER_CONSTRUCT {} @@ -37,7 +37,3 @@ list<NiObjectRef> NiParticleSystemController::GetRefs() const { const Type & NiParticleSystemController::GetType() const { return TYPE; }; - -const Type & NiParticleSystemController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiParticles.cpp b/src/obj/NiParticles.cpp index f24464e9..47ed1bc9 100644 --- a/src/obj/NiParticles.cpp +++ b/src/obj/NiParticles.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiParticles::TYPE("NiParticles", &NI_PARTICLES_PARENT::TypeConst() ); +const Type NiParticles::TYPE("NiParticles", &NI_PARTICLES_PARENT::TYPE ); NiParticles::NiParticles() NI_PARTICLES_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiParticles::GetRefs() const { const Type & NiParticles::GetType() const { return TYPE; }; - -const Type & NiParticles::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiParticlesData.cpp b/src/obj/NiParticlesData.cpp index f9e315fb..32e2d4a4 100644 --- a/src/obj/NiParticlesData.cpp +++ b/src/obj/NiParticlesData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiParticlesData::TYPE("NiParticlesData", &NI_PARTICLES_DATA_PARENT::TypeConst() ); +const Type NiParticlesData::TYPE("NiParticlesData", &NI_PARTICLES_DATA_PARENT::TYPE ); NiParticlesData::NiParticlesData() NI_PARTICLES_DATA_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiParticlesData::GetRefs() const { const Type & NiParticlesData::GetType() const { return TYPE; }; - -const Type & NiParticlesData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPathController.cpp b/src/obj/NiPathController.cpp index ad24c919..09c8b748 100644 --- a/src/obj/NiPathController.cpp +++ b/src/obj/NiPathController.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPathController::TYPE("NiPathController", &NI_PATH_CONTROLLER_PARENT::TypeConst() ); +const Type NiPathController::TYPE("NiPathController", &NI_PATH_CONTROLLER_PARENT::TYPE ); NiPathController::NiPathController() NI_PATH_CONTROLLER_CONSTRUCT {} @@ -52,7 +52,3 @@ Ref<NiPosData> NiPathController::GetPosData() const { void NiPathController::SetPosData( NiPosData * n ) { posData = n; } - -const Type & NiPathController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPathInterpolator.cpp b/src/obj/NiPathInterpolator.cpp index b92c8aca..30d51b4d 100644 --- a/src/obj/NiPathInterpolator.cpp +++ b/src/obj/NiPathInterpolator.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPathInterpolator::TYPE("NiPathInterpolator", &NI_PATH_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiPathInterpolator::TYPE("NiPathInterpolator", &NI_PATH_INTERPOLATOR_PARENT::TYPE ); NiPathInterpolator::NiPathInterpolator() NI_PATH_INTERPOLATOR_CONSTRUCT {} @@ -52,7 +52,3 @@ Ref<NiFloatData > NiPathInterpolator::GetFloatData() const { void NiPathInterpolator::SetFloatData( NiFloatData * value ) { floatData = value; } - -const Type & NiPathInterpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPixelData.cpp b/src/obj/NiPixelData.cpp index 7aadf9bd..c5469bfe 100644 --- a/src/obj/NiPixelData.cpp +++ b/src/obj/NiPixelData.cpp @@ -8,7 +8,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPixelData::TYPE("NiPixelData", &NI_PIXEL_DATA_PARENT::TypeConst() ); +const Type NiPixelData::TYPE("NiPixelData", &NI_PIXEL_DATA_PARENT::TYPE ); NiPixelData::NiPixelData() NI_PIXEL_DATA_CONSTRUCT {} @@ -345,7 +345,3 @@ void NiPixelData::SetColors( const vector<Color4> & new_pixels, bool generate_mi } } } - -const Type & NiPixelData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPlanarCollider.cpp b/src/obj/NiPlanarCollider.cpp index 71a96f61..7023ec8c 100644 --- a/src/obj/NiPlanarCollider.cpp +++ b/src/obj/NiPlanarCollider.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPlanarCollider::TYPE("NiPlanarCollider", &NI_PLANAR_COLLIDER_PARENT::TypeConst() ); +const Type NiPlanarCollider::TYPE("NiPlanarCollider", &NI_PLANAR_COLLIDER_PARENT::TYPE ); NiPlanarCollider::NiPlanarCollider() NI_PLANAR_COLLIDER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiPlanarCollider::GetRefs() const { const Type & NiPlanarCollider::GetType() const { return TYPE; }; - -const Type & NiPlanarCollider::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPoint3Interpolator.cpp b/src/obj/NiPoint3Interpolator.cpp index 7d84fde3..76fecce4 100644 --- a/src/obj/NiPoint3Interpolator.cpp +++ b/src/obj/NiPoint3Interpolator.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPoint3Interpolator::TYPE("NiPoint3Interpolator", &NI_POINT3_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiPoint3Interpolator::TYPE("NiPoint3Interpolator", &NI_POINT3_INTERPOLATOR_PARENT::TYPE ); NiPoint3Interpolator::NiPoint3Interpolator() NI_POINT3_INTERPOLATOR_CONSTRUCT {} @@ -51,7 +51,3 @@ Ref<NiPosData > NiPoint3Interpolator::GetData() const { void NiPoint3Interpolator::SetData( NiPosData * value ) { data = value; } - -const Type & NiPoint3Interpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPointLight.cpp b/src/obj/NiPointLight.cpp index fb711e77..9c724941 100644 --- a/src/obj/NiPointLight.cpp +++ b/src/obj/NiPointLight.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPointLight::TYPE("NiPointLight", &NI_POINT_LIGHT_PARENT::TypeConst() ); +const Type NiPointLight::TYPE("NiPointLight", &NI_POINT_LIGHT_PARENT::TYPE ); NiPointLight::NiPointLight() NI_POINT_LIGHT_CONSTRUCT {} @@ -58,7 +58,3 @@ float NiPointLight::GetQuadraticAttenuation() const { void NiPointLight::SetQuadraticAttenuation( float value ) { quadraticAttenuation = value; } - -const Type & NiPointLight::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiPosData.cpp b/src/obj/NiPosData.cpp index 33e69ab3..7cc31e04 100644 --- a/src/obj/NiPosData.cpp +++ b/src/obj/NiPosData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiPosData::TYPE("NiPosData", &NI_POS_DATA_PARENT::TypeConst() ); +const Type NiPosData::TYPE("NiPosData", &NI_POS_DATA_PARENT::TYPE ); NiPosData::NiPosData() NI_POS_DATA_CONSTRUCT {} @@ -51,7 +51,3 @@ vector< Key<Vector3> > NiPosData::GetKeys() const { void NiPosData::SetKeys( vector< Key<Vector3> > const & keys ) { data.keys = keys; } - -const Type & NiPosData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiProperty.cpp b/src/obj/NiProperty.cpp index e70d314d..d7c23806 100644 --- a/src/obj/NiProperty.cpp +++ b/src/obj/NiProperty.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiProperty::TYPE("NiProperty", &NI_PROPERTY_PARENT::TypeConst() ); +const Type NiProperty::TYPE("NiProperty", &NI_PROPERTY_PARENT::TYPE ); NiProperty::NiProperty() NI_PROPERTY_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiProperty::GetRefs() const { const Type & NiProperty::GetType() const { return TYPE; }; - -const Type & NiProperty::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiRangeLODData.cpp b/src/obj/NiRangeLODData.cpp index f2e6016c..d9906a49 100644 --- a/src/obj/NiRangeLODData.cpp +++ b/src/obj/NiRangeLODData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiRangeLODData::TYPE("NiRangeLODData", &NI_RANGE_L_O_D_DATA_PARENT::TypeConst() ); +const Type NiRangeLODData::TYPE("NiRangeLODData", &NI_RANGE_L_O_D_DATA_PARENT::TYPE ); NiRangeLODData::NiRangeLODData() NI_RANGE_L_O_D_DATA_CONSTRUCT {} @@ -51,7 +51,3 @@ vector<LODRange > NiRangeLODData::GetLODLevels() const { void NiRangeLODData::SetLODLevels( const vector<LODRange >& value ) { lodLevels = value; } - -const Type & NiRangeLODData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiRotatingParticles.cpp b/src/obj/NiRotatingParticles.cpp index 424d46e0..86bfc347 100644 --- a/src/obj/NiRotatingParticles.cpp +++ b/src/obj/NiRotatingParticles.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiRotatingParticles::TYPE("NiRotatingParticles", &NI_ROTATING_PARTICLES_PARENT::TypeConst() ); +const Type NiRotatingParticles::TYPE("NiRotatingParticles", &NI_ROTATING_PARTICLES_PARENT::TYPE ); NiRotatingParticles::NiRotatingParticles() NI_ROTATING_PARTICLES_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiRotatingParticles::GetRefs() const { const Type & NiRotatingParticles::GetType() const { return TYPE; }; - -const Type & NiRotatingParticles::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiRotatingParticlesData.cpp b/src/obj/NiRotatingParticlesData.cpp index 6f4a482b..f31a2c91 100644 --- a/src/obj/NiRotatingParticlesData.cpp +++ b/src/obj/NiRotatingParticlesData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiRotatingParticlesData::TYPE("NiRotatingParticlesData", &NI_ROTATING_PARTICLES_DATA_PARENT::TypeConst() ); +const Type NiRotatingParticlesData::TYPE("NiRotatingParticlesData", &NI_ROTATING_PARTICLES_DATA_PARENT::TYPE ); NiRotatingParticlesData::NiRotatingParticlesData() NI_ROTATING_PARTICLES_DATA_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiRotatingParticlesData::GetRefs() const { const Type & NiRotatingParticlesData::GetType() const { return TYPE; }; - -const Type & NiRotatingParticlesData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiScreenLODData.cpp b/src/obj/NiScreenLODData.cpp index c6982408..b6a0eb98 100644 --- a/src/obj/NiScreenLODData.cpp +++ b/src/obj/NiScreenLODData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiScreenLODData::TYPE("NiScreenLODData", &NI_SCREEN_L_O_D_DATA_PARENT::TypeConst() ); +const Type NiScreenLODData::TYPE("NiScreenLODData", &NI_SCREEN_L_O_D_DATA_PARENT::TYPE ); NiScreenLODData::NiScreenLODData() NI_SCREEN_L_O_D_DATA_CONSTRUCT {} @@ -74,7 +74,3 @@ vector<float > NiScreenLODData::GetProportionLevels() const { void NiScreenLODData::SetProportionLevels( const vector<float >& value ) { proportionLevels = value; } - -const Type & NiScreenLODData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiSequenceStreamHelper.cpp b/src/obj/NiSequenceStreamHelper.cpp index 3976c0f8..add79c34 100644 --- a/src/obj/NiSequenceStreamHelper.cpp +++ b/src/obj/NiSequenceStreamHelper.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiSequenceStreamHelper::TYPE("NiSequenceStreamHelper", &NI_SEQUENCE_STREAM_HELPER_PARENT::TypeConst() ); +const Type NiSequenceStreamHelper::TYPE("NiSequenceStreamHelper", &NI_SEQUENCE_STREAM_HELPER_PARENT::TYPE ); NiSequenceStreamHelper::NiSequenceStreamHelper() NI_SEQUENCE_STREAM_HELPER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiSequenceStreamHelper::GetRefs() const { const Type & NiSequenceStreamHelper::GetType() const { return TYPE; }; - -const Type & NiSequenceStreamHelper::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiShadeProperty.cpp b/src/obj/NiShadeProperty.cpp index aa95e9cf..8e6e3232 100644 --- a/src/obj/NiShadeProperty.cpp +++ b/src/obj/NiShadeProperty.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiShadeProperty::TYPE("NiShadeProperty", &NI_SHADE_PROPERTY_PARENT::TypeConst() ); +const Type NiShadeProperty::TYPE("NiShadeProperty", &NI_SHADE_PROPERTY_PARENT::TYPE ); NiShadeProperty::NiShadeProperty() NI_SHADE_PROPERTY_CONSTRUCT {} @@ -42,7 +42,3 @@ unsigned short NiShadeProperty::GetFlags() const { void NiShadeProperty::SetFlags( unsigned short n ) { flags = n; } - -const Type & NiShadeProperty::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiSingleInterpolatorController.cpp b/src/obj/NiSingleInterpolatorController.cpp index 9d8baffb..f8ddeab0 100644 --- a/src/obj/NiSingleInterpolatorController.cpp +++ b/src/obj/NiSingleInterpolatorController.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiSingleInterpolatorController::TYPE("NiSingleInterpolatorController", &NI_SINGLE_INTERPOLATOR_CONTROLLER_PARENT::TypeConst() ); +const Type NiSingleInterpolatorController::TYPE("NiSingleInterpolatorController", &NI_SINGLE_INTERPOLATOR_CONTROLLER_PARENT::TYPE ); NiSingleInterpolatorController::NiSingleInterpolatorController() NI_SINGLE_INTERPOLATOR_CONTROLLER_CONSTRUCT {} @@ -43,7 +43,3 @@ Ref<NiInterpolator > NiSingleInterpolatorController::GetInterpolator() const { void NiSingleInterpolatorController::SetInterpolator( NiInterpolator * value ) { interpolator = value; } - -const Type & NiSingleInterpolatorController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiSkinData.cpp b/src/obj/NiSkinData.cpp index 7dc4c31a..897417b1 100644 --- a/src/obj/NiSkinData.cpp +++ b/src/obj/NiSkinData.cpp @@ -11,7 +11,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiSkinData::TYPE("NiSkinData", &NI_SKIN_DATA_PARENT::TypeConst() ); +const Type NiSkinData::TYPE("NiSkinData", &NI_SKIN_DATA_PARENT::TYPE ); NiSkinData::NiSkinData() NI_SKIN_DATA_CONSTRUCT {} @@ -170,7 +170,3 @@ Ref<NiSkinPartition> NiSkinData::GetSkinPartition() const { void NiSkinData::SetSkinPartition( NiSkinPartition * value ) { skinPartition = value; } - -const Type & NiSkinData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiSkinInstance.cpp b/src/obj/NiSkinInstance.cpp index cadbcb7e..d4a9bb83 100644 --- a/src/obj/NiSkinInstance.cpp +++ b/src/obj/NiSkinInstance.cpp @@ -9,7 +9,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiSkinInstance::TYPE("NiSkinInstance", &NI_SKIN_INSTANCE_PARENT::TypeConst() ); +const Type NiSkinInstance::TYPE("NiSkinInstance", &NI_SKIN_INSTANCE_PARENT::TYPE ); NiSkinInstance::NiSkinInstance() NI_SKIN_INSTANCE_CONSTRUCT {} @@ -135,7 +135,3 @@ unsigned int NiSkinInstance::GetBoneCount() const { Ref<NiNode> NiSkinInstance::GetSkeletonRoot() const { return skeletonRoot; } - -const Type & NiSkinInstance::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiSkinPartition.cpp b/src/obj/NiSkinPartition.cpp index 4b72f851..c4c59c0a 100644 --- a/src/obj/NiSkinPartition.cpp +++ b/src/obj/NiSkinPartition.cpp @@ -26,7 +26,7 @@ typedef SkinPartition Partition; typedef vector<SkinPartition > PartitionList; //Definition of TYPE constant -const Type NiSkinPartition::TYPE("NiSkinPartition", &NI_SKIN_PARTITION_PARENT::TypeConst() ); +const Type NiSkinPartition::TYPE("NiSkinPartition", &NI_SKIN_PARTITION_PARENT::TYPE ); NiSkinPartition::NiSkinPartition() NI_SKIN_PARTITION_CONSTRUCT {} @@ -715,7 +715,3 @@ NiSkinPartition::NiSkinPartition(Ref<NiTriBasedGeom> shape, int maxBonesPerParti } } } - -const Type & NiSkinPartition::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiSourceTexture.cpp b/src/obj/NiSourceTexture.cpp index 2f0cd858..7e2b3185 100644 --- a/src/obj/NiSourceTexture.cpp +++ b/src/obj/NiSourceTexture.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiSourceTexture::TYPE("NiSourceTexture", &NI_SOURCE_TEXTURE_PARENT::TypeConst() ); +const Type NiSourceTexture::TYPE("NiSourceTexture", &NI_SOURCE_TEXTURE_PARENT::TYPE ); NiSourceTexture::NiSourceTexture() NI_SOURCE_TEXTURE_CONSTRUCT {} @@ -95,7 +95,3 @@ AlphaFormat NiSourceTexture::GetAlphaFormat() const { void NiSourceTexture::SetAlphaFormat( AlphaFormat n ) { alphaFormat = n; } - -const Type & NiSourceTexture::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiSpecularProperty.cpp b/src/obj/NiSpecularProperty.cpp index 35e020a6..29c197f2 100644 --- a/src/obj/NiSpecularProperty.cpp +++ b/src/obj/NiSpecularProperty.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiSpecularProperty::TYPE("NiSpecularProperty", &NI_SPECULAR_PROPERTY_PARENT::TypeConst() ); +const Type NiSpecularProperty::TYPE("NiSpecularProperty", &NI_SPECULAR_PROPERTY_PARENT::TYPE ); NiSpecularProperty::NiSpecularProperty() NI_SPECULAR_PROPERTY_CONSTRUCT {} @@ -42,7 +42,3 @@ unsigned short NiSpecularProperty::GetFlags() const { void NiSpecularProperty::SetFlags( unsigned short n ) { flags = n; } - -const Type & NiSpecularProperty::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiSphericalCollider.cpp b/src/obj/NiSphericalCollider.cpp index d9ff0066..157b92e3 100644 --- a/src/obj/NiSphericalCollider.cpp +++ b/src/obj/NiSphericalCollider.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiSphericalCollider::TYPE("NiSphericalCollider", &NI_SPHERICAL_COLLIDER_PARENT::TypeConst() ); +const Type NiSphericalCollider::TYPE("NiSphericalCollider", &NI_SPHERICAL_COLLIDER_PARENT::TYPE ); NiSphericalCollider::NiSphericalCollider() NI_SPHERICAL_COLLIDER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiSphericalCollider::GetRefs() const { const Type & NiSphericalCollider::GetType() const { return TYPE; }; - -const Type & NiSphericalCollider::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiSpotLight.cpp b/src/obj/NiSpotLight.cpp index 164b9174..5abbc835 100644 --- a/src/obj/NiSpotLight.cpp +++ b/src/obj/NiSpotLight.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiSpotLight::TYPE("NiSpotLight", &NI_SPOT_LIGHT_PARENT::TypeConst() ); +const Type NiSpotLight::TYPE("NiSpotLight", &NI_SPOT_LIGHT_PARENT::TYPE ); NiSpotLight::NiSpotLight() NI_SPOT_LIGHT_CONSTRUCT {} @@ -50,7 +50,3 @@ float NiSpotLight::GetExponent() const { void NiSpotLight::SetExponent( float value ) { exponent = value; } - -const Type & NiSpotLight::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiStencilProperty.cpp b/src/obj/NiStencilProperty.cpp index 86c53e46..fe245bbb 100644 --- a/src/obj/NiStencilProperty.cpp +++ b/src/obj/NiStencilProperty.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiStencilProperty::TYPE("NiStencilProperty", &NI_STENCIL_PROPERTY_PARENT::TypeConst() ); +const Type NiStencilProperty::TYPE("NiStencilProperty", &NI_STENCIL_PROPERTY_PARENT::TYPE ); NiStencilProperty::NiStencilProperty() NI_STENCIL_PROPERTY_CONSTRUCT {} @@ -106,7 +106,3 @@ FaceDrawMode NiStencilProperty::GetFaceDrawMode() const { void NiStencilProperty::SetFaceDrawMode(FaceDrawMode value) { drawMode = value; } - -const Type & NiStencilProperty::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiStringExtraData.cpp b/src/obj/NiStringExtraData.cpp index d2640659..86942535 100644 --- a/src/obj/NiStringExtraData.cpp +++ b/src/obj/NiStringExtraData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiStringExtraData::TYPE("NiStringExtraData", &NI_STRING_EXTRA_DATA_PARENT::TypeConst() ); +const Type NiStringExtraData::TYPE("NiStringExtraData", &NI_STRING_EXTRA_DATA_PARENT::TYPE ); NiStringExtraData::NiStringExtraData() NI_STRING_EXTRA_DATA_CONSTRUCT {} @@ -43,7 +43,3 @@ void NiStringExtraData::SetData( const string & n ) { stringData = n; bytesRemaining = (unsigned int)(stringData.size()) + 4; } - -const Type & NiStringExtraData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiStringPalette.cpp b/src/obj/NiStringPalette.cpp index a513746f..4bc3e0db 100644 --- a/src/obj/NiStringPalette.cpp +++ b/src/obj/NiStringPalette.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiStringPalette::TYPE("NiStringPalette", &NI_STRING_PALETTE_PARENT::TypeConst() ); +const Type NiStringPalette::TYPE("NiStringPalette", &NI_STRING_PALETTE_PARENT::TYPE ); NiStringPalette::NiStringPalette() NI_STRING_PALETTE_CONSTRUCT {} @@ -76,7 +76,3 @@ unsigned int NiStringPalette::AddSubStr( const string & n ) { //Return the offset where the string was found or appended return offset; } - -const Type & NiStringPalette::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiStringsExtraData.cpp b/src/obj/NiStringsExtraData.cpp index 4581ef56..f0dc7768 100644 --- a/src/obj/NiStringsExtraData.cpp +++ b/src/obj/NiStringsExtraData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiStringsExtraData::TYPE("NiStringsExtraData", &NI_STRINGS_EXTRA_DATA_PARENT::TypeConst() ); +const Type NiStringsExtraData::TYPE("NiStringsExtraData", &NI_STRINGS_EXTRA_DATA_PARENT::TYPE ); NiStringsExtraData::NiStringsExtraData() NI_STRINGS_EXTRA_DATA_CONSTRUCT {} @@ -43,7 +43,3 @@ void NiStringsExtraData::SetData( const vector<string> & n ) { numStrings = (unsigned int)(n.size()); data = n; }; - -const Type & NiStringsExtraData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTextKeyExtraData.cpp b/src/obj/NiTextKeyExtraData.cpp index 7a3aefe7..780e1014 100644 --- a/src/obj/NiTextKeyExtraData.cpp +++ b/src/obj/NiTextKeyExtraData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTextKeyExtraData::TYPE("NiTextKeyExtraData", &NI_TEXT_KEY_EXTRA_DATA_PARENT::TypeConst() ); +const Type NiTextKeyExtraData::TYPE("NiTextKeyExtraData", &NI_TEXT_KEY_EXTRA_DATA_PARENT::TYPE ); NiTextKeyExtraData::NiTextKeyExtraData() NI_TEXT_KEY_EXTRA_DATA_CONSTRUCT {} @@ -42,7 +42,3 @@ vector< Key<string> > NiTextKeyExtraData::GetKeys() const { void NiTextKeyExtraData::SetKeys( vector< Key<string> > const & keys ) { textKeys = keys; } - -const Type & NiTextKeyExtraData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTextureEffect.cpp b/src/obj/NiTextureEffect.cpp index 83556339..9bf7a2e3 100644 --- a/src/obj/NiTextureEffect.cpp +++ b/src/obj/NiTextureEffect.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTextureEffect::TYPE("NiTextureEffect", &NI_TEXTURE_EFFECT_PARENT::TypeConst() ); +const Type NiTextureEffect::TYPE("NiTextureEffect", &NI_TEXTURE_EFFECT_PARENT::TYPE ); NiTextureEffect::NiTextureEffect() NI_TEXTURE_EFFECT_CONSTRUCT {} @@ -115,7 +115,3 @@ unsigned short NiTextureEffect::GetPs2K() const { void NiTextureEffect::SetPs2K( unsigned short value ) { ps2K = value; } - -const Type & NiTextureEffect::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTextureModeProperty.cpp b/src/obj/NiTextureModeProperty.cpp index 77b098ce..cc3ceb0e 100644 --- a/src/obj/NiTextureModeProperty.cpp +++ b/src/obj/NiTextureModeProperty.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTextureModeProperty::TYPE("NiTextureModeProperty", &NI_TEXTURE_MODE_PROPERTY_PARENT::TypeConst() ); +const Type NiTextureModeProperty::TYPE("NiTextureModeProperty", &NI_TEXTURE_MODE_PROPERTY_PARENT::TYPE ); NiTextureModeProperty::NiTextureModeProperty() NI_TEXTURE_MODE_PROPERTY_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiTextureModeProperty::GetRefs() const { const Type & NiTextureModeProperty::GetType() const { return TYPE; }; - -const Type & NiTextureModeProperty::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTextureProperty.cpp b/src/obj/NiTextureProperty.cpp index d7281507..e090cf5f 100644 --- a/src/obj/NiTextureProperty.cpp +++ b/src/obj/NiTextureProperty.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTextureProperty::TYPE("NiTextureProperty", &NI_TEXTURE_PROPERTY_PARENT::TypeConst() ); +const Type NiTextureProperty::TYPE("NiTextureProperty", &NI_TEXTURE_PROPERTY_PARENT::TYPE ); NiTextureProperty::NiTextureProperty() NI_TEXTURE_PROPERTY_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiTextureProperty::GetRefs() const { const Type & NiTextureProperty::GetType() const { return TYPE; }; - -const Type & NiTextureProperty::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTextureTransformController.cpp b/src/obj/NiTextureTransformController.cpp index fd4382db..62d5eb71 100644 --- a/src/obj/NiTextureTransformController.cpp +++ b/src/obj/NiTextureTransformController.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTextureTransformController::TYPE("NiTextureTransformController", &NI_TEXTURE_TRANSFORM_CONTROLLER_PARENT::TypeConst() ); +const Type NiTextureTransformController::TYPE("NiTextureTransformController", &NI_TEXTURE_TRANSFORM_CONTROLLER_PARENT::TYPE ); NiTextureTransformController::NiTextureTransformController() NI_TEXTURE_TRANSFORM_CONTROLLER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiTextureTransformController::GetRefs() const { const Type & NiTextureTransformController::GetType() const { return TYPE; }; - -const Type & NiTextureTransformController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTexturingProperty.cpp b/src/obj/NiTexturingProperty.cpp index a8a588b1..3e3f1619 100644 --- a/src/obj/NiTexturingProperty.cpp +++ b/src/obj/NiTexturingProperty.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTexturingProperty::TYPE("NiTexturingProperty", &NI_TEXTURING_PROPERTY_PARENT::TypeConst() ); +const Type NiTexturingProperty::TYPE("NiTexturingProperty", &NI_TEXTURING_PROPERTY_PARENT::TYPE ); NiTexturingProperty::NiTexturingProperty() NI_TEXTURING_PROPERTY_CONSTRUCT {} @@ -245,7 +245,3 @@ void NiTexturingProperty::ClearTexture( int n ) { break; }; } - -const Type & NiTexturingProperty::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTimeController.cpp b/src/obj/NiTimeController.cpp index 5d580c2f..7f3e4235 100644 --- a/src/obj/NiTimeController.cpp +++ b/src/obj/NiTimeController.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTimeController::TYPE("NiTimeController", &NI_TIME_CONTROLLER_PARENT::TypeConst() ); +const Type NiTimeController::TYPE("NiTimeController", &NI_TIME_CONTROLLER_PARENT::TYPE ); NiTimeController::NiTimeController() NI_TIME_CONTROLLER_CONSTRUCT {} @@ -91,7 +91,3 @@ float NiTimeController::GetStopTime() const { void NiTimeController::SetStopTime( float n ) { stopTime = n; } - -const Type & NiTimeController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTransformController.cpp b/src/obj/NiTransformController.cpp index 742b31d1..eeec9b0c 100644 --- a/src/obj/NiTransformController.cpp +++ b/src/obj/NiTransformController.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTransformController::TYPE("NiTransformController", &NI_TRANSFORM_CONTROLLER_PARENT::TypeConst() ); +const Type NiTransformController::TYPE("NiTransformController", &NI_TRANSFORM_CONTROLLER_PARENT::TYPE ); NiTransformController::NiTransformController() NI_TRANSFORM_CONTROLLER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiTransformController::GetRefs() const { const Type & NiTransformController::GetType() const { return TYPE; }; - -const Type & NiTransformController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTransformData.cpp b/src/obj/NiTransformData.cpp index e6f56314..cb360d51 100644 --- a/src/obj/NiTransformData.cpp +++ b/src/obj/NiTransformData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTransformData::TYPE("NiTransformData", &NI_TRANSFORM_DATA_PARENT::TypeConst() ); +const Type NiTransformData::TYPE("NiTransformData", &NI_TRANSFORM_DATA_PARENT::TYPE ); NiTransformData::NiTransformData() NI_TRANSFORM_DATA_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiTransformData::GetRefs() const { const Type & NiTransformData::GetType() const { return TYPE; }; - -const Type & NiTransformData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTransformInterpolator.cpp b/src/obj/NiTransformInterpolator.cpp index 79f4694f..cd5a1826 100644 --- a/src/obj/NiTransformInterpolator.cpp +++ b/src/obj/NiTransformInterpolator.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTransformInterpolator::TYPE("NiTransformInterpolator", &NI_TRANSFORM_INTERPOLATOR_PARENT::TypeConst() ); +const Type NiTransformInterpolator::TYPE("NiTransformInterpolator", &NI_TRANSFORM_INTERPOLATOR_PARENT::TYPE ); NiTransformInterpolator::NiTransformInterpolator() NI_TRANSFORM_INTERPOLATOR_CONSTRUCT {} @@ -67,7 +67,3 @@ Ref<NiTransformData> NiTransformInterpolator::GetData() const { void NiTransformInterpolator::SetData( NiTransformData * value ) { data = value; } - -const Type & NiTransformInterpolator::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTriBasedGeom.cpp b/src/obj/NiTriBasedGeom.cpp index 8a217ace..95fb041f 100644 --- a/src/obj/NiTriBasedGeom.cpp +++ b/src/obj/NiTriBasedGeom.cpp @@ -12,7 +12,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTriBasedGeom::TYPE("NiTriBasedGeom", &NI_TRI_BASED_GEOM_PARENT::TypeConst() ); +const Type NiTriBasedGeom::TYPE("NiTriBasedGeom", &NI_TRI_BASED_GEOM_PARENT::TYPE ); NiTriBasedGeom::NiTriBasedGeom() NI_TRI_BASED_GEOM_CONSTRUCT {} @@ -230,7 +230,3 @@ void NiTriBasedGeom::UpdateTangentSpace() { TSpaceRef->SetData(binData); } - -const Type & NiTriBasedGeom::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTriBasedGeomData.cpp b/src/obj/NiTriBasedGeomData.cpp index 2cf8317a..f0136aec 100644 --- a/src/obj/NiTriBasedGeomData.cpp +++ b/src/obj/NiTriBasedGeomData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTriBasedGeomData::TYPE("NiTriBasedGeomData", &NI_TRI_BASED_GEOM_DATA_PARENT::TypeConst() ); +const Type NiTriBasedGeomData::TYPE("NiTriBasedGeomData", &NI_TRI_BASED_GEOM_DATA_PARENT::TYPE ); NiTriBasedGeomData::NiTriBasedGeomData() NI_TRI_BASED_GEOM_DATA_CONSTRUCT {} @@ -43,7 +43,3 @@ void NiTriBasedGeomData::SetTriangles( const vector<Triangle> & in ) { vector<Triangle> NiTriBasedGeomData::GetTriangles() const { return vector<Triangle>(); } - -const Type & NiTriBasedGeomData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTriShape.cpp b/src/obj/NiTriShape.cpp index 42744c1a..203f53f7 100644 --- a/src/obj/NiTriShape.cpp +++ b/src/obj/NiTriShape.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTriShape::TYPE("NiTriShape", &NI_TRI_SHAPE_PARENT::TypeConst() ); +const Type NiTriShape::TYPE("NiTriShape", &NI_TRI_SHAPE_PARENT::TYPE ); NiTriShape::NiTriShape() NI_TRI_SHAPE_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiTriShape::GetRefs() const { const Type & NiTriShape::GetType() const { return TYPE; }; - -const Type & NiTriShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTriShapeData.cpp b/src/obj/NiTriShapeData.cpp index 4cdba1d3..ff91cf5a 100644 --- a/src/obj/NiTriShapeData.cpp +++ b/src/obj/NiTriShapeData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTriShapeData::TYPE("NiTriShapeData", &NI_TRI_SHAPE_DATA_PARENT::TypeConst() ); +const Type NiTriShapeData::TYPE("NiTriShapeData", &NI_TRI_SHAPE_DATA_PARENT::TYPE ); NiTriShapeData::NiTriShapeData() NI_TRI_SHAPE_DATA_CONSTRUCT {} @@ -92,7 +92,3 @@ void NiTriShapeData::SetTriangles( const vector<Triangle> & in ) { //Set number of trianble points to the number of triangles times 3 numTrianglePoints = numTriangles * 3; } - -const Type & NiTriShapeData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTriStrips.cpp b/src/obj/NiTriStrips.cpp index 582dba11..e7821391 100644 --- a/src/obj/NiTriStrips.cpp +++ b/src/obj/NiTriStrips.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiTriStrips::TYPE("NiTriStrips", &NI_TRI_STRIPS_PARENT::TypeConst() ); +const Type NiTriStrips::TYPE("NiTriStrips", &NI_TRI_STRIPS_PARENT::TYPE ); NiTriStrips::NiTriStrips() NI_TRI_STRIPS_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiTriStrips::GetRefs() const { const Type & NiTriStrips::GetType() const { return TYPE; }; - -const Type & NiTriStrips::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiTriStripsData.cpp b/src/obj/NiTriStripsData.cpp index cd5051e1..c653ad42 100644 --- a/src/obj/NiTriStripsData.cpp +++ b/src/obj/NiTriStripsData.cpp @@ -15,7 +15,7 @@ typedef list<TriStrip> TriStrips; //Definition of TYPE constant -const Type NiTriStripsData::TYPE("NiTriStripsData", &NI_TRI_STRIPS_DATA_PARENT::TypeConst() ); +const Type NiTriStripsData::TYPE("NiTriStripsData", &NI_TRI_STRIPS_DATA_PARENT::TYPE ); NiTriStripsData::NiTriStripsData() NI_TRI_STRIPS_DATA_CONSTRUCT {} @@ -267,7 +267,3 @@ void NiTriStripsData::SetTSTriangles( const vector<Triangle> & in ) { //Recalculate Triangle Count numTriangles = CalcTriangleCount(); } - -const Type & NiTriStripsData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiUVController.cpp b/src/obj/NiUVController.cpp index d9d1df80..99af5f09 100644 --- a/src/obj/NiUVController.cpp +++ b/src/obj/NiUVController.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiUVController::TYPE("NiUVController", &NI_U_V_CONTROLLER_PARENT::TypeConst() ); +const Type NiUVController::TYPE("NiUVController", &NI_U_V_CONTROLLER_PARENT::TYPE ); NiUVController::NiUVController() NI_U_V_CONTROLLER_CONSTRUCT {} @@ -43,7 +43,3 @@ Ref<NiUVData> NiUVController::GetData() const { void NiUVController::SetData( NiUVData * n ) { data = n; } - -const Type & NiUVController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiUVData.cpp b/src/obj/NiUVData.cpp index 4c83a476..6ac41393 100644 --- a/src/obj/NiUVData.cpp +++ b/src/obj/NiUVData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiUVData::TYPE("NiUVData", &NI_U_V_DATA_PARENT::TypeConst() ); +const Type NiUVData::TYPE("NiUVData", &NI_U_V_DATA_PARENT::TYPE ); NiUVData::NiUVData() NI_U_V_DATA_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiUVData::GetRefs() const { const Type & NiUVData::GetType() const { return TYPE; }; - -const Type & NiUVData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiVectorExtraData.cpp b/src/obj/NiVectorExtraData.cpp index 4d6526b6..f0e81827 100644 --- a/src/obj/NiVectorExtraData.cpp +++ b/src/obj/NiVectorExtraData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiVectorExtraData::TYPE("NiVectorExtraData", &NI_VECTOR_EXTRA_DATA_PARENT::TypeConst() ); +const Type NiVectorExtraData::TYPE("NiVectorExtraData", &NI_VECTOR_EXTRA_DATA_PARENT::TYPE ); NiVectorExtraData::NiVectorExtraData() NI_VECTOR_EXTRA_DATA_CONSTRUCT {} @@ -42,7 +42,3 @@ Vector3 NiVectorExtraData::GetData() const { void NiVectorExtraData::SetData( const Vector3 & n ) { vectorData = n; }; - -const Type & NiVectorExtraData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiVertWeightsExtraData.cpp b/src/obj/NiVertWeightsExtraData.cpp index 29bc214b..9459f331 100644 --- a/src/obj/NiVertWeightsExtraData.cpp +++ b/src/obj/NiVertWeightsExtraData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiVertWeightsExtraData::TYPE("NiVertWeightsExtraData", &NI_VERT_WEIGHTS_EXTRA_DATA_PARENT::TypeConst() ); +const Type NiVertWeightsExtraData::TYPE("NiVertWeightsExtraData", &NI_VERT_WEIGHTS_EXTRA_DATA_PARENT::TYPE ); NiVertWeightsExtraData::NiVertWeightsExtraData() NI_VERT_WEIGHTS_EXTRA_DATA_CONSTRUCT {} @@ -44,7 +44,3 @@ void NiVertWeightsExtraData::SetData( const vector<float> & n ) { numBytes = numVertices + 2; weight = n; } - -const Type & NiVertWeightsExtraData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiVertexColorProperty.cpp b/src/obj/NiVertexColorProperty.cpp index bb774889..f209e5fd 100644 --- a/src/obj/NiVertexColorProperty.cpp +++ b/src/obj/NiVertexColorProperty.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiVertexColorProperty::TYPE("NiVertexColorProperty", &NI_VERTEX_COLOR_PROPERTY_PARENT::TypeConst() ); +const Type NiVertexColorProperty::TYPE("NiVertexColorProperty", &NI_VERTEX_COLOR_PROPERTY_PARENT::TYPE ); NiVertexColorProperty::NiVertexColorProperty() NI_VERTEX_COLOR_PROPERTY_CONSTRUCT {} @@ -58,7 +58,3 @@ LightMode NiVertexColorProperty::GetLightingMode() const { void NiVertexColorProperty::SetLightingMode(LightMode value) { lightingMode = value; } - -const Type & NiVertexColorProperty::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiVisController.cpp b/src/obj/NiVisController.cpp index fdd4c95a..7b8b3001 100644 --- a/src/obj/NiVisController.cpp +++ b/src/obj/NiVisController.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiVisController::TYPE("NiVisController", &NI_VIS_CONTROLLER_PARENT::TypeConst() ); +const Type NiVisController::TYPE("NiVisController", &NI_VIS_CONTROLLER_PARENT::TYPE ); NiVisController::NiVisController() NI_VIS_CONTROLLER_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> NiVisController::GetRefs() const { const Type & NiVisController::GetType() const { return TYPE; }; - -const Type & NiVisController::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiVisData.cpp b/src/obj/NiVisData.cpp index 963ce87c..6052f99f 100644 --- a/src/obj/NiVisData.cpp +++ b/src/obj/NiVisData.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiVisData::TYPE("NiVisData", &NI_VIS_DATA_PARENT::TypeConst() ); +const Type NiVisData::TYPE("NiVisData", &NI_VIS_DATA_PARENT::TYPE ); NiVisData::NiVisData() NI_VIS_DATA_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> NiVisData::GetRefs() const { const Type & NiVisData::GetType() const { return TYPE; }; - -const Type & NiVisData::TypeConst() { - return TYPE; -} diff --git a/src/obj/NiWireframeProperty.cpp b/src/obj/NiWireframeProperty.cpp index 33ee8f19..08bba7ce 100644 --- a/src/obj/NiWireframeProperty.cpp +++ b/src/obj/NiWireframeProperty.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiWireframeProperty::TYPE("NiWireframeProperty", &NI_WIREFRAME_PROPERTY_PARENT::TypeConst() ); +const Type NiWireframeProperty::TYPE("NiWireframeProperty", &NI_WIREFRAME_PROPERTY_PARENT::TYPE ); NiWireframeProperty::NiWireframeProperty() NI_WIREFRAME_PROPERTY_CONSTRUCT {} @@ -42,8 +42,3 @@ unsigned short NiWireframeProperty::GetFlags() const { void NiWireframeProperty::SetFlags(unsigned short value) { flags = value; } - -const Type & NiWireframeProperty::TypeConst() { - return TYPE; -} - diff --git a/src/obj/NiZBufferProperty.cpp b/src/obj/NiZBufferProperty.cpp index 700e294d..0bdcfa68 100644 --- a/src/obj/NiZBufferProperty.cpp +++ b/src/obj/NiZBufferProperty.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type NiZBufferProperty::TYPE("NiZBufferProperty", &NI_Z_BUFFER_PROPERTY_PARENT::TypeConst() ); +const Type NiZBufferProperty::TYPE("NiZBufferProperty", &NI_Z_BUFFER_PROPERTY_PARENT::TYPE ); NiZBufferProperty::NiZBufferProperty() NI_Z_BUFFER_PROPERTY_CONSTRUCT {} @@ -50,7 +50,3 @@ CompareMode NiZBufferProperty::GetDepthFunction() const { void NiZBufferProperty::SetDepthFunction(CompareMode value) { function = value; } - -const Type & NiZBufferProperty::TypeConst() { - return TYPE; -} diff --git a/src/obj/RootCollisionNode.cpp b/src/obj/RootCollisionNode.cpp index 3efffc98..ab9e2fdb 100644 --- a/src/obj/RootCollisionNode.cpp +++ b/src/obj/RootCollisionNode.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type RootCollisionNode::TYPE("RootCollisionNode", &ROOT_COLLISION_NODE_PARENT::TypeConst() ); +const Type RootCollisionNode::TYPE("RootCollisionNode", &ROOT_COLLISION_NODE_PARENT::TYPE ); RootCollisionNode::RootCollisionNode() ROOT_COLLISION_NODE_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> RootCollisionNode::GetRefs() const { const Type & RootCollisionNode::GetType() const { return TYPE; }; - -const Type & RootCollisionNode::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkBlendCollisionObject.cpp b/src/obj/bhkBlendCollisionObject.cpp index b6881e6e..1e4c827b 100644 --- a/src/obj/bhkBlendCollisionObject.cpp +++ b/src/obj/bhkBlendCollisionObject.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkBlendCollisionObject::TYPE("bhkBlendCollisionObject", &BHK_BLEND_COLLISION_OBJECT_PARENT::TypeConst() ); +const Type bhkBlendCollisionObject::TYPE("bhkBlendCollisionObject", &BHK_BLEND_COLLISION_OBJECT_PARENT::TYPE ); bhkBlendCollisionObject::bhkBlendCollisionObject() BHK_BLEND_COLLISION_OBJECT_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkBlendCollisionObject::GetRefs() const { const Type & bhkBlendCollisionObject::GetType() const { return TYPE; }; - -const Type & bhkBlendCollisionObject::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkBlendController.cpp b/src/obj/bhkBlendController.cpp index f224d66a..4a9513f7 100644 --- a/src/obj/bhkBlendController.cpp +++ b/src/obj/bhkBlendController.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkBlendController::TYPE("bhkBlendController", &BHK_BLEND_CONTROLLER_PARENT::TypeConst() ); +const Type bhkBlendController::TYPE("bhkBlendController", &BHK_BLEND_CONTROLLER_PARENT::TYPE ); bhkBlendController::bhkBlendController() BHK_BLEND_CONTROLLER_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkBlendController::GetRefs() const { const Type & bhkBlendController::GetType() const { return TYPE; }; - -const Type & bhkBlendController::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkBoxShape.cpp b/src/obj/bhkBoxShape.cpp index ceabc9ad..23bc0c1e 100644 --- a/src/obj/bhkBoxShape.cpp +++ b/src/obj/bhkBoxShape.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkBoxShape::TYPE("bhkBoxShape", &BHK_BOX_SHAPE_PARENT::TypeConst() ); +const Type bhkBoxShape::TYPE("bhkBoxShape", &BHK_BOX_SHAPE_PARENT::TYPE ); bhkBoxShape::bhkBoxShape() BHK_BOX_SHAPE_CONSTRUCT {} @@ -42,7 +42,3 @@ Vector3 bhkBoxShape::GetDimensions() const { void bhkBoxShape::SetDimensions(const Vector3 &value) { dimensions = value; } - -const Type & bhkBoxShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkCapsuleShape.cpp b/src/obj/bhkCapsuleShape.cpp index 5fc48018..bf4c62e3 100644 --- a/src/obj/bhkCapsuleShape.cpp +++ b/src/obj/bhkCapsuleShape.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkCapsuleShape::TYPE("bhkCapsuleShape", &BHK_CAPSULE_SHAPE_PARENT::TypeConst() ); +const Type bhkCapsuleShape::TYPE("bhkCapsuleShape", &BHK_CAPSULE_SHAPE_PARENT::TYPE ); bhkCapsuleShape::bhkCapsuleShape() BHK_CAPSULE_SHAPE_CONSTRUCT {} @@ -74,7 +74,3 @@ float bhkCapsuleShape::GetRadius2() const { void bhkCapsuleShape::SetRadius2( float value ) { radius2 = value; } - -const Type & bhkCapsuleShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkCollisionObject.cpp b/src/obj/bhkCollisionObject.cpp index 47808747..080fcfe4 100644 --- a/src/obj/bhkCollisionObject.cpp +++ b/src/obj/bhkCollisionObject.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkCollisionObject::TYPE("bhkCollisionObject", &BHK_COLLISION_OBJECT_PARENT::TypeConst() ); +const Type bhkCollisionObject::TYPE("bhkCollisionObject", &BHK_COLLISION_OBJECT_PARENT::TYPE ); bhkCollisionObject::bhkCollisionObject() BHK_COLLISION_OBJECT_CONSTRUCT {} @@ -37,7 +37,3 @@ list<NiObjectRef> bhkCollisionObject::GetRefs() const { const Type & bhkCollisionObject::GetType() const { return TYPE; }; - -const Type & bhkCollisionObject::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkConvexShape.cpp b/src/obj/bhkConvexShape.cpp index bfd811a1..a57db828 100644 --- a/src/obj/bhkConvexShape.cpp +++ b/src/obj/bhkConvexShape.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkConvexShape::TYPE("bhkConvexShape", &BHK_CONVEX_SHAPE_PARENT::TypeConst() ); +const Type bhkConvexShape::TYPE("bhkConvexShape", &BHK_CONVEX_SHAPE_PARENT::TYPE ); bhkConvexShape::bhkConvexShape() BHK_CONVEX_SHAPE_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkConvexShape::GetRefs() const { const Type & bhkConvexShape::GetType() const { return TYPE; }; - -const Type & bhkConvexShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkConvexTransformShape.cpp b/src/obj/bhkConvexTransformShape.cpp index 9581d2c8..3ade18e9 100644 --- a/src/obj/bhkConvexTransformShape.cpp +++ b/src/obj/bhkConvexTransformShape.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkConvexTransformShape::TYPE("bhkConvexTransformShape", &BHK_CONVEX_TRANSFORM_SHAPE_PARENT::TypeConst() ); +const Type bhkConvexTransformShape::TYPE("bhkConvexTransformShape", &BHK_CONVEX_TRANSFORM_SHAPE_PARENT::TYPE ); bhkConvexTransformShape::bhkConvexTransformShape() BHK_CONVEX_TRANSFORM_SHAPE_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkConvexTransformShape::GetRefs() const { const Type & bhkConvexTransformShape::GetType() const { return TYPE; }; - -const Type & bhkConvexTransformShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkConvexVerticesShape.cpp b/src/obj/bhkConvexVerticesShape.cpp index 25f84aa0..63b17f3e 100644 --- a/src/obj/bhkConvexVerticesShape.cpp +++ b/src/obj/bhkConvexVerticesShape.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkConvexVerticesShape::TYPE("bhkConvexVerticesShape", &BHK_CONVEX_VERTICES_SHAPE_PARENT::TypeConst() ); +const Type bhkConvexVerticesShape::TYPE("bhkConvexVerticesShape", &BHK_CONVEX_VERTICES_SHAPE_PARENT::TYPE ); bhkConvexVerticesShape::bhkConvexVerticesShape() BHK_CONVEX_VERTICES_SHAPE_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkConvexVerticesShape::GetRefs() const { const Type & bhkConvexVerticesShape::GetType() const { return TYPE; }; - -const Type & bhkConvexVerticesShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkEntity.cpp b/src/obj/bhkEntity.cpp index 17c113eb..cf1a9998 100644 --- a/src/obj/bhkEntity.cpp +++ b/src/obj/bhkEntity.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkEntity::TYPE("bhkEntity", &BHK_ENTITY_PARENT::TypeConst() ); +const Type bhkEntity::TYPE("bhkEntity", &BHK_ENTITY_PARENT::TYPE ); bhkEntity::bhkEntity() BHK_ENTITY_CONSTRUCT {} @@ -51,7 +51,3 @@ OblivionLayer bhkEntity::GetLayer() const { void bhkEntity::SetLayer( OblivionLayer value ) { layer = value; } - -const Type & bhkEntity::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkHingeConstraint.cpp b/src/obj/bhkHingeConstraint.cpp index b0ed22c8..5a04981e 100644 --- a/src/obj/bhkHingeConstraint.cpp +++ b/src/obj/bhkHingeConstraint.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkHingeConstraint::TYPE("bhkHingeConstraint", &BHK_HINGE_CONSTRAINT_PARENT::TypeConst() ); +const Type bhkHingeConstraint::TYPE("bhkHingeConstraint", &BHK_HINGE_CONSTRAINT_PARENT::TYPE ); bhkHingeConstraint::bhkHingeConstraint() BHK_HINGE_CONSTRAINT_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkHingeConstraint::GetRefs() const { const Type & bhkHingeConstraint::GetType() const { return TYPE; }; - -const Type & bhkHingeConstraint::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkLimitedHingeConstraint.cpp b/src/obj/bhkLimitedHingeConstraint.cpp index 94d40ad7..a1b930bb 100644 --- a/src/obj/bhkLimitedHingeConstraint.cpp +++ b/src/obj/bhkLimitedHingeConstraint.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkLimitedHingeConstraint::TYPE("bhkLimitedHingeConstraint", &BHK_LIMITED_HINGE_CONSTRAINT_PARENT::TypeConst() ); +const Type bhkLimitedHingeConstraint::TYPE("bhkLimitedHingeConstraint", &BHK_LIMITED_HINGE_CONSTRAINT_PARENT::TYPE ); bhkLimitedHingeConstraint::bhkLimitedHingeConstraint() BHK_LIMITED_HINGE_CONSTRAINT_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> bhkLimitedHingeConstraint::GetRefs() const { const Type & bhkLimitedHingeConstraint::GetType() const { return TYPE; }; - -const Type & bhkLimitedHingeConstraint::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkListShape.cpp b/src/obj/bhkListShape.cpp index 45844e8c..693376c7 100644 --- a/src/obj/bhkListShape.cpp +++ b/src/obj/bhkListShape.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkListShape::TYPE("bhkListShape", &BHK_LIST_SHAPE_PARENT::TypeConst() ); +const Type bhkListShape::TYPE("bhkListShape", &BHK_LIST_SHAPE_PARENT::TYPE ); bhkListShape::bhkListShape() BHK_LIST_SHAPE_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> bhkListShape::GetRefs() const { const Type & bhkListShape::GetType() const { return TYPE; }; - -const Type & bhkListShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkMalleableConstraint.cpp b/src/obj/bhkMalleableConstraint.cpp index 9b644671..14d60a26 100644 --- a/src/obj/bhkMalleableConstraint.cpp +++ b/src/obj/bhkMalleableConstraint.cpp @@ -8,7 +8,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkMalleableConstraint::TYPE("bhkMalleableConstraint", &BHK_MALLEABLE_CONSTRAINT_PARENT::TypeConst() ); +const Type bhkMalleableConstraint::TYPE("bhkMalleableConstraint", &BHK_MALLEABLE_CONSTRAINT_PARENT::TYPE ); bhkMalleableConstraint::bhkMalleableConstraint() BHK_MALLEABLE_CONSTRAINT_CONSTRUCT {} @@ -37,7 +37,3 @@ list<NiObjectRef> bhkMalleableConstraint::GetRefs() const { const Type & bhkMalleableConstraint::GetType() const { return TYPE; }; - -const Type & bhkMalleableConstraint::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkMoppBvTreeShape.cpp b/src/obj/bhkMoppBvTreeShape.cpp index ae8ee96b..1b9a286e 100644 --- a/src/obj/bhkMoppBvTreeShape.cpp +++ b/src/obj/bhkMoppBvTreeShape.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkMoppBvTreeShape::TYPE("bhkMoppBvTreeShape", &BHK_MOPP_BV_TREE_SHAPE_PARENT::TypeConst() ); +const Type bhkMoppBvTreeShape::TYPE("bhkMoppBvTreeShape", &BHK_MOPP_BV_TREE_SHAPE_PARENT::TYPE ); bhkMoppBvTreeShape::bhkMoppBvTreeShape() BHK_MOPP_BV_TREE_SHAPE_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> bhkMoppBvTreeShape::GetRefs() const { const Type & bhkMoppBvTreeShape::GetType() const { return TYPE; }; - -const Type & bhkMoppBvTreeShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkMultiSphereShape.cpp b/src/obj/bhkMultiSphereShape.cpp index 4e6492e4..7f874f23 100644 --- a/src/obj/bhkMultiSphereShape.cpp +++ b/src/obj/bhkMultiSphereShape.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkMultiSphereShape::TYPE("bhkMultiSphereShape", &BHK_MULTI_SPHERE_SHAPE_PARENT::TypeConst() ); +const Type bhkMultiSphereShape::TYPE("bhkMultiSphereShape", &BHK_MULTI_SPHERE_SHAPE_PARENT::TYPE ); bhkMultiSphereShape::bhkMultiSphereShape() BHK_MULTI_SPHERE_SHAPE_CONSTRUCT {} @@ -43,7 +43,3 @@ vector<Sphere > bhkMultiSphereShape::GetSpheres() const { void bhkMultiSphereShape::SetSpheres( const vector<Sphere >& value ) { spheres = value; } - -const Type & bhkMultiSphereShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkNiTriStripsShape.cpp b/src/obj/bhkNiTriStripsShape.cpp index 55d4ddea..bd0ecb1e 100644 --- a/src/obj/bhkNiTriStripsShape.cpp +++ b/src/obj/bhkNiTriStripsShape.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkNiTriStripsShape::TYPE("bhkNiTriStripsShape", &BHK_NI_TRI_STRIPS_SHAPE_PARENT::TypeConst() ); +const Type bhkNiTriStripsShape::TYPE("bhkNiTriStripsShape", &BHK_NI_TRI_STRIPS_SHAPE_PARENT::TYPE ); bhkNiTriStripsShape::bhkNiTriStripsShape() BHK_NI_TRI_STRIPS_SHAPE_CONSTRUCT {} @@ -61,7 +61,3 @@ Vector3 bhkNiTriStripsShape::GetScale() const { void bhkNiTriStripsShape::SetScale( const Vector3 & n ) { scale = n; } - -const Type & bhkNiTriStripsShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkPackedNiTriStripsShape.cpp b/src/obj/bhkPackedNiTriStripsShape.cpp index e1b01672..94872df3 100644 --- a/src/obj/bhkPackedNiTriStripsShape.cpp +++ b/src/obj/bhkPackedNiTriStripsShape.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkPackedNiTriStripsShape::TYPE("bhkPackedNiTriStripsShape", &BHK_PACKED_NI_TRI_STRIPS_SHAPE_PARENT::TypeConst() ); +const Type bhkPackedNiTriStripsShape::TYPE("bhkPackedNiTriStripsShape", &BHK_PACKED_NI_TRI_STRIPS_SHAPE_PARENT::TYPE ); bhkPackedNiTriStripsShape::bhkPackedNiTriStripsShape() BHK_PACKED_NI_TRI_STRIPS_SHAPE_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> bhkPackedNiTriStripsShape::GetRefs() const { const Type & bhkPackedNiTriStripsShape::GetType() const { return TYPE; }; - -const Type & bhkPackedNiTriStripsShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkPrismaticConstraint.cpp b/src/obj/bhkPrismaticConstraint.cpp index 871b9195..aa861511 100644 --- a/src/obj/bhkPrismaticConstraint.cpp +++ b/src/obj/bhkPrismaticConstraint.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkPrismaticConstraint::TYPE("bhkPrismaticConstraint", &BHK_PRISMATIC_CONSTRAINT_PARENT::TypeConst() ); +const Type bhkPrismaticConstraint::TYPE("bhkPrismaticConstraint", &BHK_PRISMATIC_CONSTRAINT_PARENT::TYPE ); bhkPrismaticConstraint::bhkPrismaticConstraint() BHK_PRISMATIC_CONSTRAINT_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkPrismaticConstraint::GetRefs() const { const Type & bhkPrismaticConstraint::GetType() const { return TYPE; }; - -const Type & bhkPrismaticConstraint::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkRagdollConstraint.cpp b/src/obj/bhkRagdollConstraint.cpp index e0122151..3575fd98 100644 --- a/src/obj/bhkRagdollConstraint.cpp +++ b/src/obj/bhkRagdollConstraint.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkRagdollConstraint::TYPE("bhkRagdollConstraint", &BHK_RAGDOLL_CONSTRAINT_PARENT::TypeConst() ); +const Type bhkRagdollConstraint::TYPE("bhkRagdollConstraint", &BHK_RAGDOLL_CONSTRAINT_PARENT::TYPE ); bhkRagdollConstraint::bhkRagdollConstraint() BHK_RAGDOLL_CONSTRAINT_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkRagdollConstraint::GetRefs() const { const Type & bhkRagdollConstraint::GetType() const { return TYPE; }; - -const Type & bhkRagdollConstraint::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkRefObject.cpp b/src/obj/bhkRefObject.cpp index 7e6ca99a..c70a0ce8 100644 --- a/src/obj/bhkRefObject.cpp +++ b/src/obj/bhkRefObject.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkRefObject::TYPE("bhkRefObject", &BHK_REF_OBJECT_PARENT::TypeConst() ); +const Type bhkRefObject::TYPE("bhkRefObject", &BHK_REF_OBJECT_PARENT::TYPE ); bhkRefObject::bhkRefObject() BHK_REF_OBJECT_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkRefObject::GetRefs() const { const Type & bhkRefObject::GetType() const { return TYPE; }; - -const Type & bhkRefObject::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkRigidBody.cpp b/src/obj/bhkRigidBody.cpp index bd783078..9e656ed0 100644 --- a/src/obj/bhkRigidBody.cpp +++ b/src/obj/bhkRigidBody.cpp @@ -7,7 +7,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkRigidBody::TYPE("bhkRigidBody", &BHK_RIGID_BODY_PARENT::TypeConst() ); +const Type bhkRigidBody::TYPE("bhkRigidBody", &BHK_RIGID_BODY_PARENT::TYPE ); bhkRigidBody::bhkRigidBody() BHK_RIGID_BODY_CONSTRUCT {} @@ -172,7 +172,3 @@ MotionQuality bhkRigidBody::GetQualityType() const { void bhkRigidBody::SetQualityType( MotionQuality value ) { qualityType = value; } - -const Type & bhkRigidBody::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkRigidBodyT.cpp b/src/obj/bhkRigidBodyT.cpp index 4d0d2b4e..eea63619 100644 --- a/src/obj/bhkRigidBodyT.cpp +++ b/src/obj/bhkRigidBodyT.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkRigidBodyT::TYPE("bhkRigidBodyT", &BHK_RIGID_BODY_T_PARENT::TypeConst() ); +const Type bhkRigidBodyT::TYPE("bhkRigidBodyT", &BHK_RIGID_BODY_T_PARENT::TYPE ); bhkRigidBodyT::bhkRigidBodyT() BHK_RIGID_BODY_T_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkRigidBodyT::GetRefs() const { const Type & bhkRigidBodyT::GetType() const { return TYPE; }; - -const Type & bhkRigidBodyT::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkSPCollisionObject.cpp b/src/obj/bhkSPCollisionObject.cpp index 6f1135c7..93ee2af7 100644 --- a/src/obj/bhkSPCollisionObject.cpp +++ b/src/obj/bhkSPCollisionObject.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkSPCollisionObject::TYPE("bhkSPCollisionObject", &BHK_S_P_COLLISION_OBJECT_PARENT::TypeConst() ); +const Type bhkSPCollisionObject::TYPE("bhkSPCollisionObject", &BHK_S_P_COLLISION_OBJECT_PARENT::TYPE ); bhkSPCollisionObject::bhkSPCollisionObject() BHK_S_P_COLLISION_OBJECT_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkSPCollisionObject::GetRefs() const { const Type & bhkSPCollisionObject::GetType() const { return TYPE; }; - -const Type & bhkSPCollisionObject::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkSerializable.cpp b/src/obj/bhkSerializable.cpp index 3b237d16..bc169f38 100644 --- a/src/obj/bhkSerializable.cpp +++ b/src/obj/bhkSerializable.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkSerializable::TYPE("bhkSerializable", &BHK_SERIALIZABLE_PARENT::TypeConst() ); +const Type bhkSerializable::TYPE("bhkSerializable", &BHK_SERIALIZABLE_PARENT::TYPE ); bhkSerializable::bhkSerializable() BHK_SERIALIZABLE_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkSerializable::GetRefs() const { const Type & bhkSerializable::GetType() const { return TYPE; }; - -const Type & bhkSerializable::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkShape.cpp b/src/obj/bhkShape.cpp index fe837574..9ecac5a2 100644 --- a/src/obj/bhkShape.cpp +++ b/src/obj/bhkShape.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkShape::TYPE("bhkShape", &BHK_SHAPE_PARENT::TypeConst() ); +const Type bhkShape::TYPE("bhkShape", &BHK_SHAPE_PARENT::TYPE ); bhkShape::bhkShape() BHK_SHAPE_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkShape::GetRefs() const { const Type & bhkShape::GetType() const { return TYPE; }; - -const Type & bhkShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkSimpleShapePhantom.cpp b/src/obj/bhkSimpleShapePhantom.cpp index f14831d7..22d012eb 100644 --- a/src/obj/bhkSimpleShapePhantom.cpp +++ b/src/obj/bhkSimpleShapePhantom.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkSimpleShapePhantom::TYPE("bhkSimpleShapePhantom", &BHK_SIMPLE_SHAPE_PHANTOM_PARENT::TypeConst() ); +const Type bhkSimpleShapePhantom::TYPE("bhkSimpleShapePhantom", &BHK_SIMPLE_SHAPE_PHANTOM_PARENT::TYPE ); bhkSimpleShapePhantom::bhkSimpleShapePhantom() BHK_SIMPLE_SHAPE_PHANTOM_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkSimpleShapePhantom::GetRefs() const { const Type & bhkSimpleShapePhantom::GetType() const { return TYPE; }; - -const Type & bhkSimpleShapePhantom::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkSphereRepShape.cpp b/src/obj/bhkSphereRepShape.cpp index 28fc5066..a718646b 100644 --- a/src/obj/bhkSphereRepShape.cpp +++ b/src/obj/bhkSphereRepShape.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkSphereRepShape::TYPE("bhkSphereRepShape", &BHK_SPHERE_REP_SHAPE_PARENT::TypeConst() ); +const Type bhkSphereRepShape::TYPE("bhkSphereRepShape", &BHK_SPHERE_REP_SHAPE_PARENT::TYPE ); bhkSphereRepShape::bhkSphereRepShape() BHK_SPHERE_REP_SHAPE_CONSTRUCT {} @@ -42,7 +42,3 @@ HavokMaterial bhkSphereRepShape::GetMaterial() const { void bhkSphereRepShape::SetMaterial( HavokMaterial value ) { material = value; } - -const Type & bhkSphereRepShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkSphereShape.cpp b/src/obj/bhkSphereShape.cpp index e0404f5c..253dbe5b 100644 --- a/src/obj/bhkSphereShape.cpp +++ b/src/obj/bhkSphereShape.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkSphereShape::TYPE("bhkSphereShape", &BHK_SPHERE_SHAPE_PARENT::TypeConst() ); +const Type bhkSphereShape::TYPE("bhkSphereShape", &BHK_SPHERE_SHAPE_PARENT::TYPE ); bhkSphereShape::bhkSphereShape() BHK_SPHERE_SHAPE_CONSTRUCT {} @@ -42,7 +42,3 @@ float bhkSphereShape::GetRadius() const { void bhkSphereShape::SetRadius( float value ) { radius = value; } - -const Type & bhkSphereShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkStiffSpringConstraint.cpp b/src/obj/bhkStiffSpringConstraint.cpp index 8dbe1330..2ab45ddb 100644 --- a/src/obj/bhkStiffSpringConstraint.cpp +++ b/src/obj/bhkStiffSpringConstraint.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkStiffSpringConstraint::TYPE("bhkStiffSpringConstraint", &BHK_STIFF_SPRING_CONSTRAINT_PARENT::TypeConst() ); +const Type bhkStiffSpringConstraint::TYPE("bhkStiffSpringConstraint", &BHK_STIFF_SPRING_CONSTRAINT_PARENT::TYPE ); bhkStiffSpringConstraint::bhkStiffSpringConstraint() BHK_STIFF_SPRING_CONSTRAINT_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkStiffSpringConstraint::GetRefs() const { const Type & bhkStiffSpringConstraint::GetType() const { return TYPE; }; - -const Type & bhkStiffSpringConstraint::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkTransformShape.cpp b/src/obj/bhkTransformShape.cpp index 324dc4fa..f9e768a7 100644 --- a/src/obj/bhkTransformShape.cpp +++ b/src/obj/bhkTransformShape.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkTransformShape::TYPE("bhkTransformShape", &BHK_TRANSFORM_SHAPE_PARENT::TypeConst() ); +const Type bhkTransformShape::TYPE("bhkTransformShape", &BHK_TRANSFORM_SHAPE_PARENT::TYPE ); bhkTransformShape::bhkTransformShape() BHK_TRANSFORM_SHAPE_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkTransformShape::GetRefs() const { const Type & bhkTransformShape::GetType() const { return TYPE; }; - -const Type & bhkTransformShape::TypeConst() { - return TYPE; -} diff --git a/src/obj/bhkWorldObject.cpp b/src/obj/bhkWorldObject.cpp index 199a1178..0bdd9c82 100644 --- a/src/obj/bhkWorldObject.cpp +++ b/src/obj/bhkWorldObject.cpp @@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type bhkWorldObject::TYPE("bhkWorldObject", &BHK_WORLD_OBJECT_PARENT::TypeConst() ); +const Type bhkWorldObject::TYPE("bhkWorldObject", &BHK_WORLD_OBJECT_PARENT::TYPE ); bhkWorldObject::bhkWorldObject() BHK_WORLD_OBJECT_CONSTRUCT {} @@ -34,7 +34,3 @@ list<NiObjectRef> bhkWorldObject::GetRefs() const { const Type & bhkWorldObject::GetType() const { return TYPE; }; - -const Type & bhkWorldObject::TypeConst() { - return TYPE; -} diff --git a/src/obj/hkPackedNiTriStripsData.cpp b/src/obj/hkPackedNiTriStripsData.cpp index f20ae0fb..6f3dbb20 100644 --- a/src/obj/hkPackedNiTriStripsData.cpp +++ b/src/obj/hkPackedNiTriStripsData.cpp @@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ using namespace Niflib; //Definition of TYPE constant -const Type hkPackedNiTriStripsData::TYPE("hkPackedNiTriStripsData", &HK_PACKED_NI_TRI_STRIPS_DATA_PARENT::TypeConst() ); +const Type hkPackedNiTriStripsData::TYPE("hkPackedNiTriStripsData", &HK_PACKED_NI_TRI_STRIPS_DATA_PARENT::TYPE ); hkPackedNiTriStripsData::hkPackedNiTriStripsData() HK_PACKED_NI_TRI_STRIPS_DATA_CONSTRUCT {} @@ -35,7 +35,3 @@ list<NiObjectRef> hkPackedNiTriStripsData::GetRefs() const { const Type & hkPackedNiTriStripsData::GetType() const { return TYPE; }; - -const Type & hkPackedNiTriStripsData::TypeConst() { - return TYPE; -} -- GitLab