Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 14:25:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1293117 (part 4) - Change many NS_IMETHODIMP occurrences to NS_IMETHOD. r=froydnj.

Browse Source 
This patch makes the following changes on many in-class methods.

- NS_IMETHODIMP F() override;      --> NS_IMETHOD F() override;
- NS_IMETHODIMP F() override {...} --> NS_IMETHOD F() override {...}
- NS_IMETHODIMP F() final;         --> NS_IMETHOD F() final;
- NS_IMETHODIMP F() final {...}    --> NS_IMETHOD F() final {...}

Using NS_IMETHOD is the preferred way of marking in-class virtual methods.
Although these transformations add an explicit |virtual|, they are safe --
there's an implicit |virtual| anyway because |override| and |final| only work
with virtual methods.

--HG--
extra : rebase_source : 386ee4e4ea2ecd8d5001efabc3ac87b4d6c0659f
This commit is contained in:
Nicholas Nethercote 2016-08-08 10:54:47 +10:00
parent d1b1a7d71d
commit bab6d17ebf
73 changed files with 238 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/base/nsAccessibilityService.cpp
View File

@ -410,7 +410,7 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHODIMP Notify(nsITimer* aTimer) final
NS_IMETHOD Notify(nsITimer* aTimer) final
{
if (!mContent->IsInUncomposedDoc())
return NS_OK;

4
caps/nsPrincipal.h
View File

@ -71,8 +71,8 @@ public:
NS_DECL_NSIEXPANDEDPRINCIPAL
NS_DECL_NSISERIALIZABLE
NS_IMETHODIMP_(MozExternalRefCountType) AddRef() override { return nsJSPrincipals::AddRef(); };
NS_IMETHODIMP_(MozExternalRefCountType) Release() override { return nsJSPrincipals::Release(); };
NS_IMETHOD_(MozExternalRefCountType) AddRef() override { return nsJSPrincipals::AddRef(); };
NS_IMETHOD_(MozExternalRefCountType) Release() override { return nsJSPrincipals::Release(); };
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) override;
NS_IMETHOD GetHashValue(uint32_t* aHashValue) override;
NS_IMETHOD GetURI(nsIURI** aURI) override;

2
docshell/base/nsDocShell.cpp
View File

@ -9503,7 +9503,7 @@ public:
{
}
NS_IMETHODIMP
NS_IMETHOD
OnComplete(nsIURI* aFaviconURI, uint32_t aDataLen,
const uint8_t* aData, const nsACString& aMimeType) override
{

2
dom/base/ImageEncoder.cpp
View File

@ -496,7 +496,7 @@ class EncoderThreadPoolTerminator final : public nsIObserver
public:
NS_DECL_ISUPPORTS
NS_IMETHODIMP Observe(nsISupports *, const char *topic, const char16_t *) override
NS_IMETHOD Observe(nsISupports *, const char *topic, const char16_t *) override
{
NS_ASSERTION(!strcmp(topic, "xpcom-shutdown-threads"),
"Unexpected topic");

2
dom/base/nsFrameLoader.cpp
View File

@ -1535,7 +1535,7 @@ public:
explicit nsFrameLoaderDestroyRunnable(nsFrameLoader* aFrameLoader)
: mFrameLoader(aFrameLoader), mPhase(eDestroyDocShell) {}
NS_IMETHODIMP Run() override;
NS_IMETHOD Run() override;
};
void

6
dom/base/nsFrameMessageManager.h
View File

@ -425,9 +425,9 @@ class nsScriptCacheCleaner final : public nsIObserver
}
}
NS_IMETHODIMP Observe(nsISupports *aSubject,
const char *aTopic,
const char16_t *aData) override
NS_IMETHOD Observe(nsISupports *aSubject,
const char *aTopic,
const char16_t *aData) override
{
if (strcmp("message-manager-flush-caches", aTopic) == 0) {
nsMessageManagerScriptExecutor::PurgeCache();

2
dom/base/nsGlobalWindow.cpp
View File

@ -480,7 +480,7 @@ public:
return mWindow->Observe(aSubject, aTopic, aData);
}
void Forget() { mWindow = nullptr; }
NS_IMETHODIMP GetInterface(const nsIID& aIID, void** aResult) override
NS_IMETHOD GetInterface(const nsIID& aIID, void** aResult) override
{
if (mWindow && aIID.Equals(NS_GET_IID(nsIDOMWindow)) && mWindow) {
return mWindow->QueryInterface(aIID, aResult);

6
dom/broadcastchannel/BroadcastChannel.cpp
View File

@ -149,7 +149,7 @@ public:
MOZ_ASSERT(mActor);
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
MOZ_ASSERT(mActor);
if (mActor->IsActorDestroyed()) {
@ -211,7 +211,7 @@ public:
MOZ_ASSERT(mBC);
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
mBC->Shutdown();
return NS_OK;
@ -243,7 +243,7 @@ public:
MOZ_ASSERT(mActor);
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
MOZ_ASSERT(mActor);
if (!mActor->IsActorDestroyed()) {

2
dom/browser-element/BrowserElementAudioChannel.cpp
View File

@ -181,7 +181,7 @@ public:
, mAudioChannel(aAudioChannel)
{}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
RefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
if (!service) {

2
dom/camera/DOMCameraCapabilities.cpp
View File

@ -31,7 +31,7 @@ public:
DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
}
NS_IMETHODIMP
NS_IMETHOD
Run() override
{
MOZ_ASSERT(NS_IsMainThread());

8
dom/camera/GonkCameraControl.cpp
View File

@ -978,7 +978,7 @@ nsGonkCameraControl::SetThumbnailSize(const Size& aSize)
}
~SetThumbnailSize() { MOZ_COUNT_DTOR(SetThumbnailSize); }
NS_IMETHODIMP
NS_IMETHOD
Run() override
{
nsresult rv = mCameraControl->SetThumbnailSizeImpl(mSize);
@ -1096,7 +1096,7 @@ nsGonkCameraControl::SetPictureSize(const Size& aSize)
}
~SetPictureSize() { MOZ_COUNT_DTOR(SetPictureSize); }
NS_IMETHODIMP
NS_IMETHOD
Run() override
{
nsresult rv = mCameraControl->SetPictureSizeImpl(mSize);
@ -1480,7 +1480,7 @@ nsGonkCameraControl::OnAutoFocusComplete(bool aSuccess, bool aExpired)
, mExpired(aExpired)
{ }
NS_IMETHODIMP
NS_IMETHOD
Run() override
{
mCameraControl->OnAutoFocusComplete(mSuccess, mExpired);
@ -2264,7 +2264,7 @@ nsGonkCameraControl::CreatePoster(Image* aImage, uint32_t aWidth, uint32_t aHeig
mTarget->OnPoster(mDst, mDstLength);
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
#ifdef MOZ_WIDGET_GONK
// NV21 (yuv420sp) is 12 bits / pixel

6
dom/canvas/CanvasImageCache.cpp
View File

@ -204,9 +204,9 @@ public:
mImageCache = nullptr;
}
NS_IMETHODIMP Observe(nsISupports* aSubject,
const char* aTopic,
const char16_t* aSomeData) override
NS_IMETHOD Observe(nsISupports* aSubject,
const char* aTopic,
const char16_t* aSomeData) override
{
if (!mImageCache || strcmp(aTopic, "memory-pressure")) {
return NS_OK;

6
dom/crypto/WebCryptoThreadPool.h
View File

@ -40,9 +40,9 @@ private:
void
Shutdown();
NS_IMETHODIMP Observe(nsISupports* aSubject,
const char* aTopic,
const char16_t* aData) override;
NS_IMETHOD Observe(nsISupports* aSubject,
const char* aTopic,
const char16_t* aData) override;
mozilla::Mutex mMutex;
nsCOMPtr<nsIThreadPool> mPool;

2
dom/devicestorage/nsDeviceStorage.cpp
View File

@ -2486,7 +2486,7 @@ public:
return Resolve(true);
}
NS_IMETHODIMP GetTypes(nsIArray** aTypes) override
NS_IMETHOD GetTypes(nsIArray** aTypes) override
{
nsString storageType;
mRequest->GetStorageType(storageType);

4
dom/html/nsGenericHTMLElement.h
View File

@ -73,7 +73,7 @@ public:
{
GetHTMLAttr(nsGkAtoms::title, aTitle);
}
NS_IMETHODIMP SetTitle(const nsAString& aTitle) override
NS_IMETHOD SetTitle(const nsAString& aTitle) override
{
SetHTMLAttr(nsGkAtoms::title, aTitle);
return NS_OK;
@ -82,7 +82,7 @@ public:
{
GetHTMLAttr(nsGkAtoms::lang, aLang);
}
NS_IMETHODIMP SetLang(const nsAString& aLang) override
NS_IMETHOD SetLang(const nsAString& aLang) override
{
SetHTMLAttr(nsGkAtoms::lang, aLang);
return NS_OK;

6
dom/ipc/TabParent.cpp
View File

@ -1419,9 +1419,9 @@ public:
MOZ_ASSERT(mTabParent);
}
NS_IMETHODIMP Observe(nsISupports* aSubject,
const char* aTopic,
const char16_t* aData) override
NS_IMETHOD Observe(nsISupports* aSubject,
const char* aTopic,
const char16_t* aData) override
{
if (!mTabParent) {
// We already sent the notification

2
dom/media/MediaRecorder.cpp
View File

@ -898,7 +898,7 @@ private:
mMediaStreamTracks.Clear();
}
NS_IMETHODIMP Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) override
NS_IMETHOD Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) override
{
MOZ_ASSERT(NS_IsMainThread());
LOG(LogLevel::Debug, ("Session.Observe XPCOM_SHUTDOWN %p", this));

2
dom/media/webaudio/AudioBufferSourceNode.cpp
View File

@ -781,7 +781,7 @@ AudioBufferSourceNode::NotifyMainThreadStreamFinished()
public:
explicit EndedEventDispatcher(AudioBufferSourceNode* aNode)
: mNode(aNode) {}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
// If it's not safe to run scripts right now, schedule this to run later
if (!nsContentUtils::IsSafeToRunScript()) {

2
dom/media/webaudio/AudioNode.cpp
View File

@ -308,7 +308,7 @@ AudioNode::DisconnectFromOutputIfConnected(AudioNode& aDestination, uint32_t aOu
explicit RunnableRelease(already_AddRefed<AudioNode> aNode)
: mNode(aNode) {}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
mNode = nullptr;
return NS_OK;

2
dom/notification/DesktopNotification.h
View File

@ -151,7 +151,7 @@ class AlertServiceObserver: public nsIObserver
void Disconnect() { mNotification = nullptr; }
NS_IMETHODIMP
NS_IMETHOD
Observe(nsISupports* aSubject,
const char* aTopic,
const char16_t* aData) override

2
dom/plugins/base/nsPluginStreamListenerPeer.cpp
View File

@ -1344,7 +1344,7 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHODIMP OnRedirectVerifyCallback(nsresult aResult) override
NS_IMETHOD OnRedirectVerifyCallback(nsresult aResult) override
{
if (NS_SUCCEEDED(aResult)) {
nsCOMPtr<nsIStreamListener> listener = do_QueryReferent(mWeakListener);

2
dom/storage/DOMStorageCache.cpp
View File

@ -254,7 +254,7 @@ class DOMStorageCacheHolder : public nsITimerCallback
NS_DECL_ISUPPORTS
NS_IMETHODIMP
NS_IMETHOD
Notify(nsITimer* aTimer) override
{
mCache = nullptr;

2
dom/svg/SVGFEImageElement.h
View File

@ -62,7 +62,7 @@ public:
virtual void UnbindFromTree(bool aDeep, bool aNullParent) override;
virtual EventStates IntrinsicState() const override;
NS_IMETHODIMP Notify(imgIRequest *aRequest, int32_t aType, const nsIntRect* aData) override;
NS_IMETHOD Notify(imgIRequest *aRequest, int32_t aType, const nsIntRect* aData) override;
void MaybeLoadSVGImage();

2
dom/system/gonk/mozstumbler/WriteStumbleOnThread.cpp
View File

@ -30,7 +30,7 @@ class DeleteRunnable : public Runnable
public:
DeleteRunnable() {}
NS_IMETHODIMP
NS_IMETHOD
Run() override
{
nsCOMPtr<nsIFile> tmpFile;

2
dom/system/gonk/mozstumbler/WriteStumbleOnThread.h
View File

@ -42,7 +42,7 @@ public:
: mDesc(aDesc)
{}
NS_IMETHODIMP Run() override;
NS_IMETHOD Run() override;
static void UploadEnded(bool deleteUploadFile);

2
dom/workers/ServiceWorkerManager.cpp
View File

@ -201,7 +201,7 @@ public:
MOZ_ASSERT(mActor);
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
MOZ_ASSERT(mActor);
mActor->SendShutdown();

2
dom/workers/ServiceWorkerManagerService.cpp
View File

@ -54,7 +54,7 @@ public:
MOZ_ASSERT(mBackgroundThread);
}
NS_IMETHODIMP
NS_IMETHOD
Run() override
{
if (NS_IsMainThread()) {

8
dom/workers/ServiceWorkerRegistration.cpp
View File

@ -529,7 +529,7 @@ public:
MOZ_ASSERT(mPromise);
}
NS_IMETHODIMP
NS_IMETHOD
UnregisterSucceeded(bool aState) override
{
AssertIsOnMainThread();
@ -537,7 +537,7 @@ public:
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHOD
UnregisterFailed() override
{
AssertIsOnMainThread();
@ -595,7 +595,7 @@ public:
MOZ_ASSERT(aProxy);
}
NS_IMETHODIMP
NS_IMETHOD
UnregisterSucceeded(bool aState) override
{
AssertIsOnMainThread();
@ -603,7 +603,7 @@ public:
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHOD
UnregisterFailed() override
{
AssertIsOnMainThread();

2
dom/workers/ServiceWorkerUnregisterJob.cpp
View File

@ -24,7 +24,7 @@ public:
AssertIsOnMainThread();
}
NS_IMETHODIMP
NS_IMETHOD
OnUnsubscribe(nsresult aStatus, bool) override
{
// Warn if unsubscribing fails, but don't prevent the worker from

2
dom/workers/WorkerScope.cpp
View File

@ -621,7 +621,7 @@ public:
MOZ_ASSERT(aPromiseProxy);
}
NS_IMETHODIMP
NS_IMETHOD
Run() override
{
AssertIsOnMainThread();

2
dom/xslt/xpath/txXPathObjectAdaptor.h
View File

@ -27,7 +27,7 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHODIMP_(txAExprResult*) GetResult() override
NS_IMETHOD_(txAExprResult*) GetResult() override
{
return mValue;
}

2
extensions/cookie/nsPermissionManager.cpp
View File

@ -203,7 +203,7 @@ public:
NS_DECL_ISUPPORTS
// nsIObserver implementation.
NS_IMETHODIMP
NS_IMETHOD
Observe(nsISupports* aSubject, const char* aTopic, const char16_t* aData) override
{
MOZ_ASSERT(!nsCRT::strcmp(aTopic, "clear-origin-data"));

16
gfx/layers/LayerScope.cpp
View File

@ -143,10 +143,10 @@ private:
SocketListener() { }
/* nsIServerSocketListener */
NS_IMETHODIMP OnSocketAccepted(nsIServerSocket *aServ,
nsISocketTransport *aTransport) override;
NS_IMETHODIMP OnStopListening(nsIServerSocket *aServ,
nsresult aStatus) override
NS_IMETHOD OnSocketAccepted(nsIServerSocket *aServ,
nsISocketTransport *aTransport) override;
NS_IMETHOD OnStopListening(nsIServerSocket *aServ,
nsresult aStatus) override
{
return NS_OK;
}
@ -171,7 +171,7 @@ private:
bool WriteToStream(void *aPtr, uint32_t aSize);
// nsIInputStreamCallback
NS_IMETHODIMP OnInputStreamReady(nsIAsyncInputStream *aStream) override;
NS_IMETHOD OnInputStreamReady(nsIAsyncInputStream *aStream) override;
private:
virtual ~SocketHandler() { CloseConnection(); }
@ -797,7 +797,7 @@ public:
mHost(host)
{ }
NS_IMETHODIMP Run() override {
NS_IMETHOD Run() override {
mHost->mList.insertBack(mData);
return NS_OK;
}
@ -821,7 +821,7 @@ public:
: mHost(host)
{ }
NS_IMETHODIMP Run() override {
NS_IMETHOD Run() override {
mHost->RemoveData();
return NS_OK;
}
@ -843,7 +843,7 @@ public:
: mHost(host)
{ }
NS_IMETHODIMP Run() override {
NS_IMETHOD Run() override {
// Sendout all appended debug data.
DebugGLData *d = nullptr;
while ((d = mHost->mList.popFirst()) != nullptr) {

2
gfx/layers/apz/util/APZEventState.cpp
View File

@ -138,7 +138,7 @@ public:
{
}
NS_IMETHODIMP Notify(nsITimer*) override
NS_IMETHOD Notify(nsITimer*) override
{
if (nsCOMPtr<nsIWidget> widget = do_QueryReferent(mWidget)) {
APZCCallbackHelper::FireSingleTapEvent(mPoint, mModifiers, widget);

2
gfx/layers/apz/util/APZThreadUtils.h
View File

@ -78,7 +78,7 @@ class GenericTimerCallback final : public GenericTimerCallbackBase
public:
explicit GenericTimerCallback(const Function& aFunction) : mFunction(aFunction) {}
NS_IMETHODIMP Notify(nsITimer*) override
NS_IMETHOD Notify(nsITimer*) override
{
mFunction();
return NS_OK;

2
intl/unicharutil/nsSaveAsCharset.h
View File

@ -24,7 +24,7 @@ public:
NS_IMETHOD Convert(const nsAString& ain, nsACString& aOut) override;
NS_IMETHODIMP GetCharset(nsACString& aCharset) override;
NS_IMETHOD GetCharset(nsACString& aCharset) override;
private:

24
ipc/hal/DaemonRunnables.h
View File

@ -84,7 +84,7 @@ public:
Unused << NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(runnable)));
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
((*mObj).*mMethod)();
return NS_OK;
@ -140,7 +140,7 @@ public:
Unused << NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(runnable)));
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
((*mObj).*mMethod)(ConvertArg<Arg1>(mArg1));
return NS_OK;
@ -203,7 +203,7 @@ public:
Unused << NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(runnable)));
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
((*mObj).*mMethod)(ConvertArg<Arg1>(mArg1),
ConvertArg<Arg2>(mArg2),
@ -280,7 +280,7 @@ public:
Unused << NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(runnable)));
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
MOZ_ASSERT(NS_IsMainThread());
@ -340,7 +340,7 @@ public:
Unused << NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(runnable)));
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
MOZ_ASSERT(NS_IsMainThread());
@ -407,7 +407,7 @@ public:
Unused << NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(runnable)));
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
MOZ_ASSERT(NS_IsMainThread());
@ -478,7 +478,7 @@ public:
Unused << NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(runnable)));
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
MOZ_ASSERT(NS_IsMainThread());
@ -552,7 +552,7 @@ public:
Unused << NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(runnable)));
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
MOZ_ASSERT(NS_IsMainThread());
@ -629,7 +629,7 @@ public:
Unused << NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(runnable)));
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
MOZ_ASSERT(NS_IsMainThread());
@ -709,7 +709,7 @@ public:
Unused << NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(runnable)));
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
MOZ_ASSERT(NS_IsMainThread());
@ -796,7 +796,7 @@ public:
Unused << NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(runnable)));
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
MOZ_ASSERT(NS_IsMainThread());
@ -890,7 +890,7 @@ public:
Unused << NS_WARN_IF(NS_FAILED(NS_DispatchToMainThread(runnable)));
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
MOZ_ASSERT(NS_IsMainThread());

2
layout/base/nsPresShell.cpp
View File

@ -3644,7 +3644,7 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHODIMP Notify(nsITimer* aTimer) final
NS_IMETHOD Notify(nsITimer* aTimer) final
{
mShell->SetNextPaintCompressed();
mShell->AddInvalidateHiddenPresShellObserver(mShell->GetPresContext()->RefreshDriver());

2
layout/forms/nsComboboxControlFrame.cpp
View File

@ -405,7 +405,7 @@ public:
NS_RELEASE_THIS();
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
if (mFrame.IsAlive()) {
static_cast<nsComboboxControlFrame*>(mFrame.GetFrame())->

2
layout/forms/nsNumberControlFrame.cpp
View File

@ -308,7 +308,7 @@ public:
mTextField(aTextField)
{}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
if (mNumber->AsElement()->State().HasState(NS_EVENT_STATE_FOCUS)) {
HTMLInputElement::FromContent(mTextField)->Focus();

2
media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp
View File

@ -108,7 +108,7 @@ public:
lock.NotifyAll();
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
MOZ_ASSERT(mThread);

2
media/webrtc/signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp
View File

@ -170,7 +170,7 @@ public:
lock.NotifyAll();
}
NS_IMETHODIMP Run() override
NS_IMETHOD Run() override
{
MonitorAutoLock lock(mMonitor);
if (mEnding) {

4
media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp
View File

@ -59,8 +59,8 @@ public:
(void) rv;
}
NS_IMETHODIMP Observe(nsISupports* aSubject, const char* aTopic,
const char16_t* aData) override {
NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic,
const char16_t* aData) override {
if (strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
CSFLogDebug(logTag, "Shutting down PeerConnectionCtx");
PeerConnectionCtx::Destroy();

8
media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h
View File

@ -442,10 +442,10 @@ class PeerConnectionMedia : public sigslot::has_slots<> {
explicit ProtocolProxyQueryHandler(PeerConnectionMedia *pcm) :
pcm_(pcm) {}
NS_IMETHODIMP OnProxyAvailable(nsICancelable *request,
nsIChannel *aChannel,
nsIProxyInfo *proxyinfo,
nsresult result) override;
NS_IMETHOD OnProxyAvailable(nsICancelable *request,
nsIChannel *aChannel,
nsIProxyInfo *proxyinfo,
nsresult result) override;
NS_DECL_ISUPPORTS
private:

8
netwerk/base/ProxyAutoConfig.cpp
View File

@ -274,9 +274,9 @@ public:
}
// nsIDNSListener
NS_IMETHODIMP OnLookupComplete(nsICancelable *request,
nsIDNSRecord *record,
nsresult status) override
NS_IMETHOD OnLookupComplete(nsICancelable *request,
nsIDNSRecord *record,
nsresult status) override
{
if (mTimer) {
mTimer->Cancel();
@ -290,7 +290,7 @@ public:
}
// nsITimerCallback
NS_IMETHODIMP Notify(nsITimer *timer) override
NS_IMETHOD Notify(nsITimer *timer) override
{
if (mRequest)
mRequest->Cancel(NS_ERROR_NET_TIMEOUT);

6
netwerk/base/nsFileStreams.h
View File

@ -254,9 +254,9 @@ public:
virtual nsresult DoOpen() override;
NS_IMETHODIMP Close() override;
NS_IMETHODIMP Write(const char *buf, uint32_t count, uint32_t *result) override;
NS_IMETHODIMP Init(nsIFile* file, int32_t ioFlags, int32_t perm, int32_t behaviorFlags) override;
NS_IMETHOD Close() override;
NS_IMETHOD Write(const char *buf, uint32_t count, uint32_t *result) override;
NS_IMETHOD Init(nsIFile* file, int32_t ioFlags, int32_t perm, int32_t behaviorFlags) override;
protected:
virtual ~nsAtomicFileOutputStream()

4
netwerk/base/nsIOService.h
View File

@ -216,13 +216,13 @@ public:
{
}
NS_IMETHODIMP GetMode(int32_t *aMode) override
NS_IMETHOD GetMode(int32_t *aMode) override
{
*aMode = mMode;
return NS_OK;
}
NS_IMETHODIMP GetAppId(uint32_t *aAppId) override
NS_IMETHOD GetAppId(uint32_t *aAppId) override
{
*aAppId = mAppId;
return NS_OK;

2
netwerk/cache/nsApplicationCacheService.cpp vendored
View File

@ -234,7 +234,7 @@ public:
NS_DECL_ISUPPORTS
// nsIObserver implementation.
NS_IMETHODIMP
NS_IMETHOD
Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) override
{
MOZ_ASSERT(!nsCRT::strcmp(aTopic, "clear-origin-data"));

2
netwerk/cookie/nsCookieService.cpp
View File

@ -570,7 +570,7 @@ public:
NS_DECL_ISUPPORTS
// nsIObserver implementation.
NS_IMETHODIMP
NS_IMETHOD
Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) override
{
MOZ_ASSERT(!nsCRT::strcmp(aTopic, TOPIC_CLEAR_ORIGIN_DATA));

8
netwerk/dns/mdns/libmdns/MDNSResponderReply.h
View File

@ -29,7 +29,7 @@ public:
const nsACString& aReplyDomain,
BrowseOperator* aContext);
NS_IMETHODIMP Run() override;
NS_IMETHOD Run() override;
static void Reply(DNSServiceRef aSdRef,
DNSServiceFlags aFlags,
@ -62,7 +62,7 @@ public:
const nsACString& aDomain,
RegisterOperator* aContext);
NS_IMETHODIMP Run() override;
NS_IMETHOD Run() override;
static void Reply(DNSServiceRef aSdRef,
DNSServiceFlags aFlags,
@ -97,7 +97,7 @@ public:
ResolveOperator* aContext);
~ResolveReplyRunnable();
NS_IMETHODIMP Run() override;
NS_IMETHOD Run() override;
static void Reply(DNSServiceRef aSdRef,
DNSServiceFlags aFlags,
@ -136,7 +136,7 @@ public:
GetAddrInfoOperator* aContext);
~GetAddrInfoReplyRunnable();
NS_IMETHODIMP Run() override;
NS_IMETHOD Run() override;
static void Reply(DNSServiceRef aSdRef,
DNSServiceFlags aFlags,

8
netwerk/protocol/file/nsFileChannel.cpp
View File

@ -181,10 +181,10 @@ public:
return mCopyEvent != nullptr;
}
NS_IMETHODIMP ReadSegments(nsWriteSegmentFun fun, void *closure,
uint32_t count, uint32_t *result) override;
NS_IMETHODIMP AsyncWait(nsIInputStreamCallback *callback, uint32_t flags,
uint32_t count, nsIEventTarget *target) override;
NS_IMETHOD ReadSegments(nsWriteSegmentFun fun, void *closure,
uint32_t count, uint32_t *result) override;
NS_IMETHOD AsyncWait(nsIInputStreamCallback *callback, uint32_t flags,
uint32_t count, nsIEventTarget *target) override;
private:
virtual ~nsFileUploadContentStream() {}

4
netwerk/protocol/ftp/nsFTPChannel.h
View File

@ -76,12 +76,12 @@ public:
mEntityID = entityID;
}
NS_IMETHODIMP GetLastModifiedTime(PRTime* lastModifiedTime) override {
NS_IMETHOD GetLastModifiedTime(PRTime* lastModifiedTime) override {
*lastModifiedTime = mLastModifiedTime;
return NS_OK;
}
NS_IMETHODIMP SetLastModifiedTime(PRTime lastModifiedTime) override {
NS_IMETHOD SetLastModifiedTime(PRTime lastModifiedTime) override {
mLastModifiedTime = lastModifiedTime;
return NS_OK;
}

4
netwerk/protocol/http/Http2Compression.cpp
View File

@ -31,7 +31,7 @@ public:
HpackStaticTableReporter() {}
NS_IMETHODIMP
NS_IMETHOD
CollectReports(nsIHandleReportCallback* aHandleReport, nsISupports* aData,
bool aAnonymize) override
{
@ -58,7 +58,7 @@ public:
: mCompressor(aCompressor)
{}
NS_IMETHODIMP
NS_IMETHOD
CollectReports(nsIHandleReportCallback* aHandleReport, nsISupports* aData,
bool aAnonymize) override
{

6
netwerk/protocol/http/HttpBaseChannel.cpp
View File

@ -883,12 +883,12 @@ public:
, mChannel(chan) {}
NS_DECL_ISUPPORTS
NS_IMETHODIMP OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) override
NS_IMETHOD OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) override
{
return mNext->OnStartRequest(aRequest, aContext);
}
NS_IMETHODIMP OnStopRequest(nsIRequest *aRequest, nsISupports *aContext, nsresult aStatusCode) override
NS_IMETHOD OnStopRequest(nsIRequest *aRequest, nsISupports *aContext, nsresult aStatusCode) override
{
if (NS_FAILED(aStatusCode) && NS_SUCCEEDED(mChannel->mStatus)) {
LOG(("HttpBaseChannel::InterceptFailedOnStop %p seting status %x", mChannel, aStatusCode));
@ -897,7 +897,7 @@ public:
return mNext->OnStopRequest(aRequest, aContext, aStatusCode);
}
NS_IMETHODIMP OnDataAvailable(nsIRequest *aRequest, nsISupports *aContext,
NS_IMETHOD OnDataAvailable(nsIRequest *aRequest, nsISupports *aContext,
nsIInputStream *aInputStream, uint64_t aOffset,
uint32_t aCount) override
{

18
netwerk/protocol/http/TunnelUtils.cpp
View File

@ -778,23 +778,23 @@ class SocketInWrapper : public nsIAsyncInputStream
, mTLSFilter(aFilter)
{ }
NS_IMETHODIMP Close() override
NS_IMETHOD Close() override
{
mTLSFilter = nullptr;
return mStream->Close();
}
NS_IMETHODIMP Available(uint64_t *_retval) override
NS_IMETHOD Available(uint64_t *_retval) override
{
return mStream->Available(_retval);
}
NS_IMETHODIMP IsNonBlocking(bool *_retval) override
NS_IMETHOD IsNonBlocking(bool *_retval) override
{
return mStream->IsNonBlocking(_retval);
}
NS_IMETHODIMP ReadSegments(nsWriteSegmentFun aWriter, void *aClosure, uint32_t aCount, uint32_t *_retval) override
NS_IMETHOD ReadSegments(nsWriteSegmentFun aWriter, void *aClosure, uint32_t aCount, uint32_t *_retval) override
{
return mStream->ReadSegments(aWriter, aClosure, aCount, _retval);
}
@ -845,28 +845,28 @@ class SocketOutWrapper : public nsIAsyncOutputStream
, mTLSFilter(aFilter)
{ }
NS_IMETHODIMP Close() override
NS_IMETHOD Close() override
{
mTLSFilter = nullptr;
return mStream->Close();
}
NS_IMETHODIMP Flush() override
NS_IMETHOD Flush() override
{
return mStream->Flush();
}
NS_IMETHODIMP IsNonBlocking(bool *_retval) override
NS_IMETHOD IsNonBlocking(bool *_retval) override
{
return mStream->IsNonBlocking(_retval);
}
NS_IMETHODIMP WriteSegments(nsReadSegmentFun aReader, void *aClosure, uint32_t aCount, uint32_t *_retval) override
NS_IMETHOD WriteSegments(nsReadSegmentFun aReader, void *aClosure, uint32_t aCount, uint32_t *_retval) override
{
return mStream->WriteSegments(aReader, aClosure, aCount, _retval);
}
NS_IMETHODIMP WriteFrom(nsIInputStream *aFromStream, uint32_t aCount, uint32_t *_retval) override
NS_IMETHOD WriteFrom(nsIInputStream *aFromStream, uint32_t aCount, uint32_t *_retval) override
{
return mStream->WriteFrom(aFromStream, aCount, _retval);
}

4
netwerk/sctp/datachannel/DataChannel.cpp
View File

@ -99,8 +99,8 @@ private:
virtual ~DataChannelShutdown() {}
public:
NS_IMETHODIMP Observe(nsISupports* aSubject, const char* aTopic,
const char16_t* aData) override {
NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic,
const char16_t* aData) override {
if (strcmp(aTopic, "xpcom-will-shutdown") == 0) {
LOG(("Shutting down SCTP"));
if (sctp_initialized) {

2
parser/html/nsHtml5Module.cpp
View File

@ -92,7 +92,7 @@ class nsHtml5ParserThreadTerminator final : public nsIObserver
explicit nsHtml5ParserThreadTerminator(nsIThread* aThread)
: mThread(aThread)
{}
NS_IMETHODIMP Observe(nsISupports *, const char *topic, const char16_t *) override
NS_IMETHOD Observe(nsISupports *, const char *topic, const char16_t *) override
{
NS_ASSERTION(!strcmp(topic, "xpcom-shutdown-threads"),
"Unexpected topic");

2
parser/html/nsHtml5Parser.h
View File

@ -175,7 +175,7 @@ class nsHtml5Parser final : public nsIParser,
/**
* Don't call. For interface compat only.
*/
NS_IMETHODIMP CancelParsingEvents() override;
NS_IMETHOD CancelParsingEvents() override;
/**
* Don't call. For interface compat only.

2
parser/htmlparser/nsParser.h
View File

@ -248,7 +248,7 @@ class nsParser final : public nsIParser,
* @update kmcclusk 5/18/98
*/
NS_IMETHODIMP CancelParsingEvents() override;
NS_IMETHOD CancelParsingEvents() override;
/**
* Return true.

14
storage/mozStorageAsyncStatement.cpp
View File

@ -48,13 +48,13 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_IMETHODIMP
NS_IMETHOD
GetInterfaces(uint32_t *_count, nsIID ***_array) override
{
return NS_CI_INTERFACE_GETTER_NAME(AsyncStatement)(_count, _array);
}
NS_IMETHODIMP
NS_IMETHOD
GetScriptableHelper(nsIXPCScriptable **_helper) override
{
static AsyncStatementJSHelper sJSHelper;
@ -62,35 +62,35 @@ public:
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHOD
GetContractID(char **_contractID) override
{
*_contractID = nullptr;
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHOD
GetClassDescription(char **_desc) override
{
*_desc = nullptr;
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHOD
GetClassID(nsCID **_id) override
{
*_id = nullptr;
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHOD
GetFlags(uint32_t *_flags) override
{
*_flags = 0;
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHOD
GetClassIDNoAlloc(nsCID *_cid) override
{
return NS_ERROR_NOT_AVAILABLE;

14
storage/mozStorageStatement.cpp
View File

@ -50,13 +50,13 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_IMETHODIMP
NS_IMETHOD
GetInterfaces(uint32_t *_count, nsIID ***_array) override
{
return NS_CI_INTERFACE_GETTER_NAME(Statement)(_count, _array);
}
NS_IMETHODIMP
NS_IMETHOD
GetScriptableHelper(nsIXPCScriptable **_helper) override
{
static StatementJSHelper sJSHelper;
@ -64,35 +64,35 @@ public:
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHOD
GetContractID(char **_contractID) override
{
*_contractID = nullptr;
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHOD
GetClassDescription(char **_desc) override
{
*_desc = nullptr;
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHOD
GetClassID(nsCID **_id) override
{
*_id = nullptr;
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHOD
GetFlags(uint32_t *_flags) override
{
*_flags = 0;
return NS_OK;
}
NS_IMETHODIMP
NS_IMETHOD
GetClassIDNoAlloc(nsCID *_cid) override
{
return NS_ERROR_NOT_AVAILABLE;

82
toolkit/components/downloads/nsDownloadProxy.h
View File

@ -33,14 +33,14 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHODIMP Init(nsIURI* aSource,
nsIURI* aTarget,
const nsAString& aDisplayName,
nsIMIMEInfo *aMIMEInfo,
PRTime aStartTime,
nsIFile* aTempFile,
nsICancelable* aCancelable,
bool aIsPrivate) override {
NS_IMETHOD Init(nsIURI* aSource,
nsIURI* aTarget,
const nsAString& aDisplayName,
nsIMIMEInfo *aMIMEInfo,
PRTime aStartTime,
nsIFile* aTempFile,
nsICancelable* aCancelable,
bool aIsPrivate) override {
nsresult rv;
nsCOMPtr<nsIDownloadManager> dm = do_GetService("@mozilla.org/download-manager;1", &rv);
NS_ENSURE_SUCCESS(rv, rv);
@ -80,36 +80,36 @@ public:
return rv;
}
NS_IMETHODIMP OnStateChange(nsIWebProgress* aWebProgress,
nsIRequest* aRequest, uint32_t aStateFlags,
nsresult aStatus) override
NS_IMETHOD OnStateChange(nsIWebProgress* aWebProgress,
nsIRequest* aRequest, uint32_t aStateFlags,
nsresult aStatus) override
{
NS_ENSURE_TRUE(mInner, NS_ERROR_NOT_INITIALIZED);
return mInner->OnStateChange(aWebProgress, aRequest, aStateFlags, aStatus);
}
NS_IMETHODIMP OnStatusChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest, nsresult aStatus,
const char16_t *aMessage) override
NS_IMETHOD OnStatusChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest, nsresult aStatus,
const char16_t *aMessage) override
{
NS_ENSURE_TRUE(mInner, NS_ERROR_NOT_INITIALIZED);
return mInner->OnStatusChange(aWebProgress, aRequest, aStatus, aMessage);
}
NS_IMETHODIMP OnLocationChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest, nsIURI *aLocation,
uint32_t aFlags) override
NS_IMETHOD OnLocationChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest, nsIURI *aLocation,
uint32_t aFlags) override
{
NS_ENSURE_TRUE(mInner, NS_ERROR_NOT_INITIALIZED);
return mInner->OnLocationChange(aWebProgress, aRequest, aLocation, aFlags);
}
NS_IMETHODIMP OnProgressChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
int32_t aCurSelfProgress,
int32_t aMaxSelfProgress,
int32_t aCurTotalProgress,
int32_t aMaxTotalProgress) override
NS_IMETHOD OnProgressChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
int32_t aCurSelfProgress,
int32_t aMaxSelfProgress,
int32_t aCurTotalProgress,
int32_t aMaxTotalProgress) override
{
NS_ENSURE_TRUE(mInner, NS_ERROR_NOT_INITIALIZED);
return mInner->OnProgressChange(aWebProgress, aRequest,
@ -119,12 +119,12 @@ public:
aMaxTotalProgress);
}
NS_IMETHODIMP OnProgressChange64(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
int64_t aCurSelfProgress,
int64_t aMaxSelfProgress,
int64_t aCurTotalProgress,
int64_t aMaxTotalProgress) override
NS_IMETHOD OnProgressChange64(nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
int64_t aCurSelfProgress,
int64_t aMaxSelfProgress,
int64_t aCurTotalProgress,
int64_t aMaxTotalProgress) override
{
NS_ENSURE_TRUE(mInner, NS_ERROR_NOT_INITIALIZED);
return mInner->OnProgressChange64(aWebProgress, aRequest,
@ -134,36 +134,36 @@ public:
aMaxTotalProgress);
}
NS_IMETHODIMP OnRefreshAttempted(nsIWebProgress *aWebProgress,
nsIURI *aUri,
int32_t aDelay,
bool aSameUri,
bool *allowRefresh) override
NS_IMETHOD OnRefreshAttempted(nsIWebProgress *aWebProgress,
nsIURI *aUri,
int32_t aDelay,
bool aSameUri,
bool *allowRefresh) override
{
*allowRefresh = true;
return NS_OK;
}
NS_IMETHODIMP OnSecurityChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest, uint32_t aState) override
NS_IMETHOD OnSecurityChange(nsIWebProgress *aWebProgress,
nsIRequest *aRequest, uint32_t aState) override
{
NS_ENSURE_TRUE(mInner, NS_ERROR_NOT_INITIALIZED);
return mInner->OnSecurityChange(aWebProgress, aRequest, aState);
}
NS_IMETHODIMP SetSha256Hash(const nsACString& aHash) override
NS_IMETHOD SetSha256Hash(const nsACString& aHash) override
{
NS_ENSURE_TRUE(mInner, NS_ERROR_NOT_INITIALIZED);
return mInner->SetSha256Hash(aHash);
}
NS_IMETHODIMP SetSignatureInfo(nsIArray* aSignatureInfo) override
NS_IMETHOD SetSignatureInfo(nsIArray* aSignatureInfo) override
{
NS_ENSURE_TRUE(mInner, NS_ERROR_NOT_INITIALIZED);
return mInner->SetSignatureInfo(aSignatureInfo);
}
NS_IMETHODIMP SetRedirects(nsIArray* aRedirects) override
NS_IMETHOD SetRedirects(nsIArray* aRedirects) override
{
NS_ENSURE_TRUE(mInner, NS_ERROR_NOT_INITIALIZED);
return mInner->SetRedirects(aRedirects);

16
toolkit/components/filewatcher/NativeFileWatcherNotSupported.h
View File

@ -23,18 +23,18 @@ public:
return NS_OK;
};
NS_IMETHODIMP AddPath(const nsAString& aPathToWatch,
nsINativeFileWatcherCallback* aOnChange,
nsINativeFileWatcherErrorCallback* aOnError,
nsINativeFileWatcherSuccessCallback* aOnSuccess) override
NS_IMETHOD AddPath(const nsAString& aPathToWatch,
nsINativeFileWatcherCallback* aOnChange,
nsINativeFileWatcherErrorCallback* aOnError,
nsINativeFileWatcherSuccessCallback* aOnSuccess) override
{
return NS_ERROR_NOT_IMPLEMENTED;
};
NS_IMETHODIMP RemovePath(const nsAString& aPathToRemove,
nsINativeFileWatcherCallback* aOnChange,
nsINativeFileWatcherErrorCallback* aOnError,
nsINativeFileWatcherSuccessCallback* aOnSuccess) override
NS_IMETHOD RemovePath(const nsAString& aPathToRemove,
nsINativeFileWatcherCallback* aOnChange,
nsINativeFileWatcherErrorCallback* aOnError,
nsINativeFileWatcherSuccessCallback* aOnSuccess) override
{
return NS_ERROR_NOT_IMPLEMENTED;
};

2
tools/profiler/gecko/ThreadResponsiveness.cpp
View File

@ -55,7 +55,7 @@ public:
return NS_OK;
}
NS_IMETHODIMP Notify(nsITimer* aTimer) final
NS_IMETHOD Notify(nsITimer* aTimer) final
{
NS_DispatchToMainThread(this);
return NS_OK;

10
widget/cocoa/nsPrintDialogX.h
View File

@ -22,11 +22,11 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHODIMP Init() override;
NS_IMETHODIMP Show(nsPIDOMWindowOuter *aParent, nsIPrintSettings *aSettings,
nsIWebBrowserPrint *aWebBrowserPrint) override;
NS_IMETHODIMP ShowPageSetup(nsPIDOMWindowOuter *aParent,
nsIPrintSettings *aSettings) override;
NS_IMETHOD Init() override;
NS_IMETHOD Show(nsPIDOMWindowOuter *aParent, nsIPrintSettings *aSettings,
nsIWebBrowserPrint *aWebBrowserPrint) override;
NS_IMETHOD ShowPageSetup(nsPIDOMWindowOuter *aParent,
nsIPrintSettings *aSettings) override;
protected:
virtual ~nsPrintDialogServiceX();

26
widget/gtk/nsFilePicker.h
View File

@ -25,19 +25,19 @@ public:
// nsIFilePicker (less what's in nsBaseFilePicker)
NS_IMETHOD Open(nsIFilePickerShownCallback *aCallback) override;
NS_IMETHODIMP AppendFilters(int32_t aFilterMask) override;
NS_IMETHODIMP AppendFilter(const nsAString& aTitle,
const nsAString& aFilter) override;
NS_IMETHODIMP SetDefaultString(const nsAString& aString) override;
NS_IMETHODIMP GetDefaultString(nsAString& aString) override;
NS_IMETHODIMP SetDefaultExtension(const nsAString& aExtension) override;
NS_IMETHODIMP GetDefaultExtension(nsAString& aExtension) override;
NS_IMETHODIMP GetFilterIndex(int32_t *aFilterIndex) override;
NS_IMETHODIMP SetFilterIndex(int32_t aFilterIndex) override;
NS_IMETHODIMP GetFile(nsIFile **aFile) override;
NS_IMETHODIMP GetFileURL(nsIURI **aFileURL) override;
NS_IMETHODIMP GetFiles(nsISimpleEnumerator **aFiles) override;
NS_IMETHODIMP Show(int16_t *aReturn) override;
NS_IMETHOD AppendFilters(int32_t aFilterMask) override;
NS_IMETHOD AppendFilter(const nsAString& aTitle,
const nsAString& aFilter) override;
NS_IMETHOD SetDefaultString(const nsAString& aString) override;
NS_IMETHOD GetDefaultString(nsAString& aString) override;
NS_IMETHOD SetDefaultExtension(const nsAString& aExtension) override;
NS_IMETHOD GetDefaultExtension(nsAString& aExtension) override;
NS_IMETHOD GetFilterIndex(int32_t *aFilterIndex) override;
NS_IMETHOD SetFilterIndex(int32_t aFilterIndex) override;
NS_IMETHOD GetFile(nsIFile **aFile) override;
NS_IMETHOD GetFileURL(nsIURI **aFileURL) override;
NS_IMETHOD GetFiles(nsISimpleEnumerator **aFiles) override;
NS_IMETHOD Show(int16_t *aReturn) override;
// nsBaseFilePicker
virtual void InitNative(nsIWidget *aParent,

10
widget/gtk/nsPrintDialogGTK.h
View File

@ -29,11 +29,11 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHODIMP Init() override;
NS_IMETHODIMP Show(nsPIDOMWindowOuter *aParent, nsIPrintSettings *aSettings,
nsIWebBrowserPrint *aWebBrowserPrint) override;
NS_IMETHODIMP ShowPageSetup(nsPIDOMWindowOuter *aParent,
nsIPrintSettings *aSettings) override;
NS_IMETHOD Init() override;
NS_IMETHOD Show(nsPIDOMWindowOuter *aParent, nsIPrintSettings *aSettings,
nsIWebBrowserPrint *aWebBrowserPrint) override;
NS_IMETHOD ShowPageSetup(nsPIDOMWindowOuter *aParent,
nsIPrintSettings *aSettings) override;
};
#endif

30
widget/nsFilePickerProxy.h
View File

@ -34,23 +34,23 @@ public:
NS_DECL_ISUPPORTS
// nsIFilePicker (less what's in nsBaseFilePicker)
NS_IMETHODIMP Init(mozIDOMWindowProxy* aParent, const nsAString& aTitle, int16_t aMode) override;
NS_IMETHODIMP AppendFilter(const nsAString& aTitle, const nsAString& aFilter) override;
NS_IMETHODIMP GetDefaultString(nsAString& aDefaultString) override;
NS_IMETHODIMP SetDefaultString(const nsAString& aDefaultString) override;
NS_IMETHODIMP GetDefaultExtension(nsAString& aDefaultExtension) override;
NS_IMETHODIMP SetDefaultExtension(const nsAString& aDefaultExtension) override;
NS_IMETHODIMP GetFilterIndex(int32_t* aFilterIndex) override;
NS_IMETHODIMP SetFilterIndex(int32_t aFilterIndex) override;
NS_IMETHODIMP GetFile(nsIFile** aFile) override;
NS_IMETHODIMP GetFileURL(nsIURI** aFileURL) override;
NS_IMETHODIMP GetFiles(nsISimpleEnumerator** aFiles) override;
NS_IMETHOD Init(mozIDOMWindowProxy* aParent, const nsAString& aTitle, int16_t aMode) override;
NS_IMETHOD AppendFilter(const nsAString& aTitle, const nsAString& aFilter) override;
NS_IMETHOD GetDefaultString(nsAString& aDefaultString) override;
NS_IMETHOD SetDefaultString(const nsAString& aDefaultString) override;
NS_IMETHOD GetDefaultExtension(nsAString& aDefaultExtension) override;
NS_IMETHOD SetDefaultExtension(const nsAString& aDefaultExtension) override;
NS_IMETHOD GetFilterIndex(int32_t* aFilterIndex) override;
NS_IMETHOD SetFilterIndex(int32_t aFilterIndex) override;
NS_IMETHOD GetFile(nsIFile** aFile) override;
NS_IMETHOD GetFileURL(nsIURI** aFileURL) override;
NS_IMETHOD GetFiles(nsISimpleEnumerator** aFiles) override;
NS_IMETHODIMP GetDomFileOrDirectory(nsISupports** aValue) override;
NS_IMETHODIMP GetDomFileOrDirectoryEnumerator(nsISimpleEnumerator** aValue) override;
NS_IMETHOD GetDomFileOrDirectory(nsISupports** aValue) override;
NS_IMETHOD GetDomFileOrDirectoryEnumerator(nsISimpleEnumerator** aValue) override;
NS_IMETHODIMP Show(int16_t* aReturn) override;
NS_IMETHODIMP Open(nsIFilePickerShownCallback* aCallback) override;
NS_IMETHOD Show(int16_t* aReturn) override;
NS_IMETHOD Open(nsIFilePickerShownCallback* aCallback) override;
// PFilePickerChild
virtual bool

2
widget/windows/nsAppShell.cpp
View File

@ -45,7 +45,7 @@ class WinWakeLockListener final : public nsIDOMMozWakeLockListener
public:
NS_DECL_ISUPPORTS;
NS_IMETHODIMP Notify(nsITimer *timer) override {
NS_IMETHOD Notify(nsITimer *timer) override {
WAKE_LOCK_LOG("WinWakeLock: periodic timer fired");
ResetScreenSaverTimeout();
return NS_OK;

4
xpcom/base/CountingAllocatorBase.h
View File

@ -21,9 +21,9 @@ namespace mozilla {
// class MyMemoryReporter : public CountingAllocatorBase<MyMemoryReporter>
// {
// ...
// NS_IMETHODIMP
// NS_IMETHOD
// CollectReports(nsIHandleReportCallback* aHandleReport,
// nsISupports* aData, bool aAnonymize)
// nsISupports* aData, bool aAnonymize) override
// {
// return MOZ_COLLECT_REPORT(
// "explicit/path/to/somewhere", KIND_HEAP, UNITS_BYTES,

4
xpcom/base/nsMemoryInfoDumper.cpp
View File

@ -333,12 +333,12 @@ public:
{
}
NS_IMETHODIMP OnFinish() override
NS_IMETHOD OnFinish() override
{
return NS_ERROR_UNEXPECTED;
}
NS_IMETHODIMP OnDump(nsIFile* aGCLog, nsIFile* aCCLog, bool aIsParent) override
NS_IMETHOD OnDump(nsIFile* aGCLog, nsIFile* aCCLog, bool aIsParent) override
{
return mCallback->OnDump(aGCLog, aCCLog, aIsParent);
}

8
xpcom/build/XPCOMInit.cpp
View File

@ -371,7 +371,7 @@ public:
}
private:
NS_IMETHODIMP
NS_IMETHOD
CollectReports(nsIHandleReportCallback* aHandleReport, nsISupports* aData,
bool aAnonymize) override
{
@ -396,7 +396,7 @@ public:
NS_DECL_ISUPPORTS
private:
NS_IMETHODIMP
NS_IMETHOD
CollectReports(nsIHandleReportCallback* aHandleReport, nsISupports* aData,
bool aAnonymize) override
{
@ -422,7 +422,7 @@ public:
NS_DECL_ISUPPORTS
private:
NS_IMETHODIMP
NS_IMETHOD
CollectReports(nsIHandleReportCallback* aHandleReport, nsISupports* aData,
bool aAnonymize) override
{
@ -449,7 +449,7 @@ public:
NS_DECL_ISUPPORTS
private:
NS_IMETHODIMP
NS_IMETHOD
CollectReports(nsIHandleReportCallback* aHandleReport, nsISupports* aData,
bool aAnonymize) override
{

6
xpcom/tests/TestHarness.h
View File

@ -220,8 +220,8 @@ class ScopedXPCOM : public nsIDirectoryServiceProvider2
////////////////////////////////////////////////////////////////////////////
//// nsIDirectoryServiceProvider
NS_IMETHODIMP GetFile(const char *aProperty, bool *_persistent,
nsIFile **_result) override
NS_IMETHOD GetFile(const char *aProperty, bool *_persistent,
nsIFile **_result) override
{
// If we were supplied a directory service provider, ask it first.
if (mDirSvcProvider &&
@ -266,7 +266,7 @@ class ScopedXPCOM : public nsIDirectoryServiceProvider2
////////////////////////////////////////////////////////////////////////////
//// nsIDirectoryServiceProvider2
NS_IMETHODIMP GetFiles(const char *aProperty, nsISimpleEnumerator **_enum) override
NS_IMETHOD GetFiles(const char *aProperty, nsISimpleEnumerator **_enum) override
{
// If we were supplied a directory service provider, ask it first.
nsCOMPtr<nsIDirectoryServiceProvider2> provider =