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

Start cleanup of Catalog.{h,cpp}

Browse Source 
* unify pointer style (to type* )
* always use boolean expressions in if
* introduce some spacing for better readability
* make a couple inline methods non-inline
This commit is contained in:
Oliver Tappe
2012-04-14 17:24:20 +02:00
parent ec48d27ca3
commit 250eca3254
2 changed files with 156 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/locale/Catalog.h
+11 -63
View File
@@ -48,6 +48,8 @@ public:
status_t InitCheck() const;
int32 CountItems() const;
// TODO: drop this, as the lifetime of the returned object
// is indeterminate
BCatalogAddOn* CatalogAddOn();
protected:
@@ -137,13 +139,13 @@ private:
};
void MyClass::AddChoices(BMenu* menu) {
for (char **ch = choices; *ch; ch++) {
for (char** ch = choices; *ch != '\0'; ++ch) {
menu->AddItem(
new BMenuItem(
B_TRANSLATE(*ch),
new BMessage(...)
)
)
);
}
}
*/
@@ -344,12 +346,13 @@ protected:
// every catalog-add-on should export these symbols...
// ...the function that instantiates a catalog for this add-on-type...
extern "C"
BCatalogAddOn *instantiate_catalog(const char *signature,
const char *language, uint32 fingerprint);
BCatalogAddOn* instantiate_catalog(const char* signature, const char* language,
uint32 fingerprint);
// ...the function that creates an empty catalog for this add-on-type...
extern "C"
BCatalogAddOn *create_catalog(const char *signature,
const char *language);
BCatalogAddOn* create_catalog(const char* signature, const char* language);
// ...and the priority which will be used to order the catalog-add-ons:
extern uint8 gCatalogAddOnPriority;
@@ -357,42 +360,6 @@ extern uint8 gCatalogAddOnPriority;
/*
* BCatalog - inlines for trivial accessors:
*/
inline status_t
BCatalog::GetSignature(BString *sig)
{
if (!sig)
return B_BAD_VALUE;
if (!fCatalog)
return B_NO_INIT;
*sig = fCatalog->fSignature;
return B_OK;
}
inline status_t
BCatalog::GetLanguage(BString *lang)
{
if (!lang)
return B_BAD_VALUE;
if (!fCatalog)
return B_NO_INIT;
*lang = fCatalog->fLanguageName;
return B_OK;
}
inline status_t
BCatalog::GetFingerprint(uint32 *fp)
{
if (!fp)
return B_BAD_VALUE;
if (!fCatalog)
return B_NO_INIT;
*fp = fCatalog->fFingerprint;
return B_OK;
}
inline const char*
BCatalog::GetNoAutoCollectString(const char* string, const char* context,
const char* comment)
@@ -408,24 +375,6 @@ BCatalog::GetNoAutoCollectString(uint32 id)
}
inline status_t
BCatalog::InitCheck() const
{
return fCatalog
? fCatalog->InitCheck()
: B_NO_INIT;
}
inline int32
BCatalog::CountItems() const
{
if (!fCatalog)
return 0;
return fCatalog->CountItems();
}
inline BCatalogAddOn*
BCatalog::CatalogAddOn()
{
@@ -443,9 +392,8 @@ BCatalogAddOn::Next()
}
inline const char*
BCatalogAddOn::MarkForTranslation(const char *str,
const char * /*ctx __attribute__ ((unused))*/,
const char * /*cmt __attribute__ ((unused))*/)
BCatalogAddOn::MarkForTranslation(const char* str, const char* /* context */,
const char* /* comment */)
{
return str;
}
src/kits/locale/Catalog.cpp
+94 -18
View File
@@ -29,8 +29,8 @@ BCatalog::BCatalog()
BCatalog::BCatalog(const entry_ref& catalogOwner, const char* language,
uint32 fingerprint)
{
fCatalog = MutableLocaleRoster::Default()->LoadCatalog(catalogOwner, language,
fingerprint);
fCatalog = MutableLocaleRoster::Default()->LoadCatalog(catalogOwner,
language, fingerprint);
}
@@ -47,9 +47,10 @@ BCatalog::GetString(const char *string, const char *context,
const char* translated;
for (BCatalogAddOn* cat = fCatalog; cat != NULL; cat = cat->fNext) {
translated = cat->GetString(string, context, comment);
if (translated)
if (translated != NULL)
return translated;
}
return string;
}
@@ -60,9 +61,10 @@ BCatalog::GetString(uint32 id)
const char* translated;
for (BCatalogAddOn* cat = fCatalog; cat != NULL; cat = cat->fNext) {
translated = cat->GetString(id);
if (translated)
if (translated != NULL)
return translated;
}
return "";
}
@@ -70,14 +72,16 @@ BCatalog::GetString(uint32 id)
status_t
BCatalog::GetData(const char* name, BMessage* msg)
{
if (!fCatalog)
if (fCatalog == NULL)
return B_NO_INIT;
status_t res;
for (BCatalogAddOn* cat = fCatalog; cat != NULL; cat = cat->fNext) {
res = cat->GetData(name, msg);
if (res != B_NAME_NOT_FOUND && res != EOPNOTSUPP)
return res; // return B_OK if found, or specific error-code
}
return B_NAME_NOT_FOUND;
}
@@ -85,18 +89,65 @@ BCatalog::GetData(const char *name, BMessage *msg)
status_t
BCatalog::GetData(uint32 id, BMessage* msg)
{
if (!fCatalog)
if (fCatalog == NULL)
return B_NO_INIT;
status_t res;
for (BCatalogAddOn* cat = fCatalog; cat != NULL; cat = cat->fNext) {
res = cat->GetData(id, msg);
if (res != B_NAME_NOT_FOUND && res != EOPNOTSUPP)
return res; // return B_OK if found, or specific error-code
}
return B_NAME_NOT_FOUND;
}
status_t
BCatalog::GetSignature(BString* sig)
{
if (sig == NULL)
return B_BAD_VALUE;
if (fCatalog == NULL)
return B_NO_INIT;
*sig = fCatalog->fSignature;
return B_OK;
}
status_t
BCatalog::GetLanguage(BString* lang)
{
if (lang == NULL)
return B_BAD_VALUE;
if (fCatalog == NULL)
return B_NO_INIT;
*lang = fCatalog->fLanguageName;
return B_OK;
}
status_t
BCatalog::GetFingerprint(uint32* fp)
{
if (fp == NULL)
return B_BAD_VALUE;
if (fCatalog == NULL)
return B_NO_INIT;
*fp = fCatalog->fFingerprint;
return B_OK;
}
status_t
BCatalog::SetCatalog(const entry_ref& catalogOwner, uint32 fingerprint)
{
@@ -110,6 +161,20 @@ BCatalog::SetCatalog(const entry_ref &catalogOwner, uint32 fingerprint)
}
status_t
BCatalog::InitCheck() const
{
return fCatalog != NULL ? fCatalog->InitCheck() : B_NO_INIT;
}
int32
BCatalog::CountItems() const
{
return fCatalog != NULL ? fCatalog->CountItems() : 0;
}
//#pragma mark - BCatalogAddOn
BCatalogAddOn::BCatalogAddOn(const char* signature, const char* language,
uint32 fingerprint)
@@ -283,8 +348,9 @@ status_t
EditableCatalog::SetString(const char* string, const char* translated,
const char* context, const char* comment)
{
if (!fCatalog)
if (fCatalog == NULL)
return B_NO_INIT;
return fCatalog->SetString(string, translated, context, comment);
}
@@ -292,8 +358,9 @@ EditableCatalog::SetString(const char *string, const char *translated,
status_t
EditableCatalog::SetString(int32 id, const char* translated)
{
if (!fCatalog)
if (fCatalog == NULL)
return B_NO_INIT;
return fCatalog->SetString(id, translated);
}
@@ -301,8 +368,9 @@ EditableCatalog::SetString(int32 id, const char *translated)
bool
EditableCatalog::CanWriteData() const
{
if (!fCatalog)
if (fCatalog == NULL)
return false;
return fCatalog->CanWriteData();
}
@@ -310,8 +378,9 @@ EditableCatalog::CanWriteData() const
status_t
EditableCatalog::SetData(const char* name, BMessage* msg)
{
if (!fCatalog)
if (fCatalog == NULL)
return B_NO_INIT;
return fCatalog->SetData(name, msg);
}
@@ -319,8 +388,9 @@ EditableCatalog::SetData(const char *name, BMessage *msg)
status_t
EditableCatalog::SetData(uint32 id, BMessage* msg)
{
if (!fCatalog)
if (fCatalog == NULL)
return B_NO_INIT;
return fCatalog->SetData(id, msg);
}
@@ -328,8 +398,9 @@ EditableCatalog::SetData(uint32 id, BMessage *msg)
status_t
EditableCatalog::ReadFromFile(const char* path)
{
if (!fCatalog)
if (fCatalog == NULL)
return B_NO_INIT;
return fCatalog->ReadFromFile(path);
}
@@ -337,8 +408,9 @@ EditableCatalog::ReadFromFile(const char *path)
status_t
EditableCatalog::ReadFromAttribute(const entry_ref& appOrAddOnRef)
{
if (!fCatalog)
if (fCatalog == NULL)
return B_NO_INIT;
return fCatalog->ReadFromAttribute(appOrAddOnRef);
}
@@ -346,8 +418,9 @@ EditableCatalog::ReadFromAttribute(const entry_ref &appOrAddOnRef)
status_t
EditableCatalog::ReadFromResource(const entry_ref& appOrAddOnRef)
{
if (!fCatalog)
if (fCatalog == NULL)
return B_NO_INIT;
return fCatalog->ReadFromResource(appOrAddOnRef);
}
@@ -355,8 +428,9 @@ EditableCatalog::ReadFromResource(const entry_ref &appOrAddOnRef)
status_t
EditableCatalog::WriteToFile(const char* path)
{
if (!fCatalog)
if (fCatalog == NULL)
return B_NO_INIT;
return fCatalog->WriteToFile(path);
}
@@ -364,8 +438,9 @@ EditableCatalog::WriteToFile(const char *path)
status_t
EditableCatalog::WriteToAttribute(const entry_ref& appOrAddOnRef)
{
if (!fCatalog)
if (fCatalog == NULL)
return B_NO_INIT;
return fCatalog->WriteToAttribute(appOrAddOnRef);
}
@@ -373,15 +448,16 @@ EditableCatalog::WriteToAttribute(const entry_ref &appOrAddOnRef)
status_t
EditableCatalog::WriteToResource(const entry_ref& appOrAddOnRef)
{
if (!fCatalog)
if (fCatalog == NULL)
return B_NO_INIT;
return fCatalog->WriteToResource(appOrAddOnRef);
}
void EditableCatalog::MakeEmpty()
{
if (fCatalog)
if (fCatalog == NULL)
fCatalog->MakeEmpty();
}