organicmaps/travelguide
Archived
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #49 from deathbaba/compilationFix

Browse source 
[iOS]Compilation fix
This commit is contained in:
Darafei Praliaskouski 2013-10-09 01:13:30 -07:00
commit 258a350548
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iOS/offlineguides.xcodeproj/project.pbxproj
View file

@ -37,7 +37,6 @@
ED81955717AED762004F3803 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED81955617AED762004F3803 /* AppDelegate.mm */; };
ED81956517AEE129004F3803 /* ArticleVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED81956417AEE129004F3803 /* ArticleVC.mm */; };
ED81956A17AEF6B6004F3803 /* GuideVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED81956917AEF6B6004F3803 /* GuideVC.mm */; };
ED81956C17AEFE66004F3803 /* simple_html.html in Resources */ = {isa = PBXBuildFile; fileRef = ED81956B17AEFE66004F3803 /* simple_html.html */; };
ED81956E17B10578004F3803 /* strings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED81956D17B10578004F3803 /* strings.cpp */; };
ED81957117B10598004F3803 /* utf8proc.c in Sources */ = {isa = PBXBuildFile; fileRef = ED81957017B10598004F3803 /* utf8proc.c */; };
ED81F52017BA2BFD00361D6D /* Default-Portrait~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = ED81F51F17BA2BFD00361D6D /* Default-Portrait~ipad.png */; };
@ -106,7 +105,6 @@
ED81956417AEE129004F3803 /* ArticleVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ArticleVC.mm; sourceTree = "<group>"; };
ED81956817AEF6B6004F3803 /* GuideVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GuideVC.h; sourceTree = "<group>"; };
ED81956917AEF6B6004F3803 /* GuideVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GuideVC.mm; sourceTree = "<group>"; };
ED81956B17AEFE66004F3803 /* simple_html.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = simple_html.html; sourceTree = "<group>"; };
ED81956D17B10578004F3803 /* strings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = strings.cpp; path = ../../env/strings.cpp; sourceTree = "<group>"; };
ED81957017B10598004F3803 /* utf8proc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = utf8proc.c; path = ../../3rdparty/utf8proc/utf8proc.c; sourceTree = "<group>"; };
ED81F51F17BA2BFD00361D6D /* Default-Portrait~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait~ipad.png"; sourceTree = "<group>"; };
@ -238,7 +236,6 @@
ED4F8BA117B2C97300ADD795 /* ic_back.png */,
ED4F8BA217B2C97300ADD795 /* ic_back@2x.png */,
ED4F8BA317B2C97300ADD795 /* ic_articleselection@2x.png */,
ED81956B17AEFE66004F3803 /* simple_html.html */,
ED81954E17AED762004F3803 /* offlineguides-Info.plist */,
ED81954F17AED762004F3803 /* InfoPlist.strings */,
ED81955217AED762004F3803 /* main.m */,
@ -344,7 +341,6 @@
buildActionMask = 2147483647;
files = (
ED81955117AED762004F3803 /* InfoPlist.strings in Resources */,
ED81956C17AEFE66004F3803 /* simple_html.html in Resources */,
A3E2220C17AFD5840018AB9E /* data in Resources */,
ED4F8B9E17B2A52200ADD795 /* bg_header.png in Resources */,
ED4F8B9F17B2A52200ADD795 /* bg_header@2x.png in Resources */,

4
iOS/offlineguides/ArticleVC.mm
View file

@ -41,7 +41,9 @@
{
NSString * title = [NSString stringWithUTF8String:article.GetTitle().c_str()];
NSString * pageId = [NSString stringWithUTF8String:article.GetUrl().c_str()];
[pins addObject:[[MWMPin alloc] initWithLat:article.m_lat lon:article.m_lon title:title andId:pageId]];
double lat, lon;
article.GetLatLon(lat, lon);
[pins addObject:[[MWMPin alloc] initWithLat:lat lon:lon title:title andId:pageId]];
}
}
[MWMApi showPins:pins];