Merge branch 'restart' into 'master'

[xonotic/netradiant.git] / radiant / autosave.cpp

diff --git a/radiant/autosave.cpp b/radiant/autosave.cpp
index effb111e0c173d54562b65ad554ed303106ca339..9921d4be4d9cd100e6b109cabab3b87fc3345f0c 100644 (file)
--- a/radiant/autosave.cpp
+++ b/radiant/autosave.cpp
@@ -93,7 +93,7 @@ void Map_Snapshot(){
        {
                StringOutputStream strMsg( 256 );
                strMsg << "Snapshot save failed.. unabled to create directory\n" << snapshotsDir.c_str();
-               MainFrame_getWindow().alert( strMsg.c_str() );
+               ui::alert( MainFrame_getWindow(), strMsg.c_str() );
        }
 }
 /*
@@ -194,9 +194,9 @@ void Autosave_registerPreferencesPage(){
 #include "stringio.h"
 
 void Autosave_Construct(){
-       GlobalPreferenceSystem().registerPreference( "Autosave", BoolImportStringCaller( g_AutoSave_Enabled ), BoolExportStringCaller( g_AutoSave_Enabled ) );
-       GlobalPreferenceSystem().registerPreference( "AutosaveMinutes", IntImportStringCaller( m_AutoSave_Frequency ), IntExportStringCaller( m_AutoSave_Frequency ) );
-       GlobalPreferenceSystem().registerPreference( "Snapshots", BoolImportStringCaller( g_SnapShots_Enabled ), BoolExportStringCaller( g_SnapShots_Enabled ) );
+       GlobalPreferenceSystem().registerPreference( "Autosave", make_property_string( g_AutoSave_Enabled ) );
+       GlobalPreferenceSystem().registerPreference( "AutosaveMinutes", make_property_string( m_AutoSave_Frequency ) );
+       GlobalPreferenceSystem().registerPreference( "Snapshots", make_property_string( g_SnapShots_Enabled ) );
 
        Autosave_registerPreferencesPage();
 }