diff --git a/dom/voicemail/Voicemail.cpp b/dom/voicemail/Voicemail.cpp index d14d08268a2..60c97b0566a 100644 --- a/dom/voicemail/Voicemail.cpp +++ b/dom/voicemail/Voicemail.cpp @@ -134,7 +134,8 @@ Voicemail::GetStatus(const Optional& aServiceId, } void -Voicemail::GetNumber(const Optional& aServiceId, nsString& aNumber, +Voicemail::GetNumber(const Optional& aServiceId, + nsString& aNumber, ErrorResult& aRv) const { aNumber.SetIsVoid(true); @@ -154,7 +155,8 @@ Voicemail::GetNumber(const Optional& aServiceId, nsString& aNumber, } void -Voicemail::GetDisplayName(const Optional& aServiceId, nsString& aDisplayName, +Voicemail::GetDisplayName(const Optional& aServiceId, + nsString& aDisplayName, ErrorResult& aRv) const { aDisplayName.SetIsVoid(true); diff --git a/dom/voicemail/Voicemail.h b/dom/voicemail/Voicemail.h index fc1768f7c8e..78578c6330b 100644 --- a/dom/voicemail/Voicemail.h +++ b/dom/voicemail/Voicemail.h @@ -34,7 +34,8 @@ class Voicemail MOZ_FINAL : public DOMEventTargetHelper, */ class Listener; - virtual ~Voicemail(); + virtual + ~Voicemail(); public: NS_DECL_ISUPPORTS_INHERITED @@ -42,7 +43,8 @@ public: NS_REALLY_FORWARD_NSIDOMEVENTTARGET(DOMEventTargetHelper) - Voicemail(nsPIDOMWindow* aWindow, nsIVoicemailService* aService); + Voicemail(nsPIDOMWindow* aWindow, + nsIVoicemailService* aService); nsPIDOMWindow* GetParentObject() const @@ -54,14 +56,17 @@ public: WrapObject(JSContext* aCx) MOZ_OVERRIDE; already_AddRefed - GetStatus(const Optional& aServiceId, ErrorResult& aRv) const; - - void - GetNumber(const Optional& aServiceId, nsString& aNumber, + GetStatus(const Optional& aServiceId, ErrorResult& aRv) const; void - GetDisplayName(const Optional& aServiceId, nsString& aDisplayName, + GetNumber(const Optional& aServiceId, + nsString& aNumber, + ErrorResult& aRv) const; + + void + GetDisplayName(const Optional& aServiceId, + nsString& aDisplayName, ErrorResult& aRv) const; IMPL_EVENT_HANDLER(statuschanged)