From 8ee34b639d91f93b3c25d02c6d809825c9adaef6 Mon Sep 17 00:00:00 2001 From: Kim Wittenburg Date: Mon, 15 Sep 2014 15:57:34 +0200 Subject: [PATCH] Small Code Changes --- MathPad.xcodeproj/project.pbxproj | 24 ++++++++++++++++++++++++ MathPad/Base.lproj/MPDocument.xib | 10 +++++++++- MathPad/MPException.h | 4 ++-- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/MathPad.xcodeproj/project.pbxproj b/MathPad.xcodeproj/project.pbxproj index 77fcca2..2928bf0 100644 --- a/MathPad.xcodeproj/project.pbxproj +++ b/MathPad.xcodeproj/project.pbxproj @@ -16,6 +16,10 @@ 3B52CEE319C070B900CEDCFC /* MPParsedProduct.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B52CEE119C070B900CEDCFC /* MPParsedProduct.m */; }; 3B52CEE619C0755300CEDCFC /* MPElementParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B52CEE419C0755300CEDCFC /* MPElementParser.h */; }; 3B52CEE719C0755300CEDCFC /* MPElementParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B52CEE519C0755300CEDCFC /* MPElementParser.m */; }; + 3B591BBB19C58D000061D86B /* MPMathRules.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B591BB919C58D000061D86B /* MPMathRules.h */; }; + 3B591BBC19C58D000061D86B /* MPMathRules.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B591BBA19C58D000061D86B /* MPMathRules.m */; }; + 3B7172EA19C7147000FEAA5B /* FunctionsButtonDisclosure@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B7172E819C7147000FEAA5B /* FunctionsButtonDisclosure@2x.png */; }; + 3B7172EB19C7147000FEAA5B /* FunctionsButtonDisclosure.png in Resources */ = {isa = PBXBuildFile; fileRef = 3B7172E919C7147000FEAA5B /* FunctionsButtonDisclosure.png */; }; 3B74BFB319A4C51800E5B5DE /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B74BFB219A4C51800E5B5DE /* CoreText.framework */; }; 3B78C85419C2DA5300516335 /* MPEvaluationContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B78C85219C2DA5300516335 /* MPEvaluationContext.h */; }; 3B78C85519C2DA5300516335 /* MPEvaluationContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B78C85319C2DA5300516335 /* MPEvaluationContext.m */; }; @@ -135,7 +139,11 @@ 3B52CEE119C070B900CEDCFC /* MPParsedProduct.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPParsedProduct.m; sourceTree = ""; }; 3B52CEE419C0755300CEDCFC /* MPElementParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPElementParser.h; sourceTree = ""; }; 3B52CEE519C0755300CEDCFC /* MPElementParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPElementParser.m; sourceTree = ""; }; + 3B591BB919C58D000061D86B /* MPMathRules.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPMathRules.h; sourceTree = ""; }; + 3B591BBA19C58D000061D86B /* MPMathRules.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPMathRules.m; sourceTree = ""; }; 3B688D9819982DF50006B4AB /* MPLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPLayout.m; sourceTree = ""; }; + 3B7172E819C7147000FEAA5B /* FunctionsButtonDisclosure@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "FunctionsButtonDisclosure@2x.png"; sourceTree = ""; }; + 3B7172E919C7147000FEAA5B /* FunctionsButtonDisclosure.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = FunctionsButtonDisclosure.png; sourceTree = ""; }; 3B74BFB219A4C51800E5B5DE /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; }; 3B78C85219C2DA5300516335 /* MPEvaluationContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEvaluationContext.h; sourceTree = ""; }; 3B78C85319C2DA5300516335 /* MPEvaluationContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPEvaluationContext.m; sourceTree = ""; }; @@ -243,12 +251,22 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3B7172E519C7112C00FEAA5B /* Resources */ = { + isa = PBXGroup; + children = ( + 3B7172E819C7147000FEAA5B /* FunctionsButtonDisclosure@2x.png */, + 3B7172E919C7147000FEAA5B /* FunctionsButtonDisclosure.png */, + ); + name = Resources; + sourceTree = ""; + }; 3B85830F19BB5E5500D76A8D /* MathKit */ = { isa = PBXGroup; children = ( 3B85833219BB5F2D00D76A8D /* MathKit.h */, 3B87E350190082B300259938 /* Model */, 3B85833119BB5EC800D76A8D /* View */, + 3B7172E519C7112C00FEAA5B /* Resources */, 3B85831019BB5E5500D76A8D /* Supporting Files */, ); path = MathKit; @@ -404,6 +422,8 @@ 3BC46B4819B38C980033F13A /* MPExpressionEvaluator.m */, 3B78C85219C2DA5300516335 /* MPEvaluationContext.h */, 3B78C85319C2DA5300516335 /* MPEvaluationContext.m */, + 3B591BB919C58D000061D86B /* MPMathRules.h */, + 3B591BBA19C58D000061D86B /* MPMathRules.m */, 3B52CEE419C0755300CEDCFC /* MPElementParser.h */, 3B52CEE519C0755300CEDCFC /* MPElementParser.m */, 3B52CEE019C070B900CEDCFC /* MPParsedProduct.h */, @@ -539,6 +559,7 @@ 3B85834819BB65B600D76A8D /* MPLayout.h in Headers */, 3B85834919BB65B600D76A8D /* MPExpressionLayout.h in Headers */, 3B78C86319C4CE2B00516335 /* MPParsedOperator.h in Headers */, + 3B591BBB19C58D000061D86B /* MPMathRules.h in Headers */, 3B85834A19BB65B600D76A8D /* MPFunctionLayout.h in Headers */, 3B85834B19BB65B600D76A8D /* MPSumFunctionLayout.h in Headers */, 3B52CEE619C0755300CEDCFC /* MPElementParser.h in Headers */, @@ -666,6 +687,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3B7172EA19C7147000FEAA5B /* FunctionsButtonDisclosure@2x.png in Resources */, + 3B7172EB19C7147000FEAA5B /* FunctionsButtonDisclosure.png in Resources */, 3B85831419BB5E5500D76A8D /* InfoPlist.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -708,6 +731,7 @@ files = ( 3B52CEE719C0755300CEDCFC /* MPElementParser.m in Sources */, 3BBEA94219BB79A700133766 /* MPExpressionLayout.m in Sources */, + 3B591BBC19C58D000061D86B /* MPMathRules.m in Sources */, 3BBEA94119BB79A700133766 /* MPLayout.m in Sources */, 3B78C86819C4E55900516335 /* MPFunction+MPParsedFactor.m in Sources */, 3B78C85C19C4CE1D00516335 /* MPParsedNumber.m in Sources */, diff --git a/MathPad/Base.lproj/MPDocument.xib b/MathPad/Base.lproj/MPDocument.xib index 5a585a5..c4c828d 100644 --- a/MathPad/Base.lproj/MPDocument.xib +++ b/MathPad/Base.lproj/MPDocument.xib @@ -18,7 +18,6 @@ - @@ -91,5 +90,14 @@ + + + + + + + + + diff --git a/MathPad/MPException.h b/MathPad/MPException.h index 5f23aca..8e9346b 100644 --- a/MathPad/MPException.h +++ b/MathPad/MPException.h @@ -9,7 +9,7 @@ #ifndef MathPad_MPException_h #define MathPad_MPException_h -extern NSString *MPIllegalElementException; -extern NSString *MPIllegalElementExceptionElementKey; +FOUNDATION_EXPORT NSString *MPIllegalElementException; +FOUNDATION_EXPORT NSString *MPIllegalElementExceptionElementKey; #endif