i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed useless static qualifier on some variables that made them behave weird.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35215 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adrien Destugues
2010-01-21 12:04:02 +00:00
parent 005a5d0bfe
commit a292eb4af2
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/locale/LocaleRoster.cpp
+2 -4
View File
@@ -513,9 +513,7 @@ BLocaleRoster::GetInstalledLanguages(BMessage *languages) const
#undef REALLY_ALL_LANGUAGES #undef REALLY_ALL_LANGUAGES
#ifdef REALLY_ALL_LANGUAGES #ifdef REALLY_ALL_LANGUAGES
// TODO: Using static variables here looks really weird, and is probably const char* const* icuLocaleList = Locale::getISOLanguages();
// the reason why calling this method a second time will crash.
static const char* const* icuLocaleList = Locale::getISOLanguages();
// Loop over the strings and add them to an std::set to remove duplicates // Loop over the strings and add them to an std::set to remove duplicates
for (i = 0; icuLocaleList[i]; i++) { for (i = 0; icuLocaleList[i]; i++) {
@@ -523,7 +521,7 @@ BLocaleRoster::GetInstalledLanguages(BMessage *languages) const
} }
#else #else
int32_t localeCount; int32_t localeCount;
static const Locale* icuLocaleList const Locale* icuLocaleList
= Locale::getAvailableLocales(localeCount); = Locale::getAvailableLocales(localeCount);
// Loop over the strings and add them to an std::set to remove duplicates // Loop over the strings and add them to an std::set to remove duplicates