summaryrefslogtreecommitdiffstats
path: root/src/splivarot.cpp
diff options
context:
space:
mode:
authorNicolas Dufour <nicoduf@yahoo.fr>2014-02-05 11:29:11 +0000
committerJazzyNico <nicoduf@yahoo.fr>2014-02-05 11:29:11 +0000
commitc7731033ef400fccb6a49d830ded86068fcd3432 (patch)
treef3858438132a3f17071321ef91ddfac5e3c6b0ba /src/splivarot.cpp
parentWorkaround for Bug #1273510 (crash in in cc_generic_knot_handler() after tool... (diff)
downloadinkscape-c7731033ef400fccb6a49d830ded86068fcd3432.tar.gz
inkscape-c7731033ef400fccb6a49d830ded86068fcd3432.zip
Fix for Bug #1250685 (Unnecessary gender-specific terms in code).
Fixed bugs: - https://launchpad.net/bugs/1250685 (bzr r12997)
Diffstat (limited to 'src/splivarot.cpp')
-rw-r--r--src/splivarot.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index e5006884c..5c7b389ff 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -371,18 +371,18 @@ sp_selected_path_boolop(Inkscape::Selection *selection, SPDesktop *desktop, bool
// objects are not in parent/child relationship;
// find their lowest common ancestor
- Inkscape::XML::Node *dad = LCA(a, b);
- if (dad == NULL) {
+ Inkscape::XML::Node *parent = LCA(a, b);
+ if (parent == NULL) {
boolop_display_error_message(desktop, _("Unable to determine the <b>z-order</b> of the objects selected for difference, XOR, division, or path cut."));
return;
}
// find the children of the LCA that lead from it to the a and b
- Inkscape::XML::Node *as = AncetreFils(a, dad);
- Inkscape::XML::Node *bs = AncetreFils(b, dad);
+ Inkscape::XML::Node *as = AncetreFils(a, parent);
+ Inkscape::XML::Node *bs = AncetreFils(b, parent);
// find out which comes first
- for (Inkscape::XML::Node *child = dad->firstChild(); child; child = child->next()) {
+ for (Inkscape::XML::Node *child = parent->firstChild(); child; child = child->next()) {
if (child == as) {
/* a first, so reverse. */
reverseOrderForOp = true;