1 files changed, 0 insertions, 40 deletions

diff --git a/core/settings/qPrefGeneral.cpp b/core/settings/qPrefGeneral.cpp
index e3d3e6e0a..25ed835f0 100644
--- a/core/settings/qPrefGeneral.cpp
+++ b/core/settings/qPrefGeneral.cpp
@@ -20,15 +20,11 @@ qPrefGeneral *qPrefGeneral::instance()
 
 void qPrefGeneral::loadSync(bool doSync)
 {
-	disk_default_filename(doSync);
-	disk_default_file_behavior(doSync);
 	disk_defaultsetpoint(doSync);
 	disk_o2consumption(doSync);
 	disk_pscr_ratio(doSync);
-	disk_use_default_file(doSync);
 	disk_filterFullTextNotes(doSync);
 	disk_filterCaseSensitive(doSync);
-	disk_extraEnvironmentalDefault(doSync);
 
 	if (!doSync) {
 		load_diveshareExport_uid();
@@ -36,48 +32,12 @@ void qPrefGeneral::loadSync(bool doSync)
 	}
 }
 
-HANDLE_PREFERENCE_TXT(General, "default_filename", default_filename);
-
-
-void qPrefGeneral::set_default_file_behavior(enum def_file_behavior value)
-{
-	if (value != prefs.default_file_behavior ||
-		prefs.default_file_behavior != UNDEFINED_DEFAULT_FILE) {
-
-	if (value == UNDEFINED_DEFAULT_FILE) {
-		// undefined, so check if there's a filename set and
-		// use that, otherwise go with no default file
-		prefs.default_file_behavior = QString(prefs.default_filename).isEmpty() ? NO_DEFAULT_FILE : LOCAL_DEFAULT_FILE;
-	} else {
-		prefs.default_file_behavior = value;
-	}
-	disk_default_file_behavior(true);
-	emit instance()->default_file_behaviorChanged(value);
-	}
-}
-void qPrefGeneral::disk_default_file_behavior(bool doSync)
-{
-	if (doSync) {
-		qPrefPrivate::propSetValue(keyFromGroupAndName(group, "default_file_behavior"), prefs.default_file_behavior, default_prefs.default_file_behavior);
-	} else {
-		prefs.default_file_behavior = (enum def_file_behavior)qPrefPrivate::propValue(keyFromGroupAndName(group, "default_file_behavior"), default_prefs.default_file_behavior).toInt();
-		if (prefs.default_file_behavior == UNDEFINED_DEFAULT_FILE)
-			// undefined, so check if there's a filename set and
-			// use that, otherwise go with no default file
-			prefs.default_file_behavior = QString(prefs.default_filename).isEmpty() ? NO_DEFAULT_FILE : LOCAL_DEFAULT_FILE;
-	}
-}
-
 HANDLE_PREFERENCE_INT(General, "defaultsetpoint", defaultsetpoint);
 
 HANDLE_PREFERENCE_INT(General, "o2consumption", o2consumption);
 
 HANDLE_PREFERENCE_INT(General, "pscr_ratio", pscr_ratio);
 
-HANDLE_PREFERENCE_BOOL(General, "extraEnvironmentalDefault", extraEnvironmentalDefault);
-
-HANDLE_PREFERENCE_BOOL(General, "use_default_file", use_default_file);
-
 HANDLE_PROP_QSTRING(General, "diveshareExport/uid", diveshareExport_uid);
 
 HANDLE_PROP_BOOL(General, "diveshareExport/private", diveshareExport_private);