rename settings => Settings

2 files changed, 21 insertions, 21 deletions

diff --git a/src/map/map.cpp b/src/map/map.cpp
index c6940f71ce..fc9e55abb3 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -10,7 +10,7 @@
 
 using namespace llmr;
 
-map::map(class settings *settings)
+map::map(Settings& settings)
     : settings(settings),
       transform(new class transform()),
       painter(new class painter(transform, settings)),
@@ -27,9 +27,9 @@ void map::setup() {
 }
 
 void map::loadSettings() {
-    transform->setAngle(settings->angle);
-    transform->setScale(settings->scale);
-    transform->setLonLat(settings->longitude, settings->latitude);
+    transform->setAngle(settings.angle);
+    transform->setScale(settings.scale);
+    transform->setLonLat(settings.longitude, settings.latitude);
     update();
 }
 
@@ -43,33 +43,33 @@ void map::moveBy(double dx, double dy) {
     transform->moveBy(dx, dy);
     update();
 
-    transform->getLonLat(settings->longitude, settings->latitude);
-    settings->save();
+    transform->getLonLat(settings.longitude, settings.latitude);
+    settings.save();
 }
 
 void map::scaleBy(double ds, double cx, double cy) {
     transform->scaleBy(ds, cx, cy);
     update();
 
-    transform->getLonLat(settings->longitude, settings->latitude);
-    settings->scale = transform->getScale();
-    settings->save();
+    transform->getLonLat(settings.longitude, settings.latitude);
+    settings.scale = transform->getScale();
+    settings.save();
 }
 
 void map::rotateBy(double cx, double cy, double sx, double sy, double ex, double ey) {
     transform->rotateBy(cx, cy, sx, sy, ex, ey);
     update();
 
-    settings->angle = transform->getAngle();
-    settings->save();
+    settings.angle = transform->getAngle();
+    settings.save();
 }
 
 void map::resetNorth() {
     transform->setAngle(0, 0.5); // 500 ms
     update();
 
-    settings->angle = transform->getAngle();
-    settings->save();
+    settings.angle = transform->getAngle();
+    settings.save();
 }
 
 void map::resetPosition() {
@@ -78,17 +78,17 @@ void map::resetPosition() {
     transform->setZoom(0);
     update();
 
-    transform->getLonLat(settings->longitude, settings->latitude);
-    settings->scale = transform->getScale();
-    settings->angle = transform->getAngle();
-    settings->save();
+    transform->getLonLat(settings.longitude, settings.latitude);
+    settings.scale = transform->getScale();
+    settings.angle = transform->getAngle();
+    settings.save();
 }
 
 void map::toggleDebug() {
-    settings->debug = !settings->debug;
+    settings.debug = !settings.debug;
     update();
 
-    settings->save();
+    settings.save();
 }
 
 void map::update() {
diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp
index 70e405ec1b..f4d35220db 100644
--- a/src/renderer/painter.cpp
+++ b/src/renderer/painter.cpp
@@ -27,7 +27,7 @@ GLshort tile_border_vertices[] = {
     0, 0
 };
 
-painter::painter(class transform *transform, class settings *settings)
+painter::painter(class transform *transform, Settings& settings)
     : transform(transform),
       settings(settings),
       currentShader(NULL),
@@ -161,7 +161,7 @@ void painter::render(const tile::ptr& tile) {
     glDrawArrays(GL_LINE_STRIP, 0, tile->lineVertex.length());
 
 
-    if (settings->debug) {
+    if (settings.debug) {
         renderDebug(tile);
     }
 }