Callback: remove fixed-arity wrappers

[xonotic/netradiant.git] / contrib / bobtoolz / DTreePlanter.h

diff --git a/contrib/bobtoolz/DTreePlanter.h b/contrib/bobtoolz/DTreePlanter.h
index 1d198ae63dddfed5b3f27278a01609c70ba526eb..102976d8d416d85f0d2d8f0970e4eff389b8ff44 100644 (file)
--- a/contrib/bobtoolz/DTreePlanter.h
+++ b/contrib/bobtoolz/DTreePlanter.h
@@ -29,25 +29,25 @@
 #include "mathlib.h"
 #include "misc.h"
 
-#define MAX_QPATH 64
+const int MAX_QPATH = 64;
 
 typedef struct treeModel_s {
        char name[MAX_QPATH];
 } treeModel_t;
 
-#define MAX_TP_MODELS 256
+const int MAX_TP_MODELS = 256;
 
 class DTreePlanter {
 MouseEventHandlerId m_mouseDown;
 SignalHandlerId m_destroyed;
 public:
 SignalHandlerResult mouseDown( const WindowVector& position, ButtonIdentifier button, ModifierFlags modifiers );
-typedef Member3<DTreePlanter, const WindowVector&, ButtonIdentifier, ModifierFlags, SignalHandlerResult, &DTreePlanter::mouseDown> MouseDownCaller;
+typedef Member<DTreePlanter, SignalHandlerResult(const WindowVector&, ButtonIdentifier, ModifierFlags), &DTreePlanter::mouseDown> MouseDownCaller;
 void destroyed(){
        m_mouseDown = MouseEventHandlerId();
        m_destroyed = SignalHandlerId();
 }
-typedef Member<DTreePlanter, void, &DTreePlanter::destroyed> DestroyedCaller;
+typedef Member<DTreePlanter, void(), &DTreePlanter::destroyed> DestroyedCaller;
 
 DTreePlanter() {
        m_numModels =   0;