X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=include%2Fpreferencesystem.h;h=6479ec91d32e7adabafc1d654d5b85611717754c;hb=1f9ff6307712d98d9d36e288c9134219407e3690;hp=f1891ae3f21cf4427d67fd91c13766a3b53fc944;hpb=12b372f89ce109a4db9d510884fbe7d05af79870;p=xonotic%2Fnetradiant.git

diff --git a/include/preferencesystem.h b/include/preferencesystem.h
index f1891ae3..6479ec91 100644
--- a/include/preferencesystem.h
+++ b/include/preferencesystem.h
@@ -1,43 +1,54 @@
 /*
-Copyright (C) 2001-2006, William Joseph.
-All Rights Reserved.
+   Copyright (C) 2001-2006, William Joseph.
+   All Rights Reserved.
 
-This file is part of GtkRadiant.
+   This file is part of GtkRadiant.
 
-GtkRadiant is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   GtkRadiant is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-GtkRadiant is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GtkRadiant is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
-#if !defined(INCLUDED_PREFERENCESYSTEM_H)
+#if !defined( INCLUDED_PREFERENCESYSTEM_H )
 #define INCLUDED_PREFERENCESYSTEM_H
 
 #include "generic/constant.h"
+#include "generic/callback.h"
+#include "property.h"
 
-template<typename FirstArgument>
-class Callback1;
-typedef Callback1<const char*> StringImportCallback;
-typedef Callback1<const StringImportCallback&> StringExportCallback;
-
-class PreferenceSystem
-{
+class PreferenceSystem {
 public:
-  INTEGER_CONSTANT(Version, 1);
-  STRING_CONSTANT(Name, "preferences");
+	INTEGER_CONSTANT(Version, 1);
+	STRING_CONSTANT(Name, "preferences");
 
-  virtual void registerPreference(const char* name, const StringImportCallback& importer, const StringExportCallback& exporter) = 0;
+	virtual void registerPreference(const char *name, const Property<const char *> &cb) = 0;
 };
 
+template<class Self>
+Property<const char *> make_property_string(Self &it) {
+	return make_property<PropertyAdaptor<Self, const char *>>(it);
+}
+
+template<class I, class Self>
+Property<const char *> make_property_string(Self &it) {
+	return make_property_chain<PropertyImpl<detail::propertyimpl_other<I>, const char *>, I>(it);
+}
+
+template<class I>
+Property<const char *> make_property_string() {
+	return make_property_chain<PropertyImpl<detail::propertyimpl_other_free<I>, const char *>, I>();
+}
+
 #include "modulesystem.h"
 
 template<typename Type>
@@ -48,9 +59,8 @@ template<typename Type>
 class GlobalModuleRef;
 typedef GlobalModuleRef<PreferenceSystem> GlobalPreferenceSystemModuleRef;
 
-inline PreferenceSystem& GlobalPreferenceSystem()
-{
-  return GlobalPreferenceSystemModule::getTable();
+inline PreferenceSystem& GlobalPreferenceSystem(){
+	return GlobalPreferenceSystemModule::getTable();
 }