From 34a79bff8ad710b8e8024b0006a77ec8a9f45b16 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 4 Aug 2010 21:34:12 +0000 Subject: [PATCH] * renamed BPrivate::mutable_locale_roster to BPrivate::gMutableLocaleRoster, to follow coding guidelines git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37908 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/locale/MutableLocaleRoster.h | 2 +- src/apps/readonlybootprompt/BootPromptWindow.cpp | 8 ++++---- src/kits/locale/Catalog.cpp | 12 ++++++------ src/kits/locale/LibbeLocaleBackend.cpp | 2 +- src/kits/locale/MutableLocaleRoster.cpp | 2 +- src/preferences/locale/FormatSettingsView.cpp | 4 ++-- src/preferences/locale/LocaleSettings.cpp | 8 ++++---- src/preferences/time/ZoneView.cpp | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/headers/private/locale/MutableLocaleRoster.h b/headers/private/locale/MutableLocaleRoster.h index ab10214e06..0d5e535d81 100644 --- a/headers/private/locale/MutableLocaleRoster.h +++ b/headers/private/locale/MutableLocaleRoster.h @@ -56,7 +56,7 @@ public: }; -extern MutableLocaleRoster* mutable_locale_roster; +extern MutableLocaleRoster* gMutableLocaleRoster; typedef BCatalogAddOn* (*InstantiateCatalogFunc)(const char* name, diff --git a/src/apps/readonlybootprompt/BootPromptWindow.cpp b/src/apps/readonlybootprompt/BootPromptWindow.cpp index baa5d801b6..74c6ae3c6c 100644 --- a/src/apps/readonlybootprompt/BootPromptWindow.cpp +++ b/src/apps/readonlybootprompt/BootPromptWindow.cpp @@ -32,7 +32,7 @@ #include "KeymapListItem.h" -using BPrivate::mutable_locale_roster; +using BPrivate::gMutableLocaleRoster; enum { @@ -159,7 +159,7 @@ BootPromptWindow::MessageReceived(BMessage* message) BMessage preferredLanguages; preferredLanguages.AddString("language", languageItem->Language()); - mutable_locale_roster->SetPreferredLanguages( + gMutableLocaleRoster->SetPreferredLanguages( &preferredLanguages); _InitCatalog(true); } @@ -198,10 +198,10 @@ BootPromptWindow::_InitCatalog(bool saveSettings) settings.AddString("language", language.String()); } - mutable_locale_roster->SetPreferredLanguages(&settings); + gMutableLocaleRoster->SetPreferredLanguages(&settings); BCountry country(language.String(), language.ToUpper()); - mutable_locale_roster->SetDefaultCountry(country); + gMutableLocaleRoster->SetDefaultCountry(country); } diff --git a/src/kits/locale/Catalog.cpp b/src/kits/locale/Catalog.cpp index 17ff900d18..50919c0531 100644 --- a/src/kits/locale/Catalog.cpp +++ b/src/kits/locale/Catalog.cpp @@ -15,7 +15,7 @@ #include -using BPrivate::mutable_locale_roster; +using BPrivate::gMutableLocaleRoster; //#pragma mark - BCatalog @@ -30,13 +30,13 @@ BCatalog::BCatalog(const char *signature, const char *language, uint32 fingerprint) { fCatalog - = mutable_locale_roster->LoadCatalog(signature, language, fingerprint); + = gMutableLocaleRoster->LoadCatalog(signature, language, fingerprint); } BCatalog::~BCatalog() { - mutable_locale_roster->UnloadCatalog(fCatalog); + gMutableLocaleRoster->UnloadCatalog(fCatalog); } @@ -102,8 +102,8 @@ BCatalog::SetCatalog(const char* signature, uint32 fingerprint) { // This is not thread safe. It is used only in ReadOnlyBootPrompt and should // not do harm there, but not sure what to do about it… - mutable_locale_roster->UnloadCatalog(fCatalog); - fCatalog = mutable_locale_roster->LoadCatalog(signature, NULL, fingerprint); + gMutableLocaleRoster->UnloadCatalog(fCatalog); + fCatalog = gMutableLocaleRoster->LoadCatalog(signature, NULL, fingerprint); return B_OK; } @@ -268,7 +268,7 @@ namespace BPrivate { EditableCatalog::EditableCatalog(const char *type, const char *signature, const char *language) { - fCatalog = mutable_locale_roster->CreateCatalog(type, signature, language); + fCatalog = gMutableLocaleRoster->CreateCatalog(type, signature, language); } diff --git a/src/kits/locale/LibbeLocaleBackend.cpp b/src/kits/locale/LibbeLocaleBackend.cpp index 65c62281b2..46efd360d0 100644 --- a/src/kits/locale/LibbeLocaleBackend.cpp +++ b/src/kits/locale/LibbeLocaleBackend.cpp @@ -25,7 +25,7 @@ CreateLocaleBackendInstance() LibbeLocaleBackend::LibbeLocaleBackend() { - mutable_locale_roster->GetSystemCatalog(&systemCatalog); + gMutableLocaleRoster->GetSystemCatalog(&systemCatalog); } diff --git a/src/kits/locale/MutableLocaleRoster.cpp b/src/kits/locale/MutableLocaleRoster.cpp index 598b7f1549..eda3440136 100644 --- a/src/kits/locale/MutableLocaleRoster.cpp +++ b/src/kits/locale/MutableLocaleRoster.cpp @@ -661,7 +661,7 @@ RosterData::_AddPreferredLanguagesToMessage(BMessage* message) const static MutableLocaleRoster gLocaleRoster; -MutableLocaleRoster* mutable_locale_roster = &gLocaleRoster; +MutableLocaleRoster* gMutableLocaleRoster = &gLocaleRoster; MutableLocaleRoster::MutableLocaleRoster() diff --git a/src/preferences/locale/FormatSettingsView.cpp b/src/preferences/locale/FormatSettingsView.cpp index 5bcfebb903..dd92d4864d 100644 --- a/src/preferences/locale/FormatSettingsView.cpp +++ b/src/preferences/locale/FormatSettingsView.cpp @@ -36,7 +36,7 @@ #include -using BPrivate::mutable_locale_roster; +using BPrivate::gMutableLocaleRoster; #undef B_TRANSLATE_CONTEXT @@ -360,7 +360,7 @@ FormatView::FormatView(const BLocale& locale) FormatView::~FormatView() { - mutable_locale_roster->SetDefaultLocale(fLocale); + gMutableLocaleRoster->SetDefaultLocale(fLocale); } diff --git a/src/preferences/locale/LocaleSettings.cpp b/src/preferences/locale/LocaleSettings.cpp index 7d978835ab..c2d77fb13b 100644 --- a/src/preferences/locale/LocaleSettings.cpp +++ b/src/preferences/locale/LocaleSettings.cpp @@ -14,7 +14,7 @@ #include -using BPrivate::mutable_locale_roster; +using BPrivate::gMutableLocaleRoster; static const uint32 kMsgLocaleSettings = 'LCst'; @@ -75,11 +75,11 @@ LocaleSettings::UpdateFrom(BMessage* message) break; fMessage.AddString("language", messageContent); } - mutable_locale_roster->SetPreferredLanguages(message); + gMutableLocaleRoster->SetPreferredLanguages(message); } BLocale defaultLocale; - mutable_locale_roster->GetDefaultLocale(&defaultLocale); + gMutableLocaleRoster->GetDefaultLocale(&defaultLocale); bool countryChanged = false; if (message->FindString("country", &messageContent) == B_OK) { @@ -105,5 +105,5 @@ LocaleSettings::UpdateFrom(BMessage* message) } if (countryChanged) - mutable_locale_roster->SetDefaultLocale(defaultLocale); + gMutableLocaleRoster->SetDefaultLocale(defaultLocale); } diff --git a/src/preferences/time/ZoneView.cpp b/src/preferences/time/ZoneView.cpp index 6baa791224..1dad92aa59 100644 --- a/src/preferences/time/ZoneView.cpp +++ b/src/preferences/time/ZoneView.cpp @@ -46,7 +46,7 @@ #include "TimeWindow.h" -using BPrivate::mutable_locale_roster; +using BPrivate::gMutableLocaleRoster; using BPrivate::ObjectDeleter; @@ -355,7 +355,7 @@ TimeZoneView::_SetSystemTimeZone() fCurrentZoneItem = (TimeZoneListItem*)(fZoneList->ItemAt(selection)); const BTimeZone& timeZone = fCurrentZoneItem->TimeZone(); - mutable_locale_roster->SetDefaultTimeZone(timeZone); + gMutableLocaleRoster->SetDefaultTimeZone(timeZone); _kern_set_timezone(timeZone.OffsetFromGMT());