[gnome-commander/gcmd-1-10: 8/8] Remove unused data migration method
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander/gcmd-1-10: 8/8] Remove unused data migration method
- Date: Sat, 13 Apr 2019 10:45:25 +0000 (UTC)
commit e1aa2b0ab883c9711744405cea63077d47278cc1
Author: Uwe Scholz <u scholz83 gmx de>
Date: Sat Apr 13 12:28:37 2019 +0200
Remove unused data migration method
src/gnome-cmd-data.cc | 86 ---------------------------------------------------
src/gnome-cmd-data.h | 1 -
2 files changed, 87 deletions(-)
---
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index ba70e9b3..17288e9f 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -3425,92 +3425,6 @@ void GnomeCmdData::load()
set_vfs_volume_monitor ();
}
-#if defined (__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch-enum"
-#endif
-/**
- * This method returns an int value which is either the given user_value or,
- * the default integer value of the given GSettings key. The user_value is returned
- * if it is different from the default value of the GSettings key.
- * @param user_value An integer value
- * @param settings_given A GSettings pointer
- * @param key a GSettings key path given as a char array
- */
-gint GnomeCmdData::migrate_data_int_value_into_gsettings(int user_value, GSettings *settings_given, const
char *key)
-{
- GVariant *variant;
- gint default_value;
- gint return_value;
-
- variant = g_settings_get_default_value (settings_given, key);
-
- switch (g_variant_classify(variant))
- {
- // In all of the following cases it is assumed that the value behind 'default_value' is the actual
- // default value, i.e. nobody changed the given key before gcmd data migration was started.
- case G_VARIANT_CLASS_STRING:
- {
- default_value = g_settings_get_enum (settings_given, key);
-
- if (user_value != default_value)
- g_settings_set_enum (settings_given, key, user_value);
-
- return_value = g_settings_get_enum(settings_given, key);
-
- break;
- }
- case G_VARIANT_CLASS_UINT32:
- {
- default_value = g_variant_get_uint32 (variant);
-
- if (user_value != default_value)
- g_settings_set_uint (settings_given, key, user_value);
-
- return_value = g_settings_get_uint(settings_given, key);
-
- break;
- }
- case G_VARIANT_CLASS_INT32:
- {
- default_value = g_variant_get_int32 (variant);
-
- if (user_value != default_value)
- g_settings_set_int (settings_given, key, user_value);
-
- return_value = g_settings_get_int(settings_given, key);
-
- break;
- }
- case G_VARIANT_CLASS_BOOLEAN:
- {
- gboolean bdef_value;
- gboolean buser_value;
- bdef_value = g_variant_get_boolean (variant);
- buser_value = user_value == 1 ? TRUE : FALSE;
-
- if (buser_value != bdef_value)
- g_settings_set_boolean (settings_given, key, buser_value);
-
- return_value = g_settings_get_boolean (settings_given, key) ? 1 : 0;
-
- break;
- }
- default:
- {
- g_warning("Could not translate key value of type '%s'\n", g_variant_get_type_string (variant));
- default_value = -9999;
- return_value = default_value;
- break;
- }
- }
- g_variant_unref (variant);
-
- return return_value;
-}
-#if defined (__GNUC__)
-#pragma GCC diagnostic pop
-#endif
void GnomeCmdData::save()
{
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index dca92e8f..d3088982 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -707,7 +707,6 @@ struct GnomeCmdData
void load_fav_apps();
void gsettings_init();
void migrate_all_data_to_gsettings();
- gint migrate_data_int_value_into_gsettings(gint user_value, GSettings *settings, const char *key);
void load_more();
void load_advrename_profiles ();
void save_advrename_profiles ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]