[haiku-commits] Re: r38250 - in haiku/trunk: headers/os/mail src/kits/mail
- From: Alex Wilson <yourpalal2@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 18 Aug 2010 15:57:07 -0600
On Wed, Aug 18, 2010 at 2:03 PM, <stefano.ceccherini@xxxxxxxxx> wrote:
> Author: jackburton
> Date: 2010-08-18 22:03:07 +0200 (Wed, 18 Aug 2010)
> New Revision: 38250
> Changeset: http://dev.haiku-os.org/changeset/38250
>
> Modified:
> haiku/trunk/headers/os/mail/MailSettings.h
> haiku/trunk/src/kits/mail/MailChain.cpp
> Log:
> Actually return B_NO_MEMORY in case of error (was a regression introduced
> in r38247.
> Small style fixes (more to come)
>
>
> Modified: haiku/trunk/headers/os/mail/MailSettings.h
> ===================================================================
> --- haiku/trunk/headers/os/mail/MailSettings.h 2010-08-18 19:57:53 UTC
> (rev 38249)
> +++ haiku/trunk/headers/os/mail/MailSettings.h 2010-08-18 20:03:07 UTC
> (rev 38250)
> @@ -40,16 +40,17 @@
> BMailChain* NewMailChain();
> BMailChain* GetMailChain(uint32 id);
>
> -status_t GetOutboundMailChains(BList *list);
> -status_t GetInboundMailChains(BList *list);
> +status_t GetOutboundMailChains(BList* list);
> +status_t GetInboundMailChains(BList* list);
>
> +
> class BMailChain : public BArchivable {
> - public:
> +public:
> BMailChain(uint32 id);
> BMailChain(BMessage*);
> virtual ~BMailChain();
>
> - virtual status_t Archive(BMessage*,bool) const;
> + virtual status_t Archive(BMessage*, bool) const;
> static BArchivable* Instantiate(BMessage*);
>
> status_t Save(bigtime_t timeout = B_INFINITE_TIMEOUT);
> @@ -62,32 +63,32 @@
> b_mail_chain_direction ChainDirection() const;
> void SetChainDirection(b_mail_chain_direction);
>
> - const char *Name() const;
> + const char* Name() const;
> status_t SetName(const char*);
>
> - BMessage *MetaData() const;
> + BMessage* MetaData() const;
>
> // "Filter" below refers to the settings message for a MailFilter
> int32 CountFilters() const;
> - status_t GetFilter(int32 index, BMessage* out_settings, entry_ref
> *addon = NULL) const;
> + status_t GetFilter(int32 index, BMessage* out_settings, entry_ref*
> addon = NULL) const;
> status_t SetFilter(int32 index, const BMessage&, const entry_ref&);
>
> status_t AddFilter(const BMessage&, const entry_ref&); // at end
> status_t AddFilter(int32 index, const BMessage&, const entry_ref&);
> status_t RemoveFilter(int32 index);
>
> - void RunChain(BMailStatusWindow *window,
> + void RunChain(BMailStatusWindow* window,
> bool async = true,
> bool save_when_done = true,
> bool delete_when_done = false);
>
> private:
> - status_t Path(BPath *path) const;
> + status_t Path(BPath* path) const;
> status_t Load(BMessage*);
>
> int32 fId;
> char fName[B_FILE_NAME_LENGTH];
> - BMessage *fMetaData;
> + BMessage* fMetaData;
>
> status_t fStatus;
>
> @@ -146,7 +147,7 @@
> void SetDefaultOutboundChainID(uint32 to);
>
> private:
> - BMessage data;
> + BMessage fData;
>
You forgot to change src/kits/mail/MailSettings.cpp to reflect this change.
(Maybe you've already noticed this, but I thought I'd mention it)
--Alex
Other related posts:
