From a227e8d45e7eaa6bf25d8ab65fbd404bc4597306 Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Wed, 20 Jul 2016 13:45:05 +0200
Subject: Changed signatures of boolean functions

(bzr r14954.1.24)
---
 src/ui/tools/calligraphic-tool.cpp | 4 ++--
 src/ui/tools/eraser-tool.cpp       | 6 +++---
 src/ui/tools/flood-tool.cpp        | 2 +-
 src/ui/tools/spray-tool.cpp        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp
index 28195eb75..12dcedd21 100644
--- a/src/ui/tools/calligraphic-tool.cpp
+++ b/src/ui/tools/calligraphic-tool.cpp
@@ -930,10 +930,10 @@ void CalligraphicTool::set_to_accumulated(bool unionize, bool subtract) {
 
         if (unionize) {
             desktop->getSelection()->add(this->repr);
-            sp_selected_path_union_skip_undo(desktop->getSelection(), desktop);
+            sp_selected_path_union_skip_undo(desktop->getSelection());
         } else if (subtract) {
             desktop->getSelection()->add(this->repr);
-            sp_selected_path_diff_skip_undo(desktop->getSelection(), desktop);
+            sp_selected_path_diff_skip_undo(desktop->getSelection());
         } else {
             if (this->keep_selected) {
                 desktop->getSelection()->set(this->repr);
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index 534123e90..8ed75fbdb 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -718,7 +718,7 @@ void EraserTool::set_to_accumulated() {
                                 Inkscape::GC::release(dup); // parent takes over
                                 selection->set(dup);
                                 if (!this->nowidth) {
-                                    sp_selected_path_union_skip_undo(selection, desktop);
+                                    sp_selected_path_union_skip_undo(selection);
                                 }
                                 selection->add(item);
                                 if(item->style->fill_rule.value == SP_WIND_RULE_EVENODD){
@@ -729,9 +729,9 @@ void EraserTool::set_to_accumulated() {
                                     css = 0;
                                 }
                                 if (this->nowidth) {
-                                    sp_selected_path_cut_skip_undo(selection, desktop);
+                                    sp_selected_path_cut_skip_undo(selection);
                                 } else {
-                                    sp_selected_path_diff_skip_undo(selection, desktop);
+                                    sp_selected_path_diff_skip_undo(selection);
                                 }
                                 workDone = true; // TODO set this only if something was cut.
                                 bool break_apart = prefs->getBool("/tools/eraser/break_apart", false);
diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index 748c82717..b5a2fd871 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -456,7 +456,7 @@ static void do_trace(bitmap_coords_info bci, guchar *trace_px, SPDesktop *deskto
                     ngettext("Area filled, path with <b>%d</b> node created and unioned with selection.","Area filled, path with <b>%d</b> nodes created and unioned with selection.",
                     SP_PATH(reprobj)->nodesInPath()), SP_PATH(reprobj)->nodesInPath() );
                 selection->add(reprobj);
-                sp_selected_path_union_skip_undo(desktop->getSelection(), desktop);
+                sp_selected_path_union_skip_undo(desktop->getSelection());
             } else {
                 desktop->messageStack()->flashF( Inkscape::WARNING_MESSAGE,
                     ngettext("Area filled, path with <b>%d</b> node created.","Area filled, path with <b>%d</b> nodes created.",
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 5d804a9bd..a95e5aa96 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -1050,7 +1050,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                     if (unionResult) { // No need to add the very first item (initialized with NULL).
                         selection->add(unionResult);
                     }
-                    sp_selected_path_union_skip_undo(selection, selection->desktop());
+                    sp_selected_path_union_skip_undo(selection);
                     selection->add(parent_item);
                     Inkscape::GC::release(copy);
                     did = true;
-- 
cgit v1.2.3