From 98bb797a4adf52993835f016f577ac7de5d56dce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Tue, 18 Mar 2014 17:57:51 +0100
Subject: explicit names

---
 src/text/collision.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/text/collision.cpp')

diff --git a/src/text/collision.cpp b/src/text/collision.cpp
index 37f065b4b2..1d08b53a2a 100644
--- a/src/text/collision.cpp
+++ b/src/text/collision.cpp
@@ -50,10 +50,11 @@ GlyphBox getMergedGlyphs(const GlyphBoxes &glyphs, bool horizontal,
     return mergedGlyphs;
 }
 
-Placement Collision::place(const GlyphBoxes &boxes,
-                           const CollisionAnchor &anchor,
-                           float minPlacementScale, float maxPlacementScale,
-                           float padding, bool horizontal) {
+PlacementProperty Collision::place(const GlyphBoxes &boxes,
+                                   const CollisionAnchor &anchor,
+                                   float minPlacementScale,
+                                   float maxPlacementScale, float padding,
+                                   bool horizontal) {
 
     float minScale = std::numeric_limits<float>::infinity();
     for (const GlyphBox &box : boxes) {
@@ -93,7 +94,7 @@ Placement Collision::place(const GlyphBoxes &boxes,
 
     // Return if the label can never be placed without collision
     if (scale < 0) {
-        return Placement{};
+        return PlacementProperty{};
     }
 
     // Calculate the range it is safe to rotate all glyphs
@@ -102,7 +103,7 @@ Placement Collision::place(const GlyphBoxes &boxes,
 
     float zoom = log(scale) / log(2);
 
-    return Placement{zoom, rotationRange};
+    return PlacementProperty{zoom, rotationRange};
 }
 
 float Collision::getPlacementScale(const GlyphBoxes &glyphs,
-- 
cgit v1.2.1