New header fiels for compatibility

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@9314 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2001-03-08 14:48:27 +00:00
parent b0f76a10ef
commit 798a82efa7
13 changed files with 286 additions and 173 deletions

View file

@ -1,3 +1,44 @@
2001-03-08 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/gnustep/base/NSCalendarDate.h:
* Headers/gnustep/base/NSTimeZone.h: New files for MacOS-X compatibility
* Headers/gnustep/base/Foundation.h: Add NSCalendarDate and NSTimeZone
* Headers/gnustep/base/NSDate.h: Remove info in new files.
* Source/GNUmakefile: Add new NSCalendarDate and NSTimeZone files.
* Source/NSCalendarDate.m: Update for header changes.
* Source/NSDate.m: ditto
* Source/NSDateFormatter.m: ditto
* Source/NSLog.m: ditto
* Source/NSString.m: ditto
* Source/NSTimeZone.m: ditto
2001-03-06 Adam Fedor <fedor@gnu.org>
* Source/libgnustep-base.def: Regenerate.
2001-03-05 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSUserDefaults.m: Changed ([+setUserLanguages:]) to use
NSLanguages.
* Documentation/gsdoc/NSUserDefaults.gsdoc: documented the
([+setUserlanguages:]) method.
2001-03-04 Jonathan Gapen <jagapen@home.com>
* Documentation/gsdoc/NSCharacterSet.gsdoc: Documented some methods.
* Headers/gnustep/unicode/caseconv.h: Updated case-mapping tables.
* Source/NSBitmapCharSet.m: Added sanity check to initWithBitmap:
* Source/Unicode.m: Changed uni_toupper() and uni_tolower() to use
direct lookup in two-level tables, rather than a linear search.
2001-03-03 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSBundle.m: Corrected
([-_bundleResourcePathsWithRootPath:subPath:]) to use
([NSUserDefaults +userLanguages]) to get language array again.
* Documentation/gsdoc/NSUserDefaults.gsdoc: Updated and added
information about +userLanguages
2001-03-07 Adam Fedor <fedor@gnu.org>
* Source/NSInvocation.m (-initWithTarget:selector:): Correct copying

View file

@ -14,7 +14,7 @@
<chapter>
<heading>NSCalendarDate</heading>
<class name="NSCalendarDate" super="NSDate">
<declared>Foundation/NSDate.h</declared>
<declared>Foundation/NSCalendarDate.h</declared>
<conform>NSCoding</conform>
<desc>
</desc>

View file

@ -37,6 +37,7 @@
#include <Foundation/NSAutoreleasePool.h>
#include <Foundation/NSBundle.h>
#include <Foundation/NSByteOrder.h>
#include <Foundation/NSCalendarDate.h>
#include <Foundation/NSCharacterSet.h>
#include <Foundation/NSClassDescription.h>
#include <Foundation/NSCoder.h>
@ -80,6 +81,7 @@
#include <Foundation/NSString.h>
#include <Foundation/NSTask.h>
#include <Foundation/NSThread.h>
#include <Foundation/NSTimeZone.h>
#include <Foundation/NSTimer.h>
#include <Foundation/NSURL.h>
#include <Foundation/NSURLHandle.h>

View file

@ -0,0 +1,137 @@
/* Interface for NSCalendarDate for GNUStep
Copyright (C) 1994, 1996, 1999 Free Software Foundation, Inc.
This file is part of the GNUstep Base Library.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
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., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
*/
#ifndef __NSCalendarDate_h_GNUSTEP_BASE_INCLUDE
#define __NSCalendarDate_h_GNUSTEP_BASE_INCLUDE
#include <Foundation/NSDate.h>
@class NSTimeZone;
@class NSTimeZoneDetail;
@interface NSCalendarDate : NSDate
{
NSTimeInterval _seconds_since_ref;
NSString *_calendar_format;
NSTimeZone *_time_zone;
}
// Getting an NSCalendar Date
+ (id) calendarDate;
+ (id) dateWithString: (NSString*)description
calendarFormat: (NSString*)format;
+ (id) dateWithString: (NSString*)description
calendarFormat: (NSString*)format
locale: (NSDictionary*)dictionary;
+ (id) dateWithYear: (int)year
month: (unsigned int)month
day: (unsigned int)day
hour: (unsigned int)hour
minute: (unsigned int)minute
second: (unsigned int)second
timeZone: (NSTimeZone*)aTimeZone;
// Initializing an NSCalendar Date
- (id) initWithString: (NSString*)description;
- (id) initWithString: (NSString*)description
calendarFormat: (NSString*)format;
- (id) initWithString: (NSString*)description
calendarFormat: (NSString*)format
locale: (NSDictionary*)dictionary;
- (id) initWithYear: (int)year
month: (unsigned int)month
day: (unsigned int)day
hour: (unsigned int)hour
minute: (unsigned int)minute
second: (unsigned int)second
timeZone: (NSTimeZone*)aTimeZone;
// Retreiving Date Elements
- (int) dayOfCommonEra;
- (int) dayOfMonth;
- (int) dayOfWeek;
- (int) dayOfYear;
- (int) hourOfDay;
- (int) minuteOfHour;
- (int) monthOfYear;
- (int) secondOfMinute;
- (int) yearOfCommonEra;
// Providing Adjusted Dates
- (NSCalendarDate*) addYear: (int)year
month: (int)month
day: (int)day
hour: (int)hour
minute: (int)minute
second: (int)second;
// Getting String Descriptions of Dates
- (NSString*) description;
- (NSString*) descriptionWithCalendarFormat: (NSString*)format;
- (NSString*) descriptionWithCalendarFormat: (NSString*)format
locale: (NSDictionary*)locale;
- (NSString*) descriptionWithLocale: (NSDictionary*)locale;
// Getting and Setting Calendar Formats
- (NSString*) calendarFormat;
- (void) setCalendarFormat: (NSString*)format;
// Getting and Setting Time Zones
- (void) setTimeZone: (NSTimeZone*)aTimeZone;
#ifndef STRICT_OPENSTEP
- (NSTimeZone*) timeZone;
#endif
#ifndef STRICT_MACOS_X
- (NSTimeZoneDetail*) timeZoneDetail;
#endif
@end
@interface NSCalendarDate (GregorianDate)
- (int) lastDayOfGregorianMonth: (int)month year: (int)year;
- (int) absoluteGregorianDay: (int)day month: (int)month year: (int)year;
- (void) gregorianDateFromAbsolute: (int)d
day: (int*)day
month: (int*)month
year: (int*)year;
@end
@interface NSCalendarDate (OPENSTEP)
- (NSCalendarDate*) dateByAddingYears: (int)years
months: (int)months
days: (int)days
hours: (int)hours
minutes: (int)minutes
seconds: (int)seconds;
- (void) years: (int*)years
months: (int*)months
days: (int*)days
hours: (int*)hours
minutes: (int*)minutes
seconds: (int*)seconds
sinceDate: (NSDate*)date;
@end
#endif /* __NSCalendarDate_h_GNUSTEP_BASE_INCLUDE*/

View file

@ -111,176 +111,4 @@ NSTimeInterval GSTimeNow(); /* Get time since reference date*/
NSTimeInterval GSTime(int d, int m, int y, int hh, int mm, int ss, int mil);
#endif
@interface NSTimeZone : NSObject
//Creating and Initializing an NSTimeZone
+ (NSTimeZone*) localTimeZone;
+ (NSTimeZone*) timeZoneForSecondsFromGMT: (int)seconds;
+ (NSTimeZone*) timeZoneWithName: (NSString*)aTimeZoneName;
//Managing Time Zones
+ (void) setDefaultTimeZone: (NSTimeZone*)aTimeZone;
// Getting Time Zone Information
+ (NSDictionary*) abbreviationDictionary;
//Getting Arrays of Time Zones
+ (NSArray*) timeZoneArray;
- (NSArray*) timeZoneDetailArray;
#ifndef NO_GNUSTEP
/* Returns an dictionary that maps abbreviations to the array
containing all the time zone names that use the abbreviation. */
+ (NSDictionary*) abbreviationMap;
#endif
#ifndef STRICT_OPENSTEP
+ (void) resetSystemTimeZone;
+ (NSTimeZone*) systemTimeZone;
+ (NSTimeZone*) timeZoneWithName: (NSString*)name data: (NSData*)data;
- (NSString*) abbreviation;
- (NSString*) abbreviationForDate: (NSDate*)aDate;
- (id) initWithName: (NSString*)name;
- (id) initWithName: (NSString*)name data: (NSData*)data;
- (BOOL) isDaylightSavingTime;
- (BOOL) isDaylightSavingTimeForDate: (NSDate*)aDate;
- (BOOL) isEqualToTimeZone: (NSTimeZone*)aTimeZone;
- (NSString*) name;
- (int) secondsFromGMT;
- (int) secondsFromGMTForDate: (NSDate*)aDate;
#endif
#ifndef STRICT_MACOS_X
- (NSTimeZoneDetail*) timeZoneDetailForDate: (NSDate*)date;
- (NSString*) timeZoneName;
#endif
/*
* The next two methods are a problem ... they are present in both
* OpenStep and MacOS-X, but return different types!
* We resort to the MaxOS-X version.
*/
+ (NSTimeZone*) defaultTimeZone;
+ (NSTimeZone*) timeZoneWithAbbreviation: (NSString*)abbreviation;
@end
#ifndef STRICT_MACOS_X
@interface NSTimeZoneDetail : NSTimeZone
- (BOOL) isDaylightSavingTimeZone;
- (NSString*) timeZoneAbbreviation;
- (int) timeZoneSecondsFromGMT;
@end
#endif
@interface NSCalendarDate : NSDate
{
NSTimeInterval _seconds_since_ref;
NSString *_calendar_format;
NSTimeZone *_time_zone;
}
// Getting an NSCalendar Date
+ (id) calendarDate;
+ (id) dateWithString: (NSString*)description
calendarFormat: (NSString*)format;
+ (id) dateWithString: (NSString*)description
calendarFormat: (NSString*)format
locale: (NSDictionary*)dictionary;
+ (id) dateWithYear: (int)year
month: (unsigned int)month
day: (unsigned int)day
hour: (unsigned int)hour
minute: (unsigned int)minute
second: (unsigned int)second
timeZone: (NSTimeZone*)aTimeZone;
// Initializing an NSCalendar Date
- (id) initWithString: (NSString*)description;
- (id) initWithString: (NSString*)description
calendarFormat: (NSString*)format;
- (id) initWithString: (NSString*)description
calendarFormat: (NSString*)format
locale: (NSDictionary*)dictionary;
- (id) initWithYear: (int)year
month: (unsigned int)month
day: (unsigned int)day
hour: (unsigned int)hour
minute: (unsigned int)minute
second: (unsigned int)second
timeZone: (NSTimeZone*)aTimeZone;
// Retreiving Date Elements
- (int) dayOfCommonEra;
- (int) dayOfMonth;
- (int) dayOfWeek;
- (int) dayOfYear;
- (int) hourOfDay;
- (int) minuteOfHour;
- (int) monthOfYear;
- (int) secondOfMinute;
- (int) yearOfCommonEra;
// Providing Adjusted Dates
- (NSCalendarDate*) addYear: (int)year
month: (int)month
day: (int)day
hour: (int)hour
minute: (int)minute
second: (int)second;
// Getting String Descriptions of Dates
- (NSString*) description;
- (NSString*) descriptionWithCalendarFormat: (NSString*)format;
- (NSString*) descriptionWithCalendarFormat: (NSString*)format
locale: (NSDictionary*)locale;
- (NSString*) descriptionWithLocale: (NSDictionary*)locale;
// Getting and Setting Calendar Formats
- (NSString*) calendarFormat;
- (void) setCalendarFormat: (NSString*)format;
// Getting and Setting Time Zones
- (void) setTimeZone: (NSTimeZone*)aTimeZone;
#ifndef STRICT_OPENSTEP
- (NSTimeZone*) timeZone;
#endif
#ifndef STRICT_MACOS_X
- (NSTimeZoneDetail*) timeZoneDetail;
#endif
@end
@interface NSCalendarDate (GregorianDate)
- (int) lastDayOfGregorianMonth: (int)month year: (int)year;
- (int) absoluteGregorianDay: (int)day month: (int)month year: (int)year;
- (void) gregorianDateFromAbsolute: (int)d
day: (int*)day
month: (int*)month
year: (int*)year;
@end
@interface NSCalendarDate (OPENSTEP)
- (NSCalendarDate*) dateByAddingYears: (int)years
months: (int)months
days: (int)days
hours: (int)hours
minutes: (int)minutes
seconds: (int)seconds;
- (void) years: (int*)years
months: (int*)months
days: (int*)days
hours: (int*)hours
minutes: (int*)minutes
seconds: (int*)seconds
sinceDate: (NSDate*)date;
@end
#endif /* __NSDate_h_GNUSTEP_BASE_INCLUDE*/

View file

@ -0,0 +1,93 @@
/* Interface for NSTimeZone for GNUStep
Copyright (C) 1994, 1996, 1999 Free Software Foundation, Inc.
This file is part of the GNUstep Base Library.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
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., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
*/
#ifndef __NSTimeZone_h_GNUSTEP_BASE_INCLUDE
#define __NSTimeZone_h_GNUSTEP_BASE_INCLUDE
#include <Foundation/NSObject.h>
@class NSArray;
@class NSDate;
@class NSDictionary;
@class NSString;
@interface NSTimeZone : NSObject
//Creating and Initializing an NSTimeZone
+ (NSTimeZone*) localTimeZone;
+ (NSTimeZone*) timeZoneForSecondsFromGMT: (int)seconds;
+ (NSTimeZone*) timeZoneWithName: (NSString*)aTimeZoneName;
//Managing Time Zones
+ (void) setDefaultTimeZone: (NSTimeZone*)aTimeZone;
// Getting Time Zone Information
+ (NSDictionary*) abbreviationDictionary;
//Getting Arrays of Time Zones
+ (NSArray*) timeZoneArray;
- (NSArray*) timeZoneDetailArray;
#ifndef NO_GNUSTEP
/* Returns an dictionary that maps abbreviations to the array
containing all the time zone names that use the abbreviation. */
+ (NSDictionary*) abbreviationMap;
#endif
#ifndef STRICT_OPENSTEP
+ (void) resetSystemTimeZone;
+ (NSTimeZone*) systemTimeZone;
+ (NSTimeZone*) timeZoneWithName: (NSString*)name data: (NSData*)data;
- (NSString*) abbreviation;
- (NSString*) abbreviationForDate: (NSDate*)aDate;
- (id) initWithName: (NSString*)name;
- (id) initWithName: (NSString*)name data: (NSData*)data;
- (BOOL) isDaylightSavingTime;
- (BOOL) isDaylightSavingTimeForDate: (NSDate*)aDate;
- (BOOL) isEqualToTimeZone: (NSTimeZone*)aTimeZone;
- (NSString*) name;
- (int) secondsFromGMT;
- (int) secondsFromGMTForDate: (NSDate*)aDate;
#endif
#ifndef STRICT_MACOS_X
- (NSTimeZoneDetail*) timeZoneDetailForDate: (NSDate*)date;
- (NSString*) timeZoneName;
#endif
/*
* The next two methods are a problem ... they are present in both
* OpenStep and MacOS-X, but return different types!
* We resort to the MaxOS-X version.
*/
+ (NSTimeZone*) defaultTimeZone;
+ (NSTimeZone*) timeZoneWithAbbreviation: (NSString*)abbreviation;
@end
#ifndef STRICT_MACOS_X
@interface NSTimeZoneDetail : NSTimeZone
- (BOOL) isDaylightSavingTimeZone;
- (NSString*) timeZoneAbbreviation;
- (int) timeZoneSecondsFromGMT;
@end
#endif
#endif /* __NSTimeZone_h_GNUSTEP_BASE_INCLUDE*/

View file

@ -276,6 +276,7 @@ NSAutoreleasePool.h \
NSBitmapCharSet.h \
NSBundle.h \
NSByteOrder.h \
NSCalendarDate.h \
NSCharacterSet.h \
NSClassDescription.h \
NSCoder.h \
@ -326,6 +327,7 @@ NSSet.h \
NSString.h \
NSTask.h \
NSThread.h \
NSTimeZone.h \
NSTimer.h \
NSUndoManager.h \
NSUserDefaults.h \

View file

@ -26,6 +26,8 @@
#include <Foundation/NSObjCRuntime.h>
#include <Foundation/NSData.h>
#include <Foundation/NSDate.h>
#include <Foundation/NSCalendarDate.h>
#include <Foundation/NSTimeZone.h>
#include <Foundation/NSArray.h>
#include <Foundation/NSString.h>
#include <Foundation/NSCoder.h>

View file

@ -27,6 +27,8 @@
#include <Foundation/NSArray.h>
#include <Foundation/NSDictionary.h>
#include <Foundation/NSDate.h>
#include <Foundation/NSCalendarDate.h>
#include <Foundation/NSTimeZone.h>
#include <Foundation/NSString.h>
#include <Foundation/NSCoder.h>
#include <Foundation/NSException.h>

View file

@ -23,6 +23,8 @@
#include <config.h>
#include <Foundation/NSDate.h>
#include <Foundation/NSCalendarDate.h>
#include <Foundation/NSTimeZone.h>
#include <Foundation/NSFormatter.h>
#include <Foundation/NSDateFormatter.h>
#include <Foundation/NSString.h>

View file

@ -25,6 +25,8 @@
#include <base/preface.h>
#include <Foundation/NSObjCRuntime.h>
#include <Foundation/NSDate.h>
#include <Foundation/NSCalendarDate.h>
#include <Foundation/NSTimeZone.h>
#include <Foundation/NSException.h>
#include <Foundation/NSProcessInfo.h>
#include <Foundation/NSLock.h>

View file

@ -44,6 +44,7 @@
#include <string.h>
#include <base/preface.h>
#include <Foundation/NSString.h>
#include <Foundation/NSCalendarDate.h>
#include <Foundation/NSArray.h>
#include <Foundation/NSCharacterSet.h>
#include <Foundation/NSException.h>

View file

@ -65,6 +65,7 @@
#include <Foundation/NSThread.h>
#include <Foundation/NSNotification.h>
#include <Foundation/NSPortCoder.h>
#include <Foundation/NSTimeZone.h>
#include <Foundation/NSDebug.h>
#define NOID