summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSwati Sharma <itawswati@gmail.com>2012-08-04 19:14:56 +0000
committerSwati Sharma <itawswati@gmail.com>2012-08-04 19:14:56 +0000
commite740e8fe602b5116d867ee29e79eec082cb43bdd (patch)
treeef84a4c3cc77750e2910349afff48bcacea08d27
parent24b3fe1ff317048b724502f5ec9fd856ea8e9e35 (diff)
downloadswig-e740e8fe602b5116d867ee29e79eec082cb43bdd.tar.gz
Fixed runme files for Examples.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-objc@13501 626c5289-ae23-0410-ae9c-e8d60b6d4f22
-rw-r--r--Examples/objc/callback/runme.m12
-rw-r--r--Examples/objc/class/runme.m4
-rw-r--r--Examples/objc/enum/runme.m6
-rw-r--r--Examples/objc/reference/runme.m18
-rw-r--r--Examples/objc/templates/runme.m8
5 files changed, 24 insertions, 24 deletions
diff --git a/Examples/objc/callback/runme.m b/Examples/objc/callback/runme.m
index 01d427178..7c987be2b 100644
--- a/Examples/objc/callback/runme.m
+++ b/Examples/objc/callback/runme.m
@@ -21,18 +21,18 @@ int main(int argc, char* argv[]) {
Caller *caller=[[Caller alloc]init];
Callback *callback=[[Callback alloc]init];
- [caller setCallback:callback];
- [caller call];
- [caller delCallback];
+ [caller Caller_setCallback:callback];
+ [caller Caller_call];
+ [caller Caller_delCallback];
NSLog(@"\n");
NSLog(@"Adding and calling an ObjectiveC callback\n");
NSLog(@"----------------------------------------\n");
Callback *objcallback=[[ObjCCallback alloc] init];
- [caller setCallback:objcallback];
- [caller call];
- [caller delCallback];
+ [caller Caller_setCallback:objcallback];
+ [caller Caller_call];
+ [caller Caller_delCallback];
[caller release];
[pool drain];
diff --git a/Examples/objc/class/runme.m b/Examples/objc/class/runme.m
index e51a2e8bb..f100f6b4f 100644
--- a/Examples/objc/class/runme.m
+++ b/Examples/objc/class/runme.m
@@ -43,8 +43,8 @@ int main(int argc, char* argv[]) {
for (Shape* obj in shapes)
{
NSLog(@"Shape: %@", obj);
- NSLog(@"area = %f", [obj area]);
- NSLog(@"perimeter = %f", [obj perimeter]);
+ NSLog(@"area = %f", [obj Shape_area]);
+ NSLog(@"perimeter = %f", [obj Shape_perimeter]);
}
// ----- Delete everything -----
diff --git a/Examples/objc/enum/runme.m b/Examples/objc/enum/runme.m
index b5a055727..958bc61a5 100644
--- a/Examples/objc/enum/runme.m
+++ b/Examples/objc/enum/runme.m
@@ -21,9 +21,9 @@ int main(int argc, char* argv[]) {
NSLog(@"\nTesting use of enum with class method" );
Foo* f = [[Foo alloc] init];
- [f enum_test:Foo_IMPULSE];
- [f enum_test:Foo_WARP];
- [f enum_test:Foo_LUDICROUS];
+ [f Foo_enum_test:Foo_IMPULSE];
+ [f Foo_enum_test:Foo_WARP];
+ [f Foo_enum_test:Foo_LUDICROUS];
[f release];
return 0;
diff --git a/Examples/objc/reference/runme.m b/Examples/objc/reference/runme.m
index 368097c4a..e1c5dafea 100644
--- a/Examples/objc/reference/runme.m
+++ b/Examples/objc/reference/runme.m
@@ -9,31 +9,31 @@ NSAutoreleasePool *pool=[[NSAutoreleasePool alloc]init];
Vector *v1 =[[Vector alloc]initWithX:3.0 y:4.0 z:5.0];
Vector *v2 =[[Vector alloc]initWithX:10.0 y:11.0 z:12.0];
- NSLog(@"Created v1 %@",[v1 print]);
- NSLog(@"Created v2 %@",[v2 print]);
+ NSLog(@"Created v1 %@",[v1 Vector_print]);
+ NSLog(@"Created v2 %@",[v2 Vector_print]);
// Call an overloaded operator
NSLog(@"Adding a+b \n");
Vector *v3 =ObjcAddv(v1 ,v2);
- NSLog(@"a+b = %@",[v3 print]);
+ NSLog(@"a+b = %@",[v3 Vector_print]);
// Create a vector Array
NSLog(@"Creating an array of vectors\n");
VectorArray *va=[[VectorArray alloc]initWithMaxsize:10];
- NSLog(@" va:size %i",[va size]);
+ NSLog(@" va:size %i",[va VectorArray_size]);
// Copy the value of v1 and v2 to a vector array
- [va set:0 a:v1];
- [va set:1 a:v2];
- [va set:2 a:ObjcAddv(v1,v2)];
+ [va VectorArray_set:0 a:v1];
+ [va VectorArray_set:1 a:v2];
+ [va VectorArray_set:2 a:ObjcAddv(v1,v2)];
// Get some values from the array
NSLog(@"Getting some array values \n");
int i =0;
for(i=0; i<5 ;i++)
{
- Vector *v4=[va get:i];
- NSLog(@"Array element %@",[v4 print]);
+ Vector *v4=[va VectorArray_get:i];
+ NSLog(@"Array element %@",[v4 Vector_print]);
}
// Clean up
diff --git a/Examples/objc/templates/runme.m b/Examples/objc/templates/runme.m
index 530a3c149..d8b773caf 100644
--- a/Examples/objc/templates/runme.m
+++ b/Examples/objc/templates/runme.m
@@ -14,22 +14,22 @@ int main(int argc, char* argv[]) {
vecdouble *dv=[[vecdouble alloc]initWith_sz:1000];
int i=0;
for (i=0;i<100;i++)
- [iv setitem:i val:2*i];
+ [iv vecint_setitem:i val:2*i];
for (i=0;i<1000;i++)
- [dv setitem:i val:1.0/(i+1)];
+ [dv vecdouble_setitem:i val:1.0/(i+1)];
{
int sum =0;
for (i=0;i<100;i++)
- sum=sum+[iv getitem:i];
+ sum=sum+[iv vecint_getitem:i];
NSLog(@"The sum of integers: %i",sum);
}
{
double sum =0;
for (i=0;i<1000;i++)
- sum=sum+[dv getitem:i];
+ sum=sum+[dv vecdouble_getitem:i];
NSLog(@"The sum of doubles: %f",sum);
}