Ticket #3598: mc-3598-0002-filemanager-panel.c-cleanup-Wcast-qual-warning.patch

src/filemanager/panel.c

@@ -406 +406 @@
 panel_lines (const WPanel * p)
 {
     /* 3 lines are: top frame, column header, botton frame */
-    return (WIDGET (p)->lines - 3 - (panels_options.show_mini_info ? 2 : 0));
+    return (CWIDGET (p)->lines - 3 - (panels_options.show_mini_info ? 2 : 0));
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -1067 +1067 @@
 static void
 display_total_marked_size (const WPanel * panel, int y, int x, gboolean size_only)
 {
-    Widget *w = WIDGET (panel);
+    const Widget *w = CWIDGET (panel);
 
-    char buffer[BUF_SMALL], b_bytes[BUF_SMALL], *buf;
+    char buffer[BUF_SMALL], b_bytes[BUF_SMALL];
+    const char *buf;
     int cols;
 
     if (panel->marked <= 0)
@@ -1091 +1092 @@
                     b_bytes, panel->marked);
 
     /* don't forget spaces around buffer content */
-    buf = (char *) str_trunc (buf, cols - 4);
+    buf = str_trunc (buf, cols - 4);
 
     if (x < 0)
         /* center in panel */
@@ -1113 +1114 @@
 {
     if (panels_options.show_mini_info)
     {
-        Widget *w = WIDGET (panel);
+        const Widget *w = CWIDGET (panel);
         int y;
 
         y = panel_lines (panel) + 2;
@@ -1156 +1157 @@
 
     if (myfs_stats.avail != 0 || myfs_stats.total != 0)
     {
-        Widget *w = WIDGET (panel);
+        const Widget *w = CWIDGET (panel);
         char buffer1[6], buffer2[6], tmp[BUF_SMALL];
 
         size_trunc_len (buffer1, sizeof (buffer1) - 1, myfs_stats.avail, 1,
@@ -1257 +1258 @@
 static void
 show_dir (const WPanel * panel)
 {
-    Widget *w = WIDGET (panel);
+    const Widget *w = CWIDGET (panel);
 
     gchar *tmp;
 
@@ -1555 +1556 @@
 static void
 panel_print_header (const WPanel * panel)
 {
-    Widget *w = WIDGET (panel);
+    const Widget *w = CWIDGET (panel);
 
     int y, x;
     int i;
@@ -4855 +4856 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-const char **
+char **
 panel_get_sortable_fields (gsize * array_size)
 {
     char **ret;
@@ -4876 +4877 @@
         if (panel_fields[i].is_user_choice)
             ret[lc_index++] = g_strdup (_(panel_fields[i].title_hotkey));
 
-    return (const char **) ret;
+    return ret;
 }
 
 /* --------------------------------------------------------------------------------------------- */
@@ -4943 +4944 @@
 
 /* --------------------------------------------------------------------------------------------- */
 
-const char **
+char **
 panel_get_user_possible_fields (gsize * array_size)
 {
     char **ret;
@@ -4964 +4965 @@
         if (panel_fields[i].use_in_user_format)
             ret[lc_index++] = g_strdup (_(panel_fields[i].title_hotkey));
 
-    return (const char **) ret;
+    return ret;
 }
 
 /* --------------------------------------------------------------------------------------------- */

src/filemanager/panel.h

@@ -180 +180 @@
 gboolean do_panel_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type);
 
 gsize panel_get_num_of_sortable_fields (void);
-const char **panel_get_sortable_fields (gsize *);
+char **panel_get_sortable_fields (gsize *);
 const panel_field_t *panel_get_field_by_id (const char *);
 const panel_field_t *panel_get_field_by_title (const char *);
 const panel_field_t *panel_get_field_by_title_hotkey (const char *);
 gsize panel_get_num_of_user_possible_fields (void);
-const char **panel_get_user_possible_fields (gsize *);
+char **panel_get_user_possible_fields (gsize *);
 void panel_set_cwd (WPanel * panel, const vfs_path_t * vpath);
 void panel_set_lwd (WPanel * panel, const vfs_path_t * vpath);