Ticket #42866: 10019_10017.diff

src/2geom/interval.h

@@ -238 +238 @@
     /**
      * Check whether this OptInterval is empty or not.
      */
-    inline bool isEmpty() { return (*this == false); };
+    //inline bool isEmpty() { return (*this); };
     
     /**
      * If \c this is empty, copy argument \c a. Otherwise, union with it (and do nothing when \c a is empty)

src/2geom/rect.h

@@ -215 +215 @@
     /**
      * Check whether this OptRect is empty or not.
      */
-    inline bool isEmpty() const { return (*this == false); };
+    inline bool isEmpty() const { return (*this); };
 
     /**
      * If \c this is empty, copy argument \c b. Otherwise, union with it (and do nothing when \c b is empty)

src/color-profile.cpp

@@ -10 +10 @@
 #include <glib/gi18n.h>
 
 #ifdef DEBUG_LCMS
-#include <gtk.h>
+#include <gtk/gtk.h>
 #endif // DEBUG_LCMS
 
 #include <cstring>

src/connector-context.cpp

@@ -1287 +1287 @@
         if (found) {
             if (cc->clickedhandle == cc->endpt_handle[0]) {
                 sp_object_setAttribute(cc->clickeditem,
-                        "inkscape:connection-start", shape_label, false);
+                        "inkscape:connection-start", shape_label, NULL);
                 sp_object_setAttribute(cc->clickeditem,
-                        "inkscape:connection-start-point", cpid, false);
+                        "inkscape:connection-start-point", cpid, NULL);
             }
             else {
                 sp_object_setAttribute(cc->clickeditem,
-                        "inkscape:connection-end", shape_label, false);
+                        "inkscape:connection-end", shape_label, NULL);
                 sp_object_setAttribute(cc->clickeditem,
-                        "inkscape:connection-end-point", cpid, false);
+                        "inkscape:connection-end-point", cpid, NULL);
             }
             g_free(shape_label);
         }
@@ -1435 +1435 @@
 
         bool connection = false;
         sp_object_setAttribute(cc->newconn, "inkscape:connector-type",
-                cc->isOrthogonal ? "orthogonal" : "polyline", false);
+                cc->isOrthogonal ? "orthogonal" : "polyline", NULL);
         sp_object_setAttribute(cc->newconn, "inkscape:connector-curvature",
-                Glib::Ascii::dtostr(cc->curvature).c_str(), false);
+                Glib::Ascii::dtostr(cc->curvature).c_str(), NULL);
         if (cc->shref)
         {
             sp_object_setAttribute(cc->newconn, "inkscape:connection-start",
-                    cc->shref, false);
+                    cc->shref, NULL);
             if (cc->scpid)
                 sp_object_setAttribute(cc->newconn, "inkscape:connection-start-point",
-                        cc->scpid, false);
+                        cc->scpid, NULL);
             connection = true;
         }
 
         if (cc->ehref)
         {
             sp_object_setAttribute(cc->newconn, "inkscape:connection-end",
-                    cc->ehref, false);
+                    cc->ehref, NULL);
             if (cc->ecpid)
                 sp_object_setAttribute(cc->newconn, "inkscape:connection-end-point",
-                        cc->ecpid, false);
+                        cc->ecpid, NULL);
             connection = true;
         }
         // Process pending updates.
@@ -1937 +1937 @@
 
         if (cc_item_is_shape(item)) {
             sp_object_setAttribute(item, "inkscape:connector-avoid",
-                    value, false);
+                    value, NULL);
             item->avoidRef->handleSettingChange();
             changes++;
         }

src/extension/effect.cpp

@@ -323 +323 @@
 Inkscape::XML::Node *
 Effect::find_menu (Inkscape::XML::Node * menustruct, const gchar *name)
 {
-    if (menustruct == NULL) return false;
+    if (menustruct == NULL) return NULL;
     for (Inkscape::XML::Node * child = menustruct;
             child != NULL;
             child = child->next()) {

src/gradient-drag.cpp

@@ -1969 +1969 @@
 {
     if (!selected) return;
 
-    SPDocument *document = false;
+    SPDocument *document = NULL;
 
     struct StructStopInfo {
         SPStop * spstop;

src/interface.cpp

@@ -1154 +1154 @@
                             sp_object_setAttribute( SP_OBJECT(item),
                                                     fillnotstroke ? "inkscape:x-fill-tag":"inkscape:x-stroke-tag",
                                                     palName.c_str(),
-                                                    false );
+                                                    NULL );
                             item->updateRepr();
 
                             sp_repr_css_set_property( css, fillnotstroke ? "fill":"stroke", c );

src/live_effects/lpe-perp_bisector.h

@@ -27 +27 @@
   class KnotHolderEntityEnd;
   class KnotHolderEntityLeftEnd;
   class KnotHolderEntityRightEnd;
-  void bisector_end_set(SPItem *item, Geom::Point const &p, bool left);
+  void bisector_end_set(SPItem *item, Geom::Point const &p, bool left = true);
 }
 
 class LPEPerpBisector : public Effect {
@@ -46 +46 @@
     friend class PB::KnotHolderEntityEnd;
     friend class PB::KnotHolderEntityLeftEnd;
     friend class PB::KnotHolderEntityRightEnd;
-    friend void PB::bisector_end_set(SPItem *item, Geom::Point const &p, bool left = true);
+    friend void PB::bisector_end_set(SPItem *item, Geom::Point const &p, bool left);
 
 private:
     ScalarParam length_left;

src/sp-polygon.cpp

@@ -144 +144 @@
         (*p)++;
     }
 
-    if (*p == '\0') {
+    if (**p == '\0') {
         return false;
     }
 

src/widgets/toolbox.cpp

@@ -7932 +7932 @@
 
         if (cc_item_is_connector(item)) {
             sp_object_setAttribute(item, "inkscape:connector-type",
-                    value, false);
+                    value, NULL);
             item->avoidRef->handleSettingChange();
             modmade = true;
         }
@@ -7981 +7981 @@
 
         if (cc_item_is_connector(item)) {
             sp_object_setAttribute(item, "inkscape:connector-curvature",
-                    value, false);
+                    value, NULL);
             item->avoidRef->handleSettingChange();
             modmade = true;
         }