Merge branch 'optional_q3map2_type' into 'master'

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

diff --git a/include/iselection.h b/include/iselection.h
index f5c76310b1cc4e17196ebebb33157c1779f839e0..9207271e1c4c52a6bc8f8557ab03cb7bb2ef3c96 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" );