summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-06-03 18:05:04 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-06-13 11:16:19 +0200
commit2bdecdf9f9a93c30f7d482f9993c47b86a9f5eb8 (patch)
treeef946d0f27b721f12662047beda6ff1d3cb31e23 /platform
parent9b6c2e6940ed33a87a20274eda19320e8c688fdf (diff)
downloadqtlocation-mapboxgl-2bdecdf9f9a93c30f7d482f9993c47b86a9f5eb8.tar.gz
[core] fix pedantic warning messages
Diffstat (limited to 'platform')
-rw-r--r--platform/darwin/src/settings_nsuserdefaults.mm60
-rw-r--r--platform/default/run_loop.cpp4
2 files changed, 2 insertions, 62 deletions
diff --git a/platform/darwin/src/settings_nsuserdefaults.mm b/platform/darwin/src/settings_nsuserdefaults.mm
deleted file mode 100644
index 548ee9b220..0000000000
--- a/platform/darwin/src/settings_nsuserdefaults.mm
+++ /dev/null
@@ -1,60 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#include <mbgl/platform/darwin/settings_nsuserdefaults.hpp>
-
-using namespace mbgl;
-
-Settings_NSUserDefaults::Settings_NSUserDefaults()
-{
- [[NSUserDefaults standardUserDefaults] registerDefaults:@{
- @"longitude" : @(longitude),
- @"latitude" : @(latitude),
- @"zoom" : @(zoom),
- @"bearing" : @(bearing),
- @"pitch" : @(pitch),
- @"userTrackingMode" : @(userTrackingMode),
- @"showsUserLocation" : @(showsUserLocation),
- @"debug" : @(debug),
- }];
- load();
-}
-
-void Settings_NSUserDefaults::load()
-{
- NSDictionary *settings = [[NSUserDefaults standardUserDefaults] dictionaryRepresentation];
-
- longitude = [settings[@"longitude"] doubleValue];
- latitude = [settings[@"latitude"] doubleValue];
- zoom = [settings[@"zoom"] doubleValue];
- bearing = [settings[@"bearing"] doubleValue];
- pitch = [settings[@"pitch"] doubleValue];
- debug = [settings[@"debug"] boolValue];
-
- unsigned uncheckedTrackingMode = [settings[@"userTrackingMode"] unsignedIntValue];
- if (uncheckedTrackingMode > MGLUserTrackingModeNone &&
- uncheckedTrackingMode <= MGLUserTrackingModeFollowWithCourse)
- {
- userTrackingMode = (MGLUserTrackingMode)uncheckedTrackingMode;
- }
- showsUserLocation = [settings[@"showsUserLocation"] boolValue];
-}
-
-void Settings_NSUserDefaults::save()
-{
- [[NSUserDefaults standardUserDefaults] setValuesForKeysWithDictionary:@{
- @"longitude" : @(longitude),
- @"latitude" : @(latitude),
- @"zoom" : @(zoom),
- @"bearing" : @(bearing),
- @"pitch" : @(pitch),
- @"userTrackingMode" : @(userTrackingMode),
- @"showsUserLocation" : @(showsUserLocation),
- @"debug" : @(debug),
- }];
- [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-void Settings_NSUserDefaults::clear()
-{
- [NSUserDefaults resetStandardUserDefaults];
-}
diff --git a/platform/default/run_loop.cpp b/platform/default/run_loop.cpp
index 6230e8f1ab..29ebe168f5 100644
--- a/platform/default/run_loop.cpp
+++ b/platform/default/run_loop.cpp
@@ -14,9 +14,9 @@ using namespace mbgl::util;
static ThreadLocal<RunLoop>& current = *new ThreadLocal<RunLoop>;
#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
-void dummyCallback(uv_async_t*, int) {};
+void dummyCallback(uv_async_t*, int) {}
#else
-void dummyCallback(uv_async_t*) {};
+void dummyCallback(uv_async_t*) {}
#endif
} // namespace