Fix c++ cmpiler warnings

GdkModifierType cast

diff --git a/src/collect-table.cc b/src/collect-table.cc
index f374d91..55d34d6 100644 (file)
--- a/src/collect-table.cc
+++ b/src/collect-table.cc
@@ -77,25 +77,25 @@ hard_coded_window_keys collection_window_keys[] = {
        {GDK_CONTROL_MASK, 'R', N_("Rename")},
        {GDK_CONTROL_MASK, 'D', N_("Move to Trash")},
        {GDK_CONTROL_MASK, 'W', N_("Close window")},
-       {0, GDK_KEY_Delete, N_("Remove")},
-       {0, GDK_KEY_Return, N_("View")},
-       {0, 'V', N_("View in new window")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Delete, N_("Remove")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Return, N_("View")},
+       {static_cast<GdkModifierType>(0), 'V', N_("View in new window")},
        {GDK_CONTROL_MASK, 'A', N_("Select all")},
        {GDK_CONTROL_MASK + GDK_SHIFT_MASK, 'A', N_("Select none")},
        {GDK_MOD1_MASK, 'R', N_("Rectangular selection")},
-       {0, GDK_KEY_space, N_("Select single file")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_space, N_("Select single file")},
        {GDK_CONTROL_MASK, GDK_KEY_space, N_("Toggle select image")},
        {GDK_CONTROL_MASK, 'L', N_("Append from file selection")},
-       {0, 'A', N_("Append from collection")},
-       {0, 'S', N_("Save collection")},
+       {static_cast<GdkModifierType>(0), 'A', N_("Append from collection")},
+       {static_cast<GdkModifierType>(0), 'S', N_("Save collection")},
        {GDK_CONTROL_MASK, 'S', N_("Save collection as")},
        {GDK_CONTROL_MASK, 'T', N_("Show filename text")},
-       {0, 'N', N_("Sort by name")},
-       {0, 'D', N_("Sort by date")},
-       {0, 'B', N_("Sort by size")},
-       {0, 'P', N_("Sort by path")},
+       {static_cast<GdkModifierType>(0), 'N', N_("Sort by name")},
+       {static_cast<GdkModifierType>(0), 'D', N_("Sort by date")},
+       {static_cast<GdkModifierType>(0), 'B', N_("Sort by size")},
+       {static_cast<GdkModifierType>(0), 'P', N_("Sort by path")},
        {GDK_SHIFT_MASK, 'P', N_("Print")},
-       {0, 0, NULL}
+       {static_cast<GdkModifierType>(0), 0, NULL}
 };
 
 /*

diff --git a/src/dupe.cc b/src/dupe.cc
index d3bd9b1..1a696d5 100644 (file)
--- a/src/dupe.cc
+++ b/src/dupe.cc
@@ -147,20 +147,20 @@ hard_coded_window_keys dupe_window_keys[] = {
        {GDK_CONTROL_MASK, 'R', N_("Rename")},
        {GDK_CONTROL_MASK, 'D', N_("Move to Trash")},
        {GDK_SHIFT_MASK, GDK_KEY_Delete, N_("Delete")},
-       {0, GDK_KEY_Delete, N_("Remove")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Delete, N_("Remove")},
        {GDK_CONTROL_MASK, GDK_KEY_Delete, N_("Clear")},
        {GDK_CONTROL_MASK, 'A', N_("Select all")},
        {GDK_CONTROL_MASK + GDK_SHIFT_MASK, 'A', N_("Select none")},
        {GDK_CONTROL_MASK, 'T', N_("Toggle thumbs")},
        {GDK_CONTROL_MASK, 'W', N_("Close window")},
-       {0, GDK_KEY_Return, N_("View")},
-       {0, 'V', N_("View in new window")},
-       {0, 'C', N_("Collection from selection")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Return, N_("View")},
+       {static_cast<GdkModifierType>(0), 'V', N_("View in new window")},
+       {static_cast<GdkModifierType>(0), 'C', N_("Collection from selection")},
        {GDK_CONTROL_MASK, 'L', N_("Append list")},
-       {0, '0', N_("Select none")},
-       {0, '1', N_("Select group 1 duplicates")},
-       {0, '2', N_("Select group 2 duplicates")},
-       {0, 0, NULL}
+       {static_cast<GdkModifierType>(0), '0', N_("Select none")},
+       {static_cast<GdkModifierType>(0), '1', N_("Select group 1 duplicates")},
+       {static_cast<GdkModifierType>(0), '2', N_("Select group 2 duplicates")},
+       {static_cast<GdkModifierType>(0), 0, NULL}
 };
 
 /**

diff --git a/src/img-view.cc b/src/img-view.cc
index 6219f98..2a874ee 100644 (file)
--- a/src/img-view.cc
+++ b/src/img-view.cc
@@ -87,50 +87,50 @@ hard_coded_window_keys image_window_keys[] = {
        {GDK_CONTROL_MASK, 'M', N_("Move")},
        {GDK_CONTROL_MASK, 'R', N_("Rename")},
        {GDK_CONTROL_MASK, 'D', N_("Move to Trash")},
-       {0, GDK_KEY_Delete, N_("Move to Trash")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Delete, N_("Move to Trash")},
        {GDK_SHIFT_MASK, GDK_KEY_Delete, N_("Delete")},
        {GDK_CONTROL_MASK, 'W', N_("Close window")},
        {GDK_SHIFT_MASK, 'R', N_("Rotate 180°")},
        {GDK_SHIFT_MASK, 'M', N_("Rotate mirror")},
        {GDK_SHIFT_MASK, 'F', N_("Rotate flip")},
-       {0, ']', N_(" Rotate counterclockwise 90°")},
-       {0, '[', N_(" Rotate clockwise 90°")},
-       {0, GDK_KEY_Page_Up, N_("Previous")},
-       {0, GDK_KEY_KP_Page_Up, N_("Previous")},
-       {0, GDK_KEY_BackSpace, N_("Previous")},
-       {0, 'B', N_("Previous")},
-       {0, GDK_KEY_Page_Down, N_("Next")},
-       {0, GDK_KEY_KP_Page_Down, N_("Next")},
-       {0, GDK_KEY_space, N_("Next")},
-       {0, 'N', N_("Next")},
-       {0, GDK_KEY_equal, N_("Zoom in")},
-       {0, GDK_KEY_plus, N_("Zoom in")},
-       {0, GDK_KEY_minus, N_("Zoom out")},
-       {0, 'X', N_("Zoom to fit")},
-       {0, GDK_KEY_KP_Multiply, N_("Zoom to fit")},
-       {0, 'Z', N_("Zoom 1:1")},
-       {0, GDK_KEY_KP_Divide, N_("Zoom 1:1")},
-       {0, GDK_KEY_1, N_("Zoom 1:1")},
-       {0, '2', N_("Zoom 2:1")},
-       {0, '3', N_("Zoom 3:1")},
-       {0, '4', N_("Zoom 4:1")},
-       {0, '7', N_("Zoom 1:4")},
-       {0, '8', N_("Zoom 1:3")},
-       {0, '9', N_("Zoom 1:2")},
-       {0, 'W', N_("Zoom fit window width")},
-       {0, 'H', N_("Zoom fit window height")},
-       {0, 'S', N_("Toggle slideshow")},
-       {0, 'P', N_("Pause slideshow")},
-       {0, 'R', N_("Reload image")},
-       {0, 'F', N_("Full screen")},
-       {0, 'V', N_("Fullscreen")},
-       {0, GDK_KEY_F11, N_("Fullscreen")},
-       {0, 'I', N_("Image overlay")},
-       {0, GDK_KEY_Escape, N_("Exit fullscreen")},
-       {0, GDK_KEY_Escape, N_("Close window")},
+       {static_cast<GdkModifierType>(0), ']', N_(" Rotate counterclockwise 90°")},
+       {static_cast<GdkModifierType>(0), '[', N_(" Rotate clockwise 90°")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Page_Up, N_("Previous")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_KP_Page_Up, N_("Previous")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_BackSpace, N_("Previous")},
+       {static_cast<GdkModifierType>(0), 'B', N_("Previous")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Page_Down, N_("Next")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_KP_Page_Down, N_("Next")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_space, N_("Next")},
+       {static_cast<GdkModifierType>(0), 'N', N_("Next")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_equal, N_("Zoom in")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_plus, N_("Zoom in")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_minus, N_("Zoom out")},
+       {static_cast<GdkModifierType>(0), 'X', N_("Zoom to fit")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_KP_Multiply, N_("Zoom to fit")},
+       {static_cast<GdkModifierType>(0), 'Z', N_("Zoom 1:1")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_KP_Divide, N_("Zoom 1:1")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_1, N_("Zoom 1:1")},
+       {static_cast<GdkModifierType>(0), '2', N_("Zoom 2:1")},
+       {static_cast<GdkModifierType>(0), '3', N_("Zoom 3:1")},
+       {static_cast<GdkModifierType>(0), '4', N_("Zoom 4:1")},
+       {static_cast<GdkModifierType>(0), '7', N_("Zoom 1:4")},
+       {static_cast<GdkModifierType>(0), '8', N_("Zoom 1:3")},
+       {static_cast<GdkModifierType>(0), '9', N_("Zoom 1:2")},
+       {static_cast<GdkModifierType>(0), 'W', N_("Zoom fit window width")},
+       {static_cast<GdkModifierType>(0), 'H', N_("Zoom fit window height")},
+       {static_cast<GdkModifierType>(0), 'S', N_("Toggle slideshow")},
+       {static_cast<GdkModifierType>(0), 'P', N_("Pause slideshow")},
+       {static_cast<GdkModifierType>(0), 'R', N_("Reload image")},
+       {static_cast<GdkModifierType>(0), 'F', N_("Full screen")},
+       {static_cast<GdkModifierType>(0), 'V', N_("Fullscreen")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_F11, N_("Fullscreen")},
+       {static_cast<GdkModifierType>(0), 'I', N_("Image overlay")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Escape, N_("Exit fullscreen")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Escape, N_("Close window")},
        {GDK_SHIFT_MASK, 'G', N_("Desaturate")},
        {GDK_SHIFT_MASK, 'P', N_("Print")},
-       {0, 0, NULL}
+       {static_cast<GdkModifierType>(0), 0, NULL}
 };
 
 

diff --git a/src/pan-view/pan-view.cc b/src/pan-view/pan-view.cc
index a31dd09..0ecdc97 100644 (file)
--- a/src/pan-view/pan-view.cc
+++ b/src/pan-view/pan-view.cc
@@ -95,37 +95,37 @@ hard_coded_window_keys pan_view_window_keys[] = {
        {GDK_CONTROL_MASK, 'W', N_("Close window")},
        {GDK_CONTROL_MASK, 'F', N_("Display Find search bar")},
        {GDK_CONTROL_MASK, 'G', N_("Start search")},
-       {0, GDK_KEY_Escape, N_("Exit fullscreen")},
-       {0, GDK_KEY_Escape, N_("Hide Find search bar")},
-       {0, GDK_KEY_equal, N_("Zoom in")},
-       {0, GDK_KEY_plus, N_("Zoom in")},
-       {0, GDK_KEY_minus, N_("Zoom out")},
-       {0, GDK_KEY_Z, N_("Zoom 1:1")},
-       {0, GDK_KEY_1, N_("Zoom 1:1")},
-       {0, GDK_KEY_KP_Divide, N_("Zoom 1:1")},
-       {0, '2', N_("Zoom 2:1")},
-       {0, '3', N_("Zoom 3:1")},
-       {0, '4', N_("Zoom 4:1")},
-       {0, '7', N_("Zoom 1:4")},
-       {0, '8', N_("Zoom 1:3")},
-       {0, '9', N_("Zoom 1:2")},
-       {0, 'F', N_("Full screen")},
-       {0, 'V', N_("Full screen")},
-       {0, GDK_KEY_F11, N_("Full screen")},
-       {0, '/', N_("Display Find search bar")},
-       {0, GDK_KEY_Left, N_("Scroll left")},
-       {0, GDK_KEY_Right, N_("Scroll right")},
-       {0, GDK_KEY_Up, N_("Scroll up")},
-       {0, GDK_KEY_Down, N_("Scroll down")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Escape, N_("Exit fullscreen")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Escape, N_("Hide Find search bar")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_equal, N_("Zoom in")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_plus, N_("Zoom in")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_minus, N_("Zoom out")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Z, N_("Zoom 1:1")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_1, N_("Zoom 1:1")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_KP_Divide, N_("Zoom 1:1")},
+       {static_cast<GdkModifierType>(0), '2', N_("Zoom 2:1")},
+       {static_cast<GdkModifierType>(0), '3', N_("Zoom 3:1")},
+       {static_cast<GdkModifierType>(0), '4', N_("Zoom 4:1")},
+       {static_cast<GdkModifierType>(0), '7', N_("Zoom 1:4")},
+       {static_cast<GdkModifierType>(0), '8', N_("Zoom 1:3")},
+       {static_cast<GdkModifierType>(0), '9', N_("Zoom 1:2")},
+       {static_cast<GdkModifierType>(0), 'F', N_("Full screen")},
+       {static_cast<GdkModifierType>(0), 'V', N_("Full screen")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_F11, N_("Full screen")},
+       {static_cast<GdkModifierType>(0), '/', N_("Display Find search bar")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Left, N_("Scroll left")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Right, N_("Scroll right")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Up, N_("Scroll up")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Down, N_("Scroll down")},
        {GDK_SHIFT_MASK, GDK_KEY_Left, N_("Scroll left faster")},
        {GDK_SHIFT_MASK, GDK_KEY_Right, N_("Scroll right faster")},
        {GDK_SHIFT_MASK, GDK_KEY_Up, N_("Scroll up faster")},
        {GDK_SHIFT_MASK, GDK_KEY_Down, N_("Scroll down faster")},
-       {0, GDK_KEY_Page_Up, N_("Scroll display half screen up")},
-       {0, GDK_KEY_Page_Down, N_("Scroll display half screen down")},
-       {0, GDK_KEY_Home, N_("Scroll display half screen left")},
-       {0, GDK_KEY_End, N_("Scroll display half screen right")},
-       {0, 0, NULL}
+       {static_cast<GdkModifierType>(0), GDK_KEY_Page_Up, N_("Scroll display half screen up")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Page_Down, N_("Scroll display half screen down")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Home, N_("Scroll display half screen left")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_End, N_("Scroll display half screen right")},
+       {static_cast<GdkModifierType>(0), 0, NULL}
 };
 
 /*

diff --git a/src/search.cc b/src/search.cc
index 2bc56a0..d7e2346 100644 (file)
--- a/src/search.cc
+++ b/src/search.cc
@@ -351,18 +351,18 @@ hard_coded_window_keys search_window_keys[] = {
        {GDK_CONTROL_MASK, 'R', N_("Rename")},
        {GDK_CONTROL_MASK, 'D', N_("Move to Trash")},
        {GDK_SHIFT_MASK, GDK_KEY_Delete, N_("Delete")},
-       {0, GDK_KEY_Delete, N_("Remove")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Delete, N_("Remove")},
        {GDK_CONTROL_MASK, 'A', N_("Select all")},
        {GDK_CONTROL_MASK + GDK_SHIFT_MASK, 'A', N_("Select none")},
        {GDK_CONTROL_MASK, GDK_KEY_Delete, N_("Clear")},
        {GDK_CONTROL_MASK, 'T', N_("Toggle thumbs")},
        {GDK_CONTROL_MASK, 'W', N_("Close window")},
-       {0, GDK_KEY_Return, N_("View")},
-       {0, 'V', N_("View in new window")},
-       {0, 'C', N_("Collection from selection")},
+       {static_cast<GdkModifierType>(0), GDK_KEY_Return, N_("View")},
+       {static_cast<GdkModifierType>(0), 'V', N_("View in new window")},
+       {static_cast<GdkModifierType>(0), 'C', N_("Collection from selection")},
        {GDK_CONTROL_MASK, GDK_KEY_Return, N_("Start/stop search")},
-       {0, GDK_KEY_F3, N_("Find duplicates")},
-       {0, 0, NULL}
+       {static_cast<GdkModifierType>(0), GDK_KEY_F3, N_("Find duplicates")},
+       {static_cast<GdkModifierType>(0), 0, NULL}
 };
 /*
  *-------------------------------------------------------------------