From 4d95ad4f42840e0719a2bc6ea723a5dfaa6655dc Mon Sep 17 00:00:00 2001 From: rfm Date: Thu, 18 Feb 2010 16:27:32 +0000 Subject: [PATCH] avoid obsolete include git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29667 72102866-910b-0410-8b05-ffd578937521 --- Headers/Additions/GNUstepBase/GSCategories.h | 12 ------------ Source/Additions/GCDictionary.m | 1 - Source/Additions/GCObject.m | 1 - Source/Additions/GSInsensitiveDictionary.m | 1 - Source/Additions/GSLock.m | 1 - Source/Additions/GSObjCRuntime.m | 1 - Source/Additions/GSXML.m | 1 - Source/Additions/NSCalendarDate+GNUstepBase.m | 2 +- Source/Additions/NSError+GNUstepBase.m | 2 +- Source/Additions/NSLock+GNUstepBase.m | 4 ++-- Source/Additions/NSTask+GNUstepBase.m | 2 +- 11 files changed, 5 insertions(+), 23 deletions(-) diff --git a/Headers/Additions/GNUstepBase/GSCategories.h b/Headers/Additions/GNUstepBase/GSCategories.h index 7fb806e7c..922fc09ca 100644 --- a/Headers/Additions/GNUstepBase/GSCategories.h +++ b/Headers/Additions/GNUstepBase/GSCategories.h @@ -115,20 +115,8 @@ GS_EXPORT void NSDecimalFromComponents(NSDecimal *result, unsigned long long mantissa, short exponent, BOOL negative); -GS_EXPORT BOOL GSDebugSet(NSString *level); - -GS_EXPORT NSThread *GSCurrentThread(void); -GS_EXPORT NSMutableDictionary *GSCurrentThreadDictionary(void); - -GS_EXPORT NSString *GSDebugMethodMsg(id obj, SEL sel, const char *file, - int line, NSString *fmt); -GS_EXPORT NSString *GSDebugFunctionMsg(const char *func, const char *file, - int line, NSString *fmt); - #endif /* OS_API_VERSION(GS_API_NONE,GS_API_NONE) */ -#include - #if defined(__cplusplus) } #endif diff --git a/Source/Additions/GCDictionary.m b/Source/Additions/GCDictionary.m index 20e857161..30f7c5f16 100644 --- a/Source/Additions/GCDictionary.m +++ b/Source/Additions/GCDictionary.m @@ -34,7 +34,6 @@ #import "GNUstepBase/GSObjCRuntime.h" #import "GNUstepBase/GCObject.h" -#import "GNUstepBase/GSCategories.h" typedef struct { id object; diff --git a/Source/Additions/GCObject.m b/Source/Additions/GCObject.m index 909d08a9e..2c358bb9a 100644 --- a/Source/Additions/GCObject.m +++ b/Source/Additions/GCObject.m @@ -39,7 +39,6 @@ #endif #import "GNUstepBase/GCObject.h" -#import "GNUstepBase/GSCategories.h" #include diff --git a/Source/Additions/GSInsensitiveDictionary.m b/Source/Additions/GSInsensitiveDictionary.m index 3692f2bfc..e212b7665 100644 --- a/Source/Additions/GSInsensitiveDictionary.m +++ b/Source/Additions/GSInsensitiveDictionary.m @@ -35,7 +35,6 @@ #import "Foundation/NSKeyedArchiver.h" #import "GNUstepBase/GSObjCRuntime.h" -#import "GNUstepBase/GSCategories.h" /* diff --git a/Source/Additions/GSLock.m b/Source/Additions/GSLock.m index 470092597..ecddd8fec 100644 --- a/Source/Additions/GSLock.m +++ b/Source/Additions/GSLock.m @@ -33,7 +33,6 @@ #import "Foundation/NSThread.h" #import "GNUstepBase/GSLock.h" #import "GNUstepBase/GNUstep.h" -#import "GNUstepBase/GSCategories.h" /** * This implements a class which, when used in single-threaded mode, diff --git a/Source/Additions/GSObjCRuntime.m b/Source/Additions/GSObjCRuntime.m index ca4c202c4..4821fccfe 100644 --- a/Source/Additions/GSObjCRuntime.m +++ b/Source/Additions/GSObjCRuntime.m @@ -50,7 +50,6 @@ #endif #import "GNUstepBase/GSObjCRuntime.h" #import "GNUstepBase/GNUstep.h" -#import "GNUstepBase/GSCategories.h" #import "../GSPrivate.h" diff --git a/Source/Additions/GSXML.m b/Source/Additions/GSXML.m index f73ca9ba2..9ee7cf5b7 100644 --- a/Source/Additions/GSXML.m +++ b/Source/Additions/GSXML.m @@ -42,7 +42,6 @@ #import "config.h" #import "GNUstepBase/preface.h" -#import "GNUstepBase/GSCategories.h" #import "GNUstepBase/Unicode.h" diff --git a/Source/Additions/NSCalendarDate+GNUstepBase.m b/Source/Additions/NSCalendarDate+GNUstepBase.m index 8a53fabb2..e6c794d7a 100644 --- a/Source/Additions/NSCalendarDate+GNUstepBase.m +++ b/Source/Additions/NSCalendarDate+GNUstepBase.m @@ -29,7 +29,7 @@ /** * Extension methods for the NSCalendarDate class */ -@implementation NSCalendarDate (GSCategories) +@implementation NSCalendarDate (GNUstepBase) /** * The ISO standard week of the year is based on the first week of the diff --git a/Source/Additions/NSError+GNUstepBase.m b/Source/Additions/NSError+GNUstepBase.m index 3ee56c52b..bbbc3ee08 100644 --- a/Source/Additions/NSError+GNUstepBase.m +++ b/Source/Additions/NSError+GNUstepBase.m @@ -35,7 +35,7 @@ * GNUstep specific (non-standard) additions to the NSError class. * Possibly to be made public */ -@implementation NSError(GSCategories) +@implementation NSError(GNUstepBase) #if !defined(__MINGW32__) diff --git a/Source/Additions/NSLock+GNUstepBase.m b/Source/Additions/NSLock+GNUstepBase.m index 1fc01ae71..c44a6df3a 100644 --- a/Source/Additions/NSLock+GNUstepBase.m +++ b/Source/Additions/NSLock+GNUstepBase.m @@ -88,14 +88,14 @@ newLockAt(Class self, SEL _cmd, id *location) } -@implementation NSLock (GSCategories) +@implementation NSLock (GNUstepBase) + (id) newLockAt: (id *)location { return newLockAt(self, _cmd, location); } @end -@implementation NSRecursiveLock (GSCategories) +@implementation NSRecursiveLock (GNUstepBase) + (id) newLockAt: (id *)location { return newLockAt(self, _cmd, location); diff --git a/Source/Additions/NSTask+GNUstepBase.m b/Source/Additions/NSTask+GNUstepBase.m index 526b21863..1e82f6b79 100644 --- a/Source/Additions/NSTask+GNUstepBase.m +++ b/Source/Additions/NSTask+GNUstepBase.m @@ -28,7 +28,7 @@ #import "Foundation/NSProcessInfo.h" #import "GNUstepBase/NSTask+GNUstepBase.h" -@implementation NSTask (GSCategories) +@implementation NSTask (GNUstepBase) static NSString* executablePath(NSFileManager *mgr, NSString *path)