Tweak names

nyalldawson · nyalldawson · commit 4fc76c4be8c5 · 2019-06-10T17:19:40.000+10:00
(cherry picked from commit 789a758)
diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp
@@ -1004,15 +1004,15 @@ LabelPosition *FeaturePart::curvedPlacementAtOffset( PointSet *path_positions, d
     for ( int i = 0; i < li->char_num; i++ )
     {
       LabelInfo::CharacterInfo &ci = li->char_info[i];
-      double start_x, start_y;
-      if ( !nextCharPosition( ci.width, path_distances[endindex], path_positions, endindex, _distance, start_x, start_y, endLabelX, endLabelY ) )
+      double characterStartX, characterStartY;
+      if ( !nextCharPosition( ci.width, path_distances[endindex], path_positions, endindex, _distance, characterStartX, characterStartY, endLabelX, endLabelY ) )
       {
         return nullptr;
       }
       if ( i == 0 )
       {
-        startLabelX = start_x;
-        startLabelY = start_y;
+        startLabelX = characterStartX;
+        startLabelY = characterStartY;
       }
     }
 
@@ -1176,7 +1176,7 @@ int FeaturePart::createCurvedCandidatesAlongLine( QList< LabelPosition * > &lPos
   if ( totalCharacterWidth > total_distance )
   {
     // label doesn't fit on this line, don't waste time trying to make candidates
-    // TODO - in future allow this, and allow label to overlap end of line
+    // TODO: in future allow this, and allow label to overlap end of line
     return 0;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1004,15 +1004,15 @@ LabelPosition FeaturePart::curvedPlacementAtOffset( PointSet path_positions, d`
`1004`	`1004`	`for ( int i = 0; i < li->char_num; i++ )`
`1005`	`1005`	`{`
`1006`	`1006`	`LabelInfo::CharacterInfo &ci = li->char_info[i];`
`1007`		`- double start_x, start_y;`
`1008`		`- if ( !nextCharPosition( ci.width, path_distances[endindex], path_positions, endindex, _distance, start_x, start_y, endLabelX, endLabelY ) )`
	`1007`	`+ double characterStartX, characterStartY;`
	`1008`	`+ if ( !nextCharPosition( ci.width, path_distances[endindex], path_positions, endindex, _distance, characterStartX, characterStartY, endLabelX, endLabelY ) )`
`1009`	`1009`	`{`
`1010`	`1010`	`return nullptr;`
`1011`	`1011`	`}`
`1012`	`1012`	`if ( i == 0 )`
`1013`	`1013`	`{`
`1014`		`- startLabelX = start_x;`
`1015`		`- startLabelY = start_y;`
	`1014`	`+ startLabelX = characterStartX;`
	`1015`	`+ startLabelY = characterStartY;`
`1016`	`1016`	`}`
`1017`	`1017`	`}`
`1018`	`1018`
`@@ -1176,7 +1176,7 @@ int FeaturePart::createCurvedCandidatesAlongLine( QList< LabelPosition * > &lPos`
`1176`	`1176`	`if ( totalCharacterWidth > total_distance )`
`1177`	`1177`	`{`
`1178`	`1178`	`// label doesn't fit on this line, don't waste time trying to make candidates`
`1179`		`- // TODO - in future allow this, and allow label to overlap end of line`
	`1179`	`+ // TODO: in future allow this, and allow label to overlap end of line`
`1180`	`1180`	`return 0;`
`1181`	`1181`	`}`
`1182`	`1182`