Group import/export callbacks

[xonotic/netradiant.git] / libs / generic / callback.h

diff --git a/libs/generic/callback.h b/libs/generic/callback.h
index 03689e8313540ff58aa4950b335b3e915edd304b..26772880385d04336583bf1d09ef281b32d6f35c 100644 (file)
--- a/libs/generic/callback.h
+++ b/libs/generic/callback.h
@@ -314,21 +314,12 @@ inline Callback<F> makeCallbackF(F *func) {
        return Callback<F>(reinterpret_cast<void *>(func), BindFirstOpaque<detail::freecallwrapper<F>>::thunk);
 }
 
-// todo: remove
-
-using BoolImportCallback = Callback<void(bool)>;
-using BoolExportCallback = Callback<void(const BoolImportCallback&)>;
-
-using IntImportCallback = Callback<void(int)>;
-using IntExportCallback = Callback<void(const IntImportCallback&)>;
-
-using FloatImportCallback = Callback<void(float)>;
-using FloatExportCallback = Callback<void(const FloatImportCallback&)>;
-
-using StringImportCallback = Callback<void(const char*)>;
-using StringExportCallback = Callback<void(const StringImportCallback&)>;
-
-using SizeImportCallback = Callback<void(std::size_t)>;
-using SizeExportCallback = Callback<void(const SizeImportCallback&)>;
+template <class T>
+struct ImportExportCallback {
+       using Import_t = Callback<void(T)>;
+       Import_t Import;
+       using Export_t = Callback<void(const Callback<void(T)> &)>;
+    Export_t Export;
+};
 
 #endif