Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Grechuhin <i.grechuhin@gmail.com>2016-03-18 13:42:32 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:56:56 +0300
commit57d75562ca9a9843ad33a9c1248e5252e306577b (patch)
tree10700106bb18b830e90ce4c8bcccb78583aa5e18
parent0fafd66da8de6c555de26fb1abfec1f31f277065 (diff)
[ios] Review fixes.
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageControllerDataSource.mm4
-rw-r--r--iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderSearchDataSource.mm12
2 files changed, 8 insertions, 8 deletions
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageControllerDataSource.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageControllerDataSource.mm
index b83a4f3a64..d882c9566b 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageControllerDataSource.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageControllerDataSource.mm
@@ -4,7 +4,7 @@
@interface MWMPageControllerDataSource ()
@property (nonatomic) Class<MWMWelcomeControllerProtocol> welcomeClass;
-@property (nonatomic) NSArray<MWMWelcomeController *> * controllers;
+@property (copy, nonatomic) NSArray<MWMWelcomeController *> * controllers;
@end
@@ -24,7 +24,7 @@
vc.pageController = pageController;
[controllers addObject:vc];
}
- self.controllers = [controllers copy];
+ self.controllers = controllers;
}
return self;
}
diff --git a/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderSearchDataSource.mm b/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderSearchDataSource.mm
index d7a9a459e1..826e6f5023 100644
--- a/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderSearchDataSource.mm
+++ b/iphone/Maps/Classes/MapDownloader/DataSources/MWMMapDownloaderSearchDataSource.mm
@@ -10,7 +10,7 @@ extern NSString * const kPlaceCellIdentifier;
@interface MWMMapDownloaderSearchDataSource ()
-@property (copy, nonatomic) NSArray<NSString *> * searchCoutryIds;
+@property (copy, nonatomic) NSArray<NSString *> * searchCountryIds;
@property (copy, nonatomic) NSDictionary<NSString *, NSString *> * searchMatchedResults;
@end
@@ -23,7 +23,7 @@ extern NSString * const kPlaceCellIdentifier;
if (self)
{
auto const & countryInfoGetter = GetFramework().CountryInfoGetter();
- NSMutableOrderedSet<NSString *> * nsSearchCoutryIds = [NSMutableOrderedSet orderedSetWithCapacity:results.GetCount()];
+ NSMutableOrderedSet<NSString *> * nsSearchCountryIds = [NSMutableOrderedSet orderedSetWithCapacity:results.GetCount()];
NSMutableDictionary<NSString *, NSString *> * nsSearchResults = [@{} mutableCopy];
for (auto it = results.Begin(); it != results.End(); ++it)
{
@@ -34,10 +34,10 @@ extern NSString * const kPlaceCellIdentifier;
if (countryId == kInvalidCountryId)
continue;
NSString * nsCountryId = @(countryId.c_str());
- [nsSearchCoutryIds addObject:nsCountryId];
+ [nsSearchCountryIds addObject:nsCountryId];
nsSearchResults[nsCountryId] = @(it->GetString().c_str());
}
- self.searchCoutryIds = [nsSearchCoutryIds array];
+ self.searchCountryIds = [nsSearchCountryIds array];
self.searchMatchedResults = nsSearchResults;
}
return self;
@@ -47,7 +47,7 @@ extern NSString * const kPlaceCellIdentifier;
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
- return self.searchCoutryIds.count;
+ return self.searchCountryIds.count;
}
- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
@@ -64,7 +64,7 @@ extern NSString * const kPlaceCellIdentifier;
- (TCountryId)countryIdForIndexPath:(NSIndexPath *)indexPath
{
- return self.searchCoutryIds[indexPath.row].UTF8String;
+ return self.searchCountryIds[indexPath.row].UTF8String;
}
- (NSString *)cellIdentifierForIndexPath:(NSIndexPath *)indexPath