From 40b60abcb31e9f088c25e403e7225fff5ccd1ffe Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 29 May 2018 11:29:44 -0400 Subject: [PATCH] [locale] Move constants for map-munging These don't have to be defines at all. --- src/modules/locale/timezonewidget/timezonewidget.cpp | 3 +++ src/modules/locale/timezonewidget/timezonewidget.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/locale/timezonewidget/timezonewidget.cpp b/src/modules/locale/timezonewidget/timezonewidget.cpp index 64557c151..6609160d5 100644 --- a/src/modules/locale/timezonewidget/timezonewidget.cpp +++ b/src/modules/locale/timezonewidget/timezonewidget.cpp @@ -27,6 +27,9 @@ #include "timezonewidget.h" + +static constexpr double MAP_Y_OFFSET = 0.125; +static constexpr double MAP_X_OFFSET = -0.0370; constexpr static double MATH_PI = 3.14159265; #ifdef DEBUG_TIMEZONES diff --git a/src/modules/locale/timezonewidget/timezonewidget.h b/src/modules/locale/timezonewidget/timezonewidget.h index a96a0309c..8589dc74d 100644 --- a/src/modules/locale/timezonewidget/timezonewidget.h +++ b/src/modules/locale/timezonewidget/timezonewidget.h @@ -36,8 +36,6 @@ #include "localeglobal.h" -#define MAP_Y_OFFSET 0.125 -#define MAP_X_OFFSET -0.0370 #define RGB_TRANSPARENT 0 #define ZONES "0.0 1.0 2.0 3.0 3.5 4.0 4.5 5.0 5.5 5.75 6.0 6.5 7.0 8.0 9.0 9.5 10.0 10.5 11.0 11.5 12.0 12.75 13.0 -1.0 -2.0 -3.0 -3.5 -4.0 -4.5 -5.0 -5.5 -6.0 -7.0 -8.0 -9.0 -9.5 -10.0 -11.0" #define X_SIZE 780