diff --git a/ChangeLog b/ChangeLog index fe66808fc..60cea1063 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,99 @@ required. * Source/win32/NSStreamWin32.m: Use fileSystemRepresentation rather than cStringUsingEncoding: - + * Source/NSSocketPortNameServer.m: + * Source/NSBundle.m: + * Source/NSProcessInfo.m: + * Source/NSAttributedString.m: + * Source/NSArray.m: + * Source/NSMessagePortNameServer.m: + * Source/GSPrivate.h: + * Source/NSInvocation.m: + * Source/NSNotificationCenter.m: + * Source/NSCoder.m: + * Source/mframe.m: + * Source/Additions/GSCategories.m: + * Source/NSConnection.m: + * Source/GSPortPrivate.h: + * Source/NSThread.m: + * Source/NSNull.m: + * Source/NSDistantObject.m: + * Source/NSTask.m: + * Source/NSPortNameServer.m: + * Headers/Foundation/NSTimeZone.h: + * Headers/Foundation/NSHashTable.h: + * Headers/Foundation/NSRange.h: + * Headers/Foundation/NSCoder.h: + * Headers/Foundation/NSException.h: + * Headers/Foundation/NSByteOrder.h: + * Headers/Foundation/NSPortCoder.h: + * Headers/Foundation/NSURL.h: + * Headers/Foundation/NSObject.h: + * Headers/Foundation/NSCalendarDate.h: + * Headers/Foundation/NSDecimalNumber.h: + * Headers/Foundation/NSKeyValueCoding.h: + * Headers/Foundation/NSBundle.h: + * Headers/Foundation/NSSerialization.h: + * Headers/Foundation/NSURLHandle.h: + * Headers/Foundation/NSPropertyList.h: + * Headers/Foundation/NSTimer.h: + * Headers/Foundation/NSNotification.h: + * Headers/Foundation/NSScanner.h: + * Headers/Foundation/NSProcessInfo.h: + * Headers/Foundation/NSDistributedNotificationCenter.h: + * Headers/Foundation/NSGeometry.h: + * Headers/Foundation/NSAttributedString.h: + * Headers/Foundation/NSDecimal.h: + * Headers/Foundation/NSConnection.h: + * Headers/Foundation/NSUndoManager.h: + * Headers/Foundation/NSDateFormatter.h: + * Headers/Foundation/NSMethodSignature.h: + * Headers/Foundation/NSAutoreleasePool.h: + * Headers/Foundation/NSFormatter.h: + * Headers/Foundation/NSUserDefaults.h: + * Headers/Foundation/NSThread.h: + * Headers/Foundation/NSData.h: + * Headers/Foundation/NSDate.h: + * Headers/Foundation/NSHost.h: + * Headers/Foundation/NSArray.h: + * Headers/Foundation/NSProxy.h: + * Headers/Foundation/NSObjCRuntime.h: + * Headers/Foundation/NSKeyedArchiver.h: + * Headers/Foundation/NSProtocolChecker.h: + * Headers/Foundation/NSDebug.h: + * Headers/Foundation/NSPortMessage.h: + * Headers/Foundation/NSError.h: + * Headers/Foundation/NSDistributedLock.h: + * Headers/Foundation/NSFileHandle.h: + * Headers/Foundation/NSKeyValueObserving.h: + * Headers/Foundation/NSDictionary.h: + * Headers/Foundation/NSClassDescription.h: + * Headers/Foundation/NSNull.h: + * Headers/Foundation/NSZone.h: + * Headers/Foundation/NSValue.h: + * Headers/Foundation/NSIndexSet.h: + * Headers/Foundation/NSPort.h: + * Headers/Foundation/NSSortDescriptor.h: + * Headers/Foundation/NSLock.h: + * Headers/Foundation/NSSet.h: + * Headers/Foundation/NSDistantObject.h: + * Headers/Foundation/NSTask.h: + * Headers/Foundation/NSCharacterSet.h: + * Headers/Foundation/NSInvocation.h: + * Headers/Foundation/NSUtilities.h: + * Headers/Foundation/NSPortNameServer.h: + * Headers/Foundation/NSNumberFormatter.h: + * Headers/Foundation/NSXMLParser.h: + * Headers/Foundation/NSEnumerator.h: + * Headers/Foundation/NSMapTable.h: + * Headers/Additions/GNUstepBase/DistributedObjects.h: + * Headers/Additions/GNUstepBase/GSCategories.h: + Tidied a bit ... wrap some long lines. + Remove some old deprecated API. + Move some internal API out of external headers. + Deprecate a few non-standard API features. + Move a bit of non-standard API to the additions library. + 2006-03-07 Richard Frith-Macdonald * Source/NSRunLoop.m: diff --git a/Headers/Additions/GNUstepBase/DistributedObjects.h b/Headers/Additions/GNUstepBase/DistributedObjects.h index 57aaad8ac..a05215f32 100644 --- a/Headers/Additions/GNUstepBase/DistributedObjects.h +++ b/Headers/Additions/GNUstepBase/DistributedObjects.h @@ -74,6 +74,13 @@ enum { - (NSDistantObject*) locateLocalTarget: (unsigned)target; - (NSDistantObject*) proxyForTarget: (unsigned)target; - (void) retainTarget: (unsigned)target; + +- (retval_t) forwardForProxy: (NSDistantObject*)object + selector: (SEL)sel + argFrame: (arglist_t)argframe; +- (void) forwardInvocation: (NSInvocation *)inv + forProxy: (NSDistantObject*)object; +- (const char *) typeForSelector: (SEL)sel remoteTarget: (unsigned)target; @end @interface NSPort (Internal) diff --git a/Headers/Additions/GNUstepBase/GSCategories.h b/Headers/Additions/GNUstepBase/GSCategories.h index 2d2f69b3f..9e7cb6c5d 100644 --- a/Headers/Additions/GNUstepBase/GSCategories.h +++ b/Headers/Additions/GNUstepBase/GSCategories.h @@ -19,7 +19,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02111 USA. AutogsdocSource: Additions/GSCategories.m @@ -246,6 +247,15 @@ typedef enum _NSGNUstepStringEncoding @interface NSArray (GSCompatibility) - (id) initWithArray: (NSArray*)array copyItems: (BOOL)shouldCopy; +- (unsigned) insertionPosition: (id)item + usingFunction: (NSComparisonResult (*)(id, id, void *))sorter + context: (void *)context; +- (unsigned) insertionPosition: (id)item + usingSelector: (SEL)comp; +@end + +@interface NSAttributedString (GSCategories) +- (NSAttributedString*) attributedSubstringWithRange: (NSRange)aRange; @end @interface NSBundle(GSCompatibility) @@ -286,7 +296,7 @@ typedef enum _NSGNUstepStringEncoding @end @interface NSLock (GSCategories) -+ (id)newLockAt:(id *)location; ++ (id) newLockAt: (id *)location; @end @interface NSLock (GSCompatibility) diff --git a/Headers/Foundation/NSArray.h b/Headers/Foundation/NSArray.h index 59e38bee0..b8e88e5b2 100644 --- a/Headers/Foundation/NSArray.h +++ b/Headers/Foundation/NSArray.h @@ -150,7 +150,7 @@ @end -@interface NSArray (GNUstep) +@interface NSArray (GSCategories) /* * Extension methods for working with sorted arrays - use a binary chop * to determine the insertion location for an nobject. If equal objects diff --git a/Headers/Foundation/NSAttributedString.h b/Headers/Foundation/NSAttributedString.h index 06d87c655..266dedb01 100644 --- a/Headers/Foundation/NSAttributedString.h +++ b/Headers/Foundation/NSAttributedString.h @@ -84,13 +84,6 @@ //Extracting a substring - (NSAttributedString*) attributedSubstringFromRange: (NSRange)aRange; -#ifndef NO_GNUSTEP -/* - * Synonym for attributedSubstringFromRange: - for consistency with NSString - */ -- (NSAttributedString*) attributedSubstringWithRange: (NSRange)aRange; -#endif - @end //NSAttributedString @@ -127,6 +120,16 @@ @end //NSMutableAttributedString +#ifndef NO_GNUSTEP +@interface NSAttributedString (GSCategories) +/** + * Dep[recated synonym for attributedSubstringFromRange: + * for consistency with NSString + */ +- (NSAttributedString*) attributedSubstringWithRange: (NSRange)aRange; +@end +#endif + #endif //STRICT_OPENSTEP #endif //_NSXKit_H_NSAttributedString diff --git a/Headers/Foundation/NSAutoreleasePool.h b/Headers/Foundation/NSAutoreleasePool.h index f62efd1b6..b9c03c08d 100644 --- a/Headers/Foundation/NSAutoreleasePool.h +++ b/Headers/Foundation/NSAutoreleasePool.h @@ -162,7 +162,9 @@ typedef struct autorelease_array_list * Methods whose names begin with copy create a copy of the receiver * which is owned by the caller. * - * [NSObject-mutableCopy], [(NSMutableCopying)-mutableCopyWithZone:] + * + * [NSObject-mutableCopy], [(NSMutableCopying)-mutableCopyWithZone:] + * * * Methods whose names begin with mutableCopy create a copy of the receiver * which is owned by the caller. @@ -278,13 +280,6 @@ typedef struct autorelease_array_list */ + (void) setPoolCountThreshhold: (unsigned)c; -/** - * Destroys all the autorelease pools in the thread.
- * You should not call this directly, it's called automatically - * when a thread exits. - */ -+ (void) _endThread: (NSThread*)thread; - /** * Return the number of objects in this pool. */ diff --git a/Headers/Foundation/NSBundle.h b/Headers/Foundation/NSBundle.h index 3fb00d85b..cc5b300b9 100644 --- a/Headers/Foundation/NSBundle.h +++ b/Headers/Foundation/NSBundle.h @@ -369,26 +369,11 @@ GS_EXPORT NSString* const NSLoadedClasses; */ + (NSBundle *) bundleForLibrary: (NSString *)libraryName; -+ (NSString *) _absolutePathOfExecutable: (NSString *)path; -+ (NSString*) _gnustep_target_cpu; -+ (NSString*) _gnustep_target_dir; -+ (NSString*) _gnustep_target_os; -+ (NSString*) _library_combo; - /** Find a resource in the "Library" directory. */ + (NSString*) pathForLibraryResource: (NSString*)name ofType: (NSString*)ext inDirectory: (NSString*)bundlePath; -/** Deprecated. Use +bundleForLibrary: instead. */ -+ (NSBundle*) gnustepBundle; - -/** Deprecated. Use +pathForLibraryResource:ofType:inDirectory: - or +bundleForLibrary: instead. */ -+ (NSString*) pathForGNUstepResource: (NSString*)name - ofType: (NSString*)ext - inDirectory: (NSString*)bundlePath; - @end /** Warning - do not use this. */ diff --git a/Headers/Foundation/NSByteOrder.h b/Headers/Foundation/NSByteOrder.h index 0a2541de5..3179996ab 100644 --- a/Headers/Foundation/NSByteOrder.h +++ b/Headers/Foundation/NSByteOrder.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02111 USA. */ #ifndef __NSByteOrder_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSCalendarDate.h b/Headers/Foundation/NSCalendarDate.h index 50e19228d..a1331b157 100644 --- a/Headers/Foundation/NSCalendarDate.h +++ b/Headers/Foundation/NSCalendarDate.h @@ -134,12 +134,6 @@ @end -void -GSBreakTime(NSTimeInterval when, int *year, int *month, int *day, int *hour, - int *minute, int *second, int *mil); -NSTimeInterval -GSTime(int day, int month, int year, int hour, int minute, int second, int mil); - #endif #ifndef STRICT_MACOS_X diff --git a/Headers/Foundation/NSCharacterSet.h b/Headers/Foundation/NSCharacterSet.h index e5e48b359..0bd81e9d5 100644 --- a/Headers/Foundation/NSCharacterSet.h +++ b/Headers/Foundation/NSCharacterSet.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02111 USA. */ #ifndef __NSCharacterSet_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSClassDescription.h b/Headers/Foundation/NSClassDescription.h index 52365832a..afce7c3d0 100644 --- a/Headers/Foundation/NSClassDescription.h +++ b/Headers/Foundation/NSClassDescription.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02111 USA. */ #ifndef __NSClassDescription_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSCoder.h b/Headers/Foundation/NSCoder.h index f8aa8c4d4..a950838d2 100644 --- a/Headers/Foundation/NSCoder.h +++ b/Headers/Foundation/NSCoder.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSCoder_h_GNUSTEP_BASE_INCLUDE @@ -352,6 +353,7 @@ /** * GNUstep extensions to [NSCoder], supporting compatibility with libObjects. + * DEPRECATED */ @interface NSCoder (GNUstep) /* Compatibility with libObjects */ diff --git a/Headers/Foundation/NSConnection.h b/Headers/Foundation/NSConnection.h index 4972bfdb6..fb3756d91 100644 --- a/Headers/Foundation/NSConnection.h +++ b/Headers/Foundation/NSConnection.h @@ -19,7 +19,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSConnection_h_GNUSTEP_BASE_INCLUDE @@ -178,45 +179,6 @@ GS_EXPORT NSString* const NSConnectionProxyCount; /* Objects received */ @end -/** - * This category contains legacy methods from the original GNU 'Connection' - * class, and useful extensions to [NSConnection]. - */ -@interface NSConnection (GNUstepExtensions) - -/** - * Alternative convenience constructor, not specified in OpenStep, where you - * register root anObject under given name in one step. - */ -+ (NSConnection*) newRegisteringAtName: (NSString*)name - withRootObject: (id)anObject; - -/** - * Performs local and remote cleanup. - */ -- (void) gcFinalize; - -/** - * [NSDistantObject -forward::] calls this to send the message over the wire. - */ -- (retval_t) forwardForProxy: (NSDistantObject*)object - selector: (SEL)sel - argFrame: (arglist_t)argframe; - -/** - * [NSDistantObject -forwardInvocation:] calls this to send the message over - * the wire. - */ -- (void) forwardInvocation: (NSInvocation *)inv - forProxy: (NSDistantObject*)object; - -/** - * Returns type code (@encode()-compatible) for given remote method. - */ -- (const char *) typeForSelector: (SEL)sel remoteTarget: (unsigned)target; - -@end - /** * This category represents an informal protocol to which NSConnection * delegates may conform ... These methods are not actually implemented diff --git a/Headers/Foundation/NSData.h b/Headers/Foundation/NSData.h index 8b8c28c09..6324b8ac6 100644 --- a/Headers/Foundation/NSData.h +++ b/Headers/Foundation/NSData.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSData_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSDate.h b/Headers/Foundation/NSDate.h index a5d647010..353d4a3a5 100644 --- a/Headers/Foundation/NSDate.h +++ b/Headers/Foundation/NSDate.h @@ -15,7 +15,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSDate_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSDateFormatter.h b/Headers/Foundation/NSDateFormatter.h index 399aeffa0..7544af3c5 100644 --- a/Headers/Foundation/NSDateFormatter.h +++ b/Headers/Foundation/NSDateFormatter.h @@ -19,7 +19,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSDateFormatter_h_GNUSTEP_BASE_INCLUDE @@ -57,7 +58,8 @@ * %d * day of the month as a decimal number (01-31) * %e - * same as %d but does not print the leading 0 for days 1 through 9 (unlike strftime(), does not print a leading space) + * same as %d but does not print the leading 0 for days 1 through 9 + * (unlike strftime(), does not print a leading space) * %F * milliseconds as a decimal number (000-999) * %H @@ -77,15 +79,18 @@ * %w * weekday as a decimal number (0-6), where Sunday is 0 * %x - * date using the date representation for the locale, including the time zone (produces different results from strftime()) + * date using the date representation for the locale, including the + * time zone (produces different results from strftime()) * %X - * time using the time representation for the locale (produces different results from strftime()) + * time using the time representation for the locale (produces + * different results from strftime()) * %y * year without century (00-99) * %Y * year with century (such as 1990) * %Z - * time zone name (such as Pacific Daylight Time; produces different results from strftime()) + * time zone name (such as Pacific Daylight Time; produces different + * results from strftime()) * %z * time zone offset in hours and minutes from GMT (HHMM) * diff --git a/Headers/Foundation/NSDebug.h b/Headers/Foundation/NSDebug.h index ce415afe9..f69b6bb8a 100644 --- a/Headers/Foundation/NSDebug.h +++ b/Headers/Foundation/NSDebug.h @@ -20,7 +20,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSDebug_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSDecimal.h b/Headers/Foundation/NSDecimal.h index 058c8a9ab..216ea4138 100644 --- a/Headers/Foundation/NSDecimal.h +++ b/Headers/Foundation/NSDecimal.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ diff --git a/Headers/Foundation/NSDecimalNumber.h b/Headers/Foundation/NSDecimalNumber.h index e48c419fc..c447e2cb3 100644 --- a/Headers/Foundation/NSDecimalNumber.h +++ b/Headers/Foundation/NSDecimalNumber.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSDecimalNumber_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSDictionary.h b/Headers/Foundation/NSDictionary.h index df3949cdf..fc6f35d0e 100644 --- a/Headers/Foundation/NSDictionary.h +++ b/Headers/Foundation/NSDictionary.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef _NSDictionary_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSDistantObject.h b/Headers/Foundation/NSDistantObject.h index 66166705b..5dcbab3ed 100644 --- a/Headers/Foundation/NSDistantObject.h +++ b/Headers/Foundation/NSDistantObject.h @@ -19,7 +19,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSDistantObject_h_GNUSTEP_BASE_INCLUDE @@ -59,12 +60,4 @@ @end -@interface NSDistantObject(GNUstepExtensions) - -- (Class) classForPortCoder; -- (const char *) selectorTypeForProxy: (SEL)selector; -- (id) forward: (SEL)aSel :(arglist_t)frame; -- (void) gcFinalize; -@end - #endif /* __NSDistantObject_h_GNUSTEP_BASE_INCLUDE */ diff --git a/Headers/Foundation/NSDistributedLock.h b/Headers/Foundation/NSDistributedLock.h index 4e83e84ba..584a99f54 100644 --- a/Headers/Foundation/NSDistributedLock.h +++ b/Headers/Foundation/NSDistributedLock.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSDistributedLock_h_GNUSTEP_BASE_INCLUDE @@ -42,7 +43,6 @@ - (BOOL) tryLock; - (void) unlock; - @end #endif /* __NSDistributedLock_h_GNUSTEP_BASE_INCLUDE */ diff --git a/Headers/Foundation/NSDistributedNotificationCenter.h b/Headers/Foundation/NSDistributedNotificationCenter.h index fb62ad69b..13aed39db 100644 --- a/Headers/Foundation/NSDistributedNotificationCenter.h +++ b/Headers/Foundation/NSDistributedNotificationCenter.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSDistributedNotificationCenter_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSEnumerator.h b/Headers/Foundation/NSEnumerator.h index 846aab506..938969091 100644 --- a/Headers/Foundation/NSEnumerator.h +++ b/Headers/Foundation/NSEnumerator.h @@ -20,7 +20,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSEnumerator_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSError.h b/Headers/Foundation/NSError.h index 6dc2adde7..dff4860e7 100644 --- a/Headers/Foundation/NSError.h +++ b/Headers/Foundation/NSError.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. AutogsdocSource: NSError.m */ diff --git a/Headers/Foundation/NSException.h b/Headers/Foundation/NSException.h index 56d643891..67364d8d6 100644 --- a/Headers/Foundation/NSException.h +++ b/Headers/Foundation/NSException.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. NSException and NSAssertionHandler class reference diff --git a/Headers/Foundation/NSFileHandle.h b/Headers/Foundation/NSFileHandle.h index 8eb502e76..b32897437 100644 --- a/Headers/Foundation/NSFileHandle.h +++ b/Headers/Foundation/NSFileHandle.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. AutogsdocSource: NSFileHandle.m AutogsdocSource: NSPipe.m diff --git a/Headers/Foundation/NSFormatter.h b/Headers/Foundation/NSFormatter.h index 8442c1e3a..55fff494b 100644 --- a/Headers/Foundation/NSFormatter.h +++ b/Headers/Foundation/NSFormatter.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSFormatter_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSGeometry.h b/Headers/Foundation/NSGeometry.h index b81560ec3..96ad7aff1 100644 --- a/Headers/Foundation/NSGeometry.h +++ b/Headers/Foundation/NSGeometry.h @@ -18,7 +18,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the Free - * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. */ + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02111 USA. */ #ifndef __NSGeometry_h_GNUSTEP_BASE_INCLUDE #define __NSGeometry_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSHashTable.h b/Headers/Foundation/NSHashTable.h index 0112745a6..c0e08e924 100644 --- a/Headers/Foundation/NSHashTable.h +++ b/Headers/Foundation/NSHashTable.h @@ -21,7 +21,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the Free - * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02111 USA. */ #ifndef __NSHashTable_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSHost.h b/Headers/Foundation/NSHost.h index c460b9959..7520a7570 100644 --- a/Headers/Foundation/NSHost.h +++ b/Headers/Foundation/NSHost.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSHost_h_GNUSTEP_BASE_INCLUDE #define __NSHost_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSIndexSet.h b/Headers/Foundation/NSIndexSet.h index 991268e9b..f1c84bc5b 100644 --- a/Headers/Foundation/NSIndexSet.h +++ b/Headers/Foundation/NSIndexSet.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. AutogsdocSource: NSIndexSet.m diff --git a/Headers/Foundation/NSInvocation.h b/Headers/Foundation/NSInvocation.h index 5a641e47c..8f975e538 100644 --- a/Headers/Foundation/NSInvocation.h +++ b/Headers/Foundation/NSInvocation.h @@ -19,7 +19,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSInvocation_h_GNUSTEP_BASE_INCLUDE @@ -92,12 +93,17 @@ #ifndef NO_GNUSTEP @interface NSInvocation (GNUstep) -- (id) initWithArgframe: (arglist_t)frame selector: (SEL)aSelector; -- (id) initWithMethodSignature: (NSMethodSignature*)aSignature; -- (id) initWithSelector: (SEL)aSelector; -- (id) initWithTarget: (id)anObject selector: (SEL)aSelector, ...; -- (void*) returnFrame: (arglist_t)argFrame; +/** + * Returns the status of the flag set by -setSendsToSuper: + */ - (BOOL) sendsToSuper; +/** + * Sets the flag to tell the invocation that it should actually invoke a + * method in the superclass of the target rather than the method of the + * target itself.
+ * This extension permits an invocation to act like a regular method + * call sent to super in the method of a class. + */ - (void) setSendsToSuper: (BOOL)flag; @end #endif @@ -107,6 +113,11 @@ + (id) _newProxyForInvocation: (id)target; + (id) _newProxyForMessage: (id)target; + (NSInvocation*) _returnInvocationAndDestroyProxy: (id)proxy; +- (id) initWithArgframe: (arglist_t)frame selector: (SEL)aSelector; +- (id) initWithMethodSignature: (NSMethodSignature*)aSignature; +- (id) initWithSelector: (SEL)aSelector; +- (id) initWithTarget: (id)anObject selector: (SEL)aSelector, ...; +- (void*) returnFrame: (arglist_t)argFrame; @end /** diff --git a/Headers/Foundation/NSKeyValueCoding.h b/Headers/Foundation/NSKeyValueCoding.h index 3477cd57a..4e7052e6e 100644 --- a/Headers/Foundation/NSKeyValueCoding.h +++ b/Headers/Foundation/NSKeyValueCoding.h @@ -19,7 +19,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSKeyValueCoding_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSKeyValueObserving.h b/Headers/Foundation/NSKeyValueObserving.h index 190867a1e..4d0db707e 100644 --- a/Headers/Foundation/NSKeyValueObserving.h +++ b/Headers/Foundation/NSKeyValueObserving.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSKeyValueObserving_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSKeyedArchiver.h b/Headers/Foundation/NSKeyedArchiver.h index e9356a206..31a956217 100644 --- a/Headers/Foundation/NSKeyedArchiver.h +++ b/Headers/Foundation/NSKeyedArchiver.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. AutogsdocSource: NSKeyedArchiver.m AutogsdocSource: NSKeyedUnarchiver.m diff --git a/Headers/Foundation/NSLock.h b/Headers/Foundation/NSLock.h index ada6976ad..3d4c332b8 100644 --- a/Headers/Foundation/NSLock.h +++ b/Headers/Foundation/NSLock.h @@ -251,7 +251,7 @@ * * */ -+ (id)newLockAt:(id *)location; ++ (id) newLockAt: (id *)location; @end /** @@ -281,7 +281,7 @@ * * */ -+ (id)newLockAt:(id *)location; ++ (id) newLockAt: (id *)location; @end #endif /* NO_GNUSTEP */ diff --git a/Headers/Foundation/NSMapTable.h b/Headers/Foundation/NSMapTable.h index 6098a2747..4a6816755 100644 --- a/Headers/Foundation/NSMapTable.h +++ b/Headers/Foundation/NSMapTable.h @@ -21,7 +21,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the Free - * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. */ + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02111 USA. */ #ifndef __NSMapTable_h_GNUSTEP_BASE_INCLUDE #define __NSMapTable_h_GNUSTEP_BASE_INCLUDE 1 diff --git a/Headers/Foundation/NSMethodSignature.h b/Headers/Foundation/NSMethodSignature.h index a941951c0..540b67249 100644 --- a/Headers/Foundation/NSMethodSignature.h +++ b/Headers/Foundation/NSMethodSignature.h @@ -20,7 +20,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSMethodSignature_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSNotification.h b/Headers/Foundation/NSNotification.h index 689b1d004..736b934c0 100644 --- a/Headers/Foundation/NSNotification.h +++ b/Headers/Foundation/NSNotification.h @@ -19,7 +19,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. AutogsdocSource: NSNotification.m AutogsdocSource: NSNotificationCenter.m @@ -85,15 +86,11 @@ #ifndef NO_GNUSTEP -/** - * Defines an extension for maximising posting performance - this option - * is NOT adjustable for the default notification center. - */ @interface NSNotificationCenter (GNUstep) - /** * You can disable locking in a multi-threaded program if you KNOW that only - * one thread will ever use the notification center. + * one thread will ever use the notification center.
+ * DEPRECATED */ - (BOOL) setLockingDisabled: (BOOL)flag; @end diff --git a/Headers/Foundation/NSNull.h b/Headers/Foundation/NSNull.h index 588704f18..5d62f1f3c 100644 --- a/Headers/Foundation/NSNull.h +++ b/Headers/Foundation/NSNull.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSNull_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSNumberFormatter.h b/Headers/Foundation/NSNumberFormatter.h index 868f6c859..3e6a525e8 100644 --- a/Headers/Foundation/NSNumberFormatter.h +++ b/Headers/Foundation/NSNumberFormatter.h @@ -19,7 +19,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef _NSNumberFormatter_h__ diff --git a/Headers/Foundation/NSObjCRuntime.h b/Headers/Foundation/NSObjCRuntime.h index 3fbf5aadb..31800cb78 100644 --- a/Headers/Foundation/NSObjCRuntime.h +++ b/Headers/Foundation/NSObjCRuntime.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. AutogsdocSource: NSObjCRuntime.m AutogsdocSource: NSLog.m diff --git a/Headers/Foundation/NSObject.h b/Headers/Foundation/NSObject.h index 2289c1d61..f80a692e8 100644 --- a/Headers/Foundation/NSObject.h +++ b/Headers/Foundation/NSObject.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. AutogsdocSource: NSObject.m AutogsdocSource: Additions/GSCategories.m diff --git a/Headers/Foundation/NSPort.h b/Headers/Foundation/NSPort.h index fb5bae79d..e1c7ccecc 100644 --- a/Headers/Foundation/NSPort.h +++ b/Headers/Foundation/NSPort.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. AutogsdocSource: NSPort.m AutogsdocSource: NSSocketPort.m diff --git a/Headers/Foundation/NSPortCoder.h b/Headers/Foundation/NSPortCoder.h index 0ffa1a6e3..f450ca6fd 100644 --- a/Headers/Foundation/NSPortCoder.h +++ b/Headers/Foundation/NSPortCoder.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSPortCoder_h @@ -172,9 +173,4 @@ @end -@interface NSPortCoder (Private) -- (NSMutableArray*) _components; -@end - - #endif /* __NSPortCoder_h */ diff --git a/Headers/Foundation/NSPortMessage.h b/Headers/Foundation/NSPortMessage.h index bdcd782e3..59648156e 100644 --- a/Headers/Foundation/NSPortMessage.h +++ b/Headers/Foundation/NSPortMessage.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSPortMessage_h_GNUSTEP_BASE_INCLUDE @@ -99,10 +100,5 @@ - (unsigned) msgid; @end -#ifndef NO_GNUSTEP -@interface NSPortMessage (private) -- (NSMutableArray*) _components; -@end -#endif #endif diff --git a/Headers/Foundation/NSPortNameServer.h b/Headers/Foundation/NSPortNameServer.h index 97c3f61d6..ac4d8d55c 100644 --- a/Headers/Foundation/NSPortNameServer.h +++ b/Headers/Foundation/NSPortNameServer.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. NSPortNameServer class reference @@ -48,17 +49,6 @@ - (BOOL) removePortForName: (NSString*)name; @end -#ifndef NO_GNUSTEP -@interface NSPortNameServer (GNUstep) -- (NSArray*) namesForPort: (NSPort*)port; /* return all names for port */ -- (BOOL) removePort: (NSPort*)port; /* remove all names for port */ - -/* Remove the name if and only if it is registered by the given port. */ -- (BOOL) removePort: (NSPort*)port forName: (NSString*)name; -@end -#endif - - @interface NSSocketPortNameServer : NSPortNameServer { NSMapTable *_portMap; /* Registered ports information. */ diff --git a/Headers/Foundation/NSProcessInfo.h b/Headers/Foundation/NSProcessInfo.h index 5e672a3c4..5ddcf8abd 100644 --- a/Headers/Foundation/NSProcessInfo.h +++ b/Headers/Foundation/NSProcessInfo.h @@ -20,7 +20,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSProcessInfo_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSPropertyList.h b/Headers/Foundation/NSPropertyList.h index 164722d67..e5ced15bd 100644 --- a/Headers/Foundation/NSPropertyList.h +++ b/Headers/Foundation/NSPropertyList.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. AutogsdocSource: NSPropertyList.m diff --git a/Headers/Foundation/NSProtocolChecker.h b/Headers/Foundation/NSProtocolChecker.h index 5fe3448ca..1adcb17f6 100644 --- a/Headers/Foundation/NSProtocolChecker.h +++ b/Headers/Foundation/NSProtocolChecker.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSProtocolChecker_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSProxy.h b/Headers/Foundation/NSProxy.h index 48fdaec53..dddd0b2c6 100644 --- a/Headers/Foundation/NSProxy.h +++ b/Headers/Foundation/NSProxy.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSProxy_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSRange.h b/Headers/Foundation/NSRange.h index 9b7c8451b..a31b83e6b 100644 --- a/Headers/Foundation/NSRange.h +++ b/Headers/Foundation/NSRange.h @@ -18,7 +18,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the Free - * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. */ + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02111 USA. */ #ifndef __NSRange_h_GNUSTEP_BASE_INCLUDE #define __NSRange_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSScanner.h b/Headers/Foundation/NSScanner.h index e0ba223e1..2c2e2cd77 100644 --- a/Headers/Foundation/NSScanner.h +++ b/Headers/Foundation/NSScanner.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSScanner_h_GNUSTEP_INCLUDE diff --git a/Headers/Foundation/NSSerialization.h b/Headers/Foundation/NSSerialization.h index ce58bc9ff..c2ca8e379 100644 --- a/Headers/Foundation/NSSerialization.h +++ b/Headers/Foundation/NSSerialization.h @@ -20,7 +20,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSSerialization_h_GNUSTEP_BASE_INCLUDE @@ -68,16 +69,19 @@ /** *

Serialize given property list (NSArray or NSDictionary plus limited - * contents) into byte array.

Deprecated in favor of - * [NSPropertyListSerialization+dataFromPropertyList:format:errorDescription:].

+ * contents) into byte array.

+ *

Deprecated in favor of + * [NSPropertyListSerialization+dataFromPropertyList:format:errorDescription:]. + *

*/ + (NSData*) serializePropertyList: (id)propertyList; /** *

Serialize given property list (NSArray or NSDictionary plus limited - * contents) into given mutable byte array.

Deprecated in favor of - * [NSPropertyListSerialization+dataFromPropertyList:format:errorDescription:].

- + * contents) into given mutable byte array.

+ *

Deprecated in favor of + * [NSPropertyListSerialization+dataFromPropertyList:format:errorDescription:]. + *

*/ + (void) serializePropertyList: (id)propertyList intoData: (NSMutableData*)d; @@ -124,8 +128,10 @@ /** * Recover a property list (NSArray or NSDictionary plus limited - * contents) from a byte array. Deprecated in favor of - * [NSPropertyListSerialization+propertyListFromData:mutabilityOption:format:errorDescription:]. + * contents) from a byte array. + * Deprecated in favor of + * [NSPropertyListSerialization + * +propertyListFromData:mutabilityOption:format:errorDescription:]. */ + (id) deserializePropertyListFromData: (NSData*)data atCursor: (unsigned int*)cursor @@ -133,8 +139,10 @@ /** * Recover a property list (NSArray or NSDictionary plus limited - * contents) from a byte array. Deprecated in favor of - * [NSPropertyListSerialization+propertyListFromData:mutabilityOption:format:errorDescription:]. + * contents) from a byte array. + * Deprecated in favor of + * [NSPropertyListSerialization + * +propertyListFromData:mutabilityOption:format:errorDescription:]. */ + (id) deserializePropertyListFromData: (NSData*)data mutableContainers: (BOOL)flag; @@ -145,7 +153,8 @@ * length, a proxy is substituted for the actual property list as long as the * constituent objects of that property list are not accessed. * Deprecated in favor of - * [NSPropertyListSerialization+propertyListFromData:mutabilityOption:format:errorDescription:]. + * [NSPropertyListSerialization + * +propertyListFromData:mutabilityOption:format:errorDescription:]. */ + (id) deserializePropertyListLazilyFromData: (NSData*)data atCursor: (unsigned*)cursor diff --git a/Headers/Foundation/NSSet.h b/Headers/Foundation/NSSet.h index d8990fe73..fc45deab6 100644 --- a/Headers/Foundation/NSSet.h +++ b/Headers/Foundation/NSSet.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. AutogsdocSource: NSSet.m AutogsdocSource: NSCountedSet.m diff --git a/Headers/Foundation/NSSortDescriptor.h b/Headers/Foundation/NSSortDescriptor.h index be4ad75e5..fafe9009f 100644 --- a/Headers/Foundation/NSSortDescriptor.h +++ b/Headers/Foundation/NSSortDescriptor.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSSortDescriptor_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSTask.h b/Headers/Foundation/NSTask.h index a3b23b815..74b5228d2 100644 --- a/Headers/Foundation/NSTask.h +++ b/Headers/Foundation/NSTask.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSTask_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSThread.h b/Headers/Foundation/NSThread.h index ba025305c..7c6268232 100644 --- a/Headers/Foundation/NSThread.h +++ b/Headers/Foundation/NSThread.h @@ -19,7 +19,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSThread_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSTimeZone.h b/Headers/Foundation/NSTimeZone.h index bd52d5f69..778b82ae8 100644 --- a/Headers/Foundation/NSTimeZone.h +++ b/Headers/Foundation/NSTimeZone.h @@ -15,7 +15,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSTimeZone_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSTimer.h b/Headers/Foundation/NSTimer.h index a9a8eb67b..372faecfa 100644 --- a/Headers/Foundation/NSTimer.h +++ b/Headers/Foundation/NSTimer.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSTimer_include__ diff --git a/Headers/Foundation/NSURL.h b/Headers/Foundation/NSURL.h index 06afefb71..e18f7bffb 100644 --- a/Headers/Foundation/NSURL.h +++ b/Headers/Foundation/NSURL.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef _NSURL_h__ diff --git a/Headers/Foundation/NSURLHandle.h b/Headers/Foundation/NSURLHandle.h index f6d43d375..9938a4f74 100644 --- a/Headers/Foundation/NSURLHandle.h +++ b/Headers/Foundation/NSURLHandle.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef _NSURLHandle_h__ diff --git a/Headers/Foundation/NSUndoManager.h b/Headers/Foundation/NSUndoManager.h index 64298982d..109e409de 100644 --- a/Headers/Foundation/NSUndoManager.h +++ b/Headers/Foundation/NSUndoManager.h @@ -17,7 +17,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSUndoManager_h_OBJECTS_INCLUDE diff --git a/Headers/Foundation/NSUserDefaults.h b/Headers/Foundation/NSUserDefaults.h index 9b3912e12..f5a8e8174 100644 --- a/Headers/Foundation/NSUserDefaults.h +++ b/Headers/Foundation/NSUserDefaults.h @@ -19,7 +19,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSUserDefaults_h_OBJECTS_INCLUDE diff --git a/Headers/Foundation/NSUtilities.h b/Headers/Foundation/NSUtilities.h index 83cbba15f..898be54ae 100644 --- a/Headers/Foundation/NSUtilities.h +++ b/Headers/Foundation/NSUtilities.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSUtilties_h_GNUSTEP_BASE_INCLUDE diff --git a/Headers/Foundation/NSValue.h b/Headers/Foundation/NSValue.h index 5c9ef19bd..350cadb0b 100644 --- a/Headers/Foundation/NSValue.h +++ b/Headers/Foundation/NSValue.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __NSValue_h_GNUSTEP_BASE_INCLUDE @@ -344,18 +345,20 @@ /** * Cache info for internal use by NSNumber concrete subclasses. + * DO NOT USE. */ typedef struct { int typeLevel; void (*getValue)(NSNumber*, SEL, void*); } GSNumberInfo; -/** Internal method for caching. */ +/** Internal method for caching. DO NOT USE. */ GSNumberInfo *GSNumberInfoFromObject(NSNumber *o); #define GS_SMALL 16 /** * Internal method: get cached values for integers in the range * - GS_SMALL to + GS_SMALL + *
DO NOT USE */ unsigned GSSmallHash(int n); #endif diff --git a/Headers/Foundation/NSXMLParser.h b/Headers/Foundation/NSXMLParser.h index 4c3e2f9cc..582b2a14d 100644 --- a/Headers/Foundation/NSXMLParser.h +++ b/Headers/Foundation/NSXMLParser.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. AutogsdocSource: NSXMLParser.m */ diff --git a/Headers/Foundation/NSZone.h b/Headers/Foundation/NSZone.h index 2abb07de8..e3a9da929 100644 --- a/Headers/Foundation/NSZone.h +++ b/Headers/Foundation/NSZone.h @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. AutogsdocSource: NSZone.m AutogsdocSource: NSPage.m @@ -64,7 +65,8 @@ typedef struct _NSZone NSZone; * type size_t- * * bytes_total - * This is the total size of memory managed by the zone, in bytes. + * + * This is the total size of memory managed by the zone, in bytes. * chunks_used * This is the number of memory chunks in use in the zone. * bytes_used @@ -72,7 +74,9 @@ typedef struct _NSZone NSZone; * chunks_free * This is the number of memory chunks that are not in use. * bytes_free - * This is the number of bytes managed by the zone that are not in use. + * + * This is the number of bytes managed by the zone that are not in use. + * * */ struct NSZoneStats diff --git a/Source/Additions/GSCategories.m b/Source/Additions/GSCategories.m index ff6faf1f0..3e6a05a96 100644 --- a/Source/Additions/GSCategories.m +++ b/Source/Additions/GSCategories.m @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02111 USA. */ #include "config.h" @@ -30,6 +31,137 @@ /* Test for ASCII whitespace which is safe for unicode characters */ #define space(C) ((C) > 127 ? NO : isspace(C)) +@implementation NSArray (GSCategories) + +- (unsigned) insertionPosition: (id)item + usingFunction: (NSComparisonResult (*)(id, id, void *))sorter + context: (void *)context +{ + unsigned count = [self count]; + unsigned upper = count; + unsigned lower = 0; + unsigned index; + SEL oaiSel; + IMP oai; + + if (item == nil) + { + [NSException raise: NSGenericException + format: @"Attempt to find position for nil object in array"]; + } + if (sorter == 0) + { + [NSException raise: NSGenericException + format: @"Attempt to find position with null comparator"]; + } + + oaiSel = @selector(objectAtIndex:); + oai = [self methodForSelector: oaiSel]; + /* + * Binary search for an item equal to the one to be inserted. + */ + for (index = upper/2; upper != lower; index = lower+(upper-lower)/2) + { + NSComparisonResult comparison; + + comparison = (*sorter)(item, (*oai)(self, oaiSel, index), context); + if (comparison == NSOrderedAscending) + { + upper = index; + } + else if (comparison == NSOrderedDescending) + { + lower = index + 1; + } + else + { + break; + } + } + /* + * Now skip past any equal items so the insertion point is AFTER any + * items that are equal to the new one. + */ + while (index < count && (*sorter)(item, (*oai)(self, oaiSel, index), context) + != NSOrderedAscending) + { + index++; + } + return index; +} + +- (unsigned) insertionPosition: (id)item + usingSelector: (SEL)comp +{ + unsigned count = [self count]; + unsigned upper = count; + unsigned lower = 0; + unsigned index; + NSComparisonResult (*imp)(id, SEL, id); + SEL oaiSel; + IMP oai; + + if (item == nil) + { + [NSException raise: NSGenericException + format: @"Attempt to find position for nil object in array"]; + } + if (comp == 0) + { + [NSException raise: NSGenericException + format: @"Attempt to find position with null comparator"]; + } + imp = (NSComparisonResult (*)(id, SEL, id))[item methodForSelector: comp]; + if (imp == 0) + { + [NSException raise: NSGenericException + format: @"Attempt to find position with unknown method"]; + } + + oaiSel = @selector(objectAtIndex:); + oai = [self methodForSelector: oaiSel]; + /* + * Binary search for an item equal to the one to be inserted. + */ + for (index = upper/2; upper != lower; index = lower+(upper-lower)/2) + { + NSComparisonResult comparison; + + comparison = (*imp)(item, comp, (*oai)(self, oaiSel, index)); + if (comparison == NSOrderedAscending) + { + upper = index; + } + else if (comparison == NSOrderedDescending) + { + lower = index + 1; + } + else + { + break; + } + } + /* + * Now skip past any equal items so the insertion point is AFTER any + * items that are equal to the new one. + */ + while (index < count + && (*imp)(item, comp, (*oai)(self, oaiSel, index)) != NSOrderedAscending) + { + index++; + } + return index; +} +@end + +@implementation NSAttributedString (GSCategories) +- (NSAttributedString*) attributedSubstringWithRange: (NSRange)aRange +{ + GSOnceMLog(@"This method is deprecated, use -attributedSubstringFromRange:"); + return [self attributedSubstringFromRange: aRange]; +} +@end + /** * Extension methods for the NSCalendarDate class */ diff --git a/Source/GSPortPrivate.h b/Source/GSPortPrivate.h index ffa6ec5b8..15065a95a 100644 --- a/Source/GSPortPrivate.h +++ b/Source/GSPortPrivate.h @@ -17,12 +17,22 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __GSPortPrivate_h_ #define __GSPortPrivate_h_ +/* + * Nameserver deregistration methods + */ +@interface NSPortNameServer (GNUstep) +- (NSArray*) namesForPort: (NSPort*)port; /* return all names for port */ +- (BOOL) removePort: (NSPort*)port; /* remove all names for port */ +- (BOOL) removePort: (NSPort*)port forName: (NSString*)name; +@end + #if defined(__MINGW32__) @interface NSMessagePort(Private) + (id) newWithName: (NSString*)name; diff --git a/Source/GSPrivate.h b/Source/GSPrivate.h index 0322daac6..26c66f8fc 100644 --- a/Source/GSPrivate.h +++ b/Source/GSPrivate.h @@ -17,7 +17,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ #ifndef __GSPrivate_h_ diff --git a/Source/NSArray.m b/Source/NSArray.m index 414d2006b..3d7c5a58d 100644 --- a/Source/NSArray.m +++ b/Source/NSArray.m @@ -1980,138 +1980,3 @@ compare(id elem1, id elem2, void* context) } @end -/** - * [NSArray] enhancements provided by GNUstep. - */ -@implementation NSArray (GNUstep) - -/** - * Locate the correct insertion position for item where the receiver is - * a sorted array witch was sorted using the sorter function.
- * The comparator function takes two items as arguments, the first is the - * item to be added, the second is the item already in the array. - * The function should return NSOrderedAscending if the item to be - * added is 'less than' the item in the array, NSOrderedDescending - * if it is greater, and NSOrderedSame if it is equal. - */ -- (unsigned) insertionPosition: (id)item - usingFunction: (NSComparisonResult (*)(id, id, void *))sorter - context: (void *)context -{ - unsigned count = [self count]; - unsigned upper = count; - unsigned lower = 0; - unsigned index; - IMP oai; - - if (item == nil) - { - [NSException raise: NSGenericException - format: @"Attempt to find position for nil object in array"]; - } - if (sorter == 0) - { - [NSException raise: NSGenericException - format: @"Attempt to find position with null comparator"]; - } - - oai = [self methodForSelector: oaiSel]; - /* - * Binary search for an item equal to the one to be inserted. - */ - for (index = upper/2; upper != lower; index = lower+(upper-lower)/2) - { - NSComparisonResult comparison; - - comparison = (*sorter)(item, (*oai)(self, oaiSel, index), context); - if (comparison == NSOrderedAscending) - { - upper = index; - } - else if (comparison == NSOrderedDescending) - { - lower = index + 1; - } - else - { - break; - } - } - /* - * Now skip past any equal items so the insertion point is AFTER any - * items that are equal to the new one. - */ - while (index < count && (*sorter)(item, (*oai)(self, oaiSel, index), context) - != NSOrderedAscending) - { - index++; - } - return index; -} - -/** - * Locate the correct insertion position for item where the receiver is - * a sorted array which was sorted using the comp selector. - */ -- (unsigned) insertionPosition: (id)item - usingSelector: (SEL)comp -{ - unsigned count = [self count]; - unsigned upper = count; - unsigned lower = 0; - unsigned index; - NSComparisonResult (*imp)(id, SEL, id); - IMP oai; - - if (item == nil) - { - [NSException raise: NSGenericException - format: @"Attempt to find position for nil object in array"]; - } - if (comp == 0) - { - [NSException raise: NSGenericException - format: @"Attempt to find position with null comparator"]; - } - imp = (NSComparisonResult (*)(id, SEL, id))[item methodForSelector: comp]; - if (imp == 0) - { - [NSException raise: NSGenericException - format: @"Attempt to find position with unknown method"]; - } - - oai = [self methodForSelector: oaiSel]; - /* - * Binary search for an item equal to the one to be inserted. - */ - for (index = upper/2; upper != lower; index = lower+(upper-lower)/2) - { - NSComparisonResult comparison; - - comparison = (*imp)(item, comp, (*oai)(self, oaiSel, index)); - if (comparison == NSOrderedAscending) - { - upper = index; - } - else if (comparison == NSOrderedDescending) - { - lower = index + 1; - } - else - { - break; - } - } - /* - * Now skip past any equal items so the insertion point is AFTER any - * items that are equal to the new one. - */ - while (index < count - && (*imp)(item, comp, (*oai)(self, oaiSel, index)) != NSOrderedAscending) - { - index++; - } - return index; -} -@end - diff --git a/Source/NSAttributedString.m b/Source/NSAttributedString.m index 79ba40f95..a48079b9a 100644 --- a/Source/NSAttributedString.m +++ b/Source/NSAttributedString.m @@ -604,14 +604,6 @@ static Class GSMutableAttributedStringClass; return newAttrString; } -/** - * Synonym for [-attributedSubstringFromRange:]. - */ -- (NSAttributedString*) attributedSubstringWithRange: (NSRange)aRange -{ - return [self attributedSubstringFromRange: aRange]; -} - @end //NSAttributedString /** diff --git a/Source/NSBundle.m b/Source/NSBundle.m index 47f76575c..a72c09e34 100644 --- a/Source/NSBundle.m +++ b/Source/NSBundle.m @@ -371,12 +371,22 @@ _find_framework(NSString *name) } @interface NSBundle (Private) ++ (NSString *) _absolutePathOfExecutable: (NSString *)path; + (void) _addFrameworkFromClass: (Class)frameworkClass; - (NSArray *) _bundleClasses; ++ (NSString*) _gnustep_target_cpu; ++ (NSString*) _gnustep_target_dir; ++ (NSString*) _gnustep_target_os; ++ (NSString*) _library_combo; @end @implementation NSBundle (Private) ++ (NSString *) _absolutePathOfExecutable: (NSString *)path +{ + return AbsolutePathOfExecutable(path, NO); +} + /* Nicola & Mirko: Frameworks can be used in an application in two different ways: @@ -615,6 +625,26 @@ _find_framework(NSString *name) return _bundleClasses; } ++ (NSString*) _gnustep_target_cpu +{ + return gnustep_target_cpu; +} + ++ (NSString*) _gnustep_target_dir +{ + return gnustep_target_dir; +} + ++ (NSString*) _gnustep_target_os +{ + return gnustep_target_os; +} + ++ (NSString*) _library_combo +{ + return library_combo; +} + @end /* @@ -1883,19 +1913,6 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory) return nil; } -+ (NSString *) _absolutePathOfExecutable: (NSString *)path -{ - return AbsolutePathOfExecutable(path, NO); -} - -+ (NSBundle *) gnustepBundle -{ - /* Deprecated since 1.7.0 */ - GSOnceMLog(@"Warning: Deprecated method %@ called. Use +bundleForLibrary: instead", - NSStringFromSelector(_cmd)); - return _gnustep_bundle; -} - + (NSString *) pathForLibraryResource: (NSString *)name ofType: (NSString *)ext inDirectory: (NSString *)bundlePath @@ -1922,36 +1939,5 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory) return path; } -+ (NSString *) pathForGNUstepResource: (NSString *)name - ofType: (NSString *)ext - inDirectory: (NSString *)bundlePath -{ - /* Deprecated since 1.7.0 */ - GSOnceMLog(@"Warning: Deprecated method %@ called. Use +pathForLibraryResource:ofType:inDirectory: or +bundleForLibrary: instead", - NSStringFromSelector(_cmd)); - return [self pathForLibraryResource: name ofType: ext - inDirectory: bundlePath]; -} - -+ (NSString*) _gnustep_target_cpu -{ - return gnustep_target_cpu; -} - -+ (NSString*) _gnustep_target_dir -{ - return gnustep_target_dir; -} - -+ (NSString*) _gnustep_target_os -{ - return gnustep_target_os; -} - -+ (NSString*) _library_combo -{ - return library_combo; -} - @end diff --git a/Source/NSCoder.m b/Source/NSCoder.m index 1783fc72b..ed96a8d90 100644 --- a/Source/NSCoder.m +++ b/Source/NSCoder.m @@ -28,6 +28,7 @@ #include "config.h" #include "GNUstepBase/preface.h" #include "Foundation/NSData.h" +#include "Foundation/NSDebug.h" #include "Foundation/NSCoder.h" #include "Foundation/NSSerialization.h" @@ -414,6 +415,7 @@ at: (void*)buf withName: (id*)name { + GSOnceMLog(@"Deprecated, use NSKeyedArchiver methods"); if (name) { *name = [self decodeObject]; @@ -429,11 +431,13 @@ */ - (void) decodeIndent { + GSOnceMLog(@"Deprecated, use NSKeyedArchiver methods"); } - (void) decodeObjectAt: (id*)anObject withName: (id*)name { + GSOnceMLog(@"Deprecated, use NSKeyedArchiver methods"); [self decodeValueOfObjCType: @encode(id) at: anObject withName: name]; } @@ -441,6 +445,7 @@ at: (void*)buf withName: (id*)name { + GSOnceMLog(@"Deprecated, use NSKeyedArchiver methods"); [self decodeValueOfObjCType: type at: buf withName: name]; } @@ -448,6 +453,7 @@ at: (void*)buf withName: (id*)name { + GSOnceMLog(@"Deprecated, use NSKeyedArchiver methods"); if (name != 0) { *name = [self decodeObject]; @@ -464,6 +470,7 @@ at: (const void*)buf withName: (id)name { + GSOnceMLog(@"Deprecated, use NSKeyedArchiver methods"); [self encodeObject: name]; [self encodeArrayOfObjCType: type count: count at: buf]; } @@ -472,12 +479,14 @@ */ - (void) encodeIndent { + GSOnceMLog(@"Deprecated, use NSKeyedArchiver methods"); } - (void) encodeValueOfCType: (const char*)type at: (const void*)buf withName: (id)name { + GSOnceMLog(@"Deprecated, use NSKeyedArchiver methods"); [self encodeValueOfObjCType: type at: buf withName: name]; } @@ -485,6 +494,7 @@ at: (const void*)buf withName: (id)name { + GSOnceMLog(@"Deprecated, use NSKeyedArchiver methods"); [self encodeObject: name]; [self encodeValueOfObjCType: type at: buf]; } @@ -492,6 +502,7 @@ - (void) encodeObjectAt: (id*)anObject withName: (id)name { + GSOnceMLog(@"Deprecated, use NSKeyedArchiver methods"); [self encodeValueOfObjCType: @encode(id) at: anObject withName: name]; } diff --git a/Source/NSConnection.m b/Source/NSConnection.m index ade151664..c4f4a36d8 100644 --- a/Source/NSConnection.m +++ b/Source/NSConnection.m @@ -77,11 +77,29 @@ #include "Foundation/NSNotification.h" #include "Foundation/NSDebug.h" #include "GSInvocation.h" +#include "GSPortPrivate.h" #ifdef HAVE_MALLOC_H #include #endif +@interface NSPortCoder (Private) +- (NSMutableArray*) _components; +@end +@interface NSPortMessage (Private) +- (NSMutableArray*) _components; +@end + +@interface NSConnection (GNUstepExtensions) +- (void) gcFinalize; +- (retval_t) forwardForProxy: (NSDistantObject*)object + selector: (SEL)sel + argFrame: (arglist_t)argframe; +- (void) forwardInvocation: (NSInvocation *)inv + forProxy: (NSDistantObject*)object; +- (const char *) typeForSelector: (SEL)sel remoteTarget: (unsigned)target; +@end + extern NSRunLoop *GSRunLoopForThread(NSThread*); #define F_LOCK(X) {NSDebugFLLog(@"GSConnection",@"Lock %@",X);[X lock];} @@ -1628,6 +1646,8 @@ static NSLock *cached_proxies_gate = nil; { NSConnection *conn; + GSOnceMLog(@"This method is deprecated, use standard initialisation"); + conn = [[self alloc] initWithReceivePort: [NSPort port] sendPort: nil]; [conn setRootObject: anObject]; diff --git a/Source/NSDistantObject.m b/Source/NSDistantObject.m index 6018cbb02..2062f7fb7 100644 --- a/Source/NSDistantObject.m +++ b/Source/NSDistantObject.m @@ -19,7 +19,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. NSDistantObject class reference $Date$ $Revision$ @@ -38,6 +39,14 @@ #include "Foundation/NSInvocation.h" #include + +@interface NSDistantObject(GNUstepExtensions) +- (Class) classForPortCoder; +- (const char *) selectorTypeForProxy: (SEL)selector; +- (id) forward: (SEL)aSel :(arglist_t)frame; +- (void) gcFinalize; +@end + #define DO_FORWARD_INVOCATION(_SELX, _ARG1) ({ \ sig = [self methodSignatureForSelector: @selector(_SELX)]; \ if (sig != nil) \ diff --git a/Source/NSInvocation.m b/Source/NSInvocation.m index dd9629b3e..9f4f9c75d 100644 --- a/Source/NSInvocation.m +++ b/Source/NSInvocation.m @@ -759,6 +759,23 @@ _arg_addr(NSInvocation *inv, int index) */ @implementation NSInvocation (GNUstep) +- (BOOL) sendsToSuper +{ + return _sendToSuper; +} + +- (void) setSendsToSuper: (BOOL)flag +{ + _sendToSuper = flag; +} +@end + +/** + * These methods are for internal use only ... not public API
+ * They are used by the NS_INVOCATION() and NS_MESSAGE() macros to help + * create invocations. + */ +@implementation NSInvocation (MacroSetup) /** * Internal use.
* Initialises the receiver with a known selector and argument list @@ -930,33 +947,6 @@ _arg_addr(NSInvocation *inv, int index) return NULL; } -/** - * Returns the status of the flag set by -setSendsToSuper: - */ -- (BOOL) sendsToSuper -{ - return _sendToSuper; -} - -/** - * Sets the flag to tell the invocation that it should actually invoke a - * method in the superclass of the target rather than the method of the - * target itself.
- * This extension permits an invocation to act like a regular method - * call sent to super in the method of a class. - */ -- (void) setSendsToSuper: (BOOL)flag -{ - _sendToSuper = flag; -} -@end - -/** - * These methods are for internal use only ... not public API
- * They are used by the NS_INVOCATION() and NS_MESSAGE() macros to help - * create invocations. - */ -@implementation NSInvocation (MacroSetup) + (id) _newProxyForInvocation: (id)target { return [GSInvocationProxy _newWithTarget: target]; diff --git a/Source/NSMessagePortNameServer.m b/Source/NSMessagePortNameServer.m index fa72b4410..7111c31b8 100644 --- a/Source/NSMessagePortNameServer.m +++ b/Source/NSMessagePortNameServer.m @@ -16,7 +16,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. NSMessagePortNameServer class reference $Date$ $Revision$ diff --git a/Source/NSNotificationCenter.m b/Source/NSNotificationCenter.m index 69fe7ad4b..63a9a870d 100644 --- a/Source/NSNotificationCenter.m +++ b/Source/NSNotificationCenter.m @@ -22,7 +22,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. NSNotificationCenter class reference $Date$ $Revision$ @@ -33,6 +34,7 @@ #include "Foundation/NSException.h" #include "Foundation/NSLock.h" #include "Foundation/NSThread.h" +#include "Foundation/NSDebug.h" #include "GNUstepBase/GSLock.h" @@ -1146,6 +1148,7 @@ static NSNotificationCenter *default_center = nil; { BOOL old; + GSOnceMLog(@"This method is deprecated"); lockNCTable(TABLE); if (self == default_center) { diff --git a/Source/NSNull.m b/Source/NSNull.m index 45da3c294..23ba70515 100644 --- a/Source/NSNull.m +++ b/Source/NSNull.m @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. NSNull class reference $Date$ $Revision$ diff --git a/Source/NSPortNameServer.m b/Source/NSPortNameServer.m index 5b5a7ac06..cf8552e58 100644 --- a/Source/NSPortNameServer.m +++ b/Source/NSPortNameServer.m @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. NSPortNameServer class reference $Date$ $Revision$ @@ -27,11 +28,12 @@ #include "config.h" #include "Foundation/NSString.h" #include "Foundation/NSException.h" +#include "Foundation/NSPort.h" #include "Foundation/NSPortNameServer.h" #include "Foundation/NSDebug.h" #include "Foundation/NSLock.h" #include "Foundation/NSUserDefaults.h" -#include "GSPrivate.h" +#include "GSPortPrivate.h" /** diff --git a/Source/NSProcessInfo.m b/Source/NSProcessInfo.m index 182c48b6e..23461179d 100644 --- a/Source/NSProcessInfo.m +++ b/Source/NSProcessInfo.m @@ -19,7 +19,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02111 USA. NSProcessInfo class reference $Date$ $Revision$ @@ -100,6 +101,10 @@ #include "GSPrivate.h" +@interface NSBundle (Private) ++ (NSString*) _gnustep_target_os; +@end + /* This error message should be called only if the private main function * was not executed successfully. This may happen ONLY if another library * or kit defines its own main function (as gnustep-base does). diff --git a/Source/NSSocketPortNameServer.m b/Source/NSSocketPortNameServer.m index 446b4d96b..2d547b04c 100644 --- a/Source/NSSocketPortNameServer.m +++ b/Source/NSSocketPortNameServer.m @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. $Date$ $Revision$ */ @@ -42,6 +43,9 @@ #include "Foundation/NSPathUtilities.h" #include "Foundation/NSPortNameServer.h" #include "Foundation/NSDebug.h" + +#include "GSPortPrivate.h" + #ifdef __MINGW32__ #include #include diff --git a/Source/NSTask.m b/Source/NSTask.m index acd8d28ae..0830af92f 100644 --- a/Source/NSTask.m +++ b/Source/NSTask.m @@ -101,6 +101,13 @@ #define NOFILE 256 #endif +@interface NSBundle(Private) ++ (NSString *) _absolutePathOfExecutable: (NSString *)path; ++ (NSString*) _gnustep_target_cpu; ++ (NSString*) _gnustep_target_dir; ++ (NSString*) _gnustep_target_os; ++ (NSString*) _library_combo; +@end static NSRecursiveLock *tasksLock = nil; static NSMapTable *activeTasks = 0; diff --git a/Source/NSThread.m b/Source/NSThread.m index 4b1d31ab5..4746a4186 100644 --- a/Source/NSThread.m +++ b/Source/NSThread.m @@ -55,6 +55,10 @@ #include "GSRunLoopCtxt.h" +@interface NSAutoreleasePool (NSThread) ++ (void) _endThread: (NSThread*)thread; +@end + typedef struct { @defs(NSThread) } NSThread_ivars; static Class threadClass = Nil; diff --git a/Source/mframe.m b/Source/mframe.m index f4ecee61b..99f57aa06 100644 --- a/Source/mframe.m +++ b/Source/mframe.m @@ -18,7 +18,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111 USA. */ /* These functions can be used for dissecting and making method calls