[haiku-commits] r37908 - in haiku/trunk: headers/private/locale src/apps/readonlybootprompt src/kits/locale src/preferences/locale src/preferences/time
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 4 Aug 2010 23:34:12 +0200 (CEST)
Author: zooey
Date: 2010-08-04 23:34:12 +0200 (Wed, 04 Aug 2010)
New Revision: 37908
Changeset: http://dev.haiku-os.org/changeset/37908
Modified:
haiku/trunk/headers/private/locale/MutableLocaleRoster.h
haiku/trunk/src/apps/readonlybootprompt/BootPromptWindow.cpp
haiku/trunk/src/kits/locale/Catalog.cpp
haiku/trunk/src/kits/locale/LibbeLocaleBackend.cpp
haiku/trunk/src/kits/locale/MutableLocaleRoster.cpp
haiku/trunk/src/preferences/locale/FormatSettingsView.cpp
haiku/trunk/src/preferences/locale/LocaleSettings.cpp
haiku/trunk/src/preferences/time/ZoneView.cpp
Log:
* renamed BPrivate::mutable_locale_roster to BPrivate::gMutableLocaleRoster,
to follow coding guidelines
Modified: haiku/trunk/headers/private/locale/MutableLocaleRoster.h
===================================================================
--- haiku/trunk/headers/private/locale/MutableLocaleRoster.h 2010-08-04
18:45:06 UTC (rev 37907)
+++ haiku/trunk/headers/private/locale/MutableLocaleRoster.h 2010-08-04
21:34:12 UTC (rev 37908)
@@ -56,7 +56,7 @@
};
-extern MutableLocaleRoster* mutable_locale_roster;
+extern MutableLocaleRoster* gMutableLocaleRoster;
typedef BCatalogAddOn* (*InstantiateCatalogFunc)(const char* name,
Modified: haiku/trunk/src/apps/readonlybootprompt/BootPromptWindow.cpp
===================================================================
--- haiku/trunk/src/apps/readonlybootprompt/BootPromptWindow.cpp
2010-08-04 18:45:06 UTC (rev 37907)
+++ haiku/trunk/src/apps/readonlybootprompt/BootPromptWindow.cpp
2010-08-04 21:34:12 UTC (rev 37908)
@@ -32,7 +32,7 @@
#include "KeymapListItem.h"
-using BPrivate::mutable_locale_roster;
+using BPrivate::gMutableLocaleRoster;
enum {
@@ -159,7 +159,7 @@
BMessage preferredLanguages;
preferredLanguages.AddString("language",
languageItem->Language());
- mutable_locale_roster->SetPreferredLanguages(
+ gMutableLocaleRoster->SetPreferredLanguages(
&preferredLanguages);
_InitCatalog(true);
}
@@ -198,10 +198,10 @@
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);
}
Modified: haiku/trunk/src/kits/locale/Catalog.cpp
===================================================================
--- haiku/trunk/src/kits/locale/Catalog.cpp 2010-08-04 18:45:06 UTC (rev
37907)
+++ haiku/trunk/src/kits/locale/Catalog.cpp 2010-08-04 21:34:12 UTC (rev
37908)
@@ -15,7 +15,7 @@
#include <Roster.h>
-using BPrivate::mutable_locale_roster;
+using BPrivate::gMutableLocaleRoster;
//#pragma mark - BCatalog
@@ -30,13 +30,13 @@
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 @@
{
// 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 @@
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);
}
Modified: haiku/trunk/src/kits/locale/LibbeLocaleBackend.cpp
===================================================================
--- haiku/trunk/src/kits/locale/LibbeLocaleBackend.cpp 2010-08-04 18:45:06 UTC
(rev 37907)
+++ haiku/trunk/src/kits/locale/LibbeLocaleBackend.cpp 2010-08-04 21:34:12 UTC
(rev 37908)
@@ -25,7 +25,7 @@
LibbeLocaleBackend::LibbeLocaleBackend()
{
- mutable_locale_roster->GetSystemCatalog(&systemCatalog);
+ gMutableLocaleRoster->GetSystemCatalog(&systemCatalog);
}
Modified: haiku/trunk/src/kits/locale/MutableLocaleRoster.cpp
===================================================================
--- haiku/trunk/src/kits/locale/MutableLocaleRoster.cpp 2010-08-04 18:45:06 UTC
(rev 37907)
+++ haiku/trunk/src/kits/locale/MutableLocaleRoster.cpp 2010-08-04 21:34:12 UTC
(rev 37908)
@@ -661,7 +661,7 @@
static MutableLocaleRoster gLocaleRoster;
-MutableLocaleRoster* mutable_locale_roster = &gLocaleRoster;
+MutableLocaleRoster* gMutableLocaleRoster = &gLocaleRoster;
MutableLocaleRoster::MutableLocaleRoster()
Modified: haiku/trunk/src/preferences/locale/FormatSettingsView.cpp
===================================================================
--- haiku/trunk/src/preferences/locale/FormatSettingsView.cpp 2010-08-04
18:45:06 UTC (rev 37907)
+++ haiku/trunk/src/preferences/locale/FormatSettingsView.cpp 2010-08-04
21:34:12 UTC (rev 37908)
@@ -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()
{
- mutable_locale_roster->SetDefaultLocale(fLocale);
+ gMutableLocaleRoster->SetDefaultLocale(fLocale);
}
Modified: haiku/trunk/src/preferences/locale/LocaleSettings.cpp
===================================================================
--- haiku/trunk/src/preferences/locale/LocaleSettings.cpp 2010-08-04
18:45:06 UTC (rev 37907)
+++ haiku/trunk/src/preferences/locale/LocaleSettings.cpp 2010-08-04
21:34:12 UTC (rev 37908)
@@ -14,7 +14,7 @@
#include <SupportDefs.h>
-using BPrivate::mutable_locale_roster;
+using BPrivate::gMutableLocaleRoster;
static const uint32 kMsgLocaleSettings = 'LCst';
@@ -75,11 +75,11 @@
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 @@
}
if (countryChanged)
- mutable_locale_roster->SetDefaultLocale(defaultLocale);
+ gMutableLocaleRoster->SetDefaultLocale(defaultLocale);
}
Modified: haiku/trunk/src/preferences/time/ZoneView.cpp
===================================================================
--- haiku/trunk/src/preferences/time/ZoneView.cpp 2010-08-04 18:45:06 UTC
(rev 37907)
+++ haiku/trunk/src/preferences/time/ZoneView.cpp 2010-08-04 21:34:12 UTC
(rev 37908)
@@ -46,7 +46,7 @@
#include "TimeWindow.h"
-using BPrivate::mutable_locale_roster;
+using BPrivate::gMutableLocaleRoster;
using BPrivate::ObjectDeleter;
@@ -355,7 +355,7 @@
fCurrentZoneItem = (TimeZoneListItem*)(fZoneList->ItemAt(selection));
const BTimeZone& timeZone = fCurrentZoneItem->TimeZone();
- mutable_locale_roster->SetDefaultTimeZone(timeZone);
+ gMutableLocaleRoster->SetDefaultTimeZone(timeZone);
_kern_set_timezone(timeZone.OffsetFromGMT());
Other related posts:
- » [haiku-commits] r37908 - in haiku/trunk: headers/private/locale src/apps/readonlybootprompt src/kits/locale src/preferences/locale src/preferences/time - zooey
