Skip to content

Commit 9b80595

Browse files
MaddTheSaneMaddTheSane
committed
Const-ify some NSStrings.
1 parent c932b83 commit 9b80595

7 files changed

Lines changed: 122 additions & 122 deletions

File tree

‎CSCommandLineParser.m‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,27 @@
2727

2828

2929

30-
static NSString *NamesKey=@"NamesKey";
31-
static NSString *AllowedValuesKey=@"AllowedValuesKey";
32-
static NSString *DefaultValueKey=@"DefaultValueKey";
33-
static NSString *OptionTypeKey=@"OptionType";
34-
static NSString *DescriptionKey=@"DescriptionKey";
35-
static NSString *ArgumentDescriptionKey=@"ArgumentDescriptionKey";
36-
static NSString *AliasTargetKey=@"AliasTargetKey";
37-
static NSString *RequiredOptionsKey=@"RequiredOptionsKey";
38-
39-
static NSString *NumberValueKey=@"NumberValue";
40-
static NSString *StringValueKey=@"StringValue";
41-
static NSString *ArrayValueKey=@"ArrayValue";
42-
43-
static NSString *StringOptionType=@"StringOptionType";
44-
static NSString *MultipleChoiceOptionType=@"MultipleChoiceOptionType";
45-
static NSString *IntegerOptionType=@"IntegerOptionType";
46-
static NSString *FloatingPointOptionType=@"FloatingPointOptionType";
47-
static NSString *SwitchOptionType=@"SwitchOptionType";
48-
static NSString *HelpOptionType=@"HelpOptionType";
49-
static NSString *VersionOptionType=@"VersionOptionType";
50-
static NSString *AliasOptionType=@"AliasOptionType";
30+
static NSString *const NamesKey=@"NamesKey";
31+
static NSString *const AllowedValuesKey=@"AllowedValuesKey";
32+
static NSString *const DefaultValueKey=@"DefaultValueKey";
33+
static NSString *const OptionTypeKey=@"OptionType";
34+
static NSString *const DescriptionKey=@"DescriptionKey";
35+
static NSString *const ArgumentDescriptionKey=@"ArgumentDescriptionKey";
36+
static NSString *const AliasTargetKey=@"AliasTargetKey";
37+
static NSString *const RequiredOptionsKey=@"RequiredOptionsKey";
38+
39+
static NSString *const NumberValueKey=@"NumberValue";
40+
static NSString *const StringValueKey=@"StringValue";
41+
static NSString *const ArrayValueKey=@"ArrayValue";
42+
43+
static NSString *const StringOptionType=@"StringOptionType";
44+
static NSString *const MultipleChoiceOptionType=@"MultipleChoiceOptionType";
45+
static NSString *const IntegerOptionType=@"IntegerOptionType";
46+
static NSString *const FloatingPointOptionType=@"FloatingPointOptionType";
47+
static NSString *const SwitchOptionType=@"SwitchOptionType";
48+
static NSString *const HelpOptionType=@"HelpOptionType";
49+
static NSString *const VersionOptionType=@"VersionOptionType";
50+
static NSString *const AliasOptionType=@"AliasOptionType";
5151

5252
#if MAC_OS_X_VERSION_MAX_ALLOWED<1050
5353
@interface NSScanner (BuildKludge)

‎XADArchiveParser.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ regex:(XADRegex *)regex firstFileExtension:(NSString *)firstext;
227227
-(NSData *)encodedPassword;
228228
-(const char *)encodedCStringPassword;
229229

230-
-(void)reportInterestingFileWithReason:(NSString *)reason,...;
230+
-(void)reportInterestingFileWithReason:(NSString *)reason,... NS_FORMAT_FUNCTION(1,2);
231231

232232

233233

‎XADMacArchiveParser.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
#import "XADArchiveParser.h"
2222
#import "CSStreamHandle.h"
2323

24-
extern NSString *XADIsMacBinaryKey;
25-
extern NSString *XADMightBeMacBinaryKey;
26-
extern NSString *XADDisableMacForkExpansionKey;
24+
extern NSString *const XADIsMacBinaryKey;
25+
extern NSString *const XADMightBeMacBinaryKey;
26+
extern NSString *const XADDisableMacForkExpansionKey;
2727

2828
@interface XADMacArchiveParser:XADArchiveParser
2929
{

‎XADMacArchiveParser.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#import "NSDateXAD.h"
2626
#import "CRC.h"
2727

28-
NSString *XADIsMacBinaryKey=@"XADIsMacBinary";
29-
NSString *XADMightBeMacBinaryKey=@"XADMightBeMacBinary";
30-
NSString *XADDisableMacForkExpansionKey=@"XADDisableMacForkExpansionKey";
28+
NSString *const XADIsMacBinaryKey=@"XADIsMacBinary";
29+
NSString *const XADMightBeMacBinaryKey=@"XADMightBeMacBinary";
30+
NSString *const XADDisableMacForkExpansionKey=@"XADDisableMacForkExpansionKey";
3131

3232
@implementation XADMacArchiveParser
3333

‎XADString.h‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -23,50 +23,50 @@
2323
@class XADStringSource,UniversalDetector;
2424

2525

26-
extern NSString *XADUTF8StringEncodingName;
27-
extern NSString *XADASCIIStringEncodingName;
28-
29-
extern NSString *XADISOLatin1StringEncodingName;
30-
extern NSString *XADISOLatin2StringEncodingName;
31-
extern NSString *XADISOLatin3StringEncodingName;
32-
extern NSString *XADISOLatin4StringEncodingName;
33-
extern NSString *XADISOLatin5StringEncodingName;
34-
extern NSString *XADISOLatin6StringEncodingName;
35-
extern NSString *XADISOLatin7StringEncodingName;
36-
extern NSString *XADISOLatin8StringEncodingName;
37-
extern NSString *XADISOLatin9StringEncodingName;
38-
extern NSString *XADISOLatin10StringEncodingName;
39-
extern NSString *XADISOLatin11StringEncodingName;
40-
extern NSString *XADISOLatin12StringEncodingName;
41-
extern NSString *XADISOLatin13StringEncodingName;
42-
extern NSString *XADISOLatin14StringEncodingName;
43-
extern NSString *XADISOLatin15StringEncodingName;
44-
extern NSString *XADISOLatin16StringEncodingName;
45-
46-
extern NSString *XADShiftJISStringEncodingName;
47-
48-
extern NSString *XADWindowsCP1250StringEncodingName;
49-
extern NSString *XADWindowsCP1251StringEncodingName;
50-
extern NSString *XADWindowsCP1252StringEncodingName;
51-
extern NSString *XADWindowsCP1253StringEncodingName;
52-
extern NSString *XADWindowsCP1254StringEncodingName;
53-
54-
extern NSString *XADMacOSRomanStringEncodingName;
55-
extern NSString *XADMacOSJapaneseStringEncodingName;
56-
extern NSString *XADMacOSTraditionalChineseStringEncodingName;
57-
extern NSString *XADMacOSKoreanStringEncodingName;
58-
extern NSString *XADMacOSArabicStringEncodingName;
59-
extern NSString *XADMacOSHebrewStringEncodingName;
60-
extern NSString *XADMacOSGreekStringEncodingName;
61-
extern NSString *XADMacOSCyrillicStringEncodingName;
62-
extern NSString *XADMacOSSimplifiedChineseStringEncodingName;
63-
extern NSString *XADMacOSRomanianStringEncodingName;
64-
extern NSString *XADMacOSUkranianStringEncodingName;
65-
extern NSString *XADMacOSThaiStringEncodingName;
66-
extern NSString *XADMacOSCentralEuropeanRomanStringEncodingName;
67-
extern NSString *XADMacOSIcelandicStringEncodingName;
68-
extern NSString *XADMacOSTurkishStringEncodingName;
69-
extern NSString *XADMacOSCroatianStringEncodingName;
26+
extern NSString *const XADUTF8StringEncodingName;
27+
extern NSString *const XADASCIIStringEncodingName;
28+
29+
extern NSString *const XADISOLatin1StringEncodingName;
30+
extern NSString *const XADISOLatin2StringEncodingName;
31+
extern NSString *const XADISOLatin3StringEncodingName;
32+
extern NSString *const XADISOLatin4StringEncodingName;
33+
extern NSString *const XADISOLatin5StringEncodingName;
34+
extern NSString *const XADISOLatin6StringEncodingName;
35+
extern NSString *const XADISOLatin7StringEncodingName;
36+
extern NSString *const XADISOLatin8StringEncodingName;
37+
extern NSString *const XADISOLatin9StringEncodingName;
38+
extern NSString *const XADISOLatin10StringEncodingName;
39+
extern NSString *const XADISOLatin11StringEncodingName;
40+
extern NSString *const XADISOLatin12StringEncodingName;
41+
extern NSString *const XADISOLatin13StringEncodingName;
42+
extern NSString *const XADISOLatin14StringEncodingName;
43+
extern NSString *const XADISOLatin15StringEncodingName;
44+
extern NSString *const XADISOLatin16StringEncodingName;
45+
46+
extern NSString *const XADShiftJISStringEncodingName;
47+
48+
extern NSString *const XADWindowsCP1250StringEncodingName;
49+
extern NSString *const XADWindowsCP1251StringEncodingName;
50+
extern NSString *const XADWindowsCP1252StringEncodingName;
51+
extern NSString *const XADWindowsCP1253StringEncodingName;
52+
extern NSString *const XADWindowsCP1254StringEncodingName;
53+
54+
extern NSString *const XADMacOSRomanStringEncodingName;
55+
extern NSString *const XADMacOSJapaneseStringEncodingName;
56+
extern NSString *const XADMacOSTraditionalChineseStringEncodingName;
57+
extern NSString *const XADMacOSKoreanStringEncodingName;
58+
extern NSString *const XADMacOSArabicStringEncodingName;
59+
extern NSString *const XADMacOSHebrewStringEncodingName;
60+
extern NSString *const XADMacOSGreekStringEncodingName;
61+
extern NSString *const XADMacOSCyrillicStringEncodingName;
62+
extern NSString *const XADMacOSSimplifiedChineseStringEncodingName;
63+
extern NSString *const XADMacOSRomanianStringEncodingName;
64+
extern NSString *const XADMacOSUkranianStringEncodingName;
65+
extern NSString *const XADMacOSThaiStringEncodingName;
66+
extern NSString *const XADMacOSCentralEuropeanRomanStringEncodingName;
67+
extern NSString *const XADMacOSIcelandicStringEncodingName;
68+
extern NSString *const XADMacOSTurkishStringEncodingName;
69+
extern NSString *const XADMacOSCroatianStringEncodingName;
7070

7171

7272
@protocol XADString <NSObject>

‎XADString.m‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -24,50 +24,50 @@
2424

2525

2626

27-
NSString *XADASCIIStringEncodingName=@"US-ASCII";
28-
NSString *XADUTF8StringEncodingName=@"UTF-8";
29-
30-
NSString *XADISOLatin1StringEncodingName=@"iso-8859-1";
31-
NSString *XADISOLatin2StringEncodingName=@"iso-8859-2";
32-
NSString *XADISOLatin3StringEncodingName=@"iso-8859-3";
33-
NSString *XADISOLatin4StringEncodingName=@"iso-8859-4";
34-
NSString *XADISOLatin5StringEncodingName=@"iso-8859-5";
35-
NSString *XADISOLatin6StringEncodingName=@"iso-8859-6";
36-
NSString *XADISOLatin7StringEncodingName=@"iso-8859-7";
37-
NSString *XADISOLatin8StringEncodingName=@"iso-8859-8";
38-
NSString *XADISOLatin9StringEncodingName=@"iso-8859-9";
39-
NSString *XADISOLatin10StringEncodingName=@"iso-8859-10";
40-
NSString *XADISOLatin11StringEncodingName=@"iso-8859-11";
41-
NSString *XADISOLatin12StringEncodingName=@"iso-8859-12";
42-
NSString *XADISOLatin13StringEncodingName=@"iso-8859-13";
43-
NSString *XADISOLatin14StringEncodingName=@"iso-8859-14";
44-
NSString *XADISOLatin15StringEncodingName=@"iso-8859-15";
45-
NSString *XADISOLatin16StringEncodingName=@"iso-8859-16";
46-
47-
NSString *XADShiftJISStringEncodingName=@"Shift_JIS";
48-
49-
NSString *XADWindowsCP1250StringEncodingName=@"windows-1250";
50-
NSString *XADWindowsCP1251StringEncodingName=@"windows-1251";
51-
NSString *XADWindowsCP1252StringEncodingName=@"windows-1252";
52-
NSString *XADWindowsCP1253StringEncodingName=@"windows-1253";
53-
NSString *XADWindowsCP1254StringEncodingName=@"windows-1254";
54-
55-
NSString *XADMacOSRomanStringEncodingName=@"macintosh";
56-
NSString *XADMacOSJapaneseStringEncodingName=@"x-mac-japanese";
57-
NSString *XADMacOSTraditionalChineseStringEncodingName=@"x-mac-trad-chinese";
58-
NSString *XADMacOSKoreanStringEncodingName=@"x-mac-korean";
59-
NSString *XADMacOSArabicStringEncodingName=@"x-mac-arabic";
60-
NSString *XADMacOSHebrewStringEncodingName=@"x-mac-hebrew";
61-
NSString *XADMacOSGreekStringEncodingName=@"x-mac-greek";
62-
NSString *XADMacOSCyrillicStringEncodingName=@"x-mac-cyrillic";
63-
NSString *XADMacOSSimplifiedChineseStringEncodingName=@"x-mac-simp-chinese";
64-
NSString *XADMacOSRomanianStringEncodingName=@"x-mac-romanian";
65-
NSString *XADMacOSUkranianStringEncodingName=@"x-mac-ukrainian";
66-
NSString *XADMacOSThaiStringEncodingName=@"x-mac-thai";
67-
NSString *XADMacOSCentralEuropeanRomanStringEncodingName=@"x-mac-centraleurroman";
68-
NSString *XADMacOSIcelandicStringEncodingName=@"x-mac-icelandic";
69-
NSString *XADMacOSTurkishStringEncodingName=@"x-mac-turkish";
70-
NSString *XADMacOSCroatianStringEncodingName=@"x-mac-croatian";
27+
NSString *const XADASCIIStringEncodingName=@"US-ASCII";
28+
NSString *const XADUTF8StringEncodingName=@"UTF-8";
29+
30+
NSString *const XADISOLatin1StringEncodingName=@"iso-8859-1";
31+
NSString *const XADISOLatin2StringEncodingName=@"iso-8859-2";
32+
NSString *const XADISOLatin3StringEncodingName=@"iso-8859-3";
33+
NSString *const XADISOLatin4StringEncodingName=@"iso-8859-4";
34+
NSString *const XADISOLatin5StringEncodingName=@"iso-8859-5";
35+
NSString *const XADISOLatin6StringEncodingName=@"iso-8859-6";
36+
NSString *const XADISOLatin7StringEncodingName=@"iso-8859-7";
37+
NSString *const XADISOLatin8StringEncodingName=@"iso-8859-8";
38+
NSString *const XADISOLatin9StringEncodingName=@"iso-8859-9";
39+
NSString *const XADISOLatin10StringEncodingName=@"iso-8859-10";
40+
NSString *const XADISOLatin11StringEncodingName=@"iso-8859-11";
41+
NSString *const XADISOLatin12StringEncodingName=@"iso-8859-12";
42+
NSString *const XADISOLatin13StringEncodingName=@"iso-8859-13";
43+
NSString *const XADISOLatin14StringEncodingName=@"iso-8859-14";
44+
NSString *const XADISOLatin15StringEncodingName=@"iso-8859-15";
45+
NSString *const XADISOLatin16StringEncodingName=@"iso-8859-16";
46+
47+
NSString *const XADShiftJISStringEncodingName=@"Shift_JIS";
48+
49+
NSString *const XADWindowsCP1250StringEncodingName=@"windows-1250";
50+
NSString *const XADWindowsCP1251StringEncodingName=@"windows-1251";
51+
NSString *const XADWindowsCP1252StringEncodingName=@"windows-1252";
52+
NSString *const XADWindowsCP1253StringEncodingName=@"windows-1253";
53+
NSString *const XADWindowsCP1254StringEncodingName=@"windows-1254";
54+
55+
NSString *const XADMacOSRomanStringEncodingName=@"macintosh";
56+
NSString *const XADMacOSJapaneseStringEncodingName=@"x-mac-japanese";
57+
NSString *const XADMacOSTraditionalChineseStringEncodingName=@"x-mac-trad-chinese";
58+
NSString *const XADMacOSKoreanStringEncodingName=@"x-mac-korean";
59+
NSString *const XADMacOSArabicStringEncodingName=@"x-mac-arabic";
60+
NSString *const XADMacOSHebrewStringEncodingName=@"x-mac-hebrew";
61+
NSString *const XADMacOSGreekStringEncodingName=@"x-mac-greek";
62+
NSString *const XADMacOSCyrillicStringEncodingName=@"x-mac-cyrillic";
63+
NSString *const XADMacOSSimplifiedChineseStringEncodingName=@"x-mac-simp-chinese";
64+
NSString *const XADMacOSRomanianStringEncodingName=@"x-mac-romanian";
65+
NSString *const XADMacOSUkranianStringEncodingName=@"x-mac-ukrainian";
66+
NSString *const XADMacOSThaiStringEncodingName=@"x-mac-thai";
67+
NSString *const XADMacOSCentralEuropeanRomanStringEncodingName=@"x-mac-centraleurroman";
68+
NSString *const XADMacOSIcelandicStringEncodingName=@"x-mac-icelandic";
69+
NSString *const XADMacOSTurkishStringEncodingName=@"x-mac-turkish";
70+
NSString *const XADMacOSCroatianStringEncodingName=@"x-mac-croatian";
7171

7272
static BOOL IsDataASCII(NSData *data);
7373

‎XADXARParser.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
#define ExtendedAttributeState 5
3838
#define OldExtendedAttributeState 6
3939

40-
static const NSString *StringFormat=@"String";
41-
static const NSString *XADStringFormat=@"XADString";
42-
static const NSString *DecimalFormat=@"Decimal";
43-
static const NSString *OctalFormat=@"Octal";
44-
static const NSString *HexFormat=@"Hex";
45-
static const NSString *DateFormat=@"Date";
40+
static const NSString *const StringFormat=@"String";
41+
static const NSString *const XADStringFormat=@"XADString";
42+
static const NSString *const DecimalFormat=@"Decimal";
43+
static const NSString *const OctalFormat=@"Octal";
44+
static const NSString *const HexFormat=@"Hex";
45+
static const NSString *const DateFormat=@"Date";
4646

4747
@implementation XADXARParser
4848

0 commit comments

Comments
 (0)