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

Fix project and compile on iOS

Browse source
This commit is contained in:
Sergey Yershov 2016-04-13 12:01:30 +03:00
parent 315e3c7b2c
commit 267869f942
10 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm
View file

@ -97,7 +97,7 @@ CGFloat const kAnimationDuration = .05;
MWMDownloadTransitMapAlert * alert = [[[NSBundle mainBundle] loadNibNamed:kDownloadTransitMapAlertNibName owner:nil options:nil] firstObject];
NSMutableArray<NSString *> * titles = [@[] mutableCopy];
storage::TMwmSize totalSize = 0;
TMwmSize totalSize = 0;
auto const & s = GetFramework().Storage();
for (auto const & countryId : countries)
{
@ -143,7 +143,7 @@ CGFloat const kAnimationDuration = .05;
}
}
- (void)processCountry:(TCountryId const &)countryId progress:(TLocalAndRemoteSize const &)progress
- (void)processCountry:(TCountryId const &)countryId progress:(MapFilesDownloader::TProgress const &)progress
{
auto const overallProgress = GetFramework().Storage().GetOverallProgress(m_countries);
CGFloat const progressValue = static_cast<CGFloat>(overallProgress.first) / overallProgress.second;

2
iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
View file

@ -216,7 +216,7 @@ extern NSString * const kSearchStateKey = @"SearchStateKey";
}
}
- (void)processCountry:(storage::TCountryId const &)countryId progress:(storage::TLocalAndRemoteSize const &)progress
- (void)processCountry:(storage::TCountryId const &)countryId progress:(storage::MapFilesDownloader::TProgress const &)progress
{
[self.downloadController downloadProgress:static_cast<CGFloat>(progress.first) / progress.second];
}

2
iphone/Maps/Classes/Framework/MWMFrameworkListener.mm
View file

@ -133,7 +133,7 @@ void loopWrappers(TObservers * observers, TLoopBlock block)
for (TStorageObserver observer in observers)
[observer processCountryEvent:countryId];
},
[observers](TCountryId const & countryId, TLocalAndRemoteSize const & progress)
[observers](TCountryId const & countryId, MapFilesDownloader::TProgress const & progress)
{
for (TStorageObserver observer in observers)
{

4
iphone/Maps/Classes/Framework/MWMFrameworkObservers.h
View file

@ -1,6 +1,6 @@
#include "routing/router.hpp"
#include "storage/index.hpp"
#include "storage/storage_defines.hpp"
#include "storage/storage.hpp"
using namespace storage;
@ -25,7 +25,7 @@ using namespace storage;
@optional
- (void)processCountry:(TCountryId const &)countryId progress:(TLocalAndRemoteSize const &)progress;
- (void)processCountry:(TCountryId const &)countryId progress:(MapFilesDownloader::TProgress const &)progress;
@end

2
iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCell.mm
View file

@ -133,7 +133,7 @@ namespace
[self config:nodeAttrs];
}
- (void)processCountry:(TCountryId const &)countryId progress:(TLocalAndRemoteSize const &)progress
- (void)processCountry:(TCountryId const &)countryId progress:(MapFilesDownloader::TProgress const &)progress
{
if (countryId != m_countryId)
return;

4
iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm
View file

@ -155,7 +155,7 @@ using namespace storage;
}
}
- (void)processCountry:(TCountryId const &)countryId progress:(TLocalAndRemoteSize const &)progress
- (void)processCountry:(TCountryId const &)countryId progress:(MapFilesDownloader::TProgress const &)progress
{
for (MWMMapDownloaderTableViewCell * cell in self.tableView.visibleCells)
[cell processCountry:countryId progress:progress];
@ -328,7 +328,7 @@ using namespace storage;
s.GetQueuedChildren(parentCountryId, queuedChildren);
if (!queuedChildren.empty())
{
storage::TMwmSize queuedSize = 0;
TMwmSize queuedSize = 0;
for (TCountryId const & countryId : queuedChildren)
{
NodeAttrs nodeAttrs;

2
iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
View file

@ -265,7 +265,7 @@ using namespace storage;
[self removeFromSuperview];
}
- (void)processCountry:(TCountryId const &)countryId progress:(TLocalAndRemoteSize const &)progress
- (void)processCountry:(TCountryId const &)countryId progress:(MapFilesDownloader::TProgress const &)progress
{
if (self.superview && m_countryId == countryId)
[self showDownloading:static_cast<CGFloat>(progress.first) / progress.second];

4
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -305,7 +305,6 @@
5605022F1B6211E100169CAD /* sound-strings in Resources */ = {isa = PBXBuildFile; fileRef = 5605022E1B6211E100169CAD /* sound-strings */; };
560634F21B78806100F3D670 /* MWMTextToSpeech.mm in Sources */ = {isa = PBXBuildFile; fileRef = 560634F11B78806100F3D670 /* MWMTextToSpeech.mm */; };
56C74C391C74A3BC00B71B9F /* MWMInputEmailValidator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA62F1C2D58F300FE1BEC /* MWMInputEmailValidator.mm */; };
56CA8DAE1C9C25B000949C04 /* MWMAddPlaceNavigationBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F653CE171C71F62400A453F1 /* MWMAddPlaceNavigationBar.xib */; };
56D545631C74A41900E3719C /* Framework.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34479C751C60C6130065D261 /* Framework.cpp */; };
671182E11C7F0DD400CB8177 /* countries_obsolete.txt in Resources */ = {isa = PBXBuildFile; fileRef = 671182DE1C7F0DD400CB8177 /* countries_obsolete.txt */; };
671182E21C7F0DD400CB8177 /* packed_polygons_obsolete.bin in Resources */ = {isa = PBXBuildFile; fileRef = 671182DF1C7F0DD400CB8177 /* packed_polygons_obsolete.bin */; };
@ -3128,7 +3127,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0720;
LastUpgradeCheck = 0730;
ORGANIZATIONNAME = MapsWithMe;
TargetAttributes = {
1D6058900D05DD3D006BFB54 = {
@ -3359,7 +3358,6 @@
6741A94A1BF340DE002C974C /* resources-6plus_clear in Resources */,
6741A94B1BF340DE002C974C /* unicode_blocks.txt in Resources */,
6741A94C1BF340DE002C974C /* fonts_blacklist.txt in Resources */,
56CA8DAE1C9C25B000949C04 /* MWMAddPlaceNavigationBar.xib in Resources */,
3401CD721C3C0C420028C6F8 /* MWMEditorNameTableViewCell.xib in Resources */,
34CCFDE31C22A2EF00F28959 /* MWMPlacePageOpeningHoursCell.xib in Resources */,
6741A94D1BF340DE002C974C /* resources-xxhdpi_clear in Resources */,

2
iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/ci.MAPS.ME.xcscheme
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
iphone/Maps/Statistics/MWMCustomFacebookEvents.mm
View file

@ -89,7 +89,7 @@ static int gStorageSubscriptionId = kNotSubscribed;
});
[Alohalytics logEvent:kDownloadedSecondMapEvent];
}
}, [](storage::TCountryId const &, storage::TLocalAndRemoteSize const &){});
}, [](storage::TCountryId const &, storage::MapFilesDownloader::TProgress const &){});
}
}
}