X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=include%2Fpreferencesystem.cpp;h=5796d76f0fbd44db47b0ddc1004010818c9eda2e;hb=80bb5fdd23e124b4c4da8509634d95d1459e6a3b;hp=6152cb14865140d173ff2daf6df1eb9daaf34436;hpb=e4287c28bb2dafedc81c66e63951d947cfbeb225;p=xonotic%2Fnetradiant.git

diff --git a/include/preferencesystem.cpp b/include/preferencesystem.cpp
index 6152cb14..5796d76f 100644
--- a/include/preferencesystem.cpp
+++ b/include/preferencesystem.cpp
@@ -75,14 +75,14 @@ void importString( const char* value ){
 	m_string = value;
 	m_observer.onChanged();
 }
-typedef MemberCaller1<StringPreference, const char*, &StringPreference::importString> ImportStringCaller;
-void exportString( StringImportCallback& importer ){
+typedef MemberCaller<StringPreference, void(const char*), &StringPreference::importString> ImportStringCaller;
+void exportString( Callback<void(const char *)>& importer ){
 	importer( m_string.c_str() );
 }
-typedef MemberCaller1<StringPreference, StringImportCallback&, &StringPreference::exportString> ExportStringCaller;
+typedef MemberCaller<StringPreference, void(Callback<void(const char *)>&), &StringPreference::exportString> ExportStringCaller;
 };
 
-inline void int_export( int i, StringImportCallback& importer ){
+inline void int_export( int i, Callback<void(const char *)>& importer ){
 	char buffer[16];
 	sprintf( buffer, "%d", i );
 	importer( buffer );
@@ -113,11 +113,11 @@ void importString( const char* value ){
 	m_int = int_import( value );
 	m_observer.onChanged();
 }
-typedef MemberCaller1<IntPreference, const char*, &IntPreference::importString> ImportStringCaller;
-void exportString( StringImportCallback& importer ){
+typedef MemberCaller<IntPreference, void(const char*), &IntPreference::importString> ImportStringCaller;
+void exportString( Callback<void(const char *)>& importer ){
 	int_export( m_int, importer );
 }
-typedef MemberCaller1<IntPreference, StringImportCallback&, &IntPreference::exportString> ExportStringCaller;
+typedef MemberCaller<IntPreference, void(Callback<void(const char *)>&), &IntPreference::exportString> ExportStringCaller;
 };
 
 class IntPreferenceImporter