[sound-juicer] Fix -Wswitch-enum warnings
- From: Phillip Wood <pwood src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [sound-juicer] Fix -Wswitch-enum warnings
- Date: Mon, 13 Feb 2017 10:57:09 +0000 (UTC)
commit 2b806ccf9781e6d34d558669bac9e0f2b9fd7559
Author: Phillip Wood <phillip wood dunelm org uk>
Date: Wed Jan 18 19:01:16 2017 +0000
Fix -Wswitch-enum warnings
Wrap switch statements in SJ_BEGIN/END_IGNORE_SWITCH_ENUM where the
warning is not useful (i.e. in switch statements that are only
interested in a subset of enum values)
https://bugzilla.gnome.org/show_bug.cgi?id=777692
src/egg-play-preview.c | 3 +++
src/sj-main.c | 4 ++++
src/sj-tree-view.c | 6 ++++++
3 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/src/egg-play-preview.c b/src/egg-play-preview.c
index 046c62c..a1482da 100644
--- a/src/egg-play-preview.c
+++ b/src/egg-play-preview.c
@@ -31,6 +31,7 @@
#include <gst/gst.h>
#include "egg-play-preview.h"
+#include "sj-util.h"
enum {
PROP_NONE,
@@ -712,6 +713,7 @@ _process_bus_messages (GstBus *bus, GstMessage *msg, EggPlayPreview *play_previe
priv = GET_PRIVATE (play_preview);
+ SJ_BEGIN_IGNORE_SWITCH_ENUM
switch (GST_MESSAGE_TYPE (msg)) {
case GST_MESSAGE_DURATION_CHANGED:
if (!gst_element_query_duration (priv->playbin, GST_FORMAT_TIME, &duration))
@@ -789,6 +791,7 @@ _process_bus_messages (GstBus *bus, GstMessage *msg, EggPlayPreview *play_previe
default:
break;
}
+ SJ_END_IGNORE_SWITCH_ENUM
return TRUE;
}
diff --git a/src/sj-main.c b/src/sj-main.c
index 83f6746..c6f59fc 100644
--- a/src/sj-main.c
+++ b/src/sj-main.c
@@ -1329,6 +1329,7 @@ on_cell_editing_done_foreach (GtkTreeModel *model,
gtk_tree_model_get (GTK_TREE_MODEL (track_store), iter,
COLUMN_DETAILS, &track,
-1);
+ SJ_BEGIN_IGNORE_SWITCH_ENUM
switch (context->column) {
case COLUMN_TITLE:
g_free (track->title);
@@ -1358,6 +1359,7 @@ on_cell_editing_done_foreach (GtkTreeModel *model,
g_warning ("Unknown column %d in on_cell_editing_done_foreach",
context->column);
}
+ SJ_END_IGNORE_SWITCH_ENUM
}
static void
@@ -1373,6 +1375,7 @@ on_cell_editing_canceled_foreach (GtkTreeModel *model,
/* COLUMN_DETAILS isn't updated during editing so get original
values back from it. */
gtk_tree_model_get (model, iter, COLUMN_DETAILS, &track, -1);
+ SJ_BEGIN_IGNORE_SWITCH_ENUM
switch (context->column) {
case COLUMN_TITLE:
text = track->title;
@@ -1388,6 +1391,7 @@ on_cell_editing_canceled_foreach (GtkTreeModel *model,
context->column);
return;
}
+ SJ_END_IGNORE_SWITCH_ENUM
gtk_list_store_set (track_store, iter, context->column, text, -1);
}
diff --git a/src/sj-tree-view.c b/src/sj-tree-view.c
index 9cc23ab..074fb81 100644
--- a/src/sj-tree-view.c
+++ b/src/sj-tree-view.c
@@ -18,6 +18,7 @@
*/
#include "sj-tree-view.h"
+#include "sj-util.h"
static GtkTreeViewClass *parent_class;
@@ -238,6 +239,8 @@ find_next_activatable_column (GtkTreeView *self,
column_list = gtk_tree_view_get_columns (self);
current_column = g_list_find (column_list, column);
+
+ SJ_BEGIN_IGNORE_SWITCH_ENUM
switch (direction) {
case GTK_DIR_TAB_FORWARD:
wrap = TRUE;
@@ -262,6 +265,7 @@ find_next_activatable_column (GtkTreeView *self,
direction);
return FALSE;
}
+ SJ_END_IGNORE_SWITCH_ENUM
*move_row = 0;
do {
@@ -360,6 +364,7 @@ sj_tree_view_move_cursor (GtkTreeView *self,
start_editing = sj_tree_view_is_editing (self);
+ SJ_BEGIN_IGNORE_SWITCH_ENUM
switch (step) {
case GTK_MOVEMENT_LOGICAL_POSITIONS:
case GTK_MOVEMENT_VISUAL_POSITIONS:
@@ -390,6 +395,7 @@ sj_tree_view_move_cursor (GtkTreeView *self,
default:
g_return_val_if_reached (FALSE);
}
+ SJ_END_IGNORE_SWITCH_ENUM
if (!moved)
return FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]