Initial python support

[xonotic/netradiant.git] / include / modelskin.h

diff --git a/include/modelskin.h b/include/modelskin.h
index bb5922ee7704b89c48ee666a8c5d353dd9e1b1b2..b070cc778255c021d716d2b6114cde9e624cf691 100644 (file)
--- a/include/modelskin.h
+++ b/include/modelskin.h
@@ -23,7 +23,7 @@
 #define INCLUDED_MODELSKIN_H
 
 #include "generic/constant.h"
-#include "generic/callbackfwd.h"
+#include "generic/callback.h"
 
 class SkinRemap
 {
@@ -34,12 +34,13 @@ SkinRemap( const char* from, const char* to ) : m_from( from ), m_to( to ){
 }
 };
 
-typedef Callback1<SkinRemap> SkinRemapCallback;
+typedef Callback<void(SkinRemap)> SkinRemapCallback;
 class ModuleObserver;
 
 class ModelSkin
 {
 public:
+virtual ~ModelSkin() = default;
 STRING_CONSTANT( Name, "ModelSkin" );
 /// \brief Attach an \p observer whose realise() and unrealise() methods will be called when the skin is loaded or unloaded.
 virtual void attach( ModuleObserver& observer ) = 0;
@@ -64,6 +65,7 @@ virtual void skinChanged() = 0;
 class ModelSkinCache
 {
 public:
+virtual ~ModelSkinCache() = default;
 INTEGER_CONSTANT( Version, 1 );
 STRING_CONSTANT( Name, "modelskin" );
 /// \brief Increments the reference count of and returns a reference to the skin uniquely identified by 'name'.