[gnome-commander/Implement_CppCheck_suggestions] Remove unused functions and methods



commit 9aef70a2d855885a84cb4c69efca9abb6a6028ac
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Mon Apr 8 22:11:41 2019 +0200

    Remove unused functions and methods

 src/gnome-cmd-data.cc          |  73 ----------------------
 src/gnome-cmd-data.h           |   2 -
 src/tags/gnome-cmd-tags-doc.cc | 136 +----------------------------------------
 src/utils.cc                   |   8 ---
 src/utils.h                    |   1 -
 5 files changed, 1 insertion(+), 219 deletions(-)
---
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 6ecfff95..1fdecbd8 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -2820,31 +2820,6 @@ inline gboolean GnomeCmdData::save_auto_load_plugins()
 }
 
 
-#if defined (__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-#endif
-inline GList* GnomeCmdData::load_string_history (const gchar *format, gint size)
-{
-    GList *list = nullptr;
-
-    for (gint i=0; i<size || size==-1; ++i)
-    {
-        gchar *key = g_strdup_printf (format, i);
-        gchar *value = gnome_cmd_data_get_string (key, nullptr);
-        g_free (key);
-        if (!value)
-            break;
-        list = g_list_append (list, value);
-    }
-
-    return list;
-}
-#if defined (__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-
-
 /**
  * Returns a GList with newly allocated char strings
  */
@@ -3834,54 +3809,6 @@ gint GnomeCmdData::migrate_data_int_value_into_gsettings(int user_value, GSettin
 #pragma GCC diagnostic pop
 #endif
 
-/**
- * This method sets the value of a given GSettings key to the string stored in user_value or to the default 
value,
- * depending on the value of user_value. If the class of the key is not a string but a string array, the 
first
- * entry of the array is set to user_value.
- * @returns FALSE if an error occured setting the key value to a new string.
- */
-gboolean GnomeCmdData::migrate_data_string_value_into_gsettings(const char* user_value, GSettings 
*settings_given, const char *key)
-{
-    GVariant *variant;
-    gboolean rv = true;
-
-    variant = g_settings_get_default_value (settings_given, key);
-
-    if (g_variant_classify(variant) == G_VARIANT_CLASS_STRING)
-    {
-        gchar *default_value;
-
-        // In the following 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.
-        default_value = g_settings_get_string (settings_given, key);
-
-        if (strcmp(user_value, default_value) != 0)
-            rv = g_settings_set_string (settings_given, key, user_value);
-    }
-    else if (g_variant_classify(variant) == G_VARIANT_CLASS_ARRAY)
-    {
-        gchar** str_array;
-        str_array = (gchar**) g_malloc (2*sizeof(char*));
-        str_array[0] = g_strdup(user_value);
-        str_array[1] = nullptr;
-
-        rv = g_settings_set_strv(settings_given, key, str_array);
-
-        g_free(str_array[0]);
-        g_free(str_array[1]);
-        g_free(str_array);
-    }
-    else
-    {
-        g_warning("Could not translate key value of type '%s'\n", g_variant_get_type_string (variant));
-        rv = false;
-    }
-    g_variant_unref (variant);
-
-    return rv;
-}
-
-
 void GnomeCmdData::save()
 {
     set_gsettings_enum_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_SIZE_DISP_MODE, 
options.size_disp_mode);
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index 7010d104..c2fb90fe 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -711,9 +711,7 @@ struct GnomeCmdData
     void gsettings_init();
     void migrate_all_data_to_gsettings();
     gint migrate_data_int_value_into_gsettings(gint user_value, GSettings *settings, const char *key);
-    gboolean migrate_data_string_value_into_gsettings(const char* user_value, GSettings *settings, const 
char *key);
     void load_more();
-    inline GList* load_string_history (const gchar *format, gint size);
     void load_advrename_profiles ();
     void save_advrename_profiles ();
     void load_search_profiles ();
diff --git a/src/tags/gnome-cmd-tags-doc.cc b/src/tags/gnome-cmd-tags-doc.cc
index 151205a0..c84ec443 100644
--- a/src/tags/gnome-cmd-tags-doc.cc
+++ b/src/tags/gnome-cmd-tags-doc.cc
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file gnome-cmd-tags-doc.cc
  * @copyright (C) 2001-2006 Marcus Bjurman\n
  * @copyright (C) 2007-2012 Piotr Eljasiak\n
@@ -59,140 +59,6 @@ using namespace std;
 #ifdef HAVE_GSF
 static DICT<GnomeCmdTag> gsf_tags(TAG_NONE);
 
-inline const gchar *lid2lang (guint lid)
-{
-#if defined (__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch-enum"
-#endif
-    switch (lid)
-    {
-        case 0x0400:
-            return _("No Proofing");
-        case 0x0401:
-            return _("Arabic");
-        case 0x0402:
-            return _("Bulgarian");
-        case 0x0403:
-            return _("Catalan");
-        case 0x0404:
-            return _("Traditional Chinese");
-        case 0x0804:
-            return _("Simplified Chinese");
-        case 0x0405:
-            return _("Chechen");
-        case 0x0406:
-            return _("Danish");
-        case 0x0407:
-            return _("German");
-        case 0x0807:
-            return _("Swiss German");
-        case 0x0408:
-            return _("Greek");
-        case 0x0409:
-            return _("U.S. English");
-        case 0x0809:
-            return _("U.K. English");
-        case 0x0c09:
-            return _("Australian English");
-        case 0x040a:
-            return _("Castilian Spanish");
-        case 0x080a:
-            return _("Mexican Spanish");
-        case 0x040b:
-            return _("Finnish");
-        case 0x040c:
-            return _("French");
-        case 0x080c:
-            return _("Belgian French");
-        case 0x0c0c:
-            return _("Canadian French");
-        case 0x100c:
-            return _("Swiss French");
-        case 0x040d:
-            return _("Hebrew");
-        case 0x040e:
-            return _("Hungarian");
-        case 0x040f:
-            return _("Icelandic");
-        case 0x0410:
-            return _("Italian");
-        case 0x0810:
-            return _("Swiss Italian");
-        case 0x0411:
-            return _("Japanese");
-        case 0x0412:
-            return _("Korean");
-        case 0x0413:
-            return _("Dutch");
-        case 0x0813:
-            return _("Belgian Dutch");
-        case 0x0414:
-            return _("Norwegian Bokmal");
-        case 0x0814:
-            return _("Norwegian Nynorsk");
-        case 0x0415:
-            return _("Polish");
-        case 0x0416:
-            return _("Brazilian Portuguese");
-        case 0x0816:
-            return _("Portuguese");
-        case 0x0417:
-            return _("Rhaeto-Romanic");
-        case 0x0418:
-            return _("Romanian");
-        case 0x0419:
-            return _("Russian");
-        case 0x041a:
-            return _("Croato-Serbian (Latin)");
-        case 0x081a:
-            return _("Serbo-Croatian (Cyrillic)");
-        case 0x041b:
-            return _("Slovak");
-        case 0x041c:
-            return _("Albanian");
-        case 0x041d:
-            return _("Swedish");
-        case 0x041e:
-            return _("Thai");
-        case 0x041f:
-            return _("Turkish");
-        case 0x0420:
-            return _("Urdu");
-        case 0x0421:
-            return _("Indonesian");
-        case 0x0422:
-            return _("Ukrainian");
-        case 0x0423:
-            return _("Byelorussian");
-        case 0x0424:
-            return _("Slovenian");
-        case 0x0425:
-            return _("Estonian");
-        case 0x0426:
-            return _("Latvian");
-        case 0x0427:
-            return _("Lithuanian");
-        case 0x0429:
-            return _("Farsi");
-        case 0x042D:
-            return _("Basque");
-        case 0x042F:
-            return _("Macedonian");
-        case 0x0436:
-            return _("Afrikaans");
-        case 0x043E:
-            return _("Malayalam");
-
-        default:
-            return NULL;
-    }
-#if defined (__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-}
-
-
 static void process_metadata(gpointer key, gpointer value, gpointer user_data)
 {
     char *type = (char *) key;
diff --git a/src/utils.cc b/src/utils.cc
index 32d37f48..94f1ad86 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -269,14 +269,6 @@ const gchar *type2string (GnomeVFSFileType type, gchar *buf, guint max)
 }
 
 
-const gchar *name2string (gchar *filename, gchar *buf, guint max)
-{
-    g_snprintf (buf, max, "%s", filename);
-
-    return buf;
-}
-
-
 const gchar *perm2string (GnomeVFSFilePermissions p, gchar *buf, guint max)
 {
     switch (gnome_cmd_data.options.perm_disp_mode)
diff --git a/src/utils.h b/src/utils.h
index 8d404fe7..1c42ddb0 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -121,7 +121,6 @@ inline char *int2string (gint i)
 }
 
 const gchar *type2string (GnomeVFSFileType type, gchar *buf, guint max);
-const gchar *name2string (gchar *filename, gchar *buf, guint max);
 const gchar *perm2string (GnomeVFSFilePermissions p, gchar *buf, guint max);
 const gchar *perm2textstring (GnomeVFSFilePermissions p, gchar *buf, guint max);
 const gchar *perm2numstring (GnomeVFSFilePermissions p, gchar *buf, guint max);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]