Eliminate clang warnings

-Wconstant-conversion
-Wenum-compare-switch
-Wpointer-bool-conversion
-Wundefined-bool-conversion
-Wunused-value

Excluding deprecation warnings and 3rdparty directory.

3 files changed, 9 insertions, 8 deletions

diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index edfdf2838..ea425a1f1 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -563,7 +563,7 @@ void GridArrangeTab::updateSelection()
 GridArrangeTab::GridArrangeTab(ArrangeDialog *parent)
     : Parent(parent),
       XPadding(_("X:"), _("Horizontal spacing between columns."), UNIT_TYPE_LINEAR, "", "object-columns", &PaddingUnitMenu),
-      YPadding(_("Y:"), _("Vertical spacing between rows."), XPadding, "", "object-rows", &PaddingUnitMenu),
+      YPadding(_("Y:"), _("Vertical spacing between rows."), XPadding, "", "object-rows"),
       PaddingTable(Gtk::manage(new Gtk::Grid()))
 {
      // bool used by spin button callbacks to stop loops where they change each other.
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
index 29cb57286..438914d6f 100644
--- a/src/ui/dialog/input.cpp
+++ b/src/ui/dialog/input.cpp
@@ -856,20 +856,20 @@ void InputDialogImpl::setupTree( Glib::RefPtr<Gtk::TreeStore> store, Gtk::TreeIt
                 deviceRow[getCols().device] = dev;
                 deviceRow[getCols().mode] = dev->getMode();
                 switch ( dev->getSource() ) {
-                    case GDK_SOURCE_MOUSE:
+                    case Gdk::SOURCE_MOUSE:
                         deviceRow[getCols().thumbnail] = getPix(PIX_CORE);
                         break;
-                    case GDK_SOURCE_PEN:
+                    case Gdk::SOURCE_PEN:
                         if (deviceRow[getCols().description] == _("pad")) {
                             deviceRow[getCols().thumbnail] = getPix(PIX_SIDEBUTTONS);
                         } else {
                             deviceRow[getCols().thumbnail] = getPix(PIX_TIP);
                         }
                         break;
-                    case GDK_SOURCE_CURSOR:
+                    case Gdk::SOURCE_CURSOR:
                         deviceRow[getCols().thumbnail] = getPix(PIX_MOUSE);
                         break;
-                    case GDK_SOURCE_ERASER:
+                    case Gdk::SOURCE_ERASER:
                         deviceRow[getCols().thumbnail] = getPix(PIX_ERASER);
                         break;
                     default:
@@ -1759,10 +1759,11 @@ bool InputDialogImpl::eventSnoop(GdkEvent* event)
             /// \fixme GTK3 added new GDK_SOURCEs that should be handled here!
             case GDK_SOURCE_KEYBOARD:
             case GDK_SOURCE_TOUCHSCREEN:
-            case GDK_SOURCE_TOUCHPAD: {
+            case GDK_SOURCE_TOUCHPAD:
+            case GDK_SOURCE_TRACKPOINT:
+            case GDK_SOURCE_TABLET_PAD:
                  g_warning("InputDialogImpl::eventSnoop : unhandled GDK_SOURCE type!");
                  break;
-            }
         }
 
         updateTestButtons(key, hotButton);
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index 884da2df2..7dfe2d7e8 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -1082,7 +1082,7 @@ void StyleDialog::_writeStyleElement(Glib::RefPtr<Gtk::TreeStore> store, Glib::u
 
         std::string pos = std::to_string(selectorpos);
         std::string selectormatch = "(";
-        for (selectorpos; selectorpos > 1; selectorpos--) {
+        for (; selectorpos > 1; selectorpos--) {
             selectormatch = selectormatch + "[^}]*?}";
         }
         selectormatch = selectormatch + ")([^}]*?})((.|\n)*)";