From 2b08917fefcd203ad6245b0aebd5cca41297d52a Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Sat, 29 Jan 2022 02:45:41 +0100 Subject: [PATCH] [ios] Warning fixes Signed-off-by: Alexander Borsuk --- iphone/Maps/Bookmarks/BookmarksCoordinator.swift | 2 +- iphone/Maps/Classes/CarPlay/CarPlayService.swift | 2 +- iphone/Maps/Core/Routing/MWMRouterTransitType.h | 2 +- kml/types.hpp | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/iphone/Maps/Bookmarks/BookmarksCoordinator.swift b/iphone/Maps/Bookmarks/BookmarksCoordinator.swift index 2967e06c53..8a2da88560 100644 --- a/iphone/Maps/Bookmarks/BookmarksCoordinator.swift +++ b/iphone/Maps/Bookmarks/BookmarksCoordinator.swift @@ -64,7 +64,7 @@ import UIKit case .closed: navigationController.popToRootViewController(animated: true) bookmarksControllers = nil - case let .hidden(categoryId): + case .hidden(_): UIView.transition(with: self.navigationController!.view, duration: kDefaultAnimationDuration, options: [.curveEaseInOut, .transitionCrossDissolve], diff --git a/iphone/Maps/Classes/CarPlay/CarPlayService.swift b/iphone/Maps/Classes/CarPlay/CarPlayService.swift index e998d0efce..5e031d7070 100644 --- a/iphone/Maps/Classes/CarPlay/CarPlayService.swift +++ b/iphone/Maps/Classes/CarPlay/CarPlayService.swift @@ -195,7 +195,7 @@ final class CarPlayService: NSObject { if let locationName = trip.destination.name { subtitle = locationName } - if let address = trip.destination.placemark.addressDictionary?[CNPostalAddressStreetKey] as? String { + if let address = trip.destination.placemark.postalAddress?.street { subtitle = subtitle + "\n" + address } diff --git a/iphone/Maps/Core/Routing/MWMRouterTransitType.h b/iphone/Maps/Core/Routing/MWMRouterTransitType.h index 7eeca993fd..66346a029e 100644 --- a/iphone/Maps/Core/Routing/MWMRouterTransitType.h +++ b/iphone/Maps/Core/Routing/MWMRouterTransitType.h @@ -1,4 +1,4 @@ -typedef NS_ENUM(NSUInteger, MWMRouterTransitType) { +typedef NS_CLOSED_ENUM(NSUInteger, MWMRouterTransitType) { MWMRouterTransitTypeIntermediatePoint, MWMRouterTransitTypePedestrian, MWMRouterTransitTypeSubway, diff --git a/kml/types.hpp b/kml/types.hpp index 74ab822f20..6e2cdc03f7 100644 --- a/kml/types.hpp +++ b/kml/types.hpp @@ -101,8 +101,6 @@ enum class CompilationType : uint8_t Category = 0, Collection, Day, - - Count }; inline std::string DebugPrint(CompilationType compilationType) @@ -112,7 +110,6 @@ inline std::string DebugPrint(CompilationType compilationType) case CompilationType::Category: return "Category"; case CompilationType::Collection: return "Collection"; case CompilationType::Day: return "Day"; - case CompilationType::Count: return {}; } UNREACHABLE(); }