From 04142e39cffd676d234f2a3b39de774500c6a66e Mon Sep 17 00:00:00 2001 From: Yuri Gorshenin Date: Mon, 27 Jul 2015 13:25:24 +0300 Subject: Removed T-letter from TMapOptions. --- platform/country_defines.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'platform/country_defines.cpp') diff --git a/platform/country_defines.cpp b/platform/country_defines.cpp index 05605e7ee0..bbbf933a2a 100644 --- a/platform/country_defines.cpp +++ b/platform/country_defines.cpp @@ -2,43 +2,43 @@ #include "base/assert.hpp" -bool HasOptions(TMapOptions mask, TMapOptions options) +bool HasOptions(MapOptions mask, MapOptions options) { return (static_cast(mask) & static_cast(options)) == static_cast(options); } -TMapOptions IntersectOptions(TMapOptions lhs, TMapOptions rhs) +MapOptions IntersectOptions(MapOptions lhs, MapOptions rhs) { - return static_cast(static_cast(lhs) & static_cast(rhs)); + return static_cast(static_cast(lhs) & static_cast(rhs)); } -TMapOptions SetOptions(TMapOptions mask, TMapOptions options) +MapOptions SetOptions(MapOptions mask, MapOptions options) { - return static_cast(static_cast(mask) | static_cast(options)); + return static_cast(static_cast(mask) | static_cast(options)); } -TMapOptions UnsetOptions(TMapOptions mask, TMapOptions options) +MapOptions UnsetOptions(MapOptions mask, MapOptions options) { - return static_cast(static_cast(mask) & ~static_cast(options)); + return static_cast(static_cast(mask) & ~static_cast(options)); } -TMapOptions LeastSignificantOption(TMapOptions mask) +MapOptions LeastSignificantOption(MapOptions mask) { - return static_cast(static_cast(mask) & -static_cast(mask)); + return static_cast(static_cast(mask) & -static_cast(mask)); } -string DebugPrint(TMapOptions options) +string DebugPrint(MapOptions options) { switch (options) { - case TMapOptions::Nothing: + case MapOptions::Nothing: return "Nothing"; - case TMapOptions::Map: + case MapOptions::Map: return "MapOnly"; - case TMapOptions::CarRouting: + case MapOptions::CarRouting: return "CarRouting"; - case TMapOptions::MapWithCarRouting: + case MapOptions::MapWithCarRouting: return "MapWithCarRouting"; } } -- cgit v1.2.3