From 1a95ec3a651bbb83e51ce554d99cdc5f3693a016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Tue, 5 Aug 2014 13:51:07 +0200
Subject: [PATCH] explicitly named parameters

---
 src/text/collision.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/text/collision.cpp b/src/text/collision.cpp
index aa4cf1c7a..337251fcd 100644
--- a/src/text/collision.cpp
+++ b/src/text/collision.cpp
@@ -53,21 +53,31 @@ Collision::Collision(float zoom, float tileExtent, float tileSize, float placeme
     const float edge = m * tilePixelRatio * 2;
 
     // Hack to prevent cross-tile labels
-    insert({GlyphBox{/* box */ CollisionRect{CollisionPoint{-edge, -edge}, CollisionPoint{0, edge}},
+    insert(
+        /* glyphs */ {
+            GlyphBox{/* box */ CollisionRect{CollisionPoint{-edge, -edge}, CollisionPoint{0, edge}},
                      /* minScale */ 0,
                      /* padding */ 2},
             GlyphBox{/* box */ CollisionRect{CollisionPoint{-edge, -edge}, CollisionPoint{edge, 0}},
                      /* minScale */ 0,
                      /* padding */ 2}},
-           CollisionAnchor(0, 0), 1, {{M_PI * 2, 0}}, false);
+        /* anchor */ CollisionAnchor(0, 0),
+        /* placementScale */ 1,
+        /* placementRange */ {{M_PI * 2, 0}},
+        /* horizontal */ false);
 
-    insert({GlyphBox{/* box*/ CollisionRect{CollisionPoint{-edge, 0}, CollisionPoint{edge, edge}},
+    insert(
+        /* glyphs */ {
+            GlyphBox{/* box*/ CollisionRect{CollisionPoint{-edge, 0}, CollisionPoint{edge, edge}},
                      /* minScale */ 0,
                      /* padding */ 2},
             GlyphBox{/* box */ CollisionRect{CollisionPoint{0, -edge}, CollisionPoint{edge, edge}},
                      /* minScale */ 0,
                      /* padding */ 2}},
-           CollisionAnchor(m, m), 1, {{M_PI * 2, 0}}, false);
+        /* anchor */ CollisionAnchor(m, m),
+        /* placementScale */ 1,
+        /* placementRange */ {{M_PI * 2, 0}},
+        /* horizontal */ false);
 }
 
 GlyphBox getMergedGlyphs(const GlyphBoxes &boxes, const CollisionAnchor &anchor) {