diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-06-03 18:05:04 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-06-13 11:16:19 +0200 |
commit | 2bdecdf9f9a93c30f7d482f9993c47b86a9f5eb8 (patch) | |
tree | ef946d0f27b721f12662047beda6ff1d3cb31e23 /include | |
parent | 9b6c2e6940ed33a87a20274eda19320e8c688fdf (diff) | |
download | qtlocation-mapboxgl-2bdecdf9f9a93c30f7d482f9993c47b86a9f5eb8.tar.gz |
[core] fix pedantic warning messages
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/platform/darwin/settings_nsuserdefaults.hpp | 27 | ||||
-rw-r--r-- | include/mbgl/platform/event.hpp | 4 | ||||
-rw-r--r-- | include/mbgl/style/types.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/util/constants.hpp | 2 |
4 files changed, 4 insertions, 31 deletions
diff --git a/include/mbgl/platform/darwin/settings_nsuserdefaults.hpp b/include/mbgl/platform/darwin/settings_nsuserdefaults.hpp deleted file mode 100644 index b0ca060b85..0000000000 --- a/include/mbgl/platform/darwin/settings_nsuserdefaults.hpp +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#import <mbgl/ios/MGLTypes.h> - -namespace mbgl { - -class Settings_NSUserDefaults { -public: - Settings_NSUserDefaults(); - void load(); - void save(); - void clear(); - -public: - double longitude = 0; - double latitude = 0; - double zoom = 0; - double bearing = 0; - double pitch = 0; - - MGLUserTrackingMode userTrackingMode = MGLUserTrackingModeNone; - bool showsUserLocation = false; - - uint32_t debug = 0; -}; - -} diff --git a/include/mbgl/platform/event.hpp b/include/mbgl/platform/event.hpp index 0b3b79df6b..f082114946 100644 --- a/include/mbgl/platform/event.hpp +++ b/include/mbgl/platform/event.hpp @@ -19,7 +19,7 @@ MBGL_DEFINE_ENUM_CLASS(EventSeverityClass, EventSeverity, { { EventSeverity::Warning, "WARNING" }, { EventSeverity::Error, "ERROR" }, { EventSeverity(-1), "UNKNOWN" }, -}); +}) enum class Event : uint8_t { General, @@ -58,7 +58,7 @@ MBGL_DEFINE_ENUM_CLASS(EventClass, Event, { { Event::Crash, "Crash" }, { Event::Glyph, "Glyph" }, { Event(-1), "Unknown" }, -}); +}) struct EventPermutation { diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp index 3be7b5d9c7..ece56026df 100644 --- a/include/mbgl/style/types.hpp +++ b/include/mbgl/style/types.hpp @@ -19,7 +19,7 @@ MBGL_DEFINE_ENUM_CLASS(SourceTypeClass, SourceType, { { SourceType::GeoJSON, "geojson" }, { SourceType::Video, "video" }, { SourceType::Annotations, "annotations" }, -}); +}) namespace style { diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp index 621fc1820e..543d5b3cab 100644 --- a/include/mbgl/util/constants.hpp +++ b/include/mbgl/util/constants.hpp @@ -35,7 +35,7 @@ constexpr double PITCH_MAX = M_PI / 3; constexpr double MIN_ZOOM = 0.0; constexpr double MAX_ZOOM = 25.5; -constexpr uint64_t DEFAULT_MAX_CACHE_SIZE = 50 * 1024 * 1024;; +constexpr uint64_t DEFAULT_MAX_CACHE_SIZE = 50 * 1024 * 1024; constexpr Duration DEFAULT_FADE_DURATION = Milliseconds(300); constexpr Seconds CLOCK_SKEW_RETRY_TIMEOUT { 30 }; |