From 4579d434e73907970511c77084f2f5d81a9ee522 Mon Sep 17 00:00:00 2001 From: fedor Date: Tue, 22 Oct 2002 03:24:48 +0000 Subject: [PATCH] Remove encodingForRegistry:encoding: git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14832 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 4 ++ Headers/gnustep/gui/GSFontInfo.h | 2 - Source/GSFontInfo.m | 77 -------------------------------- 3 files changed, 4 insertions(+), 79 deletions(-) diff --git a/ChangeLog b/ChangeLog index c463f1229..194267b75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-10-21 Adam Fedor + + * Source/GSFontInfo.m (+encodingForRegistry:encoding:): Remove. + Tue Oct 22 02:13:55 2002 Nicola Pero * Resources/GNUmakefile (string): Renamed to after-strings so diff --git a/Headers/gnustep/gui/GSFontInfo.h b/Headers/gnustep/gui/GSFontInfo.h index 530eb7093..86ff4115d 100644 --- a/Headers/gnustep/gui/GSFontInfo.h +++ b/Headers/gnustep/gui/GSFontInfo.h @@ -80,8 +80,6 @@ + (int) weightForString: (NSString *)weightString; + (NSString *) stringForWeight: (int)weight; -+ (NSStringEncoding) encodingForRegistry: (NSString*)registry - encoding: (NSString*)encoding; - (NSDictionary *)afmDictionary; - (NSString *)afmFileContents; diff --git a/Source/GSFontInfo.m b/Source/GSFontInfo.m index 3cfaea80d..0f98234a4 100644 --- a/Source/GSFontInfo.m +++ b/Source/GSFontInfo.m @@ -180,83 +180,6 @@ static GSFontEnumerator *sharedEnumerator = nil; return [arr objectAtIndex: aWeight]; } -+ (NSStringEncoding) encodingForRegistry: (NSString*)registry - encoding: (NSString*)encoding -{ - if ([registry isEqualToString: @"iso8859"]) - { - if ([encoding isEqualToString: @"1"]) - return NSISOLatin1StringEncoding; - else if ([encoding isEqualToString: @"2"]) - return NSISOLatin2StringEncoding; - else if ([encoding isEqualToString: @"3"]) - return NSISOLatin3StringEncoding; - else if ([encoding isEqualToString: @"4"]) - return NSISOLatin4StringEncoding; - else if ([encoding isEqualToString: @"5"]) - return NSISOCyrillicStringEncoding; - else if ([encoding isEqualToString: @"6"]) - return NSISOArabicStringEncoding; - else if ([encoding isEqualToString: @"7"]) - return NSISOGreekStringEncoding; - else if ([encoding isEqualToString: @"8"]) - return NSISOHebrewStringEncoding; - // Other latin encodings are currently not supported - } - else if ([registry isEqualToString: @"iso10646"]) - { - if ([encoding isEqualToString: @"1"]) - return NSUnicodeStringEncoding; - } - else if ([registry isEqualToString: @"microsoft"]) - { - if ([encoding isEqualToString: @"symbol"]) - return NSSymbolStringEncoding; - else if ([encoding isEqualToString: @"cp1250"]) - return NSWindowsCP1250StringEncoding; - else if ([encoding isEqualToString: @"cp1251"]) - return NSWindowsCP1251StringEncoding; - else if ([encoding isEqualToString: @"cp1252"]) - return NSWindowsCP1252StringEncoding; - else if ([encoding isEqualToString: @"cp1253"]) - return NSWindowsCP1253StringEncoding; - else if ([encoding isEqualToString: @"cp1254"]) - return NSWindowsCP1254StringEncoding; - } - else if ([registry isEqualToString: @"apple"]) - { - if ([encoding isEqualToString: @"roman"]) - return NSMacOSRomanStringEncoding; - } - else if ([registry isEqualToString: @"jisx0201.1976"]) - { - if ([encoding isEqualToString: @"0"]) - return NSShiftJISStringEncoding; - } - else if ([registry isEqualToString: @"iso646.1991"]) - { - if ([encoding isEqualToString: @"irv"]) - return NSASCIIStringEncoding; - } - else if ([registry isEqualToString: @"koi8"]) - { - if ([encoding isEqualToString: @"r"]) - return NSKOI8RStringEncoding; - } - else if ([registry isEqualToString: @"gb2312.1980"]) - { - if ([encoding isEqualToString: @"0"]) - return NSGB2312StringEncoding; - } - else if ([registry isEqualToString: @"big5"]) - { - if ([encoding isEqualToString: @"0"]) - return NSBIG5StringEncoding; - } - - return NSASCIIStringEncoding; -} - - init { [super init];