Re-exposed TYPE constants and marked them NIFLIB_API, making the TypeConst...

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

@@ -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();

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;