diff options
| author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2015-10-21 17:46:54 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2015-10-21 18:15:29 +0300 |
| commit | bca31df5037aba5489d7162dc75fc9ce62e0a647 (patch) | |
| tree | 7fd7d63ce2927c778a79849a90017a788f5076f1 /routing/turns_sound_settings.hpp | |
| parent | 1dadc58fc3cd3c5704b8239cfb617d02c46ea1da (diff) | |
git-clang-format
Diffstat (limited to 'routing/turns_sound_settings.hpp')
| -rw-r--r-- | routing/turns_sound_settings.hpp | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/routing/turns_sound_settings.hpp b/routing/turns_sound_settings.hpp index 13190c1fc0..3e7442f7bd 100644 --- a/routing/turns_sound_settings.hpp +++ b/routing/turns_sound_settings.hpp @@ -51,34 +51,36 @@ class Settings // This constructor is for testing only. Settings(uint32_t notificationTimeSeconds, uint32_t minNotificationDistanceUnits, - uint32_t maxNotificationDistanceUnits, - uint32_t startBeforeSeconds, uint32_t minStartBeforeMeters, - uint32_t maxStartBeforeMeters, uint32_t minDistToSayNotificationMeters, - vector<uint32_t> const & soundedDistancesUnits, + uint32_t maxNotificationDistanceUnits, uint32_t startBeforeSeconds, + uint32_t minStartBeforeMeters, uint32_t maxStartBeforeMeters, + uint32_t minDistToSayNotificationMeters, vector<uint32_t> const & soundedDistancesUnits, ::Settings::Units lengthUnits) - : m_timeSeconds(notificationTimeSeconds), - m_minDistanceUnits(minNotificationDistanceUnits), - m_maxDistanceUnits(maxNotificationDistanceUnits), - m_startBeforeSeconds(startBeforeSeconds), - m_minStartBeforeMeters(minStartBeforeMeters), - m_maxStartBeforeMeters(maxStartBeforeMeters), - m_minDistToSayNotificationMeters(minDistToSayNotificationMeters), - m_soundedDistancesUnits(soundedDistancesUnits), - m_lengthUnits(lengthUnits) + : m_timeSeconds(notificationTimeSeconds) + , m_minDistanceUnits(minNotificationDistanceUnits) + , m_maxDistanceUnits(maxNotificationDistanceUnits) + , m_startBeforeSeconds(startBeforeSeconds) + , m_minStartBeforeMeters(minStartBeforeMeters) + , m_maxStartBeforeMeters(maxStartBeforeMeters) + , m_minDistToSayNotificationMeters(minDistToSayNotificationMeters) + , m_soundedDistancesUnits(soundedDistancesUnits) + , m_lengthUnits(lengthUnits) { ASSERT(!m_soundedDistancesUnits.empty(), ()); } + public: Settings(uint32_t startBeforeSeconds, uint32_t minStartBeforeMeters, uint32_t maxStartBeforeMeters, uint32_t minDistToSayNotificationMeters) - : m_timeSeconds(0), - m_minDistanceUnits(0), - m_maxDistanceUnits(0), - m_startBeforeSeconds(startBeforeSeconds), - m_minStartBeforeMeters(minStartBeforeMeters), - m_maxStartBeforeMeters(maxStartBeforeMeters), - m_minDistToSayNotificationMeters(minDistToSayNotificationMeters), - m_lengthUnits(::Settings::Metric) {} + : m_timeSeconds(0) + , m_minDistanceUnits(0) + , m_maxDistanceUnits(0) + , m_startBeforeSeconds(startBeforeSeconds) + , m_minStartBeforeMeters(minStartBeforeMeters) + , m_maxStartBeforeMeters(maxStartBeforeMeters) + , m_minDistToSayNotificationMeters(minDistToSayNotificationMeters) + , m_lengthUnits(::Settings::Metric) + { + } void SetState(uint32_t notificationTimeSeconds, uint32_t minNotificationDistanceUnits, uint32_t maxNotificationDistanceUnits, |