* 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

@@ -56,7 +56,7 @@ public:
 };
 
 
-extern MutableLocaleRoster* mutable_locale_roster;
+extern MutableLocaleRoster* gMutableLocaleRoster;
 
 
 typedef BCatalogAddOn* (*InstantiateCatalogFunc)(const char* name,

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);
 }
 
 

src/kits/locale/Catalog.cpp

@@ -15,7 +15,7 @@
 #include <Roster.h>
 
 
-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);
+	gMutableLocaleRoster->UnloadCatalog(fCatalog);
-	fCatalog = mutable_locale_roster->LoadCatalog(signature, NULL, fingerprint);
+	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);
 }
 
 

src/kits/locale/LibbeLocaleBackend.cpp

@@ -25,7 +25,7 @@ CreateLocaleBackendInstance()
 
 LibbeLocaleBackend::LibbeLocaleBackend()
 {
-	mutable_locale_roster->GetSystemCatalog(&systemCatalog);
+	gMutableLocaleRoster->GetSystemCatalog(&systemCatalog);
 }
 
 

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()

src/preferences/locale/FormatSettingsView.cpp

@@ -36,7 +36,7 @@
 
 #include <stdio.h>
 
-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);
 }
 
 

src/preferences/locale/LocaleSettings.cpp

@@ -14,7 +14,7 @@
 #include <SupportDefs.h>
 
 
-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);
 }

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());