diff options
| author | Nicolas Dufour <nicoduf@yahoo.fr> | 2014-02-05 11:29:11 +0000 |
|---|---|---|
| committer | JazzyNico <nicoduf@yahoo.fr> | 2014-02-05 11:29:11 +0000 |
| commit | c7731033ef400fccb6a49d830ded86068fcd3432 (patch) | |
| tree | f3858438132a3f17071321ef91ddfac5e3c6b0ba /src/livarot/ShapeMisc.cpp | |
| parent | Workaround for Bug #1273510 (crash in in cc_generic_knot_handler() after tool... (diff) | |
| download | inkscape-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/livarot/ShapeMisc.cpp')
| -rw-r--r-- | src/livarot/ShapeMisc.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/livarot/ShapeMisc.cpp b/src/livarot/ShapeMisc.cpp index e5a98f0cf..c0bfe9428 100644 --- a/src/livarot/ShapeMisc.cpp +++ b/src/livarot/ShapeMisc.cpp @@ -373,7 +373,7 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int /*wildPath* int lastPtUsed = 0; do { - int dadContour=-1; + int parentContour=-1; int childEdge = -1; bool foundChild = false; int startBord = -1; @@ -387,10 +387,10 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int /*wildPath* { int askTo = pData[fi].askForWindingB; if (askTo < 0 || askTo >= numberOfEdges() ) { - dadContour=-1; + parentContour=-1; } else { - dadContour = GPOINTER_TO_INT(swdData[askTo].misc); - dadContour-=1; // pour compenser le decalage + parentContour = GPOINTER_TO_INT(swdData[askTo].misc); + parentContour-=1; // pour compenser le decalage childEdge = getPoint(fi).incidentEdge[FIRST]; } } @@ -463,7 +463,7 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int /*wildPath* contStart=(int*)g_realloc(contStart,(nbNest+1)*sizeof(int)); contStart[nbNest]=dest->descr_cmd.size(); if (foundChild) { - nesting[nbNest++]=dadContour; + nesting[nbNest++]=parentContour; foundChild = false; } else { nesting[nbNest++]=-1; // contient des bouts de coupure -> a part @@ -504,7 +504,7 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int /*wildPath* contStart=(int*)g_realloc(contStart,(nbNest+1)*sizeof(int)); contStart[nbNest]=dest->descr_cmd.size(); if (foundChild) { - nesting[nbNest++]=dadContour; + nesting[nbNest++]=parentContour; foundChild = false; } else { nesting[nbNest++]=-1; // contient des bouts de coupure -> a part |