Introduce Property<T> to simplify preferences system

[xonotic/netradiant.git] / libs / gtkutil / accelerator.h

diff --git a/libs/gtkutil/accelerator.h b/libs/gtkutil/accelerator.h
index f2be18214d8154d1a7ff596a98fa8dabd802740c..528dd6bb9269ac18d6c8f44f06117c1b4c2638c8 100644 (file)
--- a/libs/gtkutil/accelerator.h
+++ b/libs/gtkutil/accelerator.h
@@ -26,6 +26,7 @@
 #include <gdk/gdk.h>
 
 #include "generic/callback.h"
+#include "property.h"
 
 // ignore numlock
 #define ALLOWED_MODIFIERS ( ~( GDK_MOD2_MASK | GDK_LOCK_MASK | GDK_MOD3_MASK | GDK_MOD4_MASK | GDK_MOD5_MASK ) )
@@ -111,8 +112,8 @@ class Toggle
 {
 public:
 Command m_command;
-ImportExportCallback<bool>::Export_t m_exportCallback;
-Toggle( const Callback<void()>& callback, const Accelerator& accelerator, const ImportExportCallback<bool>::Export_t& exportCallback ) : m_command( callback, accelerator ), m_exportCallback( exportCallback ){
+Callback<void(const Callback<void(bool)> &)> m_exportCallback;
+Toggle( const Callback<void()>& callback, const Accelerator& accelerator, const Callback<void(const Callback<void(bool)> &)>& exportCallback ) : m_command( callback, accelerator ), m_exportCallback( exportCallback ){
 }
 };