[gnome-commander/ConvertWarningsToErrors] src/gnome-cmd-file-list.cc: fix for -Wswitch-enum, -Wswitch-default



commit 99b727b0a31a3c544d92ea8960cfcecd8ea714fe
Author: Mamoru TASAKA <mtasaka fedoraproject org>
Date:   Sun Apr 23 12:53:37 2017 +0900

    src/gnome-cmd-file-list.cc: fix for -Wswitch-enum, -Wswitch-default
    
    src/gnome-cmd-file-list.cc:1114:16: error: enumeration value 'GTK_SCROLL_NONE' not handled in switch 
[-Werror=switch-enum]
    src/gnome-cmd-file-list.cc:2264:16: error: switch missing default case [-Werror=switch-default]
    
    likewise

 src/gnome-cmd-file-list.cc |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index 934ac09..1cb7e45 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -1111,6 +1111,10 @@ static void on_scroll_vertical (GtkCList *clist, GtkScrollType scroll_type, gflo
         if (start_row < 0 || end_row < 0)
             return;
 
+#if defined (__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch-enum"
+#endif
         switch (scroll_type)
         {
             case GTK_SCROLL_STEP_BACKWARD:
@@ -1135,6 +1139,9 @@ static void on_scroll_vertical (GtkCList *clist, GtkScrollType scroll_type, gflo
                 break;
         }
     }
+#if defined (__GNUC__)
+#pragma GCC diagnostic pop
+#endif
 
     fl->priv->cur_file = clist->focus_row;
 }
@@ -2275,6 +2282,9 @@ gboolean GnomeCmdFileList::key_pressed(GdkEventKey *event)
             case GDK_KP_Subtract:
                 toggle_files_with_same_extension (this, FALSE);
                 break;
+
+            default:
+                break;
         }
     }
     else if (state_is_ctrl_alt (event->state) || state_is_ctrl_alt_shift (event->state))
@@ -2344,6 +2354,9 @@ gboolean GnomeCmdFileList::key_pressed(GdkEventKey *event)
                 priv->shift_down = TRUE;
                 g_signal_emit_by_name (this, "scroll-vertical", GTK_SCROLL_JUMP, 1.0);
                 return TRUE;
+
+            default:
+                break;
         }
     }
     else if (state_is_alt_shift (event->state))
@@ -2354,6 +2367,8 @@ gboolean GnomeCmdFileList::key_pressed(GdkEventKey *event)
             case GDK_KP_Enter:
                 show_visible_tree_sizes();
                 return TRUE;
+            default:
+                break;
         }
     }
     else if (state_is_ctrl (event->state))
@@ -2385,6 +2400,9 @@ gboolean GnomeCmdFileList::key_pressed(GdkEventKey *event)
             case GDK_F6:
                 on_column_clicked (*this, COLUMN_SIZE, this);
                 return TRUE;
+
+            default:
+                break;
         }
     }
     else if (state_is_blank (event->state))
@@ -2469,6 +2487,9 @@ gboolean GnomeCmdFileList::key_pressed(GdkEventKey *event)
             case GDK_Menu:
                 show_file_popup_with_warp (this);
                 return TRUE;
+
+            default:
+                break;
         }
     }
 
@@ -2596,6 +2617,9 @@ void GnomeCmdFileList::set_directory(GnomeCmdDir *dir)
             else
                 on_dir_list_ok (dir, NULL, this);
             break;
+
+        default:
+            break;
     }
 
     gnome_cmd_dir_start_monitoring (dir);
@@ -2862,6 +2886,10 @@ static void drag_data_received (GtkWidget *widget, GdkDragContext *context, gint
     GnomeVFSXferOptions xferOptions;
 
     // find out what operation to perform
+#if defined (__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wswitch-enum"
+#endif
     switch (context->action)
     {
         case GDK_ACTION_MOVE:
@@ -2880,6 +2908,9 @@ static void drag_data_received (GtkWidget *widget, GdkDragContext *context, gint
             g_warning ("Unknown context->action in drag_data_received");
             return;
     }
+#if defined (__GNUC__)
+#pragma GCC diagnostic pop
+#endif
 
     fl->drop_files(xferOptions,uri_list,to);
 }


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