AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[cleanup] [ios] Fixed compilation warnings.

Browse source
This commit is contained in:
Ilya Grechuhin 2018-01-23 14:43:25 +03:00 • committed by Roman Kuznetsov
parent 21260955c1
commit f80d2dbddc
7 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
indexer/categories_holder.hpp
View file

@ -85,7 +85,7 @@ public:
template <class ToDo>
void ForEachTypeAndCategory(ToDo && toDo) const
{
for (auto const it : m_type2cat)
for (auto const & it : m_type2cat)
toDo(it.first, *it.second);
}

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.h
View file

@ -15,6 +15,4 @@
- (void)router:(MWMRouterType)routerType setState:(MWMCircularProgressState)state;
- (void)router:(MWMRouterType)routerType setProgress:(CGFloat)progress;
- (CGRect)defaultFrame;
@end

18
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -678,7 +678,7 @@ using namespace osm_auth_ios;
NSForegroundColorAttributeName : [UIColor lightGrayColor],
}
forState:UIControlStateDisabled];
[UIBarButtonItem appearanceWhenContainedIn:[UINavigationBar class], nil].tintColor = [UIColor whitePrimaryText];
[UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[UINavigationBar class]]].tintColor = [UIColor whitePrimaryText];
UIPageControl * pageControl = [UIPageControl appearance];
pageControl.pageIndicatorTintColor = [UIColor blackHintText];
@ -707,12 +707,9 @@ using namespace osm_auth_ios;
[[LocalNotificationManager sharedManager] processNotification:notification onLaunch:NO];
}
- (BOOL)application:(UIApplication *)application
openURL:(NSURL *)url
sourceApplication:(NSString *)sourceApplication
annotation:(id)annotation
- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options
{
m_sourceApplication = sourceApplication;
m_sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey];
if ([self checkLaunchURL:url])
{
@ -721,15 +718,12 @@ using namespace osm_auth_ios;
}
BOOL isGoogleURL = [[GIDSignIn sharedInstance] handleURL:url
sourceApplication:sourceApplication
annotation:annotation];
sourceApplication:m_sourceApplication
annotation:options[UIApplicationOpenURLOptionsAnnotationKey]];
if (isGoogleURL)
return YES;
return [[FBSDKApplicationDelegate sharedInstance] application:application
openURL:url
sourceApplication:sourceApplication
annotation:annotation];
return [[FBSDKApplicationDelegate sharedInstance] application:app openURL:url options:options];
}
- (BOOL)checkLaunchURL:(NSURL *)url

2
iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm
View file

@ -62,7 +62,7 @@
selectedAttrs:selectedTitleAttrs
unselectedAttrs:unselectedTitleAttrs];
TMwmSize size = nodeAttrs.m_mwmSize;
TMwmSize size;
bool const isModeDownloaded = self.mode == MWMMapDownloaderModeDownloaded;
switch (nodeAttrs.m_status)

2
iphone/Maps/UI/Settings/MWMMobileInternetViewController.mm
View file

@ -39,7 +39,7 @@ using np = platform::NetworkPolicy;
return;
_selected = selected;
NSString * statValue = nil;
NSString * statValue = @"";
if ([selected isEqual:self.always])
{
statValue = kStatAlways;

2
iphone/Maps/UI/Settings/MWMNightModeController.mm
View file

@ -37,7 +37,7 @@
return;
_selectedCell = cell;
NSString * statValue = nil;
NSString * statValue = @"";
if ([cell isEqual:self.on])
{
[MWMSettings setTheme:MWMThemeNight];

6
iphone/Maps/UI/Storyboard/SearchFilters.storyboard
View file

@ -33,7 +33,7 @@
<action selector="applyAction" destination="LNn-Gp-Jtg" eventType="touchUpInside" id="q2Q-O2-QLa"/>
</connections>
</button>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="1" estimatedSectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="7db-bh-egf">
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="7db-bh-egf">
<rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<prototypes>
@ -67,7 +67,7 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nOA-aX-aet">
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nOA-aX-aet">
<rect key="frame" x="191.5" y="32.5" width="167.5" height="36"/>
<inset key="contentEdgeInsets" minX="8" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="Button"/>
@ -272,7 +272,7 @@
<constraints>
<constraint firstAttribute="height" priority="999" constant="43.5" id="wiY-V3-s47"/>
</constraints>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="12" minimumInteritemSpacing="8" id="hQi-pH-6ln" customClass="TypeCellFlowLayout" customModule="cm_dbg" customModuleProvider="target">
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="12" minimumInteritemSpacing="8" id="hQi-pH-6ln" customClass="TypeCellFlowLayout" customModule="maps_me" customModuleProvider="target">
<size key="itemSize" width="50" height="36"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
<size key="footerReferenceSize" width="0.0" height="0.0"/>