summaryrefslogtreecommitdiff
path: root/objective-c
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2017-05-09 16:39:18 -0400
committerJoe George <joe@zeroc.com>2017-05-09 16:39:56 -0400
commita0dae9ed44e1f8ebd928389e612f4a502c05701a (patch)
treeee40c6f9262601b387e17c90fccf9213564d3b7a /objective-c
parentICE-7868 - Update to latest gulp builder (diff)
downloadice-a0dae9ed44e1f8ebd928389e612f4a502c05701a.tar.bz2
ice-a0dae9ed44e1f8ebd928389e612f4a502c05701a.tar.xz
ice-a0dae9ed44e1f8ebd928389e612f4a502c05701a.zip
Cleanup more whitespace
Remove extra newlines from the end of files and add newlines to files which are missing one.
Diffstat (limited to 'objective-c')
-rwxr-xr-xobjective-c/allTests.py2
-rw-r--r--objective-c/include/objc/Ice/DispatchInterceptor.h1
-rw-r--r--objective-c/src/Ice/CurrentI.mm1
-rw-r--r--objective-c/src/Ice/DispatcherI.h1
-rw-r--r--objective-c/src/Ice/EndpointI.h1
-rw-r--r--objective-c/src/Ice/EndpointI.mm1
-rw-r--r--objective-c/src/Ice/ObjectAdapterI.h1
-rw-r--r--objective-c/src/Ice/VersionI.h1
-rw-r--r--objective-c/test/Ice/ami/TestI.h1
-rw-r--r--objective-c/test/Ice/binding/AllTests.m1
-rw-r--r--objective-c/test/Ice/binding/TestI.h1
-rw-r--r--objective-c/test/Ice/inheritance/TestI.h1
-rw-r--r--objective-c/test/Ice/interceptor/InterceptorI.h1
-rw-r--r--objective-c/test/Ice/operations/TwowaysNewAMI.m1
-rw-r--r--objective-c/test/Ice/stream/StreamTest.ice1
-rw-r--r--objective-c/test/ios/controller/Classes/AppDelegate.h1
-rw-r--r--objective-c/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json2
-rw-r--r--objective-c/test/ios/controller/Classes/Assets.xcassets/Contents.json2
-rw-r--r--objective-c/test/ios/controller/Classes/ViewController.h1
19 files changed, 3 insertions, 19 deletions
diff --git a/objective-c/allTests.py b/objective-c/allTests.py
index 18df973cab0..d0439bd0028 100755
--- a/objective-c/allTests.py
+++ b/objective-c/allTests.py
@@ -13,4 +13,4 @@ sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
from Util import runTestsWithPath
-runTestsWithPath(__file__) \ No newline at end of file
+runTestsWithPath(__file__)
diff --git a/objective-c/include/objc/Ice/DispatchInterceptor.h b/objective-c/include/objc/Ice/DispatchInterceptor.h
index 97a86906c13..002bf822679 100644
--- a/objective-c/include/objc/Ice/DispatchInterceptor.h
+++ b/objective-c/include/objc/Ice/DispatchInterceptor.h
@@ -24,4 +24,3 @@ ICE_API @interface ICEMainThreadDispatch : ICEDispatchInterceptor<ICEDispatchInt
-(id)init:(ICEObject*)servant;
+(id)mainThreadDispatch:(ICEObject*)servant;
@end
-
diff --git a/objective-c/src/Ice/CurrentI.mm b/objective-c/src/Ice/CurrentI.mm
index 3577c5c0d6a..f3c2f6a2fb1 100644
--- a/objective-c/src/Ice/CurrentI.mm
+++ b/objective-c/src/Ice/CurrentI.mm
@@ -41,4 +41,3 @@
return self;
}
@end
-
diff --git a/objective-c/src/Ice/DispatcherI.h b/objective-c/src/Ice/DispatcherI.h
index bae14fa9a58..b227d2b3b92 100644
--- a/objective-c/src/Ice/DispatcherI.h
+++ b/objective-c/src/Ice/DispatcherI.h
@@ -24,4 +24,3 @@
}
-(id) initWithCall:(Ice::DispatcherCall*)call;
@end
-
diff --git a/objective-c/src/Ice/EndpointI.h b/objective-c/src/Ice/EndpointI.h
index 5a6da849eb0..9e3dd2dc1f8 100644
--- a/objective-c/src/Ice/EndpointI.h
+++ b/objective-c/src/Ice/EndpointI.h
@@ -46,4 +46,3 @@ ICE_API void registerEndpointInfoClass(Class cl);
@interface ICEOpaqueEndpointInfo (ICEInternal)
-(id) initWithOpaqueEndpointInfo:(Ice::OpaqueEndpointInfo*)opaqueEndpointInfo;
@end
-
diff --git a/objective-c/src/Ice/EndpointI.mm b/objective-c/src/Ice/EndpointI.mm
index 3b987cbe09a..a9e7a333bd1 100644
--- a/objective-c/src/Ice/EndpointI.mm
+++ b/objective-c/src/Ice/EndpointI.mm
@@ -233,4 +233,3 @@ registerEndpointInfoClass(Class cl)
}
@end
-
diff --git a/objective-c/src/Ice/ObjectAdapterI.h b/objective-c/src/Ice/ObjectAdapterI.h
index 564b68867c4..4bbdbd3b616 100644
--- a/objective-c/src/Ice/ObjectAdapterI.h
+++ b/objective-c/src/Ice/ObjectAdapterI.h
@@ -18,4 +18,3 @@
@interface ICEObjectAdapter : ICELocalObject<ICEObjectAdapter>
-(Ice::ObjectAdapter*) adapter;
@end
-
diff --git a/objective-c/src/Ice/VersionI.h b/objective-c/src/Ice/VersionI.h
index 0d0b35c09c0..ff4528df30b 100644
--- a/objective-c/src/Ice/VersionI.h
+++ b/objective-c/src/Ice/VersionI.h
@@ -24,4 +24,3 @@
-(Ice::EncodingVersion)encodingVersion;
+(ICEEncodingVersion*)encodingVersionWithEncodingVersion:(const Ice::EncodingVersion&)arg;
@end
-
diff --git a/objective-c/test/Ice/ami/TestI.h b/objective-c/test/Ice/ami/TestI.h
index 2e740213736..3480e453a9a 100644
--- a/objective-c/test/Ice/ami/TestI.h
+++ b/objective-c/test/Ice/ami/TestI.h
@@ -27,4 +27,3 @@
}
-(id) initWithAdapter:(id<ICEObjectAdapter>)adapter;
@end
-
diff --git a/objective-c/test/Ice/binding/AllTests.m b/objective-c/test/Ice/binding/AllTests.m
index c15cce64044..713050a2ad5 100644
--- a/objective-c/test/Ice/binding/AllTests.m
+++ b/objective-c/test/Ice/binding/AllTests.m
@@ -862,4 +862,3 @@ bindingAllTests(id<ICECommunicator> communicator)
[com shutdown];
}
-
diff --git a/objective-c/test/Ice/binding/TestI.h b/objective-c/test/Ice/binding/TestI.h
index 82fa9219bf2..034a9f9c611 100644
--- a/objective-c/test/Ice/binding/TestI.h
+++ b/objective-c/test/Ice/binding/TestI.h
@@ -32,4 +32,3 @@
@interface TestBindingI : TestBindingTestIntf<TestBindingTestIntf>
-(NSString *) getAdapterName:(ICECurrent *)current;
@end
-
diff --git a/objective-c/test/Ice/inheritance/TestI.h b/objective-c/test/Ice/inheritance/TestI.h
index 175b24a8a4c..0346e28763c 100644
--- a/objective-c/test/Ice/inheritance/TestI.h
+++ b/objective-c/test/Ice/inheritance/TestI.h
@@ -47,4 +47,3 @@
@interface CDI : TestInheritanceMACD<TestInheritanceMACD>
@end
-
diff --git a/objective-c/test/Ice/interceptor/InterceptorI.h b/objective-c/test/Ice/interceptor/InterceptorI.h
index 497c29812ff..5c916f1b817 100644
--- a/objective-c/test/Ice/interceptor/InterceptorI.h
+++ b/objective-c/test/Ice/interceptor/InterceptorI.h
@@ -22,4 +22,3 @@
-(void) clear;
@end
-
diff --git a/objective-c/test/Ice/operations/TwowaysNewAMI.m b/objective-c/test/Ice/operations/TwowaysNewAMI.m
index 5b930f7a64a..96cd0f81d1f 100644
--- a/objective-c/test/Ice/operations/TwowaysNewAMI.m
+++ b/objective-c/test/Ice/operations/TwowaysNewAMI.m
@@ -2074,4 +2074,3 @@ twowaysNewAMI(id<ICECommunicator> communicator, id<TestOperationsMyClassPrx> p)
// Marshaling tests for NSNull are present only in synchronous test because testing asynchronously
// would only test the same marshaling code that's been tested already.
}
-
diff --git a/objective-c/test/Ice/stream/StreamTest.ice b/objective-c/test/Ice/stream/StreamTest.ice
index 20b18e7af7f..2d4c00391be 100644
--- a/objective-c/test/Ice/stream/StreamTest.ice
+++ b/objective-c/test/Ice/stream/StreamTest.ice
@@ -172,4 +172,3 @@ module Sub2
}
}
}
-
diff --git a/objective-c/test/ios/controller/Classes/AppDelegate.h b/objective-c/test/ios/controller/Classes/AppDelegate.h
index cd554aa7ed3..bdbf2a2e808 100644
--- a/objective-c/test/ios/controller/Classes/AppDelegate.h
+++ b/objective-c/test/ios/controller/Classes/AppDelegate.h
@@ -15,4 +15,3 @@
@end
-
diff --git a/objective-c/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json b/objective-c/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json
index ef0fccfaf08..d4e114a8919 100644
--- a/objective-c/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/objective-c/test/ios/controller/Classes/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -107,4 +107,4 @@
"version" : 1,
"author" : "xcode"
}
-} \ No newline at end of file
+}
diff --git a/objective-c/test/ios/controller/Classes/Assets.xcassets/Contents.json b/objective-c/test/ios/controller/Classes/Assets.xcassets/Contents.json
index da4a164c918..2d92bd53fdb 100644
--- a/objective-c/test/ios/controller/Classes/Assets.xcassets/Contents.json
+++ b/objective-c/test/ios/controller/Classes/Assets.xcassets/Contents.json
@@ -3,4 +3,4 @@
"version" : 1,
"author" : "xcode"
}
-} \ No newline at end of file
+}
diff --git a/objective-c/test/ios/controller/Classes/ViewController.h b/objective-c/test/ios/controller/Classes/ViewController.h
index 4033b89aafc..6c7412e83c3 100644
--- a/objective-c/test/ios/controller/Classes/ViewController.h
+++ b/objective-c/test/ios/controller/Classes/ViewController.h
@@ -26,4 +26,3 @@
id<ICECommunicator> communicator;
}
@end
-