summaryrefslogtreecommitdiff
path: root/2013-05-07
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2013-05-09 19:17:42 -0600
committermo khan <mo@mokhan.ca>2013-05-09 19:17:42 -0600
commitc96d62a50a1e7b3e32433238050210d3307abb84 (patch)
tree1179644ba27b8f35eeed0ad130cf2dd8d25bc617 /2013-05-07
parenta05c1d9c2614169f35740d45d9a86c0f76648160 (diff)
tell the truth
Diffstat (limited to '2013-05-07')
-rw-r--r--2013-05-07/People/People.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstatebin17253 -> 18812 bytes
-rw-r--r--2013-05-07/People/People/Person.h1
-rw-r--r--2013-05-07/People/People/Person.m8
-rw-r--r--2013-05-07/People/People/main.m4
4 files changed, 10 insertions, 3 deletions
diff --git a/2013-05-07/People/People.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate b/2013-05-07/People/People.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate
index 883e302..70c5733 100644
--- a/2013-05-07/People/People.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/2013-05-07/People/People.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
diff --git a/2013-05-07/People/People/Person.h b/2013-05-07/People/People/Person.h
index cef9eed..ecdb3ca 100644
--- a/2013-05-07/People/People/Person.h
+++ b/2013-05-07/People/People/Person.h
@@ -13,4 +13,5 @@
@property (strong, nonatomic) NSString * lastName;
-(NSString *)putFirstAndLastTogether:(NSString *)first;
-(NSString *)fullName;
+-(NSString *)theTruth;
@end
diff --git a/2013-05-07/People/People/Person.m b/2013-05-07/People/People/Person.m
index d7bbe6f..dea7ae4 100644
--- a/2013-05-07/People/People/Person.m
+++ b/2013-05-07/People/People/Person.m
@@ -17,7 +17,11 @@
-(NSString *)fullName
{
- NSString * result = [[NSString alloc]initWithFormat:@"%@ %@", self.firstName, self.lastName];
- return result;
+ return [[NSString alloc]initWithFormat:@"%@ %@", self.firstName, self.lastName];
+}
+
+-(NSString *)theTruth
+{
+ return [[NSString alloc]initWithFormat:@"%@ is the boss!", self.fullName];
}
@end
diff --git a/2013-05-07/People/People/main.m b/2013-05-07/People/People/main.m
index ff7a7bd..1630a00 100644
--- a/2013-05-07/People/People/main.m
+++ b/2013-05-07/People/People/main.m
@@ -20,7 +20,9 @@ int main(int argc, const char * argv[])
[newPerson setLastName:@"Khan"];
NSLog(@"Hello, World! %@ %@", newPerson.firstName, newPerson.lastName);
NSLog(@"%@", [newPerson putFirstAndLastTogether:newPerson.firstName]);
- NSLog(@"%@", [newPerson fullName]);
+ NSLog(@"%@", [newPerson theTruth]);
+
+ NSObject * item;
}
return 0;
}