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

Rename Objective-C files from .hpp to .h, use #include for hpp and import for h.

Browse source
This commit is contained in:
Yury Melnichek 2011-03-15 14:03:01 +01:00 • committed by Alex Zolotarev
parent a98c3ead64
commit a48a5b2fec
15 changed files with 39 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
iphone/Maps/Classes/EAGLView.hpp → iphone/Maps/Classes/EAGLView.h
View file

@ -10,10 +10,10 @@
#import <OpenGLES/EAGL.h>
#import <OpenGLES/ES1/gl.h>
#import <OpenGLES/ES1/glext.h>
#import "MapViewController.hpp"
#import "../../std/shared_ptr.hpp"
#import "../../map/drawer_yg.hpp"
#import "RenderBuffer.hpp"
#import "MapViewController.h"
#include "../../std/shared_ptr.hpp"
#include "../../map/drawer_yg.hpp"
#include"RenderBuffer.hpp"
namespace iphone
{

4
iphone/Maps/Classes/EAGLView.mm
View file

@ -1,7 +1,8 @@
#import <QuartzCore/QuartzCore.h>
#import <OpenGLES/EAGLDrawable.h>
#import "EAGLView.hpp"
#import "EAGLView.h"
#import "WindowHandle.h"
#include "../../yg/screen.hpp"
#include "../../yg/texture.hpp"
@ -9,7 +10,6 @@
#include "../../yg/internal/opengl.hpp"
#include "../../yg/skin.hpp"
#include "IPhonePlatform.hpp"
#include "WindowHandle.hpp"
#include "RenderBuffer.hpp"
#include "RenderContext.hpp"

2
iphone/Maps/Classes/MapViewController.hpp → iphone/Maps/Classes/MapViewController.h
View file

@ -1,5 +1,5 @@
#import <UIKit/UIKit.h>
#import "UserLocationController.hpp"
#import "UserLocationController.h"
#include "../../geometry/point2d.hpp"
#include "../../yg/texture.hpp"

6
iphone/Maps/Classes/MapViewController.mm
View file

@ -1,9 +1,9 @@
#import "MapViewController.hpp"
#import "EAGLView.hpp"
#import "MapViewController.h"
#import "EAGLView.h"
#import "WindowHandle.h"
#import "../Settings/SettingsManager.h"
#include "RenderContext.hpp"
#include "WindowHandle.hpp"
#include "../../geometry/rect2d.hpp"
#include "../../yg/internal/opengl.hpp"
#include "../../yg/screen.hpp"

0
iphone/Maps/Classes/MapsAppDelegate.hpp → iphone/Maps/Classes/MapsAppDelegate.h
View file

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

@ -1,5 +1,5 @@
#import "MapsAppDelegate.hpp"
#import "MapViewController.hpp"
#import "MapsAppDelegate.h"
#import "MapViewController.h"
@implementation MapsAppDelegate

9
iphone/Maps/Classes/RenderBuffer.hpp
View file

@ -8,10 +8,13 @@
*
*/
#import "RenderContext.hpp"
#import "../../../std/shared_ptr.hpp"
#pragma once
#include "RenderContext.hpp"
#include "../../../std/shared_ptr.hpp"
#include "../../../yg/render_target.hpp"
#import <QuartzCore/CAEAGLLayer.h>
#import "../../../yg/render_target.hpp"
namespace iphone
{

4
iphone/Maps/Classes/RenderBuffer.mm
View file

@ -7,8 +7,8 @@
*
*/
#import "RenderBuffer.hpp"
#import "../../../yg/internal/opengl.hpp"
#include "RenderBuffer.hpp"
#include "../../../yg/internal/opengl.hpp"
#include "../../../yg/utils.hpp"
namespace iphone

3
iphone/Maps/Classes/RenderContext.hpp
View file

@ -7,6 +7,8 @@
*
*/
#pragma once
#include <OpenGLES/EAGL.h>
#include <OpenGLES/ES1/gl.h>
#include <OpenGLES/ES1/glext.h>
@ -14,6 +16,7 @@
#include "../../../yg/rendercontext.hpp"
#include "../../../std/shared_ptr.hpp"
namespace iphone
{
class RenderContext : public yg::gl::RenderContext

0
iphone/Maps/Classes/UserLocationController.hpp → iphone/Maps/Classes/UserLocationController.h
View file

2
iphone/Maps/Classes/UserLocationController.mm
View file

@ -1,4 +1,4 @@
#import "UserLocationController.hpp"
#import "UserLocationController.h"
#include "../../../indexer/mercator.hpp"

2
iphone/Maps/Classes/WindowHandle.hpp → iphone/Maps/Classes/WindowHandle.h
View file

@ -10,7 +10,7 @@
#include "../../../map/window_handle.hpp"
#include "../../../yg/screen.hpp"
#include "RenderContext.hpp"
#import "EAGLView.hpp"
#import "EAGLView.h"
namespace iphone
{

4
iphone/Maps/Classes/WindowHandle.mm
View file

@ -8,8 +8,8 @@
*/
#include "WindowHandle.hpp"
#include "EAGLView.hpp"
#import "WindowHandle.h"
#import "EAGLView.h"
namespace iphone
{

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

@ -83,7 +83,7 @@
/* Begin PBXFileReference section */
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1D3623240D0F684500981E51 /* MapsAppDelegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MapsAppDelegate.hpp; sourceTree = "<group>"; };
1D3623240D0F684500981E51 /* MapsAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapsAppDelegate.h; sourceTree = "<group>"; };
1D3623250D0F684500981E51 /* MapsAppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapsAppDelegate.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
1D6058910D05DD3D006BFB54 /* MapsWithMe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MapsWithMe.app; sourceTree = BUILT_PRODUCTS_DIR; };
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@ -92,10 +92,10 @@
28AD73870D9D96C1002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = SOURCE_ROOT; };
29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = main.mm; sourceTree = "<group>"; };
46F26C7210F61FD600ECCA39 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
46F26CD610F623BA00ECCA39 /* EAGLView.hpp */ = {isa = PBXFileReference; fileEncoding = 11; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; path = EAGLView.hpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
46F26CD610F623BA00ECCA39 /* EAGLView.h */ = {isa = PBXFileReference; fileEncoding = 11; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = EAGLView.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
46F26CD710F623BA00ECCA39 /* EAGLView.mm */ = {isa = PBXFileReference; fileEncoding = 11; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = EAGLView.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
46F26D1E10F626CB00ECCA39 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
46F8A2EB10EB63040045521A /* MapViewController.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; path = MapViewController.hpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
46F8A2EB10EB63040045521A /* MapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = MapViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
8D1107310486CEB800E47090 /* MapsWithMe-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "MapsWithMe-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
EE026F0511D6AC0D00645242 /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = classificator.txt; path = ../../data/classificator.txt; sourceTree = SOURCE_ROOT; };
EE026F0811D6AC2800645242 /* basic.skn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = basic.skn; path = ../../data/basic.skn; sourceTree = SOURCE_ROOT; };
@ -114,10 +114,10 @@
EE7F297C1219ECA300EB67A9 /* RenderBuffer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; name = RenderBuffer.hpp; path = Classes/RenderBuffer.hpp; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
EE7F297D1219ECA300EB67A9 /* RenderBuffer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = RenderBuffer.mm; path = Classes/RenderBuffer.mm; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
EE7F297E1219ECA300EB67A9 /* RenderContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = RenderContext.mm; path = Classes/RenderContext.mm; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
EE7F297F1219ECA300EB67A9 /* WindowHandle.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; name = WindowHandle.hpp; path = Classes/WindowHandle.hpp; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
EE7F297F1219ECA300EB67A9 /* WindowHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = WindowHandle.h; path = Classes/WindowHandle.h; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
EE7F29801219ECA300EB67A9 /* WindowHandle.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = WindowHandle.mm; path = Classes/WindowHandle.mm; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
EEB7E22111E9079400080A68 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
EEB7E30711E9094F00080A68 /* UserLocationController.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; path = UserLocationController.hpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
EEB7E30711E9094F00080A68 /* UserLocationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = UserLocationController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
EEB7E30811E9094F00080A68 /* UserLocationController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = UserLocationController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
EED10A4411F78D120095FAD4 /* MapViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapViewController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
EEE4C93D1298A2F3007231A9 /* symbols_24.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = symbols_24.png; path = ../../data/symbols_24.png; sourceTree = SOURCE_ROOT; };
@ -207,15 +207,15 @@
EE7F297D1219ECA300EB67A9 /* RenderBuffer.mm */,
EE16192B126E374500622BD0 /* RenderContext.hpp */,
EE7F297E1219ECA300EB67A9 /* RenderContext.mm */,
EE7F297F1219ECA300EB67A9 /* WindowHandle.hpp */,
EE7F297F1219ECA300EB67A9 /* WindowHandle.h */,
EE7F29801219ECA300EB67A9 /* WindowHandle.mm */,
46F26CD610F623BA00ECCA39 /* EAGLView.hpp */,
46F26CD610F623BA00ECCA39 /* EAGLView.h */,
46F26CD710F623BA00ECCA39 /* EAGLView.mm */,
1D3623240D0F684500981E51 /* MapsAppDelegate.hpp */,
1D3623240D0F684500981E51 /* MapsAppDelegate.h */,
1D3623250D0F684500981E51 /* MapsAppDelegate.mm */,
46F8A2EB10EB63040045521A /* MapViewController.hpp */,
46F8A2EB10EB63040045521A /* MapViewController.h */,
EED10A4411F78D120095FAD4 /* MapViewController.mm */,
EEB7E30711E9094F00080A68 /* UserLocationController.hpp */,
EEB7E30711E9094F00080A68 /* UserLocationController.h */,
EEB7E30811E9094F00080A68 /* UserLocationController.mm */,
);
path = Classes;

3
iphone/Maps/Platform/IPhonePlatform.mm
View file

@ -2,11 +2,12 @@
#import <Foundation/NSBundle.h>
#import <Foundation/NSPathUtilities.h>
#import <Foundation/NSProcessInfo.h>
#import "IPhonePlatform.hpp"
#import <UIKit/UIDevice.h>
#import <UIKit/UIScreen.h>
#import <UIKit/UIScreenMode.h>
#include "IPhonePlatform.hpp"
#include <unistd.h>
#include <dirent.h>
#include <sys/stat.h>