diff --git a/docshell/base/nsDefaultURIFixup.cpp b/docshell/base/nsDefaultURIFixup.cpp index a93c593f9a8..3600b8e0bf5 100644 --- a/docshell/base/nsDefaultURIFixup.cpp +++ b/docshell/base/nsDefaultURIFixup.cpp @@ -47,7 +47,6 @@ nsDefaultURIFixup::~nsDefaultURIFixup() { } -/* nsIURI createExposableURI (in nsIURI aURI); */ NS_IMETHODIMP nsDefaultURIFixup::CreateExposableURI(nsIURI* aURI, nsIURI** aReturn) { @@ -111,7 +110,6 @@ nsDefaultURIFixup::CreateExposableURI(nsIURI* aURI, nsIURI** aReturn) return NS_OK; } -/* nsIURI createFixupURI (in nsAUTF8String aURIText, in unsigned long aFixupFlags); */ NS_IMETHODIMP nsDefaultURIFixup::CreateFixupURI(const nsACString& aStringURI, uint32_t aFixupFlags, diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index c40ee504129..fd28d102e92 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -1988,7 +1988,6 @@ nsDocShell::GetChromeEventHandler(nsIDOMEventTarget** aChromeEventHandler) return NS_OK; } -/* void setCurrentURI (in nsIURI uri); */ NS_IMETHODIMP nsDocShell::SetCurrentURI(nsIURI* aURI) { @@ -7118,7 +7117,6 @@ nsDocShell::Embed(nsIContentViewer* aContentViewer, return NS_OK; } -/* void setIsPrinting (in boolean aIsPrinting); */ NS_IMETHODIMP nsDocShell::SetIsPrinting(bool aIsPrinting) { @@ -12808,7 +12806,6 @@ nsDocShell::IsFrame() return !!parent; } -/* boolean IsBeingDestroyed (); */ NS_IMETHODIMP nsDocShell::IsBeingDestroyed(bool* aDoomed) { diff --git a/docshell/base/nsDocShellEnumerator.cpp b/docshell/base/nsDocShellEnumerator.cpp index d21b75436c7..1f870cd01fe 100644 --- a/docshell/base/nsDocShellEnumerator.cpp +++ b/docshell/base/nsDocShellEnumerator.cpp @@ -23,7 +23,6 @@ nsDocShellEnumerator::~nsDocShellEnumerator() NS_IMPL_ISUPPORTS(nsDocShellEnumerator, nsISimpleEnumerator) -/* nsISupports getNext (); */ NS_IMETHODIMP nsDocShellEnumerator::GetNext(nsISupports** aResult) { @@ -45,7 +44,6 @@ nsDocShellEnumerator::GetNext(nsISupports** aResult) return rv; } -/* boolean hasMoreElements (); */ NS_IMETHODIMP nsDocShellEnumerator::HasMoreElements(bool* aResult) { diff --git a/docshell/base/nsDocShellLoadInfo.cpp b/docshell/base/nsDocShellLoadInfo.cpp index 5f2bf2d55f1..c2c020a5319 100644 --- a/docshell/base/nsDocShellLoadInfo.cpp +++ b/docshell/base/nsDocShellLoadInfo.cpp @@ -165,7 +165,6 @@ nsDocShellLoadInfo::SetPostDataStream(nsIInputStream* aStream) return NS_OK; } -/* attribute nsIInputStream headersStream; */ NS_IMETHODIMP nsDocShellLoadInfo::GetHeadersStream(nsIInputStream** aHeadersStream) { diff --git a/dom/audiochannel/AudioChannelAgent.cpp b/dom/audiochannel/AudioChannelAgent.cpp index 3a68bdd371a..5792522e86b 100644 --- a/dom/audiochannel/AudioChannelAgent.cpp +++ b/dom/audiochannel/AudioChannelAgent.cpp @@ -53,7 +53,6 @@ AudioChannelAgent::Shutdown() } } -/* readonly attribute long audioChannelType; */ NS_IMETHODIMP AudioChannelAgent::GetAudioChannelType(int32_t *aAudioChannelType) { *aAudioChannelType = mAudioChannelType; @@ -128,7 +127,6 @@ AudioChannelAgent::InitInternal(nsIDOMWindow* aWindow, int32_t aChannelType, return NS_OK; } -/* boolean notifyStartedPlaying (); */ NS_IMETHODIMP AudioChannelAgent::NotifyStartedPlaying(float *aVolume, bool* aMuted) { @@ -150,7 +148,6 @@ NS_IMETHODIMP AudioChannelAgent::NotifyStartedPlaying(float *aVolume, return NS_OK; } -/* void notifyStoppedPlaying (); */ NS_IMETHODIMP AudioChannelAgent::NotifyStoppedPlaying(void) { if (mAudioChannelType == AUDIO_AGENT_CHANNEL_ERROR || diff --git a/dom/base/DOMException.cpp b/dom/base/DOMException.cpp index 5106d3a94f1..21068bb509f 100644 --- a/dom/base/DOMException.cpp +++ b/dom/base/DOMException.cpp @@ -294,7 +294,6 @@ Exception::StowJSVal(JS::Value& aVp) } } -/* readonly attribute AUTF8String message; */ NS_IMETHODIMP Exception::GetMessageMoz(nsACString& aMessage) { @@ -304,7 +303,6 @@ Exception::GetMessageMoz(nsACString& aMessage) return NS_OK; } -/* readonly attribute nsresult result; */ NS_IMETHODIMP Exception::GetResult(nsresult* aResult) { @@ -315,7 +313,6 @@ Exception::GetResult(nsresult* aResult) return NS_OK; } -/* readonly attribute AUTF8String name; */ NS_IMETHODIMP Exception::GetName(nsACString& aName) { @@ -337,7 +334,6 @@ Exception::GetName(nsACString& aName) return NS_OK; } -/* readonly attribute AString filename; */ NS_IMETHODIMP Exception::GetFilename(nsAString& aFilename) { @@ -351,7 +347,6 @@ Exception::GetFilename(nsAString& aFilename) return NS_OK; } -/* readonly attribute uint32_t lineNumber; */ NS_IMETHODIMP Exception::GetLineNumber(uint32_t *aLineNumber) { @@ -369,7 +364,6 @@ Exception::GetLineNumber(uint32_t *aLineNumber) return NS_OK; } -/* readonly attribute uint32_t columnNumber; */ NS_IMETHODIMP Exception::GetColumnNumber(uint32_t* aColumnNumber) { @@ -380,7 +374,6 @@ Exception::GetColumnNumber(uint32_t* aColumnNumber) return NS_OK; } -/* readonly attribute nsIStackFrame location; */ NS_IMETHODIMP Exception::GetLocation(nsIStackFrame** aLocation) { @@ -392,7 +385,6 @@ Exception::GetLocation(nsIStackFrame** aLocation) return NS_OK; } -/* readonly attribute nsISupports data; */ NS_IMETHODIMP Exception::GetData(nsISupports** aData) { @@ -404,7 +396,6 @@ Exception::GetData(nsISupports** aData) return NS_OK; } -/* readonly attribute nsIException inner; */ NS_IMETHODIMP Exception::GetInner(nsIException** aException) { @@ -416,7 +407,6 @@ Exception::GetInner(nsIException** aException) return NS_OK; } -/* AUTF8String toString (); */ NS_IMETHODIMP Exception::ToString(nsACString& _retval) { diff --git a/dom/base/NodeIterator.cpp b/dom/base/NodeIterator.cpp index 2d5729348c1..95b880d935c 100644 --- a/dom/base/NodeIterator.cpp +++ b/dom/base/NodeIterator.cpp @@ -179,21 +179,18 @@ NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(NodeIterator) NS_IMPL_CYCLE_COLLECTING_RELEASE(NodeIterator) -/* readonly attribute nsIDOMNode root; */ NS_IMETHODIMP NodeIterator::GetRoot(nsIDOMNode * *aRoot) { NS_ADDREF(*aRoot = Root()->AsDOMNode()); return NS_OK; } -/* readonly attribute unsigned long whatToShow; */ NS_IMETHODIMP NodeIterator::GetWhatToShow(uint32_t *aWhatToShow) { *aWhatToShow = WhatToShow(); return NS_OK; } -/* readonly attribute nsIDOMNodeFilter filter; */ NS_IMETHODIMP NodeIterator::GetFilter(nsIDOMNodeFilter **aFilter) { NS_ENSURE_ARG_POINTER(aFilter); @@ -203,13 +200,11 @@ NS_IMETHODIMP NodeIterator::GetFilter(nsIDOMNodeFilter **aFilter) return NS_OK; } -/* nsIDOMNode nextNode () raises (DOMException); */ NS_IMETHODIMP NodeIterator::NextNode(nsIDOMNode **_retval) { return ImplNodeGetter(&NodeIterator::NextNode, _retval); } -/* nsIDOMNode previousNode () raises (DOMException); */ NS_IMETHODIMP NodeIterator::PreviousNode(nsIDOMNode **_retval) { return ImplNodeGetter(&NodeIterator::PreviousNode, _retval); @@ -248,7 +243,6 @@ NodeIterator::NextOrPrevNode(NodePointer::MoveToMethodType aMove, return nullptr; } -/* void detach (); */ NS_IMETHODIMP NodeIterator::Detach(void) { if (mRoot) { @@ -257,7 +251,6 @@ NS_IMETHODIMP NodeIterator::Detach(void) return NS_OK; } -/* readonly attribute nsIDOMNode referenceNode; */ NS_IMETHODIMP NodeIterator::GetReferenceNode(nsIDOMNode * *aRefNode) { nsCOMPtr node(do_QueryInterface(GetReferenceNode())); @@ -265,7 +258,6 @@ NS_IMETHODIMP NodeIterator::GetReferenceNode(nsIDOMNode * *aRefNode) return NS_OK; } -/* readonly attribute boolean pointerBeforeReferenceNode; */ NS_IMETHODIMP NodeIterator::GetPointerBeforeReferenceNode(bool *aBeforeNode) { *aBeforeNode = PointerBeforeReferenceNode(); diff --git a/dom/base/ProcessGlobal.cpp b/dom/base/ProcessGlobal.cpp index 61be4bcadb8..0ded8e34b19 100644 --- a/dom/base/ProcessGlobal.cpp +++ b/dom/base/ProcessGlobal.cpp @@ -37,7 +37,6 @@ ProcessGlobal::Get() return static_cast(service.get()); } -/* [notxpcom] boolean markForCC (); */ // This method isn't automatically forwarded safely because it's notxpcom, so // the IDL binding doesn't know what value to return. NS_IMETHODIMP_(bool) diff --git a/dom/base/TreeWalker.cpp b/dom/base/TreeWalker.cpp index f61a05ead05..c6ccdcf2ec7 100644 --- a/dom/base/TreeWalker.cpp +++ b/dom/base/TreeWalker.cpp @@ -61,21 +61,18 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(dom::TreeWalker) * nsIDOMTreeWalker Getters/Setters */ -/* readonly attribute nsIDOMNode root; */ NS_IMETHODIMP TreeWalker::GetRoot(nsIDOMNode * *aRoot) { NS_ADDREF(*aRoot = Root()->AsDOMNode()); return NS_OK; } -/* readonly attribute unsigned long whatToShow; */ NS_IMETHODIMP TreeWalker::GetWhatToShow(uint32_t *aWhatToShow) { *aWhatToShow = WhatToShow(); return NS_OK; } -/* readonly attribute nsIDOMNodeFilter filter; */ NS_IMETHODIMP TreeWalker::GetFilter(nsIDOMNodeFilter * *aFilter) { NS_ENSURE_ARG_POINTER(aFilter); @@ -85,7 +82,6 @@ NS_IMETHODIMP TreeWalker::GetFilter(nsIDOMNodeFilter * *aFilter) return NS_OK; } -/* attribute nsIDOMNode currentNode; */ NS_IMETHODIMP TreeWalker::GetCurrentNode(nsIDOMNode * *aCurrentNode) { if (mCurrentNode) { @@ -124,7 +120,6 @@ TreeWalker::SetCurrentNode(nsINode& aNode, ErrorResult& aResult) * nsIDOMTreeWalker functions */ -/* nsIDOMNode parentNode (); */ NS_IMETHODIMP TreeWalker::ParentNode(nsIDOMNode **_retval) { return ImplNodeGetter(&TreeWalker::ParentNode, _retval); @@ -153,7 +148,6 @@ TreeWalker::ParentNode(ErrorResult& aResult) return nullptr; } -/* nsIDOMNode firstChild (); */ NS_IMETHODIMP TreeWalker::FirstChild(nsIDOMNode **_retval) { return ImplNodeGetter(&TreeWalker::FirstChild, _retval); @@ -165,7 +159,6 @@ TreeWalker::FirstChild(ErrorResult& aResult) return FirstChildInternal(false, aResult); } -/* nsIDOMNode lastChild (); */ NS_IMETHODIMP TreeWalker::LastChild(nsIDOMNode **_retval) { return ImplNodeGetter(&TreeWalker::LastChild, _retval); @@ -177,7 +170,6 @@ TreeWalker::LastChild(ErrorResult& aResult) return FirstChildInternal(true, aResult); } -/* nsIDOMNode previousSibling (); */ NS_IMETHODIMP TreeWalker::PreviousSibling(nsIDOMNode **_retval) { return ImplNodeGetter(&TreeWalker::PreviousSibling, _retval); @@ -189,7 +181,6 @@ TreeWalker::PreviousSibling(ErrorResult& aResult) return NextSiblingInternal(true, aResult); } -/* nsIDOMNode nextSibling (); */ NS_IMETHODIMP TreeWalker::NextSibling(nsIDOMNode **_retval) { return ImplNodeGetter(&TreeWalker::NextSibling, _retval); @@ -201,7 +192,6 @@ TreeWalker::NextSibling(ErrorResult& aResult) return NextSiblingInternal(false, aResult); } -/* nsIDOMNode previousNode (); */ NS_IMETHODIMP TreeWalker::PreviousNode(nsIDOMNode **_retval) { return ImplNodeGetter(&TreeWalker::PreviousNode, _retval); @@ -260,7 +250,6 @@ TreeWalker::PreviousNode(ErrorResult& aResult) return nullptr; } -/* nsIDOMNode nextNode (); */ NS_IMETHODIMP TreeWalker::NextNode(nsIDOMNode **_retval) { return ImplNodeGetter(&TreeWalker::NextNode, _retval); diff --git a/dom/base/nsGlobalWindowCommands.cpp b/dom/base/nsGlobalWindowCommands.cpp index 393ed7479d4..8e17ce97776 100644 --- a/dom/base/nsGlobalWindowCommands.cpp +++ b/dom/base/nsGlobalWindowCommands.cpp @@ -174,7 +174,6 @@ public: NS_IMPL_ISUPPORTS(nsSelectionCommandsBase, nsIControllerCommand) -/* boolean isCommandEnabled (in string aCommandName, in nsISupports aCommandContext); */ NS_IMETHODIMP nsSelectionCommandsBase::IsCommandEnabled(const char * aCommandName, nsISupports *aCommandContext, @@ -186,7 +185,6 @@ nsSelectionCommandsBase::IsCommandEnabled(const char * aCommandName, return NS_OK; } -/* void getCommandStateParams (in string aCommandName, in nsICommandParams aParams, in nsISupports aCommandContext); */ NS_IMETHODIMP nsSelectionCommandsBase::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandContext) @@ -195,7 +193,6 @@ nsSelectionCommandsBase::GetCommandStateParams(const char *aCommandName, return NS_ERROR_NOT_IMPLEMENTED; } -/* void doCommandParams (in string aCommandName, in nsICommandParams aParams, in nsISupports aCommandContext); */ NS_IMETHODIMP nsSelectionCommandsBase::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandContext) @@ -845,7 +842,6 @@ nsWebNavigationBaseCommand::DoCommand(const char *aCommandName, return DoWebNavCommand(aCommandName, webNav); } -/* void doCommandParams (in string aCommandName, in nsICommandParams aParams, in nsISupports aCommandContext); */ NS_IMETHODIMP nsWebNavigationBaseCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandContext) diff --git a/dom/base/nsInProcessTabChildGlobal.cpp b/dom/base/nsInProcessTabChildGlobal.cpp index 8b4e929328f..72695b7816a 100644 --- a/dom/base/nsInProcessTabChildGlobal.cpp +++ b/dom/base/nsInProcessTabChildGlobal.cpp @@ -113,7 +113,6 @@ nsInProcessTabChildGlobal::~nsInProcessTabChildGlobal() mozilla::DropJSObjects(this); } -/* [notxpcom] boolean markForCC (); */ // This method isn't automatically forwarded safely because it's notxpcom, so // the IDL binding doesn't know what value to return. NS_IMETHODIMP_(bool) diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index 83e632762a5..65d217544ee 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -3045,7 +3045,6 @@ NS_IMETHODIMP nsJSArgArray::GetLength(uint32_t *aLength) return NS_OK; } -/* void queryElementAt (in unsigned long index, in nsIIDRef uuid, [iid_is (uuid), retval] out nsQIResult result); */ NS_IMETHODIMP nsJSArgArray::QueryElementAt(uint32_t index, const nsIID & uuid, void * *result) { *result = nullptr; @@ -3062,13 +3061,11 @@ NS_IMETHODIMP nsJSArgArray::QueryElementAt(uint32_t index, const nsIID & uuid, v return NS_ERROR_NO_INTERFACE; } -/* unsigned long indexOf (in unsigned long startIndex, in nsISupports element); */ NS_IMETHODIMP nsJSArgArray::IndexOf(uint32_t startIndex, nsISupports *element, uint32_t *_retval) { return NS_ERROR_NOT_IMPLEMENTED; } -/* nsISimpleEnumerator enumerate (); */ NS_IMETHODIMP nsJSArgArray::Enumerate(nsISimpleEnumerator **_retval) { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/dom/base/nsOpenURIInFrameParams.cpp b/dom/base/nsOpenURIInFrameParams.cpp index 2b80a70dce0..97706c0edd2 100644 --- a/dom/base/nsOpenURIInFrameParams.cpp +++ b/dom/base/nsOpenURIInFrameParams.cpp @@ -16,7 +16,6 @@ nsOpenURIInFrameParams::nsOpenURIInFrameParams() : nsOpenURIInFrameParams::~nsOpenURIInFrameParams() { } -/* attribute DOMString referrer; */ NS_IMETHODIMP nsOpenURIInFrameParams::GetReferrer(nsAString& aReferrer) { @@ -30,7 +29,6 @@ nsOpenURIInFrameParams::SetReferrer(const nsAString& aReferrer) return NS_OK; } -/* attribute boolean isPrivate; */ NS_IMETHODIMP nsOpenURIInFrameParams::GetIsPrivate(bool* aIsPrivate) { diff --git a/dom/base/nsXMLHttpRequest.cpp b/dom/base/nsXMLHttpRequest.cpp index dca786b4931..00571cae417 100644 --- a/dom/base/nsXMLHttpRequest.cpp +++ b/dom/base/nsXMLHttpRequest.cpp @@ -580,7 +580,6 @@ nsXMLHttpRequest::SizeOfEventTargetIncludingThis( // - lots } -/* readonly attribute nsIChannel channel; */ NS_IMETHODIMP nsXMLHttpRequest::GetChannel(nsIChannel **aChannel) { @@ -602,7 +601,6 @@ static void LogMessage(const char* aWarning, nsPIDOMWindow* aWindow) aWarning); } -/* readonly attribute nsIDOMDocument responseXML; */ NS_IMETHODIMP nsXMLHttpRequest::GetResponseXML(nsIDOMDocument **aResponseXML) { @@ -716,7 +714,6 @@ nsXMLHttpRequest::AppendToResponseText(const char * aSrcBuffer, return NS_OK; } -/* readonly attribute AString responseText; */ NS_IMETHODIMP nsXMLHttpRequest::GetResponseText(nsAString& aResponseText) { @@ -834,7 +831,6 @@ nsXMLHttpRequest::CreatePartialBlob() mResponseBlob = mBlobSet->GetBlobInternal(GetOwner(), contentType); } -/* attribute AString responseType; */ NS_IMETHODIMP nsXMLHttpRequest::GetResponseType(nsAString& aResponseType) { switch (mResponseType) { @@ -895,7 +891,6 @@ nsXMLHttpRequest::StaticAssertions() } #endif -/* attribute AString responseType; */ NS_IMETHODIMP nsXMLHttpRequest::SetResponseType(const nsAString& aResponseType) { nsXMLHttpRequest::ResponseTypeEnum responseType; @@ -964,7 +959,6 @@ nsXMLHttpRequest::SetResponseType(nsXMLHttpRequest::ResponseTypeEnum aResponseTy } -/* readonly attribute jsval response; */ NS_IMETHODIMP nsXMLHttpRequest::GetResponse(JSContext *aCx, JS::MutableHandle aResult) { @@ -1093,7 +1087,6 @@ nsXMLHttpRequest::IsDeniedCrossSiteRequest() return false; } -/* readonly attribute AString responseURL; */ void nsXMLHttpRequest::GetResponseURL(nsAString& aUrl) { @@ -1122,7 +1115,6 @@ nsXMLHttpRequest::GetResponseURL(nsAString& aUrl) CopyUTF8toUTF16(temp, aUrl); } -/* readonly attribute unsigned long status; */ NS_IMETHODIMP nsXMLHttpRequest::GetStatus(uint32_t *aStatus) { @@ -1259,7 +1251,6 @@ nsXMLHttpRequest::CloseRequestWithError(const nsAString& aType, mState &= ~XML_HTTP_REQUEST_SYNCLOOPING; } -/* void abort (); */ void nsXMLHttpRequest::Abort() { @@ -1329,7 +1320,6 @@ nsXMLHttpRequest::IsSafeHeader(const nsACString& header, nsIHttpChannel* httpCha return isSafe; } -/* ByteString getAllResponseHeaders(); */ IMPL_CSTRING_GETTER(GetAllResponseHeaders) void nsXMLHttpRequest::GetAllResponseHeaders(nsCString& aResponseHeaders) @@ -1984,7 +1974,6 @@ nsXMLHttpRequest::OnDataAvailable(nsIRequest *request, return NS_OK; } -/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */ NS_IMETHODIMP nsXMLHttpRequest::OnStartRequest(nsIRequest *request, nsISupports *ctxt) { @@ -2219,7 +2208,6 @@ nsXMLHttpRequest::OnStartRequest(nsIRequest *request, nsISupports *ctxt) return NS_OK; } -/* void onStopRequest (in nsIRequest request, in nsISupports ctxt, in nsresult status, in wstring statusArg); */ NS_IMETHODIMP nsXMLHttpRequest::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status) { @@ -2634,7 +2622,6 @@ nsXMLHttpRequest::GetRequestBody(nsIVariant* aVariant, return NS_OK; } -/* void send (in nsIVariant aBody); */ NS_IMETHODIMP nsXMLHttpRequest::Send(nsIVariant *aBody) { @@ -3038,7 +3025,6 @@ nsXMLHttpRequest::Send(nsIVariant* aVariant, const Nullable& aBody) return rv; } -/* void setRequestHeader (in ByteString header, in ByteString value); */ // http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#dom-xmlhttprequest-setrequestheader NS_IMETHODIMP nsXMLHttpRequest::SetRequestHeader(const nsACString& header, @@ -3144,7 +3130,6 @@ nsXMLHttpRequest::SetRequestHeader(const nsACString& header, return rv; } -/* attribute unsigned long timeout; */ NS_IMETHODIMP nsXMLHttpRequest::GetTimeout(uint32_t *aTimeout) { @@ -3208,7 +3193,6 @@ nsXMLHttpRequest::StartTimeoutTimer() ); } -/* readonly attribute unsigned short readyState; */ NS_IMETHODIMP nsXMLHttpRequest::GetReadyState(uint16_t *aState) { @@ -3236,7 +3220,6 @@ nsXMLHttpRequest::ReadyState() return DONE; } -/* void overrideMimeType(in DOMString mimetype); */ NS_IMETHODIMP nsXMLHttpRequest::SlowOverrideMimeType(const nsAString& aMimeType) { @@ -3244,7 +3227,6 @@ nsXMLHttpRequest::SlowOverrideMimeType(const nsAString& aMimeType) return NS_OK; } -/* attribute boolean mozBackgroundRequest; */ NS_IMETHODIMP nsXMLHttpRequest::GetMozBackgroundRequest(bool *_retval) { @@ -3287,7 +3269,6 @@ nsXMLHttpRequest::SetMozBackgroundRequest(bool aMozBackgroundRequest, nsresult& } } -/* attribute boolean withCredentials; */ NS_IMETHODIMP nsXMLHttpRequest::GetWithCredentials(bool *_retval) { diff --git a/dom/bindings/Exceptions.cpp b/dom/bindings/Exceptions.cpp index 4c386757655..90c17cf3b56 100644 --- a/dom/bindings/Exceptions.cpp +++ b/dom/bindings/Exceptions.cpp @@ -352,14 +352,12 @@ NS_IMPL_RELEASE_INHERITED(JSStackFrame, StackFrame) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(JSStackFrame) NS_INTERFACE_MAP_END_INHERITING(StackFrame) -/* readonly attribute uint32_t language; */ NS_IMETHODIMP StackFrame::GetLanguage(uint32_t* aLanguage) { *aLanguage = mLanguage; return NS_OK; } -/* readonly attribute string languageName; */ NS_IMETHODIMP StackFrame::GetLanguageName(nsACString& aLanguageName) { aLanguageName.AssignLiteral("C++"); @@ -409,7 +407,6 @@ GetValueIfNotCached(JSContext* aCx, JSObject* aStack, aPropGetter(aCx, stack, aValue); } -/* readonly attribute AString filename; */ NS_IMETHODIMP JSStackFrame::GetFilename(nsAString& aFilename) { if (!mStack) { @@ -454,7 +451,6 @@ NS_IMETHODIMP StackFrame::GetFilename(nsAString& aFilename) return NS_OK; } -/* readonly attribute AString name; */ NS_IMETHODIMP JSStackFrame::GetName(nsAString& aFunction) { if (!mStack) { @@ -531,7 +527,6 @@ JSStackFrame::GetLineno() return line; } -/* readonly attribute int32_t lineNumber; */ NS_IMETHODIMP StackFrame::GetLineNumber(int32_t* aLineNumber) { *aLineNumber = GetLineno(); @@ -564,21 +559,18 @@ JSStackFrame::GetColNo() return col; } -/* readonly attribute int32_t columnNumber; */ NS_IMETHODIMP StackFrame::GetColumnNumber(int32_t* aColumnNumber) { *aColumnNumber = GetColNo(); return NS_OK; } -/* readonly attribute AUTF8String sourceLine; */ NS_IMETHODIMP StackFrame::GetSourceLine(nsACString& aSourceLine) { aSourceLine.Truncate(); return NS_OK; } -/* readonly attribute AString asyncCause; */ NS_IMETHODIMP JSStackFrame::GetAsyncCause(nsAString& aAsyncCause) { if (!mStack) { @@ -629,7 +621,6 @@ NS_IMETHODIMP StackFrame::GetAsyncCause(nsAString& aAsyncCause) return NS_OK; } -/* readonly attribute nsIStackFrame asyncCaller; */ NS_IMETHODIMP JSStackFrame::GetAsyncCaller(nsIStackFrame** aAsyncCaller) { if (!mStack) { @@ -666,7 +657,6 @@ NS_IMETHODIMP StackFrame::GetAsyncCaller(nsIStackFrame** aAsyncCaller) return NS_OK; } -/* readonly attribute nsIStackFrame caller; */ NS_IMETHODIMP JSStackFrame::GetCaller(nsIStackFrame** aCaller) { if (!mStack) { @@ -764,7 +754,6 @@ NS_IMETHODIMP StackFrame::GetFormattedStack(nsAString& aStack) return NS_OK; } -/* readonly attribute jsval nativeSavedFrame; */ NS_IMETHODIMP JSStackFrame::GetNativeSavedFrame(JS::MutableHandle aSavedFrame) { aSavedFrame.setObjectOrNull(mStack); @@ -777,7 +766,6 @@ NS_IMETHODIMP StackFrame::GetNativeSavedFrame(JS::MutableHandle aSave return NS_OK; } -/* AUTF8String toString (); */ NS_IMETHODIMP StackFrame::ToString(nsACString& _retval) { _retval.Truncate(); diff --git a/dom/canvas/WebGLContext.cpp b/dom/canvas/WebGLContext.cpp index 34dc0bae70c..651064c9085 100644 --- a/dom/canvas/WebGLContext.cpp +++ b/dom/canvas/WebGLContext.cpp @@ -1308,7 +1308,6 @@ WebGLContext::GetContextAttributes(dom::Nullable& r result.mFailIfMajorPerformanceCaveat = mOptions.failIfMajorPerformanceCaveat; } -/* [noscript] DOMString mozGetUnderlyingParamString(in GLenum pname); */ NS_IMETHODIMP WebGLContext::MozGetUnderlyingParamString(uint32_t pname, nsAString& retval) { diff --git a/dom/events/FocusEvent.cpp b/dom/events/FocusEvent.cpp index b392ac82f2d..0d684f64b87 100644 --- a/dom/events/FocusEvent.cpp +++ b/dom/events/FocusEvent.cpp @@ -27,7 +27,6 @@ FocusEvent::FocusEvent(EventTarget* aOwner, } } -/* readonly attribute nsIDOMEventTarget relatedTarget; */ NS_IMETHODIMP FocusEvent::GetRelatedTarget(nsIDOMEventTarget** aRelatedTarget) { diff --git a/dom/events/SimpleGestureEvent.cpp b/dom/events/SimpleGestureEvent.cpp index d35719dcc31..4ff4522b389 100644 --- a/dom/events/SimpleGestureEvent.cpp +++ b/dom/events/SimpleGestureEvent.cpp @@ -39,7 +39,6 @@ NS_INTERFACE_MAP_BEGIN(SimpleGestureEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMSimpleGestureEvent) NS_INTERFACE_MAP_END_INHERITING(MouseEvent) -/* attribute unsigned long allowedDirections; */ uint32_t SimpleGestureEvent::AllowedDirections() { @@ -61,7 +60,6 @@ SimpleGestureEvent::SetAllowedDirections(uint32_t aAllowedDirections) return NS_OK; } -/* readonly attribute unsigned long direction; */ uint32_t SimpleGestureEvent::Direction() { @@ -76,7 +74,6 @@ SimpleGestureEvent::GetDirection(uint32_t* aDirection) return NS_OK; } -/* readonly attribute float delta; */ double SimpleGestureEvent::Delta() { @@ -91,7 +88,6 @@ SimpleGestureEvent::GetDelta(double* aDelta) return NS_OK; } -/* readonly attribute unsigned long clickCount; */ uint32_t SimpleGestureEvent::ClickCount() { diff --git a/dom/gamepad/GamepadServiceTest.cpp b/dom/gamepad/GamepadServiceTest.cpp index 4f07d52971f..ab30324fdb6 100644 --- a/dom/gamepad/GamepadServiceTest.cpp +++ b/dom/gamepad/GamepadServiceTest.cpp @@ -39,7 +39,6 @@ GamepadServiceTest::~GamepadServiceTest() { } -/* uint32_t addGamepad(in unsigned long index, in string id, in unsigned long mapping, in unsigned long numButtons, in unsigned long numAxes); */ NS_IMETHODIMP GamepadServiceTest::AddGamepad(const char* aID, uint32_t aMapping, @@ -54,7 +53,6 @@ GamepadServiceTest::AddGamepad(const char* aID, return NS_OK; } -/* void removeGamepad (in uint32_t index); */ NS_IMETHODIMP GamepadServiceTest::RemoveGamepad(uint32_t aIndex) { GamepadFunctions::RemoveGamepad(aIndex); diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp index d2cac6a12b3..02b2781f31b 100644 --- a/dom/html/HTMLMediaElement.cpp +++ b/dom/html/HTMLMediaElement.cpp @@ -573,7 +573,6 @@ HTMLMediaElement::SetMozSrcObject(DOMMediaStream* aValue) DoLoad(); } -/* readonly attribute nsIDOMHTMLMediaElement mozAutoplayEnabled; */ NS_IMETHODIMP HTMLMediaElement::GetMozAutoplayEnabled(bool *aAutoplayEnabled) { *aAutoplayEnabled = mAutoplayEnabled; @@ -581,7 +580,6 @@ NS_IMETHODIMP HTMLMediaElement::GetMozAutoplayEnabled(bool *aAutoplayEnabled) return NS_OK; } -/* readonly attribute nsIDOMMediaError error; */ NS_IMETHODIMP HTMLMediaElement::GetError(nsIDOMMediaError * *aError) { NS_IF_ADDREF(*aError = mError); @@ -589,7 +587,6 @@ NS_IMETHODIMP HTMLMediaElement::GetError(nsIDOMMediaError * *aError) return NS_OK; } -/* readonly attribute boolean ended; */ bool HTMLMediaElement::Ended() { @@ -610,7 +607,6 @@ NS_IMETHODIMP HTMLMediaElement::GetEnded(bool* aEnded) return NS_OK; } -/* readonly attribute DOMString currentSrc; */ NS_IMETHODIMP HTMLMediaElement::GetCurrentSrc(nsAString & aCurrentSrc) { nsAutoCString src; @@ -619,7 +615,6 @@ NS_IMETHODIMP HTMLMediaElement::GetCurrentSrc(nsAString & aCurrentSrc) return NS_OK; } -/* readonly attribute unsigned short networkState; */ NS_IMETHODIMP HTMLMediaElement::GetNetworkState(uint16_t* aNetworkState) { *aNetworkState = NetworkState(); @@ -811,7 +806,6 @@ void HTMLMediaElement::QueueSelectResourceTask() NS_NewRunnableMethod(this, &HTMLMediaElement::SelectResourceWrapper)); } -/* void load (); */ NS_IMETHODIMP HTMLMediaElement::Load() { if (mIsRunningLoadMethod) { @@ -1347,7 +1341,6 @@ nsresult HTMLMediaElement::LoadWithChannel(nsIChannel* aChannel, return NS_OK; } -/* readonly attribute unsigned short readyState; */ NS_IMETHODIMP HTMLMediaElement::GetReadyState(uint16_t* aReadyState) { *aReadyState = ReadyState(); @@ -1355,7 +1348,6 @@ NS_IMETHODIMP HTMLMediaElement::GetReadyState(uint16_t* aReadyState) return NS_OK; } -/* readonly attribute boolean seeking; */ bool HTMLMediaElement::Seeking() const { @@ -1368,7 +1360,6 @@ NS_IMETHODIMP HTMLMediaElement::GetSeeking(bool* aSeeking) return NS_OK; } -/* attribute double currentTime; */ double HTMLMediaElement::CurrentTime() const { @@ -1590,7 +1581,6 @@ NS_IMETHODIMP HTMLMediaElement::SetCurrentTime(double aCurrentTime) return rv.StealNSResult(); } -/* readonly attribute double duration; */ double HTMLMediaElement::Duration() const { @@ -1621,7 +1611,6 @@ HTMLMediaElement::Seekable() const return ranges.forget(); } -/* readonly attribute nsIDOMHTMLTimeRanges seekable; */ NS_IMETHODIMP HTMLMediaElement::GetSeekable(nsIDOMTimeRanges** aSeekable) { nsRefPtr ranges = Seekable(); @@ -1629,7 +1618,6 @@ NS_IMETHODIMP HTMLMediaElement::GetSeekable(nsIDOMTimeRanges** aSeekable) return NS_OK; } -/* readonly attribute boolean paused; */ NS_IMETHODIMP HTMLMediaElement::GetPaused(bool* aPaused) { *aPaused = Paused(); @@ -1665,7 +1653,6 @@ HTMLMediaElement::Played() return ranges.forget(); } -/* readonly attribute nsIDOMHTMLTimeRanges played; */ NS_IMETHODIMP HTMLMediaElement::GetPlayed(nsIDOMTimeRanges** aPlayed) { nsRefPtr ranges = Played(); @@ -1673,7 +1660,6 @@ NS_IMETHODIMP HTMLMediaElement::GetPlayed(nsIDOMTimeRanges** aPlayed) return NS_OK; } -/* void pause (); */ void HTMLMediaElement::Pause(ErrorResult& aRv) { @@ -1709,7 +1695,6 @@ NS_IMETHODIMP HTMLMediaElement::Pause() return rv.StealNSResult(); } -/* attribute double volume; */ NS_IMETHODIMP HTMLMediaElement::GetVolume(double* aVolume) { *aVolume = Volume(); @@ -1788,7 +1773,6 @@ HTMLMediaElement::MozGetMetadata(JSContext* cx, JS::MutableHandle aVa return rv.StealNSResult(); } -/* attribute boolean muted; */ NS_IMETHODIMP HTMLMediaElement::GetMuted(bool* aMuted) { *aMuted = Muted(); @@ -4337,7 +4321,6 @@ void HTMLMediaElement::GetCurrentSpec(nsCString& aString) } } -/* attribute double mozFragmentEnd; */ double HTMLMediaElement::MozFragmentEnd() { @@ -4368,7 +4351,6 @@ static double ClampPlaybackRate(double aPlaybackRate) return aPlaybackRate; } -/* attribute double defaultPlaybackRate; */ NS_IMETHODIMP HTMLMediaElement::GetDefaultPlaybackRate(double* aDefaultPlaybackRate) { *aDefaultPlaybackRate = DefaultPlaybackRate(); @@ -4394,7 +4376,6 @@ NS_IMETHODIMP HTMLMediaElement::SetDefaultPlaybackRate(double aDefaultPlaybackRa return rv.StealNSResult(); } -/* attribute double playbackRate; */ NS_IMETHODIMP HTMLMediaElement::GetPlaybackRate(double* aPlaybackRate) { *aPlaybackRate = PlaybackRate(); @@ -4434,7 +4415,6 @@ NS_IMETHODIMP HTMLMediaElement::SetPlaybackRate(double aPlaybackRate) return rv.StealNSResult(); } -/* attribute bool mozPreservesPitch; */ NS_IMETHODIMP HTMLMediaElement::GetMozPreservesPitch(bool* aPreservesPitch) { *aPreservesPitch = MozPreservesPitch(); @@ -4766,7 +4746,6 @@ HTMLMediaElement::VideoTracks() return mVideoTrackList; } -/* readonly attribute TextTrackList? textTracks; */ TextTrackList* HTMLMediaElement::GetTextTracks() { diff --git a/dom/html/UndoManager.cpp b/dom/html/UndoManager.cpp index 540db7f623c..8e574b221f5 100644 --- a/dom/html/UndoManager.cpp +++ b/dom/html/UndoManager.cpp @@ -57,7 +57,6 @@ protected: virtual ~UndoTxn() {} }; -/* void doTransaction (); */ NS_IMETHODIMP UndoTxn::DoTransaction() { @@ -66,21 +65,18 @@ UndoTxn::DoTransaction() return NS_OK; } -/* void doTransaction (); */ NS_IMETHODIMP UndoTxn::RedoTransaction() { return NS_ERROR_NOT_IMPLEMENTED; } -/* void doTransaction (); */ NS_IMETHODIMP UndoTxn::UndoTransaction() { return NS_ERROR_NOT_IMPLEMENTED; } -/* readonly attribute boolean isTransient; */ NS_IMETHODIMP UndoTxn::GetIsTransient(bool* aIsTransient) { @@ -88,7 +84,6 @@ UndoTxn::GetIsTransient(bool* aIsTransient) return NS_OK; } -/* boolean merge (in nsITransaction aTransaction); */ NS_IMETHODIMP UndoTxn::Merge(nsITransaction* aTransaction, bool* aResult) { diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp index 73d21eb672c..e5936e6ebab 100644 --- a/dom/html/nsHTMLDocument.cpp +++ b/dom/html/nsHTMLDocument.cpp @@ -2476,7 +2476,6 @@ nsHTMLDocument::GenerateParserKey(void) return script; } -/* attribute DOMString designMode; */ NS_IMETHODIMP nsHTMLDocument::GetDesignMode(nsAString & aDesignMode) { @@ -3329,7 +3328,6 @@ nsHTMLDocument::ExecCommand(const nsAString& commandID, return !rv.Failed(); } -/* boolean queryCommandEnabled(in DOMString commandID); */ NS_IMETHODIMP nsHTMLDocument::QueryCommandEnabled(const nsAString& commandID, bool* _retval) @@ -3384,7 +3382,6 @@ nsHTMLDocument::QueryCommandEnabled(const nsAString& commandID, ErrorResult& rv) return retval; } -/* boolean queryCommandIndeterm (in DOMString commandID); */ NS_IMETHODIMP nsHTMLDocument::QueryCommandIndeterm(const nsAString & commandID, bool *_retval) @@ -3442,7 +3439,6 @@ nsHTMLDocument::QueryCommandIndeterm(const nsAString& commandID, ErrorResult& rv return retval; } -/* boolean queryCommandState(in DOMString commandID); */ NS_IMETHODIMP nsHTMLDocument::QueryCommandState(const nsAString & commandID, bool *_retval) { @@ -3526,7 +3522,6 @@ nsHTMLDocument::QueryCommandState(const nsAString& commandID, ErrorResult& rv) return retval; } -/* boolean queryCommandSupported(in DOMString commandID); */ NS_IMETHODIMP nsHTMLDocument::QueryCommandSupported(const nsAString & commandID, bool *_retval) @@ -3561,7 +3556,6 @@ nsHTMLDocument::QueryCommandSupported(const nsAString& commandID) return ConvertToMidasInternalCommand(commandID, cmdToDispatch); } -/* DOMString queryCommandValue(in DOMString commandID); */ NS_IMETHODIMP nsHTMLDocument::QueryCommandValue(const nsAString & commandID, nsAString &_retval) diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 1a0f7829b6b..17dc2ade91d 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -3046,7 +3046,6 @@ NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(TabChildGlobal, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(TabChildGlobal, DOMEventTargetHelper) -/* [notxpcom] boolean markForCC (); */ // This method isn't automatically forwarded safely because it's notxpcom, so // the IDL binding doesn't know what value to return. NS_IMETHODIMP_(bool) diff --git a/dom/svg/SVGGradientElement.cpp b/dom/svg/SVGGradientElement.cpp index f664213d2fe..e841e11285b 100644 --- a/dom/svg/SVGGradientElement.cpp +++ b/dom/svg/SVGGradientElement.cpp @@ -77,7 +77,6 @@ SVGGradientElement::GradientUnits() return mEnumAttributes[GRADIENTUNITS].ToDOMAnimatedEnum(this); } -/* readonly attribute SVGAnimatedTransformList gradientTransform; */ already_AddRefed SVGGradientElement::GradientTransform() { diff --git a/dom/svg/SVGSVGElement.cpp b/dom/svg/SVGSVGElement.cpp index 97295713f13..3c538565b5a 100644 --- a/dom/svg/SVGSVGElement.cpp +++ b/dom/svg/SVGSVGElement.cpp @@ -291,14 +291,12 @@ SVGSVGElement::SuspendRedraw(uint32_t max_wait_milliseconds) return 1; } -/* void unsuspendRedraw (in unsigned long suspend_handle_id); */ void SVGSVGElement::UnsuspendRedraw(uint32_t suspend_handle_id) { // no-op } -/* void unsuspendRedrawAll (); */ void SVGSVGElement::UnsuspendRedrawAll() { diff --git a/dom/svg/nsSVGElement.cpp b/dom/svg/nsSVGElement.cpp index 216c8adafa1..50125d05ad3 100644 --- a/dom/svg/nsSVGElement.cpp +++ b/dom/svg/nsSVGElement.cpp @@ -101,7 +101,6 @@ nsSVGElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) //---------------------------------------------------------------------- -/* readonly attribute SVGAnimatedString className; */ NS_IMETHODIMP nsSVGElement::GetSVGClassName(nsISupports** aClassName) { @@ -109,7 +108,6 @@ nsSVGElement::GetSVGClassName(nsISupports** aClassName) return NS_OK; } -/* readonly attribute nsIDOMCSSStyleDeclaration style; */ NS_IMETHODIMP nsSVGElement::GetStyle(nsIDOMCSSStyleDeclaration** aStyle) { @@ -1084,7 +1082,6 @@ nsSVGElement::sMaskMap[] = { //---------------------------------------------------------------------- // nsIDOMSVGElement methods -/* readonly attribute nsIDOMSVGSVGElement ownerSVGElement; */ NS_IMETHODIMP nsSVGElement::GetOwnerSVGElement(nsIDOMSVGElement * *aOwnerSVGElement) { @@ -1098,7 +1095,6 @@ nsSVGElement::GetOwnerSVGElement() return GetCtx(); // this may return nullptr } -/* readonly attribute nsIDOMSVGElement viewportElement; */ NS_IMETHODIMP nsSVGElement::GetViewportElement(nsIDOMSVGElement * *aViewportElement) { diff --git a/dom/system/gonk/nsVolumeMountLock.cpp b/dom/system/gonk/nsVolumeMountLock.cpp index 0bb4fbd1112..75a323985d4 100644 --- a/dom/system/gonk/nsVolumeMountLock.cpp +++ b/dom/system/gonk/nsVolumeMountLock.cpp @@ -81,7 +81,6 @@ nsresult nsVolumeMountLock::Init() return Lock(vol); } -/* void unlock (); */ NS_IMETHODIMP nsVolumeMountLock::Unlock() { LOG("nsVolumeMountLock released for '%s'", diff --git a/dom/system/gonk/nsVolumeStat.cpp b/dom/system/gonk/nsVolumeStat.cpp index 87cbc94e214..11976237f7a 100644 --- a/dom/system/gonk/nsVolumeStat.cpp +++ b/dom/system/gonk/nsVolumeStat.cpp @@ -17,14 +17,12 @@ nsVolumeStat::nsVolumeStat(const nsAString& aPath) } } -/* readonly attribute long long totalBytes; */ NS_IMETHODIMP nsVolumeStat::GetTotalBytes(int64_t* aTotalBytes) { *aTotalBytes = mStat.f_blocks * mStat.f_bsize; return NS_OK; } -/* readonly attribute long long freeBytes; */ NS_IMETHODIMP nsVolumeStat::GetFreeBytes(int64_t* aFreeBytes) { *aFreeBytes = mStat.f_bfree * mStat.f_bsize; diff --git a/dom/xul/nsXULControllers.cpp b/dom/xul/nsXULControllers.cpp index d7b5bd24b65..57869faf29b 100644 --- a/dom/xul/nsXULControllers.cpp +++ b/dom/xul/nsXULControllers.cpp @@ -201,7 +201,6 @@ nsXULControllers::RemoveController(nsIController *controller) return NS_ERROR_FAILURE; // right thing to return if no controller found? } -/* unsigned long getControllerId (in nsIController controller); */ NS_IMETHODIMP nsXULControllers::GetControllerId(nsIController *controller, uint32_t *_retval) { @@ -225,7 +224,6 @@ nsXULControllers::GetControllerId(nsIController *controller, uint32_t *_retval) return NS_ERROR_FAILURE; // none found } -/* nsIController getControllerById (in unsigned long controllerID); */ NS_IMETHODIMP nsXULControllers::GetControllerById(uint32_t controllerID, nsIController **_retval) { diff --git a/dom/xul/templates/nsXULTreeBuilder.cpp b/dom/xul/templates/nsXULTreeBuilder.cpp index f94fbd9d1c5..440390db685 100644 --- a/dom/xul/templates/nsXULTreeBuilder.cpp +++ b/dom/xul/templates/nsXULTreeBuilder.cpp @@ -1840,7 +1840,6 @@ nsXULTreeBuilder::SortSubtree(nsTreeRows::Subtree* aSubtree) } -/* boolean canDrop (in long index, in long orientation); */ NS_IMETHODIMP nsXULTreeBuilder::CanDrop(int32_t index, int32_t orientation, nsIDOMDataTransfer* dataTransfer, bool *_retval) diff --git a/editor/composer/nsEditorSpellCheck.cpp b/editor/composer/nsEditorSpellCheck.cpp index dce38130558..575c723c460 100644 --- a/editor/composer/nsEditorSpellCheck.cpp +++ b/editor/composer/nsEditorSpellCheck.cpp @@ -666,7 +666,6 @@ nsEditorSpellCheck::UninitSpellChecker() } -/* void setFilter (in nsITextServicesFilter filter); */ NS_IMETHODIMP nsEditorSpellCheck::SetFilter(nsITextServicesFilter *filter) { diff --git a/editor/libeditor/nsEditor.cpp b/editor/libeditor/nsEditor.cpp index d9bd3a26cc0..c4525c8393f 100644 --- a/editor/libeditor/nsEditor.cpp +++ b/editor/libeditor/nsEditor.cpp @@ -600,7 +600,6 @@ nsEditor::GetWidget() return widget.forget(); } -/* attribute string contentsMIMEType; */ NS_IMETHODIMP nsEditor::GetContentsMIMEType(char * *aContentsMIMEType) { diff --git a/editor/txmgr/nsTransactionList.cpp b/editor/txmgr/nsTransactionList.cpp index a960df92a85..692ede8fa79 100644 --- a/editor/txmgr/nsTransactionList.cpp +++ b/editor/txmgr/nsTransactionList.cpp @@ -39,7 +39,6 @@ nsTransactionList::~nsTransactionList() mTxnItem = 0; } -/* readonly attribute long numItems; */ NS_IMETHODIMP nsTransactionList::GetNumItems(int32_t *aNumItems) { NS_ENSURE_TRUE(aNumItems, NS_ERROR_NULL_POINTER); @@ -60,7 +59,6 @@ NS_IMETHODIMP nsTransactionList::GetNumItems(int32_t *aNumItems) return result; } -/* boolean itemIsBatch (in long aIndex); */ NS_IMETHODIMP nsTransactionList::ItemIsBatch(int32_t aIndex, bool *aIsBatch) { NS_ENSURE_TRUE(aIsBatch, NS_ERROR_NULL_POINTER); @@ -123,7 +121,6 @@ NS_IMETHODIMP nsTransactionList::GetData(int32_t aIndex, return NS_OK; } -/* nsITransaction getItem (in long aIndex); */ NS_IMETHODIMP nsTransactionList::GetItem(int32_t aIndex, nsITransaction **aItem) { NS_ENSURE_TRUE(aItem, NS_ERROR_NULL_POINTER); @@ -152,7 +149,6 @@ NS_IMETHODIMP nsTransactionList::GetItem(int32_t aIndex, nsITransaction **aItem) return NS_OK; } -/* long getNumChildrenForItem (in long aIndex); */ NS_IMETHODIMP nsTransactionList::GetNumChildrenForItem(int32_t aIndex, int32_t *aNumChildren) { NS_ENSURE_TRUE(aNumChildren, NS_ERROR_NULL_POINTER); @@ -179,7 +175,6 @@ NS_IMETHODIMP nsTransactionList::GetNumChildrenForItem(int32_t aIndex, int32_t * return item->GetNumberOfChildren(aNumChildren); } -/* nsITransactionList getChildListForItem (in long aIndex); */ NS_IMETHODIMP nsTransactionList::GetChildListForItem(int32_t aIndex, nsITransactionList **aTxnList) { NS_ENSURE_TRUE(aTxnList, NS_ERROR_NULL_POINTER); diff --git a/embedding/components/printingui/mac/nsPrintProgress.cpp b/embedding/components/printingui/mac/nsPrintProgress.cpp index 29c52daf688..e5d6325aa3b 100644 --- a/embedding/components/printingui/mac/nsPrintProgress.cpp +++ b/embedding/components/printingui/mac/nsPrintProgress.cpp @@ -35,7 +35,6 @@ nsPrintProgress::~nsPrintProgress() (void)ReleaseListeners(); } -/* void openProgressDialog (in nsIDOMWindow parent, in string dialogURL, in nsISupports parameters); */ NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindow *parent, const char *dialogURL, nsISupports *parameters, @@ -49,7 +48,6 @@ NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindow *parent, return NS_ERROR_NOT_IMPLEMENTED; } -/* void closeProgressDialog (in boolean forceClose); */ NS_IMETHODIMP nsPrintProgress::CloseProgressDialog(bool forceClose) { MOZ_ASSERT_UNREACHABLE("The nsPrintingPromptService::ShowProgress " @@ -59,7 +57,6 @@ NS_IMETHODIMP nsPrintProgress::CloseProgressDialog(bool forceClose) return NS_ERROR_NOT_IMPLEMENTED; } -/* nsIPrompt GetPrompter (); */ NS_IMETHODIMP nsPrintProgress::GetPrompter(nsIPrompt **_retval) { NS_ENSURE_ARG_POINTER(_retval); @@ -71,7 +68,6 @@ NS_IMETHODIMP nsPrintProgress::GetPrompter(nsIPrompt **_retval) return NS_ERROR_FAILURE; } -/* attribute boolean processCanceledByUser; */ NS_IMETHODIMP nsPrintProgress::GetProcessCanceledByUser(bool *aProcessCanceledByUser) { NS_ENSURE_ARG_POINTER(aProcessCanceledByUser); @@ -85,7 +81,6 @@ NS_IMETHODIMP nsPrintProgress::SetProcessCanceledByUser(bool aProcessCanceledByU return NS_OK; } -/* void RegisterListener (in nsIWebProgressListener listener); */ NS_IMETHODIMP nsPrintProgress::RegisterListener(nsIWebProgressListener * listener) { if (!listener) //Nothing to do with a null listener! @@ -105,7 +100,6 @@ NS_IMETHODIMP nsPrintProgress::RegisterListener(nsIWebProgressListener * listene return NS_OK; } -/* void UnregisterListener (in nsIWebProgressListener listener); */ NS_IMETHODIMP nsPrintProgress::UnregisterListener(nsIWebProgressListener *listener) { if (listener) @@ -114,7 +108,6 @@ NS_IMETHODIMP nsPrintProgress::UnregisterListener(nsIWebProgressListener *listen return NS_OK; } -/* void doneIniting (); */ NS_IMETHODIMP nsPrintProgress::DoneIniting() { if (m_observer) { @@ -123,7 +116,6 @@ NS_IMETHODIMP nsPrintProgress::DoneIniting() return NS_OK; } -/* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long aStateFlags, in nsresult aStatus); */ NS_IMETHODIMP nsPrintProgress::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t aStateFlags, nsresult aStatus) { m_pendingStateFlags = aStateFlags; @@ -140,7 +132,6 @@ NS_IMETHODIMP nsPrintProgress::OnStateChange(nsIWebProgress *aWebProgress, nsIRe return NS_OK; } -/* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */ NS_IMETHODIMP nsPrintProgress::OnProgressChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, int32_t aCurSelfProgress, int32_t aMaxSelfProgress, int32_t aCurTotalProgress, int32_t aMaxTotalProgress) { uint32_t count = m_listenerList.Count(); @@ -154,13 +145,11 @@ NS_IMETHODIMP nsPrintProgress::OnProgressChange(nsIWebProgress *aWebProgress, ns return NS_OK; } -/* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location, in unsigned long aFlags); */ NS_IMETHODIMP nsPrintProgress::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsIURI *location, uint32_t aFlags) { return NS_OK; } -/* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */ NS_IMETHODIMP nsPrintProgress::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsresult aStatus, const char16_t *aMessage) { if (aMessage && *aMessage) @@ -177,7 +166,6 @@ NS_IMETHODIMP nsPrintProgress::OnStatusChange(nsIWebProgress *aWebProgress, nsIR return NS_OK; } -/* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long state); */ NS_IMETHODIMP nsPrintProgress::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t state) { return NS_OK; @@ -194,31 +182,26 @@ NS_IMETHODIMP nsPrintProgress::ShowStatusString(const char16_t *status) return OnStatusChange(nullptr, nullptr, NS_OK, status); } -/* void startMeteors (); */ NS_IMETHODIMP nsPrintProgress::StartMeteors() { return NS_ERROR_NOT_IMPLEMENTED; } -/* void stopMeteors (); */ NS_IMETHODIMP nsPrintProgress::StopMeteors() { return NS_ERROR_NOT_IMPLEMENTED; } -/* void showProgress (in long percent); */ NS_IMETHODIMP nsPrintProgress::ShowProgress(int32_t percent) { return NS_ERROR_NOT_IMPLEMENTED; } -/* [noscript] void setDocShell (in nsIDocShell shell, in nsIDOMWindow window); */ NS_IMETHODIMP nsPrintProgress::SetDocShell(nsIDocShell *shell, nsIDOMWindow *window) { return NS_ERROR_NOT_IMPLEMENTED; } -/* void closeWindow (); */ NS_IMETHODIMP nsPrintProgress::CloseWindow() { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/embedding/components/printingui/mac/nsPrintProgressParams.cpp b/embedding/components/printingui/mac/nsPrintProgressParams.cpp index a2ffb1184ba..eba86b29875 100644 --- a/embedding/components/printingui/mac/nsPrintProgressParams.cpp +++ b/embedding/components/printingui/mac/nsPrintProgressParams.cpp @@ -17,7 +17,6 @@ nsPrintProgressParams::~nsPrintProgressParams() { } -/* attribute wstring docTitle; */ NS_IMETHODIMP nsPrintProgressParams::GetDocTitle(char16_t * *aDocTitle) { NS_ENSURE_ARG(aDocTitle); @@ -32,7 +31,6 @@ NS_IMETHODIMP nsPrintProgressParams::SetDocTitle(const char16_t * aDocTitle) return NS_OK; } -/* attribute wstring docURL; */ NS_IMETHODIMP nsPrintProgressParams::GetDocURL(char16_t * *aDocURL) { NS_ENSURE_ARG(aDocURL); diff --git a/embedding/components/printingui/unixshared/nsPrintProgress.cpp b/embedding/components/printingui/unixshared/nsPrintProgress.cpp index 66f04b5cd2f..c206720b5cf 100644 --- a/embedding/components/printingui/unixshared/nsPrintProgress.cpp +++ b/embedding/components/printingui/unixshared/nsPrintProgress.cpp @@ -42,7 +42,6 @@ nsPrintProgress::~nsPrintProgress() (void)ReleaseListeners(); } -/* void openProgressDialog (in nsIDOMWindow parent, in string dialogURL, in nsISupports parameters); */ NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindow *parent, const char *dialogURL, nsISupports *parameters, @@ -105,7 +104,6 @@ NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindow *parent, return rv; } -/* void closeProgressDialog (in boolean forceClose); */ NS_IMETHODIMP nsPrintProgress::CloseProgressDialog(bool forceClose) { m_closeProgress = true; @@ -114,7 +112,6 @@ NS_IMETHODIMP nsPrintProgress::CloseProgressDialog(bool forceClose) (nsresult)forceClose); } -/* nsIPrompt GetPrompter (); */ NS_IMETHODIMP nsPrintProgress::GetPrompter(nsIPrompt **_retval) { NS_ENSURE_ARG_POINTER(_retval); @@ -126,7 +123,6 @@ NS_IMETHODIMP nsPrintProgress::GetPrompter(nsIPrompt **_retval) return NS_ERROR_FAILURE; } -/* attribute boolean processCanceledByUser; */ NS_IMETHODIMP nsPrintProgress::GetProcessCanceledByUser(bool *aProcessCanceledByUser) { NS_ENSURE_ARG_POINTER(aProcessCanceledByUser); @@ -142,7 +138,6 @@ NS_IMETHODIMP nsPrintProgress::SetProcessCanceledByUser(bool aProcessCanceledByU return NS_OK; } -/* void RegisterListener (in nsIWebProgressListener listener); */ NS_IMETHODIMP nsPrintProgress::RegisterListener(nsIWebProgressListener * listener) { if (!listener) //Nothing to do with a null listener! @@ -161,7 +156,6 @@ NS_IMETHODIMP nsPrintProgress::RegisterListener(nsIWebProgressListener * listene return NS_OK; } -/* void UnregisterListener (in nsIWebProgressListener listener); */ NS_IMETHODIMP nsPrintProgress::UnregisterListener(nsIWebProgressListener *listener) { if (listener) @@ -170,7 +164,6 @@ NS_IMETHODIMP nsPrintProgress::UnregisterListener(nsIWebProgressListener *listen return NS_OK; } -/* void doneIniting (); */ NS_IMETHODIMP nsPrintProgress::DoneIniting() { if (m_observer) { @@ -179,7 +172,6 @@ NS_IMETHODIMP nsPrintProgress::DoneIniting() return NS_OK; } -/* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long aStateFlags, in nsresult aStatus); */ NS_IMETHODIMP nsPrintProgress::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t aStateFlags, nsresult aStatus) { m_pendingStateFlags = aStateFlags; @@ -196,7 +188,6 @@ NS_IMETHODIMP nsPrintProgress::OnStateChange(nsIWebProgress *aWebProgress, nsIRe return NS_OK; } -/* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */ NS_IMETHODIMP nsPrintProgress::OnProgressChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, int32_t aCurSelfProgress, int32_t aMaxSelfProgress, int32_t aCurTotalProgress, int32_t aMaxTotalProgress) { uint32_t count = m_listenerList.Count(); @@ -210,13 +201,11 @@ NS_IMETHODIMP nsPrintProgress::OnProgressChange(nsIWebProgress *aWebProgress, ns return NS_OK; } -/* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location, in unsigned long aFlags); */ NS_IMETHODIMP nsPrintProgress::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsIURI *location, uint32_t aFlags) { return NS_ERROR_NOT_IMPLEMENTED; } -/* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */ NS_IMETHODIMP nsPrintProgress::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsresult aStatus, const char16_t *aMessage) { if (aMessage && *aMessage) @@ -233,7 +222,6 @@ NS_IMETHODIMP nsPrintProgress::OnStatusChange(nsIWebProgress *aWebProgress, nsIR return NS_OK; } -/* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long state); */ NS_IMETHODIMP nsPrintProgress::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t state) { return NS_OK; @@ -251,31 +239,26 @@ NS_IMETHODIMP nsPrintProgress::ShowStatusString(const char16_t *status) return OnStatusChange(nullptr, nullptr, NS_OK, status); } -/* void startMeteors (); */ NS_IMETHODIMP nsPrintProgress::StartMeteors() { return NS_ERROR_NOT_IMPLEMENTED; } -/* void stopMeteors (); */ NS_IMETHODIMP nsPrintProgress::StopMeteors() { return NS_ERROR_NOT_IMPLEMENTED; } -/* void showProgress (in long percent); */ NS_IMETHODIMP nsPrintProgress::ShowProgress(int32_t percent) { return NS_ERROR_NOT_IMPLEMENTED; } -/* [noscript] void setDocShell (in nsIDocShell shell, in nsIDOMWindow window); */ NS_IMETHODIMP nsPrintProgress::SetDocShell(nsIDocShell *shell, nsIDOMWindow *window) { return NS_ERROR_NOT_IMPLEMENTED; } -/* void closeWindow (); */ NS_IMETHODIMP nsPrintProgress::CloseWindow() { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/embedding/components/printingui/unixshared/nsPrintProgressParams.cpp b/embedding/components/printingui/unixshared/nsPrintProgressParams.cpp index a2ffb1184ba..eba86b29875 100644 --- a/embedding/components/printingui/unixshared/nsPrintProgressParams.cpp +++ b/embedding/components/printingui/unixshared/nsPrintProgressParams.cpp @@ -17,7 +17,6 @@ nsPrintProgressParams::~nsPrintProgressParams() { } -/* attribute wstring docTitle; */ NS_IMETHODIMP nsPrintProgressParams::GetDocTitle(char16_t * *aDocTitle) { NS_ENSURE_ARG(aDocTitle); @@ -32,7 +31,6 @@ NS_IMETHODIMP nsPrintProgressParams::SetDocTitle(const char16_t * aDocTitle) return NS_OK; } -/* attribute wstring docURL; */ NS_IMETHODIMP nsPrintProgressParams::GetDocURL(char16_t * *aDocURL) { NS_ENSURE_ARG(aDocURL); diff --git a/embedding/components/printingui/unixshared/nsPrintingPromptService.cpp b/embedding/components/printingui/unixshared/nsPrintingPromptService.cpp index 9b94e3fdb29..1cdce8c50be 100644 --- a/embedding/components/printingui/unixshared/nsPrintingPromptService.cpp +++ b/embedding/components/printingui/unixshared/nsPrintingPromptService.cpp @@ -71,7 +71,6 @@ nsPrintingPromptService::Init() return rv; } -/* void showPrintDialog (in nsIDOMWindow parent, in nsIWebBrowserPrint webBrowserPrint, in nsIPrintSettings printSettings); */ NS_IMETHODIMP nsPrintingPromptService::ShowPrintDialog(nsIDOMWindow *parent, nsIWebBrowserPrint *webBrowserPrint, nsIPrintSettings *printSettings) { @@ -94,7 +93,6 @@ nsPrintingPromptService::ShowPrintDialog(nsIDOMWindow *parent, nsIWebBrowserPrin return DoDialog(parent, block, webBrowserPrint, printSettings, kPrintDialogURL); } -/* void showProgress (in nsIDOMWindow parent, in nsIWebBrowserPrint webBrowserPrint, in nsIPrintSettings printSettings, in nsIObserver openDialogObserver, in boolean isForPrinting, out nsIWebProgressListener webProgressListener, out nsIPrintProgressParams printProgressParams, out boolean notifyOnOpen); */ NS_IMETHODIMP nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, nsIWebBrowserPrint* webBrowserPrint, // ok to be null @@ -135,7 +133,6 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, return NS_OK; } -/* void showPageSetup (in nsIDOMWindow parent, in nsIPrintSettings printSettings); */ NS_IMETHODIMP nsPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *printSettings, nsIObserver *aObs) { @@ -156,7 +153,6 @@ nsPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *p return DoDialog(parent, block, nullptr, printSettings, kPageSetupDialogURL); } -/* void showPrinterProperties (in nsIDOMWindow parent, in wstring printerName, in nsIPrintSettings printSettings); */ NS_IMETHODIMP nsPrintingPromptService::ShowPrinterProperties(nsIDOMWindow *parent, const char16_t *printerName, nsIPrintSettings *printSettings) { @@ -251,7 +247,6 @@ nsPrintingPromptService::DoDialog(nsIDOMWindow *aParent, // nsIWebProgressListener ////////////////////////////////////////////////////////////////////// -/* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long aStateFlags, in nsresult aStatus); */ NS_IMETHODIMP nsPrintingPromptService::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t aStateFlags, nsresult aStatus) { @@ -266,7 +261,6 @@ nsPrintingPromptService::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest return NS_OK; } -/* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */ NS_IMETHODIMP nsPrintingPromptService::OnProgressChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, int32_t aCurSelfProgress, int32_t aMaxSelfProgress, int32_t aCurTotalProgress, int32_t aMaxTotalProgress) { @@ -276,7 +270,6 @@ nsPrintingPromptService::OnProgressChange(nsIWebProgress *aWebProgress, nsIReque return NS_OK; } -/* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location, in unsigned long aFlags); */ NS_IMETHODIMP nsPrintingPromptService::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsIURI *location, uint32_t aFlags) { @@ -286,7 +279,6 @@ nsPrintingPromptService::OnLocationChange(nsIWebProgress *aWebProgress, nsIReque return NS_OK; } -/* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */ NS_IMETHODIMP nsPrintingPromptService::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsresult aStatus, const char16_t *aMessage) { @@ -296,7 +288,6 @@ nsPrintingPromptService::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest return NS_OK; } -/* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long state); */ NS_IMETHODIMP nsPrintingPromptService::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t state) { diff --git a/embedding/components/printingui/win/nsPrintProgress.cpp b/embedding/components/printingui/win/nsPrintProgress.cpp index 1edb75b45f7..62dc0ca0446 100644 --- a/embedding/components/printingui/win/nsPrintProgress.cpp +++ b/embedding/components/printingui/win/nsPrintProgress.cpp @@ -69,7 +69,6 @@ nsPrintProgress::~nsPrintProgress() (void)ReleaseListeners(); } -/* void openProgressDialog (in nsIDOMWindow parent, in string dialogURL, in nsISupports parameters); */ NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindow *parent, const char *dialogURL, nsISupports *parameters, @@ -132,7 +131,6 @@ NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindow *parent, return rv; } -/* void closeProgressDialog (in boolean forceClose); */ NS_IMETHODIMP nsPrintProgress::CloseProgressDialog(bool forceClose) { m_closeProgress = true; @@ -141,7 +139,6 @@ NS_IMETHODIMP nsPrintProgress::CloseProgressDialog(bool forceClose) static_cast(forceClose)); } -/* nsIPrompt GetPrompter (); */ NS_IMETHODIMP nsPrintProgress::GetPrompter(nsIPrompt **_retval) { NS_ENSURE_ARG_POINTER(_retval); @@ -153,7 +150,6 @@ NS_IMETHODIMP nsPrintProgress::GetPrompter(nsIPrompt **_retval) return NS_ERROR_FAILURE; } -/* attribute boolean processCanceledByUser; */ NS_IMETHODIMP nsPrintProgress::GetProcessCanceledByUser(bool *aProcessCanceledByUser) { NS_ENSURE_ARG_POINTER(aProcessCanceledByUser); @@ -167,7 +163,6 @@ NS_IMETHODIMP nsPrintProgress::SetProcessCanceledByUser(bool aProcessCanceledByU return NS_OK; } -/* void RegisterListener (in nsIWebProgressListener listener); */ NS_IMETHODIMP nsPrintProgress::RegisterListener(nsIWebProgressListener * listener) { if (!listener) //Nothing to do with a null listener! @@ -187,7 +182,6 @@ NS_IMETHODIMP nsPrintProgress::RegisterListener(nsIWebProgressListener * listene return NS_OK; } -/* void UnregisterListener (in nsIWebProgressListener listener); */ NS_IMETHODIMP nsPrintProgress::UnregisterListener(nsIWebProgressListener *listener) { if (listener) @@ -196,7 +190,6 @@ NS_IMETHODIMP nsPrintProgress::UnregisterListener(nsIWebProgressListener *listen return NS_OK; } -/* void doneIniting (); */ NS_IMETHODIMP nsPrintProgress::DoneIniting() { if (m_observer) { @@ -205,7 +198,6 @@ NS_IMETHODIMP nsPrintProgress::DoneIniting() return NS_OK; } -/* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long aStateFlags, in nsresult aStatus); */ NS_IMETHODIMP nsPrintProgress::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t aStateFlags, nsresult aStatus) { m_pendingStateFlags = aStateFlags; @@ -222,7 +214,6 @@ NS_IMETHODIMP nsPrintProgress::OnStateChange(nsIWebProgress *aWebProgress, nsIRe return NS_OK; } -/* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */ NS_IMETHODIMP nsPrintProgress::OnProgressChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, int32_t aCurSelfProgress, int32_t aMaxSelfProgress, int32_t aCurTotalProgress, int32_t aMaxTotalProgress) { uint32_t count = m_listenerList.Count(); @@ -236,13 +227,11 @@ NS_IMETHODIMP nsPrintProgress::OnProgressChange(nsIWebProgress *aWebProgress, ns return NS_OK; } -/* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location, in unsigned long aFlags); */ NS_IMETHODIMP nsPrintProgress::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsIURI *location, uint32_t aFlags) { return NS_OK; } -/* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */ NS_IMETHODIMP nsPrintProgress::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsresult aStatus, const char16_t *aMessage) { if (aMessage && *aMessage) @@ -259,7 +248,6 @@ NS_IMETHODIMP nsPrintProgress::OnStatusChange(nsIWebProgress *aWebProgress, nsIR return NS_OK; } -/* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long state); */ NS_IMETHODIMP nsPrintProgress::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t state) { return NS_OK; @@ -276,31 +264,26 @@ NS_IMETHODIMP nsPrintProgress::ShowStatusString(const char16_t *status) return OnStatusChange(nullptr, nullptr, NS_OK, status); } -/* void startMeteors (); */ NS_IMETHODIMP nsPrintProgress::StartMeteors() { return NS_ERROR_NOT_IMPLEMENTED; } -/* void stopMeteors (); */ NS_IMETHODIMP nsPrintProgress::StopMeteors() { return NS_ERROR_NOT_IMPLEMENTED; } -/* void showProgress (in long percent); */ NS_IMETHODIMP nsPrintProgress::ShowProgress(int32_t percent) { return NS_ERROR_NOT_IMPLEMENTED; } -/* [noscript] void setDocShell (in nsIDocShell shell, in nsIDOMWindow window); */ NS_IMETHODIMP nsPrintProgress::SetDocShell(nsIDocShell *shell, nsIDOMWindow *window) { return NS_ERROR_NOT_IMPLEMENTED; } -/* void closeWindow (); */ NS_IMETHODIMP nsPrintProgress::CloseWindow() { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/embedding/components/printingui/win/nsPrintProgressParams.cpp b/embedding/components/printingui/win/nsPrintProgressParams.cpp index a2ffb1184ba..eba86b29875 100644 --- a/embedding/components/printingui/win/nsPrintProgressParams.cpp +++ b/embedding/components/printingui/win/nsPrintProgressParams.cpp @@ -17,7 +17,6 @@ nsPrintProgressParams::~nsPrintProgressParams() { } -/* attribute wstring docTitle; */ NS_IMETHODIMP nsPrintProgressParams::GetDocTitle(char16_t * *aDocTitle) { NS_ENSURE_ARG(aDocTitle); @@ -32,7 +31,6 @@ NS_IMETHODIMP nsPrintProgressParams::SetDocTitle(const char16_t * aDocTitle) return NS_OK; } -/* attribute wstring docURL; */ NS_IMETHODIMP nsPrintProgressParams::GetDocURL(char16_t * *aDocURL) { NS_ENSURE_ARG(aDocURL); diff --git a/embedding/components/printingui/win/nsPrintingPromptService.cpp b/embedding/components/printingui/win/nsPrintingPromptService.cpp index e769a1bf2f2..088b4540ba9 100644 --- a/embedding/components/printingui/win/nsPrintingPromptService.cpp +++ b/embedding/components/printingui/win/nsPrintingPromptService.cpp @@ -157,7 +157,6 @@ nsPrintingPromptService::ShowPrintDialog(nsIDOMWindow *parent, nsIWebBrowserPrin } -/* void showProgress (in nsIDOMWindow parent, in nsIWebBrowserPrint webBrowserPrint, in nsIPrintSettings printSettings, in nsIObserver openDialogObserver, in boolean isForPrinting, out nsIWebProgressListener webProgressListener, out nsIPrintProgressParams printProgressParams, out boolean notifyOnOpen); */ NS_IMETHODIMP nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, nsIWebBrowserPrint* webBrowserPrint, // ok to be null @@ -203,7 +202,6 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, return NS_OK; } -/* void showPageSetup (in nsIDOMWindow parent, in nsIPrintSettings printSettings); */ NS_IMETHODIMP nsPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *printSettings, nsIObserver *aObs) { @@ -229,7 +227,6 @@ nsPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *p return rv; } -/* void showPrinterProperties (in nsIDOMWindow parent, in wstring printerName, in nsIPrintSettings printSettings); */ NS_IMETHODIMP nsPrintingPromptService::ShowPrinterProperties(nsIDOMWindow *parent, const char16_t *printerName, nsIPrintSettings *printSettings) { @@ -293,7 +290,6 @@ nsPrintingPromptService::DoDialog(nsIDOMWindow *aParent, // nsIWebProgressListener ////////////////////////////////////////////////////////////////////// -/* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aStateFlags, in nsresult aStatus); */ NS_IMETHODIMP nsPrintingPromptService::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t aStateFlags, nsresult aStatus) { @@ -310,7 +306,6 @@ nsPrintingPromptService::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest return NS_OK; } -/* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */ NS_IMETHODIMP nsPrintingPromptService::OnProgressChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, int32_t aCurSelfProgress, int32_t aMaxSelfProgress, int32_t aCurTotalProgress, int32_t aMaxTotalProgress) { @@ -321,7 +316,6 @@ nsPrintingPromptService::OnProgressChange(nsIWebProgress *aWebProgress, nsIReque return NS_ERROR_FAILURE; } -/* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location, in unsigned long aFlags); */ NS_IMETHODIMP nsPrintingPromptService::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsIURI *location, uint32_t aFlags) { @@ -332,7 +326,6 @@ nsPrintingPromptService::OnLocationChange(nsIWebProgress *aWebProgress, nsIReque return NS_ERROR_FAILURE; } -/* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */ NS_IMETHODIMP nsPrintingPromptService::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsresult aStatus, const char16_t *aMessage) { @@ -343,7 +336,6 @@ nsPrintingPromptService::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest return NS_ERROR_FAILURE; } -/* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in unsigned long state); */ NS_IMETHODIMP nsPrintingPromptService::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, uint32_t state) { diff --git a/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp b/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp index d7fbdd05ef3..863dfaa6040 100644 --- a/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp +++ b/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp @@ -270,7 +270,6 @@ NS_IMETHODIMP nsWebBrowserPersist::GetInterface(const nsIID & aIID, void **aIFac // nsWebBrowserPersist::nsIWebBrowserPersist //***************************************************************************** -/* attribute unsigned long persistFlags; */ NS_IMETHODIMP nsWebBrowserPersist::GetPersistFlags(uint32_t *aPersistFlags) { NS_ENSURE_ARG_POINTER(aPersistFlags); @@ -285,7 +284,6 @@ NS_IMETHODIMP nsWebBrowserPersist::SetPersistFlags(uint32_t aPersistFlags) return NS_OK; } -/* readonly attribute unsigned long currentState; */ NS_IMETHODIMP nsWebBrowserPersist::GetCurrentState(uint32_t *aCurrentState) { NS_ENSURE_ARG_POINTER(aCurrentState); @@ -304,7 +302,6 @@ NS_IMETHODIMP nsWebBrowserPersist::GetCurrentState(uint32_t *aCurrentState) return NS_OK; } -/* readonly attribute unsigned long result; */ NS_IMETHODIMP nsWebBrowserPersist::GetResult(nsresult *aResult) { NS_ENSURE_ARG_POINTER(aResult); @@ -312,7 +309,6 @@ NS_IMETHODIMP nsWebBrowserPersist::GetResult(nsresult *aResult) return NS_OK; } -/* attribute nsIWebBrowserPersistProgress progressListener; */ NS_IMETHODIMP nsWebBrowserPersist::GetProgressListener( nsIWebProgressListener * *aProgressListener) { @@ -366,7 +362,6 @@ NS_IMETHODIMP nsWebBrowserPersist::SavePrivacyAwareURI( return NS_FAILED(rv) ? rv : NS_OK; } -/* void saveChannel (in nsIChannel aChannel, in nsISupports aFile); */ NS_IMETHODIMP nsWebBrowserPersist::SaveChannel( nsIChannel *aChannel, nsISupports *aFile) { @@ -480,7 +475,6 @@ NS_IMETHODIMP nsWebBrowserPersist::SaveDocument( return rv; } -/* void cancel(nsresult aReason); */ NS_IMETHODIMP nsWebBrowserPersist::Cancel(nsresult aReason) { mCancel = true; @@ -489,7 +483,6 @@ NS_IMETHODIMP nsWebBrowserPersist::Cancel(nsresult aReason) } -/* void cancelSave(); */ NS_IMETHODIMP nsWebBrowserPersist::CancelSave() { return Cancel(NS_BINDING_ABORTED); diff --git a/extensions/spellcheck/hunspell/src/mozHunspell.cpp b/extensions/spellcheck/hunspell/src/mozHunspell.cpp index 1324be9c832..1a5f7a00aea 100644 --- a/extensions/spellcheck/hunspell/src/mozHunspell.cpp +++ b/extensions/spellcheck/hunspell/src/mozHunspell.cpp @@ -136,7 +136,6 @@ mozHunspell::~mozHunspell() delete mHunspell; } -/* attribute wstring dictionary; */ NS_IMETHODIMP mozHunspell::GetDictionary(char16_t **aDictionary) { NS_ENSURE_ARG_POINTER(aDictionary); @@ -237,7 +236,6 @@ NS_IMETHODIMP mozHunspell::SetDictionary(const char16_t *aDictionary) return NS_OK; } -/* readonly attribute wstring language; */ NS_IMETHODIMP mozHunspell::GetLanguage(char16_t **aLanguage) { NS_ENSURE_ARG_POINTER(aLanguage); @@ -249,7 +247,6 @@ NS_IMETHODIMP mozHunspell::GetLanguage(char16_t **aLanguage) return *aLanguage ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -/* readonly attribute boolean providesPersonalDictionary; */ NS_IMETHODIMP mozHunspell::GetProvidesPersonalDictionary(bool *aProvidesPersonalDictionary) { NS_ENSURE_ARG_POINTER(aProvidesPersonalDictionary); @@ -258,7 +255,6 @@ NS_IMETHODIMP mozHunspell::GetProvidesPersonalDictionary(bool *aProvidesPersonal return NS_OK; } -/* readonly attribute boolean providesWordUtils; */ NS_IMETHODIMP mozHunspell::GetProvidesWordUtils(bool *aProvidesWordUtils) { NS_ENSURE_ARG_POINTER(aProvidesWordUtils); @@ -267,19 +263,16 @@ NS_IMETHODIMP mozHunspell::GetProvidesWordUtils(bool *aProvidesWordUtils) return NS_OK; } -/* readonly attribute wstring name; */ NS_IMETHODIMP mozHunspell::GetName(char16_t * *aName) { return NS_ERROR_NOT_IMPLEMENTED; } -/* readonly attribute wstring copyright; */ NS_IMETHODIMP mozHunspell::GetCopyright(char16_t * *aCopyright) { return NS_ERROR_NOT_IMPLEMENTED; } -/* attribute mozIPersonalDictionary personalDictionary; */ NS_IMETHODIMP mozHunspell::GetPersonalDictionary(mozIPersonalDictionary * *aPersonalDictionary) { *aPersonalDictionary = mPersonalDictionary; @@ -314,7 +307,6 @@ AppendNewString(const nsAString& aString, nsIFile* aFile, void* aClosure) return PL_DHASH_NEXT; } -/* void GetDictionaryList ([array, size_is (count)] out wstring dictionaries, out uint32_t count); */ NS_IMETHODIMP mozHunspell::GetDictionaryList(char16_t ***aDictionaries, uint32_t *aCount) { @@ -519,7 +511,6 @@ nsresult mozHunspell::ConvertCharset(const char16_t* aStr, char ** aDst) return rv; } -/* boolean Check (in wstring word); */ NS_IMETHODIMP mozHunspell::Check(const char16_t *aWord, bool *aResult) { NS_ENSURE_ARG_POINTER(aWord); @@ -539,7 +530,6 @@ NS_IMETHODIMP mozHunspell::Check(const char16_t *aWord, bool *aResult) return rv; } -/* void Suggest (in wstring word, [array, size_is (count)] out wstring suggestions, out uint32_t count); */ NS_IMETHODIMP mozHunspell::Suggest(const char16_t *aWord, char16_t ***aSuggestions, uint32_t *aSuggestionCount) { NS_ENSURE_ARG_POINTER(aSuggestions); @@ -603,7 +593,6 @@ mozHunspell::Observe(nsISupports* aSubj, const char *aTopic, return NS_OK; } -/* void addDirectory(in nsIFile dir); */ NS_IMETHODIMP mozHunspell::AddDirectory(nsIFile *aDir) { mDynamicDirectories.AppendObject(aDir); @@ -611,7 +600,6 @@ NS_IMETHODIMP mozHunspell::AddDirectory(nsIFile *aDir) return NS_OK; } -/* void removeDirectory(in nsIFile dir); */ NS_IMETHODIMP mozHunspell::RemoveDirectory(nsIFile *aDir) { mDynamicDirectories.RemoveObject(aDir); diff --git a/extensions/spellcheck/src/mozEnglishWordUtils.cpp b/extensions/spellcheck/src/mozEnglishWordUtils.cpp index caae9ff4ae0..64450896361 100644 --- a/extensions/spellcheck/src/mozEnglishWordUtils.cpp +++ b/extensions/spellcheck/src/mozEnglishWordUtils.cpp @@ -36,7 +36,6 @@ mozEnglishWordUtils::~mozEnglishWordUtils() { } -/* attribute wstring language; */ NS_IMETHODIMP mozEnglishWordUtils::GetLanguage(char16_t * *aLanguage) { nsresult rv = NS_OK; @@ -47,7 +46,6 @@ NS_IMETHODIMP mozEnglishWordUtils::GetLanguage(char16_t * *aLanguage) return rv; } -/* void GetRootForm (in wstring aWord, in uint32_t type, [array, size_is (count)] out wstring words, out uint32_t count); */ // return the possible root forms of aWord. NS_IMETHODIMP mozEnglishWordUtils::GetRootForm(const char16_t *aWord, uint32_t type, char16_t ***words, uint32_t *count) { @@ -138,7 +136,6 @@ bool mozEnglishWordUtils::ucIsAlpha(char16_t aChar) return nsIUGenCategory::kLetter == mozilla::unicode::GetGenCategory(aChar); } -/* void FindNextWord (in wstring word, in uint32_t length, in uint32_t offset, out uint32_t begin, out uint32_t end); */ NS_IMETHODIMP mozEnglishWordUtils::FindNextWord(const char16_t *word, uint32_t length, uint32_t offset, int32_t *begin, int32_t *end) { const char16_t *p = word + offset; diff --git a/extensions/spellcheck/src/mozGenericWordUtils.cpp b/extensions/spellcheck/src/mozGenericWordUtils.cpp index e83d0906c73..75346d6a79b 100644 --- a/extensions/spellcheck/src/mozGenericWordUtils.cpp +++ b/extensions/spellcheck/src/mozGenericWordUtils.cpp @@ -18,25 +18,21 @@ mozGenericWordUtils::~mozGenericWordUtils() /* destructor code */ } -/* readonly attribute wstring language; */ NS_IMETHODIMP mozGenericWordUtils::GetLanguage(char16_t * *aLanguage) { return NS_ERROR_NOT_IMPLEMENTED; } -/* void GetRootForm (in wstring word, in uint32_t type, [array, size_is (count)] out wstring words, out uint32_t count); */ NS_IMETHODIMP mozGenericWordUtils::GetRootForm(const char16_t *word, uint32_t type, char16_t ***words, uint32_t *count) { return NS_ERROR_NOT_IMPLEMENTED; } -/* void FromRootForm (in wstring word, [array, size_is (icount)] in wstring iwords, in uint32_t icount, [array, size_is (ocount)] out wstring owords, out uint32_t ocount); */ NS_IMETHODIMP mozGenericWordUtils::FromRootForm(const char16_t *word, const char16_t **iwords, uint32_t icount, char16_t ***owords, uint32_t *ocount) { return NS_ERROR_NOT_IMPLEMENTED; } -/* void FindNextWord (in wstring word, in uint32_t length, in uint32_t offset, out uint32_t begin, out uint32_t end); */ NS_IMETHODIMP mozGenericWordUtils::FindNextWord(const char16_t *word, uint32_t length, uint32_t offset, int32_t *begin, int32_t *end) { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/extensions/spellcheck/src/mozPersonalDictionary.cpp b/extensions/spellcheck/src/mozPersonalDictionary.cpp index 302d02d7bd3..44f2fc405a4 100644 --- a/extensions/spellcheck/src/mozPersonalDictionary.cpp +++ b/extensions/spellcheck/src/mozPersonalDictionary.cpp @@ -389,7 +389,6 @@ NS_IMETHODIMP mozPersonalDictionary::Save() return res; } -/* readonly attribute nsIStringEnumerator GetWordList() */ NS_IMETHODIMP mozPersonalDictionary::GetWordList(nsIStringEnumerator **aWords) { NS_ENSURE_ARG_POINTER(aWords); @@ -407,7 +406,6 @@ NS_IMETHODIMP mozPersonalDictionary::GetWordList(nsIStringEnumerator **aWords) return NS_NewAdoptingStringEnumerator(aWords, array); } -/* boolean Check (in wstring word, in wstring language); */ NS_IMETHODIMP mozPersonalDictionary::Check(const char16_t *aWord, const char16_t *aLanguage, bool *aResult) { NS_ENSURE_ARG_POINTER(aWord); @@ -419,7 +417,6 @@ NS_IMETHODIMP mozPersonalDictionary::Check(const char16_t *aWord, const char16_t return NS_OK; } -/* void AddWord (in wstring word); */ NS_IMETHODIMP mozPersonalDictionary::AddWord(const char16_t *aWord, const char16_t *aLang) { nsresult res; @@ -430,7 +427,6 @@ NS_IMETHODIMP mozPersonalDictionary::AddWord(const char16_t *aWord, const char16 return res; } -/* void RemoveWord (in wstring word); */ NS_IMETHODIMP mozPersonalDictionary::RemoveWord(const char16_t *aWord, const char16_t *aLang) { nsresult res; @@ -441,7 +437,6 @@ NS_IMETHODIMP mozPersonalDictionary::RemoveWord(const char16_t *aWord, const cha return res; } -/* void IgnoreWord (in wstring word); */ NS_IMETHODIMP mozPersonalDictionary::IgnoreWord(const char16_t *aWord) { // avoid adding duplicate words to the ignore list @@ -450,7 +445,6 @@ NS_IMETHODIMP mozPersonalDictionary::IgnoreWord(const char16_t *aWord) return NS_OK; } -/* void EndSession (); */ NS_IMETHODIMP mozPersonalDictionary::EndSession() { WaitForLoad(); @@ -460,25 +454,21 @@ NS_IMETHODIMP mozPersonalDictionary::EndSession() return NS_OK; } -/* void AddCorrection (in wstring word, in wstring correction); */ NS_IMETHODIMP mozPersonalDictionary::AddCorrection(const char16_t *word, const char16_t *correction, const char16_t *lang) { return NS_ERROR_NOT_IMPLEMENTED; } -/* void RemoveCorrection (in wstring word, in wstring correction); */ NS_IMETHODIMP mozPersonalDictionary::RemoveCorrection(const char16_t *word, const char16_t *correction, const char16_t *lang) { return NS_ERROR_NOT_IMPLEMENTED; } -/* void GetCorrection (in wstring word, [array, size_is (count)] out wstring words, out uint32_t count); */ NS_IMETHODIMP mozPersonalDictionary::GetCorrection(const char16_t *word, char16_t ***words, uint32_t *count) { return NS_ERROR_NOT_IMPLEMENTED; } -/* void observe (in nsISupports aSubject, in string aTopic, in wstring aData); */ NS_IMETHODIMP mozPersonalDictionary::Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) { if (!nsCRT::strcmp(aTopic, "profile-do-change")) { diff --git a/extensions/spellcheck/src/mozSpellI18NManager.cpp b/extensions/spellcheck/src/mozSpellI18NManager.cpp index 7e4b94bde9e..41d3b628b82 100644 --- a/extensions/spellcheck/src/mozSpellI18NManager.cpp +++ b/extensions/spellcheck/src/mozSpellI18NManager.cpp @@ -20,7 +20,6 @@ mozSpellI18NManager::~mozSpellI18NManager() /* destructor code */ } -/* mozISpellI18NUtil GetUtil (in wstring language); */ NS_IMETHODIMP mozSpellI18NManager::GetUtil(const char16_t *aLanguage, mozISpellI18NUtil **_retval) { if( nullptr == _retval) { diff --git a/image/RasterImage.cpp b/image/RasterImage.cpp index 62e644e6851..df9e64e7e22 100644 --- a/image/RasterImage.cpp +++ b/image/RasterImage.cpp @@ -341,7 +341,6 @@ RasterImage::RequestRefresh(const TimeStamp& aTime) } //****************************************************************************** -/* readonly attribute int32_t width; */ NS_IMETHODIMP RasterImage::GetWidth(int32_t* aWidth) { @@ -357,7 +356,6 @@ RasterImage::GetWidth(int32_t* aWidth) } //****************************************************************************** -/* readonly attribute int32_t height; */ NS_IMETHODIMP RasterImage::GetHeight(int32_t* aHeight) { @@ -373,7 +371,6 @@ RasterImage::GetHeight(int32_t* aHeight) } //****************************************************************************** -/* [noscript] readonly attribute nsSize intrinsicSize; */ NS_IMETHODIMP RasterImage::GetIntrinsicSize(nsSize* aSize) { @@ -387,7 +384,6 @@ RasterImage::GetIntrinsicSize(nsSize* aSize) } //****************************************************************************** -/* [noscript] readonly attribute nsSize intrinsicRatio; */ NS_IMETHODIMP RasterImage::GetIntrinsicRatio(nsSize* aRatio) { @@ -406,7 +402,6 @@ RasterImage::GetOrientation() } //****************************************************************************** -/* unsigned short GetType(); */ NS_IMETHODIMP RasterImage::GetType(uint16_t* aType) { @@ -570,7 +565,6 @@ RasterImage::OnSurfaceDiscarded() } //****************************************************************************** -/* readonly attribute boolean animated; */ NS_IMETHODIMP RasterImage::GetAnimated(bool* aAnimated) { @@ -599,7 +593,6 @@ RasterImage::GetAnimated(bool* aAnimated) } //****************************************************************************** -/* [notxpcom] int32_t getFirstFrameDelay (); */ NS_IMETHODIMP_(int32_t) RasterImage::GetFirstFrameDelay() { @@ -991,7 +984,7 @@ RasterImage::SetAnimationMode(uint16_t aAnimationMode) } //****************************************************************************** -/* void StartAnimation () */ + nsresult RasterImage::StartAnimation() { @@ -1023,7 +1016,6 @@ RasterImage::StartAnimation() } //****************************************************************************** -/* void stopAnimation (); */ nsresult RasterImage::StopAnimation() { @@ -1041,7 +1033,6 @@ RasterImage::StopAnimation() } //****************************************************************************** -/* void resetAnimation (); */ NS_IMETHODIMP RasterImage::ResetAnimation() { @@ -1284,14 +1275,14 @@ RasterImage::CanDiscard() { } //****************************************************************************** -/* void requestDecode() */ + NS_IMETHODIMP RasterImage::RequestDecode() { return RequestDecodeForSize(mSize, DECODE_FLAGS_DEFAULT); } -/* void startDecode() */ + NS_IMETHODIMP RasterImage::StartDecoding() { @@ -1774,7 +1765,7 @@ RasterImage::Draw(gfxContext* aContext, } //****************************************************************************** -/* void lockImage() */ + NS_IMETHODIMP RasterImage::LockImage() { @@ -1796,7 +1787,7 @@ RasterImage::LockImage() } //****************************************************************************** -/* void unlockImage() */ + NS_IMETHODIMP RasterImage::UnlockImage() { @@ -1825,7 +1816,7 @@ RasterImage::UnlockImage() } //****************************************************************************** -/* void requestDiscard() */ + NS_IMETHODIMP RasterImage::RequestDiscard() { @@ -1905,7 +1896,6 @@ RasterImage::ShouldAnimate() !mAnimationFinished; } -/* readonly attribute uint32_t framesNotified; */ #ifdef DEBUG NS_IMETHODIMP RasterImage::GetFramesNotified(uint32_t* aFramesNotified) diff --git a/image/SVGDocumentWrapper.cpp b/image/SVGDocumentWrapper.cpp index 8fc6bbdd188..7a6e1b56de9 100644 --- a/image/SVGDocumentWrapper.cpp +++ b/image/SVGDocumentWrapper.cpp @@ -214,7 +214,6 @@ SVGDocumentWrapper::OnDataAvailable(nsIRequest* aRequest, nsISupports* ctxt, /** nsIRequestObserver methods **/ -/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */ NS_IMETHODIMP SVGDocumentWrapper::OnStartRequest(nsIRequest* aRequest, nsISupports* ctxt) { diff --git a/image/VectorImage.cpp b/image/VectorImage.cpp index fbb340a0a29..336f74763f5 100644 --- a/image/VectorImage.cpp +++ b/image/VectorImage.cpp @@ -492,7 +492,6 @@ VectorImage::SetAnimationStartTime(const TimeStamp& aTime) // imgIContainer methods //****************************************************************************** -/* readonly attribute int32_t width; */ NS_IMETHODIMP VectorImage::GetWidth(int32_t* aWidth) { @@ -508,7 +507,6 @@ VectorImage::GetWidth(int32_t* aWidth) } //****************************************************************************** -/* [notxpcom] void requestRefresh ([const] in TimeStamp aTime); */ NS_IMETHODIMP_(void) VectorImage::RequestRefresh(const TimeStamp& aTime) { @@ -558,7 +556,6 @@ VectorImage::GetImageSpaceInvalidationRect(const IntRect& aRect) } //****************************************************************************** -/* readonly attribute int32_t height; */ NS_IMETHODIMP VectorImage::GetHeight(int32_t* aHeight) { @@ -574,7 +571,6 @@ VectorImage::GetHeight(int32_t* aHeight) } //****************************************************************************** -/* [noscript] readonly attribute nsSize intrinsicSize; */ NS_IMETHODIMP VectorImage::GetIntrinsicSize(nsSize* aSize) { @@ -600,7 +596,6 @@ VectorImage::GetIntrinsicSize(nsSize* aSize) } //****************************************************************************** -/* [noscript] readonly attribute nsSize intrinsicRatio; */ NS_IMETHODIMP VectorImage::GetIntrinsicRatio(nsSize* aRatio) { @@ -624,7 +619,6 @@ VectorImage::GetOrientation() } //****************************************************************************** -/* readonly attribute unsigned short type; */ NS_IMETHODIMP VectorImage::GetType(uint16_t* aType) { @@ -635,7 +629,6 @@ VectorImage::GetType(uint16_t* aType) } //****************************************************************************** -/* readonly attribute boolean animated; */ NS_IMETHODIMP VectorImage::GetAnimated(bool* aAnimated) { @@ -648,7 +641,6 @@ VectorImage::GetAnimated(bool* aAnimated) } //****************************************************************************** -/* [notxpcom] int32_t getFirstFrameDelay (); */ int32_t VectorImage::GetFirstFrameDelay() { @@ -730,7 +722,6 @@ VectorImage::IsImageContainerAvailable(LayerManager* aManager, uint32_t aFlags) } //****************************************************************************** -/* [noscript] ImageContainer getImageContainer(); */ NS_IMETHODIMP_(already_AddRefed) VectorImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags) { @@ -958,7 +949,7 @@ VectorImage::RecoverFromLossOfSurfaces() } //****************************************************************************** -/* void requestDecode() */ + NS_IMETHODIMP VectorImage::RequestDecode() { @@ -983,7 +974,7 @@ VectorImage::RequestDecodeForSize(const nsIntSize& aSize, uint32_t aFlags) } //****************************************************************************** -/* void lockImage() */ + NS_IMETHODIMP VectorImage::LockImage() { @@ -1004,7 +995,7 @@ VectorImage::LockImage() } //****************************************************************************** -/* void unlockImage() */ + NS_IMETHODIMP VectorImage::UnlockImage() { @@ -1030,7 +1021,7 @@ VectorImage::UnlockImage() } //****************************************************************************** -/* void requestDiscard() */ + NS_IMETHODIMP VectorImage::RequestDiscard() { @@ -1055,7 +1046,6 @@ VectorImage::OnSurfaceDiscarded() } //****************************************************************************** -/* void resetAnimation (); */ NS_IMETHODIMP VectorImage::ResetAnimation() { @@ -1085,7 +1075,6 @@ VectorImage::GetFrameIndex(uint32_t aWhichFrame) // nsIRequestObserver methods //****************************************************************************** -/* void onStartRequest(in nsIRequest request, in nsISupports ctxt); */ NS_IMETHODIMP VectorImage::OnStartRequest(nsIRequest* aRequest, nsISupports* aCtxt) { diff --git a/image/encoders/jpeg/nsJPEGEncoder.cpp b/image/encoders/jpeg/nsJPEGEncoder.cpp index 81ca381d576..15ff257efa5 100644 --- a/image/encoders/jpeg/nsJPEGEncoder.cpp +++ b/image/encoders/jpeg/nsJPEGEncoder.cpp @@ -238,7 +238,6 @@ nsJPEGEncoder::EndImageEncode() } -/* void close (); */ NS_IMETHODIMP nsJPEGEncoder::Close() { @@ -252,7 +251,6 @@ nsJPEGEncoder::Close() return NS_OK; } -/* unsigned long available (); */ NS_IMETHODIMP nsJPEGEncoder::Available(uint64_t* _retval) { @@ -264,7 +262,6 @@ nsJPEGEncoder::Available(uint64_t* _retval) return NS_OK; } -/* [noscript] unsigned long read (in charPtr aBuf, in unsigned long aCount); */ NS_IMETHODIMP nsJPEGEncoder::Read(char* aBuf, uint32_t aCount, uint32_t* _retval) { @@ -302,7 +299,6 @@ nsJPEGEncoder::ReadSegments(nsWriteSegmentFun aWriter, return NS_OK; } -/* boolean isNonBlocking (); */ NS_IMETHODIMP nsJPEGEncoder::IsNonBlocking(bool* _retval) { diff --git a/image/encoders/png/nsPNGEncoder.cpp b/image/encoders/png/nsPNGEncoder.cpp index 0e755d96dd4..2b95de39b4b 100644 --- a/image/encoders/png/nsPNGEncoder.cpp +++ b/image/encoders/png/nsPNGEncoder.cpp @@ -524,7 +524,6 @@ nsPNGEncoder::ParseOptions(const nsAString& aOptions, } -/* void close (); */ NS_IMETHODIMP nsPNGEncoder::Close() { @@ -538,7 +537,6 @@ nsPNGEncoder::Close() return NS_OK; } -/* unsigned long available (); */ NS_IMETHODIMP nsPNGEncoder::Available(uint64_t* _retval) { @@ -592,7 +590,6 @@ nsPNGEncoder::ReadSegments(nsWriteSegmentFun aWriter, return NS_OK; } -/* boolean isNonBlocking (); */ NS_IMETHODIMP nsPNGEncoder::IsNonBlocking(bool* _retval) { diff --git a/image/imgLoader.cpp b/image/imgLoader.cpp index 416c003f67a..dbab234ea5a 100644 --- a/image/imgLoader.cpp +++ b/image/imgLoader.cpp @@ -1316,7 +1316,6 @@ void imgLoader::ReadAcceptHeaderPref() } } -/* void clearCache (in boolean chrome); */ NS_IMETHODIMP imgLoader::ClearCache(bool chrome) { @@ -1327,7 +1326,6 @@ imgLoader::ClearCache(bool chrome) } } -/* void removeEntry(in nsIURI uri); */ NS_IMETHODIMP imgLoader::RemoveEntry(nsIURI* aURI) { @@ -1338,7 +1336,6 @@ imgLoader::RemoveEntry(nsIURI* aURI) return NS_ERROR_NOT_AVAILABLE; } -/* imgIRequest findEntry(in nsIURI uri); */ NS_IMETHODIMP imgLoader::FindEntryProperties(nsIURI* uri, nsIProperties** _retval) { @@ -2579,7 +2576,6 @@ ProxyListener::~ProxyListener() /** nsIRequestObserver methods **/ -/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */ NS_IMETHODIMP ProxyListener::OnStartRequest(nsIRequest* aRequest, nsISupports* ctxt) { @@ -2726,7 +2722,6 @@ imgCacheValidator::AddProxy(imgRequestProxy* aProxy) /** nsIRequestObserver methods **/ -/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest* aRequest, nsISupports* ctxt) { diff --git a/image/imgRequest.cpp b/image/imgRequest.cpp index d6ed9fee6ca..9c3356d3788 100644 --- a/image/imgRequest.cpp +++ b/image/imgRequest.cpp @@ -710,7 +710,6 @@ imgRequest::HadInsecureRedirect() const /** nsIRequestObserver methods **/ -/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */ NS_IMETHODIMP imgRequest::OnStartRequest(nsIRequest* aRequest, nsISupports* ctxt) { diff --git a/image/imgRequestProxy.cpp b/image/imgRequestProxy.cpp index 1fed75dd9f5..f6211e9444a 100644 --- a/image/imgRequestProxy.cpp +++ b/image/imgRequestProxy.cpp @@ -281,7 +281,6 @@ imgRequestProxy::RemoveFromLoadGroup(bool releaseLoadGroup) /** nsIRequest / imgIRequest methods **/ -/* readonly attribute wstring name; */ NS_IMETHODIMP imgRequestProxy::GetName(nsACString& aName) { @@ -294,21 +293,18 @@ imgRequestProxy::GetName(nsACString& aName) return NS_OK; } -/* boolean isPending (); */ NS_IMETHODIMP imgRequestProxy::IsPending(bool* _retval) { return NS_ERROR_NOT_IMPLEMENTED; } -/* readonly attribute nsresult status; */ NS_IMETHODIMP imgRequestProxy::GetStatus(nsresult* aStatus) { return NS_ERROR_NOT_IMPLEMENTED; } -/* void cancel (in nsresult status); */ NS_IMETHODIMP imgRequestProxy::Cancel(nsresult status) { @@ -334,7 +330,6 @@ imgRequestProxy::DoCancel(nsresult status) NullOutListener(); } -/* void cancelAndForgetObserver (in nsresult aStatus); */ NS_IMETHODIMP imgRequestProxy::CancelAndForgetObserver(nsresult aStatus) { @@ -373,7 +368,6 @@ imgRequestProxy::CancelAndForgetObserver(nsresult aStatus) return NS_OK; } -/* void startDecode (); */ NS_IMETHODIMP imgRequestProxy::StartDecoding() { @@ -392,7 +386,6 @@ imgRequestProxy::StartDecoding() return NS_OK; } -/* void requestDecode (); */ NS_IMETHODIMP imgRequestProxy::RequestDecode() { @@ -412,7 +405,6 @@ imgRequestProxy::RequestDecode() } -/* void lockImage (); */ NS_IMETHODIMP imgRequestProxy::LockImage() { @@ -424,7 +416,6 @@ imgRequestProxy::LockImage() return NS_OK; } -/* void unlockImage (); */ NS_IMETHODIMP imgRequestProxy::UnlockImage() { @@ -438,7 +429,6 @@ imgRequestProxy::UnlockImage() return NS_OK; } -/* void requestDiscard (); */ NS_IMETHODIMP imgRequestProxy::RequestDiscard() { @@ -487,21 +477,18 @@ imgRequestProxy::ClearAnimationConsumers() } } -/* void suspend (); */ NS_IMETHODIMP imgRequestProxy::Suspend() { return NS_ERROR_NOT_IMPLEMENTED; } -/* void resume (); */ NS_IMETHODIMP imgRequestProxy::Resume() { return NS_ERROR_NOT_IMPLEMENTED; } -/* attribute nsILoadGroup loadGroup */ NS_IMETHODIMP imgRequestProxy::GetLoadGroup(nsILoadGroup** loadGroup) { @@ -515,7 +502,6 @@ imgRequestProxy::SetLoadGroup(nsILoadGroup* loadGroup) return NS_OK; } -/* attribute nsLoadFlags loadFlags */ NS_IMETHODIMP imgRequestProxy::GetLoadFlags(nsLoadFlags* flags) { @@ -531,7 +517,6 @@ imgRequestProxy::SetLoadFlags(nsLoadFlags flags) /** imgIRequest methods **/ -/* attribute imgIContainer image; */ NS_IMETHODIMP imgRequestProxy::GetImage(imgIContainer** aImage) { @@ -557,7 +542,6 @@ imgRequestProxy::GetImage(imgIContainer** aImage) return NS_OK; } -/* readonly attribute unsigned long imageStatus; */ NS_IMETHODIMP imgRequestProxy::GetImageStatus(uint32_t* aStatus) { @@ -567,7 +551,6 @@ imgRequestProxy::GetImageStatus(uint32_t* aStatus) return NS_OK; } -/* readonly attribute nresult imageErrorCode; */ NS_IMETHODIMP imgRequestProxy::GetImageErrorCode(nsresult* aStatus) { @@ -580,7 +563,6 @@ imgRequestProxy::GetImageErrorCode(nsresult* aStatus) return NS_OK; } -/* readonly attribute nsIURI URI; */ NS_IMETHODIMP imgRequestProxy::GetURI(nsIURI** aURI) { @@ -612,7 +594,6 @@ imgRequestProxy::GetURI(ImageURL** aURI) return NS_OK; } -/* readonly attribute imgINotificationObserver notificationObserver; */ NS_IMETHODIMP imgRequestProxy::GetNotificationObserver(imgINotificationObserver** aObserver) { @@ -621,7 +602,6 @@ imgRequestProxy::GetNotificationObserver(imgINotificationObserver** aObserver) return NS_OK; } -/* readonly attribute string mimeType; */ NS_IMETHODIMP imgRequestProxy::GetMimeType(char** aMimeType) { @@ -711,7 +691,6 @@ imgRequestProxy::PerformClone(imgINotificationObserver* aObserver, return NS_OK; } -/* readonly attribute nsIPrincipal imagePrincipal; */ NS_IMETHODIMP imgRequestProxy::GetImagePrincipal(nsIPrincipal** aPrincipal) { @@ -723,7 +702,6 @@ imgRequestProxy::GetImagePrincipal(nsIPrincipal** aPrincipal) return NS_OK; } -/* readonly attribute bool multipart; */ NS_IMETHODIMP imgRequestProxy::GetMultipart(bool* aMultipart) { @@ -736,7 +714,6 @@ imgRequestProxy::GetMultipart(bool* aMultipart) return NS_OK; } -/* readonly attribute int32_t CORSMode; */ NS_IMETHODIMP imgRequestProxy::GetCORSMode(int32_t* aCorsMode) { diff --git a/intl/lwbrk/nsSemanticUnitScanner.cpp b/intl/lwbrk/nsSemanticUnitScanner.cpp index bf51a743fcc..8feb738a8cf 100644 --- a/intl/lwbrk/nsSemanticUnitScanner.cpp +++ b/intl/lwbrk/nsSemanticUnitScanner.cpp @@ -18,14 +18,12 @@ nsSemanticUnitScanner::~nsSemanticUnitScanner() } -/* void start (in string characterSet); */ NS_IMETHODIMP nsSemanticUnitScanner::Start(const char *characterSet) { // do nothing for now. return NS_OK; } -/* void next (in wstring text, in long length, in long pos, out boolean hasMoreUnits, out long begin, out long end); */ NS_IMETHODIMP nsSemanticUnitScanner::Next(const char16_t *text, int32_t length, int32_t pos, bool isLastBuffer, int32_t *begin, int32_t *end, bool *_retval) { // xxx need to bullet proff and check input pointer diff --git a/intl/strres/nsStringBundle.cpp b/intl/strres/nsStringBundle.cpp index 63dcd134314..d4774c29c37 100644 --- a/intl/strres/nsStringBundle.cpp +++ b/intl/strres/nsStringBundle.cpp @@ -191,7 +191,6 @@ nsStringBundle::FormatStringFromName(const char16_t *aName, NS_IMPL_ISUPPORTS(nsStringBundle, nsIStringBundle) -/* void GetStringFromID (in long aID, out wstring aResult); */ NS_IMETHODIMP nsStringBundle::GetStringFromID(int32_t aID, char16_t **aResult) { @@ -211,7 +210,6 @@ nsStringBundle::GetStringFromID(int32_t aID, char16_t **aResult) return NS_OK; } -/* void GetStringFromName (in wstring aName, out wstring aResult); */ NS_IMETHODIMP nsStringBundle::GetStringFromName(const char16_t *aName, char16_t **aResult) { diff --git a/intl/uconv/nsScriptableUConv.cpp b/intl/uconv/nsScriptableUConv.cpp index 510c77c2243..c30dbb5b24c 100644 --- a/intl/uconv/nsScriptableUConv.cpp +++ b/intl/uconv/nsScriptableUConv.cpp @@ -55,7 +55,6 @@ nsScriptableUnicodeConverter::ConvertFromUnicodeWithLength(const nsAString& aSrc return NS_ERROR_FAILURE; } -/* ACString ConvertFromUnicode (in AString src); */ NS_IMETHODIMP nsScriptableUnicodeConverter::ConvertFromUnicode(const nsAString& aSrc, nsACString& _retval) @@ -95,7 +94,6 @@ nsScriptableUnicodeConverter::FinishWithLength(char **_retval, int32_t* aLength) } -/* ACString Finish(); */ NS_IMETHODIMP nsScriptableUnicodeConverter::Finish(nsACString& _retval) { @@ -122,7 +120,6 @@ nsScriptableUnicodeConverter::Finish(nsACString& _retval) return rv; } -/* AString ConvertToUnicode (in ACString src); */ NS_IMETHODIMP nsScriptableUnicodeConverter::ConvertToUnicode(const nsACString& aSrc, nsAString& _retval) { @@ -203,7 +200,6 @@ nsScriptableUnicodeConverter::ConvertToByteArray(const nsAString& aString, return NS_OK; } -/* nsIInputStream convertToInputStream(in AString aString); */ NS_IMETHODIMP nsScriptableUnicodeConverter::ConvertToInputStream(const nsAString& aString, nsIInputStream** _retval) @@ -230,7 +226,6 @@ nsScriptableUnicodeConverter::ConvertToInputStream(const nsAString& aString, return rv; } -/* attribute string charset; */ NS_IMETHODIMP nsScriptableUnicodeConverter::GetCharset(char * *aCharset) { diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp index d9f92aafcce..8da370b72b8 100644 --- a/js/xpconnect/loader/mozJSComponentLoader.cpp +++ b/js/xpconnect/loader/mozJSComponentLoader.cpp @@ -1051,7 +1051,6 @@ mozJSComponentLoader::ImportInto(const nsACString& aLocation, return NS_OK; } -/* boolean isModuleLoaded (in AUTF8String registryLocation); */ NS_IMETHODIMP mozJSComponentLoader::IsModuleLoaded(const nsACString& aLocation, bool* retval) diff --git a/js/xpconnect/public/xpc_map_end.h b/js/xpconnect/public/xpc_map_end.h index 8794399d562..1f6f9892100 100644 --- a/js/xpconnect/public/xpc_map_end.h +++ b/js/xpconnect/public/xpc_map_end.h @@ -73,7 +73,6 @@ XPC_MAP_CLASSNAME::GetScriptableFlags() /**************************************************************/ #ifndef XPC_MAP_WANT_PRECREATE -/* void preCreate (in nsISupports nativeObj, in JSContextPtr cx, in JSObjectPtr globalObj, out JSObjectPtr parentObj); */ NS_IMETHODIMP XPC_MAP_CLASSNAME::PreCreate(nsISupports* nativeObj, JSContext * cx, JSObject * globalObj, JSObject * *parentObj) {NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;} #endif diff --git a/js/xpconnect/src/XPCCallContext.cpp b/js/xpconnect/src/XPCCallContext.cpp index 7dd59490039..1111b8ef732 100644 --- a/js/xpconnect/src/XPCCallContext.cpp +++ b/js/xpconnect/src/XPCCallContext.cpp @@ -233,7 +233,6 @@ XPCCallContext::~XPCCallContext() } } -/* readonly attribute nsISupports Callee; */ NS_IMETHODIMP XPCCallContext::GetCallee(nsISupports * *aCallee) { @@ -242,7 +241,6 @@ XPCCallContext::GetCallee(nsISupports * *aCallee) return NS_OK; } -/* readonly attribute uint16_t CalleeMethodIndex; */ NS_IMETHODIMP XPCCallContext::GetCalleeMethodIndex(uint16_t* aCalleeMethodIndex) { @@ -250,7 +248,6 @@ XPCCallContext::GetCalleeMethodIndex(uint16_t* aCalleeMethodIndex) return NS_OK; } -/* readonly attribute XPCNativeInterface CalleeInterface; */ NS_IMETHODIMP XPCCallContext::GetCalleeInterface(nsIInterfaceInfo * *aCalleeInterface) { @@ -259,7 +256,6 @@ XPCCallContext::GetCalleeInterface(nsIInterfaceInfo * *aCalleeInterface) return NS_OK; } -/* readonly attribute nsIClassInfo CalleeClassInfo; */ NS_IMETHODIMP XPCCallContext::GetCalleeClassInfo(nsIClassInfo * *aCalleeClassInfo) { @@ -268,7 +264,6 @@ XPCCallContext::GetCalleeClassInfo(nsIClassInfo * *aCalleeClassInfo) return NS_OK; } -/* readonly attribute JSContextPtr JSContext; */ NS_IMETHODIMP XPCCallContext::GetJSContext(JSContext * *aJSContext) { @@ -277,7 +272,6 @@ XPCCallContext::GetJSContext(JSContext * *aJSContext) return NS_OK; } -/* readonly attribute uint32_t Argc; */ NS_IMETHODIMP XPCCallContext::GetArgc(uint32_t* aArgc) { @@ -285,7 +279,6 @@ XPCCallContext::GetArgc(uint32_t* aArgc) return NS_OK; } -/* readonly attribute JSValPtr ArgvPtr; */ NS_IMETHODIMP XPCCallContext::GetArgvPtr(Value** aArgvPtr) { diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp index dd65e72bd22..511a6eebcca 100644 --- a/js/xpconnect/src/XPCComponents.cpp +++ b/js/xpconnect/src/XPCComponents.cpp @@ -149,7 +149,6 @@ oom: return NS_ERROR_OUT_OF_MEMORY; } -/* nsIXPCScriptable getScriptableHelper(); */ NS_IMETHODIMP nsXPCComponents_Interfaces::GetScriptableHelper(nsIXPCScriptable** retval) { @@ -157,7 +156,6 @@ nsXPCComponents_Interfaces::GetScriptableHelper(nsIXPCScriptable** retval) return NS_OK; } -/* readonly attribute string contractID; */ NS_IMETHODIMP nsXPCComponents_Interfaces::GetContractID(char * *aContractID) { @@ -165,7 +163,6 @@ nsXPCComponents_Interfaces::GetContractID(char * *aContractID) return NS_ERROR_NOT_AVAILABLE; } -/* readonly attribute string classDescription; */ NS_IMETHODIMP nsXPCComponents_Interfaces::GetClassDescription(char * *aClassDescription) { @@ -174,7 +171,6 @@ nsXPCComponents_Interfaces::GetClassDescription(char * *aClassDescription) return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -/* readonly attribute nsCIDPtr classID; */ NS_IMETHODIMP nsXPCComponents_Interfaces::GetClassID(nsCID * *aClassID) { @@ -182,7 +178,6 @@ nsXPCComponents_Interfaces::GetClassID(nsCID * *aClassID) return NS_OK; } -/* readonly attribute uint32_t flags; */ NS_IMETHODIMP nsXPCComponents_Interfaces::GetFlags(uint32_t* aFlags) { @@ -192,7 +187,6 @@ nsXPCComponents_Interfaces::GetFlags(uint32_t* aFlags) return NS_OK; } -/* [notxpcom] readonly attribute nsCID classIDNoAlloc; */ NS_IMETHODIMP nsXPCComponents_Interfaces::GetClassIDNoAlloc(nsCID* aClassIDNoAlloc) { @@ -382,7 +376,6 @@ oom: return NS_ERROR_OUT_OF_MEMORY; } -/* nsIXPCScriptable getScriptableHelper(); */ NS_IMETHODIMP nsXPCComponents_InterfacesByID::GetScriptableHelper(nsIXPCScriptable** retval) { @@ -390,7 +383,6 @@ nsXPCComponents_InterfacesByID::GetScriptableHelper(nsIXPCScriptable** retval) return NS_OK; } -/* readonly attribute string contractID; */ NS_IMETHODIMP nsXPCComponents_InterfacesByID::GetContractID(char * *aContractID) { @@ -398,7 +390,6 @@ nsXPCComponents_InterfacesByID::GetContractID(char * *aContractID) return NS_ERROR_NOT_AVAILABLE; } -/* readonly attribute string classDescription; */ NS_IMETHODIMP nsXPCComponents_InterfacesByID::GetClassDescription(char * *aClassDescription) { @@ -407,7 +398,6 @@ nsXPCComponents_InterfacesByID::GetClassDescription(char * *aClassDescription) return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -/* readonly attribute nsCIDPtr classID; */ NS_IMETHODIMP nsXPCComponents_InterfacesByID::GetClassID(nsCID * *aClassID) { @@ -415,7 +405,6 @@ nsXPCComponents_InterfacesByID::GetClassID(nsCID * *aClassID) return NS_OK; } -/* readonly attribute uint32_t flags; */ NS_IMETHODIMP nsXPCComponents_InterfacesByID::GetFlags(uint32_t* aFlags) { @@ -425,7 +414,6 @@ nsXPCComponents_InterfacesByID::GetFlags(uint32_t* aFlags) return NS_OK; } -/* [notxpcom] readonly attribute nsCID classIDNoAlloc; */ NS_IMETHODIMP nsXPCComponents_InterfacesByID::GetClassIDNoAlloc(nsCID* aClassIDNoAlloc) { @@ -617,7 +605,6 @@ oom: return NS_ERROR_OUT_OF_MEMORY; } -/* nsIXPCScriptable getScriptableHelper(); */ NS_IMETHODIMP nsXPCComponents_Classes::GetScriptableHelper(nsIXPCScriptable** retval) { @@ -625,7 +612,6 @@ nsXPCComponents_Classes::GetScriptableHelper(nsIXPCScriptable** retval) return NS_OK; } -/* readonly attribute string contractID; */ NS_IMETHODIMP nsXPCComponents_Classes::GetContractID(char * *aContractID) { @@ -633,7 +619,6 @@ nsXPCComponents_Classes::GetContractID(char * *aContractID) return NS_ERROR_NOT_AVAILABLE; } -/* readonly attribute string classDescription; */ NS_IMETHODIMP nsXPCComponents_Classes::GetClassDescription(char * *aClassDescription) { @@ -642,7 +627,6 @@ nsXPCComponents_Classes::GetClassDescription(char * *aClassDescription) return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -/* readonly attribute nsCIDPtr classID; */ NS_IMETHODIMP nsXPCComponents_Classes::GetClassID(nsCID * *aClassID) { @@ -650,7 +634,6 @@ nsXPCComponents_Classes::GetClassID(nsCID * *aClassID) return NS_OK; } -/* readonly attribute uint32_t flags; */ NS_IMETHODIMP nsXPCComponents_Classes::GetFlags(uint32_t* aFlags) { @@ -658,7 +641,6 @@ nsXPCComponents_Classes::GetFlags(uint32_t* aFlags) return NS_OK; } -/* [notxpcom] readonly attribute nsCID classIDNoAlloc; */ NS_IMETHODIMP nsXPCComponents_Classes::GetClassIDNoAlloc(nsCID* aClassIDNoAlloc) { @@ -832,7 +814,6 @@ oom: return NS_ERROR_OUT_OF_MEMORY; } -/* nsIXPCScriptable getScriptableHelper(); */ NS_IMETHODIMP nsXPCComponents_ClassesByID::GetScriptableHelper(nsIXPCScriptable** retval) { @@ -840,7 +821,6 @@ nsXPCComponents_ClassesByID::GetScriptableHelper(nsIXPCScriptable** retval) return NS_OK; } -/* readonly attribute string contractID; */ NS_IMETHODIMP nsXPCComponents_ClassesByID::GetContractID(char * *aContractID) { @@ -848,7 +828,6 @@ nsXPCComponents_ClassesByID::GetContractID(char * *aContractID) return NS_ERROR_NOT_AVAILABLE; } -/* readonly attribute string classDescription; */ NS_IMETHODIMP nsXPCComponents_ClassesByID::GetClassDescription(char * *aClassDescription) { @@ -857,7 +836,6 @@ nsXPCComponents_ClassesByID::GetClassDescription(char * *aClassDescription) return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -/* readonly attribute nsCIDPtr classID; */ NS_IMETHODIMP nsXPCComponents_ClassesByID::GetClassID(nsCID * *aClassID) { @@ -865,7 +843,6 @@ nsXPCComponents_ClassesByID::GetClassID(nsCID * *aClassID) return NS_OK; } -/* readonly attribute uint32_t flags; */ NS_IMETHODIMP nsXPCComponents_ClassesByID::GetFlags(uint32_t* aFlags) { @@ -873,7 +850,6 @@ nsXPCComponents_ClassesByID::GetFlags(uint32_t* aFlags) return NS_OK; } -/* [notxpcom] readonly attribute nsCID classIDNoAlloc; */ NS_IMETHODIMP nsXPCComponents_ClassesByID::GetClassIDNoAlloc(nsCID* aClassIDNoAlloc) { @@ -1070,7 +1046,6 @@ oom: return NS_ERROR_OUT_OF_MEMORY; } -/* nsIXPCScriptable getScriptableHelper(); */ NS_IMETHODIMP nsXPCComponents_Results::GetScriptableHelper(nsIXPCScriptable** retval) { @@ -1078,7 +1053,6 @@ nsXPCComponents_Results::GetScriptableHelper(nsIXPCScriptable** retval) return NS_OK; } -/* readonly attribute string contractID; */ NS_IMETHODIMP nsXPCComponents_Results::GetContractID(char * *aContractID) { @@ -1086,7 +1060,6 @@ nsXPCComponents_Results::GetContractID(char * *aContractID) return NS_ERROR_NOT_AVAILABLE; } -/* readonly attribute string classDescription; */ NS_IMETHODIMP nsXPCComponents_Results::GetClassDescription(char * *aClassDescription) { @@ -1095,7 +1068,6 @@ nsXPCComponents_Results::GetClassDescription(char * *aClassDescription) return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -/* readonly attribute nsCIDPtr classID; */ NS_IMETHODIMP nsXPCComponents_Results::GetClassID(nsCID * *aClassID) { @@ -1103,7 +1075,6 @@ nsXPCComponents_Results::GetClassID(nsCID * *aClassID) return NS_OK; } -/* readonly attribute uint32_t flags; */ NS_IMETHODIMP nsXPCComponents_Results::GetFlags(uint32_t* aFlags) { @@ -1113,7 +1084,6 @@ nsXPCComponents_Results::GetFlags(uint32_t* aFlags) return NS_OK; } -/* [notxpcom] readonly attribute nsCID classIDNoAlloc; */ NS_IMETHODIMP nsXPCComponents_Results::GetClassIDNoAlloc(nsCID* aClassIDNoAlloc) { @@ -1268,7 +1238,6 @@ oom: return NS_ERROR_OUT_OF_MEMORY; } -/* nsIXPCScriptable getScriptableHelper(); */ NS_IMETHODIMP nsXPCComponents_ID::GetScriptableHelper(nsIXPCScriptable** retval) { @@ -1276,7 +1245,6 @@ nsXPCComponents_ID::GetScriptableHelper(nsIXPCScriptable** retval) return NS_OK; } -/* readonly attribute string contractID; */ NS_IMETHODIMP nsXPCComponents_ID::GetContractID(char * *aContractID) { @@ -1284,7 +1252,6 @@ nsXPCComponents_ID::GetContractID(char * *aContractID) return NS_ERROR_NOT_AVAILABLE; } -/* readonly attribute string classDescription; */ NS_IMETHODIMP nsXPCComponents_ID::GetClassDescription(char * *aClassDescription) { @@ -1293,7 +1260,6 @@ nsXPCComponents_ID::GetClassDescription(char * *aClassDescription) return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -/* readonly attribute nsCIDPtr classID; */ NS_IMETHODIMP nsXPCComponents_ID::GetClassID(nsCID * *aClassID) { @@ -1301,7 +1267,6 @@ nsXPCComponents_ID::GetClassID(nsCID * *aClassID) return NS_OK; } -/* readonly attribute uint32_t flags; */ NS_IMETHODIMP nsXPCComponents_ID::GetFlags(uint32_t* aFlags) { @@ -1309,7 +1274,6 @@ nsXPCComponents_ID::GetFlags(uint32_t* aFlags) return NS_OK; } -/* [notxpcom] readonly attribute nsCID classIDNoAlloc; */ NS_IMETHODIMP nsXPCComponents_ID::GetClassIDNoAlloc(nsCID* aClassIDNoAlloc) { @@ -1345,7 +1309,6 @@ NS_IMPL_RELEASE(nsXPCComponents_ID) #include "xpc_map_end.h" /* This will #undef the above */ -/* bool call (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */ NS_IMETHODIMP nsXPCComponents_ID::Call(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSObject* objArg, const CallArgs& args, bool* _retval) @@ -1354,7 +1317,6 @@ nsXPCComponents_ID::Call(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSOb return CallOrConstruct(wrapper, cx, obj, args, _retval); } -/* bool construct (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */ NS_IMETHODIMP nsXPCComponents_ID::Construct(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSObject* objArg, const CallArgs& args, bool* _retval) @@ -1404,7 +1366,6 @@ nsXPCComponents_ID::CallOrConstruct(nsIXPConnectWrappedNative* wrapper, return NS_OK; } -/* bool hasInstance (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsval val, out bool bp); */ NS_IMETHODIMP nsXPCComponents_ID::HasInstance(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSObject* obj, @@ -1476,7 +1437,6 @@ oom: return NS_ERROR_OUT_OF_MEMORY; } -/* nsIXPCScriptable getScriptableHelper(); */ NS_IMETHODIMP nsXPCComponents_Exception::GetScriptableHelper(nsIXPCScriptable** retval) { @@ -1484,7 +1444,6 @@ nsXPCComponents_Exception::GetScriptableHelper(nsIXPCScriptable** retval) return NS_OK; } -/* readonly attribute string contractID; */ NS_IMETHODIMP nsXPCComponents_Exception::GetContractID(char * *aContractID) { @@ -1492,7 +1451,6 @@ nsXPCComponents_Exception::GetContractID(char * *aContractID) return NS_ERROR_NOT_AVAILABLE; } -/* readonly attribute string classDescription; */ NS_IMETHODIMP nsXPCComponents_Exception::GetClassDescription(char * *aClassDescription) { @@ -1501,7 +1459,6 @@ nsXPCComponents_Exception::GetClassDescription(char * *aClassDescription) return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -/* readonly attribute nsCIDPtr classID; */ NS_IMETHODIMP nsXPCComponents_Exception::GetClassID(nsCID * *aClassID) { @@ -1509,7 +1466,6 @@ nsXPCComponents_Exception::GetClassID(nsCID * *aClassID) return NS_OK; } -/* readonly attribute uint32_t flags; */ NS_IMETHODIMP nsXPCComponents_Exception::GetFlags(uint32_t* aFlags) { @@ -1517,7 +1473,6 @@ nsXPCComponents_Exception::GetFlags(uint32_t* aFlags) return NS_OK; } -/* [notxpcom] readonly attribute nsCID classIDNoAlloc; */ NS_IMETHODIMP nsXPCComponents_Exception::GetClassIDNoAlloc(nsCID* aClassIDNoAlloc) { @@ -1553,7 +1508,6 @@ NS_IMPL_RELEASE(nsXPCComponents_Exception) #include "xpc_map_end.h" /* This will #undef the above */ -/* bool call (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */ NS_IMETHODIMP nsXPCComponents_Exception::Call(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSObject* objArg, const CallArgs& args, bool* _retval) @@ -1562,7 +1516,6 @@ nsXPCComponents_Exception::Call(nsIXPConnectWrappedNative* wrapper, JSContext* c return CallOrConstruct(wrapper, cx, obj, args, _retval); } -/* bool construct (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */ NS_IMETHODIMP nsXPCComponents_Exception::Construct(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSObject* objArg, const CallArgs& args, bool* _retval) @@ -1756,7 +1709,6 @@ nsXPCComponents_Exception::CallOrConstruct(nsIXPConnectWrappedNative* wrapper, return NS_OK; } -/* bool hasInstance (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsval val, out bool bp); */ NS_IMETHODIMP nsXPCComponents_Exception::HasInstance(nsIXPConnectWrappedNative* wrapper, JSContext * cx, JSObject * obj, @@ -1852,7 +1804,6 @@ oom: return NS_ERROR_OUT_OF_MEMORY; } -/* nsIXPCScriptable getScriptableHelper(); */ NS_IMETHODIMP nsXPCConstructor::GetScriptableHelper(nsIXPCScriptable** retval) { @@ -1860,7 +1811,6 @@ nsXPCConstructor::GetScriptableHelper(nsIXPCScriptable** retval) return NS_OK; } -/* readonly attribute string contractID; */ NS_IMETHODIMP nsXPCConstructor::GetContractID(char * *aContractID) { @@ -1868,7 +1818,6 @@ nsXPCConstructor::GetContractID(char * *aContractID) return NS_ERROR_NOT_AVAILABLE; } -/* readonly attribute string classDescription; */ NS_IMETHODIMP nsXPCConstructor::GetClassDescription(char * *aClassDescription) { @@ -1877,7 +1826,6 @@ nsXPCConstructor::GetClassDescription(char * *aClassDescription) return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -/* readonly attribute nsCIDPtr classID; */ NS_IMETHODIMP nsXPCConstructor::GetClassID(nsCID * *aClassID) { @@ -1885,7 +1833,6 @@ nsXPCConstructor::GetClassID(nsCID * *aClassID) return NS_OK; } -/* readonly attribute uint32_t flags; */ NS_IMETHODIMP nsXPCConstructor::GetFlags(uint32_t* aFlags) { @@ -1893,7 +1840,6 @@ nsXPCConstructor::GetFlags(uint32_t* aFlags) return NS_OK; } -/* [notxpcom] readonly attribute nsCID classIDNoAlloc; */ NS_IMETHODIMP nsXPCConstructor::GetClassIDNoAlloc(nsCID* aClassIDNoAlloc) { @@ -1917,7 +1863,6 @@ nsXPCConstructor::~nsXPCConstructor() free(mInitializer); } -/* readonly attribute nsIJSCID classID; */ NS_IMETHODIMP nsXPCConstructor::GetClassID(nsIJSCID * *aClassID) { @@ -1926,7 +1871,6 @@ nsXPCConstructor::GetClassID(nsIJSCID * *aClassID) return NS_OK; } -/* readonly attribute nsIJSIID interfaceID; */ NS_IMETHODIMP nsXPCConstructor::GetInterfaceID(nsIJSIID * *aInterfaceID) { @@ -1935,7 +1879,6 @@ nsXPCConstructor::GetInterfaceID(nsIJSIID * *aInterfaceID) return NS_OK; } -/* readonly attribute string initializer; */ NS_IMETHODIMP nsXPCConstructor::GetInitializer(char * *aInitializer) { @@ -1961,7 +1904,6 @@ NS_IMPL_RELEASE(nsXPCConstructor) #include "xpc_map_end.h" /* This will #undef the above */ -/* bool call (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */ NS_IMETHODIMP nsXPCConstructor::Call(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSObject* objArg, const CallArgs& args, bool* _retval) @@ -1971,7 +1913,6 @@ nsXPCConstructor::Call(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSObje } -/* bool construct (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */ NS_IMETHODIMP nsXPCConstructor::Construct(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSObject* objArg, const CallArgs& args, bool* _retval) @@ -2090,7 +2031,6 @@ oom: return NS_ERROR_OUT_OF_MEMORY; } -/* nsIXPCScriptable getScriptableHelper(); */ NS_IMETHODIMP nsXPCComponents_Constructor::GetScriptableHelper(nsIXPCScriptable** retval) { @@ -2098,7 +2038,6 @@ nsXPCComponents_Constructor::GetScriptableHelper(nsIXPCScriptable** retval) return NS_OK; } -/* readonly attribute string contractID; */ NS_IMETHODIMP nsXPCComponents_Constructor::GetContractID(char * *aContractID) { @@ -2106,7 +2045,6 @@ nsXPCComponents_Constructor::GetContractID(char * *aContractID) return NS_ERROR_NOT_AVAILABLE; } -/* readonly attribute string classDescription; */ NS_IMETHODIMP nsXPCComponents_Constructor::GetClassDescription(char * *aClassDescription) { @@ -2115,7 +2053,6 @@ nsXPCComponents_Constructor::GetClassDescription(char * *aClassDescription) return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -/* readonly attribute nsCIDPtr classID; */ NS_IMETHODIMP nsXPCComponents_Constructor::GetClassID(nsCID * *aClassID) { @@ -2123,7 +2060,6 @@ nsXPCComponents_Constructor::GetClassID(nsCID * *aClassID) return NS_OK; } -/* readonly attribute uint32_t flags; */ NS_IMETHODIMP nsXPCComponents_Constructor::GetFlags(uint32_t* aFlags) { @@ -2131,7 +2067,6 @@ nsXPCComponents_Constructor::GetFlags(uint32_t* aFlags) return NS_OK; } -/* [notxpcom] readonly attribute nsCID classIDNoAlloc; */ NS_IMETHODIMP nsXPCComponents_Constructor::GetClassIDNoAlloc(nsCID* aClassIDNoAlloc) { @@ -2167,7 +2102,6 @@ NS_IMPL_RELEASE(nsXPCComponents_Constructor) #include "xpc_map_end.h" /* This will #undef the above */ -/* bool call (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */ NS_IMETHODIMP nsXPCComponents_Constructor::Call(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSObject* objArg, const CallArgs& args, bool* _retval) @@ -2176,7 +2110,6 @@ nsXPCComponents_Constructor::Call(nsIXPConnectWrappedNative* wrapper, JSContext* return CallOrConstruct(wrapper, cx, obj, args, _retval); } -/* bool construct (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */ NS_IMETHODIMP nsXPCComponents_Constructor::Construct(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSObject* objArg, const CallArgs& args, bool* _retval) @@ -2317,7 +2250,6 @@ nsXPCComponents_Constructor::CallOrConstruct(nsIXPConnectWrappedNative* wrapper, return NS_OK; } -/* bool hasInstance (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsval val, out bool bp); */ NS_IMETHODIMP nsXPCComponents_Constructor::HasInstance(nsIXPConnectWrappedNative* wrapper, JSContext * cx, JSObject * obj, @@ -2374,7 +2306,6 @@ nsXPCComponents_Utils::GetSandbox(nsIXPCComponents_utils_Sandbox** aSandbox) return NS_OK; } -/* void reportError (); */ NS_IMETHODIMP nsXPCComponents_Utils::ReportError(HandleValue error, JSContext* cx) { @@ -2444,7 +2375,6 @@ nsXPCComponents_Utils::ReportError(HandleValue error, JSContext* cx) return NS_OK; } -/* void evalInSandbox(in AString source, in nativeobj sandbox); */ NS_IMETHODIMP nsXPCComponents_Utils::EvalInSandbox(const nsAString& source, HandleValue sandboxVal, @@ -2626,7 +2556,6 @@ nsXPCComponents_Utils::ImportGlobalProperties(HandleValue aPropertyList, return NS_OK; } -/* xpcIJSWeakReference getWeakReference (); */ NS_IMETHODIMP nsXPCComponents_Utils::GetWeakReference(HandleValue object, JSContext* cx, xpcIJSWeakReference** _retval) @@ -2638,7 +2567,6 @@ nsXPCComponents_Utils::GetWeakReference(HandleValue object, JSContext* cx, return NS_OK; } -/* void forceGC (); */ NS_IMETHODIMP nsXPCComponents_Utils::ForceGC() { @@ -2648,7 +2576,6 @@ nsXPCComponents_Utils::ForceGC() return NS_OK; } -/* void forceCC (); */ NS_IMETHODIMP nsXPCComponents_Utils::ForceCC(nsICycleCollectorListener* listener) { @@ -2656,7 +2583,6 @@ nsXPCComponents_Utils::ForceCC(nsICycleCollectorListener* listener) return NS_OK; } -/* void finishCC(); */ NS_IMETHODIMP nsXPCComponents_Utils::FinishCC() { @@ -2664,7 +2590,6 @@ nsXPCComponents_Utils::FinishCC() return NS_OK; } -/* void ccSlice(in long long budget); */ NS_IMETHODIMP nsXPCComponents_Utils::CcSlice(int64_t budget) { @@ -2672,7 +2597,6 @@ nsXPCComponents_Utils::CcSlice(int64_t budget) return NS_OK; } -/* long getMaxCCSliceTimeSinceClear(); */ NS_IMETHODIMP nsXPCComponents_Utils::GetMaxCCSliceTimeSinceClear(int32_t* out) { @@ -2680,7 +2604,6 @@ nsXPCComponents_Utils::GetMaxCCSliceTimeSinceClear(int32_t* out) return NS_OK; } -/* void clearMaxCCTime(); */ NS_IMETHODIMP nsXPCComponents_Utils::ClearMaxCCTime() { @@ -2688,7 +2611,6 @@ nsXPCComponents_Utils::ClearMaxCCTime() return NS_OK; } -/* void forceShrinkingGC (); */ NS_IMETHODIMP nsXPCComponents_Utils::ForceShrinkingGC() { @@ -2731,7 +2653,6 @@ class PreciseGCRunnable : public nsRunnable bool mShrinking; }; -/* void schedulePreciseGC(in ScheduledGCCallback callback); */ NS_IMETHODIMP nsXPCComponents_Utils::SchedulePreciseGC(ScheduledGCCallback* aCallback) { @@ -2739,7 +2660,6 @@ nsXPCComponents_Utils::SchedulePreciseGC(ScheduledGCCallback* aCallback) return NS_DispatchToMainThread(event); } -/* void schedulePreciseShrinkingGC(in ScheduledGCCallback callback); */ NS_IMETHODIMP nsXPCComponents_Utils::SchedulePreciseShrinkingGC(ScheduledGCCallback* aCallback) { @@ -2747,7 +2667,6 @@ nsXPCComponents_Utils::SchedulePreciseShrinkingGC(ScheduledGCCallback* aCallback return NS_DispatchToMainThread(event); } -/* void unlinkGhostWindows(); */ NS_IMETHODIMP nsXPCComponents_Utils::UnlinkGhostWindows() { @@ -2759,7 +2678,6 @@ nsXPCComponents_Utils::UnlinkGhostWindows() #endif } -/* [implicit_jscontext] jsval nondeterministicGetWeakMapKeys(in jsval aMap); */ NS_IMETHODIMP nsXPCComponents_Utils::NondeterministicGetWeakMapKeys(HandleValue aMap, JSContext* aCx, @@ -2777,7 +2695,6 @@ nsXPCComponents_Utils::NondeterministicGetWeakMapKeys(HandleValue aMap, return NS_OK; } -/* [implicit_jscontext] jsval getJSTestingFunctions(); */ NS_IMETHODIMP nsXPCComponents_Utils::GetJSTestingFunctions(JSContext* cx, MutableHandleValue retval) @@ -2831,7 +2748,6 @@ nsXPCComponents_Utils::CallFunctionWithAsyncStack(HandleValue function, return NS_OK; } -/* void getGlobalForObject(); */ NS_IMETHODIMP nsXPCComponents_Utils::GetGlobalForObject(HandleValue object, JSContext* cx, @@ -2864,7 +2780,6 @@ nsXPCComponents_Utils::GetGlobalForObject(HandleValue object, return NS_OK; } -/* boolean isProxy(in value vobj); */ NS_IMETHODIMP nsXPCComponents_Utils::IsProxy(HandleValue vobj, JSContext* cx, bool* rval) { @@ -2881,7 +2796,6 @@ nsXPCComponents_Utils::IsProxy(HandleValue vobj, JSContext* cx, bool* rval) return NS_OK; } -/* jsval exportFunction(in jsval vfunction, in jsval vscope, in jsval voptions); */ NS_IMETHODIMP nsXPCComponents_Utils::ExportFunction(HandleValue vfunction, HandleValue vscope, HandleValue voptions, JSContext* cx, @@ -2892,7 +2806,6 @@ nsXPCComponents_Utils::ExportFunction(HandleValue vfunction, HandleValue vscope, return NS_OK; } -/* jsval createObjectIn(in jsval vobj, [optional] in jsval voptions); */ NS_IMETHODIMP nsXPCComponents_Utils::CreateObjectIn(HandleValue vobj, HandleValue voptions, JSContext* cx, MutableHandleValue rval) @@ -2911,7 +2824,6 @@ nsXPCComponents_Utils::CreateObjectIn(HandleValue vobj, HandleValue voptions, return NS_OK; } -/* void makeObjectPropsNormal(jsval vobj); */ NS_IMETHODIMP nsXPCComponents_Utils::MakeObjectPropsNormal(HandleValue vobj, JSContext* cx) { @@ -2988,7 +2900,6 @@ nsXPCComponents_Utils::GetCrossProcessWrapperTag(HandleValue obj, nsACString& ou return NS_OK; } -/* void recomputerWrappers(jsval vobj); */ NS_IMETHODIMP nsXPCComponents_Utils::RecomputeWrappers(HandleValue vobj, JSContext* cx) { @@ -3008,7 +2919,6 @@ nsXPCComponents_Utils::RecomputeWrappers(HandleValue vobj, JSContext* cx) return NS_OK; } -/* jsval setWantXrays(jsval vscope); */ NS_IMETHODIMP nsXPCComponents_Utils::SetWantXrays(HandleValue vscope, JSContext* cx) { @@ -3023,7 +2933,6 @@ nsXPCComponents_Utils::SetWantXrays(HandleValue vscope, JSContext* cx) return NS_OK; } -/* jsval forcePermissiveCOWs(); */ NS_IMETHODIMP nsXPCComponents_Utils::ForcePermissiveCOWs(JSContext* cx) { @@ -3032,7 +2941,6 @@ nsXPCComponents_Utils::ForcePermissiveCOWs(JSContext* cx) return NS_OK; } -/* jsval skipCOWCallableChecks(); */ NS_IMETHODIMP nsXPCComponents_Utils::SkipCOWCallableChecks(JSContext* cx) { @@ -3040,7 +2948,6 @@ nsXPCComponents_Utils::SkipCOWCallableChecks(JSContext* cx) return NS_OK; } -/* jsval forcePrivilegedComponentsForScope(jsval vscope); */ NS_IMETHODIMP nsXPCComponents_Utils::ForcePrivilegedComponentsForScope(HandleValue vscope, JSContext* cx) @@ -3054,7 +2961,6 @@ nsXPCComponents_Utils::ForcePrivilegedComponentsForScope(HandleValue vscope, return NS_OK; } -/* jsval getComponentsForScope(jsval vscope); */ NS_IMETHODIMP nsXPCComponents_Utils::GetComponentsForScope(HandleValue vscope, JSContext* cx, MutableHandleValue rval) @@ -3612,7 +3518,6 @@ nsXPCComponents::SetReturnCode(JSContext* aCx, HandleValue aCode) } // static -/* void reportError (); */ NS_IMETHODIMP nsXPCComponents::ReportError(HandleValue error, JSContext* cx) { NS_WARNING("Components.reportError deprecated, use Components.utils.reportError"); diff --git a/js/xpconnect/src/XPCJSID.cpp b/js/xpconnect/src/XPCJSID.cpp index 1dfe729772e..4d42cda8d7e 100644 --- a/js/xpconnect/src/XPCJSID.cpp +++ b/js/xpconnect/src/XPCJSID.cpp @@ -408,7 +408,6 @@ nsJSIID::Resolve(nsIXPConnectWrappedNative* wrapper, return NS_OK; } -/* bool enumerate (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj); */ NS_IMETHODIMP nsJSIID::Enumerate(nsIXPConnectWrappedNative* wrapper, JSContext * cx, JSObject * objArg, bool* _retval) @@ -505,7 +504,6 @@ xpc::HasInstance(JSContext* cx, HandleObject objArg, const nsID* iid, bool* bp) return NS_OK; } -/* bool hasInstance (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsval val, out bool bp); */ NS_IMETHODIMP nsJSIID::HasInstance(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSObject * /* unused */, @@ -624,7 +622,6 @@ GetIIDArg(uint32_t argc, const JS::Value& val, JSContext* cx) return iid; } -/* nsISupports createInstance (); */ NS_IMETHODIMP nsJSCID::CreateInstance(HandleValue iidval, JSContext* cx, uint8_t optionalArgc, MutableHandleValue retval) @@ -660,7 +657,6 @@ nsJSCID::CreateInstance(HandleValue iidval, JSContext* cx, return NS_OK; } -/* nsISupports getService (); */ NS_IMETHODIMP nsJSCID::GetService(HandleValue iidval, JSContext* cx, uint8_t optionalArgc, MutableHandleValue retval) @@ -699,7 +695,6 @@ nsJSCID::GetService(HandleValue iidval, JSContext* cx, uint8_t optionalArgc, return NS_OK; } -/* bool construct (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in uint32_t argc, in JSValPtr argv, in JSValPtr vp); */ NS_IMETHODIMP nsJSCID::Construct(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSObject* objArg, @@ -719,7 +714,6 @@ nsJSCID::Construct(nsIXPConnectWrappedNative* wrapper, return NS_OK; } -/* bool hasInstance (in nsIXPConnectWrappedNative wrapper, in JSContextPtr cx, in JSObjectPtr obj, in jsval val, out bool bp); */ NS_IMETHODIMP nsJSCID::HasInstance(nsIXPConnectWrappedNative* wrapper, JSContext* cx, JSObject * /* unused */, diff --git a/js/xpconnect/src/XPCRuntimeService.cpp b/js/xpconnect/src/XPCRuntimeService.cpp index cf5acac413f..2ae04dba821 100644 --- a/js/xpconnect/src/XPCRuntimeService.cpp +++ b/js/xpconnect/src/XPCRuntimeService.cpp @@ -113,7 +113,6 @@ oom: return NS_ERROR_OUT_OF_MEMORY; } -/* nsIXPCScriptable getScriptableHelper (); */ NS_IMETHODIMP BackstagePass::GetScriptableHelper(nsIXPCScriptable** retval) { @@ -122,7 +121,6 @@ BackstagePass::GetScriptableHelper(nsIXPCScriptable** retval) return NS_OK; } -/* readonly attribute string contractID; */ NS_IMETHODIMP BackstagePass::GetContractID(char * *aContractID) { @@ -130,7 +128,6 @@ BackstagePass::GetContractID(char * *aContractID) return NS_ERROR_NOT_AVAILABLE; } -/* readonly attribute string classDescription; */ NS_IMETHODIMP BackstagePass::GetClassDescription(char * *aClassDescription) { @@ -139,7 +136,6 @@ BackstagePass::GetClassDescription(char * *aClassDescription) return *aClassDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -/* readonly attribute nsCIDPtr classID; */ NS_IMETHODIMP BackstagePass::GetClassID(nsCID * *aClassID) { @@ -147,7 +143,6 @@ BackstagePass::GetClassID(nsCID * *aClassID) return NS_OK; } -/* readonly attribute uint32_t flags; */ NS_IMETHODIMP BackstagePass::GetFlags(uint32_t* aFlags) { @@ -155,7 +150,6 @@ BackstagePass::GetFlags(uint32_t* aFlags) return NS_OK; } -/* [notxpcom] readonly attribute nsCID classIDNoAlloc; */ NS_IMETHODIMP BackstagePass::GetClassIDNoAlloc(nsCID* aClassIDNoAlloc) { diff --git a/js/xpconnect/src/XPCShellImpl.cpp b/js/xpconnect/src/XPCShellImpl.cpp index 61290e0f41b..8ae516620b7 100644 --- a/js/xpconnect/src/XPCShellImpl.cpp +++ b/js/xpconnect/src/XPCShellImpl.cpp @@ -1189,7 +1189,6 @@ nsXPCFunctionThisTranslator::~nsXPCFunctionThisTranslator() { } -/* nsISupports TranslateThis (in nsISupports aInitialThis); */ NS_IMETHODIMP nsXPCFunctionThisTranslator::TranslateThis(nsISupports* aInitialThis, nsISupports** _retval) diff --git a/js/xpconnect/src/XPCVariant.cpp b/js/xpconnect/src/XPCVariant.cpp index 6263b39ceb6..6ee1f612337 100644 --- a/js/xpconnect/src/XPCVariant.cpp +++ b/js/xpconnect/src/XPCVariant.cpp @@ -640,104 +640,87 @@ XPCVariant::VariantDataToJS(nsIVariant* variant, // some more interesting conversions. -/* readonly attribute uint16_t dataType; */ NS_IMETHODIMP XPCVariant::GetDataType(uint16_t* aDataType) { *aDataType = mData.GetType(); return NS_OK; } -/* uint8_t getAsInt8 (); */ NS_IMETHODIMP XPCVariant::GetAsInt8(uint8_t* _retval) { return mData.ConvertToInt8(_retval); } -/* int16_t getAsInt16 (); */ NS_IMETHODIMP XPCVariant::GetAsInt16(int16_t* _retval) { return mData.ConvertToInt16(_retval); } -/* int32_t getAsInt32 (); */ NS_IMETHODIMP XPCVariant::GetAsInt32(int32_t* _retval) { return mData.ConvertToInt32(_retval); } -/* int64_t getAsInt64 (); */ NS_IMETHODIMP XPCVariant::GetAsInt64(int64_t* _retval) { return mData.ConvertToInt64(_retval); } -/* uint8_t getAsUint8 (); */ NS_IMETHODIMP XPCVariant::GetAsUint8(uint8_t* _retval) { return mData.ConvertToUint8(_retval); } -/* uint16_t getAsUint16 (); */ NS_IMETHODIMP XPCVariant::GetAsUint16(uint16_t* _retval) { return mData.ConvertToUint16(_retval); } -/* uint32_t getAsUint32 (); */ NS_IMETHODIMP XPCVariant::GetAsUint32(uint32_t* _retval) { return mData.ConvertToUint32(_retval); } -/* uint64_t getAsUint64 (); */ NS_IMETHODIMP XPCVariant::GetAsUint64(uint64_t* _retval) { return mData.ConvertToUint64(_retval); } -/* float getAsFloat (); */ NS_IMETHODIMP XPCVariant::GetAsFloat(float* _retval) { return mData.ConvertToFloat(_retval); } -/* double getAsDouble (); */ NS_IMETHODIMP XPCVariant::GetAsDouble(double* _retval) { return mData.ConvertToDouble(_retval); } -/* bool getAsBool (); */ NS_IMETHODIMP XPCVariant::GetAsBool(bool* _retval) { return mData.ConvertToBool(_retval); } -/* char getAsChar (); */ NS_IMETHODIMP XPCVariant::GetAsChar(char* _retval) { return mData.ConvertToChar(_retval); } -/* wchar getAsWChar (); */ NS_IMETHODIMP XPCVariant::GetAsWChar(char16_t* _retval) { return mData.ConvertToWChar(_retval); } -/* [notxpcom] nsresult getAsID (out nsID retval); */ NS_IMETHODIMP_(nsresult) XPCVariant::GetAsID(nsID* retval) { return mData.ConvertToID(retval); } -/* AString getAsAString (); */ NS_IMETHODIMP XPCVariant::GetAsAString(nsAString & _retval) { return mData.ConvertToAString(_retval); } -/* DOMString getAsDOMString (); */ NS_IMETHODIMP XPCVariant::GetAsDOMString(nsAString & _retval) { // A DOMString maps to an AString internally, so we can re-use @@ -745,56 +728,47 @@ NS_IMETHODIMP XPCVariant::GetAsDOMString(nsAString & _retval) return mData.ConvertToAString(_retval); } -/* ACString getAsACString (); */ NS_IMETHODIMP XPCVariant::GetAsACString(nsACString & _retval) { return mData.ConvertToACString(_retval); } -/* AUTF8String getAsAUTF8String (); */ NS_IMETHODIMP XPCVariant::GetAsAUTF8String(nsAUTF8String & _retval) { return mData.ConvertToAUTF8String(_retval); } -/* string getAsString (); */ NS_IMETHODIMP XPCVariant::GetAsString(char** _retval) { return mData.ConvertToString(_retval); } -/* wstring getAsWString (); */ NS_IMETHODIMP XPCVariant::GetAsWString(char16_t** _retval) { return mData.ConvertToWString(_retval); } -/* nsISupports getAsISupports (); */ NS_IMETHODIMP XPCVariant::GetAsISupports(nsISupports** _retval) { return mData.ConvertToISupports(_retval); } -/* void getAsInterface (out nsIIDPtr iid, [iid_is (iid), retval] out nsQIResult iface); */ NS_IMETHODIMP XPCVariant::GetAsInterface(nsIID** iid, void** iface) { return mData.ConvertToInterface(iid, iface); } -/* [notxpcom] nsresult getAsArray (out uint16_t type, out nsIID iid, out uint32_t count, out voidPtr ptr); */ NS_IMETHODIMP_(nsresult) XPCVariant::GetAsArray(uint16_t* type, nsIID* iid, uint32_t* count, void * *ptr) { return mData.ConvertToArray(type, iid, count, ptr); } -/* void getAsStringWithSize (out uint32_t size, [size_is (size), retval] out string str); */ NS_IMETHODIMP XPCVariant::GetAsStringWithSize(uint32_t* size, char** str) { return mData.ConvertToStringWithSize(size, str); } -/* void getAsWStringWithSize (out uint32_t size, [size_is (size), retval] out wstring str); */ NS_IMETHODIMP XPCVariant::GetAsWStringWithSize(uint32_t* size, char16_t** str) { return mData.ConvertToWStringWithSize(size, str); diff --git a/js/xpconnect/src/XPCWrappedJS.cpp b/js/xpconnect/src/XPCWrappedJS.cpp index 8e280f3600a..90b234e8360 100644 --- a/js/xpconnect/src/XPCWrappedJS.cpp +++ b/js/xpconnect/src/XPCWrappedJS.cpp @@ -579,7 +579,6 @@ nsXPCWrappedJS::SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const /***************************************************************************/ -/* readonly attribute nsISimpleEnumerator enumerator; */ NS_IMETHODIMP nsXPCWrappedJS::GetEnumerator(nsISimpleEnumerator * *aEnumerate) { @@ -592,7 +591,6 @@ nsXPCWrappedJS::GetEnumerator(nsISimpleEnumerator * *aEnumerate) aEnumerate); } -/* nsIVariant getProperty (in AString name); */ NS_IMETHODIMP nsXPCWrappedJS::GetProperty(const nsAString & name, nsIVariant** _retval) { diff --git a/js/xpconnect/src/XPCWrappedJSClass.cpp b/js/xpconnect/src/XPCWrappedJSClass.cpp index 100ed38856d..20ff5d16ee3 100644 --- a/js/xpconnect/src/XPCWrappedJSClass.cpp +++ b/js/xpconnect/src/XPCWrappedJSClass.cpp @@ -407,14 +407,12 @@ xpcProperty::xpcProperty(const char16_t* aName, uint32_t aNameLen, { } -/* readonly attribute AString name; */ NS_IMETHODIMP xpcProperty::GetName(nsAString & aName) { aName.Assign(mName); return NS_OK; } -/* readonly attribute nsIVariant value; */ NS_IMETHODIMP xpcProperty::GetValue(nsIVariant * *aValue) { nsCOMPtr rval = mValue; diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp index 5619cefae4b..f6b34eb7f2e 100644 --- a/js/xpconnect/src/XPCWrappedNative.cpp +++ b/js/xpconnect/src/XPCWrappedNative.cpp @@ -2098,14 +2098,12 @@ CallMethodHelper::Invoke() /***************************************************************************/ // interface methods -/* JSObjectPtr GetJSObject(); */ JSObject* XPCWrappedNative::GetJSObject() { return GetFlatJSObject(); } -/* readonly attribute nsISupports Native; */ NS_IMETHODIMP XPCWrappedNative::GetNative(nsISupports * *aNative) { // No need to QI here, we already have the correct nsISupports @@ -2115,7 +2113,6 @@ NS_IMETHODIMP XPCWrappedNative::GetNative(nsISupports * *aNative) return NS_OK; } -/* reaonly attribute JSObjectPtr JSObjectPrototype; */ NS_IMETHODIMP XPCWrappedNative::GetJSObjectPrototype(JSObject * *aJSObjectPrototype) { *aJSObjectPrototype = HasProto() ? @@ -2144,7 +2141,6 @@ XPCWrappedNative::GetObjectPrincipal() const return principal; } -/* XPCNativeInterface FindInterfaceWithMember (in JSHandleId name); */ NS_IMETHODIMP XPCWrappedNative::FindInterfaceWithMember(HandleId name, nsIInterfaceInfo * *_retval) { @@ -2159,7 +2155,6 @@ NS_IMETHODIMP XPCWrappedNative::FindInterfaceWithMember(HandleId name, return NS_OK; } -/* XPCNativeInterface FindInterfaceWithName (in JSHandleId name); */ NS_IMETHODIMP XPCWrappedNative::FindInterfaceWithName(HandleId name, nsIInterfaceInfo * *_retval) { @@ -2172,7 +2167,6 @@ NS_IMETHODIMP XPCWrappedNative::FindInterfaceWithName(HandleId name, return NS_OK; } -/* [notxpcom] bool HasNativeMember (in JSHandleId name); */ NS_IMETHODIMP_(bool) XPCWrappedNative::HasNativeMember(HandleId name) { @@ -2181,7 +2175,6 @@ XPCWrappedNative::HasNativeMember(HandleId name) return GetSet()->FindMember(name, &member, &ignored) && !!member; } -/* void debugDump (in short depth); */ NS_IMETHODIMP XPCWrappedNative::DebugDump(int16_t depth) { #ifdef DEBUG diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp index 42ea26904dc..043929d4c2c 100644 --- a/js/xpconnect/src/nsXPConnect.cpp +++ b/js/xpconnect/src/nsXPConnect.cpp @@ -505,7 +505,6 @@ NativeInterface2JSObject(HandleObject aScope, return NS_OK; } -/* JSObjectPtr wrapNative (in JSContextPtr aJSContext, in JSObjectPtr aScope, in nsISupports aCOMObj, in nsIIDRef aIID); */ NS_IMETHODIMP nsXPConnect::WrapNative(JSContext * aJSContext, JSObject * aScopeArg, @@ -531,7 +530,6 @@ nsXPConnect::WrapNative(JSContext * aJSContext, return NS_OK; } -/* nsIXPConnectJSObjectHolder wrapNativeHolder(in JSContextPtr aJSContext, in JSObjectPtr aScope, in nsISupports aCOMObj, in nsIIDRef aIID); */ NS_IMETHODIMP nsXPConnect::WrapNativeHolder(JSContext * aJSContext, JSObject * aScopeArg, @@ -550,7 +548,6 @@ nsXPConnect::WrapNativeHolder(JSContext * aJSContext, true, &v, aHolder); } -/* void wrapNativeToJSVal (in JSContextPtr aJSContext, in JSObjectPtr aScope, in nsISupports aCOMObj, in nsIIDPtr aIID, out jsval aVal); */ NS_IMETHODIMP nsXPConnect::WrapNativeToJSVal(JSContext* aJSContext, JSObject* aScopeArg, @@ -569,7 +566,6 @@ nsXPConnect::WrapNativeToJSVal(JSContext* aJSContext, aAllowWrapping, aVal, nullptr); } -/* void wrapJS (in JSContextPtr aJSContext, in JSObjectPtr aJSObj, in nsIIDRef aIID, [iid_is (aIID), retval] out nsQIResult result); */ NS_IMETHODIMP nsXPConnect::WrapJS(JSContext * aJSContext, JSObject * aJSObjArg, @@ -606,7 +602,6 @@ nsXPConnect::JSValToVariant(JSContext* cx, return NS_OK; } -/* void wrapJSAggregatedToNative (in nsISupports aOuter, in JSContextPtr aJSContext, in JSObjectPtr aJSObj, in nsIIDRef aIID, [iid_is (aIID), retval] out nsQIResult result); */ NS_IMETHODIMP nsXPConnect::WrapJSAggregatedToNative(nsISupports* aOuter, JSContext* aJSContext, @@ -629,7 +624,6 @@ nsXPConnect::WrapJSAggregatedToNative(nsISupports* aOuter, return NS_OK; } -/* nsIXPConnectWrappedNative getWrappedNativeOfJSObject (in JSContextPtr aJSContext, in JSObjectPtr aJSObj); */ NS_IMETHODIMP nsXPConnect::GetWrappedNativeOfJSObject(JSContext * aJSContext, JSObject * aJSObjArg, @@ -673,7 +667,6 @@ xpc::UnwrapReflectorToISupports(JSObject* reflector) return canonical; } -/* nsISupports getNativeOfWrapper(in JSContextPtr aJSContext, in JSObjectPtr aJSObj); */ NS_IMETHODIMP_(nsISupports*) nsXPConnect::GetNativeOfWrapper(JSContext* aJSContext, JSObject* aJSObj) @@ -681,7 +674,6 @@ nsXPConnect::GetNativeOfWrapper(JSContext* aJSContext, return UnwrapReflectorToISupports(aJSObj); } -/* nsIXPConnectWrappedNative getWrappedNativeOfNativeObject (in JSContextPtr aJSContext, in JSObjectPtr aScope, in nsISupports aCOMObj, in nsIIDRef aIID); */ NS_IMETHODIMP nsXPConnect::GetWrappedNativeOfNativeObject(JSContext * aJSContext, JSObject * aScopeArg, @@ -716,7 +708,6 @@ nsXPConnect::GetWrappedNativeOfNativeObject(JSContext * aJSContext, return NS_OK; } -/* readonly attribute nsIStackFrame CurrentJSStack; */ NS_IMETHODIMP nsXPConnect::GetCurrentJSStack(nsIStackFrame * *aCurrentJSStack) { @@ -728,7 +719,6 @@ nsXPConnect::GetCurrentJSStack(nsIStackFrame * *aCurrentJSStack) return NS_OK; } -/* readonly attribute nsIXPCNativeCallContext CurrentNativeCallContext; */ NS_IMETHODIMP nsXPConnect::GetCurrentNativeCallContext(nsAXPCNativeCallContext * *aCurrentNativeCallContext) { @@ -738,7 +728,6 @@ nsXPConnect::GetCurrentNativeCallContext(nsAXPCNativeCallContext * *aCurrentNati return NS_OK; } -/* void setFunctionThisTranslator (in nsIIDRef aIID, in nsIXPCFunctionThisTranslator aTranslator); */ NS_IMETHODIMP nsXPConnect::SetFunctionThisTranslator(const nsIID & aIID, nsIXPCFunctionThisTranslator* aTranslator) @@ -794,7 +783,6 @@ nsXPConnect::EvalInSandboxObject(const nsAString& source, const char* filename, JSVersion(jsVersion), rval); } -/* JSObjectPtr getWrappedNativePrototype (in JSContextPtr aJSContext, in JSObjectPtr aScope); */ NS_IMETHODIMP nsXPConnect::GetWrappedNativePrototype(JSContext* aJSContext, JSObject* aScopeArg, @@ -825,7 +813,6 @@ nsXPConnect::GetWrappedNativePrototype(JSContext* aJSContext, return NS_OK; } -/* void debugDump (in short depth); */ NS_IMETHODIMP nsXPConnect::DebugDump(int16_t depth) { @@ -848,7 +835,6 @@ nsXPConnect::DebugDump(int16_t depth) return NS_OK; } -/* void debugDumpObject (in nsISupports aCOMObj, in short depth); */ NS_IMETHODIMP nsXPConnect::DebugDumpObject(nsISupports* p, int16_t depth) { @@ -888,7 +874,6 @@ nsXPConnect::DebugDumpObject(nsISupports* p, int16_t depth) return NS_OK; } -/* void debugDumpJSStack (in bool showArgs, in bool showLocals, in bool showThisProps); */ NS_IMETHODIMP nsXPConnect::DebugDumpJSStack(bool showArgs, bool showLocals, @@ -913,7 +898,6 @@ nsXPConnect::DebugPrintJSStack(bool showArgs, return nullptr; } -/* jsval variantToJS (in JSContextPtr ctx, in JSObjectPtr scope, in nsIVariant value); */ NS_IMETHODIMP nsXPConnect::VariantToJS(JSContext* ctx, JSObject* scopeArg, nsIVariant* value, MutableHandleValue _retval) @@ -935,7 +919,6 @@ nsXPConnect::VariantToJS(JSContext* ctx, JSObject* scopeArg, nsIVariant* value, return NS_OK; } -/* nsIVariant JSToVariant (in JSContextPtr ctx, in jsval value); */ NS_IMETHODIMP nsXPConnect::JSToVariant(JSContext* ctx, HandleValue value, nsIVariant** _retval) { diff --git a/js/xpconnect/tests/components/native/xpctest_params.cpp b/js/xpconnect/tests/components/native/xpctest_params.cpp index dd3b35b7066..b20d322896e 100644 --- a/js/xpconnect/tests/components/native/xpctest_params.cpp +++ b/js/xpconnect/tests/components/native/xpctest_params.cpp @@ -70,73 +70,61 @@ nsXPCTestParams::~nsXPCTestParams() return NS_OK; \ } -/* boolean testBoolean (in boolean a, inout boolean b); */ NS_IMETHODIMP nsXPCTestParams::TestBoolean(bool a, bool* b, bool* _retval) { GENERIC_METHOD_IMPL; } -/* octet testOctet (in octet a, inout octet b); */ NS_IMETHODIMP nsXPCTestParams::TestOctet(uint8_t a, uint8_t* b, uint8_t* _retval) { GENERIC_METHOD_IMPL; } -/* short testShort (in short a, inout short b); */ NS_IMETHODIMP nsXPCTestParams::TestShort(int16_t a, int16_t* b, int16_t* _retval) { GENERIC_METHOD_IMPL; } -/* long testLong (in long a, inout long b); */ NS_IMETHODIMP nsXPCTestParams::TestLong(int32_t a, int32_t* b, int32_t* _retval) { GENERIC_METHOD_IMPL; } -/* long long testLongLong (in long long a, inout long long b); */ NS_IMETHODIMP nsXPCTestParams::TestLongLong(int64_t a, int64_t* b, int64_t* _retval) { GENERIC_METHOD_IMPL; } -/* unsigned short testUnsignedShort (in unsigned short a, inout unsigned short b); */ NS_IMETHODIMP nsXPCTestParams::TestUnsignedShort(uint16_t a, uint16_t* b, uint16_t* _retval) { GENERIC_METHOD_IMPL; } -/* unsigned long testUnsignedLong (in unsigned long a, inout unsigned long b); */ NS_IMETHODIMP nsXPCTestParams::TestUnsignedLong(uint32_t a, uint32_t* b, uint32_t* _retval) { GENERIC_METHOD_IMPL; } -/* unsigned long long testUnsignedLongLong (in unsigned long long a, inout unsigned long long b); */ NS_IMETHODIMP nsXPCTestParams::TestUnsignedLongLong(uint64_t a, uint64_t* b, uint64_t* _retval) { GENERIC_METHOD_IMPL; } -/* float testFloat (in float a, inout float b); */ NS_IMETHODIMP nsXPCTestParams::TestFloat(float a, float* b, float* _retval) { GENERIC_METHOD_IMPL; } -/* double testDouble (in double a, inout float b); */ NS_IMETHODIMP nsXPCTestParams::TestDouble(double a, float* b, double* _retval) { GENERIC_METHOD_IMPL; } -/* char testChar (in char a, inout char b); */ NS_IMETHODIMP nsXPCTestParams::TestChar(char a, char* b, char* _retval) { GENERIC_METHOD_IMPL; } -/* string testString (in string a, inout string b); */ NS_IMETHODIMP nsXPCTestParams::TestString(const char * a, char * *b, char * *_retval) { nsDependentCString aprime(a); @@ -151,13 +139,11 @@ NS_IMETHODIMP nsXPCTestParams::TestString(const char * a, char * *b, char * *_re return NS_OK; } -/* wchar testWchar (in wchar a, inout wchar b); */ NS_IMETHODIMP nsXPCTestParams::TestWchar(char16_t a, char16_t* b, char16_t* _retval) { GENERIC_METHOD_IMPL; } -/* wstring testWstring (in wstring a, inout wstring b); */ NS_IMETHODIMP nsXPCTestParams::TestWstring(const char16_t * a, char16_t * *b, char16_t * *_retval) { nsDependentString aprime(a); @@ -172,32 +158,27 @@ NS_IMETHODIMP nsXPCTestParams::TestWstring(const char16_t * a, char16_t * *b, ch return NS_OK; } -/* DOMString testDOMString (in DOMString a, inout DOMString b); */ NS_IMETHODIMP nsXPCTestParams::TestDOMString(const nsAString & a, nsAString & b, nsAString & _retval) { STRING_METHOD_IMPL; } -/* AString testAString (in AString a, inout AString b); */ NS_IMETHODIMP nsXPCTestParams::TestAString(const nsAString & a, nsAString & b, nsAString & _retval) { STRING_METHOD_IMPL; } -/* AUTF8String testAUTF8String (in AUTF8String a, inout AUTF8String b); */ NS_IMETHODIMP nsXPCTestParams::TestAUTF8String(const nsACString & a, nsACString & b, nsACString & _retval) { STRING_METHOD_IMPL; } -/* ACString testACString (in ACString a, inout ACString b); */ NS_IMETHODIMP nsXPCTestParams::TestACString(const nsACString & a, nsACString & b, nsACString & _retval) { STRING_METHOD_IMPL; } -/* jsval testJsval (in jsval a, in jsval b); */ NS_IMETHODIMP nsXPCTestParams::TestJsval(JS::Handle a, JS::MutableHandle b, JS::MutableHandle _retval) @@ -340,7 +321,6 @@ NS_IMETHODIMP nsXPCTestParams::TestInterfaceIsArray(uint32_t aLength, const nsII BUFFER_METHOD_IMPL(void*, 0, TAKE_OWNERSHIP_INTERFACE); } -/* void testOutAString (out AString o); */ NS_IMETHODIMP nsXPCTestParams::TestOutAString(nsAString & o) { o.AssignLiteral("out"); diff --git a/js/xpconnect/tests/components/native/xpctest_returncode.cpp b/js/xpconnect/tests/components/native/xpctest_returncode.cpp index 09dee466656..3ae7d427964 100644 --- a/js/xpconnect/tests/components/native/xpctest_returncode.cpp +++ b/js/xpconnect/tests/components/native/xpctest_returncode.cpp @@ -16,7 +16,6 @@ nsXPCTestReturnCodeParent::~nsXPCTestReturnCodeParent() { } -/* unsigned long callChild (in long childBehavior); */ NS_IMETHODIMP nsXPCTestReturnCodeParent::CallChild(int32_t childBehavior, nsresult* _retval) { nsresult rv; diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp index f650395f009..24d520fa32d 100644 --- a/layout/base/nsDocumentViewer.cpp +++ b/layout/base/nsDocumentViewer.cpp @@ -2670,7 +2670,6 @@ NS_IMETHODIMP nsDocumentViewer::GetCopyable(bool *aCopyable) return NS_OK; } -/* AString getContents (in string mimeType, in boolean selectionOnly); */ NS_IMETHODIMP nsDocumentViewer::GetContents(const char *mimeType, bool selectionOnly, nsAString& aOutValue) { aOutValue.Truncate(); @@ -2695,7 +2694,6 @@ NS_IMETHODIMP nsDocumentViewer::GetContents(const char *mimeType, bool selection mDocument, aOutValue); } -/* readonly attribute boolean canGetContents; */ NS_IMETHODIMP nsDocumentViewer::GetCanGetContents(bool *aCanGetContents) { NS_ENSURE_ARG_POINTER(aCanGetContents); @@ -3914,14 +3912,12 @@ nsDocumentViewer::PrintPreviewNavigate(int16_t aType, int32_t aPageNum) } -/* readonly attribute nsIPrintSettings globalPrintSettings; */ NS_IMETHODIMP nsDocumentViewer::GetGlobalPrintSettings(nsIPrintSettings * *aGlobalPrintSettings) { return nsPrintEngine::GetGlobalPrintSettings(aGlobalPrintSettings); } -/* readonly attribute boolean doingPrint; */ // XXX This always returns false for subdocuments NS_IMETHODIMP nsDocumentViewer::GetDoingPrint(bool *aDoingPrint) @@ -3936,7 +3932,6 @@ nsDocumentViewer::GetDoingPrint(bool *aDoingPrint) return NS_OK; } -/* readonly attribute boolean doingPrintPreview; */ // XXX This always returns false for subdocuments NS_IMETHODIMP nsDocumentViewer::GetDoingPrintPreview(bool *aDoingPrintPreview) @@ -3950,7 +3945,6 @@ nsDocumentViewer::GetDoingPrintPreview(bool *aDoingPrintPreview) return NS_OK; } -/* readonly attribute nsIPrintSettings currentPrintSettings; */ NS_IMETHODIMP nsDocumentViewer::GetCurrentPrintSettings(nsIPrintSettings * *aCurrentPrintSettings) { @@ -3963,7 +3957,6 @@ nsDocumentViewer::GetCurrentPrintSettings(nsIPrintSettings * *aCurrentPrintSetti } -/* readonly attribute nsIDOMWindow currentChildDOMWindow; */ NS_IMETHODIMP nsDocumentViewer::GetCurrentChildDOMWindow(nsIDOMWindow * *aCurrentChildDOMWindow) { @@ -3972,7 +3965,6 @@ nsDocumentViewer::GetCurrentChildDOMWindow(nsIDOMWindow * *aCurrentChildDOMWindo return NS_ERROR_NOT_IMPLEMENTED; } -/* void cancel (); */ NS_IMETHODIMP nsDocumentViewer::Cancel() { @@ -3980,7 +3972,6 @@ nsDocumentViewer::Cancel() return mPrintEngine->Cancelled(); } -/* void exitPrintPreview (); */ NS_IMETHODIMP nsDocumentViewer::ExitPrintPreview() { @@ -4011,7 +4002,6 @@ nsDocumentViewer::EnumerateDocumentNames(uint32_t* aCount, #endif } -/* readonly attribute boolean isFramesetFrameSelected; */ NS_IMETHODIMP nsDocumentViewer::GetIsFramesetFrameSelected(bool *aIsFramesetFrameSelected) { @@ -4025,7 +4015,6 @@ nsDocumentViewer::GetIsFramesetFrameSelected(bool *aIsFramesetFrameSelected) #endif } -/* readonly attribute long printPreviewNumPages; */ NS_IMETHODIMP nsDocumentViewer::GetPrintPreviewNumPages(int32_t *aPrintPreviewNumPages) { @@ -4039,7 +4028,6 @@ nsDocumentViewer::GetPrintPreviewNumPages(int32_t *aPrintPreviewNumPages) #endif } -/* readonly attribute boolean isFramesetDocument; */ NS_IMETHODIMP nsDocumentViewer::GetIsFramesetDocument(bool *aIsFramesetDocument) { @@ -4053,7 +4041,6 @@ nsDocumentViewer::GetIsFramesetDocument(bool *aIsFramesetDocument) #endif } -/* readonly attribute boolean isIFrameSelected; */ NS_IMETHODIMP nsDocumentViewer::GetIsIFrameSelected(bool *aIsIFrameSelected) { @@ -4067,7 +4054,6 @@ nsDocumentViewer::GetIsIFrameSelected(bool *aIsIFrameSelected) #endif } -/* readonly attribute boolean isRangeSelection; */ NS_IMETHODIMP nsDocumentViewer::GetIsRangeSelection(bool *aIsRangeSelection) { diff --git a/layout/inspector/nsFontFace.cpp b/layout/inspector/nsFontFace.cpp index 02be73a8d08..bd763538846 100644 --- a/layout/inspector/nsFontFace.cpp +++ b/layout/inspector/nsFontFace.cpp @@ -37,7 +37,6 @@ NS_IMPL_ISUPPORTS(nsFontFace, nsIDOMFontFace) //////////////////////////////////////////////////////////////////////// // nsIDOMFontFace -/* readonly attribute boolean fromFontGroup; */ NS_IMETHODIMP nsFontFace::GetFromFontGroup(bool * aFromFontGroup) { @@ -46,7 +45,6 @@ nsFontFace::GetFromFontGroup(bool * aFromFontGroup) return NS_OK; } -/* readonly attribute boolean fromLanguagePrefs; */ NS_IMETHODIMP nsFontFace::GetFromLanguagePrefs(bool * aFromLanguagePrefs) { @@ -55,7 +53,6 @@ nsFontFace::GetFromLanguagePrefs(bool * aFromLanguagePrefs) return NS_OK; } -/* readonly attribute boolean fromSystemFallback; */ NS_IMETHODIMP nsFontFace::GetFromSystemFallback(bool * aFromSystemFallback) { @@ -64,7 +61,6 @@ nsFontFace::GetFromSystemFallback(bool * aFromSystemFallback) return NS_OK; } -/* readonly attribute DOMString name; */ NS_IMETHODIMP nsFontFace::GetName(nsAString & aName) { @@ -77,7 +73,6 @@ nsFontFace::GetName(nsAString & aName) return NS_OK; } -/* readonly attribute DOMString CSSFamilyName; */ NS_IMETHODIMP nsFontFace::GetCSSFamilyName(nsAString & aCSSFamilyName) { @@ -85,7 +80,6 @@ nsFontFace::GetCSSFamilyName(nsAString & aCSSFamilyName) return NS_OK; } -/* readonly attribute nsIDOMCSSFontFaceRule rule; */ NS_IMETHODIMP nsFontFace::GetRule(nsIDOMCSSFontFaceRule **aRule) { @@ -107,7 +101,6 @@ nsFontFace::GetRule(nsIDOMCSSFontFaceRule **aRule) return NS_OK; } -/* readonly attribute long srcIndex; */ NS_IMETHODIMP nsFontFace::GetSrcIndex(int32_t * aSrcIndex) { @@ -120,7 +113,6 @@ nsFontFace::GetSrcIndex(int32_t * aSrcIndex) return NS_OK; } -/* readonly attribute DOMString URI; */ NS_IMETHODIMP nsFontFace::GetURI(nsAString & aURI) { @@ -136,7 +128,6 @@ nsFontFace::GetURI(nsAString & aURI) return NS_OK; } -/* readonly attribute DOMString localName; */ NS_IMETHODIMP nsFontFace::GetLocalName(nsAString & aLocalName) { @@ -149,7 +140,6 @@ nsFontFace::GetLocalName(nsAString & aLocalName) return NS_OK; } -/* readonly attribute DOMString format; */ static void AppendToFormat(nsAString & aResult, const char* aFormat) { @@ -191,7 +181,6 @@ nsFontFace::GetFormat(nsAString & aFormat) return NS_OK; } -/* readonly attribute DOMString metadata; */ NS_IMETHODIMP nsFontFace::GetMetadata(nsAString & aMetadata) { diff --git a/layout/inspector/nsFontFaceList.cpp b/layout/inspector/nsFontFaceList.cpp index f5b45d638a2..33806a9effc 100644 --- a/layout/inspector/nsFontFaceList.cpp +++ b/layout/inspector/nsFontFaceList.cpp @@ -25,7 +25,6 @@ NS_IMPL_ISUPPORTS(nsFontFaceList, nsIDOMFontFaceList) //////////////////////////////////////////////////////////////////////// // nsIDOMFontFaceList -/* nsIDOMFontFace item (in unsigned long index); */ struct FindByIndexData { uint32_t mTarget; uint32_t mCurrent; @@ -58,7 +57,6 @@ nsFontFaceList::Item(uint32_t index, nsIDOMFontFace **_retval) return NS_OK; } -/* readonly attribute unsigned long length; */ NS_IMETHODIMP nsFontFaceList::GetLength(uint32_t *aLength) { diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp index 3435342ffab..d9224caf373 100644 --- a/layout/printing/nsPrintEngine.cpp +++ b/layout/printing/nsPrintEngine.cpp @@ -797,7 +797,6 @@ nsPrintEngine::PrintPreview(nsIPrintSettings* aPrintSettings, } //---------------------------------------------------------------------------------- -/* readonly attribute boolean isFramesetDocument; */ NS_IMETHODIMP nsPrintEngine::GetIsFramesetDocument(bool *aIsFramesetDocument) { @@ -807,7 +806,6 @@ nsPrintEngine::GetIsFramesetDocument(bool *aIsFramesetDocument) } //---------------------------------------------------------------------------------- -/* readonly attribute boolean isIFrameSelected; */ NS_IMETHODIMP nsPrintEngine::GetIsIFrameSelected(bool *aIsIFrameSelected) { @@ -828,7 +826,6 @@ nsPrintEngine::GetIsIFrameSelected(bool *aIsIFrameSelected) } //---------------------------------------------------------------------------------- -/* readonly attribute boolean isRangeSelection; */ NS_IMETHODIMP nsPrintEngine::GetIsRangeSelection(bool *aIsRangeSelection) { @@ -839,7 +836,6 @@ nsPrintEngine::GetIsRangeSelection(bool *aIsRangeSelection) } //---------------------------------------------------------------------------------- -/* readonly attribute boolean isFramesetFrameSelected; */ NS_IMETHODIMP nsPrintEngine::GetIsFramesetFrameSelected(bool *aIsFramesetFrameSelected) { @@ -850,7 +846,6 @@ nsPrintEngine::GetIsFramesetFrameSelected(bool *aIsFramesetFrameSelected) } //---------------------------------------------------------------------------------- -/* readonly attribute long printPreviewNumPages; */ NS_IMETHODIMP nsPrintEngine::GetPrintPreviewNumPages(int32_t *aPrintPreviewNumPages) { @@ -912,7 +907,6 @@ nsPrintEngine::EnumerateDocumentNames(uint32_t* aCount, } //---------------------------------------------------------------------------------- -/* readonly attribute nsIPrintSettings globalPrintSettings; */ nsresult nsPrintEngine::GetGlobalPrintSettings(nsIPrintSettings **aGlobalPrintSettings) { @@ -928,7 +922,6 @@ nsPrintEngine::GetGlobalPrintSettings(nsIPrintSettings **aGlobalPrintSettings) } //---------------------------------------------------------------------------------- -/* readonly attribute boolean doingPrint; */ NS_IMETHODIMP nsPrintEngine::GetDoingPrint(bool *aDoingPrint) { @@ -938,7 +931,6 @@ nsPrintEngine::GetDoingPrint(bool *aDoingPrint) } //---------------------------------------------------------------------------------- -/* readonly attribute boolean doingPrintPreview; */ NS_IMETHODIMP nsPrintEngine::GetDoingPrintPreview(bool *aDoingPrintPreview) { @@ -948,7 +940,6 @@ nsPrintEngine::GetDoingPrintPreview(bool *aDoingPrintPreview) } //---------------------------------------------------------------------------------- -/* readonly attribute nsIPrintSettings currentPrintSettings; */ NS_IMETHODIMP nsPrintEngine::GetCurrentPrintSettings(nsIPrintSettings * *aCurrentPrintSettings) { diff --git a/layout/xul/ScrollBoxObject.cpp b/layout/xul/ScrollBoxObject.cpp index d4fb194d911..207b7cc9e8c 100644 --- a/layout/xul/ScrollBoxObject.cpp +++ b/layout/xul/ScrollBoxObject.cpp @@ -36,7 +36,6 @@ nsIScrollableFrame* ScrollBoxObject::GetScrollFrame() return do_QueryFrame(GetFrame(false)); } -/* void scrollTo (long x, long y); */ void ScrollBoxObject::ScrollTo(int32_t x, int32_t y, ErrorResult& aRv) { nsIScrollableFrame* sf = GetScrollFrame(); @@ -48,7 +47,6 @@ void ScrollBoxObject::ScrollTo(int32_t x, int32_t y, ErrorResult& aRv) sf->ScrollToCSSPixels(CSSIntPoint(x, y)); } -/* void scrollBy (long dx, long dy); */ void ScrollBoxObject::ScrollBy(int32_t dx, int32_t dy, ErrorResult& aRv) { CSSIntPoint pt; @@ -61,7 +59,6 @@ void ScrollBoxObject::ScrollBy(int32_t dx, int32_t dy, ErrorResult& aRv) ScrollTo(pt.x + dx, pt.y + dy, aRv); } -/* void scrollByLine (long dlines); */ void ScrollBoxObject::ScrollByLine(int32_t dlines, ErrorResult& aRv) { nsIScrollableFrame* sf = GetScrollFrame(); @@ -98,7 +95,6 @@ static nsIFrame* GetScrolledBox(BoxObject* aScrollBox) { return nsBox::GetChildBox(scrolledFrame); } -/* void scrollByIndex (long dindexes); */ void ScrollBoxObject::ScrollByIndex(int32_t dindexes, ErrorResult& aRv) { nsIScrollableFrame* sf = GetScrollFrame(); @@ -216,7 +212,6 @@ void ScrollBoxObject::ScrollByIndex(int32_t dindexes, ErrorResult& aRv) } } -/* void scrollToLine (in long line); */ void ScrollBoxObject::ScrollToLine(int32_t line, ErrorResult& aRv) { nsIScrollableFrame* sf = GetScrollFrame(); @@ -231,7 +226,6 @@ void ScrollBoxObject::ScrollToLine(int32_t line, ErrorResult& aRv) sf->ScrollTo(nsPoint(0, y), nsIScrollableFrame::INSTANT, &range); } -/* void scrollToElement (Element child); */ void ScrollBoxObject::ScrollToElement(Element& child, ErrorResult& aRv) { nsCOMPtr shell = GetPresShell(false); @@ -251,7 +245,6 @@ void ScrollBoxObject::ScrollToElement(Element& child, ErrorResult& aRv) nsIPresShell::SCROLL_OVERFLOW_HIDDEN); } -/* void scrollToIndex (long index); */ void ScrollBoxObject::ScrollToIndex(int32_t index, ErrorResult& aRv) { aRv.Throw(NS_ERROR_NOT_IMPLEMENTED); @@ -351,7 +344,6 @@ void ScrollBoxObject::GetScrolledSize(JSContext* cx, } } -/* void ensureElementIsVisible (in nsIDOMElement child); */ void ScrollBoxObject::EnsureElementIsVisible(Element& child, ErrorResult& aRv) { nsCOMPtr shell = GetPresShell(false); @@ -367,13 +359,11 @@ void ScrollBoxObject::EnsureElementIsVisible(Element& child, ErrorResult& aRv) nsIPresShell::SCROLL_OVERFLOW_HIDDEN); } -/* void ensureIndexIsVisible (long index); */ void ScrollBoxObject::EnsureIndexIsVisible(int32_t index, ErrorResult& aRv) { aRv.Throw(NS_ERROR_NOT_IMPLEMENTED); } -/* void ensureLineIsVisible (long line); */ void ScrollBoxObject::EnsureLineIsVisible(int32_t line, ErrorResult& aRv) { aRv.Throw(NS_ERROR_NOT_IMPLEMENTED); diff --git a/layout/xul/nsImageBoxFrame.cpp b/layout/xul/nsImageBoxFrame.cpp index ddeb722feeb..83986f9b4e5 100644 --- a/layout/xul/nsImageBoxFrame.cpp +++ b/layout/xul/nsImageBoxFrame.cpp @@ -833,7 +833,6 @@ nsImageBoxListener::Notify(imgIRequest *request, int32_t aType, const nsIntRect* return mFrame->Notify(request, aType, aData); } -/* void blockOnload (in imgIRequest aRequest); */ NS_IMETHODIMP nsImageBoxListener::BlockOnload(imgIRequest *aRequest) { @@ -844,7 +843,6 @@ nsImageBoxListener::BlockOnload(imgIRequest *aRequest) return NS_OK; } -/* void unblockOnload (in imgIRequest aRequest); */ NS_IMETHODIMP nsImageBoxListener::UnblockOnload(imgIRequest *aRequest) { diff --git a/modules/libjar/zipwriter/nsDeflateConverter.cpp b/modules/libjar/zipwriter/nsDeflateConverter.cpp index 0583b68cef6..86b88ffa607 100644 --- a/modules/libjar/zipwriter/nsDeflateConverter.cpp +++ b/modules/libjar/zipwriter/nsDeflateConverter.cpp @@ -139,7 +139,6 @@ NS_IMETHODIMP nsDeflateConverter::OnDataAvailable(nsIRequest *aRequest, return NS_OK; } -/* void onStartRequest (in nsIRequest aRequest, in nsISupports aContext); */ NS_IMETHODIMP nsDeflateConverter::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) { diff --git a/modules/libjar/zipwriter/nsZipDataStream.cpp b/modules/libjar/zipwriter/nsZipDataStream.cpp index d885c7197b2..aa29e5bdd47 100644 --- a/modules/libjar/zipwriter/nsZipDataStream.cpp +++ b/modules/libjar/zipwriter/nsZipDataStream.cpp @@ -80,7 +80,6 @@ NS_IMETHODIMP nsZipDataStream::OnDataAvailable(nsIRequest *aRequest, return ProcessData(aRequest, aContext, buffer.get(), aOffset, aCount); } -/* void onStartRequest (in nsIRequest aRequest, in nsISupports aContext); */ NS_IMETHODIMP nsZipDataStream::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) { diff --git a/modules/libjar/zipwriter/nsZipHeader.cpp b/modules/libjar/zipwriter/nsZipHeader.cpp index c377261352a..bc05bed37bf 100644 --- a/modules/libjar/zipwriter/nsZipHeader.cpp +++ b/modules/libjar/zipwriter/nsZipHeader.cpp @@ -23,7 +23,6 @@ */ NS_IMPL_ISUPPORTS(nsZipHeader, nsIZipEntry) -/* readonly attribute unsigned short compression; */ NS_IMETHODIMP nsZipHeader::GetCompression(uint16_t *aCompression) { NS_ASSERTION(mInited, "Not initalised"); @@ -32,7 +31,6 @@ NS_IMETHODIMP nsZipHeader::GetCompression(uint16_t *aCompression) return NS_OK; } -/* readonly attribute unsigned long size; */ NS_IMETHODIMP nsZipHeader::GetSize(uint32_t *aSize) { NS_ASSERTION(mInited, "Not initalised"); @@ -41,7 +39,6 @@ NS_IMETHODIMP nsZipHeader::GetSize(uint32_t *aSize) return NS_OK; } -/* readonly attribute unsigned long realSize; */ NS_IMETHODIMP nsZipHeader::GetRealSize(uint32_t *aRealSize) { NS_ASSERTION(mInited, "Not initalised"); @@ -50,7 +47,6 @@ NS_IMETHODIMP nsZipHeader::GetRealSize(uint32_t *aRealSize) return NS_OK; } -/* readonly attribute unsigned long CRC32; */ NS_IMETHODIMP nsZipHeader::GetCRC32(uint32_t *aCRC32) { NS_ASSERTION(mInited, "Not initalised"); @@ -59,7 +55,6 @@ NS_IMETHODIMP nsZipHeader::GetCRC32(uint32_t *aCRC32) return NS_OK; } -/* readonly attribute boolean isDirectory; */ NS_IMETHODIMP nsZipHeader::GetIsDirectory(bool *aIsDirectory) { NS_ASSERTION(mInited, "Not initalised"); @@ -71,7 +66,6 @@ NS_IMETHODIMP nsZipHeader::GetIsDirectory(bool *aIsDirectory) return NS_OK; } -/* readonly attribute PRTime lastModifiedTime; */ NS_IMETHODIMP nsZipHeader::GetLastModifiedTime(PRTime *aLastModifiedTime) { NS_ASSERTION(mInited, "Not initalised"); @@ -118,7 +112,6 @@ NS_IMETHODIMP nsZipHeader::GetLastModifiedTime(PRTime *aLastModifiedTime) return NS_OK; } -/* readonly attribute boolean isSynthetic; */ NS_IMETHODIMP nsZipHeader::GetIsSynthetic(bool *aIsSynthetic) { NS_ASSERTION(mInited, "Not initalised"); @@ -127,7 +120,6 @@ NS_IMETHODIMP nsZipHeader::GetIsSynthetic(bool *aIsSynthetic) return NS_OK; } -/* readonly attribute unsigned long permissions; */ NS_IMETHODIMP nsZipHeader::GetPermissions(uint32_t *aPermissions) { NS_ASSERTION(mInited, "Not initalised"); diff --git a/modules/libjar/zipwriter/nsZipWriter.cpp b/modules/libjar/zipwriter/nsZipWriter.cpp index 9b0b3783796..9cf778267ab 100644 --- a/modules/libjar/zipwriter/nsZipWriter.cpp +++ b/modules/libjar/zipwriter/nsZipWriter.cpp @@ -59,7 +59,6 @@ nsZipWriter::~nsZipWriter() Close(); } -/* attribute AString comment; */ NS_IMETHODIMP nsZipWriter::GetComment(nsACString & aComment) { if (!mStream) @@ -79,14 +78,12 @@ NS_IMETHODIMP nsZipWriter::SetComment(const nsACString & aComment) return NS_OK; } -/* readonly attribute boolean inQueue; */ NS_IMETHODIMP nsZipWriter::GetInQueue(bool *aInQueue) { *aInQueue = mInQueue; return NS_OK; } -/* readonly attribute nsIFile file; */ NS_IMETHODIMP nsZipWriter::GetFile(nsIFile **aFile) { if (!mFile) @@ -227,7 +224,6 @@ nsresult nsZipWriter::ReadFile(nsIFile *aFile) return NS_ERROR_UNEXPECTED; } -/* void open (in nsIFile aFile, in int32_t aIoFlags); */ NS_IMETHODIMP nsZipWriter::Open(nsIFile *aFile, int32_t aIoFlags) { if (mStream) @@ -286,7 +282,6 @@ NS_IMETHODIMP nsZipWriter::Open(nsIFile *aFile, int32_t aIoFlags) return NS_OK; } -/* nsIZipEntry getEntry (in AString aZipEntry); */ NS_IMETHODIMP nsZipWriter::GetEntry(const nsACString & aZipEntry, nsIZipEntry **_retval) { @@ -299,7 +294,6 @@ NS_IMETHODIMP nsZipWriter::GetEntry(const nsACString & aZipEntry, return NS_OK; } -/* boolean hasEntry (in AString aZipEntry); */ NS_IMETHODIMP nsZipWriter::HasEntry(const nsACString & aZipEntry, bool *_retval) { @@ -509,7 +503,6 @@ nsresult nsZipWriter::AddEntryStream(const nsACString & aZipEntry, return rv; } -/* void removeEntry (in AUTF8String aZipEntry, in boolean aQueue); */ NS_IMETHODIMP nsZipWriter::RemoveEntry(const nsACString & aZipEntry, bool aQueue) { @@ -626,7 +619,6 @@ NS_IMETHODIMP nsZipWriter::ProcessQueue(nsIRequestObserver *aObserver, return NS_OK; } -/* void close (); */ NS_IMETHODIMP nsZipWriter::Close() { if (!mStream) @@ -704,7 +696,6 @@ NS_IMETHODIMP nsZipWriter::Close() } // Our nsIRequestObserver monitors removal operations performed on the queue -/* void onStartRequest (in nsIRequest aRequest, in nsISupports aContext); */ NS_IMETHODIMP nsZipWriter::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) { diff --git a/modules/libpref/nsPrefBranch.cpp b/modules/libpref/nsPrefBranch.cpp index 7eafab7a267..66ef79cced2 100644 --- a/modules/libpref/nsPrefBranch.cpp +++ b/modules/libpref/nsPrefBranch.cpp @@ -515,7 +515,6 @@ NS_IMETHODIMP nsPrefBranch::UnlockPref(const char *aPrefName) return PREF_LockPref(pref, false); } -/* void resetBranch (in string startingAt); */ NS_IMETHODIMP nsPrefBranch::ResetBranch(const char *aStartingAt) { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/netwerk/base/SchedulingContextService.cpp b/netwerk/base/SchedulingContextService.cpp index 24a172102a6..0bbc557c428 100644 --- a/netwerk/base/SchedulingContextService.cpp +++ b/netwerk/base/SchedulingContextService.cpp @@ -73,7 +73,6 @@ SchedulingContext::RemoveBlockingTransaction(uint32_t *outval) return NS_OK; } -/* [noscript] attribute SpdyPushCachePtr spdyPushCache; */ NS_IMETHODIMP SchedulingContext::GetSpdyPushCache(mozilla::net::SpdyPushCache **aSpdyPushCache) { @@ -88,7 +87,6 @@ SchedulingContext::SetSpdyPushCache(mozilla::net::SpdyPushCache *aSpdyPushCache) return NS_OK; } -/* [noscript] readonly attribute nsID ID; */ NS_IMETHODIMP SchedulingContext::GetID(nsID *outval) { diff --git a/netwerk/base/nsLoadGroup.cpp b/netwerk/base/nsLoadGroup.cpp index d9bc3877226..5050c3105bc 100644 --- a/netwerk/base/nsLoadGroup.cpp +++ b/netwerk/base/nsLoadGroup.cpp @@ -722,7 +722,6 @@ nsLoadGroup::GetSchedulingContextID(nsID *aSCID) //////////////////////////////////////////////////////////////////////////////// // nsILoadGroupChild methods: -/* attribute nsILoadGroup parentLoadGroup; */ NS_IMETHODIMP nsLoadGroup::GetParentLoadGroup(nsILoadGroup * *aParentLoadGroup) { @@ -741,7 +740,6 @@ nsLoadGroup::SetParentLoadGroup(nsILoadGroup *aParentLoadGroup) return NS_OK; } -/* readonly attribute nsILoadGroup childLoadGroup; */ NS_IMETHODIMP nsLoadGroup::GetChildLoadGroup(nsILoadGroup * *aChildLoadGroup) { @@ -749,7 +747,6 @@ nsLoadGroup::GetChildLoadGroup(nsILoadGroup * *aChildLoadGroup) return NS_OK; } -/* readonly attribute nsILoadGroup rootLoadGroup; */ NS_IMETHODIMP nsLoadGroup::GetRootLoadGroup(nsILoadGroup * *aRootLoadGroup) { diff --git a/netwerk/base/nsMIMEInputStream.cpp b/netwerk/base/nsMIMEInputStream.cpp index 2fba15901de..7a65ac8b1b1 100644 --- a/netwerk/base/nsMIMEInputStream.cpp +++ b/netwerk/base/nsMIMEInputStream.cpp @@ -114,7 +114,6 @@ NS_METHOD nsMIMEInputStream::Init() } -/* attribute boolean addContentLength; */ NS_IMETHODIMP nsMIMEInputStream::GetAddContentLength(bool *aAddContentLength) { @@ -129,7 +128,6 @@ nsMIMEInputStream::SetAddContentLength(bool aAddContentLength) return NS_OK; } -/* void addHeader ([const] in string name, [const] in string value); */ NS_IMETHODIMP nsMIMEInputStream::AddHeader(const char *aName, const char *aValue) { @@ -147,7 +145,6 @@ nsMIMEInputStream::AddHeader(const char *aName, const char *aValue) return NS_OK; } -/* void setData (in nsIInputStream stream); */ NS_IMETHODIMP nsMIMEInputStream::SetData(nsIInputStream *aStream) { diff --git a/netwerk/base/nsNetAddr.cpp b/netwerk/base/nsNetAddr.cpp index 6709dc082a5..8d6f245cf30 100644 --- a/netwerk/base/nsNetAddr.cpp +++ b/netwerk/base/nsNetAddr.cpp @@ -19,7 +19,6 @@ nsNetAddr::nsNetAddr(NetAddr* addr) mAddr = *addr; } -/* readonly attribute unsigned short family; */ NS_IMETHODIMP nsNetAddr::GetFamily(uint16_t *aFamily) { switch(mAddr.raw.family) { @@ -41,7 +40,6 @@ NS_IMETHODIMP nsNetAddr::GetFamily(uint16_t *aFamily) return NS_OK; } -/* readonly attribute AUTF8String address; */ NS_IMETHODIMP nsNetAddr::GetAddress(nsACString & aAddress) { switch(mAddr.raw.family) { @@ -69,7 +67,6 @@ NS_IMETHODIMP nsNetAddr::GetAddress(nsACString & aAddress) return NS_OK; } -/* readonly attribute unsigned short port; */ NS_IMETHODIMP nsNetAddr::GetPort(uint16_t *aPort) { switch(mAddr.raw.family) { @@ -91,7 +88,6 @@ NS_IMETHODIMP nsNetAddr::GetPort(uint16_t *aPort) return NS_OK; } -/* readonly attribute unsigned long flow; */ NS_IMETHODIMP nsNetAddr::GetFlow(uint32_t *aFlow) { switch(mAddr.raw.family) { @@ -111,7 +107,6 @@ NS_IMETHODIMP nsNetAddr::GetFlow(uint32_t *aFlow) return NS_OK; } -/* readonly attribute unsigned long scope; */ NS_IMETHODIMP nsNetAddr::GetScope(uint32_t *aScope) { switch(mAddr.raw.family) { @@ -131,7 +126,6 @@ NS_IMETHODIMP nsNetAddr::GetScope(uint32_t *aScope) return NS_OK; } -/* readonly attribute boolean isV4Mapped; */ NS_IMETHODIMP nsNetAddr::GetIsV4Mapped(bool *aIsV4Mapped) { switch(mAddr.raw.family) { diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp index 301056927cb..48ea5457abd 100644 --- a/netwerk/base/nsSocketTransport2.cpp +++ b/netwerk/base/nsSocketTransport2.cpp @@ -2357,7 +2357,6 @@ nsSocketTransport::Bind(NetAddr *aLocalAddr) return NS_OK; } -/* nsINetAddr getScriptablePeerAddr (); */ NS_IMETHODIMP nsSocketTransport::GetScriptablePeerAddr(nsINetAddr * *addr) { @@ -2373,7 +2372,6 @@ nsSocketTransport::GetScriptablePeerAddr(nsINetAddr * *addr) return NS_OK; } -/* nsINetAddr getScriptableSelfAddr (); */ NS_IMETHODIMP nsSocketTransport::GetScriptableSelfAddr(nsINetAddr * *addr) { diff --git a/netwerk/base/nsStreamLoader.cpp b/netwerk/base/nsStreamLoader.cpp index e3a261a1774..c5b37477ed2 100644 --- a/netwerk/base/nsStreamLoader.cpp +++ b/netwerk/base/nsStreamLoader.cpp @@ -55,7 +55,6 @@ nsStreamLoader::GetNumBytesRead(uint32_t* aNumBytes) return NS_OK; } -/* readonly attribute nsIRequest request; */ NS_IMETHODIMP nsStreamLoader::GetRequest(nsIRequest **aRequest) { diff --git a/netwerk/base/nsUDPSocket.cpp b/netwerk/base/nsUDPSocket.cpp index 249780f136b..925ac666725 100644 --- a/netwerk/base/nsUDPSocket.cpp +++ b/netwerk/base/nsUDPSocket.cpp @@ -295,7 +295,6 @@ nsUDPOutputStream::~nsUDPOutputStream() { } -/* void close (); */ NS_IMETHODIMP nsUDPOutputStream::Close() { if (mIsClosed) @@ -305,13 +304,11 @@ NS_IMETHODIMP nsUDPOutputStream::Close() return NS_OK; } -/* void flush (); */ NS_IMETHODIMP nsUDPOutputStream::Flush() { return NS_OK; } -/* unsigned long write (in string aBuf, in unsigned long aCount); */ NS_IMETHODIMP nsUDPOutputStream::Write(const char * aBuf, uint32_t aCount, uint32_t *_retval) { if (mIsClosed) @@ -331,19 +328,16 @@ NS_IMETHODIMP nsUDPOutputStream::Write(const char * aBuf, uint32_t aCount, uint3 return NS_OK; } -/* unsigned long writeFrom (in nsIInputStream aFromStream, in unsigned long aCount); */ NS_IMETHODIMP nsUDPOutputStream::WriteFrom(nsIInputStream *aFromStream, uint32_t aCount, uint32_t *_retval) { return NS_ERROR_NOT_IMPLEMENTED; } -/* [noscript] unsigned long writeSegments (in nsReadSegmentFun aReader, in voidPtr aClosure, in unsigned long aCount); */ NS_IMETHODIMP nsUDPOutputStream::WriteSegments(nsReadSegmentFun aReader, void *aClosure, uint32_t aCount, uint32_t *_retval) { return NS_ERROR_NOT_IMPLEMENTED; } -/* boolean isNonBlocking (); */ NS_IMETHODIMP nsUDPOutputStream::IsNonBlocking(bool *_retval) { *_retval = true; @@ -389,7 +383,6 @@ nsUDPMessage::~nsUDPMessage() mozilla::DropJSObjects(this); } -/* readonly attribute nsINetAddr from; */ NS_IMETHODIMP nsUDPMessage::GetFromAddr(nsINetAddr * *aFromAddr) { @@ -401,7 +394,6 @@ nsUDPMessage::GetFromAddr(nsINetAddr * *aFromAddr) return NS_OK; } -/* readonly attribute ACString data; */ NS_IMETHODIMP nsUDPMessage::GetData(nsACString & aData) { @@ -409,7 +401,6 @@ nsUDPMessage::GetData(nsACString & aData) return NS_OK; } -/* readonly attribute nsIOutputStream outputStream; */ NS_IMETHODIMP nsUDPMessage::GetOutputStream(nsIOutputStream * *aOutputStream) { @@ -418,7 +409,6 @@ nsUDPMessage::GetOutputStream(nsIOutputStream * *aOutputStream) return NS_OK; } -/* readonly attribute jsval rawData; */ NS_IMETHODIMP nsUDPMessage::GetRawData(JSContext* cx, JS::MutableHandleValue aRawData) @@ -431,7 +421,6 @@ nsUDPMessage::GetRawData(JSContext* cx, return NS_OK; } -/* [noscript, notxpcom, nostdcall] Uint8ArrayRef getDataAsTArray(); */ FallibleTArray& nsUDPMessage::GetDataAsTArray() { @@ -595,7 +584,6 @@ private: NS_IMPL_ISUPPORTS(UDPMessageProxy, nsIUDPMessage) -/* readonly attribute nsINetAddr from; */ NS_IMETHODIMP UDPMessageProxy::GetFromAddr(nsINetAddr * *aFromAddr) { @@ -607,7 +595,6 @@ UDPMessageProxy::GetFromAddr(nsINetAddr * *aFromAddr) return NS_OK; } -/* readonly attribute ACString data; */ NS_IMETHODIMP UDPMessageProxy::GetData(nsACString & aData) { @@ -615,14 +602,12 @@ UDPMessageProxy::GetData(nsACString & aData) return NS_OK; } -/* [noscript, notxpcom, nostdcall] Uint8TArrayRef getDataAsTArray(); */ FallibleTArray& UDPMessageProxy::GetDataAsTArray() { return mData; } -/* readonly attribute jsval rawData; */ NS_IMETHODIMP UDPMessageProxy::GetRawData(JSContext* cx, JS::MutableHandleValue aRawData) @@ -630,7 +615,6 @@ UDPMessageProxy::GetRawData(JSContext* cx, return NS_ERROR_NOT_IMPLEMENTED; } -/* readonly attribute nsIOutputStream outputStream; */ NS_IMETHODIMP UDPMessageProxy::GetOutputStream(nsIOutputStream * *aOutputStream) { diff --git a/netwerk/base/nsUnicharStreamLoader.cpp b/netwerk/base/nsUnicharStreamLoader.cpp index f73e9f40c20..7f838dfe179 100644 --- a/netwerk/base/nsUnicharStreamLoader.cpp +++ b/netwerk/base/nsUnicharStreamLoader.cpp @@ -49,7 +49,6 @@ nsUnicharStreamLoader::Create(nsISupports *aOuter, NS_IMPL_ISUPPORTS(nsUnicharStreamLoader, nsIUnicharStreamLoader, nsIRequestObserver, nsIStreamListener) -/* readonly attribute nsIChannel channel; */ NS_IMETHODIMP nsUnicharStreamLoader::GetChannel(nsIChannel **aChannel) { @@ -57,7 +56,6 @@ nsUnicharStreamLoader::GetChannel(nsIChannel **aChannel) return NS_OK; } -/* readonly attribute nsACString charset */ NS_IMETHODIMP nsUnicharStreamLoader::GetCharset(nsACString& aCharset) { diff --git a/netwerk/cache/nsDiskCacheDevice.cpp b/netwerk/cache/nsDiskCacheDevice.cpp index 31b3f93bfc7..721d6c1534c 100644 --- a/netwerk/cache/nsDiskCacheDevice.cpp +++ b/netwerk/cache/nsDiskCacheDevice.cpp @@ -193,7 +193,6 @@ private: NS_IMPL_ISUPPORTS(nsDiskCacheDeviceInfo, nsICacheDeviceInfo) -/* readonly attribute string description; */ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetDescription(char ** aDescription) { NS_ENSURE_ARG_POINTER(aDescription); @@ -201,7 +200,6 @@ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetDescription(char ** aDescription) return *aDescription ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -/* readonly attribute string usageReport; */ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetUsageReport(char ** usageReport) { NS_ENSURE_ARG_POINTER(usageReport); @@ -228,7 +226,6 @@ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetUsageReport(char ** usageReport) return NS_OK; } -/* readonly attribute unsigned long entryCount; */ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetEntryCount(uint32_t *aEntryCount) { NS_ENSURE_ARG_POINTER(aEntryCount); @@ -236,7 +233,6 @@ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetEntryCount(uint32_t *aEntryCount) return NS_OK; } -/* readonly attribute unsigned long totalSize; */ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetTotalSize(uint32_t *aTotalSize) { NS_ENSURE_ARG_POINTER(aTotalSize); @@ -245,7 +241,6 @@ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetTotalSize(uint32_t *aTotalSize) return NS_OK; } -/* readonly attribute unsigned long maximumSize; */ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetMaximumSize(uint32_t *aMaximumSize) { NS_ENSURE_ARG_POINTER(aMaximumSize); diff --git a/netwerk/dns/nsIDNService.cpp b/netwerk/dns/nsIDNService.cpp index 909d7677a99..87c49e559b5 100644 --- a/netwerk/dns/nsIDNService.cpp +++ b/netwerk/dns/nsIDNService.cpp @@ -153,7 +153,6 @@ nsIDNService::~nsIDNService() idn_nameprep_destroy(mNamePrepHandle); } -/* ACString ConvertUTF8toACE (in AUTF8String input); */ NS_IMETHODIMP nsIDNService::ConvertUTF8toACE(const nsACString & input, nsACString & ace) { return UTF8toACE(input, ace, true, true); @@ -213,7 +212,6 @@ nsresult nsIDNService::UTF8toACE(const nsACString & input, nsACString & ace, boo return NS_OK; } -/* AUTF8String convertACEtoUTF8(in ACString input); */ NS_IMETHODIMP nsIDNService::ConvertACEtoUTF8(const nsACString & input, nsACString & _retval) { return ACEtoUTF8(input, _retval, true, true); @@ -267,7 +265,6 @@ nsresult nsIDNService::ACEtoUTF8(const nsACString & input, nsACString & _retval, return NS_OK; } -/* boolean isACE(in ACString input); */ NS_IMETHODIMP nsIDNService::IsACE(const nsACString & input, bool *_retval) { nsACString::const_iterator begin; @@ -286,7 +283,6 @@ NS_IMETHODIMP nsIDNService::IsACE(const nsACString & input, bool *_retval) return NS_OK; } -/* AUTF8String normalize(in AUTF8String input); */ NS_IMETHODIMP nsIDNService::Normalize(const nsACString & input, nsACString & output) { // protect against bogus input diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp index eb0770bd536..4ab6c4a42da 100644 --- a/netwerk/protocol/http/HttpChannelChild.cpp +++ b/netwerk/protocol/http/HttpChannelChild.cpp @@ -2033,7 +2033,6 @@ HttpChannelChild::GetAssociatedContentSecurity( return true; } -/* attribute unsigned long countSubRequestsBrokenSecurity; */ NS_IMETHODIMP HttpChannelChild::GetCountSubRequestsBrokenSecurity( int32_t *aSubRequestsBrokenSecurity) @@ -2055,7 +2054,6 @@ HttpChannelChild::SetCountSubRequestsBrokenSecurity( return assoc->SetCountSubRequestsBrokenSecurity(aSubRequestsBrokenSecurity); } -/* attribute unsigned long countSubRequestsNoSecurity; */ NS_IMETHODIMP HttpChannelChild::GetCountSubRequestsNoSecurity(int32_t *aSubRequestsNoSecurity) { diff --git a/netwerk/protocol/rtsp/controller/RtspMetaData.cpp b/netwerk/protocol/rtsp/controller/RtspMetaData.cpp index 1ee5fb338bb..4bf33bccc74 100644 --- a/netwerk/protocol/rtsp/controller/RtspMetaData.cpp +++ b/netwerk/protocol/rtsp/controller/RtspMetaData.cpp @@ -139,7 +139,6 @@ RtspMetaData::SetWidth(uint32_t aWidth) return NS_OK; } -/* attribute unsigned long height; */ NS_IMETHODIMP RtspMetaData::GetHeight(uint32_t *aHeight) { @@ -155,7 +154,6 @@ RtspMetaData::SetHeight(uint32_t aHeight) return NS_OK; } -/* attribute unsigned long long duration; */ NS_IMETHODIMP RtspMetaData::GetDuration(uint64_t *aDuration) { @@ -171,7 +169,6 @@ RtspMetaData::SetDuration(uint64_t aDuration) return NS_OK; } -/* attribute unsigned long sampleRate; */ NS_IMETHODIMP RtspMetaData::GetSampleRate(uint32_t *aSampleRate) { diff --git a/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp b/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp index 180b20ac987..f041c11dbcd 100644 --- a/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp +++ b/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp @@ -368,14 +368,12 @@ void WyciwygChannelChild::CancelEarly(const nsresult& statusCode) // nsIRequest //----------------------------------------------------------------------------- -/* readonly attribute AUTF8String name; */ NS_IMETHODIMP WyciwygChannelChild::GetName(nsACString & aName) { return mURI->GetSpec(aName); } -/* boolean isPending (); */ NS_IMETHODIMP WyciwygChannelChild::IsPending(bool *aIsPending) { @@ -383,7 +381,6 @@ WyciwygChannelChild::IsPending(bool *aIsPending) return NS_OK; } -/* readonly attribute nsresult status; */ NS_IMETHODIMP WyciwygChannelChild::GetStatus(nsresult *aStatus) { @@ -391,7 +388,6 @@ WyciwygChannelChild::GetStatus(nsresult *aStatus) return NS_OK; } -/* void cancel (in nsresult aStatus); */ NS_IMETHODIMP WyciwygChannelChild::Cancel(nsresult aStatus) { @@ -405,21 +401,18 @@ WyciwygChannelChild::Cancel(nsresult aStatus) return NS_OK; } -/* void suspend (); */ NS_IMETHODIMP WyciwygChannelChild::Suspend() { return NS_ERROR_NOT_IMPLEMENTED; } -/* void resume (); */ NS_IMETHODIMP WyciwygChannelChild::Resume() { return NS_ERROR_NOT_IMPLEMENTED; } -/* attribute nsILoadGroup loadGroup; */ NS_IMETHODIMP WyciwygChannelChild::GetLoadGroup(nsILoadGroup * *aLoadGroup) { @@ -442,7 +435,6 @@ WyciwygChannelChild::SetLoadGroup(nsILoadGroup * aLoadGroup) return NS_OK; } -/* attribute nsLoadFlags loadFlags; */ NS_IMETHODIMP WyciwygChannelChild::GetLoadFlags(nsLoadFlags *aLoadFlags) { @@ -461,7 +453,6 @@ WyciwygChannelChild::SetLoadFlags(nsLoadFlags aLoadFlags) // nsIChannel //----------------------------------------------------------------------------- -/* attribute nsIURI originalURI; */ NS_IMETHODIMP WyciwygChannelChild::GetOriginalURI(nsIURI * *aOriginalURI) { @@ -479,7 +470,6 @@ WyciwygChannelChild::SetOriginalURI(nsIURI * aOriginalURI) return NS_OK; } -/* readonly attribute nsIURI URI; */ NS_IMETHODIMP WyciwygChannelChild::GetURI(nsIURI * *aURI) { @@ -488,7 +478,6 @@ WyciwygChannelChild::GetURI(nsIURI * *aURI) return NS_OK; } -/* attribute nsISupports owner; */ NS_IMETHODIMP WyciwygChannelChild::GetOwner(nsISupports * *aOwner) { @@ -516,7 +505,6 @@ WyciwygChannelChild::SetLoadInfo(nsILoadInfo* aLoadInfo) return NS_OK; } -/* attribute nsIInterfaceRequestor notificationCallbacks; */ NS_IMETHODIMP WyciwygChannelChild::GetNotificationCallbacks(nsIInterfaceRequestor * *aCallbacks) { @@ -539,7 +527,6 @@ WyciwygChannelChild::SetNotificationCallbacks(nsIInterfaceRequestor * aCallbacks return NS_OK; } -/* readonly attribute nsISupports securityInfo; */ NS_IMETHODIMP WyciwygChannelChild::GetSecurityInfo(nsISupports * *aSecurityInfo) { @@ -548,7 +535,6 @@ WyciwygChannelChild::GetSecurityInfo(nsISupports * *aSecurityInfo) return NS_OK; } -/* attribute ACString contentType; */ NS_IMETHODIMP WyciwygChannelChild::GetContentType(nsACString & aContentType) { @@ -561,7 +547,6 @@ WyciwygChannelChild::SetContentType(const nsACString & aContentType) return NS_ERROR_NOT_IMPLEMENTED; } -/* attribute ACString contentCharset; */ NS_IMETHODIMP WyciwygChannelChild::GetContentCharset(nsACString & aContentCharset) { @@ -604,7 +589,6 @@ WyciwygChannelChild::GetContentDispositionHeader(nsACString &aContentDisposition return NS_ERROR_NOT_AVAILABLE; } -/* attribute int64_t contentLength; */ NS_IMETHODIMP WyciwygChannelChild::GetContentLength(int64_t *aContentLength) { @@ -616,7 +600,6 @@ WyciwygChannelChild::SetContentLength(int64_t aContentLength) return NS_ERROR_NOT_IMPLEMENTED; } -/* nsIInputStream open (); */ NS_IMETHODIMP WyciwygChannelChild::Open(nsIInputStream **_retval) { @@ -640,7 +623,6 @@ GetTabChild(nsIChannel* aChannel) return iTabChild ? static_cast(iTabChild.get()) : nullptr; } -/* void asyncOpen (in nsIStreamListener aListener, in nsISupports aContext); */ NS_IMETHODIMP WyciwygChannelChild::AsyncOpen(nsIStreamListener *aListener, nsISupports *aContext) { @@ -695,7 +677,6 @@ WyciwygChannelChild::AsyncOpen2(nsIStreamListener *aListener) // nsIWyciwygChannel //----------------------------------------------------------------------------- -/* void writeToCacheEntry (in AString aData); */ NS_IMETHODIMP WyciwygChannelChild::WriteToCacheEntry(const nsAString & aData) { @@ -717,7 +698,6 @@ WyciwygChannelChild::WriteToCacheEntry(const nsAString & aData) return NS_OK; } -/* void closeCacheEntry (in nsresult reason); */ NS_IMETHODIMP WyciwygChannelChild::CloseCacheEntry(nsresult reason) { @@ -732,7 +712,6 @@ WyciwygChannelChild::CloseCacheEntry(nsresult reason) return NS_OK; } -/* void setSecurityInfo (in nsISupports aSecurityInfo); */ NS_IMETHODIMP WyciwygChannelChild::SetSecurityInfo(nsISupports *aSecurityInfo) { @@ -753,7 +732,6 @@ WyciwygChannelChild::SetSecurityInfo(nsISupports *aSecurityInfo) return NS_OK; } -/* void setCharsetAndSource (in long aSource, in ACString aCharset); */ NS_IMETHODIMP WyciwygChannelChild::SetCharsetAndSource(int32_t aSource, const nsACString & aCharset) { @@ -770,7 +748,6 @@ WyciwygChannelChild::SetCharsetAndSource(int32_t aSource, const nsACString & aCh return NS_OK; } -/* ACString getCharsetAndSource (out long aSource); */ NS_IMETHODIMP WyciwygChannelChild::GetCharsetAndSource(int32_t *aSource, nsACString & _retval) { diff --git a/netwerk/sctp/src/netinet/sctp_pcb.h b/netwerk/sctp/src/netinet/sctp_pcb.h index 0f124c7e412..cab584bb47b 100755 --- a/netwerk/sctp/src/netinet/sctp_pcb.h +++ b/netwerk/sctp/src/netinet/sctp_pcb.h @@ -846,7 +846,6 @@ sctp_set_primary_addr(struct sctp_tcb *, struct sockaddr *, int sctp_is_vtag_good(uint32_t, uint16_t lport, uint16_t rport, struct timeval *); -/* void sctp_drain(void); */ int sctp_destination_is_reachable(struct sctp_tcb *, struct sockaddr *); diff --git a/security/manager/pki/nsASN1Tree.cpp b/security/manager/pki/nsASN1Tree.cpp index 2b838297aad..9f2888009a5 100644 --- a/security/manager/pki/nsASN1Tree.cpp +++ b/security/manager/pki/nsASN1Tree.cpp @@ -111,7 +111,6 @@ void nsNSSASN1Tree::InitNodes() InitChildsRecursively(mTopNode); } -/* void loadASN1Structure (in nsIASN1Object asn1Object); */ NS_IMETHODIMP nsNSSASN1Tree::LoadASN1Structure(nsIASN1Object *asn1Object) { @@ -147,7 +146,6 @@ nsNSSASN1Tree::LoadASN1Structure(nsIASN1Object *asn1Object) return NS_OK; } -/* readonly attribute long rowCount; */ NS_IMETHODIMP nsNSSASN1Tree::GetRowCount(int32_t *aRowCount) { @@ -159,7 +157,6 @@ nsNSSASN1Tree::GetRowCount(int32_t *aRowCount) return NS_OK; } -/* attribute nsITreeSelection selection; */ NS_IMETHODIMP nsNSSASN1Tree::GetSelection(nsITreeSelection * *aSelection) { @@ -194,7 +191,6 @@ nsNSSASN1Tree::GetColumnProperties(nsITreeColumn* col, nsAString& aProps) return NS_OK; } -/* boolean isContainer (in long index); */ NS_IMETHODIMP nsNSSASN1Tree::IsContainer(int32_t index, bool *_retval) { @@ -206,7 +202,6 @@ nsNSSASN1Tree::IsContainer(int32_t index, bool *_retval) return NS_OK; } -/* boolean isContainerOpen (in long index); */ NS_IMETHODIMP nsNSSASN1Tree::IsContainerOpen(int32_t index, bool *_retval) { @@ -218,7 +213,6 @@ nsNSSASN1Tree::IsContainerOpen(int32_t index, bool *_retval) return NS_OK; } -/* boolean isContainerEmpty (in long index); */ NS_IMETHODIMP nsNSSASN1Tree::IsContainerEmpty(int32_t index, bool *_retval) { @@ -226,7 +220,6 @@ nsNSSASN1Tree::IsContainerEmpty(int32_t index, bool *_retval) return NS_OK; } -/* boolean isSeparator (in long index); */ NS_IMETHODIMP nsNSSASN1Tree::IsSeparator(int32_t index, bool *_retval) { @@ -234,7 +227,6 @@ nsNSSASN1Tree::IsSeparator(int32_t index, bool *_retval) return NS_OK; } -/* long getLevel (in long index); */ NS_IMETHODIMP nsNSSASN1Tree::GetLevel(int32_t index, int32_t *_retval) { @@ -249,7 +241,6 @@ nsNSSASN1Tree::GetLevel(int32_t index, int32_t *_retval) return NS_OK; } -/* Astring getImageSrc (in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsNSSASN1Tree::GetImageSrc(int32_t row, nsITreeColumn* col, nsAString& _retval) @@ -257,14 +248,12 @@ nsNSSASN1Tree::GetImageSrc(int32_t row, nsITreeColumn* col, return NS_OK; } -/* long getProgressMode (in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsNSSASN1Tree::GetProgressMode(int32_t row, nsITreeColumn* col, int32_t* _retval) { return NS_OK; } -/* Astring getCellValue (in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsNSSASN1Tree::GetCellValue(int32_t row, nsITreeColumn* col, nsAString& _retval) @@ -272,7 +261,6 @@ nsNSSASN1Tree::GetCellValue(int32_t row, nsITreeColumn* col, return NS_OK; } -/* Astring getCellText (in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsNSSASN1Tree::GetCellText(int32_t row, nsITreeColumn* col, nsAString& _retval) @@ -287,7 +275,6 @@ nsNSSASN1Tree::GetCellText(int32_t row, nsITreeColumn* col, return n->obj->GetDisplayName(_retval); } -/* wstring getDisplayData (in unsigned long index); */ NS_IMETHODIMP nsNSSASN1Tree::GetDisplayData(uint32_t index, nsAString &_retval) { @@ -299,7 +286,6 @@ nsNSSASN1Tree::GetDisplayData(uint32_t index, nsAString &_retval) return NS_OK; } -/* void setTree (in nsITreeBoxObject tree); */ NS_IMETHODIMP nsNSSASN1Tree::SetTree(nsITreeBoxObject *tree) { @@ -307,7 +293,6 @@ nsNSSASN1Tree::SetTree(nsITreeBoxObject *tree) return NS_OK; } -/* void toggleOpenState (in long index); */ NS_IMETHODIMP nsNSSASN1Tree::ToggleOpenState(int32_t index) { @@ -333,28 +318,24 @@ nsNSSASN1Tree::ToggleOpenState(int32_t index) return NS_OK; } -/* void cycleHeader (in nsITreeColumn col); */ NS_IMETHODIMP nsNSSASN1Tree::CycleHeader(nsITreeColumn* col) { return NS_OK; } -/* void selectionChanged (); */ NS_IMETHODIMP nsNSSASN1Tree::SelectionChanged() { return NS_ERROR_NOT_IMPLEMENTED; } -/* void cycleCell (in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsNSSASN1Tree::CycleCell(int32_t row, nsITreeColumn* col) { return NS_OK; } -/* boolean isEditable (in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsNSSASN1Tree::IsEditable(int32_t row, nsITreeColumn* col, bool *_retval) @@ -363,7 +344,6 @@ nsNSSASN1Tree::IsEditable(int32_t row, nsITreeColumn* col, return NS_OK; } -/* boolean isSelectable (in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsNSSASN1Tree::IsSelectable(int32_t row, nsITreeColumn* col, bool *_retval) @@ -372,7 +352,6 @@ nsNSSASN1Tree::IsSelectable(int32_t row, nsITreeColumn* col, return NS_OK; } -/* void setCellValue (in long row, in nsITreeColumn col, in AString value); */ NS_IMETHODIMP nsNSSASN1Tree::SetCellValue(int32_t row, nsITreeColumn* col, const nsAString& value) @@ -380,7 +359,6 @@ nsNSSASN1Tree::SetCellValue(int32_t row, nsITreeColumn* col, return NS_OK; } -/* void setCellText (in long row, in nsITreeColumn col, in AString value); */ NS_IMETHODIMP nsNSSASN1Tree::SetCellText(int32_t row, nsITreeColumn* col, const nsAString& value) @@ -388,21 +366,18 @@ nsNSSASN1Tree::SetCellText(int32_t row, nsITreeColumn* col, return NS_OK; } -/* void performAction (in wstring action); */ NS_IMETHODIMP nsNSSASN1Tree::PerformAction(const char16_t *action) { return NS_OK; } -/* void performActionOnRow (in wstring action, in long row); */ NS_IMETHODIMP nsNSSASN1Tree::PerformActionOnRow(const char16_t *action, int32_t row) { return NS_OK; } -/* void performActionOnCell (in wstring action, in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsNSSASN1Tree::PerformActionOnCell(const char16_t *action, int32_t row, nsITreeColumn* col) @@ -444,7 +419,6 @@ NS_IMETHODIMP nsNSSASN1Tree::IsSorted(bool *_retval) } -/* long getParentIndex (in long rowIndex); */ NS_IMETHODIMP nsNSSASN1Tree::GetParentIndex(int32_t rowIndex, int32_t *_retval) { @@ -458,7 +432,6 @@ nsNSSASN1Tree::GetParentIndex(int32_t rowIndex, int32_t *_retval) return NS_OK; } -/* boolean hasNextSibling (in long rowIndex, in long afterIndex); */ NS_IMETHODIMP nsNSSASN1Tree::HasNextSibling(int32_t rowIndex, int32_t afterIndex, bool *_retval) diff --git a/security/manager/pki/nsNSSDialogs.cpp b/security/manager/pki/nsNSSDialogs.cpp index 2e3c615a094..e1d04b8b91f 100644 --- a/security/manager/pki/nsNSSDialogs.cpp +++ b/security/manager/pki/nsNSSDialogs.cpp @@ -377,7 +377,6 @@ nsNSSDialogs::GetPKCS12FilePassword(nsIInterfaceRequestor* ctx, return NS_OK; } -/* void viewCert (in nsIX509Cert cert); */ NS_IMETHODIMP nsNSSDialogs::ViewCert(nsIInterfaceRequestor *ctx, nsIX509Cert *cert) diff --git a/security/manager/pki/nsPKIParamBlock.cpp b/security/manager/pki/nsPKIParamBlock.cpp index 3cc96b603f8..1a3885fab8f 100644 --- a/security/manager/pki/nsPKIParamBlock.cpp +++ b/security/manager/pki/nsPKIParamBlock.cpp @@ -72,7 +72,6 @@ nsPKIParamBlock::SetObjects(nsIMutableArray * aObjects) -/* void setISupportAtIndex (in int32_t index, in nsISupports object); */ NS_IMETHODIMP nsPKIParamBlock::SetISupportAtIndex(int32_t index, nsISupports *object) { @@ -87,7 +86,6 @@ nsPKIParamBlock::SetISupportAtIndex(int32_t index, nsISupports *object) return NS_OK; } -/* nsISupports getISupportAtIndex (in int32_t index); */ NS_IMETHODIMP nsPKIParamBlock::GetISupportAtIndex(int32_t index, nsISupports **_retval) { diff --git a/security/manager/ssl/TransportSecurityInfo.cpp b/security/manager/ssl/TransportSecurityInfo.cpp index 1a275ff1c25..be6a8e63f4d 100644 --- a/security/manager/ssl/TransportSecurityInfo.cpp +++ b/security/manager/ssl/TransportSecurityInfo.cpp @@ -132,7 +132,6 @@ TransportSecurityInfo::SetSecurityState(uint32_t aState) return NS_OK; } -/* attribute unsigned long countSubRequestsBrokenSecurity; */ NS_IMETHODIMP TransportSecurityInfo::GetCountSubRequestsBrokenSecurity( int32_t *aSubRequestsBrokenSecurity) @@ -149,7 +148,6 @@ TransportSecurityInfo::SetCountSubRequestsBrokenSecurity( return NS_OK; } -/* attribute unsigned long countSubRequestsNoSecurity; */ NS_IMETHODIMP TransportSecurityInfo::GetCountSubRequestsNoSecurity( int32_t *aSubRequestsNoSecurity) @@ -277,7 +275,6 @@ TransportSecurityInfo::GetErrorCode(int32_t* state) return NS_OK; } -/* void getInterface (in nsIIDRef uuid, [iid_is (uuid), retval] out nsQIResult result); */ NS_IMETHODIMP TransportSecurityInfo::GetInterface(const nsIID & uuid, void * *result) { diff --git a/security/manager/ssl/nsCertTree.cpp b/security/manager/ssl/nsCertTree.cpp index 97c70fbfa5c..00f8cd7f56c 100644 --- a/security/manager/ssl/nsCertTree.cpp +++ b/security/manager/ssl/nsCertTree.cpp @@ -836,7 +836,6 @@ nsCertTree::DeleteEntryObject(uint32_t index) // ///////////////////////////////////////////////////////////////////////////// -/* nsIX509Cert getCert(in unsigned long index); */ NS_IMETHODIMP nsCertTree::GetCert(uint32_t aIndex, nsIX509Cert **_cert) { @@ -872,7 +871,6 @@ nsCertTree::IsHostPortOverride(uint32_t aIndex, bool *_retval) return NS_OK; } -/* readonly attribute long rowCount; */ NS_IMETHODIMP nsCertTree::GetRowCount(int32_t *aRowCount) { @@ -889,7 +887,6 @@ nsCertTree::GetRowCount(int32_t *aRowCount) return NS_OK; } -/* attribute nsITreeSelection selection; */ NS_IMETHODIMP nsCertTree::GetSelection(nsITreeSelection * *aSelection) { @@ -923,7 +920,6 @@ nsCertTree::GetColumnProperties(nsITreeColumn* col, nsAString& aProps) { return NS_OK; } -/* boolean isContainer (in long index); */ NS_IMETHODIMP nsCertTree::IsContainer(int32_t index, bool *_retval) { @@ -938,7 +934,6 @@ nsCertTree::IsContainer(int32_t index, bool *_retval) return NS_OK; } -/* boolean isContainerOpen (in long index); */ NS_IMETHODIMP nsCertTree::IsContainerOpen(int32_t index, bool *_retval) { @@ -953,7 +948,6 @@ nsCertTree::IsContainerOpen(int32_t index, bool *_retval) return NS_OK; } -/* boolean isContainerEmpty (in long index); */ NS_IMETHODIMP nsCertTree::IsContainerEmpty(int32_t index, bool *_retval) { @@ -961,7 +955,6 @@ nsCertTree::IsContainerEmpty(int32_t index, bool *_retval) return NS_OK; } -/* boolean isSeparator (in long index); */ NS_IMETHODIMP nsCertTree::IsSeparator(int32_t index, bool *_retval) { @@ -969,7 +962,6 @@ nsCertTree::IsSeparator(int32_t index, bool *_retval) return NS_OK; } -/* long getParentIndex (in long rowIndex); */ NS_IMETHODIMP nsCertTree::GetParentIndex(int32_t rowIndex, int32_t *_retval) { @@ -989,7 +981,6 @@ nsCertTree::GetParentIndex(int32_t rowIndex, int32_t *_retval) return NS_OK; } -/* boolean hasNextSibling (in long rowIndex, in long afterIndex); */ NS_IMETHODIMP nsCertTree::HasNextSibling(int32_t rowIndex, int32_t afterIndex, bool *_retval) @@ -1011,7 +1002,6 @@ nsCertTree::HasNextSibling(int32_t rowIndex, int32_t afterIndex, return NS_OK; } -/* long getLevel (in long index); */ NS_IMETHODIMP nsCertTree::GetLevel(int32_t index, int32_t *_retval) { @@ -1026,7 +1016,6 @@ nsCertTree::GetLevel(int32_t index, int32_t *_retval) return NS_OK; } -/* Astring getImageSrc (in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsCertTree::GetImageSrc(int32_t row, nsITreeColumn* col, nsAString& _retval) @@ -1035,14 +1024,12 @@ nsCertTree::GetImageSrc(int32_t row, nsITreeColumn* col, return NS_OK; } -/* long getProgressMode (in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsCertTree::GetProgressMode(int32_t row, nsITreeColumn* col, int32_t* _retval) { return NS_OK; } -/* Astring getCellValue (in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsCertTree::GetCellValue(int32_t row, nsITreeColumn* col, nsAString& _retval) @@ -1051,7 +1038,6 @@ nsCertTree::GetCellValue(int32_t row, nsITreeColumn* col, return NS_OK; } -/* Astring getCellText (in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsCertTree::GetCellText(int32_t row, nsITreeColumn* col, nsAString& _retval) @@ -1245,7 +1231,6 @@ nsCertTree::GetCellText(int32_t row, nsITreeColumn* col, return rv; } -/* void setTree (in nsITreeBoxObject tree); */ NS_IMETHODIMP nsCertTree::SetTree(nsITreeBoxObject *tree) { @@ -1253,7 +1238,6 @@ nsCertTree::SetTree(nsITreeBoxObject *tree) return NS_OK; } -/* void toggleOpenState (in long index); */ NS_IMETHODIMP nsCertTree::ToggleOpenState(int32_t index) { @@ -1268,28 +1252,24 @@ nsCertTree::ToggleOpenState(int32_t index) return NS_OK; } -/* void cycleHeader (in nsITreeColumn); */ NS_IMETHODIMP nsCertTree::CycleHeader(nsITreeColumn* col) { return NS_OK; } -/* void selectionChanged (); */ NS_IMETHODIMP nsCertTree::SelectionChanged() { return NS_ERROR_NOT_IMPLEMENTED; } -/* void cycleCell (in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsCertTree::CycleCell(int32_t row, nsITreeColumn* col) { return NS_OK; } -/* boolean isEditable (in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsCertTree::IsEditable(int32_t row, nsITreeColumn* col, bool *_retval) { @@ -1297,7 +1277,6 @@ nsCertTree::IsEditable(int32_t row, nsITreeColumn* col, bool *_retval) return NS_OK; } -/* boolean isSelectable (in long row, in nsITreeColumn col); */ NS_IMETHODIMP nsCertTree::IsSelectable(int32_t row, nsITreeColumn* col, bool *_retval) { @@ -1305,7 +1284,6 @@ nsCertTree::IsSelectable(int32_t row, nsITreeColumn* col, bool *_retval) return NS_OK; } -/* void setCellValue (in long row, in nsITreeColumn col, in AString value); */ NS_IMETHODIMP nsCertTree::SetCellValue(int32_t row, nsITreeColumn* col, const nsAString& value) @@ -1313,7 +1291,6 @@ nsCertTree::SetCellValue(int32_t row, nsITreeColumn* col, return NS_OK; } -/* void setCellText (in long row, in nsITreeColumn col, in AString value); */ NS_IMETHODIMP nsCertTree::SetCellText(int32_t row, nsITreeColumn* col, const nsAString& value) @@ -1321,14 +1298,12 @@ nsCertTree::SetCellText(int32_t row, nsITreeColumn* col, return NS_OK; } -/* void performAction (in wstring action); */ NS_IMETHODIMP nsCertTree::PerformAction(const char16_t *action) { return NS_OK; } -/* void performActionOnRow (in wstring action, in long row); */ NS_IMETHODIMP nsCertTree::PerformActionOnRow(const char16_t *action, int32_t row) { diff --git a/security/manager/ssl/nsCryptoHash.cpp b/security/manager/ssl/nsCryptoHash.cpp index 8dcba891311..de2a4e3ef08 100644 --- a/security/manager/ssl/nsCryptoHash.cpp +++ b/security/manager/ssl/nsCryptoHash.cpp @@ -256,7 +256,6 @@ nsCryptoHMAC::destructorSafeDestroyNSSReference() mHMACContext = nullptr; } -/* void init (in unsigned long aAlgorithm, in nsIKeyObject aKeyObject); */ NS_IMETHODIMP nsCryptoHMAC::Init(uint32_t aAlgorithm, nsIKeyObject *aKeyObject) { @@ -318,7 +317,6 @@ nsCryptoHMAC::Init(uint32_t aAlgorithm, nsIKeyObject *aKeyObject) return NS_OK; } -/* void update ([array, size_is (aLen), const] in octet aData, in unsigned long aLen); */ NS_IMETHODIMP nsCryptoHMAC::Update(const uint8_t *aData, uint32_t aLen) { @@ -339,7 +337,6 @@ nsCryptoHMAC::Update(const uint8_t *aData, uint32_t aLen) return NS_OK; } -/* void updateFromStream (in nsIInputStream aStream, in unsigned long aLen); */ NS_IMETHODIMP nsCryptoHMAC::UpdateFromStream(nsIInputStream *aStream, uint32_t aLen) { @@ -396,7 +393,6 @@ nsCryptoHMAC::UpdateFromStream(nsIInputStream *aStream, uint32_t aLen) return rv; } -/* ACString finish (in bool aASCII); */ NS_IMETHODIMP nsCryptoHMAC::Finish(bool aASCII, nsACString & _retval) { @@ -429,7 +425,6 @@ nsCryptoHMAC::Finish(bool aASCII, nsACString & _retval) return NS_OK; } -/* void reset (); */ NS_IMETHODIMP nsCryptoHMAC::Reset() { diff --git a/security/manager/ssl/nsKeyModule.cpp b/security/manager/ssl/nsKeyModule.cpp index 43b1a2c5c94..40cb36005eb 100644 --- a/security/manager/ssl/nsKeyModule.cpp +++ b/security/manager/ssl/nsKeyModule.cpp @@ -50,7 +50,6 @@ nsKeyObject::CleanUp() ////////////////////////////////////////////////////////////////////////////// // nsIKeyObject -/* [noscript] void initKey (in short aKeyType, in voidPtr aKey); */ NS_IMETHODIMP nsKeyObject::InitKey(int16_t aAlgorithm, void * aKey) { @@ -83,7 +82,6 @@ nsKeyObject::InitKey(int16_t aAlgorithm, void * aKey) return NS_OK; } -/* [noscript] voidPtr getKeyObj (); */ NS_IMETHODIMP nsKeyObject::GetKeyObj(void * *_retval) { @@ -110,7 +108,6 @@ nsKeyObject::GetKeyObj(void * *_retval) return NS_OK; } -/* short getType (); */ NS_IMETHODIMP nsKeyObject::GetType(int16_t *_retval) { @@ -130,7 +127,6 @@ nsKeyObjectFactory::nsKeyObjectFactory() { } -/* nsIKeyObject lookupKeyByName (in ACString aName); */ NS_IMETHODIMP nsKeyObjectFactory::LookupKeyByName(const nsACString & aName, nsIKeyObject **_retval) diff --git a/security/manager/ssl/nsNSSASN1Object.cpp b/security/manager/ssl/nsNSSASN1Object.cpp index 7f74150fb72..e1c22f58d9b 100644 --- a/security/manager/ssl/nsNSSASN1Object.cpp +++ b/security/manager/ssl/nsNSSASN1Object.cpp @@ -339,7 +339,6 @@ nsNSSASN1PrintableItem::~nsNSSASN1PrintableItem() free(mData); } -/* readonly attribute wstring value; */ NS_IMETHODIMP nsNSSASN1PrintableItem::GetDisplayValue(nsAString &aValue) { @@ -416,7 +415,6 @@ nsNSSASN1PrintableItem::GetData(char **outData, uint32_t *outLen) return NS_OK; } -/* attribute wstring displayName; */ NS_IMETHODIMP nsNSSASN1PrintableItem::GetDisplayName(nsAString &aDisplayName) { diff --git a/security/manager/ssl/nsNSSCertValidity.cpp b/security/manager/ssl/nsNSSCertValidity.cpp index 2d9bbc6a9c9..3e7b4719b40 100644 --- a/security/manager/ssl/nsNSSCertValidity.cpp +++ b/security/manager/ssl/nsNSSCertValidity.cpp @@ -35,7 +35,6 @@ nsX509CertValidity::~nsX509CertValidity() /* destructor code */ } -/* readonly attribute PRTime notBefore; */ NS_IMETHODIMP nsX509CertValidity::GetNotBefore(PRTime *aNotBefore) { NS_ENSURE_ARG(aNotBefore); @@ -106,7 +105,6 @@ NS_IMETHODIMP nsX509CertValidity::GetNotBeforeGMT(nsAString &aNotBeforeGMT) return NS_OK; } -/* readonly attribute PRTime notAfter; */ NS_IMETHODIMP nsX509CertValidity::GetNotAfter(PRTime *aNotAfter) { NS_ENSURE_ARG(aNotAfter); diff --git a/security/manager/ssl/nsNSSCertificateDB.cpp b/security/manager/ssl/nsNSSCertificateDB.cpp index c9505e39b3a..f975c4d0b07 100644 --- a/security/manager/ssl/nsNSSCertificateDB.cpp +++ b/security/manager/ssl/nsNSSCertificateDB.cpp @@ -1267,7 +1267,6 @@ finish: *_certNames = tmpArray; } -/* nsIX509Cert getDefaultEmailEncryptionCert (); */ NS_IMETHODIMP nsNSSCertificateDB::FindEmailEncryptionCert(const nsAString& aNickname, nsIX509Cert** _retval) @@ -1305,7 +1304,6 @@ nsNSSCertificateDB::FindEmailEncryptionCert(const nsAString& aNickname, return NS_OK; } -/* nsIX509Cert getDefaultEmailSigningCert (); */ NS_IMETHODIMP nsNSSCertificateDB::FindEmailSigningCert(const nsAString& aNickname, nsIX509Cert** _retval) @@ -1396,7 +1394,6 @@ nsNSSCertificateDB::FindCertByEmailAddress(nsISupports *aToken, const char *aEma return NS_OK; } -/* nsIX509Cert constructX509FromBase64 (in string base64); */ NS_IMETHODIMP nsNSSCertificateDB::ConstructX509FromBase64(const char *base64, nsIX509Cert **_retval) @@ -1435,7 +1432,6 @@ nsNSSCertificateDB::ConstructX509FromBase64(const char *base64, return rv; } -/* nsIX509Cert constructX509 (in string certDER, unsigned long len); */ NS_IMETHODIMP nsNSSCertificateDB::ConstructX509(const char* certDER, uint32_t lengthDER, diff --git a/security/manager/ssl/nsPK11TokenDB.cpp b/security/manager/ssl/nsPK11TokenDB.cpp index cb15b49f38e..fa25e2ea679 100644 --- a/security/manager/ssl/nsPK11TokenDB.cpp +++ b/security/manager/ssl/nsPK11TokenDB.cpp @@ -101,7 +101,6 @@ void nsPK11Token::destructorSafeDestroyNSSReference() } } -/* readonly attribute wstring tokenName; */ NS_IMETHODIMP nsPK11Token::GetTokenName(char16_t * *aTokenName) { // handle removals/insertions @@ -114,7 +113,6 @@ NS_IMETHODIMP nsPK11Token::GetTokenName(char16_t * *aTokenName) return NS_OK; } -/* readonly attribute wstring tokenDesc; */ NS_IMETHODIMP nsPK11Token::GetTokenLabel(char16_t **aTokLabel) { // handle removals/insertions @@ -126,7 +124,6 @@ NS_IMETHODIMP nsPK11Token::GetTokenLabel(char16_t **aTokLabel) return NS_OK; } -/* readonly attribute wstring tokenManID; */ NS_IMETHODIMP nsPK11Token::GetTokenManID(char16_t **aTokManID) { // handle removals/insertions @@ -138,7 +135,6 @@ NS_IMETHODIMP nsPK11Token::GetTokenManID(char16_t **aTokManID) return NS_OK; } -/* readonly attribute wstring tokenHWVersion; */ NS_IMETHODIMP nsPK11Token::GetTokenHWVersion(char16_t **aTokHWVersion) { // handle removals/insertions @@ -150,7 +146,6 @@ NS_IMETHODIMP nsPK11Token::GetTokenHWVersion(char16_t **aTokHWVersion) return NS_OK; } -/* readonly attribute wstring tokenFWVersion; */ NS_IMETHODIMP nsPK11Token::GetTokenFWVersion(char16_t **aTokFWVersion) { // handle removals/insertions @@ -162,7 +157,6 @@ NS_IMETHODIMP nsPK11Token::GetTokenFWVersion(char16_t **aTokFWVersion) return NS_OK; } -/* readonly attribute wstring tokenSerialNumber; */ NS_IMETHODIMP nsPK11Token::GetTokenSerialNumber(char16_t **aTokSerialNum) { // handle removals/insertions @@ -174,7 +168,6 @@ NS_IMETHODIMP nsPK11Token::GetTokenSerialNumber(char16_t **aTokSerialNum) return NS_OK; } -/* boolean isLoggedIn (); */ NS_IMETHODIMP nsPK11Token::IsLoggedIn(bool *_retval) { nsNSSShutDownPreventionLock locker; @@ -188,7 +181,6 @@ NS_IMETHODIMP nsPK11Token::IsLoggedIn(bool *_retval) return rv; } -/* void logout (in boolean force); */ NS_IMETHODIMP nsPK11Token::Login(bool force) { @@ -239,7 +231,6 @@ NS_IMETHODIMP nsPK11Token::LogoutAndDropAuthenticatedResources() return nssComponent->LogoutAuthenticatedPK11(); } -/* void reset (); */ NS_IMETHODIMP nsPK11Token::Reset() { nsNSSShutDownPreventionLock locker; @@ -250,7 +241,6 @@ NS_IMETHODIMP nsPK11Token::Reset() return NS_OK; } -/* readonly attribute long minimumPasswordLength; */ NS_IMETHODIMP nsPK11Token::GetMinimumPasswordLength(int32_t *aMinimumPasswordLength) { nsNSSShutDownPreventionLock locker; @@ -262,7 +252,6 @@ NS_IMETHODIMP nsPK11Token::GetMinimumPasswordLength(int32_t *aMinimumPasswordLen return NS_OK; } -/* readonly attribute boolean needsUserInit; */ NS_IMETHODIMP nsPK11Token::GetNeedsUserInit(bool *aNeedsUserInit) { nsNSSShutDownPreventionLock locker; @@ -273,7 +262,6 @@ NS_IMETHODIMP nsPK11Token::GetNeedsUserInit(bool *aNeedsUserInit) return NS_OK; } -/* boolean checkPassword (in wstring password); */ NS_IMETHODIMP nsPK11Token::CheckPassword(const char16_t *password, bool *_retval) { nsNSSShutDownPreventionLock locker; @@ -298,7 +286,6 @@ NS_IMETHODIMP nsPK11Token::CheckPassword(const char16_t *password, bool *_retval return NS_OK; } -/* void initPassword (in wstring initialPassword); */ NS_IMETHODIMP nsPK11Token::InitPassword(const char16_t *initialPassword) { nsNSSShutDownPreventionLock locker; @@ -316,7 +303,6 @@ done: return rv; } -/* long getAskPasswordTimes(); */ NS_IMETHODIMP nsPK11Token::GetAskPasswordTimes(int32_t *rvAskTimes) { @@ -330,7 +316,6 @@ nsPK11Token::GetAskPasswordTimes(int32_t *rvAskTimes) return NS_OK; } -/* long getAskPasswordTimeout(); */ NS_IMETHODIMP nsPK11Token::GetAskPasswordTimeout(int32_t *rvAskTimeout) { @@ -359,7 +344,6 @@ nsPK11Token::SetAskPasswordDefaults(const int32_t askTimes, return NS_OK; } -/* void changePassword (in wstring oldPassword, in wstring newPassword); */ NS_IMETHODIMP nsPK11Token::ChangePassword(const char16_t *oldPassword, const char16_t *newPassword) { nsNSSShutDownPreventionLock locker; @@ -376,7 +360,6 @@ NS_IMETHODIMP nsPK11Token::ChangePassword(const char16_t *oldPassword, const cha return (rv == SECSuccess) ? NS_OK : NS_ERROR_FAILURE; } -/* boolean isHardwareToken (); */ NS_IMETHODIMP nsPK11Token::IsHardwareToken(bool *_retval) { nsNSSShutDownPreventionLock locker; @@ -390,7 +373,6 @@ NS_IMETHODIMP nsPK11Token::IsHardwareToken(bool *_retval) return rv; } -/* boolean needsLogin (); */ NS_IMETHODIMP nsPK11Token::NeedsLogin(bool *_retval) { nsNSSShutDownPreventionLock locker; @@ -404,7 +386,6 @@ NS_IMETHODIMP nsPK11Token::NeedsLogin(bool *_retval) return rv; } -/* boolean isFriendly (); */ NS_IMETHODIMP nsPK11Token::IsFriendly(bool *_retval) { nsNSSShutDownPreventionLock locker; @@ -432,7 +413,6 @@ nsPK11TokenDB::~nsPK11TokenDB() /* destructor code */ } -/* nsIPK11Token getInternalKeyToken (); */ NS_IMETHODIMP nsPK11TokenDB::GetInternalKeyToken(nsIPK11Token **_retval) { nsNSSShutDownPreventionLock locker; @@ -452,7 +432,6 @@ done: return rv; } -/* nsIPK11Token findTokenByName (in wchar tokenName); */ NS_IMETHODIMP nsPK11TokenDB:: FindTokenByName(const char16_t* tokenName, nsIPK11Token **_retval) { @@ -471,7 +450,6 @@ done: return rv; } -/* nsIEnumerator listTokens (); */ NS_IMETHODIMP nsPK11TokenDB::ListTokens(nsIEnumerator* *_retval) { nsNSSShutDownPreventionLock locker; diff --git a/security/manager/ssl/nsPKCS11Slot.cpp b/security/manager/ssl/nsPKCS11Slot.cpp index c2aac0ecb0b..48e1c539e0f 100644 --- a/security/manager/ssl/nsPKCS11Slot.cpp +++ b/security/manager/ssl/nsPKCS11Slot.cpp @@ -89,7 +89,6 @@ void nsPKCS11Slot::destructorSafeDestroyNSSReference() } } -/* readonly attribute wstring name; */ NS_IMETHODIMP nsPKCS11Slot::GetName(char16_t **aName) { @@ -113,7 +112,6 @@ nsPKCS11Slot::GetName(char16_t **aName) return NS_OK; } -/* readonly attribute wstring desc; */ NS_IMETHODIMP nsPKCS11Slot::GetDesc(char16_t **aDesc) { @@ -130,7 +128,6 @@ nsPKCS11Slot::GetDesc(char16_t **aDesc) return NS_OK; } -/* readonly attribute wstring manID; */ NS_IMETHODIMP nsPKCS11Slot::GetManID(char16_t **aManID) { @@ -142,7 +139,6 @@ nsPKCS11Slot::GetManID(char16_t **aManID) return NS_OK; } -/* readonly attribute wstring HWVersion; */ NS_IMETHODIMP nsPKCS11Slot::GetHWVersion(char16_t **aHWVersion) { @@ -154,7 +150,6 @@ nsPKCS11Slot::GetHWVersion(char16_t **aHWVersion) return NS_OK; } -/* readonly attribute wstring FWVersion; */ NS_IMETHODIMP nsPKCS11Slot::GetFWVersion(char16_t **aFWVersion) { @@ -166,7 +161,6 @@ nsPKCS11Slot::GetFWVersion(char16_t **aFWVersion) return NS_OK; } -/* nsIPK11Token getToken (); */ NS_IMETHODIMP nsPKCS11Slot::GetToken(nsIPK11Token **_retval) { @@ -180,7 +174,6 @@ nsPKCS11Slot::GetToken(nsIPK11Token **_retval) return NS_OK; } -/* readonly attribute wstring tokenName; */ NS_IMETHODIMP nsPKCS11Slot::GetTokenName(char16_t **aName) { @@ -260,7 +253,6 @@ void nsPKCS11Module::destructorSafeDestroyNSSReference() } } -/* readonly attribute wstring name; */ NS_IMETHODIMP nsPKCS11Module::GetName(char16_t **aName) { @@ -272,7 +264,6 @@ nsPKCS11Module::GetName(char16_t **aName) return NS_OK; } -/* readonly attribute wstring libName; */ NS_IMETHODIMP nsPKCS11Module::GetLibName(char16_t **aName) { @@ -288,7 +279,6 @@ nsPKCS11Module::GetLibName(char16_t **aName) return NS_OK; } -/* nsIPKCS11Slot findSlotByName(in wstring name); */ NS_IMETHODIMP nsPKCS11Module::FindSlotByName(const char16_t *aName, nsIPKCS11Slot **_retval) @@ -334,7 +324,6 @@ nsPKCS11Module::FindSlotByName(const char16_t *aName, return NS_OK; } -/* nsIEnumerator listSlots (); */ NS_IMETHODIMP nsPKCS11Module::ListSlots(nsIEnumerator **_retval) { @@ -375,7 +364,6 @@ nsPKCS11ModuleDB::~nsPKCS11ModuleDB() { } -/* nsIPKCS11Module getInternal (); */ NS_IMETHODIMP nsPKCS11ModuleDB::GetInternal(nsIPKCS11Module **_retval) { @@ -389,7 +377,6 @@ nsPKCS11ModuleDB::GetInternal(nsIPKCS11Module **_retval) return NS_OK; } -/* nsIPKCS11Module getInternalFIPS (); */ NS_IMETHODIMP nsPKCS11ModuleDB::GetInternalFIPS(nsIPKCS11Module **_retval) { @@ -403,7 +390,6 @@ nsPKCS11ModuleDB::GetInternalFIPS(nsIPKCS11Module **_retval) return NS_OK; } -/* nsIPKCS11Module findModuleByName(in wstring name); */ NS_IMETHODIMP nsPKCS11ModuleDB::FindModuleByName(const char16_t *aName, nsIPKCS11Module **_retval) @@ -424,7 +410,6 @@ nsPKCS11ModuleDB::FindModuleByName(const char16_t *aName, /* This is essentially the same as nsIPK11Token::findTokenByName, except * that it returns an nsIPKCS11Slot, which may be desired. */ -/* nsIPKCS11Module findSlotByName(in wstring name); */ NS_IMETHODIMP nsPKCS11ModuleDB::FindSlotByName(const char16_t *aName, nsIPKCS11Slot **_retval) @@ -442,7 +427,6 @@ nsPKCS11ModuleDB::FindSlotByName(const char16_t *aName, return NS_OK; } -/* nsIEnumerator listModules (); */ NS_IMETHODIMP nsPKCS11ModuleDB::ListModules(nsIEnumerator **_retval) { @@ -482,7 +466,6 @@ NS_IMETHODIMP nsPKCS11ModuleDB::GetCanToggleFIPS(bool *aCanToggleFIPS) } -/* void toggleFIPSMode (); */ NS_IMETHODIMP nsPKCS11ModuleDB::ToggleFIPSMode() { nsNSSShutDownPreventionLock locker; @@ -506,7 +489,6 @@ NS_IMETHODIMP nsPKCS11ModuleDB::ToggleFIPSMode() return NS_OK; } -/* readonly attribute boolean isFIPSEnabled; */ NS_IMETHODIMP nsPKCS11ModuleDB::GetIsFIPSEnabled(bool *aIsFIPSEnabled) { nsNSSShutDownPreventionLock locker; diff --git a/security/manager/ssl/nsSDR.cpp b/security/manager/ssl/nsSDR.cpp index f00da3fcc3c..6d52c253b83 100644 --- a/security/manager/ssl/nsSDR.cpp +++ b/security/manager/ssl/nsSDR.cpp @@ -47,7 +47,6 @@ nsSecretDecoderRing::~nsSecretDecoderRing() { } -/* [noscript] long encrypt (in buffer data, in long dataLen, out buffer result); */ NS_IMETHODIMP nsSecretDecoderRing:: Encrypt(unsigned char * data, int32_t dataLen, unsigned char * *result, int32_t *_retval) { @@ -89,7 +88,6 @@ loser: return rv; } -/* [noscript] long decrypt (in buffer data, in long dataLen, out buffer result); */ NS_IMETHODIMP nsSecretDecoderRing:: Decrypt(unsigned char * data, int32_t dataLen, unsigned char * *result, int32_t *_retval) { @@ -129,7 +127,6 @@ loser: return rv; } -/* string encryptString (in string text); */ NS_IMETHODIMP nsSecretDecoderRing:: EncryptString(const char *text, char **_retval) { @@ -154,7 +151,6 @@ loser: return rv; } -/* string decryptString (in string crypt); */ NS_IMETHODIMP nsSecretDecoderRing:: DecryptString(const char *crypt, char **_retval) { @@ -194,7 +190,6 @@ loser: return rv; } -/* void changePassword(); */ NS_IMETHODIMP nsSecretDecoderRing:: ChangePassword() { @@ -279,7 +274,6 @@ LogoutAndTeardown() return rv; } -/* void setWindow(in nsISupports w); */ NS_IMETHODIMP nsSecretDecoderRing:: SetWindow(nsISupports *w) { diff --git a/toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp b/toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp index cb2b090e281..7531d3fd891 100644 --- a/toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp +++ b/toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp @@ -82,7 +82,6 @@ DiskSpaceWatcher::Observe(nsISupports* aSubject, const char* aTopic, return NS_ERROR_UNEXPECTED; } -/* readonly attribute bool isDiskFull; */ NS_IMETHODIMP DiskSpaceWatcher::GetIsDiskFull(bool* aIsDiskFull) { *aIsDiskFull = sIsDiskFull; @@ -94,7 +93,6 @@ NS_IMETHODIMP DiskSpaceWatcher::GetIsDiskFull(bool* aIsDiskFull) #ifdef XP_WIN #undef GetFreeSpace #endif -/* readonly attribute long freeSpace; */ NS_IMETHODIMP DiskSpaceWatcher::GetFreeSpace(uint64_t* aFreeSpace) { *aFreeSpace = sFreeSpace; diff --git a/toolkit/components/find/nsFindService.cpp b/toolkit/components/find/nsFindService.cpp index 36b5faf9dfb..3e80823ce0b 100644 --- a/toolkit/components/find/nsFindService.cpp +++ b/toolkit/components/find/nsFindService.cpp @@ -28,7 +28,6 @@ nsFindService::~nsFindService() NS_IMPL_ISUPPORTS(nsFindService, nsIFindService) -/* attribute AString searchString; */ NS_IMETHODIMP nsFindService::GetSearchString(nsAString & aSearchString) { aSearchString = mSearchString; @@ -41,7 +40,6 @@ NS_IMETHODIMP nsFindService::SetSearchString(const nsAString & aSearchString) return NS_OK; } -/* attribute AString replaceString; */ NS_IMETHODIMP nsFindService::GetReplaceString(nsAString & aReplaceString) { aReplaceString = mReplaceString; @@ -53,7 +51,6 @@ NS_IMETHODIMP nsFindService::SetReplaceString(const nsAString & aReplaceString) return NS_OK; } -/* attribute boolean findBackwards; */ NS_IMETHODIMP nsFindService::GetFindBackwards(bool *aFindBackwards) { NS_ENSURE_ARG_POINTER(aFindBackwards); @@ -66,7 +63,6 @@ NS_IMETHODIMP nsFindService::SetFindBackwards(bool aFindBackwards) return NS_OK; } -/* attribute boolean wrapFind; */ NS_IMETHODIMP nsFindService::GetWrapFind(bool *aWrapFind) { NS_ENSURE_ARG_POINTER(aWrapFind); @@ -79,7 +75,6 @@ NS_IMETHODIMP nsFindService::SetWrapFind(bool aWrapFind) return NS_OK; } -/* attribute boolean entireWord; */ NS_IMETHODIMP nsFindService::GetEntireWord(bool *aEntireWord) { NS_ENSURE_ARG_POINTER(aEntireWord); @@ -92,7 +87,6 @@ NS_IMETHODIMP nsFindService::SetEntireWord(bool aEntireWord) return NS_OK; } -/* attribute boolean matchCase; */ NS_IMETHODIMP nsFindService::GetMatchCase(bool *aMatchCase) { NS_ENSURE_ARG_POINTER(aMatchCase); diff --git a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp b/toolkit/components/perfmonitoring/nsPerformanceStats.cpp index 6a79bca6f4f..485a1d1dbd7 100644 --- a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp +++ b/toolkit/components/perfmonitoring/nsPerformanceStats.cpp @@ -420,7 +420,6 @@ nsPerformanceSnapshot::Init(JSContext* cx, uint64_t processId) { } -/* void getComponentsData (out nsIArray aComponents); */ NS_IMETHODIMP nsPerformanceSnapshot::GetComponentsData(nsIArray * *aComponents) { const size_t length = mComponentsData.Length(); @@ -434,7 +433,6 @@ NS_IMETHODIMP nsPerformanceSnapshot::GetComponentsData(nsIArray * *aComponents) return NS_OK; } -/* readonly attribute nsIPerformanceStats process; */ NS_IMETHODIMP nsPerformanceSnapshot::GetProcessData(nsIPerformanceStats * *aProcess) { NS_IF_ADDREF(*aProcess = mProcessData); @@ -501,7 +499,6 @@ NS_IMETHODIMP nsPerformanceStatsService::SetIsMonitoringPerCompartment(JSContext return NS_OK; } -/* readonly attribute nsIPerformanceSnapshot snapshot; */ NS_IMETHODIMP nsPerformanceStatsService::GetSnapshot(JSContext* cx, nsIPerformanceSnapshot * *aSnapshot) { nsRefPtr snapshot = new nsPerformanceSnapshot(); diff --git a/toolkit/components/places/nsNavHistoryQuery.cpp b/toolkit/components/places/nsNavHistoryQuery.cpp index 53e459e4b12..a5a1104a547 100644 --- a/toolkit/components/places/nsNavHistoryQuery.cpp +++ b/toolkit/components/places/nsNavHistoryQuery.cpp @@ -908,7 +908,6 @@ nsNavHistoryQuery::nsNavHistoryQuery() mDomain.SetIsVoid(true); } -/* attribute PRTime beginTime; */ NS_IMETHODIMP nsNavHistoryQuery::GetBeginTime(PRTime *aBeginTime) { *aBeginTime = mBeginTime; @@ -920,7 +919,6 @@ NS_IMETHODIMP nsNavHistoryQuery::SetBeginTime(PRTime aBeginTime) return NS_OK; } -/* attribute long beginTimeReference; */ NS_IMETHODIMP nsNavHistoryQuery::GetBeginTimeReference(uint32_t* _retval) { *_retval = mBeginTimeReference; @@ -934,21 +932,18 @@ NS_IMETHODIMP nsNavHistoryQuery::SetBeginTimeReference(uint32_t aReference) return NS_OK; } -/* readonly attribute boolean hasBeginTime; */ NS_IMETHODIMP nsNavHistoryQuery::GetHasBeginTime(bool* _retval) { *_retval = ! (mBeginTimeReference == TIME_RELATIVE_EPOCH && mBeginTime == 0); return NS_OK; } -/* readonly attribute PRTime absoluteBeginTime; */ NS_IMETHODIMP nsNavHistoryQuery::GetAbsoluteBeginTime(PRTime* _retval) { *_retval = nsNavHistory::NormalizeTime(mBeginTimeReference, mBeginTime); return NS_OK; } -/* attribute PRTime endTime; */ NS_IMETHODIMP nsNavHistoryQuery::GetEndTime(PRTime *aEndTime) { *aEndTime = mEndTime; @@ -960,7 +955,6 @@ NS_IMETHODIMP nsNavHistoryQuery::SetEndTime(PRTime aEndTime) return NS_OK; } -/* attribute long endTimeReference; */ NS_IMETHODIMP nsNavHistoryQuery::GetEndTimeReference(uint32_t* _retval) { *_retval = mEndTimeReference; @@ -974,21 +968,18 @@ NS_IMETHODIMP nsNavHistoryQuery::SetEndTimeReference(uint32_t aReference) return NS_OK; } -/* readonly attribute boolean hasEndTime; */ NS_IMETHODIMP nsNavHistoryQuery::GetHasEndTime(bool* _retval) { *_retval = ! (mEndTimeReference == TIME_RELATIVE_EPOCH && mEndTime == 0); return NS_OK; } -/* readonly attribute PRTime absoluteEndTime; */ NS_IMETHODIMP nsNavHistoryQuery::GetAbsoluteEndTime(PRTime* _retval) { *_retval = nsNavHistory::NormalizeTime(mEndTimeReference, mEndTime); return NS_OK; } -/* attribute string searchTerms; */ NS_IMETHODIMP nsNavHistoryQuery::GetSearchTerms(nsAString& aSearchTerms) { aSearchTerms = mSearchTerms; @@ -1005,7 +996,6 @@ NS_IMETHODIMP nsNavHistoryQuery::GetHasSearchTerms(bool* _retval) return NS_OK; } -/* attribute int32_t minVisits; */ NS_IMETHODIMP nsNavHistoryQuery::GetMinVisits(int32_t* _retval) { NS_ENSURE_ARG_POINTER(_retval); @@ -1018,7 +1008,6 @@ NS_IMETHODIMP nsNavHistoryQuery::SetMinVisits(int32_t aVisits) return NS_OK; } -/* attribute PRint32 maxVisits; */ NS_IMETHODIMP nsNavHistoryQuery::GetMaxVisits(int32_t* _retval) { NS_ENSURE_ARG_POINTER(_retval); @@ -1031,7 +1020,6 @@ NS_IMETHODIMP nsNavHistoryQuery::SetMaxVisits(int32_t aVisits) return NS_OK; } -/* attribute boolean onlyBookmarked; */ NS_IMETHODIMP nsNavHistoryQuery::GetOnlyBookmarked(bool *aOnlyBookmarked) { *aOnlyBookmarked = mOnlyBookmarked; @@ -1043,7 +1031,6 @@ NS_IMETHODIMP nsNavHistoryQuery::SetOnlyBookmarked(bool aOnlyBookmarked) return NS_OK; } -/* attribute boolean domainIsHost; */ NS_IMETHODIMP nsNavHistoryQuery::GetDomainIsHost(bool *aDomainIsHost) { *aDomainIsHost = mDomainIsHost; @@ -1055,7 +1042,6 @@ NS_IMETHODIMP nsNavHistoryQuery::SetDomainIsHost(bool aDomainIsHost) return NS_OK; } -/* attribute AUTF8String domain; */ NS_IMETHODIMP nsNavHistoryQuery::GetDomain(nsACString& aDomain) { aDomain = mDomain; @@ -1073,7 +1059,6 @@ NS_IMETHODIMP nsNavHistoryQuery::GetHasDomain(bool* _retval) return NS_OK; } -/* attribute boolean uriIsPrefix; */ NS_IMETHODIMP nsNavHistoryQuery::GetUriIsPrefix(bool* aIsPrefix) { *aIsPrefix = mUriIsPrefix; @@ -1085,7 +1070,6 @@ NS_IMETHODIMP nsNavHistoryQuery::SetUriIsPrefix(bool aIsPrefix) return NS_OK; } -/* attribute nsIURI uri; */ NS_IMETHODIMP nsNavHistoryQuery::GetUri(nsIURI** aUri) { NS_IF_ADDREF(*aUri = mUri); @@ -1102,7 +1086,6 @@ NS_IMETHODIMP nsNavHistoryQuery::GetHasUri(bool* aHasUri) return NS_OK; } -/* attribute boolean annotationIsNot; */ NS_IMETHODIMP nsNavHistoryQuery::GetAnnotationIsNot(bool* aIsNot) { *aIsNot = mAnnotationIsNot; @@ -1114,7 +1097,6 @@ NS_IMETHODIMP nsNavHistoryQuery::SetAnnotationIsNot(bool aIsNot) return NS_OK; } -/* attribute AUTF8String annotation; */ NS_IMETHODIMP nsNavHistoryQuery::GetAnnotation(nsACString& aAnnotation) { aAnnotation = mAnnotation; @@ -1131,7 +1113,6 @@ NS_IMETHODIMP nsNavHistoryQuery::GetHasAnnotation(bool* aHasIt) return NS_OK; } -/* attribute nsIVariant tags; */ NS_IMETHODIMP nsNavHistoryQuery::GetTags(nsIVariant **aTags) { NS_ENSURE_ARG_POINTER(aTags); @@ -1253,7 +1234,6 @@ NS_IMETHODIMP nsNavHistoryQuery::SetTags(nsIVariant *aTags) return NS_OK; } -/* attribute boolean tagsAreNot; */ NS_IMETHODIMP nsNavHistoryQuery::GetTagsAreNot(bool *aTagsAreNot) { NS_ENSURE_ARG_POINTER(aTagsAreNot); diff --git a/uriloader/exthandler/nsDBusHandlerApp.cpp b/uriloader/exthandler/nsDBusHandlerApp.cpp index e19d4f2de3b..c052b43f1b5 100644 --- a/uriloader/exthandler/nsDBusHandlerApp.cpp +++ b/uriloader/exthandler/nsDBusHandlerApp.cpp @@ -126,7 +126,6 @@ nsDBusHandlerApp::LaunchWithURI(nsIURI *aURI, //////////////////////////////////////////////////////////////////////////////// //// nsIDBusHandlerApp -/* attribute AUTF8String service; */ NS_IMETHODIMP nsDBusHandlerApp::GetService(nsACString & aService) { aService.Assign(mService); @@ -139,7 +138,6 @@ NS_IMETHODIMP nsDBusHandlerApp::SetService(const nsACString & aService) return NS_OK; } -/* attribute AUTF8String method; */ NS_IMETHODIMP nsDBusHandlerApp::GetMethod(nsACString & aMethod) { aMethod.Assign(mMethod); @@ -152,7 +150,6 @@ NS_IMETHODIMP nsDBusHandlerApp::SetMethod(const nsACString & aMethod) return NS_OK; } -/* attribute AUTF8String interface; */ NS_IMETHODIMP nsDBusHandlerApp::GetDBusInterface(nsACString & aInterface) { aInterface.Assign(mInterface); @@ -165,7 +162,6 @@ NS_IMETHODIMP nsDBusHandlerApp::SetDBusInterface(const nsACString & aInterface) return NS_OK; } -/* attribute AUTF8String objpath; */ NS_IMETHODIMP nsDBusHandlerApp::GetObjectPath(nsACString & aObjpath) { aObjpath.Assign(mObjpath); diff --git a/uriloader/exthandler/nsLocalHandlerApp.cpp b/uriloader/exthandler/nsLocalHandlerApp.cpp index e06cc39a5ef..f1b65dca217 100644 --- a/uriloader/exthandler/nsLocalHandlerApp.cpp +++ b/uriloader/exthandler/nsLocalHandlerApp.cpp @@ -126,7 +126,6 @@ nsLocalHandlerApp::LaunchWithIProcess(const nsCString& aArg) //////////////////////////////////////////////////////////////////////////////// //// nsILocalHandlerApp -/* attribute nsIFile executable; */ NS_IMETHODIMP nsLocalHandlerApp::GetExecutable(nsIFile **aExecutable) { @@ -141,7 +140,6 @@ nsLocalHandlerApp::SetExecutable(nsIFile *aExecutable) return NS_OK; } -/* readonly attribute unsigned long parameterCount; */ NS_IMETHODIMP nsLocalHandlerApp::GetParameterCount(uint32_t *aParameterCount) { @@ -149,7 +147,6 @@ nsLocalHandlerApp::GetParameterCount(uint32_t *aParameterCount) return NS_OK; } -/* void clearParameters (); */ NS_IMETHODIMP nsLocalHandlerApp::ClearParameters() { @@ -157,7 +154,6 @@ nsLocalHandlerApp::ClearParameters() return NS_OK; } -/* void appendParameter (in AString param); */ NS_IMETHODIMP nsLocalHandlerApp::AppendParameter(const nsAString & aParam) { @@ -165,7 +161,6 @@ nsLocalHandlerApp::AppendParameter(const nsAString & aParam) return NS_OK; } -/* AString getParameter (in unsigned long parameterIndex); */ NS_IMETHODIMP nsLocalHandlerApp::GetParameter(uint32_t parameterIndex, nsAString & _retval) { @@ -176,7 +171,6 @@ nsLocalHandlerApp::GetParameter(uint32_t parameterIndex, nsAString & _retval) return NS_OK; } -/* boolean parameterExists (in AString param); */ NS_IMETHODIMP nsLocalHandlerApp::ParameterExists(const nsAString & aParam, bool *_retval) { diff --git a/widget/GfxInfoBase.cpp b/widget/GfxInfoBase.cpp index 3bbb10de5e8..5902da00b3a 100644 --- a/widget/GfxInfoBase.cpp +++ b/widget/GfxInfoBase.cpp @@ -1042,7 +1042,6 @@ GfxInfoBase::LogFailure(const nsACString &failure) gfxCriticalError(CriticalLog::DefaultOptions(false)) << "(LF) " << failure.BeginReading(); } -/* void getFailures (out unsigned long failureCount, [optional, array, size_is (failureCount)] out long indices, [array, size_is (failureCount), retval] out string failures); */ /* XPConnect method of returning arrays is very ugly. Would not recommend. */ NS_IMETHODIMP GfxInfoBase::GetFailures(uint32_t* failureCount, int32_t** indices, diff --git a/widget/GfxInfoX11.cpp b/widget/GfxInfoX11.cpp index 6bd14a2522b..b37ba461d3e 100644 --- a/widget/GfxInfoX11.cpp +++ b/widget/GfxInfoX11.cpp @@ -390,21 +390,18 @@ GfxInfo::GetDWriteEnabled(bool *aEnabled) return NS_ERROR_FAILURE; } -/* readonly attribute DOMString DWriteVersion; */ NS_IMETHODIMP GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString cleartypeParameters; */ NS_IMETHODIMP GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDescription; */ NS_IMETHODIMP GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription) { @@ -413,14 +410,12 @@ GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription) return NS_OK; } -/* readonly attribute DOMString adapterDescription2; */ NS_IMETHODIMP GfxInfo::GetAdapterDescription2(nsAString & aAdapterDescription) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterRAM; */ NS_IMETHODIMP GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM) { @@ -428,14 +423,12 @@ GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM) return NS_OK; } -/* readonly attribute DOMString adapterRAM2; */ NS_IMETHODIMP GfxInfo::GetAdapterRAM2(nsAString & aAdapterRAM) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriver; */ NS_IMETHODIMP GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver) { @@ -443,14 +436,12 @@ GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver) return NS_OK; } -/* readonly attribute DOMString adapterDriver2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriver2(nsAString & aAdapterDriver) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriverVersion; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion) { @@ -459,14 +450,12 @@ GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion) return NS_OK; } -/* readonly attribute DOMString adapterDriverVersion2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriverDate; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate) { @@ -474,14 +463,12 @@ GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate) return NS_OK; } -/* readonly attribute DOMString adapterDriverDate2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverDate2(nsAString & aAdapterDriverDate) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterVendorID; */ NS_IMETHODIMP GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID) { @@ -490,14 +477,12 @@ GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID) return NS_OK; } -/* readonly attribute DOMString adapterVendorID2; */ NS_IMETHODIMP GfxInfo::GetAdapterVendorID2(nsAString & aAdapterVendorID) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDeviceID; */ NS_IMETHODIMP GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID) { @@ -506,28 +491,24 @@ GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID) return NS_OK; } -/* readonly attribute DOMString adapterDeviceID2; */ NS_IMETHODIMP GfxInfo::GetAdapterDeviceID2(nsAString & aAdapterDeviceID) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterSubsysID; */ NS_IMETHODIMP GfxInfo::GetAdapterSubsysID(nsAString & aAdapterSubsysID) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterSubsysID2; */ NS_IMETHODIMP GfxInfo::GetAdapterSubsysID2(nsAString & aAdapterSubsysID) { return NS_ERROR_FAILURE; } -/* readonly attribute boolean isGPU2Active; */ NS_IMETHODIMP GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active) { @@ -539,28 +520,24 @@ GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active) // Implement nsIGfxInfoDebug // We don't support spoofing anything on Linux -/* void spoofVendorID (in DOMString aVendorID); */ NS_IMETHODIMP GfxInfo::SpoofVendorID(const nsAString & aVendorID) { CopyUTF16toUTF8(aVendorID, mVendor); return NS_OK; } -/* void spoofDeviceID (in unsigned long aDeviceID); */ NS_IMETHODIMP GfxInfo::SpoofDeviceID(const nsAString & aDeviceID) { CopyUTF16toUTF8(aDeviceID, mRenderer); return NS_OK; } -/* void spoofDriverVersion (in DOMString aDriverVersion); */ NS_IMETHODIMP GfxInfo::SpoofDriverVersion(const nsAString & aDriverVersion) { CopyUTF16toUTF8(aDriverVersion, mVersion); return NS_OK; } -/* void spoofOSVersion (in unsigned long aVersion); */ NS_IMETHODIMP GfxInfo::SpoofOSVersion(uint32_t aVersion) { // We don't support OS versioning on Linux. There's just "Linux". diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp index 5e15b710637..a73d7604831 100644 --- a/widget/android/AndroidBridge.cpp +++ b/widget/android/AndroidBridge.cpp @@ -1585,7 +1585,6 @@ nsAndroidBridge::~nsAndroidBridge() { } -/* void handleGeckoEvent (in AString message); */ NS_IMETHODIMP nsAndroidBridge::HandleGeckoMessage(JS::HandleValue val, JSContext *cx) { @@ -1619,21 +1618,18 @@ NS_IMETHODIMP nsAndroidBridge::HandleGeckoMessage(JS::HandleValue val, return NS_OK; } -/* nsIAndroidDisplayport getDisplayPort(in boolean aPageSizeUpdate, in boolean isBrowserContentDisplayed, in int32_t tabId, in nsIAndroidViewport metrics); */ NS_IMETHODIMP nsAndroidBridge::GetDisplayPort(bool aPageSizeUpdate, bool aIsBrowserContentDisplayed, int32_t tabId, nsIAndroidViewport* metrics, nsIAndroidDisplayport** displayPort) { AndroidBridge::Bridge()->GetDisplayPort(aPageSizeUpdate, aIsBrowserContentDisplayed, tabId, metrics, displayPort); return NS_OK; } -/* void displayedDocumentChanged(); */ NS_IMETHODIMP nsAndroidBridge::ContentDocumentChanged() { AndroidBridge::Bridge()->ContentDocumentChanged(); return NS_OK; } -/* boolean isContentDocumentDisplayed(); */ NS_IMETHODIMP nsAndroidBridge::IsContentDocumentDisplayed(bool *aRet) { *aRet = AndroidBridge::Bridge()->IsContentDocumentDisplayed(); @@ -1727,7 +1723,6 @@ AndroidBridge::PumpMessageLoop() return GeckoAppShell::PumpMessageLoop(msg); } -/* attribute nsIAndroidBrowserApp browserApp; */ NS_IMETHODIMP nsAndroidBridge::GetBrowserApp(nsIAndroidBrowserApp * *aBrowserApp) { if (nsAppShell::gAppShell) diff --git a/widget/android/GfxInfo.cpp b/widget/android/GfxInfo.cpp index 3ec72148073..e631bfbe3e7 100644 --- a/widget/android/GfxInfo.cpp +++ b/widget/android/GfxInfo.cpp @@ -146,14 +146,12 @@ GfxInfo::GetDWriteEnabled(bool *aEnabled) return NS_ERROR_FAILURE; } -/* readonly attribute DOMString DWriteVersion; */ NS_IMETHODIMP GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString cleartypeParameters; */ NS_IMETHODIMP GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams) { @@ -219,7 +217,6 @@ GfxInfo::EnsureInitialized() mInitialized = true; } -/* readonly attribute DOMString adapterDescription; */ NS_IMETHODIMP GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription) { @@ -228,7 +225,6 @@ GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription) return NS_OK; } -/* readonly attribute DOMString adapterDescription2; */ NS_IMETHODIMP GfxInfo::GetAdapterDescription2(nsAString & aAdapterDescription) { @@ -236,7 +232,6 @@ GfxInfo::GetAdapterDescription2(nsAString & aAdapterDescription) return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterRAM; */ NS_IMETHODIMP GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM) { @@ -245,7 +240,6 @@ GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM) return NS_OK; } -/* readonly attribute DOMString adapterRAM2; */ NS_IMETHODIMP GfxInfo::GetAdapterRAM2(nsAString & aAdapterRAM) { @@ -253,7 +247,6 @@ GfxInfo::GetAdapterRAM2(nsAString & aAdapterRAM) return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriver; */ NS_IMETHODIMP GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver) { @@ -262,7 +255,6 @@ GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver) return NS_OK; } -/* readonly attribute DOMString adapterDriver2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriver2(nsAString & aAdapterDriver) { @@ -270,7 +262,6 @@ GfxInfo::GetAdapterDriver2(nsAString & aAdapterDriver) return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriverVersion; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion) { @@ -279,7 +270,6 @@ GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion) return NS_OK; } -/* readonly attribute DOMString adapterDriverVersion2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion) { @@ -287,7 +277,6 @@ GfxInfo::GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion) return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriverDate; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate) { @@ -296,7 +285,6 @@ GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate) return NS_OK; } -/* readonly attribute DOMString adapterDriverDate2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverDate2(nsAString & aAdapterDriverDate) { @@ -304,7 +292,6 @@ GfxInfo::GetAdapterDriverDate2(nsAString & aAdapterDriverDate) return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterVendorID; */ NS_IMETHODIMP GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID) { @@ -313,7 +300,6 @@ GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID) return NS_OK; } -/* readonly attribute DOMString adapterVendorID2; */ NS_IMETHODIMP GfxInfo::GetAdapterVendorID2(nsAString & aAdapterVendorID) { @@ -321,7 +307,6 @@ GfxInfo::GetAdapterVendorID2(nsAString & aAdapterVendorID) return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDeviceID; */ NS_IMETHODIMP GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID) { @@ -330,7 +315,6 @@ GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID) return NS_OK; } -/* readonly attribute DOMString adapterDeviceID2; */ NS_IMETHODIMP GfxInfo::GetAdapterDeviceID2(nsAString & aAdapterDeviceID) { @@ -338,7 +322,6 @@ GfxInfo::GetAdapterDeviceID2(nsAString & aAdapterDeviceID) return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterSubsysID; */ NS_IMETHODIMP GfxInfo::GetAdapterSubsysID(nsAString & aAdapterSubsysID) { @@ -346,7 +329,6 @@ GfxInfo::GetAdapterSubsysID(nsAString & aAdapterSubsysID) return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterSubsysID2; */ NS_IMETHODIMP GfxInfo::GetAdapterSubsysID2(nsAString & aAdapterSubsysID) { @@ -354,7 +336,6 @@ GfxInfo::GetAdapterSubsysID2(nsAString & aAdapterSubsysID) return NS_ERROR_FAILURE; } -/* readonly attribute boolean isGPU2Active; */ NS_IMETHODIMP GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active) { @@ -607,28 +588,24 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature, // Implement nsIGfxInfoDebug -/* void spoofVendorID (in DOMString aVendorID); */ NS_IMETHODIMP GfxInfo::SpoofVendorID(const nsAString & aVendorID) { mGLStrings->SpoofVendor(NS_LossyConvertUTF16toASCII(aVendorID)); return NS_OK; } -/* void spoofDeviceID (in unsigned long aDeviceID); */ NS_IMETHODIMP GfxInfo::SpoofDeviceID(const nsAString & aDeviceID) { mGLStrings->SpoofRenderer(NS_LossyConvertUTF16toASCII(aDeviceID)); return NS_OK; } -/* void spoofDriverVersion (in DOMString aDriverVersion); */ NS_IMETHODIMP GfxInfo::SpoofDriverVersion(const nsAString & aDriverVersion) { mGLStrings->SpoofVersion(NS_LossyConvertUTF16toASCII(aDriverVersion)); return NS_OK; } -/* void spoofOSVersion (in unsigned long aVersion); */ NS_IMETHODIMP GfxInfo::SpoofOSVersion(uint32_t aVersion) { EnsureInitialized(); diff --git a/widget/android/nsIMEPicker.cpp b/widget/android/nsIMEPicker.cpp index c7645c6c275..3bb6146523f 100644 --- a/widget/android/nsIMEPicker.cpp +++ b/widget/android/nsIMEPicker.cpp @@ -19,7 +19,6 @@ nsIMEPicker::~nsIMEPicker() /* destructor code */ } -/* void show (); */ NS_IMETHODIMP nsIMEPicker::Show() { widget::GeckoAppShell::ShowInputMethodPicker(); diff --git a/widget/gonk/GfxInfo.cpp b/widget/gonk/GfxInfo.cpp index 6e34c073e28..1a506831faa 100644 --- a/widget/gonk/GfxInfo.cpp +++ b/widget/gonk/GfxInfo.cpp @@ -21,21 +21,18 @@ GfxInfo::GetDWriteEnabled(bool *aEnabled) return NS_ERROR_FAILURE; } -/* readonly attribute DOMString DWriteVersion; */ NS_IMETHODIMP GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString cleartypeParameters; */ NS_IMETHODIMP GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDescription; */ NS_IMETHODIMP GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription) { @@ -43,14 +40,12 @@ GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription) return NS_OK; } -/* readonly attribute DOMString adapterDescription2; */ NS_IMETHODIMP GfxInfo::GetAdapterDescription2(nsAString & aAdapterDescription) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterRAM; */ NS_IMETHODIMP GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM) { @@ -58,14 +53,12 @@ GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM) return NS_OK; } -/* readonly attribute DOMString adapterRAM2; */ NS_IMETHODIMP GfxInfo::GetAdapterRAM2(nsAString & aAdapterRAM) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriver; */ NS_IMETHODIMP GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver) { @@ -73,14 +66,12 @@ GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver) return NS_OK; } -/* readonly attribute DOMString adapterDriver2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriver2(nsAString & aAdapterDriver) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriverVersion; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion) { @@ -88,14 +79,12 @@ GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion) return NS_OK; } -/* readonly attribute DOMString adapterDriverVersion2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriverDate; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate) { @@ -103,14 +92,12 @@ GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate) return NS_OK; } -/* readonly attribute DOMString adapterDriverDate2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverDate2(nsAString & aAdapterDriverDate) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterVendorID; */ NS_IMETHODIMP GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID) { @@ -118,14 +105,12 @@ GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID) return NS_OK; } -/* readonly attribute DOMString adapterVendorID2; */ NS_IMETHODIMP GfxInfo::GetAdapterVendorID2(nsAString & aAdapterVendorID) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDeviceID; */ NS_IMETHODIMP GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID) { @@ -133,28 +118,24 @@ GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID) return NS_OK; } -/* readonly attribute DOMString adapterDeviceID2; */ NS_IMETHODIMP GfxInfo::GetAdapterDeviceID2(nsAString & aAdapterDeviceID) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterSubsysID; */ NS_IMETHODIMP GfxInfo::GetAdapterSubsysID(nsAString & aAdapterSubsysID) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterSubsysID2; */ NS_IMETHODIMP GfxInfo::GetAdapterSubsysID2(nsAString & aAdapterSubsysID) { return NS_ERROR_FAILURE; } -/* readonly attribute boolean isGPU2Active; */ NS_IMETHODIMP GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active) { @@ -189,25 +170,21 @@ GfxInfo::GetFeatureStatusImpl(int32_t /*aFeature*/, // Implement nsIGfxInfoDebug -/* void spoofVendorID (in DOMString aVendorID); */ NS_IMETHODIMP GfxInfo::SpoofVendorID(const nsAString &) { return NS_OK; } -/* void spoofDeviceID (in unsigned long aDeviceID); */ NS_IMETHODIMP GfxInfo::SpoofDeviceID(const nsAString &) { return NS_OK; } -/* void spoofDriverVersion (in DOMString aDriverVersion); */ NS_IMETHODIMP GfxInfo::SpoofDriverVersion(const nsAString &) { return NS_OK; } -/* void spoofOSVersion (in unsigned long aVersion); */ NS_IMETHODIMP GfxInfo::SpoofOSVersion(uint32_t) { return NS_OK; diff --git a/widget/gtk/nsColorPicker.cpp b/widget/gtk/nsColorPicker.cpp index 85eb5bdcb47..06a21e3cc34 100644 --- a/widget/gtk/nsColorPicker.cpp +++ b/widget/gtk/nsColorPicker.cpp @@ -37,7 +37,6 @@ GtkColorSelection* nsColorPicker::WidgetGetColorSelection(GtkWidget* widget) GTK_COLOR_SELECTION_DIALOG(widget))); } -/* void init (in nsIDOMWindow parent, in AString title, in short mode); */ NS_IMETHODIMP nsColorPicker::Init(nsIDOMWindow *parent, const nsAString& title, const nsAString& initialColor) @@ -49,7 +48,6 @@ NS_IMETHODIMP nsColorPicker::Init(nsIDOMWindow *parent, return NS_OK; } -/* void open (in nsIColorPickerShownCallback aColorPickerShownCallback); */ NS_IMETHODIMP nsColorPicker::Open(nsIColorPickerShownCallback *aColorPickerShownCallback) { diff --git a/widget/gtk/nsDeviceContextSpecG.cpp b/widget/gtk/nsDeviceContextSpecG.cpp index e95fbbe07b7..1e7ca52afee 100644 --- a/widget/gtk/nsDeviceContextSpecG.cpp +++ b/widget/gtk/nsDeviceContextSpecG.cpp @@ -408,7 +408,6 @@ NS_IMETHODIMP nsPrinterEnumeratorGTK::GetPrinterNameList(nsIStringEnumerator **a return NS_NewAdoptingStringEnumerator(aPrinterNameList, printers); } -/* readonly attribute wstring defaultPrinterName; */ NS_IMETHODIMP nsPrinterEnumeratorGTK::GetDefaultPrinterName(char16_t **aDefaultPrinterName) { DO_PR_DEBUG_LOG(("nsPrinterEnumeratorGTK::GetDefaultPrinterName()\n")); @@ -420,7 +419,6 @@ NS_IMETHODIMP nsPrinterEnumeratorGTK::GetDefaultPrinterName(char16_t **aDefaultP return NS_OK; } -/* void initPrintSettingsFromPrinter (in wstring aPrinterName, in nsIPrintSettings aPrintSettings); */ NS_IMETHODIMP nsPrinterEnumeratorGTK::InitPrintSettingsFromPrinter(const char16_t *aPrinterName, nsIPrintSettings *aPrintSettings) { DO_PR_DEBUG_LOG(("nsPrinterEnumeratorGTK::InitPrintSettingsFromPrinter()")); diff --git a/widget/gtk/nsPrintOptionsGTK.cpp b/widget/gtk/nsPrintOptionsGTK.cpp index 799bf11b0ad..ca86a1f8935 100644 --- a/widget/gtk/nsPrintOptionsGTK.cpp +++ b/widget/gtk/nsPrintOptionsGTK.cpp @@ -89,7 +89,6 @@ nsPrintOptionsGTK::DeserializeToPrintSettings(const PrintData& data, return NS_OK; } -/* nsIPrintSettings CreatePrintSettings (); */ nsresult nsPrintOptionsGTK::_CreatePrintSettings(nsIPrintSettings **_retval) { *_retval = nullptr; diff --git a/widget/gtk/nsPrintSettingsGTK.cpp b/widget/gtk/nsPrintSettingsGTK.cpp index 79aac676bd8..436c4bcf21c 100644 --- a/widget/gtk/nsPrintSettingsGTK.cpp +++ b/widget/gtk/nsPrintSettingsGTK.cpp @@ -218,7 +218,6 @@ nsPrintSettingsGTK::SetGtkPrinter(GtkPrinter *aPrinter) * from the GTK objects rather than our own variables. */ -/* attribute long printRange; */ NS_IMETHODIMP nsPrintSettingsGTK::GetPrintRange(int16_t *aPrintRange) { NS_ENSURE_ARG_POINTER(aPrintRange); @@ -250,7 +249,6 @@ NS_IMETHODIMP nsPrintSettingsGTK::SetPrintRange(int16_t aPrintRange) return NS_OK; } -/* attribute long startPageRange; */ NS_IMETHODIMP nsPrintSettingsGTK::GetStartPageRange(int32_t *aStartPageRange) { @@ -288,7 +286,6 @@ nsPrintSettingsGTK::SetStartPageRange(int32_t aStartPageRange) return NS_OK; } -/* attribute long endPageRange; */ NS_IMETHODIMP nsPrintSettingsGTK::GetEndPageRange(int32_t *aEndPageRange) { @@ -323,7 +320,6 @@ nsPrintSettingsGTK::SetEndPageRange(int32_t aEndPageRange) return NS_OK; } -/* attribute boolean printReversed; */ NS_IMETHODIMP nsPrintSettingsGTK::GetPrintReversed(bool *aPrintReversed) { @@ -337,7 +333,6 @@ nsPrintSettingsGTK::SetPrintReversed(bool aPrintReversed) return NS_OK; } -/* attribute boolean printInColor; */ NS_IMETHODIMP nsPrintSettingsGTK::GetPrintInColor(bool *aPrintInColor) { @@ -351,7 +346,6 @@ nsPrintSettingsGTK::SetPrintInColor(bool aPrintInColor) return NS_OK; } -/* attribute short orientation; */ NS_IMETHODIMP nsPrintSettingsGTK::GetOrientation(int32_t *aOrientation) { @@ -385,7 +379,6 @@ nsPrintSettingsGTK::SetOrientation(int32_t aOrientation) return NS_OK; } -/* attribute wstring toFileName; */ NS_IMETHODIMP nsPrintSettingsGTK::GetToFileName(char16_t * *aToFileName) { @@ -486,7 +479,6 @@ nsPrintSettingsGTK::SetPrinterName(const char16_t * aPrinter) return NS_OK; } -/* attribute long numCopies; */ NS_IMETHODIMP nsPrintSettingsGTK::GetNumCopies(int32_t *aNumCopies) { @@ -501,7 +493,6 @@ nsPrintSettingsGTK::SetNumCopies(int32_t aNumCopies) return NS_OK; } -/* attribute double scaling; */ NS_IMETHODIMP nsPrintSettingsGTK::GetScaling(double *aScaling) { @@ -516,7 +507,6 @@ nsPrintSettingsGTK::SetScaling(double aScaling) return NS_OK; } -/* attribute wstring paperName; */ NS_IMETHODIMP nsPrintSettingsGTK::GetPaperName(char16_t * *aPaperName) { @@ -606,7 +596,6 @@ nsPrintSettingsGTK::SetUnwriteableMarginInTwips(nsIntMargin& aUnwriteableMargin) return NS_OK; } -/* attribute double unwriteableMarginTop; */ NS_IMETHODIMP nsPrintSettingsGTK::SetUnwriteableMarginTop(double aUnwriteableMarginTop) { @@ -616,7 +605,6 @@ nsPrintSettingsGTK::SetUnwriteableMarginTop(double aUnwriteableMarginTop) return NS_OK; } -/* attribute double unwriteableMarginLeft; */ NS_IMETHODIMP nsPrintSettingsGTK::SetUnwriteableMarginLeft(double aUnwriteableMarginLeft) { @@ -626,7 +614,6 @@ nsPrintSettingsGTK::SetUnwriteableMarginLeft(double aUnwriteableMarginLeft) return NS_OK; } -/* attribute double unwriteableMarginBottom; */ NS_IMETHODIMP nsPrintSettingsGTK::SetUnwriteableMarginBottom(double aUnwriteableMarginBottom) { @@ -636,7 +623,6 @@ nsPrintSettingsGTK::SetUnwriteableMarginBottom(double aUnwriteableMarginBottom) return NS_OK; } -/* attribute double unwriteableMarginRight; */ NS_IMETHODIMP nsPrintSettingsGTK::SetUnwriteableMarginRight(double aUnwriteableMarginRight) { @@ -646,7 +632,6 @@ nsPrintSettingsGTK::SetUnwriteableMarginRight(double aUnwriteableMarginRight) return NS_OK; } -/* attribute double paperWidth; */ NS_IMETHODIMP nsPrintSettingsGTK::GetPaperWidth(double *aPaperWidth) { @@ -665,7 +650,6 @@ nsPrintSettingsGTK::SetPaperWidth(double aPaperWidth) return NS_OK; } -/* attribute double paperHeight; */ NS_IMETHODIMP nsPrintSettingsGTK::GetPaperHeight(double *aPaperHeight) { diff --git a/widget/nsColorPickerProxy.cpp b/widget/nsColorPickerProxy.cpp index 4409470a583..a558e94d8ff 100644 --- a/widget/nsColorPickerProxy.cpp +++ b/widget/nsColorPickerProxy.cpp @@ -12,7 +12,6 @@ using namespace mozilla::dom; NS_IMPL_ISUPPORTS(nsColorPickerProxy, nsIColorPicker) -/* void init (in nsIDOMWindow parent, in AString title, in short mode); */ NS_IMETHODIMP nsColorPickerProxy::Init(nsIDOMWindow* aParent, const nsAString& aTitle, const nsAString& aInitialColor) @@ -29,7 +28,6 @@ nsColorPickerProxy::Init(nsIDOMWindow* aParent, const nsAString& aTitle, return NS_OK; } -/* void open (in nsIColorPickerShownCallback aColorPickerShownCallback); */ NS_IMETHODIMP nsColorPickerProxy::Open(nsIColorPickerShownCallback* aColorPickerShownCallback) { @@ -57,4 +55,4 @@ nsColorPickerProxy::Recv__delete__(const nsString& aColor) mCallback = nullptr; } return true; -} \ No newline at end of file +} diff --git a/widget/nsFilePickerProxy.cpp b/widget/nsFilePickerProxy.cpp index 7da9742e408..03c55aa16d4 100644 --- a/widget/nsFilePickerProxy.cpp +++ b/widget/nsFilePickerProxy.cpp @@ -99,7 +99,6 @@ nsFilePickerProxy::SetFilterIndex(int32_t aFilterIndex) return NS_OK; } -/* readonly attribute nsIFile file; */ NS_IMETHODIMP nsFilePickerProxy::GetFile(nsIFile** aFile) { @@ -107,7 +106,6 @@ nsFilePickerProxy::GetFile(nsIFile** aFile) return NS_ERROR_FAILURE; } -/* readonly attribute nsIFileURL fileURL; */ NS_IMETHODIMP nsFilePickerProxy::GetFileURL(nsIURI** aFileURL) { @@ -115,7 +113,6 @@ nsFilePickerProxy::GetFileURL(nsIURI** aFileURL) return NS_ERROR_FAILURE; } -/* readonly attribute nsISimpleEnumerator files; */ NS_IMETHODIMP nsFilePickerProxy::GetFiles(nsISimpleEnumerator** aFiles) { diff --git a/widget/nsPrintSettingsImpl.cpp b/widget/nsPrintSettingsImpl.cpp index 6686c973705..26c233be9b3 100644 --- a/widget/nsPrintSettingsImpl.cpp +++ b/widget/nsPrintSettingsImpl.cpp @@ -83,7 +83,6 @@ nsPrintSettings::~nsPrintSettings() { } -/* [noscript] attribute nsIPrintSession printSession; */ NS_IMETHODIMP nsPrintSettings::GetPrintSession(nsIPrintSession **aPrintSession) { NS_ENSURE_ARG_POINTER(aPrintSession); @@ -112,7 +111,6 @@ NS_IMETHODIMP nsPrintSettings::SetPrintSession(nsIPrintSession *aPrintSession) return NS_OK; } -/* attribute long startPageRange; */ NS_IMETHODIMP nsPrintSettings::GetStartPageRange(int32_t *aStartPageRange) { //NS_ENSURE_ARG_POINTER(aStartPageRange); @@ -125,7 +123,6 @@ NS_IMETHODIMP nsPrintSettings::SetStartPageRange(int32_t aStartPageRange) return NS_OK; } -/* attribute long endPageRange; */ NS_IMETHODIMP nsPrintSettings::GetEndPageRange(int32_t *aEndPageRange) { //NS_ENSURE_ARG_POINTER(aEndPageRange); @@ -138,7 +135,6 @@ NS_IMETHODIMP nsPrintSettings::SetEndPageRange(int32_t aEndPageRange) return NS_OK; } -/* attribute boolean printReversed; */ NS_IMETHODIMP nsPrintSettings::GetPrintReversed(bool *aPrintReversed) { //NS_ENSURE_ARG_POINTER(aPrintReversed); @@ -151,7 +147,6 @@ NS_IMETHODIMP nsPrintSettings::SetPrintReversed(bool aPrintReversed) return NS_OK; } -/* attribute boolean printInColor; */ NS_IMETHODIMP nsPrintSettings::GetPrintInColor(bool *aPrintInColor) { //NS_ENSURE_ARG_POINTER(aPrintInColor); @@ -164,7 +159,6 @@ NS_IMETHODIMP nsPrintSettings::SetPrintInColor(bool aPrintInColor) return NS_OK; } -/* attribute short orientation; */ NS_IMETHODIMP nsPrintSettings::GetOrientation(int32_t *aOrientation) { NS_ENSURE_ARG_POINTER(aOrientation); @@ -177,7 +171,6 @@ NS_IMETHODIMP nsPrintSettings::SetOrientation(int32_t aOrientation) return NS_OK; } -/* attribute wstring resolution; */ NS_IMETHODIMP nsPrintSettings::GetResolution(int32_t *aResolution) { NS_ENSURE_ARG_POINTER(aResolution); @@ -190,7 +183,6 @@ NS_IMETHODIMP nsPrintSettings::SetResolution(const int32_t aResolution) return NS_OK; } -/* attribute wstring duplex; */ NS_IMETHODIMP nsPrintSettings::GetDuplex(int32_t *aDuplex) { NS_ENSURE_ARG_POINTER(aDuplex); @@ -203,7 +195,6 @@ NS_IMETHODIMP nsPrintSettings::SetDuplex(const int32_t aDuplex) return NS_OK; } -/* attribute wstring printer; */ NS_IMETHODIMP nsPrintSettings::GetPrinterName(char16_t * *aPrinter) { NS_ENSURE_ARG_POINTER(aPrinter); @@ -225,7 +216,6 @@ NS_IMETHODIMP nsPrintSettings::SetPrinterName(const char16_t * aPrinter) return NS_OK; } -/* attribute long numCopies; */ NS_IMETHODIMP nsPrintSettings::GetNumCopies(int32_t *aNumCopies) { NS_ENSURE_ARG_POINTER(aNumCopies); @@ -238,7 +228,6 @@ NS_IMETHODIMP nsPrintSettings::SetNumCopies(int32_t aNumCopies) return NS_OK; } -/* attribute boolean printToFile; */ NS_IMETHODIMP nsPrintSettings::GetPrintToFile(bool *aPrintToFile) { //NS_ENSURE_ARG_POINTER(aPrintToFile); @@ -251,7 +240,6 @@ NS_IMETHODIMP nsPrintSettings::SetPrintToFile(bool aPrintToFile) return NS_OK; } -/* attribute wstring toFileName; */ NS_IMETHODIMP nsPrintSettings::GetToFileName(char16_t * *aToFileName) { //NS_ENSURE_ARG_POINTER(aToFileName); @@ -268,7 +256,6 @@ NS_IMETHODIMP nsPrintSettings::SetToFileName(const char16_t * aToFileName) return NS_OK; } -/* attribute short outputFormat; */ NS_IMETHODIMP nsPrintSettings::GetOutputFormat(int16_t *aOutputFormat) { NS_ENSURE_ARG_POINTER(aOutputFormat); @@ -281,7 +268,6 @@ NS_IMETHODIMP nsPrintSettings::SetOutputFormat(int16_t aOutputFormat) return NS_OK; } -/* attribute long printPageDelay; */ NS_IMETHODIMP nsPrintSettings::GetPrintPageDelay(int32_t *aPrintPageDelay) { *aPrintPageDelay = mPrintPageDelay; @@ -293,7 +279,6 @@ NS_IMETHODIMP nsPrintSettings::SetPrintPageDelay(int32_t aPrintPageDelay) return NS_OK; } -/* attribute boolean isInitializedFromPrinter; */ NS_IMETHODIMP nsPrintSettings::GetIsInitializedFromPrinter(bool *aIsInitializedFromPrinter) { NS_ENSURE_ARG_POINTER(aIsInitializedFromPrinter); @@ -306,7 +291,6 @@ NS_IMETHODIMP nsPrintSettings::SetIsInitializedFromPrinter(bool aIsInitializedFr return NS_OK; } -/* attribute boolean isInitializedFromPrefs; */ NS_IMETHODIMP nsPrintSettings::GetIsInitializedFromPrefs(bool *aInitializedFromPrefs) { NS_ENSURE_ARG_POINTER(aInitializedFromPrefs); @@ -319,7 +303,6 @@ NS_IMETHODIMP nsPrintSettings::SetIsInitializedFromPrefs(bool aInitializedFromPr return NS_OK; } -/* attribute boolean persistMarginBoxSettings; */ NS_IMETHODIMP nsPrintSettings::GetPersistMarginBoxSettings(bool *aPersistMarginBoxSettings) { NS_ENSURE_ARG_POINTER(aPersistMarginBoxSettings); @@ -332,7 +315,6 @@ NS_IMETHODIMP nsPrintSettings::SetPersistMarginBoxSettings(bool aPersistMarginBo return NS_OK; } -/* attribute double marginTop; */ NS_IMETHODIMP nsPrintSettings::GetMarginTop(double *aMarginTop) { NS_ENSURE_ARG_POINTER(aMarginTop); @@ -345,7 +327,6 @@ NS_IMETHODIMP nsPrintSettings::SetMarginTop(double aMarginTop) return NS_OK; } -/* attribute double marginLeft; */ NS_IMETHODIMP nsPrintSettings::GetMarginLeft(double *aMarginLeft) { NS_ENSURE_ARG_POINTER(aMarginLeft); @@ -358,7 +339,6 @@ NS_IMETHODIMP nsPrintSettings::SetMarginLeft(double aMarginLeft) return NS_OK; } -/* attribute double marginBottom; */ NS_IMETHODIMP nsPrintSettings::GetMarginBottom(double *aMarginBottom) { NS_ENSURE_ARG_POINTER(aMarginBottom); @@ -371,7 +351,6 @@ NS_IMETHODIMP nsPrintSettings::SetMarginBottom(double aMarginBottom) return NS_OK; } -/* attribute double marginRight; */ NS_IMETHODIMP nsPrintSettings::GetMarginRight(double *aMarginRight) { NS_ENSURE_ARG_POINTER(aMarginRight); @@ -384,7 +363,6 @@ NS_IMETHODIMP nsPrintSettings::SetMarginRight(double aMarginRight) return NS_OK; } -/* attribute double edgeTop; */ NS_IMETHODIMP nsPrintSettings::GetEdgeTop(double *aEdgeTop) { NS_ENSURE_ARG_POINTER(aEdgeTop); @@ -397,7 +375,6 @@ NS_IMETHODIMP nsPrintSettings::SetEdgeTop(double aEdgeTop) return NS_OK; } -/* attribute double edgeLeft; */ NS_IMETHODIMP nsPrintSettings::GetEdgeLeft(double *aEdgeLeft) { NS_ENSURE_ARG_POINTER(aEdgeLeft); @@ -410,7 +387,6 @@ NS_IMETHODIMP nsPrintSettings::SetEdgeLeft(double aEdgeLeft) return NS_OK; } -/* attribute double edgeBottom; */ NS_IMETHODIMP nsPrintSettings::GetEdgeBottom(double *aEdgeBottom) { NS_ENSURE_ARG_POINTER(aEdgeBottom); @@ -423,7 +399,6 @@ NS_IMETHODIMP nsPrintSettings::SetEdgeBottom(double aEdgeBottom) return NS_OK; } -/* attribute double edgeRight; */ NS_IMETHODIMP nsPrintSettings::GetEdgeRight(double *aEdgeRight) { NS_ENSURE_ARG_POINTER(aEdgeRight); @@ -436,7 +411,6 @@ NS_IMETHODIMP nsPrintSettings::SetEdgeRight(double aEdgeRight) return NS_OK; } -/* attribute double unwriteableMarginTop; */ NS_IMETHODIMP nsPrintSettings::GetUnwriteableMarginTop(double *aUnwriteableMarginTop) { NS_ENSURE_ARG_POINTER(aUnwriteableMarginTop); @@ -451,7 +425,6 @@ NS_IMETHODIMP nsPrintSettings::SetUnwriteableMarginTop(double aUnwriteableMargin return NS_OK; } -/* attribute double unwriteableMarginLeft; */ NS_IMETHODIMP nsPrintSettings::GetUnwriteableMarginLeft(double *aUnwriteableMarginLeft) { NS_ENSURE_ARG_POINTER(aUnwriteableMarginLeft); @@ -466,7 +439,6 @@ NS_IMETHODIMP nsPrintSettings::SetUnwriteableMarginLeft(double aUnwriteableMargi return NS_OK; } -/* attribute double unwriteableMarginBottom; */ NS_IMETHODIMP nsPrintSettings::GetUnwriteableMarginBottom(double *aUnwriteableMarginBottom) { NS_ENSURE_ARG_POINTER(aUnwriteableMarginBottom); @@ -481,7 +453,6 @@ NS_IMETHODIMP nsPrintSettings::SetUnwriteableMarginBottom(double aUnwriteableMar return NS_OK; } -/* attribute double unwriteableMarginRight; */ NS_IMETHODIMP nsPrintSettings::GetUnwriteableMarginRight(double *aUnwriteableMarginRight) { NS_ENSURE_ARG_POINTER(aUnwriteableMarginRight); @@ -496,7 +467,6 @@ NS_IMETHODIMP nsPrintSettings::SetUnwriteableMarginRight(double aUnwriteableMarg return NS_OK; } -/* attribute double scaling; */ NS_IMETHODIMP nsPrintSettings::GetScaling(double *aScaling) { NS_ENSURE_ARG_POINTER(aScaling); @@ -510,7 +480,6 @@ NS_IMETHODIMP nsPrintSettings::SetScaling(double aScaling) return NS_OK; } -/* attribute boolean printBGColors; */ NS_IMETHODIMP nsPrintSettings::GetPrintBGColors(bool *aPrintBGColors) { NS_ENSURE_ARG_POINTER(aPrintBGColors); @@ -523,7 +492,6 @@ NS_IMETHODIMP nsPrintSettings::SetPrintBGColors(bool aPrintBGColors) return NS_OK; } -/* attribute boolean printBGImages; */ NS_IMETHODIMP nsPrintSettings::GetPrintBGImages(bool *aPrintBGImages) { NS_ENSURE_ARG_POINTER(aPrintBGImages); @@ -536,7 +504,6 @@ NS_IMETHODIMP nsPrintSettings::SetPrintBGImages(bool aPrintBGImages) return NS_OK; } -/* attribute long printRange; */ NS_IMETHODIMP nsPrintSettings::GetPrintRange(int16_t *aPrintRange) { NS_ENSURE_ARG_POINTER(aPrintRange); @@ -549,7 +516,6 @@ NS_IMETHODIMP nsPrintSettings::SetPrintRange(int16_t aPrintRange) return NS_OK; } -/* attribute wstring docTitle; */ NS_IMETHODIMP nsPrintSettings::GetTitle(char16_t * *aTitle) { NS_ENSURE_ARG_POINTER(aTitle); @@ -570,7 +536,6 @@ NS_IMETHODIMP nsPrintSettings::SetTitle(const char16_t * aTitle) return NS_OK; } -/* attribute wstring docURL; */ NS_IMETHODIMP nsPrintSettings::GetDocURL(char16_t * *aDocURL) { NS_ENSURE_ARG_POINTER(aDocURL); @@ -636,7 +601,6 @@ nsPrintSettings::SetPrintOptionsBits(int32_t aBits) return NS_OK; } -/* attribute wstring docTitle; */ nsresult nsPrintSettings::GetMarginStrs(char16_t * *aTitle, nsHeaderFooterEnum aType, @@ -682,7 +646,6 @@ nsPrintSettings::SetMarginStrs(const char16_t * aTitle, return NS_OK; } -/* attribute wstring Header String Left */ NS_IMETHODIMP nsPrintSettings::GetHeaderStrLeft(char16_t * *aTitle) { return GetMarginStrs(aTitle, eHeader, kJustLeft); @@ -692,7 +655,6 @@ NS_IMETHODIMP nsPrintSettings::SetHeaderStrLeft(const char16_t * aTitle) return SetMarginStrs(aTitle, eHeader, kJustLeft); } -/* attribute wstring Header String Center */ NS_IMETHODIMP nsPrintSettings::GetHeaderStrCenter(char16_t * *aTitle) { return GetMarginStrs(aTitle, eHeader, kJustCenter); @@ -702,7 +664,6 @@ NS_IMETHODIMP nsPrintSettings::SetHeaderStrCenter(const char16_t * aTitle) return SetMarginStrs(aTitle, eHeader, kJustCenter); } -/* attribute wstring Header String Right */ NS_IMETHODIMP nsPrintSettings::GetHeaderStrRight(char16_t * *aTitle) { return GetMarginStrs(aTitle, eHeader, kJustRight); @@ -712,8 +673,6 @@ NS_IMETHODIMP nsPrintSettings::SetHeaderStrRight(const char16_t * aTitle) return SetMarginStrs(aTitle, eHeader, kJustRight); } - -/* attribute wstring Footer String Left */ NS_IMETHODIMP nsPrintSettings::GetFooterStrLeft(char16_t * *aTitle) { return GetMarginStrs(aTitle, eFooter, kJustLeft); @@ -723,7 +682,6 @@ NS_IMETHODIMP nsPrintSettings::SetFooterStrLeft(const char16_t * aTitle) return SetMarginStrs(aTitle, eFooter, kJustLeft); } -/* attribute wstring Footer String Center */ NS_IMETHODIMP nsPrintSettings::GetFooterStrCenter(char16_t * *aTitle) { return GetMarginStrs(aTitle, eFooter, kJustCenter); @@ -733,7 +691,6 @@ NS_IMETHODIMP nsPrintSettings::SetFooterStrCenter(const char16_t * aTitle) return SetMarginStrs(aTitle, eFooter, kJustCenter); } -/* attribute wstring Footer String Right */ NS_IMETHODIMP nsPrintSettings::GetFooterStrRight(char16_t * *aTitle) { return GetMarginStrs(aTitle, eFooter, kJustRight); @@ -743,7 +700,6 @@ NS_IMETHODIMP nsPrintSettings::SetFooterStrRight(const char16_t * aTitle) return SetMarginStrs(aTitle, eFooter, kJustRight); } -/* attribute short printFrameTypeUsage; */ NS_IMETHODIMP nsPrintSettings::GetPrintFrameTypeUsage(int16_t *aPrintFrameTypeUsage) { NS_ENSURE_ARG_POINTER(aPrintFrameTypeUsage); @@ -756,7 +712,6 @@ NS_IMETHODIMP nsPrintSettings::SetPrintFrameTypeUsage(int16_t aPrintFrameTypeUsa return NS_OK; } -/* attribute long printFrameType; */ NS_IMETHODIMP nsPrintSettings::GetPrintFrameType(int16_t *aPrintFrameType) { NS_ENSURE_ARG_POINTER(aPrintFrameType); @@ -769,7 +724,6 @@ NS_IMETHODIMP nsPrintSettings::SetPrintFrameType(int16_t aPrintFrameType) return NS_OK; } -/* attribute boolean printSilent; */ NS_IMETHODIMP nsPrintSettings::GetPrintSilent(bool *aPrintSilent) { NS_ENSURE_ARG_POINTER(aPrintSilent); @@ -782,7 +736,6 @@ NS_IMETHODIMP nsPrintSettings::SetPrintSilent(bool aPrintSilent) return NS_OK; } -/* attribute boolean shrinkToFit; */ NS_IMETHODIMP nsPrintSettings::GetShrinkToFit(bool *aShrinkToFit) { NS_ENSURE_ARG_POINTER(aShrinkToFit); @@ -795,7 +748,6 @@ NS_IMETHODIMP nsPrintSettings::SetShrinkToFit(bool aShrinkToFit) return NS_OK; } -/* attribute boolean showPrintProgress; */ NS_IMETHODIMP nsPrintSettings::GetShowPrintProgress(bool *aShowPrintProgress) { NS_ENSURE_ARG_POINTER(aShowPrintProgress); @@ -808,7 +760,6 @@ NS_IMETHODIMP nsPrintSettings::SetShowPrintProgress(bool aShowPrintProgress) return NS_OK; } -/* attribute wstring paperName; */ NS_IMETHODIMP nsPrintSettings::GetPaperName(char16_t * *aPaperName) { NS_ENSURE_ARG_POINTER(aPaperName); @@ -829,7 +780,6 @@ NS_IMETHODIMP nsPrintSettings::SetPaperName(const char16_t * aPaperName) return NS_OK; } -/* attribute boolean howToEnableFrameUI; */ NS_IMETHODIMP nsPrintSettings::GetHowToEnableFrameUI(int16_t *aHowToEnableFrameUI) { NS_ENSURE_ARG_POINTER(aHowToEnableFrameUI); @@ -842,7 +792,6 @@ NS_IMETHODIMP nsPrintSettings::SetHowToEnableFrameUI(int16_t aHowToEnableFrameUI return NS_OK; } -/* attribute long isCancelled; */ NS_IMETHODIMP nsPrintSettings::GetIsCancelled(bool *aIsCancelled) { NS_ENSURE_ARG_POINTER(aIsCancelled); @@ -855,7 +804,6 @@ NS_IMETHODIMP nsPrintSettings::SetIsCancelled(bool aIsCancelled) return NS_OK; } -/* attribute double paperWidth; */ NS_IMETHODIMP nsPrintSettings::GetPaperWidth(double *aPaperWidth) { NS_ENSURE_ARG_POINTER(aPaperWidth); @@ -871,7 +819,6 @@ NS_IMETHODIMP nsPrintSettings::SetPaperWidth(double aPaperWidth) return NS_OK; } -/* attribute double paperHeight; */ NS_IMETHODIMP nsPrintSettings::GetPaperHeight(double *aPaperHeight) { NS_ENSURE_ARG_POINTER(aPaperHeight); @@ -887,7 +834,6 @@ NS_IMETHODIMP nsPrintSettings::SetPaperHeight(double aPaperHeight) return NS_OK; } -/* attribute short PaperSizeUnit; */ NS_IMETHODIMP nsPrintSettings::GetPaperSizeUnit(int16_t *aPaperSizeUnit) { NS_ENSURE_ARG_POINTER(aPaperSizeUnit); @@ -900,7 +846,6 @@ NS_IMETHODIMP nsPrintSettings::SetPaperSizeUnit(int16_t aPaperSizeUnit) return NS_OK; } -/* attribute short PaperSizeType; */ NS_IMETHODIMP nsPrintSettings::GetPaperSizeType(int16_t *aPaperSizeType) { NS_ENSURE_ARG_POINTER(aPaperSizeType); @@ -913,7 +858,6 @@ NS_IMETHODIMP nsPrintSettings::SetPaperSizeType(int16_t aPaperSizeType) return NS_OK; } -/* attribute short PaperData; */ NS_IMETHODIMP nsPrintSettings::GetPaperData(int16_t *aPaperData) { NS_ENSURE_ARG_POINTER(aPaperData); @@ -1036,7 +980,6 @@ nsPrintSettings::_Clone(nsIPrintSettings **_retval) return NS_OK; } -/* nsIPrintSettings clone (); */ NS_IMETHODIMP nsPrintSettings::Clone(nsIPrintSettings **_retval) { @@ -1044,7 +987,6 @@ nsPrintSettings::Clone(nsIPrintSettings **_retval) return _Clone(_retval); } -/* void assign (in nsIPrintSettings aPS); */ nsresult nsPrintSettings::_Assign(nsIPrintSettings *aPS) { @@ -1053,7 +995,6 @@ nsPrintSettings::_Assign(nsIPrintSettings *aPS) return NS_OK; } -/* void assign (in nsIPrintSettings aPS); */ NS_IMETHODIMP nsPrintSettings::Assign(nsIPrintSettings *aPS) { diff --git a/widget/qt/GfxInfo.cpp b/widget/qt/GfxInfo.cpp index 6e34c073e28..1a506831faa 100644 --- a/widget/qt/GfxInfo.cpp +++ b/widget/qt/GfxInfo.cpp @@ -21,21 +21,18 @@ GfxInfo::GetDWriteEnabled(bool *aEnabled) return NS_ERROR_FAILURE; } -/* readonly attribute DOMString DWriteVersion; */ NS_IMETHODIMP GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString cleartypeParameters; */ NS_IMETHODIMP GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDescription; */ NS_IMETHODIMP GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription) { @@ -43,14 +40,12 @@ GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription) return NS_OK; } -/* readonly attribute DOMString adapterDescription2; */ NS_IMETHODIMP GfxInfo::GetAdapterDescription2(nsAString & aAdapterDescription) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterRAM; */ NS_IMETHODIMP GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM) { @@ -58,14 +53,12 @@ GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM) return NS_OK; } -/* readonly attribute DOMString adapterRAM2; */ NS_IMETHODIMP GfxInfo::GetAdapterRAM2(nsAString & aAdapterRAM) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriver; */ NS_IMETHODIMP GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver) { @@ -73,14 +66,12 @@ GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver) return NS_OK; } -/* readonly attribute DOMString adapterDriver2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriver2(nsAString & aAdapterDriver) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriverVersion; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion) { @@ -88,14 +79,12 @@ GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion) return NS_OK; } -/* readonly attribute DOMString adapterDriverVersion2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriverDate; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate) { @@ -103,14 +92,12 @@ GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate) return NS_OK; } -/* readonly attribute DOMString adapterDriverDate2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverDate2(nsAString & aAdapterDriverDate) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterVendorID; */ NS_IMETHODIMP GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID) { @@ -118,14 +105,12 @@ GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID) return NS_OK; } -/* readonly attribute DOMString adapterVendorID2; */ NS_IMETHODIMP GfxInfo::GetAdapterVendorID2(nsAString & aAdapterVendorID) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDeviceID; */ NS_IMETHODIMP GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID) { @@ -133,28 +118,24 @@ GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID) return NS_OK; } -/* readonly attribute DOMString adapterDeviceID2; */ NS_IMETHODIMP GfxInfo::GetAdapterDeviceID2(nsAString & aAdapterDeviceID) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterSubsysID; */ NS_IMETHODIMP GfxInfo::GetAdapterSubsysID(nsAString & aAdapterSubsysID) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterSubsysID2; */ NS_IMETHODIMP GfxInfo::GetAdapterSubsysID2(nsAString & aAdapterSubsysID) { return NS_ERROR_FAILURE; } -/* readonly attribute boolean isGPU2Active; */ NS_IMETHODIMP GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active) { @@ -189,25 +170,21 @@ GfxInfo::GetFeatureStatusImpl(int32_t /*aFeature*/, // Implement nsIGfxInfoDebug -/* void spoofVendorID (in DOMString aVendorID); */ NS_IMETHODIMP GfxInfo::SpoofVendorID(const nsAString &) { return NS_OK; } -/* void spoofDeviceID (in unsigned long aDeviceID); */ NS_IMETHODIMP GfxInfo::SpoofDeviceID(const nsAString &) { return NS_OK; } -/* void spoofDriverVersion (in DOMString aDriverVersion); */ NS_IMETHODIMP GfxInfo::SpoofDriverVersion(const nsAString &) { return NS_OK; } -/* void spoofOSVersion (in unsigned long aVersion); */ NS_IMETHODIMP GfxInfo::SpoofOSVersion(uint32_t) { return NS_OK; diff --git a/widget/uikit/GfxInfo.cpp b/widget/uikit/GfxInfo.cpp index 50100a17fae..9f605ebead9 100644 --- a/widget/uikit/GfxInfo.cpp +++ b/widget/uikit/GfxInfo.cpp @@ -34,105 +34,90 @@ GfxInfo::GetDWriteEnabled(bool *aEnabled) return NS_ERROR_FAILURE; } -/* readonly attribute DOMString DWriteVersion; */ NS_IMETHODIMP GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString cleartypeParameters; */ NS_IMETHODIMP GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDescription; */ NS_IMETHODIMP GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDescription2; */ NS_IMETHODIMP GfxInfo::GetAdapterDescription2(nsAString & aAdapterDescription) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterRAM; */ NS_IMETHODIMP GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterRAM2; */ NS_IMETHODIMP GfxInfo::GetAdapterRAM2(nsAString & aAdapterRAM) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriver; */ NS_IMETHODIMP GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriver2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriver2(nsAString & aAdapterDriver) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriverVersion; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriverVersion2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriverDate; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDriverDate2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverDate2(nsAString & aAdapterDriverDate) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterVendorID; */ NS_IMETHODIMP GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterVendorID2; */ NS_IMETHODIMP GfxInfo::GetAdapterVendorID2(nsAString & aAdapterVendorID) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterDeviceID; */ NS_IMETHODIMP GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID) { @@ -140,28 +125,24 @@ GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID) return NS_OK; } -/* readonly attribute DOMString adapterDeviceID2; */ NS_IMETHODIMP GfxInfo::GetAdapterDeviceID2(nsAString & aAdapterDeviceID) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterSubsysID; */ NS_IMETHODIMP GfxInfo::GetAdapterSubsysID(nsAString & aAdapterSubsysID) { return NS_ERROR_FAILURE; } -/* readonly attribute DOMString adapterSubsysID2; */ NS_IMETHODIMP GfxInfo::GetAdapterSubsysID2(nsAString & aAdapterSubsysID) { return NS_ERROR_FAILURE; } -/* readonly attribute boolean isGPU2Active; */ NS_IMETHODIMP GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active) { @@ -211,25 +192,21 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature, // Implement nsIGfxInfoDebug -/* void spoofVendorID (in DOMString aVendorID); */ NS_IMETHODIMP GfxInfo::SpoofVendorID(const nsAString & aVendorID) { return NS_ERROR_FAILURE; } -/* void spoofDeviceID (in unsigned long aDeviceID); */ NS_IMETHODIMP GfxInfo::SpoofDeviceID(const nsAString & aDeviceID) { return NS_ERROR_FAILURE; } -/* void spoofDriverVersion (in DOMString aDriverVersion); */ NS_IMETHODIMP GfxInfo::SpoofDriverVersion(const nsAString & aDriverVersion) { return NS_ERROR_FAILURE; } -/* void spoofOSVersion (in unsigned long aVersion); */ NS_IMETHODIMP GfxInfo::SpoofOSVersion(uint32_t aVersion) { return NS_ERROR_FAILURE; diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp index 185627def70..046acafddf4 100644 --- a/widget/windows/GfxInfo.cpp +++ b/widget/windows/GfxInfo.cpp @@ -59,7 +59,6 @@ GfxInfo::GetDWriteEnabled(bool *aEnabled) return NS_OK; } -/* readonly attribute DOMString DWriteVersion; */ NS_IMETHODIMP GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion) { @@ -70,7 +69,6 @@ GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion) #define PIXEL_STRUCT_RGB 1 #define PIXEL_STRUCT_BGR 2 -/* readonly attribute DOMString cleartypeParameters; */ NS_IMETHODIMP GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams) { @@ -569,7 +567,6 @@ GfxInfo::Init() return rv; } -/* readonly attribute DOMString adapterDescription; */ NS_IMETHODIMP GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription) { @@ -577,7 +574,6 @@ GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription) return NS_OK; } -/* readonly attribute DOMString adapterDescription2; */ NS_IMETHODIMP GfxInfo::GetAdapterDescription2(nsAString & aAdapterDescription) { @@ -585,7 +581,6 @@ GfxInfo::GetAdapterDescription2(nsAString & aAdapterDescription) return NS_OK; } -/* readonly attribute DOMString adapterRAM; */ NS_IMETHODIMP GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM) { @@ -594,7 +589,6 @@ GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM) return NS_OK; } -/* readonly attribute DOMString adapterRAM2; */ NS_IMETHODIMP GfxInfo::GetAdapterRAM2(nsAString & aAdapterRAM) { @@ -606,7 +600,6 @@ GfxInfo::GetAdapterRAM2(nsAString & aAdapterRAM) return NS_OK; } -/* readonly attribute DOMString adapterDriver; */ NS_IMETHODIMP GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver) { @@ -615,7 +608,6 @@ GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver) return NS_OK; } -/* readonly attribute DOMString adapterDriver2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriver2(nsAString & aAdapterDriver) { @@ -627,7 +619,6 @@ GfxInfo::GetAdapterDriver2(nsAString & aAdapterDriver) return NS_OK; } -/* readonly attribute DOMString adapterDriverVersion; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion) { @@ -635,7 +626,6 @@ GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion) return NS_OK; } -/* readonly attribute DOMString adapterDriverDate; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate) { @@ -643,7 +633,6 @@ GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate) return NS_OK; } -/* readonly attribute DOMString adapterDriverVersion2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion) { @@ -651,7 +640,6 @@ GfxInfo::GetAdapterDriverVersion2(nsAString & aAdapterDriverVersion) return NS_OK; } -/* readonly attribute DOMString adapterDriverDate2; */ NS_IMETHODIMP GfxInfo::GetAdapterDriverDate2(nsAString & aAdapterDriverDate) { @@ -659,7 +647,6 @@ GfxInfo::GetAdapterDriverDate2(nsAString & aAdapterDriverDate) return NS_OK; } -/* readonly attribute DOMString adapterVendorID; */ NS_IMETHODIMP GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID) { @@ -667,7 +654,6 @@ GfxInfo::GetAdapterVendorID(nsAString & aAdapterVendorID) return NS_OK; } -/* readonly attribute DOMString adapterVendorID2; */ NS_IMETHODIMP GfxInfo::GetAdapterVendorID2(nsAString & aAdapterVendorID) { @@ -675,7 +661,6 @@ GfxInfo::GetAdapterVendorID2(nsAString & aAdapterVendorID) return NS_OK; } -/* readonly attribute DOMString adapterDeviceID; */ NS_IMETHODIMP GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID) { @@ -683,7 +668,6 @@ GfxInfo::GetAdapterDeviceID(nsAString & aAdapterDeviceID) return NS_OK; } -/* readonly attribute DOMString adapterDeviceID2; */ NS_IMETHODIMP GfxInfo::GetAdapterDeviceID2(nsAString & aAdapterDeviceID) { @@ -691,7 +675,6 @@ GfxInfo::GetAdapterDeviceID2(nsAString & aAdapterDeviceID) return NS_OK; } -/* readonly attribute DOMString adapterSubsysID; */ NS_IMETHODIMP GfxInfo::GetAdapterSubsysID(nsAString & aAdapterSubsysID) { @@ -699,7 +682,6 @@ GfxInfo::GetAdapterSubsysID(nsAString & aAdapterSubsysID) return NS_OK; } -/* readonly attribute DOMString adapterSubsysID2; */ NS_IMETHODIMP GfxInfo::GetAdapterSubsysID2(nsAString & aAdapterSubsysID) { @@ -707,7 +689,6 @@ GfxInfo::GetAdapterSubsysID2(nsAString & aAdapterSubsysID) return NS_OK; } -/* readonly attribute boolean isGPU2Active; */ NS_IMETHODIMP GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active) { @@ -733,7 +714,6 @@ CheckForCiscoVPN() { #endif /* interface nsIGfxInfo2 */ -/* readonly attribute DOMString countryCode; */ NS_IMETHODIMP GfxInfo::GetCountryCode(nsAString& aCountryCode) { @@ -1315,28 +1295,24 @@ GfxInfo::DescribeFeatures(JSContext* aCx, JS::Handle aObj) // Implement nsIGfxInfoDebug -/* void spoofVendorID (in DOMString aVendorID); */ NS_IMETHODIMP GfxInfo::SpoofVendorID(const nsAString & aVendorID) { mAdapterVendorID = aVendorID; return NS_OK; } -/* void spoofDeviceID (in unsigned long aDeviceID); */ NS_IMETHODIMP GfxInfo::SpoofDeviceID(const nsAString & aDeviceID) { mAdapterDeviceID = aDeviceID; return NS_OK; } -/* void spoofDriverVersion (in DOMString aDriverVersion); */ NS_IMETHODIMP GfxInfo::SpoofDriverVersion(const nsAString & aDriverVersion) { mDriverVersion = aDriverVersion; return NS_OK; } -/* void spoofOSVersion (in unsigned long aVersion); */ NS_IMETHODIMP GfxInfo::SpoofOSVersion(uint32_t aVersion) { mWindowsVersion = aVersion; diff --git a/widget/windows/JumpListBuilder.cpp b/widget/windows/JumpListBuilder.cpp index d00f8b4aac4..f2a1ba6c771 100644 --- a/widget/windows/JumpListBuilder.cpp +++ b/widget/windows/JumpListBuilder.cpp @@ -74,7 +74,6 @@ JumpListBuilder::~JumpListBuilder() ::CoUninitialize(); } -/* readonly attribute short available; */ NS_IMETHODIMP JumpListBuilder::GetAvailable(int16_t *aAvailable) { *aAvailable = false; @@ -85,7 +84,6 @@ NS_IMETHODIMP JumpListBuilder::GetAvailable(int16_t *aAvailable) return NS_OK; } -/* readonly attribute boolean isListCommitted; */ NS_IMETHODIMP JumpListBuilder::GetIsListCommitted(bool *aCommit) { *aCommit = mHasCommit; @@ -93,7 +91,6 @@ NS_IMETHODIMP JumpListBuilder::GetIsListCommitted(bool *aCommit) return NS_OK; } -/* readonly attribute short maxItems; */ NS_IMETHODIMP JumpListBuilder::GetMaxListItems(int16_t *aMaxItems) { if (!mJumpListMgr) @@ -119,7 +116,6 @@ NS_IMETHODIMP JumpListBuilder::GetMaxListItems(int16_t *aMaxItems) return NS_OK; } -/* boolean initListBuild(in nsIMutableArray removedItems); */ NS_IMETHODIMP JumpListBuilder::InitListBuild(nsIMutableArray *removedItems, bool *_retval) { NS_ENSURE_ARG_POINTER(removedItems); @@ -250,7 +246,6 @@ nsresult JumpListBuilder::RemoveIconCacheForAllItems() return NS_OK; } -/* boolean addListToBuild(in short aCatType, [optional] in nsIArray items, [optional] in AString catName); */ NS_IMETHODIMP JumpListBuilder::AddListToBuild(int16_t aCatType, nsIArray *items, const nsAString &catName, bool *_retval) { nsresult rv; @@ -402,7 +397,6 @@ NS_IMETHODIMP JumpListBuilder::AddListToBuild(int16_t aCatType, nsIArray *items, return NS_OK; } -/* void abortListBuild(); */ NS_IMETHODIMP JumpListBuilder::AbortListBuild() { if (!mJumpListMgr) @@ -414,7 +408,6 @@ NS_IMETHODIMP JumpListBuilder::AbortListBuild() return NS_OK; } -/* boolean commitListBuild(); */ NS_IMETHODIMP JumpListBuilder::CommitListBuild(bool *_retval) { *_retval = false; @@ -434,7 +427,6 @@ NS_IMETHODIMP JumpListBuilder::CommitListBuild(bool *_retval) return NS_OK; } -/* boolean deleteActiveList(); */ NS_IMETHODIMP JumpListBuilder::DeleteActiveList(bool *_retval) { *_retval = false; diff --git a/widget/windows/JumpListItem.cpp b/widget/windows/JumpListItem.cpp index 68bd9ea8795..f4b219db178 100644 --- a/widget/windows/JumpListItem.cpp +++ b/widget/windows/JumpListItem.cpp @@ -43,7 +43,6 @@ NS_IMPL_CYCLE_COLLECTION(JumpListShortcut, mHandlerApp) NS_IMPL_CYCLE_COLLECTING_ADDREF(JumpListShortcut) NS_IMPL_CYCLE_COLLECTING_RELEASE(JumpListShortcut) -/* attribute short type; */ NS_IMETHODIMP JumpListItem::GetType(int16_t *aType) { NS_ENSURE_ARG_POINTER(aType); @@ -53,7 +52,6 @@ NS_IMETHODIMP JumpListItem::GetType(int16_t *aType) return NS_OK; } -/* boolean equals(nsIJumpListItem item); */ NS_IMETHODIMP JumpListItem::Equals(nsIJumpListItem *aItem, bool *aResult) { NS_ENSURE_ARG_POINTER(aItem); @@ -75,7 +73,6 @@ NS_IMETHODIMP JumpListItem::Equals(nsIJumpListItem *aItem, bool *aResult) /* link impl. */ -/* attribute nsIURI uri; */ NS_IMETHODIMP JumpListLink::GetUri(nsIURI **aURI) { NS_IF_ADDREF(*aURI = mURI); @@ -90,7 +87,6 @@ NS_IMETHODIMP JumpListLink::SetUri(nsIURI *aURI) return NS_OK; } -/* attribute AString uriTitle; */ NS_IMETHODIMP JumpListLink::SetUriTitle(const nsAString &aUriTitle) { mUriTitle.Assign(aUriTitle); @@ -105,7 +101,6 @@ NS_IMETHODIMP JumpListLink::GetUriTitle(nsAString& aUriTitle) return NS_OK; } -/* readonly attribute long uriHash; */ NS_IMETHODIMP JumpListLink::GetUriHash(nsACString& aUriHash) { if (!mURI) @@ -114,7 +109,6 @@ NS_IMETHODIMP JumpListLink::GetUriHash(nsACString& aUriHash) return mozilla::widget::FaviconHelper::HashURI(mCryptoHash, mURI, aUriHash); } -/* boolean compareHash(in nsIURI uri); */ NS_IMETHODIMP JumpListLink::CompareHash(nsIURI *aUri, bool *aResult) { nsresult rv; @@ -138,7 +132,6 @@ NS_IMETHODIMP JumpListLink::CompareHash(nsIURI *aUri, bool *aResult) return NS_OK; } -/* boolean equals(nsIJumpListItem item); */ NS_IMETHODIMP JumpListLink::Equals(nsIJumpListItem *aItem, bool *aResult) { NS_ENSURE_ARG_POINTER(aItem); @@ -184,7 +177,6 @@ NS_IMETHODIMP JumpListLink::Equals(nsIJumpListItem *aItem, bool *aResult) /* shortcut impl. */ -/* attribute nsILocalHandlerApp app; */ NS_IMETHODIMP JumpListShortcut::GetApp(nsILocalHandlerApp **aApp) { NS_IF_ADDREF(*aApp = mHandlerApp); @@ -203,7 +195,6 @@ NS_IMETHODIMP JumpListShortcut::SetApp(nsILocalHandlerApp *aApp) return NS_OK; } -/* attribute long iconIndex; */ NS_IMETHODIMP JumpListShortcut::GetIconIndex(int32_t *aIconIndex) { NS_ENSURE_ARG_POINTER(aIconIndex); @@ -218,7 +209,6 @@ NS_IMETHODIMP JumpListShortcut::SetIconIndex(int32_t aIconIndex) return NS_OK; } -/* attribute long iconURI; */ NS_IMETHODIMP JumpListShortcut::GetFaviconPageUri(nsIURI **aFaviconPageURI) { NS_IF_ADDREF(*aFaviconPageURI = mFaviconPageURI); @@ -232,7 +222,6 @@ NS_IMETHODIMP JumpListShortcut::SetFaviconPageUri(nsIURI *aFaviconPageURI) return NS_OK; } -/* boolean equals(nsIJumpListItem item); */ NS_IMETHODIMP JumpListShortcut::Equals(nsIJumpListItem *aItem, bool *aResult) { NS_ENSURE_ARG_POINTER(aItem); diff --git a/widget/windows/WinTaskbar.cpp b/widget/windows/WinTaskbar.cpp index 29b6fa436c5..b5600b352c6 100644 --- a/widget/windows/WinTaskbar.cpp +++ b/widget/windows/WinTaskbar.cpp @@ -316,7 +316,6 @@ WinTaskbar::GetAppUserModelID(nsAString & aDefaultGroupId) { return true; } -/* readonly attribute AString defaultGroupId; */ NS_IMETHODIMP WinTaskbar::GetDefaultGroupId(nsAString & aDefaultGroupId) { if (!GetAppUserModelID(aDefaultGroupId)) @@ -438,7 +437,6 @@ WinTaskbar::GetOverlayIconController(nsIDocShell *shell, return CallQueryInterface(preview, _retval); } -/* nsIJumpListBuilder createJumpListBuilder(); */ NS_IMETHODIMP WinTaskbar::CreateJumpListBuilder(nsIJumpListBuilder * *aJumpListBuilder) { nsresult rv; @@ -456,14 +454,12 @@ WinTaskbar::CreateJumpListBuilder(nsIJumpListBuilder * *aJumpListBuilder) { return NS_OK; } -/* void setGroupIdForWindow (in nsIDOMWindow aParent, in AString aIdentifier); */ NS_IMETHODIMP WinTaskbar::SetGroupIdForWindow(nsIDOMWindow *aParent, const nsAString & aIdentifier) { return SetWindowAppUserModelProp(aParent, nsString(aIdentifier)); } -/* void prepareFullScreen(in nsIDOMWindow aWindow, in boolean aFullScreen); */ NS_IMETHODIMP WinTaskbar::PrepareFullScreen(nsIDOMWindow *aWindow, bool aFullScreen) { NS_ENSURE_ARG_POINTER(aWindow); @@ -475,7 +471,6 @@ WinTaskbar::PrepareFullScreen(nsIDOMWindow *aWindow, bool aFullScreen) { return PrepareFullScreenHWND(toplevelHWND, aFullScreen); } -/* void prepareFullScreen(in voidPtr aWindow, in boolean aFullScreen); */ NS_IMETHODIMP WinTaskbar::PrepareFullScreenHWND(void *aHWND, bool aFullScreen) { if (!Initialize()) diff --git a/widget/windows/nsDeviceContextSpecWin.cpp b/widget/windows/nsDeviceContextSpecWin.cpp index c011faaecd4..a057b749281 100644 --- a/widget/windows/nsDeviceContextSpecWin.cpp +++ b/widget/windows/nsDeviceContextSpecWin.cpp @@ -624,7 +624,6 @@ NS_IMPL_ISUPPORTS(nsPrinterEnumeratorWin, nsIPrinterEnumerator) //---------------------------------------------------------------------------------- // Return the Default Printer name -/* readonly attribute wstring defaultPrinterName; */ NS_IMETHODIMP nsPrinterEnumeratorWin::GetDefaultPrinterName(char16_t * *aDefaultPrinterName) { @@ -635,7 +634,6 @@ nsPrinterEnumeratorWin::GetDefaultPrinterName(char16_t * *aDefaultPrinterName) return NS_OK; } -/* void initPrintSettingsFromPrinter (in wstring aPrinterName, in nsIPrintSettings aPrintSettings); */ NS_IMETHODIMP nsPrinterEnumeratorWin::InitPrintSettingsFromPrinter(const char16_t *aPrinterName, nsIPrintSettings *aPrintSettings) { diff --git a/widget/windows/nsPrintOptionsWin.cpp b/widget/windows/nsPrintOptionsWin.cpp index 6bda837f6d3..b9ef1362acd 100644 --- a/widget/windows/nsPrintOptionsWin.cpp +++ b/widget/windows/nsPrintOptionsWin.cpp @@ -97,7 +97,6 @@ nsPrintOptionsWin::DeserializeToPrintSettings(const PrintData& data, return NS_OK; } -/* nsIPrintSettings CreatePrintSettings (); */ nsresult nsPrintOptionsWin::_CreatePrintSettings(nsIPrintSettings **_retval) { *_retval = nullptr; diff --git a/widget/windows/nsPrintSettingsWin.cpp b/widget/windows/nsPrintSettingsWin.cpp index bf87c9c422c..0408a8b603c 100644 --- a/widget/windows/nsPrintSettingsWin.cpp +++ b/widget/windows/nsPrintSettingsWin.cpp @@ -45,7 +45,6 @@ nsPrintSettingsWin::~nsPrintSettingsWin() if (mDevMode) ::HeapFree(::GetProcessHeap(), 0, mDevMode); } -/* [noscript] attribute charPtr deviceName; */ NS_IMETHODIMP nsPrintSettingsWin::SetDeviceName(const char16_t * aDeviceName) { if (mDeviceName) { @@ -61,7 +60,6 @@ NS_IMETHODIMP nsPrintSettingsWin::GetDeviceName(char16_t **aDeviceName) return NS_OK; } -/* [noscript] attribute charPtr driverName; */ NS_IMETHODIMP nsPrintSettingsWin::SetDriverName(const char16_t * aDriverName) { if (mDriverName) { @@ -88,7 +86,6 @@ void nsPrintSettingsWin::CopyDevMode(DEVMODEW* aInDevMode, DEVMODEW *& aOutDevMo } -/* [noscript] attribute nsDevMode devMode; */ NS_IMETHODIMP nsPrintSettingsWin::GetDevMode(DEVMODEW * *aDevMode) { NS_ENSURE_ARG_POINTER(aDevMode); @@ -158,7 +155,6 @@ nsPrintSettingsWin& nsPrintSettingsWin::operator=(const nsPrintSettingsWin& rhs) } //------------------------------------------- -/* void assign (in nsIPrintSettings aPS); */ nsresult nsPrintSettingsWin::_Assign(nsIPrintSettings *aPS) { diff --git a/xpcom/base/nsMacUtilsImpl.cpp b/xpcom/base/nsMacUtilsImpl.cpp index 37c9099b6f7..e2706047a65 100644 --- a/xpcom/base/nsMacUtilsImpl.cpp +++ b/xpcom/base/nsMacUtilsImpl.cpp @@ -118,7 +118,6 @@ nsMacUtilsImpl::GetArchitecturesInBinary(nsAString& aArchString) return GetArchString(aArchString); } -/* readonly attribute boolean isTranslated; */ // True when running under binary translation (Rosetta). NS_IMETHODIMP nsMacUtilsImpl::GetIsTranslated(bool* aIsTranslated) diff --git a/xpcom/ds/nsVariant.cpp b/xpcom/ds/nsVariant.cpp index 8f41e8fe703..9bd98e2aef2 100644 --- a/xpcom/ds/nsVariant.cpp +++ b/xpcom/ds/nsVariant.cpp @@ -1724,7 +1724,6 @@ nsVariant::nsVariant() // For all the data getters we just forward to the static (and sharable) // 'ConvertTo' functions. -/* readonly attribute uint16_t dataType; */ NS_IMETHODIMP nsVariant::GetDataType(uint16_t* aDataType) { @@ -1732,112 +1731,96 @@ nsVariant::GetDataType(uint16_t* aDataType) return NS_OK; } -/* uint8_t getAsInt8 (); */ NS_IMETHODIMP nsVariant::GetAsInt8(uint8_t* aResult) { return mData.ConvertToInt8(aResult); } -/* int16_t getAsInt16 (); */ NS_IMETHODIMP nsVariant::GetAsInt16(int16_t* aResult) { return mData.ConvertToInt16(aResult); } -/* int32_t getAsInt32 (); */ NS_IMETHODIMP nsVariant::GetAsInt32(int32_t* aResult) { return mData.ConvertToInt32(aResult); } -/* int64_t getAsInt64 (); */ NS_IMETHODIMP nsVariant::GetAsInt64(int64_t* aResult) { return mData.ConvertToInt64(aResult); } -/* uint8_t getAsUint8 (); */ NS_IMETHODIMP nsVariant::GetAsUint8(uint8_t* aResult) { return mData.ConvertToUint8(aResult); } -/* uint16_t getAsUint16 (); */ NS_IMETHODIMP nsVariant::GetAsUint16(uint16_t* aResult) { return mData.ConvertToUint16(aResult); } -/* uint32_t getAsUint32 (); */ NS_IMETHODIMP nsVariant::GetAsUint32(uint32_t* aResult) { return mData.ConvertToUint32(aResult); } -/* uint64_t getAsUint64 (); */ NS_IMETHODIMP nsVariant::GetAsUint64(uint64_t* aResult) { return mData.ConvertToUint64(aResult); } -/* float getAsFloat (); */ NS_IMETHODIMP nsVariant::GetAsFloat(float* aResult) { return mData.ConvertToFloat(aResult); } -/* double getAsDouble (); */ NS_IMETHODIMP nsVariant::GetAsDouble(double* aResult) { return mData.ConvertToDouble(aResult); } -/* bool getAsBool (); */ NS_IMETHODIMP nsVariant::GetAsBool(bool* aResult) { return mData.ConvertToBool(aResult); } -/* char getAsChar (); */ NS_IMETHODIMP nsVariant::GetAsChar(char* aResult) { return mData.ConvertToChar(aResult); } -/* wchar getAsWChar (); */ NS_IMETHODIMP nsVariant::GetAsWChar(char16_t* aResult) { return mData.ConvertToWChar(aResult); } -/* [notxpcom] nsresult getAsID (out nsID retval); */ NS_IMETHODIMP_(nsresult) nsVariant::GetAsID(nsID* aResult) { return mData.ConvertToID(aResult); } -/* AString getAsAString (); */ NS_IMETHODIMP nsVariant::GetAsAString(nsAString& aResult) { return mData.ConvertToAString(aResult); } -/* DOMString getAsDOMString (); */ NS_IMETHODIMP nsVariant::GetAsDOMString(nsAString& aResult) { @@ -1846,42 +1829,36 @@ nsVariant::GetAsDOMString(nsAString& aResult) return mData.ConvertToAString(aResult); } -/* ACString getAsACString (); */ NS_IMETHODIMP nsVariant::GetAsACString(nsACString& aResult) { return mData.ConvertToACString(aResult); } -/* AUTF8String getAsAUTF8String (); */ NS_IMETHODIMP nsVariant::GetAsAUTF8String(nsAUTF8String& aResult) { return mData.ConvertToAUTF8String(aResult); } -/* string getAsString (); */ NS_IMETHODIMP nsVariant::GetAsString(char** aResult) { return mData.ConvertToString(aResult); } -/* wstring getAsWString (); */ NS_IMETHODIMP nsVariant::GetAsWString(char16_t** aResult) { return mData.ConvertToWString(aResult); } -/* nsISupports getAsISupports (); */ NS_IMETHODIMP nsVariant::GetAsISupports(nsISupports** aResult) { return mData.ConvertToISupports(aResult); } -/* jsval getAsJSVal() */ NS_IMETHODIMP nsVariant::GetAsJSVal(JS::MutableHandleValue) { @@ -1889,14 +1866,12 @@ nsVariant::GetAsJSVal(JS::MutableHandleValue) return NS_ERROR_CANNOT_CONVERT_DATA; } -/* void getAsInterface (out nsIIDPtr iid, [iid_is (iid), retval] out nsQIResult iface); */ NS_IMETHODIMP nsVariant::GetAsInterface(nsIID** aIID, void** aInterface) { return mData.ConvertToInterface(aIID, aInterface); } -/* [notxpcom] nsresult getAsArray (out uint16_t type, out nsIID iid, out uint32_t count, out voidPtr ptr); */ NS_IMETHODIMP_(nsresult) nsVariant::GetAsArray(uint16_t* aType, nsIID* aIID, uint32_t* aCount, void** aPtr) @@ -1904,14 +1879,12 @@ nsVariant::GetAsArray(uint16_t* aType, nsIID* aIID, return mData.ConvertToArray(aType, aIID, aCount, aPtr); } -/* void getAsStringWithSize (out uint32_t size, [size_is (size), retval] out string str); */ NS_IMETHODIMP nsVariant::GetAsStringWithSize(uint32_t* aSize, char** aStr) { return mData.ConvertToStringWithSize(aSize, aStr); } -/* void getAsWStringWithSize (out uint32_t size, [size_is (size), retval] out wstring str); */ NS_IMETHODIMP nsVariant::GetAsWStringWithSize(uint32_t* aSize, char16_t** aStr) { @@ -1920,7 +1893,6 @@ nsVariant::GetAsWStringWithSize(uint32_t* aSize, char16_t** aStr) /***************************************************************************/ -/* attribute bool writable; */ NS_IMETHODIMP nsVariant::GetWritable(bool* aWritable) { @@ -1942,7 +1914,6 @@ nsVariant::SetWritable(bool aWritable) // For all the data setters we just forward to the static (and sharable) // 'SetFrom' functions. -/* void setAsInt8 (in uint8_t aValue); */ NS_IMETHODIMP nsVariant::SetAsInt8(uint8_t aValue) { @@ -1952,7 +1923,6 @@ nsVariant::SetAsInt8(uint8_t aValue) return mData.SetFromInt8(aValue); } -/* void setAsInt16 (in int16_t aValue); */ NS_IMETHODIMP nsVariant::SetAsInt16(int16_t aValue) { @@ -1962,7 +1932,6 @@ nsVariant::SetAsInt16(int16_t aValue) return mData.SetFromInt16(aValue); } -/* void setAsInt32 (in int32_t aValue); */ NS_IMETHODIMP nsVariant::SetAsInt32(int32_t aValue) { @@ -1972,7 +1941,6 @@ nsVariant::SetAsInt32(int32_t aValue) return mData.SetFromInt32(aValue); } -/* void setAsInt64 (in int64_t aValue); */ NS_IMETHODIMP nsVariant::SetAsInt64(int64_t aValue) { @@ -1982,7 +1950,6 @@ nsVariant::SetAsInt64(int64_t aValue) return mData.SetFromInt64(aValue); } -/* void setAsUint8 (in uint8_t aValue); */ NS_IMETHODIMP nsVariant::SetAsUint8(uint8_t aValue) { @@ -1992,7 +1959,6 @@ nsVariant::SetAsUint8(uint8_t aValue) return mData.SetFromUint8(aValue); } -/* void setAsUint16 (in uint16_t aValue); */ NS_IMETHODIMP nsVariant::SetAsUint16(uint16_t aValue) { @@ -2002,7 +1968,6 @@ nsVariant::SetAsUint16(uint16_t aValue) return mData.SetFromUint16(aValue); } -/* void setAsUint32 (in uint32_t aValue); */ NS_IMETHODIMP nsVariant::SetAsUint32(uint32_t aValue) { @@ -2012,7 +1977,6 @@ nsVariant::SetAsUint32(uint32_t aValue) return mData.SetFromUint32(aValue); } -/* void setAsUint64 (in uint64_t aValue); */ NS_IMETHODIMP nsVariant::SetAsUint64(uint64_t aValue) { @@ -2022,7 +1986,6 @@ nsVariant::SetAsUint64(uint64_t aValue) return mData.SetFromUint64(aValue); } -/* void setAsFloat (in float aValue); */ NS_IMETHODIMP nsVariant::SetAsFloat(float aValue) { @@ -2032,7 +1995,6 @@ nsVariant::SetAsFloat(float aValue) return mData.SetFromFloat(aValue); } -/* void setAsDouble (in double aValue); */ NS_IMETHODIMP nsVariant::SetAsDouble(double aValue) { @@ -2042,7 +2004,6 @@ nsVariant::SetAsDouble(double aValue) return mData.SetFromDouble(aValue); } -/* void setAsBool (in bool aValue); */ NS_IMETHODIMP nsVariant::SetAsBool(bool aValue) { @@ -2052,7 +2013,6 @@ nsVariant::SetAsBool(bool aValue) return mData.SetFromBool(aValue); } -/* void setAsChar (in char aValue); */ NS_IMETHODIMP nsVariant::SetAsChar(char aValue) { @@ -2062,7 +2022,6 @@ nsVariant::SetAsChar(char aValue) return mData.SetFromChar(aValue); } -/* void setAsWChar (in wchar aValue); */ NS_IMETHODIMP nsVariant::SetAsWChar(char16_t aValue) { @@ -2072,7 +2031,6 @@ nsVariant::SetAsWChar(char16_t aValue) return mData.SetFromWChar(aValue); } -/* void setAsID (in nsIDRef aValue); */ NS_IMETHODIMP nsVariant::SetAsID(const nsID& aValue) { @@ -2082,7 +2040,6 @@ nsVariant::SetAsID(const nsID& aValue) return mData.SetFromID(aValue); } -/* void setAsAString (in AString aValue); */ NS_IMETHODIMP nsVariant::SetAsAString(const nsAString& aValue) { @@ -2092,7 +2049,6 @@ nsVariant::SetAsAString(const nsAString& aValue) return mData.SetFromAString(aValue); } -/* void setAsDOMString (in DOMString aValue); */ NS_IMETHODIMP nsVariant::SetAsDOMString(const nsAString& aValue) { @@ -2103,7 +2059,6 @@ nsVariant::SetAsDOMString(const nsAString& aValue) return mData.SetFromDOMString(aValue); } -/* void setAsACString (in ACString aValue); */ NS_IMETHODIMP nsVariant::SetAsACString(const nsACString& aValue) { @@ -2113,7 +2068,6 @@ nsVariant::SetAsACString(const nsACString& aValue) return mData.SetFromACString(aValue); } -/* void setAsAUTF8String (in AUTF8String aValue); */ NS_IMETHODIMP nsVariant::SetAsAUTF8String(const nsAUTF8String& aValue) { @@ -2123,7 +2077,6 @@ nsVariant::SetAsAUTF8String(const nsAUTF8String& aValue) return mData.SetFromAUTF8String(aValue); } -/* void setAsString (in string aValue); */ NS_IMETHODIMP nsVariant::SetAsString(const char* aValue) { @@ -2133,7 +2086,6 @@ nsVariant::SetAsString(const char* aValue) return mData.SetFromString(aValue); } -/* void setAsWString (in wstring aValue); */ NS_IMETHODIMP nsVariant::SetAsWString(const char16_t* aValue) { @@ -2143,7 +2095,6 @@ nsVariant::SetAsWString(const char16_t* aValue) return mData.SetFromWString(aValue); } -/* void setAsISupports (in nsISupports aValue); */ NS_IMETHODIMP nsVariant::SetAsISupports(nsISupports* aValue) { @@ -2153,7 +2104,6 @@ nsVariant::SetAsISupports(nsISupports* aValue) return mData.SetFromISupports(aValue); } -/* void setAsInterface (in nsIIDRef iid, [iid_is (iid)] in nsQIResult iface); */ NS_IMETHODIMP nsVariant::SetAsInterface(const nsIID& aIID, void* aInterface) { @@ -2163,7 +2113,6 @@ nsVariant::SetAsInterface(const nsIID& aIID, void* aInterface) return mData.SetFromInterface(aIID, (nsISupports*)aInterface); } -/* [noscript] void setAsArray (in uint16_t type, in nsIIDPtr iid, in uint32_t count, in voidPtr ptr); */ NS_IMETHODIMP nsVariant::SetAsArray(uint16_t aType, const nsIID* aIID, uint32_t aCount, void* aPtr) @@ -2174,7 +2123,6 @@ nsVariant::SetAsArray(uint16_t aType, const nsIID* aIID, return mData.SetFromArray(aType, aIID, aCount, aPtr); } -/* void setAsStringWithSize (in uint32_t size, [size_is (size)] in string str); */ NS_IMETHODIMP nsVariant::SetAsStringWithSize(uint32_t aSize, const char* aStr) { @@ -2184,7 +2132,6 @@ nsVariant::SetAsStringWithSize(uint32_t aSize, const char* aStr) return mData.SetFromStringWithSize(aSize, aStr); } -/* void setAsWStringWithSize (in uint32_t size, [size_is (size)] in wstring str); */ NS_IMETHODIMP nsVariant::SetAsWStringWithSize(uint32_t aSize, const char16_t* aStr) { @@ -2194,7 +2141,6 @@ nsVariant::SetAsWStringWithSize(uint32_t aSize, const char16_t* aStr) return mData.SetFromWStringWithSize(aSize, aStr); } -/* void setAsVoid (); */ NS_IMETHODIMP nsVariant::SetAsVoid() { @@ -2204,7 +2150,6 @@ nsVariant::SetAsVoid() return mData.SetToVoid(); } -/* void setAsEmpty (); */ NS_IMETHODIMP nsVariant::SetAsEmpty() { @@ -2214,7 +2159,6 @@ nsVariant::SetAsEmpty() return mData.SetToEmpty(); } -/* void setAsEmptyArray (); */ NS_IMETHODIMP nsVariant::SetAsEmptyArray() { @@ -2224,7 +2168,6 @@ nsVariant::SetAsEmptyArray() return mData.SetToEmptyArray(); } -/* void setFromVariant (in nsIVariant aValue); */ NS_IMETHODIMP nsVariant::SetFromVariant(nsIVariant* aValue) { diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp index 1be3fed1744..3110773aa1e 100644 --- a/xpcom/io/nsLocalFileWin.cpp +++ b/xpcom/io/nsLocalFileWin.cpp @@ -3192,7 +3192,6 @@ nsLocalFile::GetTarget(nsAString& aResult) } -/* attribute bool followLinks; */ NS_IMETHODIMP nsLocalFile::GetFollowLinks(bool* aFollowLinks) { @@ -3254,7 +3253,6 @@ nsLocalFile::SetPersistentDescriptor(const nsACString& aPersistentDescriptor) } } -/* attrib unsigned long fileAttributesWin; */ NS_IMETHODIMP nsLocalFile::GetFileAttributesWin(uint32_t* aAttribs) { diff --git a/xpcom/io/nsMultiplexInputStream.cpp b/xpcom/io/nsMultiplexInputStream.cpp index 5f730db8fb9..5926458d492 100644 --- a/xpcom/io/nsMultiplexInputStream.cpp +++ b/xpcom/io/nsMultiplexInputStream.cpp @@ -133,7 +133,6 @@ nsMultiplexInputStream::nsMultiplexInputStream() { } -/* readonly attribute unsigned long count; */ NS_IMETHODIMP nsMultiplexInputStream::GetCount(uint32_t* aCount) { @@ -155,7 +154,6 @@ SeekableStreamAtBeginning(nsIInputStream* aStream) } #endif -/* void appendStream (in nsIInputStream stream); */ NS_IMETHODIMP nsMultiplexInputStream::AppendStream(nsIInputStream* aStream) { @@ -165,7 +163,6 @@ nsMultiplexInputStream::AppendStream(nsIInputStream* aStream) return mStreams.AppendElement(aStream) ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -/* void insertStream (in nsIInputStream stream, in unsigned long index); */ NS_IMETHODIMP nsMultiplexInputStream::InsertStream(nsIInputStream* aStream, uint32_t aIndex) { @@ -180,7 +177,6 @@ nsMultiplexInputStream::InsertStream(nsIInputStream* aStream, uint32_t aIndex) return NS_OK; } -/* void removeStream (in unsigned long index); */ NS_IMETHODIMP nsMultiplexInputStream::RemoveStream(uint32_t aIndex) { @@ -195,7 +191,6 @@ nsMultiplexInputStream::RemoveStream(uint32_t aIndex) return NS_OK; } -/* nsIInputStream getStream (in unsigned long index); */ NS_IMETHODIMP nsMultiplexInputStream::GetStream(uint32_t aIndex, nsIInputStream** aResult) { @@ -209,7 +204,6 @@ nsMultiplexInputStream::GetStream(uint32_t aIndex, nsIInputStream** aResult) return NS_OK; } -/* void close (); */ NS_IMETHODIMP nsMultiplexInputStream::Close() { @@ -229,7 +223,6 @@ nsMultiplexInputStream::Close() return rv; } -/* unsigned long long available (); */ NS_IMETHODIMP nsMultiplexInputStream::Available(uint64_t* aResult) { @@ -254,7 +247,6 @@ nsMultiplexInputStream::Available(uint64_t* aResult) return NS_OK; } -/* [noscript] unsigned long read (in charPtr buf, in unsigned long count); */ NS_IMETHODIMP nsMultiplexInputStream::Read(char* aBuf, uint32_t aCount, uint32_t* aResult) { @@ -385,7 +377,6 @@ nsMultiplexInputStream::ReadSegCb(nsIInputStream* aIn, void* aClosure, return rv; } -/* readonly attribute boolean nonBlocking; */ NS_IMETHODIMP nsMultiplexInputStream::IsNonBlocking(bool* aNonBlocking) { @@ -415,7 +406,6 @@ nsMultiplexInputStream::IsNonBlocking(bool* aNonBlocking) return NS_OK; } -/* void seek (in int32_t whence, in int32_t offset); */ NS_IMETHODIMP nsMultiplexInputStream::Seek(int32_t aWhence, int64_t aOffset) { @@ -658,7 +648,6 @@ nsMultiplexInputStream::Seek(int32_t aWhence, int64_t aOffset) return NS_ERROR_NOT_IMPLEMENTED; } -/* uint32_t tell (); */ NS_IMETHODIMP nsMultiplexInputStream::Tell(int64_t* aResult) { @@ -690,7 +679,6 @@ nsMultiplexInputStream::Tell(int64_t* aResult) return NS_OK; } -/* void setEOF (); */ NS_IMETHODIMP nsMultiplexInputStream::SetEOF() { diff --git a/xpcom/io/nsScriptableBase64Encoder.cpp b/xpcom/io/nsScriptableBase64Encoder.cpp index 2b26e7726e6..a8ffce8cd00 100644 --- a/xpcom/io/nsScriptableBase64Encoder.cpp +++ b/xpcom/io/nsScriptableBase64Encoder.cpp @@ -11,7 +11,6 @@ using namespace mozilla; NS_IMPL_ISUPPORTS(nsScriptableBase64Encoder, nsIScriptableBase64Encoder) -/* ACString encodeToCString (in nsIInputStream stream, in unsigned long length); */ NS_IMETHODIMP nsScriptableBase64Encoder::EncodeToCString(nsIInputStream* aStream, uint32_t aLength, @@ -20,7 +19,6 @@ nsScriptableBase64Encoder::EncodeToCString(nsIInputStream* aStream, return Base64EncodeInputStream(aStream, aResult, aLength); } -/* AString encodeToString (in nsIInputStream stream, in unsigned long length); */ NS_IMETHODIMP nsScriptableBase64Encoder::EncodeToString(nsIInputStream* aStream, uint32_t aLength, diff --git a/xpcom/reflect/xptinfo/xptiInterfaceInfo.cpp b/xpcom/reflect/xptinfo/xptiInterfaceInfo.cpp index 0ce7ce52228..db92c3c3ed4 100644 --- a/xpcom/reflect/xptinfo/xptiInterfaceInfo.cpp +++ b/xpcom/reflect/xptinfo/xptiInterfaceInfo.cpp @@ -603,7 +603,6 @@ xptiInterfaceEntry::GetInterfaceIsArgNumberForParam(uint16_t methodIndex, return NS_OK; } -/* bool isIID (in nsIIDPtr IID); */ nsresult xptiInterfaceEntry::IsIID(const nsIID * IID, bool *_retval) { @@ -612,7 +611,6 @@ xptiInterfaceEntry::IsIID(const nsIID * IID, bool *_retval) return NS_OK; } -/* void getNameShared ([shared, retval] out string name); */ nsresult xptiInterfaceEntry::GetNameShared(const char **name) { @@ -621,7 +619,6 @@ xptiInterfaceEntry::GetNameShared(const char **name) return NS_OK; } -/* void getIIDShared ([shared, retval] out nsIIDPtrShared iid); */ nsresult xptiInterfaceEntry::GetIIDShared(const nsIID * *iid) { @@ -630,7 +627,6 @@ xptiInterfaceEntry::GetIIDShared(const nsIID * *iid) return NS_OK; } -/* bool hasAncestor (in nsIIDPtr iid); */ nsresult xptiInterfaceEntry::HasAncestor(const nsIID * iid, bool *_retval) { diff --git a/xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp b/xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp index 044ef09aa67..44a14c982b4 100644 --- a/xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp +++ b/xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp @@ -202,7 +202,6 @@ XPTInterfaceInfoManager::GetInterfaceEntryForIID(const nsIID *iid) return mWorkingSet.mIIDTable.Get(*iid); } -/* nsIInterfaceInfo getInfoForIID (in nsIIDPtr iid); */ NS_IMETHODIMP XPTInterfaceInfoManager::GetInfoForIID(const nsIID * iid, nsIInterfaceInfo **_retval) { @@ -214,7 +213,6 @@ XPTInterfaceInfoManager::GetInfoForIID(const nsIID * iid, nsIInterfaceInfo **_re return EntryToInfo(entry, _retval); } -/* nsIInterfaceInfo getInfoForName (in string name); */ NS_IMETHODIMP XPTInterfaceInfoManager::GetInfoForName(const char *name, nsIInterfaceInfo **_retval) { @@ -226,7 +224,6 @@ XPTInterfaceInfoManager::GetInfoForName(const char *name, nsIInterfaceInfo **_re return EntryToInfo(entry, _retval); } -/* nsIIDPtr getIIDForName (in string name); */ NS_IMETHODIMP XPTInterfaceInfoManager::GetIIDForName(const char *name, nsIID * *_retval) { @@ -243,7 +240,6 @@ XPTInterfaceInfoManager::GetIIDForName(const char *name, nsIID * *_retval) return entry->GetIID(_retval); } -/* string getNameForIID (in nsIIDPtr iid); */ NS_IMETHODIMP XPTInterfaceInfoManager::GetNameForIID(const nsIID * iid, char **_retval) { @@ -260,7 +256,6 @@ XPTInterfaceInfoManager::GetNameForIID(const nsIID * iid, char **_retval) return entry->GetName(_retval); } -/* nsIEnumerator enumerateInterfaces (); */ void XPTInterfaceInfoManager::GetScriptableInterfaces(nsCOMArray& aInterfaces) { @@ -280,7 +275,6 @@ XPTInterfaceInfoManager::GetScriptableInterfaces(nsCOMArray& a } } -/* nsIEnumerator enumerateInterfacesWhoseNamesStartWith (in string prefix); */ NS_IMETHODIMP XPTInterfaceInfoManager::EnumerateInterfacesWhoseNamesStartWith(const char *prefix, nsIEnumerator **_retval) { @@ -305,7 +299,6 @@ XPTInterfaceInfoManager::EnumerateInterfacesWhoseNamesStartWith(const char *pref return array->Enumerate(_retval); } -/* void autoRegisterInterfaces (); */ NS_IMETHODIMP XPTInterfaceInfoManager::AutoRegisterInterfaces() { diff --git a/xpcom/threads/TimerThread.cpp b/xpcom/threads/TimerThread.cpp index 759ebf71d72..4e31a1d648e 100644 --- a/xpcom/threads/TimerThread.cpp +++ b/xpcom/threads/TimerThread.cpp @@ -393,7 +393,6 @@ struct IntervalComparator } // namespace -/* void Run(); */ NS_IMETHODIMP TimerThread::Run() { @@ -790,7 +789,6 @@ TimerThread::DoAfterSleep() } -/* void observe (in nsISupports aSubject, in string aTopic, in wstring aData); */ NS_IMETHODIMP TimerThread::Observe(nsISupports* /* aSubject */, const char* aTopic, const char16_t* /* aData */) diff --git a/xpfe/components/windowds/nsWindowDataSource.cpp b/xpfe/components/windowds/nsWindowDataSource.cpp index 85287297fbc..519b7089f80 100644 --- a/xpfe/components/windowds/nsWindowDataSource.cpp +++ b/xpfe/components/windowds/nsWindowDataSource.cpp @@ -119,7 +119,6 @@ NS_INTERFACE_MAP_END // handle notifications from the window mediator and reflect them into // RDF -/* void onWindowTitleChange (in nsIXULWindow window, in wstring newTitle); */ NS_IMETHODIMP nsWindowDataSource::OnWindowTitleChange(nsIXULWindow *window, const char16_t *newTitle) @@ -162,7 +161,6 @@ nsWindowDataSource::OnWindowTitleChange(nsIXULWindow *window, return NS_OK; } -/* void onOpenWindow (in nsIXULWindow window); */ NS_IMETHODIMP nsWindowDataSource::OnOpenWindow(nsIXULWindow *window) { @@ -181,7 +179,6 @@ nsWindowDataSource::OnOpenWindow(nsIXULWindow *window) return NS_OK; } -/* void onCloseWindow (in nsIXULWindow window); */ NS_IMETHODIMP nsWindowDataSource::OnCloseWindow(nsIXULWindow *window) { @@ -327,7 +324,6 @@ nsWindowDataSource::GetWindowForResource(const char *aResourceString, // GetTarget() - need to handle kNC_KeyIndex -/* readonly attribute string URI; */ NS_IMETHODIMP nsWindowDataSource::GetURI(char * *aURI) { NS_ENSURE_ARG_POINTER(aURI); @@ -340,7 +336,6 @@ NS_IMETHODIMP nsWindowDataSource::GetURI(char * *aURI) return NS_OK; } -/* nsIRDFNode GetTarget (in nsIRDFResource aSource, in nsIRDFResource aProperty, in boolean aTruthValue); */ NS_IMETHODIMP nsWindowDataSource::GetTarget(nsIRDFResource *aSource, nsIRDFResource *aProperty, bool aTruthValue, nsIRDFNode **_retval) { NS_ENSURE_ARG_POINTER(_retval); @@ -371,7 +366,6 @@ NS_IMETHODIMP nsWindowDataSource::GetTarget(nsIRDFResource *aSource, nsIRDFResou return mInner->GetTarget(aSource, aProperty, aTruthValue, _retval); } -/* nsIRDFResource GetSource (in nsIRDFResource aProperty, in nsIRDFNode aTarget, in boolean aTruthValue); */ NS_IMETHODIMP nsWindowDataSource::GetSource(nsIRDFResource *aProperty, nsIRDFNode *aTarget, bool aTruthValue, nsIRDFResource **_retval) { if (mInner) @@ -379,7 +373,6 @@ NS_IMETHODIMP nsWindowDataSource::GetSource(nsIRDFResource *aProperty, nsIRDFNod return NS_OK; } -/* nsISimpleEnumerator GetSources (in nsIRDFResource aProperty, in nsIRDFNode aTarget, in boolean aTruthValue); */ NS_IMETHODIMP nsWindowDataSource::GetSources(nsIRDFResource *aProperty, nsIRDFNode *aTarget, bool aTruthValue, nsISimpleEnumerator **_retval) { if (mInner) @@ -387,7 +380,6 @@ NS_IMETHODIMP nsWindowDataSource::GetSources(nsIRDFResource *aProperty, nsIRDFNo return NS_OK; } -/* nsISimpleEnumerator GetTargets (in nsIRDFResource aSource, in nsIRDFResource aProperty, in boolean aTruthValue); */ NS_IMETHODIMP nsWindowDataSource::GetTargets(nsIRDFResource *aSource, nsIRDFResource *aProperty, bool aTruthValue, nsISimpleEnumerator **_retval) { if (mInner) @@ -395,7 +387,6 @@ NS_IMETHODIMP nsWindowDataSource::GetTargets(nsIRDFResource *aSource, nsIRDFReso return NS_OK; } -/* void Assert (in nsIRDFResource aSource, in nsIRDFResource aProperty, in nsIRDFNode aTarget, in boolean aTruthValue); */ NS_IMETHODIMP nsWindowDataSource::Assert(nsIRDFResource *aSource, nsIRDFResource *aProperty, nsIRDFNode *aTarget, bool aTruthValue) { if (mInner) @@ -403,7 +394,6 @@ NS_IMETHODIMP nsWindowDataSource::Assert(nsIRDFResource *aSource, nsIRDFResource return NS_OK; } -/* void Unassert (in nsIRDFResource aSource, in nsIRDFResource aProperty, in nsIRDFNode aTarget); */ NS_IMETHODIMP nsWindowDataSource::Unassert(nsIRDFResource *aSource, nsIRDFResource *aProperty, nsIRDFNode *aTarget) { if (mInner) @@ -411,7 +401,6 @@ NS_IMETHODIMP nsWindowDataSource::Unassert(nsIRDFResource *aSource, nsIRDFResour return NS_OK; } -/* void Change (in nsIRDFResource aSource, in nsIRDFResource aProperty, in nsIRDFNode aOldTarget, in nsIRDFNode aNewTarget); */ NS_IMETHODIMP nsWindowDataSource::Change(nsIRDFResource *aSource, nsIRDFResource *aProperty, nsIRDFNode *aOldTarget, nsIRDFNode *aNewTarget) { if (mInner) @@ -419,7 +408,6 @@ NS_IMETHODIMP nsWindowDataSource::Change(nsIRDFResource *aSource, nsIRDFResource return NS_OK; } -/* void Move (in nsIRDFResource aOldSource, in nsIRDFResource aNewSource, in nsIRDFResource aProperty, in nsIRDFNode aTarget); */ NS_IMETHODIMP nsWindowDataSource::Move(nsIRDFResource *aOldSource, nsIRDFResource *aNewSource, nsIRDFResource *aProperty, nsIRDFNode *aTarget) { if (mInner) @@ -427,7 +415,6 @@ NS_IMETHODIMP nsWindowDataSource::Move(nsIRDFResource *aOldSource, nsIRDFResourc return NS_OK; } -/* boolean HasAssertion (in nsIRDFResource aSource, in nsIRDFResource aProperty, in nsIRDFNode aTarget, in boolean aTruthValue); */ NS_IMETHODIMP nsWindowDataSource::HasAssertion(nsIRDFResource *aSource, nsIRDFResource *aProperty, nsIRDFNode *aTarget, bool aTruthValue, bool *_retval) { if (mInner) @@ -435,7 +422,6 @@ NS_IMETHODIMP nsWindowDataSource::HasAssertion(nsIRDFResource *aSource, nsIRDFRe return NS_OK; } -/* void AddObserver (in nsIRDFObserver aObserver); */ NS_IMETHODIMP nsWindowDataSource::AddObserver(nsIRDFObserver *aObserver) { if (mInner) @@ -443,7 +429,6 @@ NS_IMETHODIMP nsWindowDataSource::AddObserver(nsIRDFObserver *aObserver) return NS_OK; } -/* void RemoveObserver (in nsIRDFObserver aObserver); */ NS_IMETHODIMP nsWindowDataSource::RemoveObserver(nsIRDFObserver *aObserver) { if (mInner) @@ -451,7 +436,6 @@ NS_IMETHODIMP nsWindowDataSource::RemoveObserver(nsIRDFObserver *aObserver) return NS_OK; } -/* nsISimpleEnumerator ArcLabelsIn (in nsIRDFNode aNode); */ NS_IMETHODIMP nsWindowDataSource::ArcLabelsIn(nsIRDFNode *aNode, nsISimpleEnumerator **_retval) { if (mInner) @@ -459,7 +443,6 @@ NS_IMETHODIMP nsWindowDataSource::ArcLabelsIn(nsIRDFNode *aNode, nsISimpleEnumer return NS_OK; } -/* nsISimpleEnumerator ArcLabelsOut (in nsIRDFResource aSource); */ NS_IMETHODIMP nsWindowDataSource::ArcLabelsOut(nsIRDFResource *aSource, nsISimpleEnumerator **_retval) { if (mInner) @@ -467,7 +450,6 @@ NS_IMETHODIMP nsWindowDataSource::ArcLabelsOut(nsIRDFResource *aSource, nsISimpl return NS_OK; } -/* nsISimpleEnumerator GetAllResources (); */ NS_IMETHODIMP nsWindowDataSource::GetAllResources(nsISimpleEnumerator **_retval) { if (mInner) @@ -475,7 +457,6 @@ NS_IMETHODIMP nsWindowDataSource::GetAllResources(nsISimpleEnumerator **_retval) return NS_OK; } -/* boolean IsCommandEnabled (in nsISupportsArray aSources, in nsIRDFResource aCommand, in nsISupportsArray aArguments); */ NS_IMETHODIMP nsWindowDataSource::IsCommandEnabled(nsISupportsArray *aSources, nsIRDFResource *aCommand, nsISupportsArray *aArguments, bool *_retval) { if (mInner) @@ -483,7 +464,6 @@ NS_IMETHODIMP nsWindowDataSource::IsCommandEnabled(nsISupportsArray *aSources, n return NS_OK; } -/* void DoCommand (in nsISupportsArray aSources, in nsIRDFResource aCommand, in nsISupportsArray aArguments); */ NS_IMETHODIMP nsWindowDataSource::DoCommand(nsISupportsArray *aSources, nsIRDFResource *aCommand, nsISupportsArray *aArguments) { if (mInner) @@ -491,7 +471,6 @@ NS_IMETHODIMP nsWindowDataSource::DoCommand(nsISupportsArray *aSources, nsIRDFRe return NS_OK; } -/* nsISimpleEnumerator GetAllCmds (in nsIRDFResource aSource); */ NS_IMETHODIMP nsWindowDataSource::GetAllCmds(nsIRDFResource *aSource, nsISimpleEnumerator **_retval) { if (mInner) @@ -499,7 +478,6 @@ NS_IMETHODIMP nsWindowDataSource::GetAllCmds(nsIRDFResource *aSource, nsISimpleE return NS_OK; } -/* boolean hasArcIn (in nsIRDFNode aNode, in nsIRDFResource aArc); */ NS_IMETHODIMP nsWindowDataSource::HasArcIn(nsIRDFNode *aNode, nsIRDFResource *aArc, bool *_retval) { if (mInner) @@ -507,7 +485,6 @@ NS_IMETHODIMP nsWindowDataSource::HasArcIn(nsIRDFNode *aNode, nsIRDFResource *aA return NS_OK; } -/* boolean hasArcOut (in nsIRDFResource aSource, in nsIRDFResource aArc); */ NS_IMETHODIMP nsWindowDataSource::HasArcOut(nsIRDFResource *aSource, nsIRDFResource *aArc, bool *_retval) { if (mInner) @@ -515,7 +492,6 @@ NS_IMETHODIMP nsWindowDataSource::HasArcOut(nsIRDFResource *aSource, nsIRDFResou return NS_OK; } -/* void beginUpdateBatch (); */ NS_IMETHODIMP nsWindowDataSource::BeginUpdateBatch() { if (mInner) @@ -523,7 +499,6 @@ NS_IMETHODIMP nsWindowDataSource::BeginUpdateBatch() return NS_OK; } -/* void endUpdateBatch (); */ NS_IMETHODIMP nsWindowDataSource::EndUpdateBatch() { if (mInner)