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

Renamed some members to fit our guidelines

Browse Source 
(and to make the code more readable)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38249 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2010-08-18 19:57:53 +00:00
parent 8f88fe1d98
commit d3485a2648
2 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/mail/MailSettings.h
+12 -12
View File
@@ -43,8 +43,7 @@ BMailChain* GetMailChain(uint32 id);
status_t GetOutboundMailChains(BList *list); status_t GetOutboundMailChains(BList *list);
status_t GetInboundMailChains(BList *list); status_t GetInboundMailChains(BList *list);
class BMailChain : public BArchivable class BMailChain : public BArchivable {
{
public: public:
BMailChain(uint32 id); BMailChain(uint32 id);
BMailChain(BMessage*); BMailChain(BMessage*);
@@ -86,23 +85,24 @@ class BMailChain : public BArchivable
status_t Path(BPath *path) const; status_t Path(BPath *path) const;
status_t Load(BMessage*); status_t Load(BMessage*);
int32 id; int32 fId;
char name[B_FILE_NAME_LENGTH]; char fName[B_FILE_NAME_LENGTH];
BMessage *meta_data; BMessage *fMetaData;
status_t _err; status_t fStatus;
b_mail_chain_direction direction; b_mail_chain_direction fDirection;
int32 settings_ct, addons_ct; int32 fSettingsCount;
BList filter_settings; int32 fAddonsCount;
BList filter_addons; BList fFilterSettings;
BList fFilterAddons;
uint32 _reserved[5]; uint32 _reserved[5];
}; };
class BMailSettings
{ class BMailSettings {
public: public:
BMailSettings(); BMailSettings();
~BMailSettings(); ~BMailSettings();
src/kits/mail/MailChain.cpp
+77 -77
View File
@@ -29,64 +29,64 @@ namespace MailInternal {
BMailChain::BMailChain(uint32 i) BMailChain::BMailChain(uint32 i)
: :
id(i), fId(i),
meta_data(NULL), fMetaData(NULL),
_err(B_OK), fStatus(B_OK),
direction(inbound), fDirection(inbound),
settings_ct(0), fSettingsCount(0),
addons_ct(0) fAddonsCount(0)
{ {
name[0] = 0; fName[0] = 0;
Reload(); Reload();
} }
BMailChain::BMailChain(BMessage* settings) BMailChain::BMailChain(BMessage* settings)
: :
id(settings->FindInt32("id")), fId(settings->FindInt32("id")),
meta_data(NULL), fMetaData(NULL),
_err(B_OK), fStatus(B_OK),
direction(inbound), fDirection(inbound),
settings_ct(0), fSettingsCount(0),
addons_ct(0) fAddonsCount(0)
{ {
name[0] = 0; fName[0] = 0;
Load(settings); Load(settings);
} }
BMailChain::~BMailChain() BMailChain::~BMailChain()
{ {
delete meta_data; delete fMetaData;
for (int32 i = 0; filter_settings.ItemAt(i); i++) for (int32 i = 0; fFilterSettings.ItemAt(i); i++)
delete (BMessage*)filter_settings.ItemAt(i); delete (BMessage*)fFilterSettings.ItemAt(i);
for (int32 i = 0; filter_addons.ItemAt(i); i++) for (int32 i = 0; fFilterAddons.ItemAt(i); i++)
delete (entry_ref*)filter_addons.ItemAt(i); delete (entry_ref*)fFilterAddons.ItemAt(i);
} }
status_t status_t
BMailChain::Load(BMessage* settings) BMailChain::Load(BMessage* settings)
{ {
delete meta_data; delete fMetaData;
meta_data = new BMessage; fMetaData = new BMessage;
if (settings->HasMessage("meta_data")) if (settings->HasMessage("meta_data"))
settings->FindMessage("meta_data", meta_data); settings->FindMessage("meta_data", fMetaData);
const char* n; const char* n;
status_t ret = settings->FindString("name", &n); status_t ret = settings->FindString("name", &n);
if (ret == B_OK) if (ret == B_OK)
strncpy(name, n, sizeof(name)); strncpy(fName, n, sizeof(fName));
else else
name[0] = '\0'; fName[0] = '\0';
type_code t; type_code t;
settings->GetInfo("filter_settings", &t, (int32*)(&settings_ct)); settings->GetInfo("filter_settings", &t, (int32*)(&fSettingsCount));
settings->GetInfo("filter_addons", &t, (int32*)(&addons_ct)); settings->GetInfo("filter_addons", &t, (int32*)(&fAddonsCount));
if (settings_ct != addons_ct) if (fSettingsCount != fAddonsCount)
return B_MISMATCHED_VALUES; return B_MISMATCHED_VALUES;
for (int i = 0;;i++) { for (int i = 0;;i++) {
@@ -103,14 +103,14 @@ BMailChain::Load(BMessage* settings)
break; break;
} }
if (!filter_settings.AddItem(filter)) { if (!fFilterSettings.AddItem(filter)) {
delete filter; delete filter;
delete ref; delete ref;
return B_NO_MEMORY; return B_NO_MEMORY;
} }
if (!filter_addons.AddItem(ref)) { if (!fFilterAddons.AddItem(ref)) {
filter_settings.RemoveItem(filter); fFilterSettings.RemoveItem(filter);
delete filter; delete filter;
delete ref; delete ref;
return B_NO_MEMORY; return B_NO_MEMORY;
@@ -124,13 +124,13 @@ BMailChain::Load(BMessage* settings)
status_t status_t
BMailChain::InitCheck() const BMailChain::InitCheck() const
{ {
if (settings_ct != addons_ct) if (fSettingsCount != fAddonsCount)
return B_MISMATCHED_VALUES; return B_MISMATCHED_VALUES;
if (filter_settings.CountItems() != settings_ct if (fFilterSettings.CountItems() != fSettingsCount
|| filter_addons.CountItems() != addons_ct) || fFilterAddons.CountItems() != fAddonsCount)
return B_NO_MEMORY; return B_NO_MEMORY;
if (_err < B_OK) if (fStatus < B_OK)
return _err; return fStatus;
return B_OK; return B_OK;
} }
@@ -152,15 +152,15 @@ BMailChain::Archive(BMessage* archive, bool deep) const
if (ret != B_OK) if (ret != B_OK)
return ret; return ret;
ret = archive->AddInt32("id", id); ret = archive->AddInt32("id", fId);
if (ret != B_OK) if (ret != B_OK)
return ret; return ret;
ret = archive->AddString("name", name); ret = archive->AddString("name", fName);
if (ret != B_OK) if (ret != B_OK)
return ret; return ret;
ret = archive->AddMessage("meta_data", meta_data); ret = archive->AddMessage("meta_data", fMetaData);
if (ret != B_OK) if (ret != B_OK)
return ret; return ret;
@@ -169,8 +169,8 @@ BMailChain::Archive(BMessage* archive, bool deep) const
entry_ref* ref; entry_ref* ref;
int32 i; int32 i;
for (i = 0;((settings = (BMessage*)filter_settings.ItemAt(i)) != NULL) for (i = 0;((settings = (BMessage*)fFilterSettings.ItemAt(i)) != NULL)
&& ((ref = (entry_ref*)filter_addons.ItemAt(i)) != NULL); && ((ref = (entry_ref*)fFilterAddons.ItemAt(i)) != NULL);
++i) { ++i) {
ret = archive->AddMessage("filter_settings", settings); ret = archive->AddMessage("filter_settings", settings);
if (ret < B_OK) if (ret < B_OK)
@@ -183,7 +183,7 @@ BMailChain::Archive(BMessage* archive, bool deep) const
if (ret < B_OK) if (ret < B_OK)
return ret; return ret;
} }
if (i != settings_ct) if (i != fSettingsCount)
return B_MISMATCHED_VALUES; return B_MISMATCHED_VALUES;
} }
@@ -217,7 +217,7 @@ BMailChain::Path(BPath* path) const
path->Append("inbound"); path->Append("inbound");
BString leaf; BString leaf;
leaf << id; leaf << fId;
path->Append(leaf.String()); path->Append(leaf.String());
return B_OK; return B_OK;
@@ -233,7 +233,7 @@ BMailChain::Save(bigtime_t /*timeout*/)
ret = Archive(&archive,true); ret = Archive(&archive,true);
if (ret != B_OK) { if (ret != B_OK) {
fprintf(stderr, "Couldn't archive chain %ld: %s\n", fprintf(stderr, "Couldn't archive chain %ld: %s\n",
id, strerror(ret)); fId, strerror(ret));
return ret; return ret;
} }
@@ -268,14 +268,14 @@ BMailChain::Delete() const
b_mail_chain_direction b_mail_chain_direction
BMailChain::ChainDirection() const BMailChain::ChainDirection() const
{ {
return direction; return fDirection;
} }
void void
BMailChain::SetChainDirection(b_mail_chain_direction dir) BMailChain::SetChainDirection(b_mail_chain_direction dir)
{ {
direction = dir; fDirection = dir;
} }
@@ -287,7 +287,7 @@ BMailChain::Reload()
if (ret != B_OK) { if (ret != B_OK) {
fprintf(stderr, "Couldn't find user settings directory: %s\n", fprintf(stderr, "Couldn't find user settings directory: %s\n",
strerror(ret)); strerror(ret));
_err = ret; fStatus = ret;
return ret; return ret;
} }
@@ -297,20 +297,20 @@ BMailChain::Reload()
BPath working = path; BPath working = path;
working.Append("inbound"); working.Append("inbound");
BString leaf; BString leaf;
leaf << id; leaf << fId;
//puts(path.Path()); //puts(path.Path());
//puts(leaf.String()); //puts(leaf.String());
if (BDirectory(working.Path()).Contains(leaf.String())) { if (BDirectory(working.Path()).Contains(leaf.String())) {
path = working; path = working;
direction = inbound; fDirection = inbound;
} else { } else {
working = path; working = path;
working.Append("outbound"); working.Append("outbound");
if (BDirectory(working.Path()).Contains(leaf.String())) { if (BDirectory(working.Path()).Contains(leaf.String())) {
path = working; path = working;
direction = outbound; fDirection = outbound;
} }
} }
@@ -330,7 +330,7 @@ BMailChain::Reload()
fprintf(stderr, "Couldn't open chain settings file '%s': %s\n", fprintf(stderr, "Couldn't open chain settings file '%s': %s\n",
path.Path(), strerror(ret)); path.Path(), strerror(ret));
Load(&empty); Load(&empty);
_err = B_FILE_ERROR; fStatus = B_FILE_ERROR;
return ret; return ret;
} }
@@ -341,12 +341,12 @@ BMailChain::Reload()
fprintf(stderr, "Couldn't read settings from '%s': %s\n", fprintf(stderr, "Couldn't read settings from '%s': %s\n",
path.Path(), strerror(ret)); path.Path(), strerror(ret));
Load(&tmp); Load(&tmp);
_err = ret; fStatus = ret;
return ret; return ret;
} }
// clobber old settings // clobber old settings
_err = ret = Load(&tmp); fStatus = ret = Load(&tmp);
return ret; return ret;
} }
@@ -354,14 +354,14 @@ BMailChain::Reload()
uint32 uint32
BMailChain::ID() const BMailChain::ID() const
{ {
return id; return fId;
} }
const char* const char*
BMailChain::Name() const BMailChain::Name() const
{ {
return name; return fName;
} }
@@ -369,9 +369,9 @@ status_t
BMailChain::SetName(const char* n) BMailChain::SetName(const char* n)
{ {
if (n) if (n)
strncpy(name, n, sizeof(name)); strncpy(fName, n, sizeof(fName));
else else
name[0] = '\0'; fName[0] = '\0';
return B_OK; return B_OK;
} }
@@ -380,14 +380,14 @@ BMailChain::SetName(const char* n)
BMessage* BMessage*
BMailChain::MetaData() const BMailChain::MetaData() const
{ {
return meta_data; return fMetaData;
} }
int32 int32
BMailChain::CountFilters() const BMailChain::CountFilters() const
{ {
return filter_settings.CountItems(); return fFilterSettings.CountItems();
} }
@@ -395,17 +395,17 @@ status_t
BMailChain::GetFilter(int32 index, BMessage* out_settings, BMailChain::GetFilter(int32 index, BMessage* out_settings,
entry_ref* addon) const entry_ref* addon) const
{ {
if (index >= filter_settings.CountItems()) if (index >= fFilterSettings.CountItems())
return B_BAD_INDEX; return B_BAD_INDEX;
BMessage* settings = (BMessage*)filter_settings.ItemAt(index); BMessage* settings = (BMessage*)fFilterSettings.ItemAt(index);
if (settings) if (settings)
*out_settings = *settings; *out_settings = *settings;
else else
return B_BAD_INDEX; return B_BAD_INDEX;
if (addon) { if (addon) {
entry_ref* ref = (entry_ref*)filter_addons.ItemAt(index); entry_ref* ref = (entry_ref*)fFilterAddons.ItemAt(index);
if (ref) if (ref)
*addon = *ref; *addon = *ref;
else else
@@ -419,13 +419,13 @@ status_t
BMailChain::SetFilter(int32 index, const BMessage& s, BMailChain::SetFilter(int32 index, const BMessage& s,
const entry_ref& addon) const entry_ref& addon)
{ {
BMessage* settings = (BMessage*)filter_settings.ItemAt(index); BMessage* settings = (BMessage*)fFilterSettings.ItemAt(index);
if (settings) if (settings)
*settings = s; *settings = s;
else else
return B_BAD_INDEX; return B_BAD_INDEX;
entry_ref* ref = (entry_ref*)filter_addons.ItemAt(index); entry_ref* ref = (entry_ref*)fFilterAddons.ItemAt(index);
if (ref) if (ref)
*ref = addon; *ref = addon;
else else
@@ -441,22 +441,22 @@ BMailChain::AddFilter(const BMessage& settings, const entry_ref& addon)
BMessage* s = new BMessage(settings); BMessage* s = new BMessage(settings);
entry_ref* a = new entry_ref(addon); entry_ref* a = new entry_ref(addon);
if (!filter_settings.AddItem(s)) { if (!fFilterSettings.AddItem(s)) {
delete s; delete s;
delete a; delete a;
return B_BAD_INDEX; return B_BAD_INDEX;
} }
if (!filter_addons.AddItem(a)) { if (!fFilterAddons.AddItem(a)) {
filter_settings.RemoveItem(settings_ct); fFilterSettings.RemoveItem(fSettingsCount);
delete s; delete s;
delete a; delete a;
return B_BAD_INDEX; return B_BAD_INDEX;
} }
// else // else
++settings_ct; ++fSettingsCount;
++addons_ct; ++fAddonsCount;
return B_OK; return B_OK;
} }
@@ -469,20 +469,20 @@ BMailChain::AddFilter(int32 index, const BMessage& settings,
BMessage*s = new BMessage(settings); BMessage*s = new BMessage(settings);
entry_ref* a = new entry_ref(addon); entry_ref* a = new entry_ref(addon);
if (!filter_settings.AddItem(s, index)) { if (!fFilterSettings.AddItem(s, index)) {
delete s; delete s;
delete a; delete a;
return B_BAD_INDEX; return B_BAD_INDEX;
} }
if (!filter_addons.AddItem(a, index)) { if (!fFilterAddons.AddItem(a, index)) {
filter_settings.RemoveItem(index); fFilterSettings.RemoveItem(index);
delete s; delete s;
delete a; delete a;
return B_BAD_INDEX; return B_BAD_INDEX;
} }
++settings_ct; ++fSettingsCount;
++addons_ct; ++fAddonsCount;
return B_OK; return B_OK;
} }
@@ -491,14 +491,14 @@ BMailChain::AddFilter(int32 index, const BMessage& settings,
status_t status_t
BMailChain::RemoveFilter(int32 index) BMailChain::RemoveFilter(int32 index)
{ {
BMessage* s = (BMessage*)filter_settings.RemoveItem(index); BMessage* s = (BMessage*)fFilterSettings.RemoveItem(index);
delete s; delete s;
entry_ref* a = (entry_ref*)filter_addons.RemoveItem(index); entry_ref* a = (entry_ref*)fFilterAddons.RemoveItem(index);
delete a; delete a;
--settings_ct; --fSettingsCount;
--addons_ct; --fAddonsCount;
return s || a ? B_OK : B_BAD_INDEX; return s || a ? B_OK : B_BAD_INDEX;
} }