fix warnings and delete gradient pixmap that will not be used

diff --git a/src/file.cpp b/src/file.cpp
index 748a288e5aacff5e0ac919727fba0b2d0c52ddaa..904ff93231b39eeffd74576a307c4095caa5ef39 100644 (file)
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -547,7 +547,12 @@ file_save(Gtk::Window &parentWindow, SPDocument *doc, const Glib::ustring &uri,
  * Used only for remote saving using VFS and a specific uri. Gets the file at the /tmp.
  */
 bool
-file_save_remote(SPDocument */*doc*/, const Glib::ustring &uri,
+file_save_remote(SPDocument */*doc*/,
+    #ifdef WITH_GNOME_VFS
+                 const Glib::ustring &uri,
+    #else
+                 const Glib::ustring &/*uri*/,
+    #endif
                  Inkscape::Extension::Extension */*key*/, bool /*saveas*/, bool /*official*/)
 {
 #ifdef WITH_GNOME_VFS

diff --git a/src/gc.cpp b/src/gc.cpp
index 8d89de26a69784f9c2d62ec5576e7db50c760210..248a324bda7b86d220fd3ddd328094383ecd36cb 100644 (file)
--- a/src/gc.cpp
+++ b/src/gc.cpp
@@ -89,7 +89,7 @@ void dummy_register_finalizer(void *, CleanupFunc, void *,
 
 int dummy_general_register_disappearing_link(void **, void *) { return false; }
 
-int dummy_unregister_disappearing_link(void **link) { return false; }
+int dummy_unregister_disappearing_link(void **/*link*/) { return false; }
 
 std::size_t dummy_get_heap_size() { return 0; }
 

diff --git a/src/gradient-context.cpp b/src/gradient-context.cpp
index 5424b7a3d7289280e659e177749b48855ffbd68b..df4726967404fd4fa375a1f274d3c27cfd0093fe 100644 (file)
--- a/src/gradient-context.cpp
+++ b/src/gradient-context.cpp
@@ -29,7 +29,6 @@
 #include "message-stack.h"
 #include "pixmaps/cursor-gradient.xpm"
 #include "pixmaps/cursor-gradient-add.xpm"
-#include "pixmaps/cursor-gradient-delete.xpm"
 #include "gradient-context.h"
 #include "gradient-chemistry.h"
 #include <glibmm/i18n.h>

diff --git a/src/pixmaps/cursor-gradient-delete.xpm b/src/pixmaps/cursor-gradient-delete.xpm
deleted file mode 100644 (file)
index 109c281..0000000
--- a/src/pixmaps/cursor-gradient-delete.xpm
+++ /dev/null
@@ -1,38 +0,0 @@
-/* XPM */
-static char const *cursor_gradient_delete_xpm[] = {
-"32 32 3 1",
-"      c None",
-".     c #FFFFFF",
-"+     c #000000",
-"   ...                          ",
-"   .+.                          ",
-"   .+.                          ",
-"....+....                       ",
-".+++ +++.                       ",
-"....+....                       ",
-"   .+.                          ",
-"   .+.  .....                   ",
-"   ...  .+++.                   ",
-"        .+.+.                   ",
-"        .+++.                   ",
-"         .+.                    ",
-"         .+.                    ",
-"         .+.                    ",
-"         .+.                    ",
-"        .+++.                   ",
-"        .+.+.                   ",
-"        .+++.                   ",
-"        .....                   ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"               .............    ",
-"               .+++++++++++.    ",
-"               .............    ",
-"                                ",
-"                                ",
-"                                ",
-"                                "};

diff --git a/src/sp-animation.cpp b/src/sp-animation.cpp
index 8a2a02bdcb3a581e4567200be1014db0cf165fd9..2d9f2e94191478e4377bc9267025da0b1b63739e 100644 (file)
--- a/src/sp-animation.cpp
+++ b/src/sp-animation.cpp
@@ -78,7 +78,7 @@ sp_animation_class_init(SPAnimationClass *klass)
 }
 
 static void
-sp_animation_init(SPAnimation *animation)
+sp_animation_init(SPAnimation */*animation*/)
 {
 }
 
@@ -104,7 +104,7 @@ sp_animation_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *
 }
 
 static void
-sp_animation_release(SPObject *object)
+sp_animation_release(SPObject */*object*/)
 {
 }
 
@@ -165,7 +165,7 @@ sp_ianimation_class_init(SPIAnimationClass *klass)
 }
 
 static void
-sp_ianimation_init(SPIAnimation *animation)
+sp_ianimation_init(SPIAnimation */*animation*/)
 {
 }
 
@@ -188,7 +188,7 @@ sp_ianimation_build(SPObject *object, SPDocument *document, Inkscape::XML::Node
 }
 
 static void
-sp_ianimation_release(SPObject *object)
+sp_ianimation_release(SPObject */*object*/)
 {
 }
 
@@ -249,7 +249,7 @@ sp_animate_class_init(SPAnimateClass *klass)
 }
 
 static void
-sp_animate_init(SPAnimate *animate)
+sp_animate_init(SPAnimate */*animate*/)
 {
 }
 
@@ -262,7 +262,7 @@ sp_animate_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *re
 }
 
 static void
-sp_animate_release(SPObject *object)
+sp_animate_release(SPObject */*object*/)
 {
 }
 

diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index 87e3246f97194fe9b92315e8e4e2da76642ae2f6..01df68b993c3dbaec8b3d6ba58c3c54255dc54af 100644 (file)
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -351,7 +351,12 @@ sp_flowtext_print(SPItem *item, SPPrintContext *ctx)
     NRRect pbox;
     sp_item_invoke_bbox(item, &pbox, NR::identity(), TRUE);
     NRRect bbox;
-    sp_item_bbox_desktop(item, &bbox);
+    NR::Maybe<NR::Rect> bbox_maybe = sp_item_bbox_desktop(item);
+    if (!bbox_maybe) {
+        return;
+    }
+    bbox = NRRect(*bbox_maybe);
+
     NRRect dbox;
     dbox.x0 = 0.0;
     dbox.y0 = 0.0;