IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reformat Objective C code to work around a KDevelop bug.

Browse Source 
KDevelop erroneously interprets [[ as the beginning of a C++17 attribute which
messes up all subsequent formatting. Changing this to '[ [' (with a space in between)
resolves the issue.
This commit is contained in:
Geert Janssens 2020-05-23 10:15:23 +02:00
parent 785f6702a1
commit 91473b1218
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnucash/gnucash-base.cpp
View File

@ -96,9 +96,9 @@ static void
mac_set_currency_locale(NSLocale *locale, NSString *locale_str) mac_set_currency_locale(NSLocale *locale, NSString *locale_str)
{ {
/* If the currency doesn't match the base locale, we need to find a locale that does match, because setlocale won't know what to do with just a currency identifier. */ /* If the currency doesn't match the base locale, we need to find a locale that does match, because setlocale won't know what to do with just a currency identifier. */
NSLocale *cur_locale = [[NSLocale alloc] initWithLocaleIdentifier: locale_str]; NSLocale *cur_locale = [ [NSLocale alloc] initWithLocaleIdentifier: locale_str];
if (![[locale objectForKey: NSLocaleCurrencyCode] isEqualToString: if (![ [locale objectForKey: NSLocaleCurrencyCode] isEqualToString:
[cur_locale objectForKey: NSLocaleCurrencyCode]]) [cur_locale objectForKey: NSLocaleCurrencyCode] ])
{ {
NSArray *all_locales = [NSLocale availableLocaleIdentifiers]; NSArray *all_locales = [NSLocale availableLocaleIdentifiers];
NSEnumerator *locale_iter = [all_locales objectEnumerator]; NSEnumerator *locale_iter = [all_locales objectEnumerator];
@ -107,9 +107,9 @@ mac_set_currency_locale(NSLocale *locale, NSString *locale_str)
NSString *money_locale = nil; NSString *money_locale = nil;
while ((this_locale = (NSString*)[locale_iter nextObject])) while ((this_locale = (NSString*)[locale_iter nextObject]))
{ {
NSLocale *templocale = [[NSLocale alloc] NSLocale *templocale = [ [NSLocale alloc]
initWithLocaleIdentifier: this_locale]; initWithLocaleIdentifier: this_locale];
if ([[templocale objectForKey: NSLocaleCurrencyCode] if ([ [templocale objectForKey: NSLocaleCurrencyCode]
isEqualToString: currency]) isEqualToString: currency])
{ {
money_locale = this_locale; money_locale = this_locale;
@ -137,7 +137,7 @@ mac_find_close_country(NSString *locale_str, NSString *country_str,
PWARN("Apple Locale is set to a value %s not supported" PWARN("Apple Locale is set to a value %s not supported"
" by the C runtime", [locale_str UTF8String]); " by the C runtime", [locale_str UTF8String]);
while ((this_locale = (NSString*)[locale_iter nextObject])) while ((this_locale = (NSString*)[locale_iter nextObject]))
if ([[[NSLocale componentsFromLocaleIdentifier: this_locale] if ([ [ [NSLocale componentsFromLocaleIdentifier: this_locale]
objectForKey: NSLocaleCountryCode] objectForKey: NSLocaleCountryCode]
isEqualToString: country_str] && isEqualToString: country_str] &&
setlocale (LC_ALL, [this_locale UTF8String])) setlocale (LC_ALL, [this_locale UTF8String]))
@ -147,7 +147,7 @@ mac_find_close_country(NSString *locale_str, NSString *country_str,
} }
if (!new_locale) if (!new_locale)
while ((this_locale = (NSString*)[locale_iter nextObject])) while ((this_locale = (NSString*)[locale_iter nextObject]))
if ([[[NSLocale componentsFromLocaleIdentifier: this_locale] if ([ [ [NSLocale componentsFromLocaleIdentifier: this_locale]
objectForKey: NSLocaleLanguageCode] objectForKey: NSLocaleLanguageCode]
isEqualToString: lang_str] && isEqualToString: lang_str] &&
setlocale (LC_ALL, [this_locale UTF8String])) setlocale (LC_ALL, [this_locale UTF8String]))
@ -179,8 +179,8 @@ mac_convert_complex_language(NSString* this_lang)
NSArray *elements = [this_lang componentsSeparatedByString: @"-"]; NSArray *elements = [this_lang componentsSeparatedByString: @"-"];
if ([elements count] == 1) if ([elements count] == 1)
return this_lang; return this_lang;
if ([[elements objectAtIndex: 0] isEqualToString: @"zh"]) { if ([ [elements objectAtIndex: 0] isEqualToString: @"zh"]) {
if ([[elements objectAtIndex: 1] isEqualToString: @"Hans"]) if ([ [elements objectAtIndex: 1] isEqualToString: @"Hans"])
this_lang = @"zh_CN"; this_lang = @"zh_CN";
else else
this_lang = @"zh_TW"; this_lang = @"zh_TW";
@ -202,7 +202,7 @@ mac_set_languages(NSArray* languages, NSString *lang_str)
NSRange not_found = {NSNotFound, 0}; NSRange not_found = {NSNotFound, 0};
while ((this_lang = [lang_iter nextObject])) { while ((this_lang = [lang_iter nextObject])) {
this_lang = [this_lang stringByTrimmingCharactersInSet: this_lang = [this_lang stringByTrimmingCharactersInSet:
[NSCharacterSet characterSetWithCharactersInString: @"\""]]; [NSCharacterSet characterSetWithCharactersInString: @"\""] ];
this_lang = mac_convert_complex_language(this_lang); this_lang = mac_convert_complex_language(this_lang);
new_languages = [new_languages arrayByAddingObject: this_lang]; new_languages = [new_languages arrayByAddingObject: this_lang];
/* If it's an English language, add the "C" locale after it so that /* If it's an English language, add the "C" locale after it so that
@ -213,7 +213,7 @@ mac_set_languages(NSArray* languages, NSString *lang_str)
NSArray *temp_array = [NSArray arrayWithObject: lang_str]; NSArray *temp_array = [NSArray arrayWithObject: lang_str];
new_languages = [temp_array arrayByAddingObjectsFromArray: new_languages]; new_languages = [temp_array arrayByAddingObjectsFromArray: new_languages];
} }
langs = [[new_languages componentsJoinedByString:@":"] UTF8String]; langs = [ [new_languages componentsJoinedByString:@":"] UTF8String];
} }
if (langs && strlen(langs) > 0) if (langs && strlen(langs) > 0)
{ {
@ -225,16 +225,16 @@ mac_set_languages(NSArray* languages, NSString *lang_str)
static void static void
set_mac_locale() set_mac_locale()
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [ [NSAutoreleasePool alloc] init];
NSUserDefaults *defs = [NSUserDefaults standardUserDefaults]; NSUserDefaults *defs = [NSUserDefaults standardUserDefaults];
NSLocale *locale = [NSLocale currentLocale]; NSLocale *locale = [NSLocale currentLocale];
NSString *lang_str, *country_str, *locale_str; NSString *lang_str, *country_str, *locale_str;
NSArray *languages = [[defs arrayForKey: @"AppleLanguages"] retain]; NSArray *languages = [ [defs arrayForKey: @"AppleLanguages"] retain];
@try @try
{ {
lang_str = [locale objectForKey: NSLocaleLanguageCode]; lang_str = [locale objectForKey: NSLocaleLanguageCode];
country_str = [locale objectForKey: NSLocaleCountryCode]; country_str = [locale objectForKey: NSLocaleCountryCode];
locale_str = [[lang_str stringByAppendingString: @"_"] locale_str = [ [lang_str stringByAppendingString: @"_"]
stringByAppendingString: country_str]; stringByAppendingString: country_str];
} }
@catch (NSException *err) @catch (NSException *err)
@ -242,7 +242,7 @@ set_mac_locale()
PWARN("Locale detection raised error %s: %s. " PWARN("Locale detection raised error %s: %s. "
"Check that your locale settings in " "Check that your locale settings in "
"System Preferences>Languages & Text are set correctly.", "System Preferences>Languages & Text are set correctly.",
[[err name] UTF8String], [[err reason] UTF8String]); [ [err name] UTF8String], [ [err reason] UTF8String]);
locale_str = @"_"; locale_str = @"_";
} }
/* If we didn't get a valid current locale, the string will be just "_" */ /* If we didn't get a valid current locale, the string will be just "_" */