radiant/camwindow, radiant/xywindow: Fix use of uninitialized values

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

diff --git a/radiant/autosave.cpp b/radiant/autosave.cpp
index b9f9b824abd26a5e71c0d0880f842994e38049f8..9921d4be4d9cd100e6b109cabab3b87fc3345f0c 100644 (file)
--- a/radiant/autosave.cpp
+++ b/radiant/autosave.cpp
@@ -21,6 +21,7 @@
 
 #include <uilib/uilib.h>
 #include "autosave.h"
+#include "globaldefs.h"
 
 #include "os/file.h"
 #include "os/path.h"
@@ -36,7 +37,7 @@
 #include "preferences.h"
 
 
-#if defined( WIN32 )
+#if GDEF_OS_WINDOWS
 #define PATH_MAX 260
 #endif
 
@@ -92,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() );
        }
 }
 /*
@@ -185,7 +186,7 @@ void Autosave_constructPage( PreferenceGroup& group ){
        Autosave_constructPreferences( page );
 }
 void Autosave_registerPreferencesPage(){
-       PreferencesDialog_addSettingsPage( FreeCaller1<PreferenceGroup&, Autosave_constructPage>() );
+       PreferencesDialog_addSettingsPage(makeCallbackF(Autosave_constructPage));
 }
 
 
@@ -193,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();
 }