Ronald Oussoren avatar Ronald Oussoren committed 51ce77c Merge

merge

Comments (0)

Files changed (6)

pyobjc-core/Modules/objc/OC_PythonArray.m

 
 @implementation OC_PythonArray 
 
-+ (instancetype)depythonifyObject:(PyObject*)object
++ (OC_PythonArray*)depythonifyObject:(PyObject*)object
 {
 	Py_ssize_t i, len;
 	
 	return result;
 }
 
-+ (instancetype)arrayWithPythonObject:(PyObject*)v
++ (OC_PythonArray*)arrayWithPythonObject:(PyObject*)v
 {
 	OC_PythonArray* res;
 

pyobjc-core/Modules/objc/OC_PythonData.m

 
 @implementation OC_PythonData 
 
-+ (instancetype)dataWithPythonObject:(PyObject*)v
++ (OC_PythonData*)dataWithPythonObject:(PyObject*)v
 {
 	OC_PythonData* res;
 
 }
 
 
-- (id)initWithPythonObject:(PyObject*)v
+- (OC_PythonData*)initWithPythonObject:(PyObject*)v
 {
 	self = [super init];
 	if (unlikely(self == nil)) return nil;

pyobjc-core/Modules/objc/OC_PythonDictionary.m

 
 @implementation OC_PythonDictionary 
 
-+ (instancetype)depythonifyObject:(PyObject*)object
++ (OC_PythonDictionary*)depythonifyObject:(PyObject*)object
 {
 	Py_ssize_t i, len;
 	
 	return result;
 }
 
-+(instancetype)dictionaryWithPythonObject:(PyObject*)v
++(OC_PythonDictionary*)dictionaryWithPythonObject:(PyObject*)v
 {
 	OC_PythonDictionary* res = 
 		[[OC_PythonDictionary alloc] initWithPythonObject:v];
 	return res;
 }
 
--(id)initWithPythonObject:(PyObject*)v
+-(OC_PythonDictionary*)initWithPythonObject:(PyObject*)v
 {
 	self = [super init];
 	if (unlikely(self == nil)) return nil;

pyobjc-core/Modules/objc/OC_PythonObject.h

 - (void)encodeWithCoder:(NSCoder*)coder;
 - (id)initWithCoder:(NSCoder*)coder;
 + (id)classFallbacksForKeyedArchiver;
--(NSObject*)replacementObjectForArchiver:(NSObject*)archiver;
--(NSObject*)replacementObjectForKeyedArchiver:(NSObject*)archiver;
--(NSObject*)replacementObjectForCoder:(NSObject*)archiver;
--(NSObject*)replacementObjectForPortCoder:(NSObject*)archiver;
+-(NSObject*)replacementObjectForArchiver:(NSArchiver*)archiver;
+-(NSObject*)replacementObjectForKeyedArchiver:(NSKeyedArchiver*)archiver;
+-(NSObject*)replacementObjectForCoder:(NSCoder*)archiver;
+-(NSObject*)replacementObjectForPortCoder:(NSPortCoder*)archiver;
 -(Class)classForArchiver;
 -(Class)classForKeyedArchiver;
 +(Class)classForUnarchiver;

pyobjc-core/Modules/objc/OC_PythonObject.m

 
 	} else if (sel_isEqual(aSelector, @selector(replacementObjectForKeyedArchiver:))){
 		NSObject*	c;
-		NSObject* archiver;
+		NSKeyedArchiver* archiver;
 
 		[invocation getArgument:&archiver atIndex:2];
 		c = [self replacementObjectForKeyedArchiver:archiver];
 
 	} else if (sel_isEqual(aSelector, @selector(replacementObjectForArchiver:))){
 		NSObject*	c;
-		NSObject* archiver;
+		NSArchiver* archiver;
 
 		[invocation getArgument:&archiver atIndex:2];
 		c = [self replacementObjectForArchiver:archiver];
 
 	} else if (sel_isEqual(aSelector, @selector(replacementObjectForCoder:))){
 		NSObject*	c;
-		NSObject* archiver;
+		NSCoder* archiver;
 
 		[invocation getArgument:&archiver atIndex:2];
 		c = [self replacementObjectForCoder:archiver];
 
 	} else if (sel_isEqual(aSelector, @selector(replacementObjectForPortCoder:))){
 		NSObject*	c;
-		NSObject* archiver;
+		NSPortCoder* archiver;
 
 		[invocation getArgument:&archiver atIndex:2];
 		c = [self replacementObjectForPortCoder:archiver];

pyobjc-core/Modules/objc/objc-runtime-compat.m

 
 		for (i = 0; i < nprotos; i++) {
 			Protocol* p = (Protocol*)&protos[i];
-			if (strcmp([protocol name], name) == 0) {
+			if (strcmp([p name], name) == 0) {
 				return p;
 			}
 		}
 	}
-	return protocols;
+	return nil;
 }
 
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.