aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil Hodgson <nyamatongwe@gmail.com>2015-09-29 16:44:45 +1000
committerNeil Hodgson <nyamatongwe@gmail.com>2015-09-29 16:44:45 +1000
commit70867d5782b2c74a6b16ee167c1dd1ba3a8bf0f4 (patch)
treedc26b6a2378a7ad0d036388f6435e8509151fd39
parent9f289050d300a1769ccf1fc99fc6442d17a9d8b5 (diff)
downloadscintilla-mirror-70867d5782b2c74a6b16ee167c1dd1ba3a8bf0f4.tar.gz
Reindented code which had become a mess.
-rw-r--r--cocoa/ScintillaCocoa.mm90
1 files changed, 45 insertions, 45 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index b6fb71758..9cb48e5c8 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -560,24 +560,24 @@ public:
folded[0] = mapping[static_cast<unsigned char>(mixed[0])];
return 1;
} else {
- CFStringRef cfsVal = CFStringCreateWithBytes(kCFAllocatorDefault,
- reinterpret_cast<const UInt8 *>(mixed),
- lenMixed, encoding, false);
+ CFStringRef cfsVal = CFStringCreateWithBytes(kCFAllocatorDefault,
+ reinterpret_cast<const UInt8 *>(mixed),
+ lenMixed, encoding, false);
- NSString *sMapped = [(NSString *)cfsVal stringByFoldingWithOptions:NSCaseInsensitiveSearch
- locale:[NSLocale currentLocale]];
+ NSString *sMapped = [(NSString *)cfsVal stringByFoldingWithOptions:NSCaseInsensitiveSearch
+ locale:[NSLocale currentLocale]];
- char *encoded = EncodedBytes((CFStringRef)sMapped, encoding);
+ char *encoded = EncodedBytes((CFStringRef)sMapped, encoding);
size_t lenMapped = strlen(encoded);
- if (lenMapped < sizeFolded) {
- memcpy(folded, encoded, lenMapped);
- } else {
- folded[0] = '\0';
- lenMapped = 1;
- }
- delete []encoded;
- CFRelease(cfsVal);
+ if (lenMapped < sizeFolded) {
+ memcpy(folded, encoded, lenMapped);
+ } else {
+ folded[0] = '\0';
+ lenMapped = 1;
+ }
+ delete []encoded;
+ CFRelease(cfsVal);
return lenMapped;
}
}
@@ -587,37 +587,37 @@ CaseFolder *ScintillaCocoa::CaseFolderForEncoding() {
if (pdoc->dbcsCodePage == SC_CP_UTF8) {
return new CaseFolderUnicode();
} else {
- CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
- vs.styles[STYLE_DEFAULT].characterSet);
- if (pdoc->dbcsCodePage == 0) {
- CaseFolderTable *pcf = new CaseFolderTable();
- pcf->StandardASCII();
- // Only for single byte encodings
- for (int i=0x80; i<0x100; i++) {
- char sCharacter[2] = "A";
- sCharacter[0] = static_cast<char>(i);
- CFStringRef cfsVal = CFStringCreateWithBytes(kCFAllocatorDefault,
- reinterpret_cast<const UInt8 *>(sCharacter),
- 1, encoding, false);
- if (!cfsVal)
- continue;
-
- NSString *sMapped = [(NSString *)cfsVal stringByFoldingWithOptions:NSCaseInsensitiveSearch
- locale:[NSLocale currentLocale]];
-
- char *encoded = EncodedBytes((CFStringRef)sMapped, encoding);
-
- if (strlen(encoded) == 1) {
- pcf->SetTranslation(sCharacter[0], encoded[0]);
- }
-
- delete []encoded;
- CFRelease(cfsVal);
- }
- return pcf;
- } else {
- return new CaseFolderDBCS(encoding);
- }
+ CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
+ vs.styles[STYLE_DEFAULT].characterSet);
+ if (pdoc->dbcsCodePage == 0) {
+ CaseFolderTable *pcf = new CaseFolderTable();
+ pcf->StandardASCII();
+ // Only for single byte encodings
+ for (int i=0x80; i<0x100; i++) {
+ char sCharacter[2] = "A";
+ sCharacter[0] = static_cast<char>(i);
+ CFStringRef cfsVal = CFStringCreateWithBytes(kCFAllocatorDefault,
+ reinterpret_cast<const UInt8 *>(sCharacter),
+ 1, encoding, false);
+ if (!cfsVal)
+ continue;
+
+ NSString *sMapped = [(NSString *)cfsVal stringByFoldingWithOptions:NSCaseInsensitiveSearch
+ locale:[NSLocale currentLocale]];
+
+ char *encoded = EncodedBytes((CFStringRef)sMapped, encoding);
+
+ if (strlen(encoded) == 1) {
+ pcf->SetTranslation(sCharacter[0], encoded[0]);
+ }
+
+ delete []encoded;
+ CFRelease(cfsVal);
+ }
+ return pcf;
+ } else {
+ return new CaseFolderDBCS(encoding);
+ }
}
}