Merge commit '0d5ebb17b29d4263ec4f1634af24a27620ab47a4' into garux-merge

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

diff --git a/include/iselection.h b/include/iselection.h
index 36b27deb02bef3c69cdc3967dbc562fc8593481e..7e4dc255cdfd12a2c16299fce335ae2075175c4a 100644 (file)
--- a/include/iselection.h
+++ b/include/iselection.h
@@ -24,7 +24,7 @@
 
 #include <cstddef>
 #include "generic/constant.h"
-#include "generic/callbackfwd.h"
+#include "generic/callback.h"
 #include "signal/signalfwd.h"
 
 class Renderer;
@@ -42,7 +42,7 @@ virtual bool isSelected() const = 0;
 namespace scene
 {
 class Instance;
-};
+}
 
 class InstanceSelectionObserver
 {
@@ -57,12 +57,13 @@ typedef BasicVector4<float> Vector4;
 class Matrix4;
 typedef Vector4 Quaternion;
 
-typedef Callback1<const Selectable&> SelectionChangeCallback;
+typedef Callback<void(const Selectable&)> SelectionChangeCallback;
 typedef SignalHandler1<const Selectable&> SelectionChangeHandler;
 
 class SelectionSystem
 {
 public:
+virtual ~SelectionSystem() = default;
 INTEGER_CONSTANT( Version, 1 );
 STRING_CONSTANT( Name, "selection" );