From ff8ce9bd42e838053ac9dc8ba9f643a98a507308 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Sun, 27 Apr 2014 03:06:00 -0400 Subject: [PATCH] Bug 900908 - Part 3: Change uses of numbered macros in nsIClassInfoImpl.h/nsISupportsImpl.h to the variadic variants. r=froydnj --- accessible/src/base/DocManager.cpp | 8 +-- .../src/base/nsAccessibilityService.cpp | 14 ++-- accessible/src/generic/ARIAGridAccessible.cpp | 12 ++-- .../src/generic/ApplicationAccessible.cpp | 4 +- .../src/generic/FormControlAccessible.cpp | 6 +- accessible/src/generic/ImageAccessible.cpp | 4 +- accessible/src/generic/RootAccessible.cpp | 2 +- .../src/html/HTMLFormControlAccessible.cpp | 8 +-- accessible/src/html/HTMLLinkAccessible.cpp | 4 +- accessible/src/html/HTMLTableAccessible.cpp | 10 +-- accessible/src/xpcom/nsAccessibleRelation.cpp | 2 +- accessible/src/xul/XULElementAccessibles.cpp | 4 +- accessible/src/xul/XULListboxAccessible.cpp | 6 +- accessible/src/xul/XULTreeAccessible.cpp | 4 +- accessible/src/xul/XULTreeGridAccessible.cpp | 12 ++-- browser/components/about/AboutRedirector.cpp | 2 +- .../dirprovider/DirectoryProvider.cpp | 8 +-- .../components/feeds/src/nsFeedSniffer.cpp | 8 +-- .../migration/src/nsIEHistoryEnumerator.cpp | 2 +- .../shell/src/nsGNOMEShellService.cpp | 2 +- .../shell/src/nsMacShellService.cpp | 2 +- .../shell/src/nsWindowsShellService.cpp | 2 +- caps/src/DomainPolicy.cpp | 4 +- caps/src/nsNullPrincipal.cpp | 8 +-- caps/src/nsPrincipal.cpp | 16 ++--- caps/src/nsScriptSecurityManager.cpp | 10 +-- caps/src/nsSecurityManagerFactory.cpp | 2 +- caps/src/nsSystemPrincipal.cpp | 8 +-- chrome/src/nsChromeProtocolHandler.cpp | 6 +- content/base/src/Attr.cpp | 4 +- content/base/src/Comment.cpp | 4 +- content/base/src/DOMRect.cpp | 4 +- content/base/src/DocumentType.cpp | 4 +- content/base/src/FragmentOrElement.cpp | 6 +- content/base/src/ThirdPartyUtil.cpp | 2 +- content/base/src/nsCCUncollectableMarker.cpp | 2 +- content/base/src/nsCSPService.cpp | 2 +- content/base/src/nsChannelPolicy.cpp | 2 +- content/base/src/nsContentAreaDragDrop.cpp | 2 +- content/base/src/nsContentList.cpp | 8 +-- content/base/src/nsContentPolicy.cpp | 2 +- content/base/src/nsContentUtils.cpp | 8 +-- content/base/src/nsCrossSiteListenerProxy.cpp | 12 ++-- content/base/src/nsDOMAttributeMap.cpp | 2 +- content/base/src/nsDOMBlobBuilder.cpp | 4 +- content/base/src/nsDOMFile.cpp | 2 +- .../base/src/nsDataDocumentContentPolicy.cpp | 2 +- content/base/src/nsDocument.cpp | 30 ++++---- content/base/src/nsFrameLoader.cpp | 2 +- content/base/src/nsFrameMessageManager.cpp | 4 +- content/base/src/nsGenConImageContent.cpp | 10 +-- .../base/src/nsHostObjectProtocolHandler.cpp | 6 +- content/base/src/nsMappedAttributes.cpp | 4 +- content/base/src/nsMixedContentBlocker.cpp | 2 +- .../src/nsNoDataProtocolContentPolicy.cpp | 2 +- content/base/src/nsNodeInfo.cpp | 2 +- content/base/src/nsObjectLoadingContent.cpp | 4 +- content/base/src/nsPlainTextSerializer.cpp | 4 +- content/base/src/nsReferencedElement.cpp | 4 +- content/base/src/nsScriptLoader.cpp | 2 +- content/base/src/nsSyncLoadService.cpp | 18 ++--- content/base/src/nsTextNode.cpp | 8 +-- content/base/src/nsXMLContentSerializer.cpp | 2 +- content/base/src/nsXMLHttpRequest.cpp | 6 +- content/canvas/src/CanvasImageCache.cpp | 2 +- .../canvas/src/CanvasRenderingContext2D.cpp | 2 +- content/canvas/src/ImageEncoder.cpp | 4 +- content/canvas/src/WebGLContextReporter.cpp | 4 +- .../html/content/src/HTMLAnchorElement.cpp | 6 +- content/html/content/src/HTMLAreaElement.cpp | 6 +- content/html/content/src/HTMLAudioElement.cpp | 4 +- content/html/content/src/HTMLBRElement.cpp | 4 +- content/html/content/src/HTMLBodyElement.cpp | 6 +- .../html/content/src/HTMLButtonElement.cpp | 6 +- .../html/content/src/HTMLCanvasElement.cpp | 2 +- .../html/content/src/HTMLContentElement.cpp | 2 +- content/html/content/src/HTMLDivElement.cpp | 4 +- .../html/content/src/HTMLFieldSetElement.cpp | 6 +- .../src/HTMLFormControlsCollection.cpp | 6 +- content/html/content/src/HTMLFormElement.cpp | 10 +-- content/html/content/src/HTMLFrameElement.cpp | 4 +- .../html/content/src/HTMLFrameSetElement.cpp | 4 +- content/html/content/src/HTMLHRElement.cpp | 4 +- .../html/content/src/HTMLHeadingElement.cpp | 4 +- .../html/content/src/HTMLIFrameElement.cpp | 4 +- content/html/content/src/HTMLImageElement.cpp | 10 +-- content/html/content/src/HTMLInputElement.cpp | 34 ++++----- content/html/content/src/HTMLLIElement.cpp | 4 +- content/html/content/src/HTMLLabelElement.cpp | 4 +- content/html/content/src/HTMLLinkElement.cpp | 8 +-- content/html/content/src/HTMLMapElement.cpp | 2 +- content/html/content/src/HTMLMediaElement.cpp | 6 +- content/html/content/src/HTMLMenuElement.cpp | 4 +- .../html/content/src/HTMLMenuItemElement.cpp | 4 +- content/html/content/src/HTMLMetaElement.cpp | 4 +- .../html/content/src/HTMLObjectElement.cpp | 22 +++--- .../html/content/src/HTMLOptGroupElement.cpp | 4 +- .../html/content/src/HTMLOptionElement.cpp | 4 +- .../content/src/HTMLOptionsCollection.cpp | 8 +-- .../html/content/src/HTMLOutputElement.cpp | 6 +- .../html/content/src/HTMLParagraphElement.cpp | 4 +- content/html/content/src/HTMLPreElement.cpp | 4 +- .../content/src/HTMLPropertiesCollection.cpp | 16 ++--- .../html/content/src/HTMLScriptElement.cpp | 10 +-- .../html/content/src/HTMLSelectElement.cpp | 8 +-- .../content/src/HTMLSharedObjectElement.cpp | 18 ++--- .../html/content/src/HTMLSourceElement.cpp | 4 +- content/html/content/src/HTMLStyleElement.cpp | 8 +-- .../content/src/HTMLTableCaptionElement.cpp | 4 +- .../html/content/src/HTMLTableCellElement.cpp | 4 +- content/html/content/src/HTMLTableElement.cpp | 6 +- .../html/content/src/HTMLTextAreaElement.cpp | 12 ++-- content/html/content/src/HTMLTitleElement.cpp | 4 +- content/html/content/src/HTMLVideoElement.cpp | 4 +- content/html/content/src/TimeRanges.cpp | 2 +- content/html/content/src/UndoManager.cpp | 2 +- .../html/content/src/nsGenericHTMLElement.cpp | 10 +-- .../content/src/nsGenericHTMLFrameElement.cpp | 8 +-- .../html/content/src/nsHTMLDNSPrefetch.cpp | 12 ++-- content/html/content/src/nsRadioVisitor.cpp | 2 +- .../html/content/src/nsTextEditorState.cpp | 20 +++--- content/html/document/src/ImageDocument.cpp | 4 +- content/html/document/src/MediaDocument.cpp | 6 +- content/html/document/src/PluginDocument.cpp | 2 +- content/html/document/src/nsHTMLDocument.cpp | 4 +- .../mathml/content/src/nsMathMLElement.cpp | 4 +- content/media/DOMMediaStream.cpp | 4 +- content/media/Latency.cpp | 2 +- content/media/MediaCache.cpp | 2 +- content/media/MediaDecoder.cpp | 4 +- content/media/MediaDecoderStateMachine.cpp | 2 +- content/media/MediaRecorder.cpp | 2 +- content/media/MediaResource.cpp | 6 +- content/media/MediaShutdownManager.cpp | 2 +- content/media/MediaStreamGraph.cpp | 4 +- content/media/RtspMediaResource.cpp | 4 +- content/media/SharedThreadPool.cpp | 4 +- content/media/plugins/MediaResourceServer.cpp | 2 +- content/media/webrtc/LoadMonitor.cpp | 2 +- content/media/webrtc/MediaEngineDefault.cpp | 4 +- .../webrtc/MediaEngineTabVideoSource.cpp | 2 +- .../media/webrtc/MediaEngineWebRTCVideo.cpp | 4 +- .../recognition/SpeechRecognition.cpp | 4 +- .../test/FakeSpeechRecognitionService.cpp | 2 +- .../webspeech/synth/nsSynthVoiceRegistry.cpp | 2 +- .../webspeech/synth/pico/nsPicoService.cpp | 2 +- content/svg/content/src/SVGAElement.cpp | 10 +-- content/svg/content/src/SVGFEImageElement.cpp | 8 +-- content/svg/content/src/SVGImageElement.cpp | 10 +-- content/svg/content/src/SVGMPathElement.cpp | 6 +- content/svg/content/src/SVGSVGElement.cpp | 4 +- content/svg/content/src/SVGScriptElement.cpp | 10 +-- content/svg/content/src/SVGStyleElement.cpp | 6 +- content/svg/content/src/SVGSymbolElement.cpp | 6 +- content/svg/content/src/SVGTitleElement.cpp | 8 +-- content/svg/content/src/SVGUseElement.cpp | 2 +- content/svg/content/src/nsSVGElement.cpp | 6 +- content/xml/content/src/CDATASection.cpp | 6 +- .../xml/content/src/ProcessingInstruction.cpp | 6 +- .../XMLStylesheetProcessingInstruction.cpp | 6 +- content/xml/content/src/nsXMLElement.cpp | 4 +- content/xml/document/src/XMLDocument.cpp | 2 +- .../xml/document/src/nsXMLPrettyPrinter.cpp | 6 +- content/xul/content/src/nsXULElement.cpp | 4 +- content/xul/document/src/XULDocument.cpp | 12 ++-- .../xul/document/src/nsXULPrototypeCache.cpp | 2 +- .../xul/templates/src/nsXULSortService.cpp | 2 +- .../nsXULTemplateQueryProcessorStorage.cpp | 6 +- .../src/nsXULTemplateQueryProcessorXML.cpp | 4 +- .../src/nsXULTemplateResultSetRDF.cpp | 2 +- .../src/nsXULTemplateResultStorage.cpp | 2 +- .../templates/src/nsXULTemplateResultXML.cpp | 2 +- docshell/base/LoadContext.cpp | 2 +- docshell/base/nsAboutRedirector.cpp | 2 +- docshell/base/nsDefaultURIFixup.cpp | 2 +- docshell/base/nsDocShell.cpp | 8 +-- docshell/base/nsDocShellEnumerator.cpp | 2 +- docshell/base/nsDocShellTransferableHooks.cpp | 2 +- docshell/base/nsDownloadHistory.cpp | 2 +- docshell/base/nsWebNavigationInfo.cpp | 2 +- docshell/shistory/src/nsSHEntry.cpp | 2 +- docshell/shistory/src/nsSHEntryShared.cpp | 2 +- docshell/shistory/src/nsSHistory.cpp | 4 +- dom/alarm/AlarmHalService.cpp | 2 +- dom/audiochannel/AudioChannelService.cpp | 2 +- .../tests/TestAudioChannelService.cpp | 4 +- dom/base/CompositionStringSynthesizer.cpp | 4 +- dom/base/DOMException.cpp | 2 +- dom/base/DOMRequest.cpp | 2 +- dom/base/Navigator.cpp | 8 +-- dom/base/nsContentPermissionHelper.cpp | 4 +- dom/base/nsGlobalWindow.cpp | 4 +- dom/base/nsGlobalWindowCommands.cpp | 10 +-- dom/base/nsIDOMClassInfo.h | 2 +- dom/base/nsJSEnvironment.cpp | 2 +- dom/base/nsScreen.cpp | 2 +- dom/base/nsScriptNameSpaceManager.cpp | 2 +- dom/base/nsWindowMemoryReporter.cpp | 8 +-- dom/bluetooth/BluetoothHidManager.cpp | 2 +- dom/bluetooth/BluetoothProfileController.cpp | 2 +- dom/bluetooth/BluetoothRilListener.cpp | 6 +- dom/bluetooth/BluetoothService.cpp | 4 +- .../bluedroid/BluetoothA2dpManager.cpp | 2 +- .../bluedroid/BluetoothOppManager.cpp | 2 +- .../hfp-fallback/BluetoothHfpManager.cpp | 2 +- .../bluedroid/hfp/BluetoothHfpManager.cpp | 6 +- dom/bluetooth/bluez/BluetoothA2dpManager.cpp | 2 +- dom/bluetooth/bluez/BluetoothHfpManager.cpp | 6 +- dom/bluetooth/bluez/BluetoothOppManager.cpp | 2 +- dom/camera/DOMCameraControl.cpp | 2 +- dom/cellbroadcast/src/CellBroadcast.cpp | 2 +- dom/devicestorage/nsDeviceStorage.cpp | 4 +- dom/events/EventListenerService.cpp | 2 +- dom/events/EventStateManager.cpp | 2 +- dom/events/FocusEvent.cpp | 2 +- dom/events/PaintRequest.cpp | 2 +- dom/file/ArchiveZipFile.cpp | 6 +- dom/file/AsyncHelper.cpp | 2 +- dom/file/FileHelper.cpp | 2 +- dom/file/FileService.cpp | 2 +- dom/file/FileStreamWrappers.cpp | 18 ++--- dom/file/LockedFile.cpp | 2 +- dom/file/MemoryStreams.cpp | 2 +- .../FileSystemPermissionRequest.cpp | 2 +- dom/fmradio/FMRadioService.cpp | 4 +- dom/gamepad/GamepadService.cpp | 4 +- dom/icc/src/IccListener.cpp | 2 +- dom/indexedDB/AsyncConnectionHelper.cpp | 4 +- dom/indexedDB/CheckPermissionsHelper.cpp | 6 +- dom/indexedDB/FileInfo.cpp | 4 +- dom/indexedDB/IDBTransaction.cpp | 6 +- dom/indexedDB/IndexedDatabaseManager.cpp | 12 ++-- dom/indexedDB/OpenDatabaseHelper.cpp | 6 +- dom/indexedDB/TransactionThreadPool.cpp | 6 +- dom/indexedDB/ipc/IndexedDBParent.cpp | 2 +- dom/ipc/Blob.cpp | 4 +- dom/ipc/ColorPickerParent.cpp | 4 +- dom/ipc/ContentChild.cpp | 10 +-- dom/ipc/ContentParent.cpp | 12 ++-- dom/ipc/FilePickerParent.cpp | 4 +- dom/ipc/PreallocatedProcessManager.cpp | 2 +- dom/ipc/ProcessPriorityManager.cpp | 16 ++--- dom/ipc/TabChild.cpp | 2 +- dom/ipc/TabParent.cpp | 2 +- dom/media/MediaManager.cpp | 4 +- dom/media/MediaPermissionGonk.cpp | 8 +-- dom/mobileconnection/src/MobileConnection.cpp | 2 +- .../src/MobileMessageService.cpp | 2 +- .../android/MobileMessageDatabaseService.cpp | 2 +- dom/mobilemessage/src/android/SmsService.cpp | 2 +- dom/mobilemessage/src/gonk/SmsService.cpp | 6 +- dom/mobilemessage/src/ipc/SmsChild.cpp | 2 +- dom/mobilemessage/src/ipc/SmsIPCService.cpp | 10 +-- dom/mobilemessage/src/ipc/SmsParent.cpp | 6 +- dom/network/src/Connection.cpp | 4 +- dom/network/src/UDPSocketChild.cpp | 2 +- dom/network/src/UDPSocketParent.cpp | 2 +- .../base/nsNPAPIPluginStreamListener.cpp | 6 +- .../base/nsPluginDirServiceProvider.cpp | 4 +- dom/plugins/base/nsPluginHost.cpp | 10 +-- dom/plugins/base/nsPluginInstanceOwner.cpp | 14 ++-- dom/plugins/base/nsPluginPlayPreviewInfo.cpp | 2 +- .../base/nsPluginStreamListenerPeer.cpp | 24 +++---- dom/plugins/base/nsPluginTags.cpp | 2 +- dom/plugins/ipc/PluginModuleParent.cpp | 2 +- dom/power/PowerManagerService.cpp | 2 +- dom/quota/CheckQuotaHelper.cpp | 6 +- dom/quota/QuotaManager.cpp | 4 +- dom/smil/nsSMILTimeValueSpec.cpp | 2 +- dom/speakermanager/SpeakerManager.cpp | 4 +- dom/speakermanager/SpeakerManagerService.cpp | 2 +- dom/src/geolocation/nsGeolocation.cpp | 2 +- dom/src/jsurl/nsJSProtocolHandler.cpp | 10 +-- dom/src/notification/DesktopNotification.cpp | 8 +-- dom/src/notification/Notification.cpp | 4 +- dom/src/storage/DOMStorageCache.cpp | 2 +- dom/src/storage/DOMStorageDBThread.cpp | 2 +- dom/src/storage/DOMStorageManager.cpp | 4 +- dom/src/storage/DOMStorageObserver.cpp | 6 +- dom/system/OSFileConstants.cpp | 4 +- .../android/AndroidLocationProvider.cpp | 2 +- dom/system/android/nsHapticFeedback.cpp | 2 +- dom/system/gonk/AudioChannelManager.cpp | 4 +- dom/system/gonk/AudioManager.cpp | 4 +- dom/system/gonk/AutoMounterSetting.cpp | 6 +- .../gonk/GonkGPSGeolocationProvider.cpp | 12 ++-- dom/system/gonk/NetworkWorker.cpp | 2 +- dom/system/gonk/SystemWorkerManager.cpp | 8 +-- dom/system/gonk/TimeZoneSettingObserver.cpp | 4 +- dom/system/gonk/VolumeServiceTest.cpp | 2 +- dom/system/gonk/nsVolume.cpp | 2 +- dom/system/gonk/nsVolumeMountLock.cpp | 4 +- dom/system/gonk/nsVolumeService.cpp | 6 +- dom/system/gonk/nsVolumeStat.cpp | 2 +- .../mac/CoreLocationLocationProvider.mm | 2 +- dom/system/nsDeviceSensors.cpp | 2 +- dom/system/qt/QTMLocationProvider.cpp | 2 +- dom/system/qt/QtHapticFeedback.cpp | 2 +- dom/system/windows/nsHapticFeedback.cpp | 2 +- dom/telephony/Telephony.cpp | 4 +- dom/telephony/ipc/TelephonyIPCProvider.cpp | 8 +-- dom/telephony/ipc/TelephonyParent.cpp | 8 +-- dom/time/TimeService.cpp | 2 +- dom/voicemail/Voicemail.cpp | 2 +- dom/wifi/WifiProxyService.cpp | 2 +- dom/workers/RuntimeService.cpp | 4 +- dom/workers/ScriptLoader.cpp | 2 +- dom/workers/WorkerPrivate.cpp | 4 +- dom/workers/XMLHttpRequest.cpp | 6 +- dom/xbl/XBLChildrenElement.cpp | 8 +-- dom/xbl/nsXBLEventHandler.cpp | 4 +- dom/xbl/nsXBLService.cpp | 10 +-- dom/xbl/nsXBLWindowKeyHandler.cpp | 6 +- dom/xslt/xpath/XPathEvaluator.cpp | 2 +- dom/xslt/xpath/txNodeSetAdaptor.cpp | 2 +- dom/xslt/xpath/txXPCOMExtensionFunction.cpp | 4 +- dom/xslt/xslt/txMozillaStylesheetCompiler.cpp | 14 ++-- dom/xslt/xslt/txMozillaXMLOutput.cpp | 6 +- editor/composer/src/nsComposeTxtSrvFilter.cpp | 2 +- editor/composer/src/nsComposerCommands.cpp | 2 +- .../src/nsComposerCommandsUpdater.cpp | 4 +- editor/composer/src/nsEditingSession.cpp | 4 +- editor/composer/src/nsEditorSpellCheck.cpp | 2 +- editor/libeditor/base/nsEditorCommands.cpp | 2 +- .../libeditor/base/nsEditorEventListener.cpp | 2 +- .../libeditor/html/nsHTMLAnonymousUtils.cpp | 2 +- editor/libeditor/html/nsHTMLEditRules.cpp | 2 +- editor/libeditor/html/nsHTMLObjectResizer.cpp | 6 +- editor/libeditor/html/nsHTMLURIRefObject.cpp | 2 +- editor/txmgr/src/nsTransactionList.cpp | 2 +- editor/txmgr/tests/TestTXMgr.cpp | 2 +- .../browser/webBrowser/nsContextMenuInfo.cpp | 2 +- .../webBrowser/nsDocShellTreeOwner.cpp | 6 +- .../webBrowser/nsWebBrowserContentPolicy.cpp | 2 +- .../appstartup/src/nsAppStartupNotifier.cpp | 2 +- .../commandhandler/src/nsCommandGroup.cpp | 6 +- .../commandhandler/src/nsCommandParams.cpp | 2 +- .../src/nsControllerCommandTable.cpp | 2 +- .../components/find/src/nsWebBrowserFind.cpp | 2 +- .../src/mac/nsPrintProgressParams.cpp | 2 +- .../src/mac/nsPrintingPromptServiceX.mm | 2 +- .../src/unixshared/nsPrintProgressParams.cpp | 2 +- .../unixshared/nsPrintingPromptService.cpp | 2 +- .../src/win/nsPrintProgressParams.cpp | 2 +- .../src/win/nsPrintingPromptService.cpp | 2 +- .../windowwatcher/src/nsDialogParamBlock.cpp | 2 +- .../windowwatcher/src/nsWindowWatcher.cpp | 10 +-- embedding/tests/winEmbed/WindowCreator.cpp | 2 +- extensions/auth/nsAuthGSSAPI.cpp | 2 +- extensions/auth/nsAuthSASL.cpp | 2 +- extensions/auth/nsAuthSSPI.cpp | 2 +- extensions/auth/nsAuthSambaNTLM.cpp | 2 +- extensions/auth/nsHttpNegotiateAuth.cpp | 2 +- extensions/cookie/nsCookiePermission.cpp | 6 +- extensions/cookie/nsCookiePromptService.cpp | 2 +- extensions/cookie/nsPermission.cpp | 2 +- extensions/cookie/nsPermissionManager.cpp | 8 +-- extensions/cookie/nsPopupWindowManager.cpp | 8 +-- extensions/gio/nsGIOProtocolHandler.cpp | 4 +- .../gnomevfs/nsGnomeVFSProtocolHandler.cpp | 4 +- extensions/permissions/nsContentBlocker.cpp | 8 +-- .../pref/autoconfig/src/nsAutoConfig.cpp | 2 +- .../pref/autoconfig/src/nsReadConfig.cpp | 2 +- .../hunspell/src/mozHunspellDirProvider.cpp | 4 +- .../spellcheck/src/mozGenericWordUtils.cpp | 2 +- .../spellcheck/src/mozInlineSpellChecker.cpp | 4 +- .../spellcheck/src/mozSpellI18NManager.cpp | 2 +- .../src/xpcom/nsUdetXPCOMWrapper.cpp | 4 +- gfx/gl/GfxTexturesReporter.cpp | 2 +- gfx/layers/LayerScope.cpp | 6 +- gfx/layers/d3d10/ReadbackManagerD3D10.cpp | 2 +- gfx/layers/ipc/ISurfaceAllocator.cpp | 2 +- gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp | 2 +- gfx/src/gfxCrashReporterUtils.cpp | 4 +- gfx/src/nsDeviceContext.cpp | 2 +- gfx/src/nsScriptableRegion.cpp | 2 +- gfx/src/nsThebesFontEnumerator.cpp | 2 +- gfx/thebes/gfxASurface.cpp | 2 +- gfx/thebes/gfxAndroidPlatform.cpp | 2 +- gfx/thebes/gfxFont.cpp | 4 +- gfx/thebes/gfxFontInfoLoader.cpp | 6 +- gfx/thebes/gfxPlatform.cpp | 6 +- gfx/thebes/gfxPlatformFontList.cpp | 4 +- gfx/thebes/gfxUserFontSet.cpp | 2 +- gfx/thebes/gfxWindowsPlatform.cpp | 6 +- hal/HalWakeLock.cpp | 4 +- hal/cocoa/CocoaBattery.cpp | 2 +- hal/gonk/GonkHal.cpp | 4 +- hal/windows/WindowsGamepad.cpp | 2 +- image/decoders/icon/android/nsIconChannel.cpp | 6 +- image/decoders/icon/gtk/nsIconChannel.cpp | 6 +- image/decoders/icon/mac/nsIconChannelCocoa.mm | 6 +- image/decoders/icon/nsIconProtocolHandler.cpp | 2 +- image/decoders/icon/nsIconURI.cpp | 2 +- image/decoders/icon/qt/nsIconChannel.cpp | 6 +- image/decoders/icon/win/nsIconChannel.cpp | 10 +-- image/encoders/bmp/nsBMPEncoder.cpp | 2 +- image/encoders/ico/nsICOEncoder.cpp | 2 +- image/encoders/jpeg/nsJPEGEncoder.cpp | 2 +- image/encoders/png/nsPNGEncoder.cpp | 2 +- image/src/ClippedImage.cpp | 2 +- image/src/FrozenImage.cpp | 2 +- image/src/ImageWrapper.cpp | 2 +- image/src/OrientedImage.cpp | 2 +- image/src/RasterImage.cpp | 12 ++-- image/src/SVGDocumentWrapper.cpp | 10 +-- image/src/SurfaceCache.cpp | 4 +- image/src/VectorImage.cpp | 12 ++-- image/src/imgLoader.cpp | 30 ++++---- image/src/imgRequest.cpp | 12 ++-- image/src/imgTools.cpp | 2 +- intl/chardet/src/nsCyrillicDetector.cpp | 4 +- intl/hyphenation/src/nsHyphenationManager.cpp | 4 +- intl/locale/src/mac/nsCollationMacUC.cpp | 2 +- intl/locale/src/mac/nsDateTimeFormatMac.cpp | 2 +- intl/locale/src/mac/nsMacCharset.cpp | 2 +- intl/locale/src/nsCollation.cpp | 2 +- intl/locale/src/nsLanguageAtomService.cpp | 2 +- intl/locale/src/nsLocale.cpp | 2 +- intl/locale/src/nsLocaleService.cpp | 2 +- intl/locale/src/nsScriptableDateFormat.cpp | 2 +- intl/locale/src/unix/nsAndroidCharset.cpp | 2 +- intl/locale/src/unix/nsCollationUnix.cpp | 2 +- intl/locale/src/unix/nsDateTimeFormatUnix.cpp | 2 +- intl/locale/src/unix/nsUNIXCharset.cpp | 2 +- intl/locale/src/windows/nsCollationWin.cpp | 2 +- .../src/windows/nsDateTimeFormatWin.cpp | 2 +- intl/locale/src/windows/nsWinCharset.cpp | 2 +- intl/lwbrk/src/nsJISx4051LineBreaker.cpp | 2 +- intl/lwbrk/src/nsSampleWordBreaker.cpp | 2 +- intl/lwbrk/src/nsSemanticUnitScanner.cpp | 2 +- intl/strres/src/nsStringBundle.cpp | 12 ++-- .../strres/src/nsStringBundleTextOverride.cpp | 8 +-- intl/uconv/src/nsCharsetConverterManager.cpp | 2 +- intl/uconv/src/nsConverterInputStream.cpp | 4 +- intl/uconv/src/nsConverterOutputStream.cpp | 6 +- intl/uconv/src/nsScriptableUConv.cpp | 2 +- intl/uconv/src/nsTextToSubURI.cpp | 2 +- intl/uconv/src/nsUTF8ConverterService.cpp | 2 +- intl/uconv/src/nsUnicodeToUTF8.cpp | 2 +- intl/uconv/util/nsUCSupport.cpp | 18 ++--- intl/unicharutil/src/nsCaseConversionImp2.cpp | 2 +- intl/unicharutil/src/nsCategoryImp.cpp | 2 +- intl/unicharutil/src/nsEntityConverter.cpp | 2 +- intl/unicharutil/src/nsSaveAsCharset.cpp | 2 +- intl/unicharutil/src/nsUnicodeNormalizer.cpp | 2 +- ipc/glue/BackgroundImpl.cpp | 4 +- ipc/glue/FileDescriptorUtils.cpp | 2 +- ipc/glue/MessagePump.cpp | 2 +- ipc/glue/SharedMemory.cpp | 2 +- ipc/testshell/XPCShellEnvironment.cpp | 2 +- js/ductwork/debugger/JSDebugger.cpp | 2 +- js/jsd/jsd_xpc.cpp | 18 ++--- js/xpconnect/loader/mozJSComponentLoader.cpp | 8 +-- js/xpconnect/loader/mozJSSubScriptLoader.cpp | 4 +- js/xpconnect/src/Sandbox.cpp | 2 +- js/xpconnect/src/XPCComponents.cpp | 4 +- js/xpconnect/src/XPCJSID.cpp | 6 +- js/xpconnect/src/XPCJSRuntime.cpp | 6 +- js/xpconnect/src/XPCJSWeakReference.cpp | 2 +- js/xpconnect/src/XPCShellImpl.cpp | 10 +-- js/xpconnect/src/XPCVariant.cpp | 2 +- js/xpconnect/src/XPCWrappedJSClass.cpp | 4 +- js/xpconnect/src/XPCWrappedNative.cpp | 2 +- js/xpconnect/src/nsScriptError.cpp | 2 +- js/xpconnect/src/nsXPConnect.cpp | 10 +-- .../components/native/xpctest_attributes.cpp | 4 +- .../components/native/xpctest_params.cpp | 2 +- layout/base/nsCaret.cpp | 2 +- layout/base/nsDocumentViewer.cpp | 6 +- layout/base/nsFrameTraversal.cpp | 4 +- layout/base/nsLayoutDebugger.cpp | 2 +- layout/base/nsLayoutHistoryState.cpp | 6 +- layout/base/nsPresShell.cpp | 10 +-- layout/base/nsRefreshDriver.cpp | 2 +- layout/base/nsStyleSheetService.cpp | 2 +- layout/build/nsContentDLF.cpp | 4 +- layout/forms/nsComboboxControlFrame.cpp | 4 +- layout/forms/nsFileControlFrame.cpp | 4 +- layout/forms/nsListControlFrame.cpp | 2 +- layout/generic/ScrollbarActivity.cpp | 2 +- layout/generic/nsBulletFrame.cpp | 2 +- layout/generic/nsFrameUtil.cpp | 2 +- layout/generic/nsImageFrame.cpp | 6 +- layout/generic/nsImageMap.cpp | 6 +- layout/generic/nsSelection.cpp | 4 +- layout/inspector/inCSSValueSearch.cpp | 2 +- layout/inspector/inDOMUtils.cpp | 2 +- layout/inspector/inDOMView.cpp | 8 +-- layout/inspector/inDeepTreeWalker.cpp | 6 +- layout/inspector/inFlasher.cpp | 2 +- layout/inspector/nsFontFace.cpp | 2 +- layout/inspector/nsFontFaceList.cpp | 2 +- layout/mathml/nsMathMLChar.cpp | 2 +- layout/mathml/nsMathMLmactionFrame.cpp | 4 +- layout/printing/nsPagePrintTimer.cpp | 2 +- layout/printing/nsPrintEngine.cpp | 4 +- layout/printing/nsPrintPreviewListener.cpp | 2 +- layout/style/AnimationCommon.cpp | 4 +- layout/style/Loader.cpp | 4 +- layout/style/StyleRule.cpp | 2 +- layout/style/nsCSSRuleProcessor.cpp | 2 +- layout/style/nsDOMCSSDeclaration.cpp | 6 +- layout/style/nsFontFaceLoader.cpp | 2 +- layout/style/nsHTMLCSSStyleSheet.cpp | 2 +- layout/style/nsHTMLStyleSheet.cpp | 8 +-- layout/style/nsLayoutStylesheetCache.cpp | 2 +- layout/style/nsStyleSet.cpp | 6 +- layout/svg/SVGTextFrame.cpp | 2 +- layout/svg/nsSVGEffects.cpp | 10 +-- layout/svg/nsSVGImageFrame.cpp | 2 +- .../layout-debug/src/nsLayoutDebugCLH.cpp | 2 +- .../src/nsLayoutDebuggingTools.cpp | 2 +- .../layout-debug/src/nsRegressionTester.cpp | 2 +- layout/xul/nsBoxLayout.cpp | 2 +- layout/xul/nsImageBoxFrame.cpp | 2 +- layout/xul/nsListBoxBodyFrame.cpp | 2 +- layout/xul/nsListBoxObject.cpp | 4 +- layout/xul/nsMenuBarListener.cpp | 2 +- layout/xul/nsMenuBoxObject.cpp | 2 +- layout/xul/nsMenuFrame.cpp | 2 +- layout/xul/nsPopupBoxObject.cpp | 2 +- layout/xul/nsRepeatService.cpp | 2 +- layout/xul/nsSliderFrame.cpp | 4 +- layout/xul/nsSplitterFrame.cpp | 2 +- layout/xul/nsXULPopupManager.cpp | 8 +-- layout/xul/nsXULTooltipListener.cpp | 2 +- layout/xul/tree/nsTreeImageListener.cpp | 2 +- media/mtransport/nr_socket_prsock.cpp | 2 +- media/mtransport/nr_timer.cpp | 2 +- media/mtransport/nriceresolver.cpp | 2 +- media/mtransport/stun_udp_socket_filter.cpp | 4 +- media/mtransport/test/sctp_unittest.cpp | 2 +- media/mtransport/transportlayerloopback.cpp | 2 +- .../src/peerconnection/PeerConnectionCtx.cpp | 2 +- .../signaling/test/FakeMediaStreamsImpl.h | 4 +- .../signaling/test/signaling_unittests.cpp | 2 +- .../components/build/nsAndroidHistory.cpp | 2 +- .../components/build/nsShellService.cpp | 2 +- modules/libjar/nsJAR.cpp | 8 +-- modules/libjar/nsJARChannel.cpp | 20 +++--- modules/libjar/nsJARInputStream.cpp | 2 +- modules/libjar/nsJARProtocolHandler.cpp | 8 +-- .../zipwriter/src/nsDeflateConverter.cpp | 6 +- .../libjar/zipwriter/src/nsZipDataStream.cpp | 4 +- modules/libjar/zipwriter/src/nsZipHeader.cpp | 2 +- modules/libjar/zipwriter/src/nsZipWriter.cpp | 4 +- modules/libpref/src/Preferences.cpp | 4 +- modules/libpref/src/nsPrefBranch.cpp | 2 +- netwerk/base/src/ArrayBufferInputStream.cpp | 2 +- netwerk/base/src/BackgroundFileSaver.cpp | 22 +++--- netwerk/base/src/Dashboard.cpp | 6 +- netwerk/base/src/EventTokenBucket.cpp | 4 +- netwerk/base/src/LoadContextInfo.cpp | 2 +- netwerk/base/src/ProxyAutoConfig.cpp | 2 +- netwerk/base/src/RedirectChannelRegistrar.cpp | 2 +- netwerk/base/src/Seer.cpp | 12 ++-- netwerk/base/src/StreamingProtocolService.cpp | 4 +- netwerk/base/src/Tickler.cpp | 4 +- .../base/src/nsAsyncRedirectVerifyHelper.cpp | 6 +- netwerk/base/src/nsAuthInformationHolder.cpp | 2 +- netwerk/base/src/nsBase64Encoder.cpp | 2 +- netwerk/base/src/nsBaseChannel.cpp | 20 +++--- netwerk/base/src/nsBufferedStreams.cpp | 12 ++-- netwerk/base/src/nsChannelClassifier.cpp | 4 +- netwerk/base/src/nsDNSPrefetch.cpp | 2 +- netwerk/base/src/nsDirectoryIndexStream.cpp | 2 +- netwerk/base/src/nsDownloader.cpp | 8 +-- netwerk/base/src/nsFileStreams.cpp | 54 +++++++------- netwerk/base/src/nsIOService.cpp | 16 ++--- netwerk/base/src/nsIncrementalDownload.cpp | 20 +++--- netwerk/base/src/nsInputStreamChannel.cpp | 6 +- netwerk/base/src/nsInputStreamPump.cpp | 10 +-- netwerk/base/src/nsLoadGroup.cpp | 2 +- netwerk/base/src/nsMIMEInputStream.cpp | 14 ++-- netwerk/base/src/nsNetAddr.cpp | 2 +- netwerk/base/src/nsPACMan.cpp | 4 +- netwerk/base/src/nsPreloadedStream.cpp | 6 +- netwerk/base/src/nsProtocolProxyService.cpp | 14 ++-- netwerk/base/src/nsProxyInfo.cpp | 2 +- netwerk/base/src/nsRequestObserverProxy.cpp | 6 +- netwerk/base/src/nsSerializationHelper.cpp | 2 +- netwerk/base/src/nsServerSocket.cpp | 6 +- netwerk/base/src/nsSimpleNestedURI.cpp | 2 +- netwerk/base/src/nsSimpleStreamListener.cpp | 8 +-- netwerk/base/src/nsSimpleURI.cpp | 2 +- netwerk/base/src/nsSocketTransport2.cpp | 30 ++++---- .../base/src/nsSocketTransportService2.cpp | 14 ++-- netwerk/base/src/nsStandardURL.cpp | 2 +- netwerk/base/src/nsStreamListenerTee.cpp | 10 +-- netwerk/base/src/nsStreamListenerWrapper.cpp | 8 +-- netwerk/base/src/nsStreamLoader.cpp | 4 +- netwerk/base/src/nsStreamTransportService.cpp | 22 +++--- netwerk/base/src/nsSyncStreamListener.cpp | 10 +-- .../base/src/nsTemporaryFileInputStream.cpp | 2 +- netwerk/base/src/nsTransportUtils.cpp | 2 +- netwerk/base/src/nsUDPSocket.cpp | 12 ++-- netwerk/base/src/nsURIChecker.cpp | 14 ++-- netwerk/base/src/nsURLParsers.cpp | 4 +- netwerk/base/src/nsUnicharStreamLoader.cpp | 4 +- netwerk/cache/nsApplicationCacheService.cpp | 4 +- netwerk/cache/nsCacheEntry.cpp | 2 +- netwerk/cache/nsCacheEntryDescriptor.cpp | 6 +- netwerk/cache/nsCacheService.cpp | 8 +-- netwerk/cache/nsCacheSession.cpp | 2 +- netwerk/cache/nsDiskCacheDevice.cpp | 2 +- netwerk/cache/nsDiskCacheDeviceSQL.cpp | 14 ++-- netwerk/cache/nsDiskCacheEntry.cpp | 2 +- netwerk/cache/nsDiskCacheStreams.cpp | 4 +- netwerk/cache/nsMemoryCacheDevice.cpp | 2 +- netwerk/cache2/CacheEntry.cpp | 10 +-- netwerk/cache2/CacheFile.cpp | 2 +- netwerk/cache2/CacheFileIOManager.cpp | 2 +- netwerk/cache2/CacheFileMetadata.cpp | 2 +- netwerk/cache2/CacheIOThread.cpp | 2 +- netwerk/cache2/CacheIndex.cpp | 2 +- netwerk/cache2/CacheObserver.cpp | 6 +- netwerk/cache2/CacheStorage.cpp | 2 +- netwerk/cache2/CacheStorageService.cpp | 10 +-- netwerk/cache2/OldWrappers.cpp | 16 ++--- netwerk/cookie/CookieServiceChild.cpp | 8 +-- netwerk/cookie/nsCookie.cpp | 2 +- netwerk/cookie/nsCookieService.cpp | 26 +++---- netwerk/dns/ChildDNSService.cpp | 8 +-- netwerk/dns/DNSListenerProxy.cpp | 2 +- netwerk/dns/DNSRequestChild.cpp | 6 +- netwerk/dns/DNSRequestParent.cpp | 4 +- netwerk/dns/nsDNSService2.cpp | 8 +-- netwerk/dns/nsEffectiveTLDService.cpp | 4 +- netwerk/dns/nsIDNService.cpp | 8 +-- netwerk/ipc/RemoteOpenFileChild.cpp | 8 +-- netwerk/mime/nsMIMEHeaderParamImpl.cpp | 2 +- netwerk/protocol/about/nsAboutBlank.cpp | 2 +- netwerk/protocol/about/nsAboutBloat.cpp | 2 +- netwerk/protocol/about/nsAboutCache.cpp | 2 +- netwerk/protocol/about/nsAboutCacheEntry.cpp | 6 +- .../protocol/about/nsAboutProtocolHandler.cpp | 4 +- netwerk/protocol/app/AppProtocolHandler.cpp | 4 +- netwerk/protocol/data/nsDataHandler.cpp | 2 +- .../device/AndroidCaptureProvider.cpp | 2 +- netwerk/protocol/device/nsDeviceChannel.cpp | 6 +- .../device/nsDeviceProtocolHandler.cpp | 4 +- netwerk/protocol/file/nsFileChannel.cpp | 8 +-- .../protocol/file/nsFileProtocolHandler.cpp | 8 +-- netwerk/protocol/ftp/FTPChannelChild.cpp | 16 ++--- netwerk/protocol/ftp/FTPChannelParent.cpp | 10 +-- netwerk/protocol/ftp/nsFTPChannel.cpp | 14 ++-- .../protocol/ftp/nsFtpConnectionThread.cpp | 14 ++-- .../protocol/ftp/nsFtpControlConnection.cpp | 2 +- netwerk/protocol/ftp/nsFtpProtocolHandler.cpp | 10 +-- netwerk/protocol/http/HttpBaseChannel.cpp | 2 +- netwerk/protocol/http/HttpChannelParent.cpp | 14 ++-- .../http/HttpChannelParentListener.cpp | 12 ++-- netwerk/protocol/http/SpdyZlibReporter.cpp | 2 +- .../http/nsHttpActivityDistributor.cpp | 6 +- netwerk/protocol/http/nsHttpAuthCache.cpp | 2 +- netwerk/protocol/http/nsHttpAuthManager.cpp | 2 +- netwerk/protocol/http/nsHttpBasicAuth.cpp | 2 +- .../http/nsHttpChannelAuthProvider.cpp | 4 +- netwerk/protocol/http/nsHttpConnection.cpp | 10 +-- netwerk/protocol/http/nsHttpConnectionMgr.cpp | 12 ++-- netwerk/protocol/http/nsHttpDigestAuth.cpp | 2 +- netwerk/protocol/http/nsHttpHandler.cpp | 26 +++---- netwerk/protocol/http/nsHttpNTLMAuth.cpp | 2 +- netwerk/protocol/http/nsHttpTransaction.cpp | 6 +- netwerk/protocol/res/nsResProtocolHandler.cpp | 8 +-- netwerk/protocol/rtsp/RtspChannelChild.cpp | 8 +-- netwerk/protocol/rtsp/RtspChannelParent.cpp | 6 +- netwerk/protocol/rtsp/RtspHandler.cpp | 2 +- .../rtsp/controller/RtspController.cpp | 4 +- .../rtsp/controller/RtspControllerParent.cpp | 6 +- .../protocol/rtsp/controller/RtspMetaData.cpp | 2 +- .../viewsource/nsViewSourceHandler.cpp | 2 +- .../protocol/websocket/WebSocketChannel.cpp | 40 +++++------ .../websocket/WebSocketChannelParent.cpp | 6 +- .../protocol/wyciwyg/WyciwygChannelChild.cpp | 10 +-- .../protocol/wyciwyg/WyciwygChannelParent.cpp | 8 +-- netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp | 16 ++--- .../wyciwyg/nsWyciwygProtocolHandler.cpp | 4 +- netwerk/sctp/datachannel/DataChannel.cpp | 6 +- netwerk/socket/nsSOCKSIOLayer.cpp | 2 +- netwerk/socket/nsSOCKSSocketProvider.cpp | 2 +- netwerk/socket/nsSocketProviderService.cpp | 2 +- netwerk/socket/nsUDPSocketProvider.cpp | 2 +- .../converters/mozTXTToHTMLConv.cpp | 10 +-- netwerk/streamconv/converters/nsDirIndex.cpp | 4 +- .../converters/nsDirIndexParser.cpp | 8 +-- .../converters/nsFTPDirListingConv.cpp | 8 +-- .../converters/nsHTTPCompressConv.cpp | 8 +-- .../streamconv/converters/nsIndexedToHTML.cpp | 10 +-- .../converters/nsMultiMixedConv.cpp | 8 +-- .../streamconv/converters/nsTXTToHTMLConv.cpp | 10 +-- .../src/nsStreamConverterService.cpp | 2 +- netwerk/streamconv/test/Converters.cpp | 8 +-- netwerk/streamconv/test/TestStreamConv.cpp | 6 +- .../android/nsAndroidNetworkLinkService.cpp | 4 +- netwerk/system/mac/nsNetworkLinkService.mm | 6 +- netwerk/system/qt/nsQtNetworkLinkService.cpp | 6 +- netwerk/system/win32/nsNotifyAddrListener.cpp | 8 +-- netwerk/test/TestCallbacks.cpp | 4 +- netwerk/test/TestCommon.h | 2 +- netwerk/test/TestDNS.cpp | 2 +- netwerk/test/TestFileInput2.cpp | 4 +- netwerk/test/TestHttp.cpp | 12 ++-- netwerk/test/TestIOThreads.cpp | 2 +- netwerk/test/TestIncrementalDownload.cpp | 4 +- netwerk/test/TestMCTransport.cpp | 6 +- netwerk/test/TestOverlappedIO.cpp | 12 ++-- netwerk/test/TestPageLoad.cpp | 12 ++-- netwerk/test/TestPerf.cpp | 2 +- netwerk/test/TestProtocols.cpp | 10 +-- netwerk/test/TestRes.cpp | 2 +- netwerk/test/TestServ.cpp | 2 +- netwerk/test/TestSocketIO.cpp | 12 ++-- netwerk/test/TestSocketInput.cpp | 2 +- netwerk/test/TestSocketTransport.cpp | 6 +- netwerk/test/TestStreamChannel.cpp | 12 ++-- netwerk/test/TestStreamLoader.cpp | 2 +- netwerk/test/TestStreamPump.cpp | 6 +- netwerk/test/TestStreamTransport.cpp | 6 +- netwerk/test/TestThreadedIO.cpp | 2 +- netwerk/test/TestUDPSocket.cpp | 4 +- netwerk/test/TestUpload.cpp | 6 +- netwerk/wifi/nsWifiAccessPoint.cpp | 2 +- netwerk/wifi/nsWifiMonitor.cpp | 16 ++--- netwerk/wifi/nsWifiMonitorGonk.cpp | 8 +-- parser/html/nsHtml5Module.cpp | 2 +- parser/html/nsHtml5Parser.cpp | 2 +- parser/html/nsHtml5StreamParser.cpp | 4 +- parser/html/nsHtml5TreeOpExecutor.cpp | 4 +- parser/html/nsParserUtils.cpp | 6 +- parser/htmlparser/src/CNavDTD.cpp | 2 +- parser/htmlparser/src/nsHTMLTokenizer.cpp | 2 +- parser/htmlparser/src/nsParserService.cpp | 2 +- parser/xml/src/nsSAXAttributes.cpp | 2 +- parser/xml/src/nsSAXLocator.cpp | 2 +- .../src/nsProfileDirServiceProvider.cpp | 4 +- rdf/base/src/nsCompositeDataSource.cpp | 2 +- rdf/base/src/nsContainerEnumerator.cpp | 2 +- rdf/base/src/nsInMemoryDataSource.cpp | 4 +- rdf/base/src/nsRDFContainer.cpp | 2 +- rdf/base/src/nsRDFContainerUtils.cpp | 2 +- rdf/base/src/nsRDFService.cpp | 4 +- rdf/base/src/nsRDFXMLParser.cpp | 2 +- rdf/base/src/nsRDFXMLSerializer.cpp | 4 +- rdf/base/src/rdfTriplesSerializer.cpp | 4 +- rdf/datasource/src/nsFileSystemDataSource.cpp | 2 +- rdf/tests/rdfcat/rdfcat.cpp | 2 +- rdf/tests/rdfpoll/rdfpoll.cpp | 2 +- rdf/tests/triplescat/triplescat.cpp | 2 +- rdf/util/src/nsRDFResource.cpp | 2 +- .../manager/boot/src/nsEntropyCollector.cpp | 6 +- .../boot/src/nsSecureBrowserUIImpl.cpp | 14 ++-- .../boot/src/nsSecurityWarningDialogs.cpp | 2 +- .../boot/src/nsSiteSecurityService.cpp | 6 +- security/manager/pki/src/nsASN1Tree.cpp | 2 +- .../manager/pki/src/nsFormSigningDialog.cpp | 2 +- security/manager/pki/src/nsNSSDialogs.cpp | 16 ++--- security/manager/pki/src/nsPKIParamBlock.cpp | 2 +- security/manager/ssl/src/NSSErrorsService.cpp | 2 +- .../manager/ssl/src/PSMContentListener.cpp | 8 +-- security/manager/ssl/src/SharedSSLState.cpp | 2 +- .../manager/ssl/src/TransportSecurityInfo.cpp | 14 ++-- security/manager/ssl/src/nsCMS.cpp | 6 +- .../manager/ssl/src/nsCMSSecureMessage.cpp | 2 +- .../manager/ssl/src/nsCertOverrideService.cpp | 8 +-- security/manager/ssl/src/nsCertPicker.cpp | 2 +- security/manager/ssl/src/nsCertTree.cpp | 4 +- .../ssl/src/nsCertVerificationThread.cpp | 2 +- .../ssl/src/nsCertificatePrincipal.cpp | 2 +- .../manager/ssl/src/nsClientAuthRemember.cpp | 6 +- security/manager/ssl/src/nsCrypto.cpp | 4 +- security/manager/ssl/src/nsCryptoHash.cpp | 4 +- .../ssl/src/nsDataSignatureVerifier.cpp | 2 +- security/manager/ssl/src/nsKeyModule.cpp | 4 +- security/manager/ssl/src/nsKeygenHandler.cpp | 2 +- security/manager/ssl/src/nsKeygenThread.cpp | 2 +- security/manager/ssl/src/nsNSSASN1Object.cpp | 4 +- security/manager/ssl/src/nsNSSCallbacks.cpp | 2 +- security/manager/ssl/src/nsNSSCertCache.cpp | 2 +- .../manager/ssl/src/nsNSSCertValidity.cpp | 2 +- security/manager/ssl/src/nsNSSCertificate.cpp | 20 +++--- .../manager/ssl/src/nsNSSCertificateDB.cpp | 2 +- .../ssl/src/nsNSSCertificateFakeTransport.cpp | 8 +-- security/manager/ssl/src/nsNSSComponent.cpp | 18 ++--- security/manager/ssl/src/nsNSSIOLayer.cpp | 8 +-- security/manager/ssl/src/nsNSSVersion.cpp | 2 +- security/manager/ssl/src/nsNTLMAuthModule.cpp | 2 +- security/manager/ssl/src/nsPK11TokenDB.cpp | 4 +- security/manager/ssl/src/nsPKCS11Slot.cpp | 6 +- .../manager/ssl/src/nsProtectedAuthThread.cpp | 2 +- .../manager/ssl/src/nsRandomGenerator.cpp | 2 +- security/manager/ssl/src/nsRecentBadCerts.cpp | 2 +- security/manager/ssl/src/nsSDR.cpp | 2 +- .../manager/ssl/src/nsSSLSocketProvider.cpp | 2 +- security/manager/ssl/src/nsSSLStatus.cpp | 2 +- security/manager/ssl/src/nsStreamCipher.cpp | 2 +- .../manager/ssl/src/nsTLSSocketProvider.cpp | 2 +- services/crypto/component/nsSyncJPAKE.h | 2 +- startupcache/StartupCache.cpp | 10 +-- storage/src/VacuumManager.cpp | 4 +- storage/src/Variant_inl.h | 2 +- storage/src/mozStorageArgValueArray.cpp | 2 +- storage/src/mozStorageAsyncStatement.cpp | 14 ++-- .../src/mozStorageAsyncStatementExecution.cpp | 2 +- .../src/mozStorageAsyncStatementParams.cpp | 2 +- storage/src/mozStorageBindingParams.cpp | 2 +- storage/src/mozStorageBindingParamsArray.cpp | 2 +- storage/src/mozStorageError.cpp | 2 +- storage/src/mozStorageResultSet.cpp | 2 +- storage/src/mozStorageRow.cpp | 2 +- storage/src/mozStorageService.cpp | 2 +- storage/src/mozStorageStatement.cpp | 16 ++--- storage/src/mozStorageStatementParams.cpp | 2 +- storage/src/mozStorageStatementRow.cpp | 2 +- storage/style.txt | 2 +- storage/test/storage_test_harness.h | 6 +- ..._async_callbacks_with_spun_event_loops.cpp | 2 +- toolkit/components/alerts/nsAlertsService.cpp | 2 +- toolkit/components/alerts/nsXULAlerts.cpp | 2 +- .../autocomplete/nsAutoCompleteController.cpp | 4 +- .../nsAutoCompleteSimpleResult.cpp | 6 +- .../components/commandlines/nsCommandLine.cpp | 6 +- toolkit/components/ctypes/ctypes.cpp | 2 +- .../diskspacewatcher/DiskSpaceWatcher.cpp | 2 +- .../downloads/ApplicationReputation.cpp | 14 ++-- toolkit/components/downloads/SQLFunctions.cpp | 2 +- .../downloads/nsDownloadManager.cpp | 4 +- .../components/downloads/nsDownloadProxy.h | 4 +- toolkit/components/filepicker/nsFileView.cpp | 6 +- .../FinalizationWitnessService.cpp | 2 +- toolkit/components/find/nsFindService.cpp | 2 +- toolkit/components/intl/nsCharsetMenu.cpp | 2 +- .../jsdownloads/src/DownloadPlatform.cpp | 2 +- .../mediasniffer/nsMediaSniffer.cpp | 2 +- .../osfile/NativeOSFileInternals.cpp | 2 +- .../nsParentalControlsServiceWin.cpp | 2 +- toolkit/components/perf/PerfMeasurement.cpp | 2 +- .../components/places/AsyncFaviconHelpers.cpp | 2 +- toolkit/components/places/Database.cpp | 4 +- toolkit/components/places/Helpers.cpp | 4 +- toolkit/components/places/History.cpp | 4 +- toolkit/components/places/PlaceInfo.cpp | 2 +- toolkit/components/places/SQLFunctions.cpp | 12 ++-- toolkit/components/places/VisitInfo.cpp | 2 +- .../places/nsAnnoProtocolHandler.cpp | 4 +- .../components/places/nsAnnotationService.cpp | 4 +- .../components/places/nsFaviconService.cpp | 2 +- toolkit/components/places/nsNavBookmarks.cpp | 4 +- toolkit/components/places/nsNavHistory.cpp | 8 +-- .../components/places/nsNavHistoryQuery.cpp | 4 +- .../components/places/nsNavHistoryResult.cpp | 12 ++-- .../components/places/tests/cpp/mock_Link.h | 2 +- .../places/tests/cpp/places_test_harness.h | 8 +-- .../places/tests/cpp/test_IHistory.cpp | 4 +- toolkit/components/reflect/reflect.cpp | 2 +- .../components/remote/nsGTKRemoteService.cpp | 6 +- .../components/remote/nsQtRemoteService.cpp | 6 +- .../satchel/nsFormFillController.cpp | 14 ++-- toolkit/components/startup/nsAppStartup.cpp | 12 ++-- toolkit/components/startup/nsUserInfoMac.mm | 2 +- toolkit/components/startup/nsUserInfoUnix.cpp | 2 +- toolkit/components/startup/nsUserInfoWin.cpp | 2 +- .../statusfilter/nsBrowserStatusFilter.cpp | 10 +-- toolkit/components/telemetry/Telemetry.cpp | 2 +- .../nsCheckSummedOutputStream.cpp | 10 +-- .../nsUrlClassifierDBService.cpp | 24 +++---- .../nsUrlClassifierPrefixSet.cpp | 2 +- .../url-classifier/nsUrlClassifierProxies.cpp | 16 ++--- .../nsUrlClassifierStreamUpdater.cpp | 16 ++--- .../url-classifier/nsUrlClassifierUtils.cpp | 2 +- toolkit/identity/IdentityCryptoService.cpp | 4 +- toolkit/profile/nsToolkitProfileService.cpp | 14 ++-- .../nsAndroidSystemProxySettings.cpp | 2 +- toolkit/system/dbus/nsDBusService.cpp | 2 +- .../system/dbus/nsNetworkManagerListener.cpp | 2 +- toolkit/system/gnome/nsAlertsIconListener.cpp | 4 +- toolkit/system/gnome/nsGConfService.cpp | 2 +- toolkit/system/gnome/nsGIOService.cpp | 6 +- toolkit/system/gnome/nsGSettingsService.cpp | 4 +- toolkit/system/gnome/nsGnomeVFSService.cpp | 6 +- .../osxproxy/nsOSXSystemProxySettings.mm | 2 +- .../system/unixproxy/nsLibProxySettings.cpp | 2 +- .../unixproxy/nsUnixSystemProxySettings.cpp | 2 +- .../nsWindowsSystemProxySettings.cpp | 2 +- toolkit/xre/nsAppRunner.cpp | 2 +- toolkit/xre/nsNativeAppSupportBase.cpp | 2 +- toolkit/xre/nsUpdateDriver.cpp | 2 +- toolkit/xre/nsXREDirProvider.cpp | 8 +-- tools/profiler/SaveProfileTask.cpp | 2 +- tools/profiler/nsProfiler.cpp | 2 +- .../exthandler/ExternalHelperAppChild.cpp | 6 +- .../exthandler/ExternalHelperAppParent.cpp | 14 ++-- .../android/nsAndroidHandlerApp.cpp | 2 +- .../android/nsExternalSharingAppService.cpp | 2 +- .../android/nsExternalURLHandlerService.cpp | 2 +- .../exthandler/android/nsMIMEInfoAndroid.cpp | 4 +- uriloader/exthandler/nsContentHandlerApp.cpp | 2 +- uriloader/exthandler/nsDBusHandlerApp.cpp | 2 +- .../exthandler/nsExternalHelperAppService.cpp | 2 +- uriloader/exthandler/nsLocalHandlerApp.cpp | 2 +- .../unix/nsMeegoExternalSharingAppService.cpp | 2 +- uriloader/exthandler/win/nsMIMEInfoWin.cpp | 2 +- uriloader/prefetch/OfflineCacheUpdateGlue.cpp | 8 +-- .../prefetch/OfflineCacheUpdateParent.cpp | 6 +- uriloader/prefetch/nsOfflineCacheUpdate.cpp | 30 ++++---- .../prefetch/nsOfflineCacheUpdateService.cpp | 14 ++-- uriloader/prefetch/nsPrefetchService.cpp | 24 +++---- widget/android/AndroidBridge.cpp | 2 +- widget/android/AndroidJavaWrappers.cpp | 2 +- widget/android/GfxInfo.cpp | 2 +- widget/android/nsAppShell.cpp | 4 +- widget/android/nsClipboard.cpp | 2 +- widget/android/nsDeviceContextAndroid.cpp | 2 +- widget/android/nsIMEPicker.cpp | 2 +- widget/android/nsScreenManagerAndroid.cpp | 2 +- widget/android/nsWindow.cpp | 4 +- widget/cocoa/GfxInfo.mm | 2 +- widget/cocoa/OSXNotificationCenter.mm | 2 +- widget/cocoa/nsBidiKeyboard.mm | 2 +- widget/cocoa/nsChildView.mm | 2 +- widget/cocoa/nsCocoaWindow.mm | 2 +- widget/cocoa/nsColorPicker.mm | 2 +- widget/cocoa/nsDeviceContextSpecX.mm | 2 +- widget/cocoa/nsFilePicker.mm | 2 +- widget/cocoa/nsMacDockSupport.mm | 2 +- widget/cocoa/nsMacWebAppUtils.mm | 2 +- widget/cocoa/nsMenuBarX.mm | 2 +- widget/cocoa/nsMenuGroupOwnerX.mm | 2 +- widget/cocoa/nsMenuItemIconX.mm | 2 +- widget/cocoa/nsNativeThemeCocoa.mm | 2 +- widget/cocoa/nsPrintDialogX.mm | 2 +- widget/cocoa/nsPrintSettingsX.mm | 2 +- widget/cocoa/nsScreenManagerCocoa.mm | 2 +- widget/cocoa/nsSound.mm | 2 +- widget/cocoa/nsStandaloneNativeMenu.mm | 2 +- widget/gonk/GonkMemoryPressureMonitoring.cpp | 2 +- widget/gonk/nsAppShell.cpp | 2 +- widget/gonk/nsClipboard.cpp | 2 +- widget/gonk/nsWindow.cpp | 2 +- widget/gtk/nsBidiKeyboard.cpp | 2 +- widget/gtk/nsClipboard.cpp | 2 +- widget/gtk/nsColorPicker.cpp | 2 +- widget/gtk/nsDeviceContextSpecG.cpp | 6 +- widget/gtk/nsDragService.cpp | 2 +- widget/gtk/nsFilePicker.cpp | 2 +- widget/gtk/nsImageToPixbuf.cpp | 2 +- widget/gtk/nsNativeThemeGTK.cpp | 4 +- widget/gtk/nsPrintDialogGTK.cpp | 2 +- widget/gtk/nsPrintSettingsGTK.cpp | 6 +- widget/gtk/nsScreenManagerGtk.cpp | 2 +- widget/gtk/nsSound.cpp | 2 +- widget/gtk/nsWindow.cpp | 4 +- widget/qt/nsBidiKeyboard.cpp | 2 +- widget/qt/nsClipboard.cpp | 2 +- widget/qt/nsDeviceContextSpecQt.cpp | 4 +- widget/qt/nsPrintDialogQt.cpp | 2 +- widget/qt/nsPrintSettingsQt.cpp | 6 +- widget/qt/nsScreenManagerQt.cpp | 2 +- widget/qt/nsWindow.cpp | 2 +- widget/tests/TestAppShellSteadyState.cpp | 2 +- widget/tests/TestWinTSF.cpp | 4 +- widget/windows/GfxInfo.cpp | 2 +- widget/windows/JumpListBuilder.cpp | 2 +- widget/windows/JumpListItem.cpp | 16 ++--- widget/windows/LSPAnnotator.cpp | 2 +- widget/windows/TaskbarPreviewButton.cpp | 2 +- widget/windows/TaskbarTabPreview.cpp | 2 +- widget/windows/TaskbarWindowPreview.cpp | 6 +- widget/windows/WinTaskbar.cpp | 4 +- widget/windows/WinUtils.cpp | 10 +-- widget/windows/nsAppShell.cpp | 2 +- widget/windows/nsBidiKeyboard.cpp | 2 +- widget/windows/nsClipboard.cpp | 2 +- widget/windows/nsColorPicker.cpp | 2 +- widget/windows/nsDataObj.cpp | 2 +- widget/windows/nsDeviceContextSpecWin.cpp | 4 +- widget/windows/nsFilePicker.cpp | 2 +- widget/windows/nsNativeThemeWin.cpp | 2 +- widget/windows/nsPrintSettingsWin.cpp | 6 +- widget/windows/nsScreenManagerWin.cpp | 2 +- widget/windows/nsSound.cpp | 2 +- .../windows/winrt/UIAAccessibilityBridge.cpp | 2 +- widget/windows/winrt/WakeLockListener.cpp | 2 +- widget/windows/winrt/nsMetroFilePicker.cpp | 2 +- widget/windows/winrt/nsWinMetroUtils.cpp | 2 +- widget/xpwidgets/GfxInfoBase.cpp | 4 +- widget/xpwidgets/GfxInfoX11.cpp | 2 +- widget/xpwidgets/PuppetWidget.cpp | 6 +- widget/xpwidgets/nsBaseAppShell.cpp | 2 +- widget/xpwidgets/nsBaseClipboard.cpp | 2 +- widget/xpwidgets/nsBaseDragService.cpp | 2 +- widget/xpwidgets/nsBaseFilePicker.cpp | 2 +- widget/xpwidgets/nsBaseScreen.cpp | 2 +- widget/xpwidgets/nsBaseWidget.cpp | 6 +- widget/xpwidgets/nsClipboardHelper.cpp | 2 +- .../xpwidgets/nsClipboardPrivacyHandler.cpp | 2 +- widget/xpwidgets/nsClipboardProxy.cpp | 2 +- widget/xpwidgets/nsColorPickerProxy.cpp | 2 +- widget/xpwidgets/nsFilePickerProxy.cpp | 2 +- widget/xpwidgets/nsHTMLFormatConverter.cpp | 2 +- widget/xpwidgets/nsIdleService.cpp | 4 +- widget/xpwidgets/nsNativeTheme.cpp | 2 +- widget/xpwidgets/nsPrintOptionsImpl.cpp | 2 +- widget/xpwidgets/nsPrintSession.cpp | 2 +- widget/xpwidgets/nsPrintSettingsImpl.cpp | 2 +- widget/xpwidgets/nsTransferable.cpp | 2 +- xpcom/base/AvailableMemoryTracker.cpp | 6 +- xpcom/base/SystemMemoryReporter.cpp | 2 +- xpcom/base/VisualEventTracer.cpp | 4 +- xpcom/base/nsConsoleMessage.cpp | 2 +- xpcom/base/nsConsoleService.cpp | 4 +- xpcom/base/nsCycleCollector.cpp | 4 +- xpcom/base/nsDebugImpl.cpp | 2 +- xpcom/base/nsDumpUtils.cpp | 2 +- xpcom/base/nsErrorService.cpp | 2 +- xpcom/base/nsGZFileWriter.cpp | 2 +- xpcom/base/nsIStatusReporter.idl | 2 +- xpcom/base/nsInterfaceRequestorAgg.cpp | 2 +- xpcom/base/nsMacUtilsImpl.cpp | 2 +- xpcom/base/nsMemoryImpl.cpp | 4 +- xpcom/base/nsMemoryInfoDumper.cpp | 8 +-- xpcom/base/nsMemoryReporterManager.cpp | 26 +++---- xpcom/base/nsMessageLoop.cpp | 4 +- xpcom/base/nsSecurityConsoleMessage.cpp | 2 +- xpcom/base/nsStatusReporterManager.cpp | 2 +- xpcom/base/nsUUIDGenerator.cpp | 2 +- xpcom/base/nsVersionComparatorImpl.cpp | 2 +- xpcom/build/nsXPComInit.cpp | 8 +-- xpcom/components/nsCategoryManager.cpp | 4 +- xpcom/components/nsComponentManager.cpp | 2 +- xpcom/components/nsNativeComponentLoader.cpp | 4 +- xpcom/ds/nsAtomService.cpp | 2 +- xpcom/ds/nsAtomTable.cpp | 2 +- xpcom/ds/nsExpirationTracker.h | 2 +- xpcom/ds/nsHashPropertyBag.cpp | 2 +- xpcom/ds/nsINIParserImpl.cpp | 10 +-- xpcom/ds/nsObserverList.cpp | 2 +- xpcom/ds/nsObserverService.cpp | 2 +- xpcom/ds/nsPersistentProperties.cpp | 4 +- xpcom/ds/nsStringEnumerator.cpp | 8 +-- xpcom/ds/nsSupportsArray.cpp | 2 +- xpcom/ds/nsSupportsArrayEnumerator.cpp | 2 +- xpcom/ds/nsSupportsPrimitives.cpp | 70 +++++++++---------- xpcom/ds/nsVariant.cpp | 2 +- xpcom/ds/nsWindowsRegKey.cpp | 2 +- xpcom/glue/GenericFactory.cpp | 2 +- xpcom/glue/GenericModule.cpp | 2 +- xpcom/glue/nsArrayEnumerator.cpp | 4 +- xpcom/glue/nsCategoryCache.cpp | 2 +- xpcom/glue/nsClassInfoImpl.cpp | 2 +- xpcom/glue/nsEnumeratorUtils.cpp | 8 +-- xpcom/glue/nsIClassInfoImpl.h | 12 ++-- xpcom/glue/nsThreadUtils.cpp | 8 +-- xpcom/glue/nsWeakReference.cpp | 2 +- xpcom/idl-parser/header.py | 2 +- xpcom/io/nsAnonymousTemporaryFile.cpp | 2 +- xpcom/io/nsAppFileLocationProvider.cpp | 4 +- xpcom/io/nsBinaryStream.cpp | 4 +- xpcom/io/nsDirectoryService.cpp | 2 +- xpcom/io/nsIOUtil.cpp | 2 +- xpcom/io/nsInputStreamTee.cpp | 6 +- xpcom/io/nsLocalFileUnix.cpp | 20 +++--- xpcom/io/nsLocalFileWin.cpp | 14 ++-- xpcom/io/nsMultiplexInputStream.cpp | 14 ++-- xpcom/io/nsPipe3.cpp | 38 +++++----- xpcom/io/nsScriptableBase64Encoder.cpp | 2 +- xpcom/io/nsScriptableInputStream.cpp | 2 +- xpcom/io/nsStorageStream.cpp | 12 ++-- xpcom/io/nsStreamUtils.cpp | 16 ++--- xpcom/io/nsStringStream.cpp | 16 ++--- xpcom/io/nsUnicharInputStream.cpp | 10 +-- .../reflect/xptcall/tests/TestXPTCInvoke.cpp | 2 +- .../reflect/xptinfo/src/xptiInterfaceInfo.cpp | 2 +- .../xptinfo/src/xptiInterfaceInfoManager.cpp | 2 +- xpcom/sample/nsSample.cpp | 4 +- xpcom/sample/xpconnect-sample.html | 2 +- xpcom/tests/TestArray.cpp | 2 +- xpcom/tests/TestBase64.cpp | 2 +- xpcom/tests/TestCOMArray.cpp | 4 +- xpcom/tests/TestCallTemplates.cpp | 2 +- xpcom/tests/TestHarness.h | 2 +- xpcom/tests/TestObserverService.cpp | 2 +- xpcom/tests/TestPipes.cpp | 6 +- xpcom/tests/TestRacingServiceManager.cpp | 2 +- xpcom/tests/TestThreadPool.cpp | 2 +- xpcom/tests/TestThreadPoolListener.cpp | 2 +- xpcom/tests/TestThreads.cpp | 4 +- xpcom/tests/TestTimers.cpp | 2 +- xpcom/tests/windows/TestCOM.cpp | 4 +- xpcom/threads/LazyIdleThread.cpp | 10 +-- xpcom/threads/TimerThread.cpp | 2 +- xpcom/threads/nsEnvironment.cpp | 2 +- xpcom/threads/nsProcessCommon.cpp | 4 +- xpcom/threads/nsThread.cpp | 8 +-- xpcom/threads/nsThreadManager.cpp | 4 +- xpcom/threads/nsThreadPool.cpp | 6 +- xpcom/threads/nsTimerImpl.cpp | 2 +- xpfe/appshell/src/nsAppShellService.cpp | 6 +- .../src/nsAppShellWindowEnumerator.cpp | 2 +- xpfe/appshell/src/nsWebShellWindow.cpp | 2 +- xpfe/appshell/src/nsWindowMediator.cpp | 2 +- .../directory/nsDirectoryViewer.cpp | 2 +- .../simple/components/src/SimpleTest.cpp | 2 +- 1104 files changed, 2667 insertions(+), 2673 deletions(-) diff --git a/accessible/src/base/DocManager.cpp b/accessible/src/base/DocManager.cpp index a5a9704e48f..52bc77b171a 100644 --- a/accessible/src/base/DocManager.cpp +++ b/accessible/src/base/DocManager.cpp @@ -118,10 +118,10 @@ DocManager::Shutdown() //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS3(DocManager, - nsIWebProgressListener, - nsIDOMEventListener, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(DocManager, + nsIWebProgressListener, + nsIDOMEventListener, + nsISupportsWeakReference) //////////////////////////////////////////////////////////////////////////////// // nsIWebProgressListener diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp index c37d0ac5da8..9f6c96521c6 100644 --- a/accessible/src/base/nsAccessibilityService.cpp +++ b/accessible/src/base/nsAccessibilityService.cpp @@ -152,12 +152,12 @@ nsAccessibilityService::~nsAccessibilityService() //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED4(nsAccessibilityService, - DocManager, - nsIAccessibilityService, - nsIAccessibleRetrieval, - nsIObserver, - nsISelectionListener) // from SelectionManager +NS_IMPL_ISUPPORTS_INHERITED(nsAccessibilityService, + DocManager, + nsIAccessibilityService, + nsIAccessibleRetrieval, + nsIObserver, + nsISelectionListener) // from SelectionManager //////////////////////////////////////////////////////////////////////////////// // nsIObserver @@ -256,7 +256,7 @@ private: nsCOMPtr mContent; }; -NS_IMPL_ISUPPORTS1(PluginTimerCallBack, nsITimerCallback) +NS_IMPL_ISUPPORTS(PluginTimerCallBack, nsITimerCallback) #endif already_AddRefed diff --git a/accessible/src/generic/ARIAGridAccessible.cpp b/accessible/src/generic/ARIAGridAccessible.cpp index 1776d291e7f..09d3fb62365 100644 --- a/accessible/src/generic/ARIAGridAccessible.cpp +++ b/accessible/src/generic/ARIAGridAccessible.cpp @@ -35,9 +35,9 @@ ARIAGridAccessible:: //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridAccessible, - Accessible, - nsIAccessibleTable) +NS_IMPL_ISUPPORTS_INHERITED(ARIAGridAccessible, + Accessible, + nsIAccessibleTable) //////////////////////////////////////////////////////////////////////////////// // Accessible @@ -540,9 +540,9 @@ ARIAGridCellAccessible:: //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridCellAccessible, - HyperTextAccessible, - nsIAccessibleTableCell) +NS_IMPL_ISUPPORTS_INHERITED(ARIAGridCellAccessible, + HyperTextAccessible, + nsIAccessibleTableCell) //////////////////////////////////////////////////////////////////////////////// // nsIAccessibleTableCell diff --git a/accessible/src/generic/ApplicationAccessible.cpp b/accessible/src/generic/ApplicationAccessible.cpp index db29ad8b491..73091fecc28 100644 --- a/accessible/src/generic/ApplicationAccessible.cpp +++ b/accessible/src/generic/ApplicationAccessible.cpp @@ -33,8 +33,8 @@ ApplicationAccessible::ApplicationAccessible() : //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(ApplicationAccessible, Accessible, - nsIAccessibleApplication) +NS_IMPL_ISUPPORTS_INHERITED(ApplicationAccessible, Accessible, + nsIAccessibleApplication) //////////////////////////////////////////////////////////////////////////////// // nsIAccessible diff --git a/accessible/src/generic/FormControlAccessible.cpp b/accessible/src/generic/FormControlAccessible.cpp index 245d8600dd7..848ac6dadc7 100644 --- a/accessible/src/generic/FormControlAccessible.cpp +++ b/accessible/src/generic/FormControlAccessible.cpp @@ -32,9 +32,9 @@ template NS_IMPL_RELEASE_INHERITED(ProgressMeterAccessible, LeafAccessible) template -NS_IMPL_QUERY_INTERFACE_INHERITED1(ProgressMeterAccessible, - LeafAccessible, - nsIAccessibleValue) +NS_IMPL_QUERY_INTERFACE_INHERITED(ProgressMeterAccessible, + LeafAccessible, + nsIAccessibleValue) //////////////////////////////////////////////////////////////////////////////// // Accessible diff --git a/accessible/src/generic/ImageAccessible.cpp b/accessible/src/generic/ImageAccessible.cpp index 341f0630e46..ce61e4c1151 100644 --- a/accessible/src/generic/ImageAccessible.cpp +++ b/accessible/src/generic/ImageAccessible.cpp @@ -35,8 +35,8 @@ ImageAccessible:: mType = eImageType; } -NS_IMPL_ISUPPORTS_INHERITED1(ImageAccessible, Accessible, - nsIAccessibleImage) +NS_IMPL_ISUPPORTS_INHERITED(ImageAccessible, Accessible, + nsIAccessibleImage) //////////////////////////////////////////////////////////////////////////////// // Accessible public diff --git a/accessible/src/generic/RootAccessible.cpp b/accessible/src/generic/RootAccessible.cpp index d89f666c503..e5b67693066 100644 --- a/accessible/src/generic/RootAccessible.cpp +++ b/accessible/src/generic/RootAccessible.cpp @@ -53,7 +53,7 @@ using namespace mozilla::dom; //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(RootAccessible, DocAccessible, nsIAccessibleDocument) +NS_IMPL_ISUPPORTS_INHERITED(RootAccessible, DocAccessible, nsIAccessibleDocument) //////////////////////////////////////////////////////////////////////////////// // Constructor/destructor diff --git a/accessible/src/html/HTMLFormControlAccessible.cpp b/accessible/src/html/HTMLFormControlAccessible.cpp index 42a24d24d6f..f8ba771ce76 100644 --- a/accessible/src/html/HTMLFormControlAccessible.cpp +++ b/accessible/src/html/HTMLFormControlAccessible.cpp @@ -292,10 +292,10 @@ HTMLTextFieldAccessible:: mType = eHTMLTextFieldType; } -NS_IMPL_ISUPPORTS_INHERITED2(HTMLTextFieldAccessible, - Accessible, - nsIAccessibleText, - nsIAccessibleEditableText) +NS_IMPL_ISUPPORTS_INHERITED(HTMLTextFieldAccessible, + Accessible, + nsIAccessibleText, + nsIAccessibleEditableText) role HTMLTextFieldAccessible::NativeRole() diff --git a/accessible/src/html/HTMLLinkAccessible.cpp b/accessible/src/html/HTMLLinkAccessible.cpp index 315d7577414..5a2aa84711e 100644 --- a/accessible/src/html/HTMLLinkAccessible.cpp +++ b/accessible/src/html/HTMLLinkAccessible.cpp @@ -28,8 +28,8 @@ HTMLLinkAccessible:: } // Expose nsIAccessibleHyperLink unconditionally -NS_IMPL_ISUPPORTS_INHERITED1(HTMLLinkAccessible, HyperTextAccessibleWrap, - nsIAccessibleHyperLink) +NS_IMPL_ISUPPORTS_INHERITED(HTMLLinkAccessible, HyperTextAccessibleWrap, + nsIAccessibleHyperLink) //////////////////////////////////////////////////////////////////////////////// // nsIAccessible diff --git a/accessible/src/html/HTMLTableAccessible.cpp b/accessible/src/html/HTMLTableAccessible.cpp index 43e14aeb21b..4322a58d7e8 100644 --- a/accessible/src/html/HTMLTableAccessible.cpp +++ b/accessible/src/html/HTMLTableAccessible.cpp @@ -54,9 +54,9 @@ HTMLTableCellAccessible:: //////////////////////////////////////////////////////////////////////////////// // HTMLTableCellAccessible: nsISupports implementation -NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableCellAccessible, - HyperTextAccessible, - nsIAccessibleTableCell) +NS_IMPL_ISUPPORTS_INHERITED(HTMLTableCellAccessible, + HyperTextAccessible, + nsIAccessibleTableCell) //////////////////////////////////////////////////////////////////////////////// // HTMLTableCellAccessible: Accessible implementation @@ -360,8 +360,8 @@ HTMLTableRowAccessible::NativeRole() // HTMLTableAccessible //////////////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableAccessible, Accessible, - nsIAccessibleTable) +NS_IMPL_ISUPPORTS_INHERITED(HTMLTableAccessible, Accessible, + nsIAccessibleTable) //////////////////////////////////////////////////////////////////////////////// // HTMLTableAccessible: Accessible diff --git a/accessible/src/xpcom/nsAccessibleRelation.cpp b/accessible/src/xpcom/nsAccessibleRelation.cpp index 8b0462a04f0..c3a9d6b4ffc 100644 --- a/accessible/src/xpcom/nsAccessibleRelation.cpp +++ b/accessible/src/xpcom/nsAccessibleRelation.cpp @@ -24,7 +24,7 @@ nsAccessibleRelation::nsAccessibleRelation(uint32_t aType, } // nsISupports -NS_IMPL_ISUPPORTS1(nsAccessibleRelation, nsIAccessibleRelation) +NS_IMPL_ISUPPORTS(nsAccessibleRelation, nsIAccessibleRelation) // nsIAccessibleRelation NS_IMETHODIMP diff --git a/accessible/src/xul/XULElementAccessibles.cpp b/accessible/src/xul/XULElementAccessibles.cpp index f5df1106d3d..eb34c9ee8ca 100644 --- a/accessible/src/xul/XULElementAccessibles.cpp +++ b/accessible/src/xul/XULElementAccessibles.cpp @@ -185,8 +185,8 @@ XULLinkAccessible:: } // Expose nsIAccessibleHyperLink unconditionally -NS_IMPL_ISUPPORTS_INHERITED1(XULLinkAccessible, XULLabelAccessible, - nsIAccessibleHyperLink) +NS_IMPL_ISUPPORTS_INHERITED(XULLinkAccessible, XULLabelAccessible, + nsIAccessibleHyperLink) //////////////////////////////////////////////////////////////////////////////// // XULLinkAccessible. nsIAccessible diff --git a/accessible/src/xul/XULListboxAccessible.cpp b/accessible/src/xul/XULListboxAccessible.cpp index b6757fd62cd..8d2aae5fc52 100644 --- a/accessible/src/xul/XULListboxAccessible.cpp +++ b/accessible/src/xul/XULListboxAccessible.cpp @@ -739,9 +739,9 @@ XULListCellAccessible:: //////////////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(XULListCellAccessible, - HyperTextAccessible, - nsIAccessibleTableCell) +NS_IMPL_ISUPPORTS_INHERITED(XULListCellAccessible, + HyperTextAccessible, + nsIAccessibleTableCell) //////////////////////////////////////////////////////////////////////////////// // XULListCellAccessible: nsIAccessibleTableCell implementation diff --git a/accessible/src/xul/XULTreeAccessible.cpp b/accessible/src/xul/XULTreeAccessible.cpp index 9e0386bd677..b5d11d3f2ce 100644 --- a/accessible/src/xul/XULTreeAccessible.cpp +++ b/accessible/src/xul/XULTreeAccessible.cpp @@ -710,8 +710,8 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessibleBase, Accessible, mTree) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessibleBase) - NS_INTERFACE_TABLE_INHERITED1(XULTreeItemAccessibleBase, - XULTreeItemAccessibleBase) + NS_INTERFACE_TABLE_INHERITED(XULTreeItemAccessibleBase, + XULTreeItemAccessibleBase) NS_INTERFACE_TABLE_TAIL_INHERITING(Accessible) NS_IMPL_ADDREF_INHERITED(XULTreeItemAccessibleBase, Accessible) NS_IMPL_RELEASE_INHERITED(XULTreeItemAccessibleBase, Accessible) diff --git a/accessible/src/xul/XULTreeGridAccessible.cpp b/accessible/src/xul/XULTreeGridAccessible.cpp index e6143ac2a70..93855e066e1 100644 --- a/accessible/src/xul/XULTreeGridAccessible.cpp +++ b/accessible/src/xul/XULTreeGridAccessible.cpp @@ -25,9 +25,9 @@ using namespace mozilla::a11y; //////////////////////////////////////////////////////////////////////////////// // XULTreeGridAccessible: nsISupports implementation -NS_IMPL_ISUPPORTS_INHERITED1(XULTreeGridAccessible, - XULTreeAccessible, - nsIAccessibleTable) +NS_IMPL_ISUPPORTS_INHERITED(XULTreeGridAccessible, + XULTreeAccessible, + nsIAccessibleTable) //////////////////////////////////////////////////////////////////////////////// // XULTreeGridAccessible: nsIAccessibleTable implementation @@ -457,9 +457,9 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeGridCellAccessible, LeafAccessible, mTree, mColumn) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XULTreeGridCellAccessible) - NS_INTERFACE_TABLE_INHERITED2(XULTreeGridCellAccessible, - nsIAccessibleTableCell, - XULTreeGridCellAccessible) + NS_INTERFACE_TABLE_INHERITED(XULTreeGridCellAccessible, + nsIAccessibleTableCell, + XULTreeGridCellAccessible) NS_INTERFACE_TABLE_TAIL_INHERITING(LeafAccessible) NS_IMPL_ADDREF_INHERITED(XULTreeGridCellAccessible, LeafAccessible) NS_IMPL_RELEASE_INHERITED(XULTreeGridCellAccessible, LeafAccessible) diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp index 891580928fe..645022c1839 100644 --- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -13,7 +13,7 @@ namespace mozilla { namespace browser { -NS_IMPL_ISUPPORTS1(AboutRedirector, nsIAboutModule) +NS_IMPL_ISUPPORTS(AboutRedirector, nsIAboutModule) struct RedirEntry { const char* id; diff --git a/browser/components/dirprovider/DirectoryProvider.cpp b/browser/components/dirprovider/DirectoryProvider.cpp index e3f2882e1a3..746a4efa8b0 100644 --- a/browser/components/dirprovider/DirectoryProvider.cpp +++ b/browser/components/dirprovider/DirectoryProvider.cpp @@ -27,9 +27,9 @@ namespace mozilla { namespace browser { -NS_IMPL_ISUPPORTS2(DirectoryProvider, - nsIDirectoryServiceProvider, - nsIDirectoryServiceProvider2) +NS_IMPL_ISUPPORTS(DirectoryProvider, + nsIDirectoryServiceProvider, + nsIDirectoryServiceProvider2) NS_IMETHODIMP DirectoryProvider::GetFile(const char *aKey, bool *aPersist, nsIFile* *aResult) @@ -254,7 +254,7 @@ DirectoryProvider::GetFiles(const char *aKey, nsISimpleEnumerator* *aResult) return NS_ERROR_FAILURE; } -NS_IMPL_ISUPPORTS1(DirectoryProvider::AppendingEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(DirectoryProvider::AppendingEnumerator, nsISimpleEnumerator) NS_IMETHODIMP DirectoryProvider::AppendingEnumerator::HasMoreElements(bool *aResult) diff --git a/browser/components/feeds/src/nsFeedSniffer.cpp b/browser/components/feeds/src/nsFeedSniffer.cpp index 2965aece705..c9c6ea80f00 100644 --- a/browser/components/feeds/src/nsFeedSniffer.cpp +++ b/browser/components/feeds/src/nsFeedSniffer.cpp @@ -39,10 +39,10 @@ #define MAX_BYTES 512u -NS_IMPL_ISUPPORTS3(nsFeedSniffer, - nsIContentSniffer, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(nsFeedSniffer, + nsIContentSniffer, + nsIStreamListener, + nsIRequestObserver) nsresult nsFeedSniffer::ConvertEncodedData(nsIRequest* request, diff --git a/browser/components/migration/src/nsIEHistoryEnumerator.cpp b/browser/components/migration/src/nsIEHistoryEnumerator.cpp index 9154ac8a5e7..7fe31a666e3 100644 --- a/browser/components/migration/src/nsIEHistoryEnumerator.cpp +++ b/browser/components/migration/src/nsIEHistoryEnumerator.cpp @@ -41,7 +41,7 @@ namespace { //////////////////////////////////////////////////////////////////////////////// //// nsIEHistoryEnumerator -NS_IMPL_ISUPPORTS1(nsIEHistoryEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsIEHistoryEnumerator, nsISimpleEnumerator) nsIEHistoryEnumerator::nsIEHistoryEnumerator() { diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp index dd16220a39c..fe616628999 100644 --- a/browser/components/shell/src/nsGNOMEShellService.cpp +++ b/browser/components/shell/src/nsGNOMEShellService.cpp @@ -116,7 +116,7 @@ nsGNOMEShellService::Init() return appPath->GetNativePath(mAppPath); } -NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService) +NS_IMPL_ISUPPORTS(nsGNOMEShellService, nsIShellService) bool nsGNOMEShellService::GetAppPathFromLauncher() diff --git a/browser/components/shell/src/nsMacShellService.cpp b/browser/components/shell/src/nsMacShellService.cpp index 4af703ce0fc..c9351dbbc86 100644 --- a/browser/components/shell/src/nsMacShellService.cpp +++ b/browser/components/shell/src/nsMacShellService.cpp @@ -31,7 +31,7 @@ #define SAFARI_BUNDLE_IDENTIFIER "com.apple.Safari" -NS_IMPL_ISUPPORTS3(nsMacShellService, nsIMacShellService, nsIShellService, nsIWebProgressListener) +NS_IMPL_ISUPPORTS(nsMacShellService, nsIMacShellService, nsIShellService, nsIWebProgressListener) NS_IMETHODIMP nsMacShellService::IsDefaultBrowser(bool aStartupCheck, diff --git a/browser/components/shell/src/nsWindowsShellService.cpp b/browser/components/shell/src/nsWindowsShellService.cpp index 5218e0a6c85..d3bb673cb68 100644 --- a/browser/components/shell/src/nsWindowsShellService.cpp +++ b/browser/components/shell/src/nsWindowsShellService.cpp @@ -60,7 +60,7 @@ using mozilla::IsWin8OrLater; using namespace mozilla; using namespace mozilla::gfx; -NS_IMPL_ISUPPORTS2(nsWindowsShellService, nsIWindowsShellService, nsIShellService) +NS_IMPL_ISUPPORTS(nsWindowsShellService, nsIWindowsShellService, nsIShellService) static nsresult OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey) diff --git a/caps/src/DomainPolicy.cpp b/caps/src/DomainPolicy.cpp index 2207d69ce80..ec0230cbe3b 100644 --- a/caps/src/DomainPolicy.cpp +++ b/caps/src/DomainPolicy.cpp @@ -9,7 +9,7 @@ namespace mozilla { -NS_IMPL_ISUPPORTS1(DomainPolicy, nsIDomainPolicy) +NS_IMPL_ISUPPORTS(DomainPolicy, nsIDomainPolicy) DomainPolicy::DomainPolicy() : mBlacklist(new DomainSet()) , mSuperBlacklist(new DomainSet()) @@ -92,7 +92,7 @@ GetCanonicalClone(nsIURI* aURI) return clone.forget(); } -NS_IMPL_ISUPPORTS1(DomainSet, nsIDomainSet) +NS_IMPL_ISUPPORTS(DomainSet, nsIDomainSet) NS_IMETHODIMP DomainSet::Add(nsIURI* aDomain) diff --git a/caps/src/nsNullPrincipal.cpp b/caps/src/nsNullPrincipal.cpp index 32d2ce3d50e..dc87cf1ee40 100644 --- a/caps/src/nsNullPrincipal.cpp +++ b/caps/src/nsNullPrincipal.cpp @@ -29,12 +29,12 @@ using namespace mozilla; NS_IMPL_CLASSINFO(nsNullPrincipal, nullptr, nsIClassInfo::MAIN_THREAD_ONLY, NS_NULLPRINCIPAL_CID) -NS_IMPL_QUERY_INTERFACE2_CI(nsNullPrincipal, +NS_IMPL_QUERY_INTERFACE_CI(nsNullPrincipal, + nsIPrincipal, + nsISerializable) +NS_IMPL_CI_INTERFACE_GETTER(nsNullPrincipal, nsIPrincipal, nsISerializable) -NS_IMPL_CI_INTERFACE_GETTER2(nsNullPrincipal, - nsIPrincipal, - nsISerializable) NS_IMETHODIMP_(MozExternalRefCountType) nsNullPrincipal::AddRef() diff --git a/caps/src/nsPrincipal.cpp b/caps/src/nsPrincipal.cpp index d2c1c4bb139..46bd9d2b585 100644 --- a/caps/src/nsPrincipal.cpp +++ b/caps/src/nsPrincipal.cpp @@ -116,12 +116,12 @@ void nsPrincipal::dumpImpl() NS_IMPL_CLASSINFO(nsPrincipal, nullptr, nsIClassInfo::MAIN_THREAD_ONLY, NS_PRINCIPAL_CID) -NS_IMPL_QUERY_INTERFACE2_CI(nsPrincipal, +NS_IMPL_QUERY_INTERFACE_CI(nsPrincipal, + nsIPrincipal, + nsISerializable) +NS_IMPL_CI_INTERFACE_GETTER(nsPrincipal, nsIPrincipal, nsISerializable) -NS_IMPL_CI_INTERFACE_GETTER2(nsPrincipal, - nsIPrincipal, - nsISerializable) NS_IMPL_ADDREF_INHERITED(nsPrincipal, nsBasePrincipal) NS_IMPL_RELEASE_INHERITED(nsPrincipal, nsBasePrincipal) @@ -627,10 +627,10 @@ static const char EXPANDED_PRINCIPAL_SPEC[] = "[Expanded Principal]"; NS_IMPL_CLASSINFO(nsExpandedPrincipal, nullptr, nsIClassInfo::MAIN_THREAD_ONLY, NS_EXPANDEDPRINCIPAL_CID) -NS_IMPL_QUERY_INTERFACE2_CI(nsExpandedPrincipal, - nsIPrincipal, - nsIExpandedPrincipal) -NS_IMPL_CI_INTERFACE_GETTER2(nsExpandedPrincipal, +NS_IMPL_QUERY_INTERFACE_CI(nsExpandedPrincipal, + nsIPrincipal, + nsIExpandedPrincipal) +NS_IMPL_CI_INTERFACE_GETTER(nsExpandedPrincipal, nsIPrincipal, nsIExpandedPrincipal) NS_IMPL_ADDREF_INHERITED(nsExpandedPrincipal, nsBasePrincipal) diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp index f8cb3341e40..08b2f1bf16c 100644 --- a/caps/src/nsScriptSecurityManager.cpp +++ b/caps/src/nsScriptSecurityManager.cpp @@ -339,11 +339,11 @@ nsScriptSecurityManager::GetCxSubjectPrincipal(JSContext *cx) //////////////////////////////////// // Methods implementing ISupports // //////////////////////////////////// -NS_IMPL_ISUPPORTS4(nsScriptSecurityManager, - nsIScriptSecurityManager, - nsIXPCSecurityManager, - nsIChannelEventSink, - nsIObserver) +NS_IMPL_ISUPPORTS(nsScriptSecurityManager, + nsIScriptSecurityManager, + nsIXPCSecurityManager, + nsIChannelEventSink, + nsIObserver) /////////////////////////////////////////////////// // Methods implementing nsIScriptSecurityManager // diff --git a/caps/src/nsSecurityManagerFactory.cpp b/caps/src/nsSecurityManagerFactory.cpp index 32155f7fe13..a57ea3b7a59 100644 --- a/caps/src/nsSecurityManagerFactory.cpp +++ b/caps/src/nsSecurityManagerFactory.cpp @@ -44,7 +44,7 @@ nsSecurityNameSet::~nsSecurityNameSet() { } -NS_IMPL_ISUPPORTS1(nsSecurityNameSet, nsIScriptExternalNameSet) +NS_IMPL_ISUPPORTS(nsSecurityNameSet, nsIScriptExternalNameSet) static bool netscape_security_enablePrivilege(JSContext *cx, unsigned argc, JS::Value *vp) diff --git a/caps/src/nsSystemPrincipal.cpp b/caps/src/nsSystemPrincipal.cpp index a6f089b343c..634128a6741 100644 --- a/caps/src/nsSystemPrincipal.cpp +++ b/caps/src/nsSystemPrincipal.cpp @@ -22,12 +22,12 @@ NS_IMPL_CLASSINFO(nsSystemPrincipal, nullptr, nsIClassInfo::SINGLETON | nsIClassInfo::MAIN_THREAD_ONLY, NS_SYSTEMPRINCIPAL_CID) -NS_IMPL_QUERY_INTERFACE2_CI(nsSystemPrincipal, +NS_IMPL_QUERY_INTERFACE_CI(nsSystemPrincipal, + nsIPrincipal, + nsISerializable) +NS_IMPL_CI_INTERFACE_GETTER(nsSystemPrincipal, nsIPrincipal, nsISerializable) -NS_IMPL_CI_INTERFACE_GETTER2(nsSystemPrincipal, - nsIPrincipal, - nsISerializable) NS_IMETHODIMP_(MozExternalRefCountType) nsSystemPrincipal::AddRef() diff --git a/chrome/src/nsChromeProtocolHandler.cpp b/chrome/src/nsChromeProtocolHandler.cpp index 5f074bc99c7..f5a4dad969c 100644 --- a/chrome/src/nsChromeProtocolHandler.cpp +++ b/chrome/src/nsChromeProtocolHandler.cpp @@ -27,9 +27,9 @@ //////////////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS2(nsChromeProtocolHandler, - nsIProtocolHandler, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsChromeProtocolHandler, + nsIProtocolHandler, + nsISupportsWeakReference) //////////////////////////////////////////////////////////////////////////////// // nsIProtocolHandler methods: diff --git a/content/base/src/Attr.cpp b/content/base/src/Attr.cpp index e402550d93a..76f7f7a79e4 100644 --- a/content/base/src/Attr.cpp +++ b/content/base/src/Attr.cpp @@ -104,8 +104,8 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END // QueryInterface implementation for Attr NS_INTERFACE_TABLE_HEAD(Attr) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY - NS_INTERFACE_TABLE6(Attr, nsINode, nsIDOMAttr, nsIAttribute, nsIDOMNode, - nsIDOMEventTarget, EventTarget) + NS_INTERFACE_TABLE(Attr, nsINode, nsIDOMAttr, nsIAttribute, nsIDOMNode, + nsIDOMEventTarget, EventTarget) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(Attr) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsISupportsWeakReference, new nsNodeSupportsWeakRefTearoff(this)) diff --git a/content/base/src/Comment.cpp b/content/base/src/Comment.cpp index cbcd03ab98a..b9cb2705159 100644 --- a/content/base/src/Comment.cpp +++ b/content/base/src/Comment.cpp @@ -22,8 +22,8 @@ Comment::~Comment() { } -NS_IMPL_ISUPPORTS_INHERITED3(Comment, nsGenericDOMDataNode, nsIDOMNode, - nsIDOMCharacterData, nsIDOMComment) +NS_IMPL_ISUPPORTS_INHERITED(Comment, nsGenericDOMDataNode, nsIDOMNode, + nsIDOMCharacterData, nsIDOMComment) bool Comment::IsNodeOfType(uint32_t aFlags) const diff --git a/content/base/src/DOMRect.cpp b/content/base/src/DOMRect.cpp index 2b1cda1d447..b26414b6e29 100644 --- a/content/base/src/DOMRect.cpp +++ b/content/base/src/DOMRect.cpp @@ -29,7 +29,7 @@ DOMRectReadOnly::WrapObject(JSContext* aCx) // ----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS_INHERITED1(DOMRect, DOMRectReadOnly, nsIDOMClientRect) +NS_IMPL_ISUPPORTS_INHERITED(DOMRect, DOMRectReadOnly, nsIDOMClientRect) #define FORWARD_GETTER(_name) \ NS_IMETHODIMP \ @@ -76,7 +76,7 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(DOMRectList, mParent, mArray) NS_INTERFACE_TABLE_HEAD(DOMRectList) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY - NS_INTERFACE_TABLE1(DOMRectList, nsIDOMClientRectList) + NS_INTERFACE_TABLE(DOMRectList, nsIDOMClientRectList) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(DOMRectList) NS_INTERFACE_MAP_END diff --git a/content/base/src/DocumentType.cpp b/content/base/src/DocumentType.cpp index 4b96c44185b..cf02f28a45c 100644 --- a/content/base/src/DocumentType.cpp +++ b/content/base/src/DocumentType.cpp @@ -82,8 +82,8 @@ DocumentType::~DocumentType() { } -NS_IMPL_ISUPPORTS_INHERITED2(DocumentType, nsGenericDOMDataNode, nsIDOMNode, - nsIDOMDocumentType) +NS_IMPL_ISUPPORTS_INHERITED(DocumentType, nsGenericDOMDataNode, nsIDOMNode, + nsIDOMDocumentType) bool DocumentType::IsNodeOfType(uint32_t aFlags) const diff --git a/content/base/src/FragmentOrElement.cpp b/content/base/src/FragmentOrElement.cpp index 0a1b20cd06c..2ebbfb4390e 100644 --- a/content/base/src/FragmentOrElement.cpp +++ b/content/base/src/FragmentOrElement.cpp @@ -375,7 +375,7 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END NS_INTERFACE_TABLE_HEAD(nsChildContentList) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY - NS_INTERFACE_TABLE2(nsChildContentList, nsINodeList, nsIDOMNodeList) + NS_INTERFACE_TABLE(nsChildContentList, nsINodeList, nsIDOMNodeList) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsChildContentList) NS_INTERFACE_MAP_END @@ -463,8 +463,8 @@ FragmentOrElement::Children() //---------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsNodeWeakReference, - nsIWeakReference) +NS_IMPL_ISUPPORTS(nsNodeWeakReference, + nsIWeakReference) nsNodeWeakReference::~nsNodeWeakReference() { diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp index ca6b01970c6..8fade9d4e9b 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp @@ -12,7 +12,7 @@ #include "nsIScriptObjectPrincipal.h" #include "nsThreadUtils.h" -NS_IMPL_ISUPPORTS1(ThirdPartyUtil, mozIThirdPartyUtil) +NS_IMPL_ISUPPORTS(ThirdPartyUtil, mozIThirdPartyUtil) nsresult ThirdPartyUtil::Init() diff --git a/content/base/src/nsCCUncollectableMarker.cpp b/content/base/src/nsCCUncollectableMarker.cpp index 29fe87930fd..b677f4585a5 100644 --- a/content/base/src/nsCCUncollectableMarker.cpp +++ b/content/base/src/nsCCUncollectableMarker.cpp @@ -41,7 +41,7 @@ uint32_t nsCCUncollectableMarker::sGeneration = 0; #include "nsXULPrototypeCache.h" #endif -NS_IMPL_ISUPPORTS1(nsCCUncollectableMarker, nsIObserver) +NS_IMPL_ISUPPORTS(nsCCUncollectableMarker, nsIObserver) /* static */ nsresult diff --git a/content/base/src/nsCSPService.cpp b/content/base/src/nsCSPService.cpp index 7461c86e2ab..4f5c0d5062a 100644 --- a/content/base/src/nsCSPService.cpp +++ b/content/base/src/nsCSPService.cpp @@ -48,7 +48,7 @@ CSPService::~CSPService() mAppStatusCache.Clear(); } -NS_IMPL_ISUPPORTS2(CSPService, nsIContentPolicy, nsIChannelEventSink) +NS_IMPL_ISUPPORTS(CSPService, nsIContentPolicy, nsIChannelEventSink) /* nsIContentPolicy implementation */ NS_IMETHODIMP diff --git a/content/base/src/nsChannelPolicy.cpp b/content/base/src/nsChannelPolicy.cpp index bb58afa840a..7d647695bbe 100644 --- a/content/base/src/nsChannelPolicy.cpp +++ b/content/base/src/nsChannelPolicy.cpp @@ -14,7 +14,7 @@ nsChannelPolicy::~nsChannelPolicy() { } -NS_IMPL_ISUPPORTS1(nsChannelPolicy, nsIChannelPolicy) +NS_IMPL_ISUPPORTS(nsChannelPolicy, nsIChannelPolicy) NS_IMETHODIMP nsChannelPolicy::GetLoadType(uint32_t *aLoadType) diff --git a/content/base/src/nsContentAreaDragDrop.cpp b/content/base/src/nsContentAreaDragDrop.cpp index b20753aa274..721e0e84111 100644 --- a/content/base/src/nsContentAreaDragDrop.cpp +++ b/content/base/src/nsContentAreaDragDrop.cpp @@ -127,7 +127,7 @@ nsContentAreaDragDrop::GetDragData(nsPIDOMWindow* aWindow, } -NS_IMPL_ISUPPORTS1(nsContentAreaDragDropDataProvider, nsIFlavorDataProvider) +NS_IMPL_ISUPPORTS(nsContentAreaDragDropDataProvider, nsIFlavorDataProvider) // SaveURIToFile // used on platforms where it's possible to drag items (e.g. images) diff --git a/content/base/src/nsContentList.cpp b/content/base/src/nsContentList.cpp index 5a621d253a7..439eec4ffb2 100644 --- a/content/base/src/nsContentList.cpp +++ b/content/base/src/nsContentList.cpp @@ -85,7 +85,7 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END // QueryInterface implementation for nsBaseContentList NS_INTERFACE_TABLE_HEAD(nsBaseContentList) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY - NS_INTERFACE_TABLE2(nsBaseContentList, nsINodeList, nsIDOMNodeList) + NS_INTERFACE_TABLE(nsBaseContentList, nsINodeList, nsIDOMNodeList) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsBaseContentList) NS_INTERFACE_MAP_END @@ -493,9 +493,9 @@ nsContentList::WrapObject(JSContext *cx) return HTMLCollectionBinding::Wrap(cx, this); } -NS_IMPL_ISUPPORTS_INHERITED3(nsContentList, nsBaseContentList, - nsIHTMLCollection, nsIDOMHTMLCollection, - nsIMutationObserver) +NS_IMPL_ISUPPORTS_INHERITED(nsContentList, nsBaseContentList, + nsIHTMLCollection, nsIDOMHTMLCollection, + nsIMutationObserver) uint32_t nsContentList::Length(bool aDoFlush) diff --git a/content/base/src/nsContentPolicy.cpp b/content/base/src/nsContentPolicy.cpp index b6b58a97df9..5841fe7fe50 100644 --- a/content/base/src/nsContentPolicy.cpp +++ b/content/base/src/nsContentPolicy.cpp @@ -20,7 +20,7 @@ #include "nsIContent.h" #include "nsCOMArray.h" -NS_IMPL_ISUPPORTS1(nsContentPolicy, nsIContentPolicy) +NS_IMPL_ISUPPORTS(nsContentPolicy, nsIContentPolicy) #ifdef PR_LOGGING static PRLogModuleInfo* gConPolLog; diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp index eba3f7e908b..f4ce2a79831 100644 --- a/content/base/src/nsContentUtils.cpp +++ b/content/base/src/nsContentUtils.cpp @@ -278,7 +278,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(DOMEventListenerManagersHashReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(DOMEventListenerManagersHashReporter, nsIMemoryReporter) class EventListenerManagerMapEntry : public PLDHashEntryHdr { @@ -5390,9 +5390,9 @@ nsContentUtils::CheckSameOrigin(nsIChannel *aOldChannel, nsIChannel *aNewChannel return rv; } -NS_IMPL_ISUPPORTS2(SameOriginChecker, - nsIChannelEventSink, - nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(SameOriginChecker, + nsIChannelEventSink, + nsIInterfaceRequestor) NS_IMETHODIMP SameOriginChecker::AsyncOnChannelRedirect(nsIChannel *aOldChannel, diff --git a/content/base/src/nsCrossSiteListenerProxy.cpp b/content/base/src/nsCrossSiteListenerProxy.cpp index e1a4323a9ef..15c3a71932a 100644 --- a/content/base/src/nsCrossSiteListenerProxy.cpp +++ b/content/base/src/nsCrossSiteListenerProxy.cpp @@ -397,9 +397,9 @@ nsPreflightCache::GetCacheKey(nsIURI* aURI, ////////////////////////////////////////////////////////////////////////// // nsCORSListenerProxy -NS_IMPL_ISUPPORTS5(nsCORSListenerProxy, nsIStreamListener, - nsIRequestObserver, nsIChannelEventSink, - nsIInterfaceRequestor, nsIAsyncVerifyRedirectCallback) +NS_IMPL_ISUPPORTS(nsCORSListenerProxy, nsIStreamListener, + nsIRequestObserver, nsIChannelEventSink, + nsIInterfaceRequestor, nsIAsyncVerifyRedirectCallback) /* static */ void @@ -931,9 +931,9 @@ private: bool mWithCredentials; }; -NS_IMPL_ISUPPORTS4(nsCORSPreflightListener, nsIStreamListener, - nsIRequestObserver, nsIInterfaceRequestor, - nsIChannelEventSink) +NS_IMPL_ISUPPORTS(nsCORSPreflightListener, nsIStreamListener, + nsIRequestObserver, nsIInterfaceRequestor, + nsIChannelEventSink) void nsCORSPreflightListener::AddResultToCache(nsIRequest *aRequest) diff --git a/content/base/src/nsDOMAttributeMap.cpp b/content/base/src/nsDOMAttributeMap.cpp index f96aaa87ac0..a296453c4cb 100644 --- a/content/base/src/nsDOMAttributeMap.cpp +++ b/content/base/src/nsDOMAttributeMap.cpp @@ -114,7 +114,7 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END // QueryInterface implementation for nsDOMAttributeMap NS_INTERFACE_TABLE_HEAD(nsDOMAttributeMap) - NS_INTERFACE_TABLE1(nsDOMAttributeMap, nsIDOMMozNamedAttrMap) + NS_INTERFACE_TABLE(nsDOMAttributeMap, nsIDOMMozNamedAttrMap) NS_INTERFACE_TABLE_TO_MAP_SEGUE NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsDOMAttributeMap) diff --git a/content/base/src/nsDOMBlobBuilder.cpp b/content/base/src/nsDOMBlobBuilder.cpp index 6c6f29ae190..a109b932b1c 100644 --- a/content/base/src/nsDOMBlobBuilder.cpp +++ b/content/base/src/nsDOMBlobBuilder.cpp @@ -21,8 +21,8 @@ using namespace mozilla; using namespace mozilla::dom; -NS_IMPL_ISUPPORTS_INHERITED1(nsDOMMultipartFile, nsDOMFile, - nsIJSNativeInitializer) +NS_IMPL_ISUPPORTS_INHERITED(nsDOMMultipartFile, nsDOMFile, + nsIJSNativeInitializer) NS_IMETHODIMP nsDOMMultipartFile::GetSize(uint64_t* aLength) diff --git a/content/base/src/nsDOMFile.cpp b/content/base/src/nsDOMFile.cpp index ac120b4c3e8..e7655944c62 100644 --- a/content/base/src/nsDOMFile.cpp +++ b/content/base/src/nsDOMFile.cpp @@ -710,7 +710,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(nsDOMMemoryFileDataOwnerMemoryReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(nsDOMMemoryFileDataOwnerMemoryReporter, nsIMemoryReporter) /* static */ void nsDOMMemoryFile::DataOwner::EnsureMemoryReporterRegistered() diff --git a/content/base/src/nsDataDocumentContentPolicy.cpp b/content/base/src/nsDataDocumentContentPolicy.cpp index 6d2662dc6f0..06b84ca5f6c 100644 --- a/content/base/src/nsDataDocumentContentPolicy.cpp +++ b/content/base/src/nsDataDocumentContentPolicy.cpp @@ -16,7 +16,7 @@ #include "nsINode.h" #include "nsIDOMWindow.h" -NS_IMPL_ISUPPORTS1(nsDataDocumentContentPolicy, nsIContentPolicy) +NS_IMPL_ISUPPORTS(nsDataDocumentContentPolicy, nsIContentPolicy) // Helper method for ShouldLoad() // Checks a URI for the given flags. Returns true if the URI has the flags, diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 869bbc36351..55de916ba98 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -723,9 +723,9 @@ nsDOMStyleSheetList::~nsDOMStyleSheetList() } } -NS_IMPL_ISUPPORTS_INHERITED2(nsDOMStyleSheetList, StyleSheetList, - nsIDocumentObserver, - nsIMutationObserver) +NS_IMPL_ISUPPORTS_INHERITED(nsDOMStyleSheetList, StyleSheetList, + nsIDocumentObserver, + nsIMutationObserver) uint32_t nsDOMStyleSheetList::Length() @@ -800,7 +800,7 @@ nsDOMStyleSheetList::StyleSheetRemoved(nsIDocument *aDocument, } // nsOnloadBlocker implementation -NS_IMPL_ISUPPORTS1(nsOnloadBlocker, nsIRequest) +NS_IMPL_ISUPPORTS(nsOnloadBlocker, nsIRequest) NS_IMETHODIMP nsOnloadBlocker::GetName(nsACString &aResult) @@ -1120,9 +1120,9 @@ nsExternalResourceMap::AddExternalResource(nsIURI* aURI, return rv; } -NS_IMPL_ISUPPORTS2(nsExternalResourceMap::PendingLoad, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(nsExternalResourceMap::PendingLoad, + nsIStreamListener, + nsIRequestObserver) NS_IMETHODIMP nsExternalResourceMap::PendingLoad::OnStartRequest(nsIRequest *aRequest, @@ -1317,11 +1317,11 @@ nsExternalResourceMap::PendingLoad::StartLoad(nsIURI* aURI, return channel->AsyncOpen(this, nullptr); } -NS_IMPL_ISUPPORTS1(nsExternalResourceMap::LoadgroupCallbacks, - nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(nsExternalResourceMap::LoadgroupCallbacks, + nsIInterfaceRequestor) #define IMPL_SHIM(_i) \ - NS_IMPL_ISUPPORTS1(nsExternalResourceMap::LoadgroupCallbacks::_i##Shim, _i) + NS_IMPL_ISUPPORTS(nsExternalResourceMap::LoadgroupCallbacks::_i##Shim, _i) IMPL_SHIM(nsILoadContext) IMPL_SHIM(nsIProgressEventSink) @@ -5565,7 +5565,7 @@ class ProcessStackRunner MOZ_FINAL : public nsIRunnable bool mIsBaseQueue; }; -NS_IMPL_ISUPPORTS1(ProcessStackRunner, nsIRunnable); +NS_IMPL_ISUPPORTS(ProcessStackRunner, nsIRunnable); } // anonymous namespace @@ -9326,7 +9326,7 @@ public: } NS_DECL_ISUPPORTS }; -NS_IMPL_ISUPPORTS1(StubCSSLoaderObserver, nsICSSLoaderObserver) +NS_IMPL_ISUPPORTS(StubCSSLoaderObserver, nsICSSLoaderObserver) } @@ -11437,9 +11437,9 @@ public: bool mUserInputOrChromeCaller; }; -NS_IMPL_ISUPPORTS_INHERITED1(nsPointerLockPermissionRequest, - nsRunnable, - nsIContentPermissionRequest) +NS_IMPL_ISUPPORTS_INHERITED(nsPointerLockPermissionRequest, + nsRunnable, + nsIContentPermissionRequest) NS_IMETHODIMP nsPointerLockPermissionRequest::GetTypes(nsIArray** aTypes) diff --git a/content/base/src/nsFrameLoader.cpp b/content/base/src/nsFrameLoader.cpp index da4295967a8..7a87073c5c7 100644 --- a/content/base/src/nsFrameLoader.cpp +++ b/content/base/src/nsFrameLoader.cpp @@ -122,7 +122,7 @@ public: nsRefPtr mDocShell; }; -NS_IMPL_ISUPPORTS1(nsContentView, nsIContentView) +NS_IMPL_ISUPPORTS(nsContentView, nsIContentView) nsresult nsContentView::Update(const ViewConfig& aConfig) diff --git a/content/base/src/nsFrameMessageManager.cpp b/content/base/src/nsFrameMessageManager.cpp index 60175f736a7..4d0fb1de312 100644 --- a/content/base/src/nsFrameMessageManager.cpp +++ b/content/base/src/nsFrameMessageManager.cpp @@ -1210,7 +1210,7 @@ protected: MessageManagerReferentCount* aReferentCount); }; -NS_IMPL_ISUPPORTS1(MessageManagerReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(MessageManagerReporter, nsIMemoryReporter) static PLDHashOperator CollectMessageListenerData(const nsAString& aKey, @@ -1611,7 +1611,7 @@ nsFrameScriptExecutor::InitTabChildGlobalInternal(nsISupports* aScope, return true; } -NS_IMPL_ISUPPORTS1(nsScriptCacheCleaner, nsIObserver) +NS_IMPL_ISUPPORTS(nsScriptCacheCleaner, nsIObserver) nsFrameMessageManager* nsFrameMessageManager::sChildProcessManager = nullptr; nsFrameMessageManager* nsFrameMessageManager::sParentProcessManager = nullptr; diff --git a/content/base/src/nsGenConImageContent.cpp b/content/base/src/nsGenConImageContent.cpp index fd131120bd2..88cb4abc1b9 100644 --- a/content/base/src/nsGenConImageContent.cpp +++ b/content/base/src/nsGenConImageContent.cpp @@ -63,11 +63,11 @@ public: NS_DECL_ISUPPORTS_INHERITED }; -NS_IMPL_ISUPPORTS_INHERITED3(nsGenConImageContent, - nsXMLElement, - nsIImageLoadingContent, - imgINotificationObserver, - imgIOnloadBlocker) +NS_IMPL_ISUPPORTS_INHERITED(nsGenConImageContent, + nsXMLElement, + nsIImageLoadingContent, + imgINotificationObserver, + imgIOnloadBlocker) nsresult NS_NewGenConImageContent(nsIContent** aResult, already_AddRefed&& aNodeInfo, diff --git a/content/base/src/nsHostObjectProtocolHandler.cpp b/content/base/src/nsHostObjectProtocolHandler.cpp index f19900453cf..10ec44c5706 100644 --- a/content/base/src/nsHostObjectProtocolHandler.cpp +++ b/content/base/src/nsHostObjectProtocolHandler.cpp @@ -47,7 +47,7 @@ class HostObjectURLsReporter MOZ_FINAL : public nsIMemoryReporter } }; -NS_IMPL_ISUPPORTS1(HostObjectURLsReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(HostObjectURLsReporter, nsIMemoryReporter) class BlobURLsReporter MOZ_FINAL : public nsIMemoryReporter { @@ -250,7 +250,7 @@ class BlobURLsReporter MOZ_FINAL : public nsIMemoryReporter } }; -NS_IMPL_ISUPPORTS1(BlobURLsReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(BlobURLsReporter, nsIMemoryReporter) } @@ -407,7 +407,7 @@ GetDataObject(nsIURI* aURI) // ----------------------------------------------------------------------- // Protocol handler -NS_IMPL_ISUPPORTS1(nsHostObjectProtocolHandler, nsIProtocolHandler) +NS_IMPL_ISUPPORTS(nsHostObjectProtocolHandler, nsIProtocolHandler) NS_IMETHODIMP nsHostObjectProtocolHandler::GetDefaultPort(int32_t *result) diff --git a/content/base/src/nsMappedAttributes.cpp b/content/base/src/nsMappedAttributes.cpp index 6b5f9352737..c5598fdb6e3 100644 --- a/content/base/src/nsMappedAttributes.cpp +++ b/content/base/src/nsMappedAttributes.cpp @@ -74,8 +74,8 @@ void* nsMappedAttributes::operator new(size_t aSize, uint32_t aAttrCount) CPP_TH return newAttrs; } -NS_IMPL_ISUPPORTS1(nsMappedAttributes, - nsIStyleRule) +NS_IMPL_ISUPPORTS(nsMappedAttributes, + nsIStyleRule) void nsMappedAttributes::SetAndTakeAttr(nsIAtom* aAttrName, nsAttrValue& aValue) diff --git a/content/base/src/nsMixedContentBlocker.cpp b/content/base/src/nsMixedContentBlocker.cpp index 442737b8303..40fed3c9bb5 100644 --- a/content/base/src/nsMixedContentBlocker.cpp +++ b/content/base/src/nsMixedContentBlocker.cpp @@ -150,7 +150,7 @@ nsMixedContentBlocker::~nsMixedContentBlocker() { } -NS_IMPL_ISUPPORTS1(nsMixedContentBlocker, nsIContentPolicy) +NS_IMPL_ISUPPORTS(nsMixedContentBlocker, nsIContentPolicy) static void LogMixedContentMessage(MixedContentTypes aClassification, diff --git a/content/base/src/nsNoDataProtocolContentPolicy.cpp b/content/base/src/nsNoDataProtocolContentPolicy.cpp index ca8ee3cd668..e722bf841b6 100644 --- a/content/base/src/nsNoDataProtocolContentPolicy.cpp +++ b/content/base/src/nsNoDataProtocolContentPolicy.cpp @@ -17,7 +17,7 @@ #include "nsIExternalProtocolHandler.h" #include "nsNetUtil.h" -NS_IMPL_ISUPPORTS1(nsNoDataProtocolContentPolicy, nsIContentPolicy) +NS_IMPL_ISUPPORTS(nsNoDataProtocolContentPolicy, nsIContentPolicy) NS_IMETHODIMP nsNoDataProtocolContentPolicy::ShouldLoad(uint32_t aContentType, diff --git a/content/base/src/nsNodeInfo.cpp b/content/base/src/nsNodeInfo.cpp index e2bf37e7e44..60bf4955b53 100644 --- a/content/base/src/nsNodeInfo.cpp +++ b/content/base/src/nsNodeInfo.cpp @@ -165,7 +165,7 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsNodeInfo) NS_IMPL_CYCLE_COLLECTING_RELEASE_WITH_DESTROY(nsNodeInfo, LastRelease()) NS_INTERFACE_TABLE_HEAD(nsNodeInfo) - NS_INTERFACE_TABLE1(nsNodeInfo, nsINodeInfo) + NS_INTERFACE_TABLE(nsNodeInfo, nsINodeInfo) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsNodeInfo) NS_INTERFACE_MAP_END diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp index 555f2a996e9..1472a441f8e 100644 --- a/content/base/src/nsObjectLoadingContent.cpp +++ b/content/base/src/nsObjectLoadingContent.cpp @@ -395,7 +395,7 @@ private: nsCOMPtr mContent; }; -NS_IMPL_ISUPPORTS_INHERITED1(nsStopPluginRunnable, nsRunnable, nsITimerCallback) +NS_IMPL_ISUPPORTS_INHERITED(nsStopPluginRunnable, nsRunnable, nsITimerCallback) NS_IMETHODIMP nsStopPluginRunnable::Notify(nsITimer *aTimer) @@ -3514,5 +3514,5 @@ nsObjectLoadingContent::SetupProtoChainRunner::Run() return NS_OK; } -NS_IMPL_ISUPPORTS1(nsObjectLoadingContent::SetupProtoChainRunner, nsIRunnable) +NS_IMPL_ISUPPORTS(nsObjectLoadingContent::SetupProtoChainRunner, nsIRunnable) diff --git a/content/base/src/nsPlainTextSerializer.cpp b/content/base/src/nsPlainTextSerializer.cpp index 8736ac5a54b..fa8f4075181 100644 --- a/content/base/src/nsPlainTextSerializer.cpp +++ b/content/base/src/nsPlainTextSerializer.cpp @@ -112,8 +112,8 @@ nsPlainTextSerializer::~nsPlainTextSerializer() NS_WARN_IF_FALSE(mHeadLevel == 0, "Wrong head level!"); } -NS_IMPL_ISUPPORTS1(nsPlainTextSerializer, - nsIContentSerializer) +NS_IMPL_ISUPPORTS(nsPlainTextSerializer, + nsIContentSerializer) NS_IMETHODIMP diff --git a/content/base/src/nsReferencedElement.cpp b/content/base/src/nsReferencedElement.cpp index 84eaff5f137..b291d5fe897 100644 --- a/content/base/src/nsReferencedElement.cpp +++ b/content/base/src/nsReferencedElement.cpp @@ -217,8 +217,8 @@ nsReferencedElement::Observe(Element* aOldElement, NS_IMPL_ISUPPORTS_INHERITED0(nsReferencedElement::ChangeNotification, nsRunnable) -NS_IMPL_ISUPPORTS1(nsReferencedElement::DocumentLoadNotification, - nsIObserver) +NS_IMPL_ISUPPORTS(nsReferencedElement::DocumentLoadNotification, + nsIObserver) NS_IMETHODIMP nsReferencedElement::DocumentLoadNotification::Observe(nsISupports* aSubject, diff --git a/content/base/src/nsScriptLoader.cpp b/content/base/src/nsScriptLoader.cpp index 81117720a41..a6a4c345489 100644 --- a/content/base/src/nsScriptLoader.cpp +++ b/content/base/src/nsScriptLoader.cpp @@ -177,7 +177,7 @@ nsScriptLoader::~nsScriptLoader() } } -NS_IMPL_ISUPPORTS1(nsScriptLoader, nsIStreamLoaderObserver) +NS_IMPL_ISUPPORTS(nsScriptLoader, nsIStreamLoaderObserver) // Helper method for checking if the script element is an event-handler // This means that it has both a for-attribute and a event-attribute. diff --git a/content/base/src/nsSyncLoadService.cpp b/content/base/src/nsSyncLoadService.cpp index 9fb52f45357..8aec1d2a764 100644 --- a/content/base/src/nsSyncLoadService.cpp +++ b/content/base/src/nsSyncLoadService.cpp @@ -85,9 +85,9 @@ nsForceXMLListener::~nsForceXMLListener() { } -NS_IMPL_ISUPPORTS2(nsForceXMLListener, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(nsForceXMLListener, + nsIStreamListener, + nsIRequestObserver) NS_IMETHODIMP nsForceXMLListener::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) @@ -116,12 +116,12 @@ nsSyncLoader::~nsSyncLoader() } } -NS_IMPL_ISUPPORTS5(nsSyncLoader, - nsIStreamListener, - nsIRequestObserver, - nsIChannelEventSink, - nsIInterfaceRequestor, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsSyncLoader, + nsIStreamListener, + nsIRequestObserver, + nsIChannelEventSink, + nsIInterfaceRequestor, + nsISupportsWeakReference) nsresult nsSyncLoader::LoadDocument(nsIChannel* aChannel, diff --git a/content/base/src/nsTextNode.cpp b/content/base/src/nsTextNode.cpp index feda49d8a7a..e1795264478 100644 --- a/content/base/src/nsTextNode.cpp +++ b/content/base/src/nsTextNode.cpp @@ -96,8 +96,8 @@ nsTextNode::~nsTextNode() { } -NS_IMPL_ISUPPORTS_INHERITED3(nsTextNode, nsGenericDOMDataNode, nsIDOMNode, - nsIDOMText, nsIDOMCharacterData) +NS_IMPL_ISUPPORTS_INHERITED(nsTextNode, nsGenericDOMDataNode, nsIDOMNode, + nsIDOMText, nsIDOMCharacterData) JSObject* nsTextNode::WrapNode(JSContext *aCx) @@ -222,8 +222,8 @@ NS_NewAttributeContent(nsNodeInfoManager *aNodeInfoManager, return NS_OK; } -NS_IMPL_ISUPPORTS_INHERITED1(nsAttributeTextNode, nsTextNode, - nsIMutationObserver) +NS_IMPL_ISUPPORTS_INHERITED(nsAttributeTextNode, nsTextNode, + nsIMutationObserver) nsresult nsAttributeTextNode::BindToTree(nsIDocument* aDocument, nsIContent* aParent, diff --git a/content/base/src/nsXMLContentSerializer.cpp b/content/base/src/nsXMLContentSerializer.cpp index 0ecf61aa4a9..e1325423b93 100644 --- a/content/base/src/nsXMLContentSerializer.cpp +++ b/content/base/src/nsXMLContentSerializer.cpp @@ -71,7 +71,7 @@ nsXMLContentSerializer::~nsXMLContentSerializer() { } -NS_IMPL_ISUPPORTS1(nsXMLContentSerializer, nsIContentSerializer) +NS_IMPL_ISUPPORTS(nsXMLContentSerializer, nsIContentSerializer) NS_IMETHODIMP nsXMLContentSerializer::Init(uint32_t aFlags, uint32_t aWrapColumn, diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index 5d5cac6a665..90d56bef1c3 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -138,7 +138,7 @@ using namespace mozilla::dom; return NS_OK; \ } -NS_IMPL_ISUPPORTS1(nsXHRParseEndListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsXHRParseEndListener, nsIDOMEventListener) class nsResumeTimeoutsEvent : public nsRunnable { @@ -180,7 +180,7 @@ public: virtual ~XMLHttpRequestAuthPrompt(); }; -NS_IMPL_ISUPPORTS1(XMLHttpRequestAuthPrompt, nsIAuthPrompt) +NS_IMPL_ISUPPORTS(XMLHttpRequestAuthPrompt, nsIAuthPrompt) XMLHttpRequestAuthPrompt::XMLHttpRequestAuthPrompt() { @@ -3781,7 +3781,7 @@ nsXMLHttpRequest::EnsureXPCOMifier() return newRef.forget(); } -NS_IMPL_ISUPPORTS1(nsXMLHttpRequest::nsHeaderVisitor, nsIHttpHeaderVisitor) +NS_IMPL_ISUPPORTS(nsXMLHttpRequest::nsHeaderVisitor, nsIHttpHeaderVisitor) NS_IMETHODIMP nsXMLHttpRequest:: nsHeaderVisitor::VisitHeader(const nsACString &header, const nsACString &value) diff --git a/content/canvas/src/CanvasImageCache.cpp b/content/canvas/src/CanvasImageCache.cpp index 7a221d78731..14c10be05c8 100644 --- a/content/canvas/src/CanvasImageCache.cpp +++ b/content/canvas/src/CanvasImageCache.cpp @@ -187,7 +187,7 @@ CanvasImageCache::Lookup(Element* aImage, return entry->mData->mSourceSurface; } -NS_IMPL_ISUPPORTS1(CanvasImageCacheShutdownObserver, nsIObserver) +NS_IMPL_ISUPPORTS(CanvasImageCacheShutdownObserver, nsIObserver) NS_IMETHODIMP CanvasImageCacheShutdownObserver::Observe(nsISupports *aSubject, diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp index 248fcaaacdf..218fd1a036d 100755 --- a/content/canvas/src/CanvasRenderingContext2D.cpp +++ b/content/canvas/src/CanvasRenderingContext2D.cpp @@ -158,7 +158,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(Canvas2dPixelsReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(Canvas2dPixelsReporter, nsIMemoryReporter) class CanvasRadialGradient : public CanvasGradient { diff --git a/content/canvas/src/ImageEncoder.cpp b/content/canvas/src/ImageEncoder.cpp index b67e29455d5..3941d850a37 100644 --- a/content/canvas/src/ImageEncoder.cpp +++ b/content/canvas/src/ImageEncoder.cpp @@ -81,7 +81,7 @@ private: bool mFailed; }; -NS_IMPL_ISUPPORTS1(EncodingCompleteEvent, nsIRunnable); +NS_IMPL_ISUPPORTS(EncodingCompleteEvent, nsIRunnable); class EncodingRunnable : public nsRunnable { @@ -175,7 +175,7 @@ private: bool mUsingCustomOptions; }; -NS_IMPL_ISUPPORTS1(EncodingRunnable, nsIRunnable) +NS_IMPL_ISUPPORTS(EncodingRunnable, nsIRunnable) /* static */ nsresult diff --git a/content/canvas/src/WebGLContextReporter.cpp b/content/canvas/src/WebGLContextReporter.cpp index 9349fe98f3e..c0af50a0bd0 100644 --- a/content/canvas/src/WebGLContextReporter.cpp +++ b/content/canvas/src/WebGLContextReporter.cpp @@ -8,7 +8,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS1(WebGLMemoryPressureObserver, nsIObserver) +NS_IMPL_ISUPPORTS(WebGLMemoryPressureObserver, nsIObserver) NS_IMETHODIMP WebGLMemoryTracker::CollectReports(nsIHandleReportCallback* aHandleReport, @@ -85,7 +85,7 @@ WebGLMemoryTracker::CollectReports(nsIHandleReportCallback* aHandleReport, return NS_OK; } -NS_IMPL_ISUPPORTS1(WebGLMemoryTracker, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(WebGLMemoryTracker, nsIMemoryReporter) StaticRefPtr WebGLMemoryTracker::sUniqueInstance; diff --git a/content/html/content/src/HTMLAnchorElement.cpp b/content/html/content/src/HTMLAnchorElement.cpp index ee8a76cc5a5..860fd5d8113 100644 --- a/content/html/content/src/HTMLAnchorElement.cpp +++ b/content/html/content/src/HTMLAnchorElement.cpp @@ -44,9 +44,9 @@ HTMLAnchorElement::~HTMLAnchorElement() } NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLAnchorElement) - NS_INTERFACE_TABLE_INHERITED2(HTMLAnchorElement, - nsIDOMHTMLAnchorElement, - Link) + NS_INTERFACE_TABLE_INHERITED(HTMLAnchorElement, + nsIDOMHTMLAnchorElement, + Link) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement) NS_IMPL_ADDREF_INHERITED(HTMLAnchorElement, Element) diff --git a/content/html/content/src/HTMLAreaElement.cpp b/content/html/content/src/HTMLAreaElement.cpp index f78bad7fd30..74418d8efc3 100644 --- a/content/html/content/src/HTMLAreaElement.cpp +++ b/content/html/content/src/HTMLAreaElement.cpp @@ -28,9 +28,9 @@ HTMLAreaElement::~HTMLAreaElement() } NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLAreaElement) - NS_INTERFACE_TABLE_INHERITED2(HTMLAreaElement, - nsIDOMHTMLAreaElement, - Link) + NS_INTERFACE_TABLE_INHERITED(HTMLAreaElement, + nsIDOMHTMLAreaElement, + Link) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement) NS_IMPL_ADDREF_INHERITED(HTMLAreaElement, Element) diff --git a/content/html/content/src/HTMLAudioElement.cpp b/content/html/content/src/HTMLAudioElement.cpp index 87d3597a6b0..21039c9d663 100644 --- a/content/html/content/src/HTMLAudioElement.cpp +++ b/content/html/content/src/HTMLAudioElement.cpp @@ -29,8 +29,8 @@ namespace dom { extern bool IsAudioAPIEnabled(); -NS_IMPL_ISUPPORTS_INHERITED2(HTMLAudioElement, HTMLMediaElement, - nsIDOMHTMLMediaElement, nsIDOMHTMLAudioElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLAudioElement, HTMLMediaElement, + nsIDOMHTMLMediaElement, nsIDOMHTMLAudioElement) NS_IMPL_ELEMENT_CLONE(HTMLAudioElement) diff --git a/content/html/content/src/HTMLBRElement.cpp b/content/html/content/src/HTMLBRElement.cpp index 3b5d70ecbf8..d1545b2ada3 100644 --- a/content/html/content/src/HTMLBRElement.cpp +++ b/content/html/content/src/HTMLBRElement.cpp @@ -26,8 +26,8 @@ HTMLBRElement::~HTMLBRElement() { } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLBRElement, nsGenericHTMLElement, - nsIDOMHTMLBRElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLBRElement, nsGenericHTMLElement, + nsIDOMHTMLBRElement) NS_IMPL_ELEMENT_CLONE(HTMLBRElement) diff --git a/content/html/content/src/HTMLBodyElement.cpp b/content/html/content/src/HTMLBodyElement.cpp index 1efc804d76c..9cf86956297 100644 --- a/content/html/content/src/HTMLBodyElement.cpp +++ b/content/html/content/src/HTMLBodyElement.cpp @@ -36,7 +36,7 @@ BodyRule::~BodyRule() { } -NS_IMPL_ISUPPORTS1(BodyRule, nsIStyleRule) +NS_IMPL_ISUPPORTS(BodyRule, nsIStyleRule) /* virtual */ void BodyRule::MapRuleInfoInto(nsRuleData* aData) @@ -194,8 +194,8 @@ HTMLBodyElement::WrapNode(JSContext *aCx) return HTMLBodyElementBinding::Wrap(aCx, this); } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLBodyElement, nsGenericHTMLElement, - nsIDOMHTMLBodyElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLBodyElement, nsGenericHTMLElement, + nsIDOMHTMLBodyElement) NS_IMPL_ELEMENT_CLONE(HTMLBodyElement) diff --git a/content/html/content/src/HTMLButtonElement.cpp b/content/html/content/src/HTMLButtonElement.cpp index 9a726e8578b..493f2005095 100644 --- a/content/html/content/src/HTMLButtonElement.cpp +++ b/content/html/content/src/HTMLButtonElement.cpp @@ -86,9 +86,9 @@ NS_IMPL_RELEASE_INHERITED(HTMLButtonElement, Element) // QueryInterface implementation for HTMLButtonElement NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLButtonElement) - NS_INTERFACE_TABLE_INHERITED2(HTMLButtonElement, - nsIDOMHTMLButtonElement, - nsIConstraintValidation) + NS_INTERFACE_TABLE_INHERITED(HTMLButtonElement, + nsIDOMHTMLButtonElement, + nsIConstraintValidation) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLFormElementWithState) // nsIConstraintValidation diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp index 7dceccd1c45..c89416787e3 100644 --- a/content/html/content/src/HTMLCanvasElement.cpp +++ b/content/html/content/src/HTMLCanvasElement.cpp @@ -131,7 +131,7 @@ NS_IMPL_ADDREF_INHERITED(HTMLCanvasElement, Element) NS_IMPL_RELEASE_INHERITED(HTMLCanvasElement, Element) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLCanvasElement) - NS_INTERFACE_TABLE_INHERITED1(HTMLCanvasElement, nsIDOMHTMLCanvasElement) + NS_INTERFACE_TABLE_INHERITED(HTMLCanvasElement, nsIDOMHTMLCanvasElement) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement) NS_IMPL_ELEMENT_CLONE(HTMLCanvasElement) diff --git a/content/html/content/src/HTMLContentElement.cpp b/content/html/content/src/HTMLContentElement.cpp index eb5130990e1..4d67b38c4f7 100644 --- a/content/html/content/src/HTMLContentElement.cpp +++ b/content/html/content/src/HTMLContentElement.cpp @@ -245,7 +245,7 @@ HTMLContentElement::GetDistributedNodes() NS_IMPL_CYCLE_COLLECTION(DistributedContentList, mParent, mDistributedNodes) NS_INTERFACE_TABLE_HEAD(DistributedContentList) - NS_INTERFACE_TABLE1(DistributedContentList, nsINodeList) + NS_INTERFACE_TABLE(DistributedContentList, nsINodeList) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(DistributedContentList) NS_INTERFACE_MAP_END diff --git a/content/html/content/src/HTMLDivElement.cpp b/content/html/content/src/HTMLDivElement.cpp index d3cf9ee6f37..699b16ed5d4 100644 --- a/content/html/content/src/HTMLDivElement.cpp +++ b/content/html/content/src/HTMLDivElement.cpp @@ -18,8 +18,8 @@ HTMLDivElement::~HTMLDivElement() { } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLDivElement, nsGenericHTMLElement, - nsIDOMHTMLDivElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLDivElement, nsGenericHTMLElement, + nsIDOMHTMLDivElement) NS_IMPL_ELEMENT_CLONE(HTMLDivElement) diff --git a/content/html/content/src/HTMLFieldSetElement.cpp b/content/html/content/src/HTMLFieldSetElement.cpp index 095c4ea6c41..a9ee5a0e23e 100644 --- a/content/html/content/src/HTMLFieldSetElement.cpp +++ b/content/html/content/src/HTMLFieldSetElement.cpp @@ -46,9 +46,9 @@ NS_IMPL_RELEASE_INHERITED(HTMLFieldSetElement, Element) // QueryInterface implementation for HTMLFieldSetElement NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLFieldSetElement) - NS_INTERFACE_TABLE_INHERITED2(HTMLFieldSetElement, - nsIDOMHTMLFieldSetElement, - nsIConstraintValidation) + NS_INTERFACE_TABLE_INHERITED(HTMLFieldSetElement, + nsIDOMHTMLFieldSetElement, + nsIConstraintValidation) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLFormElement) NS_IMPL_ELEMENT_CLONE(HTMLFieldSetElement) diff --git a/content/html/content/src/HTMLFormControlsCollection.cpp b/content/html/content/src/HTMLFormControlsCollection.cpp index 1c29baf14a0..8559e280955 100644 --- a/content/html/content/src/HTMLFormControlsCollection.cpp +++ b/content/html/content/src/HTMLFormControlsCollection.cpp @@ -136,9 +136,9 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_END // XPConnect interface list for HTMLFormControlsCollection NS_INTERFACE_TABLE_HEAD(HTMLFormControlsCollection) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY - NS_INTERFACE_TABLE2(HTMLFormControlsCollection, - nsIHTMLCollection, - nsIDOMHTMLCollection) + NS_INTERFACE_TABLE(HTMLFormControlsCollection, + nsIHTMLCollection, + nsIDOMHTMLCollection) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(HTMLFormControlsCollection) NS_INTERFACE_MAP_END diff --git a/content/html/content/src/HTMLFormElement.cpp b/content/html/content/src/HTMLFormElement.cpp index 47c369bd14a..40d2fa2eeb7 100644 --- a/content/html/content/src/HTMLFormElement.cpp +++ b/content/html/content/src/HTMLFormElement.cpp @@ -177,11 +177,11 @@ NS_IMPL_RELEASE_INHERITED(HTMLFormElement, Element) // QueryInterface implementation for HTMLFormElement NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLFormElement) - NS_INTERFACE_TABLE_INHERITED4(HTMLFormElement, - nsIDOMHTMLFormElement, - nsIForm, - nsIWebProgressListener, - nsIRadioGroupContainer) + NS_INTERFACE_TABLE_INHERITED(HTMLFormElement, + nsIDOMHTMLFormElement, + nsIForm, + nsIWebProgressListener, + nsIRadioGroupContainer) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement) diff --git a/content/html/content/src/HTMLFrameElement.cpp b/content/html/content/src/HTMLFrameElement.cpp index cd663a17a08..5c2db640e22 100644 --- a/content/html/content/src/HTMLFrameElement.cpp +++ b/content/html/content/src/HTMLFrameElement.cpp @@ -24,8 +24,8 @@ HTMLFrameElement::~HTMLFrameElement() } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLFrameElement, nsGenericHTMLFrameElement, - nsIDOMHTMLFrameElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLFrameElement, nsGenericHTMLFrameElement, + nsIDOMHTMLFrameElement) NS_IMPL_ELEMENT_CLONE(HTMLFrameElement) diff --git a/content/html/content/src/HTMLFrameSetElement.cpp b/content/html/content/src/HTMLFrameSetElement.cpp index d0ba6cb61c5..a292f061f55 100644 --- a/content/html/content/src/HTMLFrameSetElement.cpp +++ b/content/html/content/src/HTMLFrameSetElement.cpp @@ -23,8 +23,8 @@ HTMLFrameSetElement::WrapNode(JSContext *aCx) return HTMLFrameSetElementBinding::Wrap(aCx, this); } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLFrameSetElement, nsGenericHTMLElement, - nsIDOMHTMLFrameSetElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLFrameSetElement, nsGenericHTMLElement, + nsIDOMHTMLFrameSetElement) NS_IMPL_ELEMENT_CLONE(HTMLFrameSetElement) diff --git a/content/html/content/src/HTMLHRElement.cpp b/content/html/content/src/HTMLHRElement.cpp index 518fbe7b4ac..6b698603910 100644 --- a/content/html/content/src/HTMLHRElement.cpp +++ b/content/html/content/src/HTMLHRElement.cpp @@ -20,8 +20,8 @@ HTMLHRElement::~HTMLHRElement() { } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLHRElement, nsGenericHTMLElement, - nsIDOMHTMLHRElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLHRElement, nsGenericHTMLElement, + nsIDOMHTMLHRElement) NS_IMPL_ELEMENT_CLONE(HTMLHRElement) diff --git a/content/html/content/src/HTMLHeadingElement.cpp b/content/html/content/src/HTMLHeadingElement.cpp index adf89ca0936..1ad71eef4d1 100644 --- a/content/html/content/src/HTMLHeadingElement.cpp +++ b/content/html/content/src/HTMLHeadingElement.cpp @@ -21,8 +21,8 @@ HTMLHeadingElement::~HTMLHeadingElement() { } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLHeadingElement, nsGenericHTMLElement, - nsIDOMHTMLHeadingElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLHeadingElement, nsGenericHTMLElement, + nsIDOMHTMLHeadingElement) NS_IMPL_ELEMENT_CLONE(HTMLHeadingElement) diff --git a/content/html/content/src/HTMLIFrameElement.cpp b/content/html/content/src/HTMLIFrameElement.cpp index 353eccea680..cd694cf0121 100644 --- a/content/html/content/src/HTMLIFrameElement.cpp +++ b/content/html/content/src/HTMLIFrameElement.cpp @@ -27,8 +27,8 @@ HTMLIFrameElement::~HTMLIFrameElement() { } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLIFrameElement, nsGenericHTMLFrameElement, - nsIDOMHTMLIFrameElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLIFrameElement, nsGenericHTMLFrameElement, + nsIDOMHTMLIFrameElement) NS_IMPL_ELEMENT_CLONE(HTMLIFrameElement) diff --git a/content/html/content/src/HTMLImageElement.cpp b/content/html/content/src/HTMLImageElement.cpp index 2b3dbb713f7..0ea948e7685 100644 --- a/content/html/content/src/HTMLImageElement.cpp +++ b/content/html/content/src/HTMLImageElement.cpp @@ -66,11 +66,11 @@ NS_IMPL_RELEASE_INHERITED(HTMLImageElement, Element) // QueryInterface implementation for HTMLImageElement NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLImageElement) - NS_INTERFACE_TABLE_INHERITED4(HTMLImageElement, - nsIDOMHTMLImageElement, - nsIImageLoadingContent, - imgIOnloadBlocker, - imgINotificationObserver) + NS_INTERFACE_TABLE_INHERITED(HTMLImageElement, + nsIDOMHTMLImageElement, + nsIImageLoadingContent, + imgIOnloadBlocker, + imgINotificationObserver) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement) diff --git a/content/html/content/src/HTMLInputElement.cpp b/content/html/content/src/HTMLInputElement.cpp index f640ba522d8..93efc00f264 100644 --- a/content/html/content/src/HTMLInputElement.cpp +++ b/content/html/content/src/HTMLInputElement.cpp @@ -274,7 +274,7 @@ class HTMLInputElementState MOZ_FINAL : public nsISupports NS_DEFINE_STATIC_IID_ACCESSOR(HTMLInputElementState, NS_INPUT_ELEMENT_STATE_IID) -NS_IMPL_ISUPPORTS1(HTMLInputElementState, HTMLInputElementState) +NS_IMPL_ISUPPORTS(HTMLInputElementState, HTMLInputElementState) HTMLInputElement::nsFilePickerShownCallback::nsFilePickerShownCallback( HTMLInputElement* aInput, nsIFilePicker* aFilePicker) @@ -283,7 +283,7 @@ HTMLInputElement::nsFilePickerShownCallback::nsFilePickerShownCallback( { } -NS_IMPL_ISUPPORTS1(UploadLastDir::ContentPrefCallback, nsIContentPrefCallback2) +NS_IMPL_ISUPPORTS(UploadLastDir::ContentPrefCallback, nsIContentPrefCallback2) NS_IMETHODIMP UploadLastDir::ContentPrefCallback::HandleCompletion(uint16_t aReason) @@ -478,7 +478,7 @@ private: nsTArray > mDirEnumeratorStack; }; -NS_IMPL_ISUPPORTS1(DirPickerRecursiveFileEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(DirPickerRecursiveFileEnumerator, nsISimpleEnumerator) /** * This may return nullptr if aDomFile's implementation of @@ -714,8 +714,8 @@ HTMLInputElement::nsFilePickerShownCallback::Done(int16_t aResult) false); } -NS_IMPL_ISUPPORTS1(HTMLInputElement::nsFilePickerShownCallback, - nsIFilePickerShownCallback) +NS_IMPL_ISUPPORTS(HTMLInputElement::nsFilePickerShownCallback, + nsIFilePickerShownCallback) class nsColorPickerShownCallback MOZ_FINAL : public nsIColorPickerShownCallback @@ -814,7 +814,7 @@ nsColorPickerShownCallback::Done(const nsAString& aColor) return rv; } -NS_IMPL_ISUPPORTS1(nsColorPickerShownCallback, nsIColorPickerShownCallback) +NS_IMPL_ISUPPORTS(nsColorPickerShownCallback, nsIColorPickerShownCallback) bool HTMLInputElement::IsPopupBlocked() const @@ -989,7 +989,7 @@ HTMLInputElement::InitFilePicker(FilePickerType aType) #define CPS_PREF_NAME NS_LITERAL_STRING("browser.upload.lastDir") -NS_IMPL_ISUPPORTS2(UploadLastDir, nsIObserver, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(UploadLastDir, nsIObserver, nsISupportsWeakReference) void HTMLInputElement::InitUploadLastDir() { @@ -1223,16 +1223,16 @@ NS_IMPL_RELEASE_INHERITED(HTMLInputElement, Element) // QueryInterface implementation for HTMLInputElement NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLInputElement) - NS_INTERFACE_TABLE_INHERITED9(HTMLInputElement, - nsIDOMHTMLInputElement, - nsITextControlElement, - nsIPhonetic, - imgINotificationObserver, - nsIImageLoadingContent, - imgIOnloadBlocker, - nsIDOMNSEditableElement, - nsITimerCallback, - nsIConstraintValidation) + NS_INTERFACE_TABLE_INHERITED(HTMLInputElement, + nsIDOMHTMLInputElement, + nsITextControlElement, + nsIPhonetic, + imgINotificationObserver, + nsIImageLoadingContent, + imgIOnloadBlocker, + nsIDOMNSEditableElement, + nsITimerCallback, + nsIConstraintValidation) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLFormElementWithState) // nsIConstraintValidation diff --git a/content/html/content/src/HTMLLIElement.cpp b/content/html/content/src/HTMLLIElement.cpp index 111e26a1672..db05f025fc0 100644 --- a/content/html/content/src/HTMLLIElement.cpp +++ b/content/html/content/src/HTMLLIElement.cpp @@ -21,8 +21,8 @@ HTMLLIElement::~HTMLLIElement() { } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLLIElement, nsGenericHTMLElement, - nsIDOMHTMLLIElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLLIElement, nsGenericHTMLElement, + nsIDOMHTMLLIElement) NS_IMPL_ELEMENT_CLONE(HTMLLIElement) diff --git a/content/html/content/src/HTMLLabelElement.cpp b/content/html/content/src/HTMLLabelElement.cpp index ef1634dec03..77d765b31a5 100644 --- a/content/html/content/src/HTMLLabelElement.cpp +++ b/content/html/content/src/HTMLLabelElement.cpp @@ -32,8 +32,8 @@ HTMLLabelElement::WrapNode(JSContext *aCx) // nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(HTMLLabelElement, nsGenericHTMLFormElement, - nsIDOMHTMLLabelElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLLabelElement, nsGenericHTMLFormElement, + nsIDOMHTMLLabelElement) // nsIDOMHTMLLabelElement diff --git a/content/html/content/src/HTMLLinkElement.cpp b/content/html/content/src/HTMLLinkElement.cpp index 030439f3be3..64648909097 100644 --- a/content/html/content/src/HTMLLinkElement.cpp +++ b/content/html/content/src/HTMLLinkElement.cpp @@ -65,10 +65,10 @@ NS_IMPL_RELEASE_INHERITED(HTMLLinkElement, Element) // QueryInterface implementation for HTMLLinkElement NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLLinkElement) - NS_INTERFACE_TABLE_INHERITED3(HTMLLinkElement, - nsIDOMHTMLLinkElement, - nsIStyleSheetLinkingElement, - Link) + NS_INTERFACE_TABLE_INHERITED(HTMLLinkElement, + nsIDOMHTMLLinkElement, + nsIStyleSheetLinkingElement, + Link) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement) diff --git a/content/html/content/src/HTMLMapElement.cpp b/content/html/content/src/HTMLMapElement.cpp index 7568f74ebcd..60fc75e08c6 100644 --- a/content/html/content/src/HTMLMapElement.cpp +++ b/content/html/content/src/HTMLMapElement.cpp @@ -33,7 +33,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLMapElement, Element) // QueryInterface implementation for HTMLMapElement NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLMapElement) - NS_INTERFACE_TABLE_INHERITED1(HTMLMapElement, nsIDOMHTMLMapElement) + NS_INTERFACE_TABLE_INHERITED(HTMLMapElement, nsIDOMHTMLMapElement) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement) NS_IMPL_ELEMENT_CLONE(HTMLMapElement) diff --git a/content/html/content/src/HTMLMediaElement.cpp b/content/html/content/src/HTMLMediaElement.cpp index 8a29c1611b1..f89f09ab1f2 100644 --- a/content/html/content/src/HTMLMediaElement.cpp +++ b/content/html/content/src/HTMLMediaElement.cpp @@ -262,9 +262,9 @@ private: uint32_t mLoadID; }; -NS_IMPL_ISUPPORTS5(HTMLMediaElement::MediaLoadListener, nsIRequestObserver, - nsIStreamListener, nsIChannelEventSink, - nsIInterfaceRequestor, nsIObserver) +NS_IMPL_ISUPPORTS(HTMLMediaElement::MediaLoadListener, nsIRequestObserver, + nsIStreamListener, nsIChannelEventSink, + nsIInterfaceRequestor, nsIObserver) NS_IMETHODIMP HTMLMediaElement::MediaLoadListener::Observe(nsISupports* aSubject, diff --git a/content/html/content/src/HTMLMenuElement.cpp b/content/html/content/src/HTMLMenuElement.cpp index 07d722e7b34..f5f7acdf0c3 100644 --- a/content/html/content/src/HTMLMenuElement.cpp +++ b/content/html/content/src/HTMLMenuElement.cpp @@ -54,8 +54,8 @@ HTMLMenuElement::~HTMLMenuElement() { } -NS_IMPL_ISUPPORTS_INHERITED2(HTMLMenuElement, nsGenericHTMLElement, - nsIDOMHTMLMenuElement, nsIHTMLMenu) +NS_IMPL_ISUPPORTS_INHERITED(HTMLMenuElement, nsGenericHTMLElement, + nsIDOMHTMLMenuElement, nsIHTMLMenu) NS_IMPL_ELEMENT_CLONE(HTMLMenuElement) diff --git a/content/html/content/src/HTMLMenuItemElement.cpp b/content/html/content/src/HTMLMenuItemElement.cpp index 4c8a6e5b86b..8b992b20988 100644 --- a/content/html/content/src/HTMLMenuItemElement.cpp +++ b/content/html/content/src/HTMLMenuItemElement.cpp @@ -172,8 +172,8 @@ HTMLMenuItemElement::~HTMLMenuItemElement() } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLMenuItemElement, nsGenericHTMLElement, - nsIDOMHTMLMenuItemElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLMenuItemElement, nsGenericHTMLElement, + nsIDOMHTMLMenuItemElement) //NS_IMPL_ELEMENT_CLONE(HTMLMenuItemElement) nsresult diff --git a/content/html/content/src/HTMLMetaElement.cpp b/content/html/content/src/HTMLMetaElement.cpp index 1fb3302828f..343da5e1d0b 100644 --- a/content/html/content/src/HTMLMetaElement.cpp +++ b/content/html/content/src/HTMLMetaElement.cpp @@ -24,8 +24,8 @@ HTMLMetaElement::~HTMLMetaElement() } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLMetaElement, nsGenericHTMLElement, - nsIDOMHTMLMetaElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLMetaElement, nsGenericHTMLElement, + nsIDOMHTMLMetaElement) NS_IMPL_ELEMENT_CLONE(HTMLMetaElement) diff --git a/content/html/content/src/HTMLObjectElement.cpp b/content/html/content/src/HTMLObjectElement.cpp index 1b47e5105d6..234833ed192 100644 --- a/content/html/content/src/HTMLObjectElement.cpp +++ b/content/html/content/src/HTMLObjectElement.cpp @@ -80,17 +80,17 @@ NS_IMPL_ADDREF_INHERITED(HTMLObjectElement, Element) NS_IMPL_RELEASE_INHERITED(HTMLObjectElement, Element) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLObjectElement) - NS_INTERFACE_TABLE_INHERITED10(HTMLObjectElement, - nsIDOMHTMLObjectElement, - imgINotificationObserver, - nsIRequestObserver, - nsIStreamListener, - nsIFrameLoaderOwner, - nsIObjectLoadingContent, - nsIImageLoadingContent, - imgIOnloadBlocker, - nsIChannelEventSink, - nsIConstraintValidation) + NS_INTERFACE_TABLE_INHERITED(HTMLObjectElement, + nsIDOMHTMLObjectElement, + imgINotificationObserver, + nsIRequestObserver, + nsIStreamListener, + nsIFrameLoaderOwner, + nsIObjectLoadingContent, + nsIImageLoadingContent, + imgIOnloadBlocker, + nsIChannelEventSink, + nsIConstraintValidation) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLFormElement) NS_IMPL_ELEMENT_CLONE(HTMLObjectElement) diff --git a/content/html/content/src/HTMLOptGroupElement.cpp b/content/html/content/src/HTMLOptGroupElement.cpp index c1e5947e518..369b936afa8 100644 --- a/content/html/content/src/HTMLOptGroupElement.cpp +++ b/content/html/content/src/HTMLOptGroupElement.cpp @@ -36,8 +36,8 @@ HTMLOptGroupElement::~HTMLOptGroupElement() } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLOptGroupElement, nsGenericHTMLElement, - nsIDOMHTMLOptGroupElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLOptGroupElement, nsGenericHTMLElement, + nsIDOMHTMLOptGroupElement) NS_IMPL_ELEMENT_CLONE(HTMLOptGroupElement) diff --git a/content/html/content/src/HTMLOptionElement.cpp b/content/html/content/src/HTMLOptionElement.cpp index 6f8d0341e1f..e8c820ef609 100644 --- a/content/html/content/src/HTMLOptionElement.cpp +++ b/content/html/content/src/HTMLOptionElement.cpp @@ -51,8 +51,8 @@ HTMLOptionElement::~HTMLOptionElement() { } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLOptionElement, nsGenericHTMLElement, - nsIDOMHTMLOptionElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLOptionElement, nsGenericHTMLElement, + nsIDOMHTMLOptionElement) NS_IMPL_ELEMENT_CLONE(HTMLOptionElement) diff --git a/content/html/content/src/HTMLOptionsCollection.cpp b/content/html/content/src/HTMLOptionsCollection.cpp index 511290bf7f8..66d1468aa30 100644 --- a/content/html/content/src/HTMLOptionsCollection.cpp +++ b/content/html/content/src/HTMLOptionsCollection.cpp @@ -96,10 +96,10 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(HTMLOptionsCollection, mElements) // QueryInterface implementation for HTMLOptionsCollection NS_INTERFACE_TABLE_HEAD(HTMLOptionsCollection) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY - NS_INTERFACE_TABLE3(HTMLOptionsCollection, - nsIHTMLCollection, - nsIDOMHTMLOptionsCollection, - nsIDOMHTMLCollection) + NS_INTERFACE_TABLE(HTMLOptionsCollection, + nsIHTMLCollection, + nsIDOMHTMLOptionsCollection, + nsIDOMHTMLCollection) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(HTMLOptionsCollection) NS_INTERFACE_MAP_END diff --git a/content/html/content/src/HTMLOutputElement.cpp b/content/html/content/src/HTMLOutputElement.cpp index 0e9324736ed..037236dab2e 100644 --- a/content/html/content/src/HTMLOutputElement.cpp +++ b/content/html/content/src/HTMLOutputElement.cpp @@ -49,9 +49,9 @@ NS_IMPL_ADDREF_INHERITED(HTMLOutputElement, Element) NS_IMPL_RELEASE_INHERITED(HTMLOutputElement, Element) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLOutputElement) - NS_INTERFACE_TABLE_INHERITED2(HTMLOutputElement, - nsIMutationObserver, - nsIConstraintValidation) + NS_INTERFACE_TABLE_INHERITED(HTMLOutputElement, + nsIMutationObserver, + nsIConstraintValidation) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLFormElement) NS_IMPL_ELEMENT_CLONE(HTMLOutputElement) diff --git a/content/html/content/src/HTMLParagraphElement.cpp b/content/html/content/src/HTMLParagraphElement.cpp index bcd4b85e6a1..147041828d5 100644 --- a/content/html/content/src/HTMLParagraphElement.cpp +++ b/content/html/content/src/HTMLParagraphElement.cpp @@ -20,8 +20,8 @@ HTMLParagraphElement::~HTMLParagraphElement() { } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLParagraphElement, nsGenericHTMLElement, - nsIDOMHTMLParagraphElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLParagraphElement, nsGenericHTMLElement, + nsIDOMHTMLParagraphElement) NS_IMPL_ELEMENT_CLONE(HTMLParagraphElement) diff --git a/content/html/content/src/HTMLPreElement.cpp b/content/html/content/src/HTMLPreElement.cpp index 29fc0da2df6..ed291bc1da3 100644 --- a/content/html/content/src/HTMLPreElement.cpp +++ b/content/html/content/src/HTMLPreElement.cpp @@ -21,8 +21,8 @@ HTMLPreElement::~HTMLPreElement() { } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLPreElement, nsGenericHTMLElement, - nsIDOMHTMLPreElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLPreElement, nsGenericHTMLElement, + nsIDOMHTMLPreElement) NS_IMPL_ELEMENT_CLONE(HTMLPreElement) diff --git a/content/html/content/src/HTMLPropertiesCollection.cpp b/content/html/content/src/HTMLPropertiesCollection.cpp index b7700fd7d37..95833483aab 100644 --- a/content/html/content/src/HTMLPropertiesCollection.cpp +++ b/content/html/content/src/HTMLPropertiesCollection.cpp @@ -62,10 +62,10 @@ HTMLPropertiesCollection::~HTMLPropertiesCollection() NS_INTERFACE_TABLE_HEAD(HTMLPropertiesCollection) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY - NS_INTERFACE_TABLE3(HTMLPropertiesCollection, - nsIDOMHTMLCollection, - nsIHTMLCollection, - nsIMutationObserver) + NS_INTERFACE_TABLE(HTMLPropertiesCollection, + nsIDOMHTMLCollection, + nsIHTMLCollection, + nsIMutationObserver) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(HTMLPropertiesCollection) NS_INTERFACE_MAP_END @@ -409,10 +409,10 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(PropertyNodeList) NS_INTERFACE_TABLE_HEAD(PropertyNodeList) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY - NS_INTERFACE_TABLE3(PropertyNodeList, - nsIDOMNodeList, - nsINodeList, - nsIMutationObserver) + NS_INTERFACE_TABLE(PropertyNodeList, + nsIDOMNodeList, + nsINodeList, + nsIMutationObserver) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(PropertyNodeList) NS_INTERFACE_MAP_END diff --git a/content/html/content/src/HTMLScriptElement.cpp b/content/html/content/src/HTMLScriptElement.cpp index a1e18306e90..824328f02b7 100644 --- a/content/html/content/src/HTMLScriptElement.cpp +++ b/content/html/content/src/HTMLScriptElement.cpp @@ -46,11 +46,11 @@ HTMLScriptElement::~HTMLScriptElement() { } -NS_IMPL_ISUPPORTS_INHERITED4(HTMLScriptElement, nsGenericHTMLElement, - nsIDOMHTMLScriptElement, - nsIScriptLoaderObserver, - nsIScriptElement, - nsIMutationObserver) +NS_IMPL_ISUPPORTS_INHERITED(HTMLScriptElement, nsGenericHTMLElement, + nsIDOMHTMLScriptElement, + nsIScriptLoaderObserver, + nsIScriptElement, + nsIMutationObserver) nsresult HTMLScriptElement::BindToTree(nsIDocument* aDocument, nsIContent* aParent, diff --git a/content/html/content/src/HTMLSelectElement.cpp b/content/html/content/src/HTMLSelectElement.cpp index 37149e53bfa..314d64c4771 100644 --- a/content/html/content/src/HTMLSelectElement.cpp +++ b/content/html/content/src/HTMLSelectElement.cpp @@ -40,7 +40,7 @@ NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(Select) namespace mozilla { namespace dom { -NS_IMPL_ISUPPORTS1(SelectState, SelectState) +NS_IMPL_ISUPPORTS(SelectState, SelectState) //---------------------------------------------------------------------- // @@ -153,9 +153,9 @@ NS_IMPL_RELEASE_INHERITED(HTMLSelectElement, Element) // QueryInterface implementation for HTMLSelectElement NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLSelectElement) - NS_INTERFACE_TABLE_INHERITED2(HTMLSelectElement, - nsIDOMHTMLSelectElement, - nsIConstraintValidation) + NS_INTERFACE_TABLE_INHERITED(HTMLSelectElement, + nsIDOMHTMLSelectElement, + nsIConstraintValidation) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLFormElementWithState) diff --git a/content/html/content/src/HTMLSharedObjectElement.cpp b/content/html/content/src/HTMLSharedObjectElement.cpp index 11267a39171..2b3a058bd2e 100644 --- a/content/html/content/src/HTMLSharedObjectElement.cpp +++ b/content/html/content/src/HTMLSharedObjectElement.cpp @@ -92,15 +92,15 @@ NS_IMPL_ADDREF_INHERITED(HTMLSharedObjectElement, Element) NS_IMPL_RELEASE_INHERITED(HTMLSharedObjectElement, Element) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLSharedObjectElement) - NS_INTERFACE_TABLE_INHERITED8(HTMLSharedObjectElement, - nsIRequestObserver, - nsIStreamListener, - nsIFrameLoaderOwner, - nsIObjectLoadingContent, - imgINotificationObserver, - nsIImageLoadingContent, - imgIOnloadBlocker, - nsIChannelEventSink) + NS_INTERFACE_TABLE_INHERITED(HTMLSharedObjectElement, + nsIRequestObserver, + nsIStreamListener, + nsIFrameLoaderOwner, + nsIObjectLoadingContent, + imgINotificationObserver, + nsIImageLoadingContent, + imgIOnloadBlocker, + nsIChannelEventSink) NS_INTERFACE_TABLE_TO_MAP_SEGUE NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLAppletElement, applet) NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLEmbedElement, embed) diff --git a/content/html/content/src/HTMLSourceElement.cpp b/content/html/content/src/HTMLSourceElement.cpp index 4f39cd2eca6..b21bde3c82e 100644 --- a/content/html/content/src/HTMLSourceElement.cpp +++ b/content/html/content/src/HTMLSourceElement.cpp @@ -21,8 +21,8 @@ HTMLSourceElement::~HTMLSourceElement() { } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLSourceElement, nsGenericHTMLElement, - nsIDOMHTMLSourceElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLSourceElement, nsGenericHTMLElement, + nsIDOMHTMLSourceElement) NS_IMPL_ELEMENT_CLONE(HTMLSourceElement) diff --git a/content/html/content/src/HTMLStyleElement.cpp b/content/html/content/src/HTMLStyleElement.cpp index 76b263523da..f175a9b53da 100644 --- a/content/html/content/src/HTMLStyleElement.cpp +++ b/content/html/content/src/HTMLStyleElement.cpp @@ -48,10 +48,10 @@ NS_IMPL_RELEASE_INHERITED(HTMLStyleElement, Element) // QueryInterface implementation for HTMLStyleElement NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLStyleElement) - NS_INTERFACE_TABLE_INHERITED3(HTMLStyleElement, - nsIDOMHTMLStyleElement, - nsIStyleSheetLinkingElement, - nsIMutationObserver) + NS_INTERFACE_TABLE_INHERITED(HTMLStyleElement, + nsIDOMHTMLStyleElement, + nsIStyleSheetLinkingElement, + nsIMutationObserver) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement) NS_IMPL_ELEMENT_CLONE(HTMLStyleElement) diff --git a/content/html/content/src/HTMLTableCaptionElement.cpp b/content/html/content/src/HTMLTableCaptionElement.cpp index 46f6c01103a..4370d0acb64 100644 --- a/content/html/content/src/HTMLTableCaptionElement.cpp +++ b/content/html/content/src/HTMLTableCaptionElement.cpp @@ -24,8 +24,8 @@ HTMLTableCaptionElement::WrapNode(JSContext *aCx) return HTMLTableCaptionElementBinding::Wrap(aCx, this); } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableCaptionElement, nsGenericHTMLElement, - nsIDOMHTMLTableCaptionElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLTableCaptionElement, nsGenericHTMLElement, + nsIDOMHTMLTableCaptionElement) NS_IMPL_ELEMENT_CLONE(HTMLTableCaptionElement) diff --git a/content/html/content/src/HTMLTableCellElement.cpp b/content/html/content/src/HTMLTableCellElement.cpp index dc7999fbfee..2092aa33235 100644 --- a/content/html/content/src/HTMLTableCellElement.cpp +++ b/content/html/content/src/HTMLTableCellElement.cpp @@ -28,8 +28,8 @@ HTMLTableCellElement::WrapNode(JSContext *aCx) return HTMLTableCellElementBinding::Wrap(aCx, this); } -NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableCellElement, nsGenericHTMLElement, - nsIDOMHTMLTableCellElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLTableCellElement, nsGenericHTMLElement, + nsIDOMHTMLTableCellElement) NS_IMPL_ELEMENT_CLONE(HTMLTableCellElement) diff --git a/content/html/content/src/HTMLTableElement.cpp b/content/html/content/src/HTMLTableElement.cpp index a5c608a1a8b..f9804145be1 100644 --- a/content/html/content/src/HTMLTableElement.cpp +++ b/content/html/content/src/HTMLTableElement.cpp @@ -95,8 +95,8 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(TableRowsCollection) NS_INTERFACE_TABLE_HEAD(TableRowsCollection) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY - NS_INTERFACE_TABLE2(TableRowsCollection, nsIHTMLCollection, - nsIDOMHTMLCollection) + NS_INTERFACE_TABLE(TableRowsCollection, nsIHTMLCollection, + nsIDOMHTMLCollection) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(TableRowsCollection) NS_INTERFACE_MAP_END @@ -328,7 +328,7 @@ NS_IMPL_RELEASE_INHERITED(HTMLTableElement, Element) // QueryInterface implementation for HTMLTableElement NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableElement) - NS_INTERFACE_TABLE_INHERITED1(HTMLTableElement, nsIDOMHTMLTableElement) + NS_INTERFACE_TABLE_INHERITED(HTMLTableElement, nsIDOMHTMLTableElement) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement) diff --git a/content/html/content/src/HTMLTextAreaElement.cpp b/content/html/content/src/HTMLTextAreaElement.cpp index b5e23a53349..c94f7331fa2 100644 --- a/content/html/content/src/HTMLTextAreaElement.cpp +++ b/content/html/content/src/HTMLTextAreaElement.cpp @@ -87,12 +87,12 @@ NS_IMPL_RELEASE_INHERITED(HTMLTextAreaElement, Element) // QueryInterface implementation for HTMLTextAreaElement NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTextAreaElement) - NS_INTERFACE_TABLE_INHERITED5(HTMLTextAreaElement, - nsIDOMHTMLTextAreaElement, - nsITextControlElement, - nsIDOMNSEditableElement, - nsIMutationObserver, - nsIConstraintValidation) + NS_INTERFACE_TABLE_INHERITED(HTMLTextAreaElement, + nsIDOMHTMLTextAreaElement, + nsITextControlElement, + nsIDOMNSEditableElement, + nsIMutationObserver, + nsIConstraintValidation) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLFormElementWithState) diff --git a/content/html/content/src/HTMLTitleElement.cpp b/content/html/content/src/HTMLTitleElement.cpp index 6a6237ad72f..6150a6667dd 100644 --- a/content/html/content/src/HTMLTitleElement.cpp +++ b/content/html/content/src/HTMLTitleElement.cpp @@ -27,8 +27,8 @@ HTMLTitleElement::~HTMLTitleElement() { } -NS_IMPL_ISUPPORTS_INHERITED2(HTMLTitleElement, nsGenericHTMLElement, - nsIDOMHTMLTitleElement, nsIMutationObserver) +NS_IMPL_ISUPPORTS_INHERITED(HTMLTitleElement, nsGenericHTMLElement, + nsIDOMHTMLTitleElement, nsIMutationObserver) NS_IMPL_ELEMENT_CLONE(HTMLTitleElement) diff --git a/content/html/content/src/HTMLVideoElement.cpp b/content/html/content/src/HTMLVideoElement.cpp index 1e572dede50..db90fa86027 100644 --- a/content/html/content/src/HTMLVideoElement.cpp +++ b/content/html/content/src/HTMLVideoElement.cpp @@ -41,8 +41,8 @@ namespace dom { static bool sVideoStatsEnabled; -NS_IMPL_ISUPPORTS_INHERITED2(HTMLVideoElement, HTMLMediaElement, - nsIDOMHTMLMediaElement, nsIDOMHTMLVideoElement) +NS_IMPL_ISUPPORTS_INHERITED(HTMLVideoElement, HTMLMediaElement, + nsIDOMHTMLMediaElement, nsIDOMHTMLVideoElement) NS_IMPL_ELEMENT_CLONE(HTMLVideoElement) diff --git a/content/html/content/src/TimeRanges.cpp b/content/html/content/src/TimeRanges.cpp index b85961e801f..dfe1ed8cc42 100644 --- a/content/html/content/src/TimeRanges.cpp +++ b/content/html/content/src/TimeRanges.cpp @@ -12,7 +12,7 @@ namespace mozilla { namespace dom { -NS_IMPL_ISUPPORTS1(TimeRanges, nsIDOMTimeRanges) +NS_IMPL_ISUPPORTS(TimeRanges, nsIDOMTimeRanges) TimeRanges::TimeRanges() { diff --git a/content/html/content/src/UndoManager.cpp b/content/html/content/src/UndoManager.cpp index dda57bb5f76..b28d5acf80a 100644 --- a/content/html/content/src/UndoManager.cpp +++ b/content/html/content/src/UndoManager.cpp @@ -596,7 +596,7 @@ protected: // reference. }; -NS_IMPL_ISUPPORTS1(UndoMutationObserver, nsIMutationObserver) +NS_IMPL_ISUPPORTS(UndoMutationObserver, nsIMutationObserver) bool UndoMutationObserver::IsManagerForMutation(nsIContent* aContent) diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp index 32f368c8807..fde36195794 100644 --- a/content/html/content/src/nsGenericHTMLElement.cpp +++ b/content/html/content/src/nsGenericHTMLElement.cpp @@ -195,8 +195,8 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(nsGenericHTMLElementTearoff) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsGenericHTMLElementTearoff) NS_INTERFACE_TABLE_HEAD(nsGenericHTMLElementTearoff) - NS_INTERFACE_TABLE_INHERITED1(nsGenericHTMLElementTearoff, - nsIDOMElementCSSInlineStyle) + NS_INTERFACE_TABLE_INHERITED(nsGenericHTMLElementTearoff, + nsIDOMElementCSSInlineStyle) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsGenericHTMLElementTearoff) NS_INTERFACE_MAP_END_AGGREGATED(mElement) @@ -1924,9 +1924,9 @@ nsGenericHTMLFormElement::~nsGenericHTMLFormElement() NS_ASSERTION(!mForm, "mForm should be null at this point!"); } -NS_IMPL_ISUPPORTS_INHERITED1(nsGenericHTMLFormElement, - nsGenericHTMLElement, - nsIFormControl) +NS_IMPL_ISUPPORTS_INHERITED(nsGenericHTMLFormElement, + nsGenericHTMLElement, + nsIFormControl) mozilla::dom::ParentObject nsGenericHTMLFormElement::GetParentObject() const diff --git a/content/html/content/src/nsGenericHTMLFrameElement.cpp b/content/html/content/src/nsGenericHTMLFrameElement.cpp index 3876902f2e0..0989b476685 100644 --- a/content/html/content/src/nsGenericHTMLFrameElement.cpp +++ b/content/html/content/src/nsGenericHTMLFrameElement.cpp @@ -38,10 +38,10 @@ NS_IMPL_ADDREF_INHERITED(nsGenericHTMLFrameElement, nsGenericHTMLElement) NS_IMPL_RELEASE_INHERITED(nsGenericHTMLFrameElement, nsGenericHTMLElement) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsGenericHTMLFrameElement) - NS_INTERFACE_TABLE_INHERITED3(nsGenericHTMLFrameElement, - nsIFrameLoaderOwner, - nsIDOMMozBrowserFrame, - nsIMozBrowserFrame) + NS_INTERFACE_TABLE_INHERITED(nsGenericHTMLFrameElement, + nsIFrameLoaderOwner, + nsIDOMMozBrowserFrame, + nsIMozBrowserFrame) NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement) NS_IMPL_BOOL_ATTR(nsGenericHTMLFrameElement, Mozbrowser, mozbrowser) diff --git a/content/html/content/src/nsHTMLDNSPrefetch.cpp b/content/html/content/src/nsHTMLDNSPrefetch.cpp index 229fde83e7a..6090d9f8c77 100644 --- a/content/html/content/src/nsHTMLDNSPrefetch.cpp +++ b/content/html/content/src/nsHTMLDNSPrefetch.cpp @@ -223,8 +223,8 @@ nsHTMLDNSPrefetch::CancelPrefetchLow(const nsAString &hostname, nsresult aReason ///////////////////////////////////////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS1(nsHTMLDNSPrefetch::nsListener, - nsIDNSListener) +NS_IMPL_ISUPPORTS(nsHTMLDNSPrefetch::nsListener, + nsIDNSListener) NS_IMETHODIMP nsHTMLDNSPrefetch::nsListener::OnLookupComplete(nsICancelable *request, @@ -255,10 +255,10 @@ nsHTMLDNSPrefetch::nsDeferrals::~nsDeferrals() Flush(); } -NS_IMPL_ISUPPORTS3(nsHTMLDNSPrefetch::nsDeferrals, - nsIWebProgressListener, - nsISupportsWeakReference, - nsIObserver) +NS_IMPL_ISUPPORTS(nsHTMLDNSPrefetch::nsDeferrals, + nsIWebProgressListener, + nsISupportsWeakReference, + nsIObserver) void nsHTMLDNSPrefetch::nsDeferrals::Flush() diff --git a/content/html/content/src/nsRadioVisitor.cpp b/content/html/content/src/nsRadioVisitor.cpp index c6c2a62642a..3698eff9301 100644 --- a/content/html/content/src/nsRadioVisitor.cpp +++ b/content/html/content/src/nsRadioVisitor.cpp @@ -10,7 +10,7 @@ using namespace mozilla::dom; -NS_IMPL_ISUPPORTS1(nsRadioVisitor, nsIRadioVisitor) +NS_IMPL_ISUPPORTS(nsRadioVisitor, nsIRadioVisitor) bool nsRadioSetCheckedChangedVisitor::Visit(nsIFormControl* aRadio) diff --git a/content/html/content/src/nsTextEditorState.cpp b/content/html/content/src/nsTextEditorState.cpp index 6126660f633..e88f6102275 100644 --- a/content/html/content/src/nsTextEditorState.cpp +++ b/content/html/content/src/nsTextEditorState.cpp @@ -249,10 +249,10 @@ private: NS_IMPL_CYCLE_COLLECTING_ADDREF(nsTextInputSelectionImpl) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsTextInputSelectionImpl) NS_INTERFACE_TABLE_HEAD(nsTextInputSelectionImpl) - NS_INTERFACE_TABLE3(nsTextInputSelectionImpl, - nsISelectionController, - nsISelectionDisplay, - nsISupportsWeakReference) + NS_INTERFACE_TABLE(nsTextInputSelectionImpl, + nsISelectionController, + nsISelectionDisplay, + nsISupportsWeakReference) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsTextInputSelectionImpl) NS_INTERFACE_MAP_END @@ -725,11 +725,11 @@ nsTextInputListener::~nsTextInputListener() { } -NS_IMPL_ISUPPORTS4(nsTextInputListener, - nsISelectionListener, - nsIEditorObserver, - nsISupportsWeakReference, - nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsTextInputListener, + nsISelectionListener, + nsIEditorObserver, + nsISupportsWeakReference, + nsIDOMEventListener) // BEGIN nsIDOMSelectionListener @@ -1991,7 +1991,7 @@ nsTextEditorState::HideSelectionIfBlurred() } } -NS_IMPL_ISUPPORTS1(nsAnonDivObserver, nsIMutationObserver) +NS_IMPL_ISUPPORTS(nsAnonDivObserver, nsIMutationObserver) void nsAnonDivObserver::CharacterDataChanged(nsIDocument* aDocument, diff --git a/content/html/document/src/ImageDocument.cpp b/content/html/document/src/ImageDocument.cpp index 189a17a3511..f8f57f5ddc9 100644 --- a/content/html/document/src/ImageDocument.cpp +++ b/content/html/document/src/ImageDocument.cpp @@ -154,8 +154,8 @@ NS_IMPL_ADDREF_INHERITED(ImageDocument, MediaDocument) NS_IMPL_RELEASE_INHERITED(ImageDocument, MediaDocument) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(ImageDocument) - NS_INTERFACE_TABLE_INHERITED3(ImageDocument, nsIImageDocument, - imgINotificationObserver, nsIDOMEventListener) + NS_INTERFACE_TABLE_INHERITED(ImageDocument, nsIImageDocument, + imgINotificationObserver, nsIDOMEventListener) NS_INTERFACE_TABLE_TAIL_INHERITING(MediaDocument) diff --git a/content/html/document/src/MediaDocument.cpp b/content/html/document/src/MediaDocument.cpp index d6069e2d2c4..0933c0c04d5 100644 --- a/content/html/document/src/MediaDocument.cpp +++ b/content/html/document/src/MediaDocument.cpp @@ -36,9 +36,9 @@ MediaDocumentStreamListener::~MediaDocumentStreamListener() } -NS_IMPL_ISUPPORTS2(MediaDocumentStreamListener, - nsIRequestObserver, - nsIStreamListener) +NS_IMPL_ISUPPORTS(MediaDocumentStreamListener, + nsIRequestObserver, + nsIStreamListener) void diff --git a/content/html/document/src/PluginDocument.cpp b/content/html/document/src/PluginDocument.cpp index 117a9af1659..42d894e7b26 100644 --- a/content/html/document/src/PluginDocument.cpp +++ b/content/html/document/src/PluginDocument.cpp @@ -116,7 +116,7 @@ NS_IMPL_ADDREF_INHERITED(PluginDocument, MediaDocument) NS_IMPL_RELEASE_INHERITED(PluginDocument, MediaDocument) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(PluginDocument) - NS_INTERFACE_TABLE_INHERITED1(PluginDocument, nsIPluginDocument) + NS_INTERFACE_TABLE_INHERITED(PluginDocument, nsIPluginDocument) NS_INTERFACE_TABLE_TAIL_INHERITING(MediaDocument) void diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp index 1c639c6e5ba..8e45fa249e8 100644 --- a/content/html/document/src/nsHTMLDocument.cpp +++ b/content/html/document/src/nsHTMLDocument.cpp @@ -217,8 +217,8 @@ NS_IMPL_RELEASE_INHERITED(nsHTMLDocument, nsDocument) // QueryInterface implementation for nsHTMLDocument NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLDocument) - NS_INTERFACE_TABLE_INHERITED2(nsHTMLDocument, nsIHTMLDocument, - nsIDOMHTMLDocument) + NS_INTERFACE_TABLE_INHERITED(nsHTMLDocument, nsIHTMLDocument, + nsIDOMHTMLDocument) NS_INTERFACE_TABLE_TAIL_INHERITING(nsDocument) JSObject* diff --git a/content/mathml/content/src/nsMathMLElement.cpp b/content/mathml/content/src/nsMathMLElement.cpp index e61dfeac7fc..28324b9d1b2 100644 --- a/content/mathml/content/src/nsMathMLElement.cpp +++ b/content/mathml/content/src/nsMathMLElement.cpp @@ -31,8 +31,8 @@ using namespace mozilla::dom; //---------------------------------------------------------------------- // nsISupports methods: -NS_IMPL_ISUPPORTS_INHERITED3(nsMathMLElement, nsMathMLElementBase, - nsIDOMElement, nsIDOMNode, Link) +NS_IMPL_ISUPPORTS_INHERITED(nsMathMLElement, nsMathMLElementBase, + nsIDOMElement, nsIDOMNode, Link) static nsresult WarnDeprecated(const char16_t* aDeprecatedAttribute, diff --git a/content/media/DOMMediaStream.cpp b/content/media/DOMMediaStream.cpp index 20be806b1cf..cb3cff82c3a 100644 --- a/content/media/DOMMediaStream.cpp +++ b/content/media/DOMMediaStream.cpp @@ -41,8 +41,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(DOMMediaStream) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(DOMMediaStream) -NS_IMPL_ISUPPORTS_INHERITED1(DOMLocalMediaStream, DOMMediaStream, - nsIDOMLocalMediaStream) +NS_IMPL_ISUPPORTS_INHERITED(DOMLocalMediaStream, DOMMediaStream, + nsIDOMLocalMediaStream) NS_IMPL_CYCLE_COLLECTION_INHERITED(DOMAudioNodeMediaStream, DOMMediaStream, mStreamNode) diff --git a/content/media/Latency.cpp b/content/media/Latency.cpp index 153ac3bbf75..7270293712e 100644 --- a/content/media/Latency.cpp +++ b/content/media/Latency.cpp @@ -136,7 +136,7 @@ AsyncLatencyLogger* AsyncLatencyLogger::Get(bool aStartTimer) return gAsyncLogger; } -NS_IMPL_ISUPPORTS1(AsyncLatencyLogger, nsIObserver) +NS_IMPL_ISUPPORTS(AsyncLatencyLogger, nsIObserver) AsyncLatencyLogger::AsyncLatencyLogger() : mThread(nullptr), diff --git a/content/media/MediaCache.cpp b/content/media/MediaCache.cpp index e3857b7c0cf..598d905e9c0 100644 --- a/content/media/MediaCache.cpp +++ b/content/media/MediaCache.cpp @@ -83,7 +83,7 @@ public: static MediaCacheFlusher* gMediaCacheFlusher; -NS_IMPL_ISUPPORTS2(MediaCacheFlusher, nsIObserver, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(MediaCacheFlusher, nsIObserver, nsISupportsWeakReference) MediaCacheFlusher::~MediaCacheFlusher() { diff --git a/content/media/MediaDecoder.cpp b/content/media/MediaDecoder.cpp index b8db67c13f1..0b5db4272d7 100644 --- a/content/media/MediaDecoder.cpp +++ b/content/media/MediaDecoder.cpp @@ -105,9 +105,9 @@ public: StaticRefPtr MediaMemoryTracker::sUniqueInstance; -NS_IMPL_ISUPPORTS1(MediaMemoryTracker, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(MediaMemoryTracker, nsIMemoryReporter) -NS_IMPL_ISUPPORTS1(MediaDecoder, nsIObserver) +NS_IMPL_ISUPPORTS(MediaDecoder, nsIObserver) void MediaDecoder::SetDormantIfNecessary(bool aDormant) { diff --git a/content/media/MediaDecoderStateMachine.cpp b/content/media/MediaDecoderStateMachine.cpp index 603e95ed435..38fa9bc1c76 100644 --- a/content/media/MediaDecoderStateMachine.cpp +++ b/content/media/MediaDecoderStateMachine.cpp @@ -2716,7 +2716,7 @@ private: int mTimerId; }; -NS_IMPL_ISUPPORTS2(TimerEvent, nsITimerCallback, nsIRunnable); +NS_IMPL_ISUPPORTS(TimerEvent, nsITimerCallback, nsIRunnable); nsresult MediaDecoderStateMachine::ScheduleStateMachine(int64_t aUsecs) { AssertCurrentThreadInMonitor(); diff --git a/content/media/MediaRecorder.cpp b/content/media/MediaRecorder.cpp index 91d9033e913..f222ec9f20a 100644 --- a/content/media/MediaRecorder.cpp +++ b/content/media/MediaRecorder.cpp @@ -468,7 +468,7 @@ private: bool mStopIssued; }; -NS_IMPL_ISUPPORTS1(MediaRecorder::Session, nsIObserver) +NS_IMPL_ISUPPORTS(MediaRecorder::Session, nsIObserver) MediaRecorder::~MediaRecorder() { diff --git a/content/media/MediaResource.cpp b/content/media/MediaResource.cpp index 7b1e115bbc1..ae6d2de5314 100644 --- a/content/media/MediaResource.cpp +++ b/content/media/MediaResource.cpp @@ -106,9 +106,9 @@ ChannelMediaResource::~ChannelMediaResource() // disconnect the old listener from the ChannelMediaResource and hook up // a new listener, so notifications from the old channel are discarded // and don't confuse us. -NS_IMPL_ISUPPORTS4(ChannelMediaResource::Listener, - nsIRequestObserver, nsIStreamListener, nsIChannelEventSink, - nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(ChannelMediaResource::Listener, + nsIRequestObserver, nsIStreamListener, nsIChannelEventSink, + nsIInterfaceRequestor) nsresult ChannelMediaResource::Listener::OnStartRequest(nsIRequest* aRequest, diff --git a/content/media/MediaShutdownManager.cpp b/content/media/MediaShutdownManager.cpp index af770abd85a..76b12dd64b4 100644 --- a/content/media/MediaShutdownManager.cpp +++ b/content/media/MediaShutdownManager.cpp @@ -20,7 +20,7 @@ extern PRLogModuleInfo* gMediaDecoderLog; #define DECODER_LOG(type, msg) #endif -NS_IMPL_ISUPPORTS1(MediaShutdownManager, nsIObserver) +NS_IMPL_ISUPPORTS(MediaShutdownManager, nsIObserver) MediaShutdownManager::MediaShutdownManager() : mIsObservingShutdown(false), diff --git a/content/media/MediaStreamGraph.cpp b/content/media/MediaStreamGraph.cpp index 69c2e788380..e7c7031c38f 100644 --- a/content/media/MediaStreamGraph.cpp +++ b/content/media/MediaStreamGraph.cpp @@ -2673,7 +2673,7 @@ MediaStreamGraphImpl::Destroy() mSelfRef = nullptr; } -NS_IMPL_ISUPPORTS1(MediaStreamGraphShutdownObserver, nsIObserver) +NS_IMPL_ISUPPORTS(MediaStreamGraphShutdownObserver, nsIObserver) static bool gShutdownObserverRegistered = false; @@ -2740,7 +2740,7 @@ MediaStreamGraph::DestroyNonRealtimeInstance(MediaStreamGraph* aGraph) graph->ForceShutDown(); } -NS_IMPL_ISUPPORTS1(MediaStreamGraphImpl, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(MediaStreamGraphImpl, nsIMemoryReporter) struct ArrayClearer { diff --git a/content/media/RtspMediaResource.cpp b/content/media/RtspMediaResource.cpp index a95e4478a64..facca818b45 100644 --- a/content/media/RtspMediaResource.cpp +++ b/content/media/RtspMediaResource.cpp @@ -404,8 +404,8 @@ RtspMediaResource::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const //---------------------------------------------------------------------------- // RtspMediaResource::Listener //---------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS2(RtspMediaResource::Listener, - nsIInterfaceRequestor, nsIStreamingProtocolListener); +NS_IMPL_ISUPPORTS(RtspMediaResource::Listener, + nsIInterfaceRequestor, nsIStreamingProtocolListener); nsresult RtspMediaResource::Listener::OnMediaDataAvailable(uint8_t aTrackIdx, diff --git a/content/media/SharedThreadPool.cpp b/content/media/SharedThreadPool.cpp index e514e98b039..92ba95382e7 100644 --- a/content/media/SharedThreadPool.cpp +++ b/content/media/SharedThreadPool.cpp @@ -170,7 +170,7 @@ NS_IMETHODIMP_(MozExternalRefCountType) SharedThreadPool::Release(void) return 0; } -NS_IMPL_QUERY_INTERFACE2(SharedThreadPool, nsIThreadPool, nsIEventTarget) +NS_IMPL_QUERY_INTERFACE(SharedThreadPool, nsIThreadPool, nsIEventTarget) SharedThreadPool::SharedThreadPool(const nsCString& aName, nsIThreadPool* aPool) @@ -198,7 +198,7 @@ public: NS_DECL_NSITHREADPOOLLISTENER }; -NS_IMPL_ISUPPORTS1(MSCOMInitThreadPoolListener, nsIThreadPoolListener) +NS_IMPL_ISUPPORTS(MSCOMInitThreadPoolListener, nsIThreadPoolListener) NS_IMETHODIMP MSCOMInitThreadPoolListener::OnThreadCreated() diff --git a/content/media/plugins/MediaResourceServer.cpp b/content/media/plugins/MediaResourceServer.cpp index 8ed6437deeb..68f31f26b81 100644 --- a/content/media/plugins/MediaResourceServer.cpp +++ b/content/media/plugins/MediaResourceServer.cpp @@ -356,7 +356,7 @@ public: virtual ~ResourceSocketListener() { } }; -NS_IMPL_ISUPPORTS1(ResourceSocketListener, nsIServerSocketListener) +NS_IMPL_ISUPPORTS(ResourceSocketListener, nsIServerSocketListener) NS_IMETHODIMP ResourceSocketListener::OnSocketAccepted(nsIServerSocket* aServ, diff --git a/content/media/webrtc/LoadMonitor.cpp b/content/media/webrtc/LoadMonitor.cpp index 1d7d83429c4..16dfd3f7c4e 100644 --- a/content/media/webrtc/LoadMonitor.cpp +++ b/content/media/webrtc/LoadMonitor.cpp @@ -44,7 +44,7 @@ namespace mozilla { -NS_IMPL_ISUPPORTS1(LoadMonitor, nsIObserver) +NS_IMPL_ISUPPORTS(LoadMonitor, nsIObserver) LoadMonitor::LoadMonitor(int aLoadUpdateInterval) : mLoadUpdateInterval(aLoadUpdateInterval), diff --git a/content/media/webrtc/MediaEngineDefault.cpp b/content/media/webrtc/MediaEngineDefault.cpp index e53744ecd4c..7acbe153469 100644 --- a/content/media/webrtc/MediaEngineDefault.cpp +++ b/content/media/webrtc/MediaEngineDefault.cpp @@ -31,7 +31,7 @@ namespace mozilla { using namespace mozilla::gfx; -NS_IMPL_ISUPPORTS1(MediaEngineDefaultVideoSource, nsITimerCallback) +NS_IMPL_ISUPPORTS(MediaEngineDefaultVideoSource, nsITimerCallback) /** * Default video source. */ @@ -344,7 +344,7 @@ private: /** * Default audio source. */ -NS_IMPL_ISUPPORTS1(MediaEngineDefaultAudioSource, nsITimerCallback) +NS_IMPL_ISUPPORTS(MediaEngineDefaultAudioSource, nsITimerCallback) MediaEngineDefaultAudioSource::MediaEngineDefaultAudioSource() : mTimer(nullptr) diff --git a/content/media/webrtc/MediaEngineTabVideoSource.cpp b/content/media/webrtc/MediaEngineTabVideoSource.cpp index b0cdb4ec3e6..26506b6af63 100644 --- a/content/media/webrtc/MediaEngineTabVideoSource.cpp +++ b/content/media/webrtc/MediaEngineTabVideoSource.cpp @@ -27,7 +27,7 @@ namespace mozilla { using namespace mozilla::gfx; -NS_IMPL_ISUPPORTS2(MediaEngineTabVideoSource, nsIDOMEventListener, nsITimerCallback) +NS_IMPL_ISUPPORTS(MediaEngineTabVideoSource, nsIDOMEventListener, nsITimerCallback) MediaEngineTabVideoSource::MediaEngineTabVideoSource() : mMonitor("MediaEngineTabVideoSource") diff --git a/content/media/webrtc/MediaEngineWebRTCVideo.cpp b/content/media/webrtc/MediaEngineWebRTCVideo.cpp index 15170c65656..bd935fe745f 100644 --- a/content/media/webrtc/MediaEngineWebRTCVideo.cpp +++ b/content/media/webrtc/MediaEngineWebRTCVideo.cpp @@ -38,9 +38,9 @@ extern PRLogModuleInfo* GetMediaManagerLog(); * Webrtc video source. */ #ifndef MOZ_B2G_CAMERA -NS_IMPL_ISUPPORTS1(MediaEngineWebRTCVideoSource, nsIRunnable) +NS_IMPL_ISUPPORTS(MediaEngineWebRTCVideoSource, nsIRunnable) #else -NS_IMPL_QUERY_INTERFACE1(MediaEngineWebRTCVideoSource, nsIRunnable) +NS_IMPL_QUERY_INTERFACE(MediaEngineWebRTCVideoSource, nsIRunnable) NS_IMPL_ADDREF_INHERITED(MediaEngineWebRTCVideoSource, CameraControlListener) NS_IMPL_RELEASE_INHERITED(MediaEngineWebRTCVideoSource, CameraControlListener) #endif diff --git a/content/media/webspeech/recognition/SpeechRecognition.cpp b/content/media/webspeech/recognition/SpeechRecognition.cpp index b41160f4754..9870b5fa2ce 100644 --- a/content/media/webspeech/recognition/SpeechRecognition.cpp +++ b/content/media/webspeech/recognition/SpeechRecognition.cpp @@ -938,7 +938,7 @@ SpeechEvent::Run() return NS_OK; } -NS_IMPL_ISUPPORTS1(SpeechRecognition::GetUserMediaSuccessCallback, nsIDOMGetUserMediaSuccessCallback) +NS_IMPL_ISUPPORTS(SpeechRecognition::GetUserMediaSuccessCallback, nsIDOMGetUserMediaSuccessCallback) NS_IMETHODIMP SpeechRecognition::GetUserMediaSuccessCallback::OnSuccess(nsISupports* aStream) @@ -948,7 +948,7 @@ SpeechRecognition::GetUserMediaSuccessCallback::OnSuccess(nsISupports* aStream) return NS_OK; } -NS_IMPL_ISUPPORTS1(SpeechRecognition::GetUserMediaErrorCallback, nsIDOMGetUserMediaErrorCallback) +NS_IMPL_ISUPPORTS(SpeechRecognition::GetUserMediaErrorCallback, nsIDOMGetUserMediaErrorCallback) NS_IMETHODIMP SpeechRecognition::GetUserMediaErrorCallback::OnError(const nsAString& aError) diff --git a/content/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp b/content/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp index edf0ec80863..422b8b9054f 100644 --- a/content/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp +++ b/content/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp @@ -19,7 +19,7 @@ namespace mozilla { using namespace dom; -NS_IMPL_ISUPPORTS2(FakeSpeechRecognitionService, nsISpeechRecognitionService, nsIObserver) +NS_IMPL_ISUPPORTS(FakeSpeechRecognitionService, nsISpeechRecognitionService, nsIObserver) FakeSpeechRecognitionService::FakeSpeechRecognitionService() { diff --git a/content/media/webspeech/synth/nsSynthVoiceRegistry.cpp b/content/media/webspeech/synth/nsSynthVoiceRegistry.cpp index 7fdc9560af8..4d2821d359e 100644 --- a/content/media/webspeech/synth/nsSynthVoiceRegistry.cpp +++ b/content/media/webspeech/synth/nsSynthVoiceRegistry.cpp @@ -99,7 +99,7 @@ public: static StaticRefPtr gSynthVoiceRegistry; -NS_IMPL_ISUPPORTS1(nsSynthVoiceRegistry, nsISynthVoiceRegistry) +NS_IMPL_ISUPPORTS(nsSynthVoiceRegistry, nsISynthVoiceRegistry) nsSynthVoiceRegistry::nsSynthVoiceRegistry() : mSpeechSynthChild(nullptr) diff --git a/content/media/webspeech/synth/pico/nsPicoService.cpp b/content/media/webspeech/synth/pico/nsPicoService.cpp index 7c6ec2d064b..0860e5c29a0 100644 --- a/content/media/webspeech/synth/pico/nsPicoService.cpp +++ b/content/media/webspeech/synth/pico/nsPicoService.cpp @@ -260,7 +260,7 @@ private: nsRefPtr mService; }; -NS_IMPL_ISUPPORTS_INHERITED1(PicoCallbackRunnable, nsRunnable, nsISpeechTaskCallback) +NS_IMPL_ISUPPORTS_INHERITED(PicoCallbackRunnable, nsRunnable, nsISpeechTaskCallback) // nsRunnable diff --git a/content/svg/content/src/SVGAElement.cpp b/content/svg/content/src/SVGAElement.cpp index 1c74a7e788f..87c15d40bef 100644 --- a/content/svg/content/src/SVGAElement.cpp +++ b/content/svg/content/src/SVGAElement.cpp @@ -37,11 +37,11 @@ nsSVGElement::StringInfo SVGAElement::sStringInfo[2] = // nsISupports methods NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(SVGAElement) - NS_INTERFACE_TABLE_INHERITED4(SVGAElement, - nsIDOMNode, - nsIDOMElement, - nsIDOMSVGElement, - Link) + NS_INTERFACE_TABLE_INHERITED(SVGAElement, + nsIDOMNode, + nsIDOMElement, + nsIDOMSVGElement, + Link) NS_INTERFACE_TABLE_TAIL_INHERITING(SVGAElementBase) NS_IMPL_CYCLE_COLLECTION_CLASS(SVGAElement) diff --git a/content/svg/content/src/SVGFEImageElement.cpp b/content/svg/content/src/SVGFEImageElement.cpp index ac9f0bf282a..b7c1e3bb37f 100644 --- a/content/svg/content/src/SVGFEImageElement.cpp +++ b/content/svg/content/src/SVGFEImageElement.cpp @@ -39,10 +39,10 @@ nsSVGElement::StringInfo SVGFEImageElement::sStringInfo[2] = //---------------------------------------------------------------------- // nsISupports methods -NS_IMPL_ISUPPORTS_INHERITED6(SVGFEImageElement, SVGFEImageElementBase, - nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, - imgINotificationObserver, nsIImageLoadingContent, - imgIOnloadBlocker) +NS_IMPL_ISUPPORTS_INHERITED(SVGFEImageElement, SVGFEImageElementBase, + nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, + imgINotificationObserver, nsIImageLoadingContent, + imgIOnloadBlocker) //---------------------------------------------------------------------- // Implementation diff --git a/content/svg/content/src/SVGImageElement.cpp b/content/svg/content/src/SVGImageElement.cpp index fa3ffde6020..3f57644b357 100644 --- a/content/svg/content/src/SVGImageElement.cpp +++ b/content/svg/content/src/SVGImageElement.cpp @@ -45,11 +45,11 @@ nsSVGElement::StringInfo SVGImageElement::sStringInfo[1] = //---------------------------------------------------------------------- // nsISupports methods -NS_IMPL_ISUPPORTS_INHERITED6(SVGImageElement, SVGImageElementBase, - nsIDOMNode, nsIDOMElement, - nsIDOMSVGElement, - imgINotificationObserver, - nsIImageLoadingContent, imgIOnloadBlocker) +NS_IMPL_ISUPPORTS_INHERITED(SVGImageElement, SVGImageElementBase, + nsIDOMNode, nsIDOMElement, + nsIDOMSVGElement, + imgINotificationObserver, + nsIImageLoadingContent, imgIOnloadBlocker) //---------------------------------------------------------------------- // Implementation diff --git a/content/svg/content/src/SVGMPathElement.cpp b/content/svg/content/src/SVGMPathElement.cpp index c8bf716141d..20f8edc322f 100644 --- a/content/svg/content/src/SVGMPathElement.cpp +++ b/content/svg/content/src/SVGMPathElement.cpp @@ -49,9 +49,9 @@ NS_IMPL_ADDREF_INHERITED(SVGMPathElement,SVGMPathElementBase) NS_IMPL_RELEASE_INHERITED(SVGMPathElement,SVGMPathElementBase) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(SVGMPathElement) - NS_INTERFACE_TABLE_INHERITED4(SVGMPathElement, nsIDOMNode, nsIDOMElement, - nsIDOMSVGElement, - nsIMutationObserver) + NS_INTERFACE_TABLE_INHERITED(SVGMPathElement, nsIDOMNode, nsIDOMElement, + nsIDOMSVGElement, + nsIMutationObserver) NS_INTERFACE_TABLE_TAIL_INHERITING(SVGMPathElementBase) // Constructor diff --git a/content/svg/content/src/SVGSVGElement.cpp b/content/svg/content/src/SVGSVGElement.cpp index d327e62b472..9ea2a074819 100644 --- a/content/svg/content/src/SVGSVGElement.cpp +++ b/content/svg/content/src/SVGSVGElement.cpp @@ -149,8 +149,8 @@ NS_IMPL_ADDREF_INHERITED(SVGSVGElement,SVGSVGElementBase) NS_IMPL_RELEASE_INHERITED(SVGSVGElement,SVGSVGElementBase) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(SVGSVGElement) - NS_INTERFACE_TABLE_INHERITED3(SVGSVGElement, nsIDOMNode, nsIDOMElement, - nsIDOMSVGElement) + NS_INTERFACE_TABLE_INHERITED(SVGSVGElement, nsIDOMNode, nsIDOMElement, + nsIDOMSVGElement) NS_INTERFACE_TABLE_TAIL_INHERITING(SVGSVGElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/SVGScriptElement.cpp b/content/svg/content/src/SVGScriptElement.cpp index 40b2ee9f585..418eb8286f2 100644 --- a/content/svg/content/src/SVGScriptElement.cpp +++ b/content/svg/content/src/SVGScriptElement.cpp @@ -29,11 +29,11 @@ nsSVGElement::StringInfo SVGScriptElement::sStringInfo[1] = //---------------------------------------------------------------------- // nsISupports methods -NS_IMPL_ISUPPORTS_INHERITED6(SVGScriptElement, SVGScriptElementBase, - nsIDOMNode, nsIDOMElement, - nsIDOMSVGElement, - nsIScriptLoaderObserver, - nsIScriptElement, nsIMutationObserver) +NS_IMPL_ISUPPORTS_INHERITED(SVGScriptElement, SVGScriptElementBase, + nsIDOMNode, nsIDOMElement, + nsIDOMSVGElement, + nsIScriptLoaderObserver, + nsIScriptElement, nsIMutationObserver) //---------------------------------------------------------------------- // Implementation diff --git a/content/svg/content/src/SVGStyleElement.cpp b/content/svg/content/src/SVGStyleElement.cpp index 94bccd10049..e19590331be 100644 --- a/content/svg/content/src/SVGStyleElement.cpp +++ b/content/svg/content/src/SVGStyleElement.cpp @@ -26,9 +26,9 @@ NS_IMPL_ADDREF_INHERITED(SVGStyleElement, SVGStyleElementBase) NS_IMPL_RELEASE_INHERITED(SVGStyleElement, SVGStyleElementBase) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(SVGStyleElement) - NS_INTERFACE_TABLE_INHERITED2(SVGStyleElement, - nsIStyleSheetLinkingElement, - nsIMutationObserver) + NS_INTERFACE_TABLE_INHERITED(SVGStyleElement, + nsIStyleSheetLinkingElement, + nsIMutationObserver) NS_INTERFACE_TABLE_TAIL_INHERITING(SVGStyleElementBase) NS_IMPL_CYCLE_COLLECTION_CLASS(SVGStyleElement) diff --git a/content/svg/content/src/SVGSymbolElement.cpp b/content/svg/content/src/SVGSymbolElement.cpp index 380031ae702..1e503cf84bf 100644 --- a/content/svg/content/src/SVGSymbolElement.cpp +++ b/content/svg/content/src/SVGSymbolElement.cpp @@ -20,9 +20,9 @@ SVGSymbolElement::WrapNode(JSContext *aCx) //---------------------------------------------------------------------- // nsISupports methods -NS_IMPL_ISUPPORTS_INHERITED4(SVGSymbolElement, SVGSymbolElementBase, - nsIDOMNode, nsIDOMElement, - nsIDOMSVGElement, mozilla::dom::SVGTests) +NS_IMPL_ISUPPORTS_INHERITED(SVGSymbolElement, SVGSymbolElementBase, + nsIDOMNode, nsIDOMElement, + nsIDOMSVGElement, mozilla::dom::SVGTests) //---------------------------------------------------------------------- // Implementation diff --git a/content/svg/content/src/SVGTitleElement.cpp b/content/svg/content/src/SVGTitleElement.cpp index 7c76e08546c..6bc4f194b71 100644 --- a/content/svg/content/src/SVGTitleElement.cpp +++ b/content/svg/content/src/SVGTitleElement.cpp @@ -20,10 +20,10 @@ SVGTitleElement::WrapNode(JSContext *aCx) //---------------------------------------------------------------------- // nsISupports methods -NS_IMPL_ISUPPORTS_INHERITED4(SVGTitleElement, SVGTitleElementBase, - nsIDOMNode, nsIDOMElement, - nsIDOMSVGElement, - nsIMutationObserver) +NS_IMPL_ISUPPORTS_INHERITED(SVGTitleElement, SVGTitleElementBase, + nsIDOMNode, nsIDOMElement, + nsIDOMSVGElement, + nsIMutationObserver) //---------------------------------------------------------------------- // Implementation diff --git a/content/svg/content/src/SVGUseElement.cpp b/content/svg/content/src/SVGUseElement.cpp index 16cb19239fb..723904a6e33 100644 --- a/content/svg/content/src/SVGUseElement.cpp +++ b/content/svg/content/src/SVGUseElement.cpp @@ -65,7 +65,7 @@ NS_IMPL_ADDREF_INHERITED(SVGUseElement,SVGUseElementBase) NS_IMPL_RELEASE_INHERITED(SVGUseElement,SVGUseElementBase) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(SVGUseElement) - NS_INTERFACE_TABLE_INHERITED1(SVGUseElement, nsIMutationObserver) + NS_INTERFACE_TABLE_INHERITED(SVGUseElement, nsIMutationObserver) NS_INTERFACE_TABLE_TAIL_INHERITING(SVGUseElementBase) //---------------------------------------------------------------------- diff --git a/content/svg/content/src/nsSVGElement.cpp b/content/svg/content/src/nsSVGElement.cpp index 08355be3e3b..23e923230c5 100644 --- a/content/svg/content/src/nsSVGElement.cpp +++ b/content/svg/content/src/nsSVGElement.cpp @@ -230,9 +230,9 @@ nsSVGElement::Init() //---------------------------------------------------------------------- // nsISupports methods -NS_IMPL_ISUPPORTS_INHERITED3(nsSVGElement, nsSVGElementBase, - nsIDOMNode, nsIDOMElement, - nsIDOMSVGElement) +NS_IMPL_ISUPPORTS_INHERITED(nsSVGElement, nsSVGElementBase, + nsIDOMNode, nsIDOMElement, + nsIDOMSVGElement) //---------------------------------------------------------------------- // Implementation diff --git a/content/xml/content/src/CDATASection.cpp b/content/xml/content/src/CDATASection.cpp index 09d40ee95c5..3f45d0f0075 100644 --- a/content/xml/content/src/CDATASection.cpp +++ b/content/xml/content/src/CDATASection.cpp @@ -14,9 +14,9 @@ CDATASection::~CDATASection() { } -NS_IMPL_ISUPPORTS_INHERITED4(CDATASection, nsGenericDOMDataNode, nsIDOMNode, - nsIDOMCharacterData, nsIDOMText, - nsIDOMCDATASection) +NS_IMPL_ISUPPORTS_INHERITED(CDATASection, nsGenericDOMDataNode, nsIDOMNode, + nsIDOMCharacterData, nsIDOMText, + nsIDOMCDATASection) JSObject* CDATASection::WrapNode(JSContext *aCx) diff --git a/content/xml/content/src/ProcessingInstruction.cpp b/content/xml/content/src/ProcessingInstruction.cpp index cb50083be2e..46248ee76ed 100644 --- a/content/xml/content/src/ProcessingInstruction.cpp +++ b/content/xml/content/src/ProcessingInstruction.cpp @@ -62,9 +62,9 @@ ProcessingInstruction::~ProcessingInstruction() { } -NS_IMPL_ISUPPORTS_INHERITED3(ProcessingInstruction, nsGenericDOMDataNode, - nsIDOMNode, nsIDOMCharacterData, - nsIDOMProcessingInstruction) +NS_IMPL_ISUPPORTS_INHERITED(ProcessingInstruction, nsGenericDOMDataNode, + nsIDOMNode, nsIDOMCharacterData, + nsIDOMProcessingInstruction) JSObject* ProcessingInstruction::WrapNode(JSContext *aCx) diff --git a/content/xml/content/src/XMLStylesheetProcessingInstruction.cpp b/content/xml/content/src/XMLStylesheetProcessingInstruction.cpp index 6e991443d5c..591e04435ca 100644 --- a/content/xml/content/src/XMLStylesheetProcessingInstruction.cpp +++ b/content/xml/content/src/XMLStylesheetProcessingInstruction.cpp @@ -14,9 +14,9 @@ namespace dom { // nsISupports implementation NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XMLStylesheetProcessingInstruction) - NS_INTERFACE_TABLE_INHERITED3(XMLStylesheetProcessingInstruction, nsIDOMNode, - nsIDOMProcessingInstruction, - nsIStyleSheetLinkingElement) + NS_INTERFACE_TABLE_INHERITED(XMLStylesheetProcessingInstruction, nsIDOMNode, + nsIDOMProcessingInstruction, + nsIStyleSheetLinkingElement) NS_INTERFACE_TABLE_TAIL_INHERITING(ProcessingInstruction) NS_IMPL_ADDREF_INHERITED(XMLStylesheetProcessingInstruction, diff --git a/content/xml/content/src/nsXMLElement.cpp b/content/xml/content/src/nsXMLElement.cpp index 486ba5b976c..1fa15a97e3f 100644 --- a/content/xml/content/src/nsXMLElement.cpp +++ b/content/xml/content/src/nsXMLElement.cpp @@ -19,8 +19,8 @@ NS_NewXMLElement(Element** aInstancePtrResult, return NS_OK; } -NS_IMPL_ISUPPORTS_INHERITED2(nsXMLElement, Element, - nsIDOMNode, nsIDOMElement) +NS_IMPL_ISUPPORTS_INHERITED(nsXMLElement, Element, + nsIDOMNode, nsIDOMElement) JSObject* nsXMLElement::WrapNode(JSContext *aCx) diff --git a/content/xml/document/src/XMLDocument.cpp b/content/xml/document/src/XMLDocument.cpp index e589129a3fe..54da9349127 100644 --- a/content/xml/document/src/XMLDocument.cpp +++ b/content/xml/document/src/XMLDocument.cpp @@ -228,7 +228,7 @@ XMLDocument::~XMLDocument() } // QueryInterface implementation for XMLDocument -NS_IMPL_ISUPPORTS_INHERITED1(XMLDocument, nsDocument, nsIDOMXMLDocument) +NS_IMPL_ISUPPORTS_INHERITED(XMLDocument, nsDocument, nsIDOMXMLDocument) nsresult XMLDocument::Init() diff --git a/content/xml/document/src/nsXMLPrettyPrinter.cpp b/content/xml/document/src/nsXMLPrettyPrinter.cpp index 7944e45e340..aacb26e404a 100644 --- a/content/xml/document/src/nsXMLPrettyPrinter.cpp +++ b/content/xml/document/src/nsXMLPrettyPrinter.cpp @@ -29,9 +29,9 @@ using namespace mozilla; using namespace mozilla::dom; -NS_IMPL_ISUPPORTS2(nsXMLPrettyPrinter, - nsIDocumentObserver, - nsIMutationObserver) +NS_IMPL_ISUPPORTS(nsXMLPrettyPrinter, + nsIDocumentObserver, + nsIMutationObserver) nsXMLPrettyPrinter::nsXMLPrettyPrinter() : mDocument(nullptr), mUnhookPending(false) diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp index 8e239addf24..ea58f5cc18a 100644 --- a/content/xul/content/src/nsXULElement.cpp +++ b/content/xul/content/src/nsXULElement.cpp @@ -339,8 +339,8 @@ NS_IMPL_ADDREF_INHERITED(nsXULElement, nsStyledElement) NS_IMPL_RELEASE_INHERITED(nsXULElement, nsStyledElement) NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsXULElement) - NS_INTERFACE_TABLE_INHERITED3(nsXULElement, nsIDOMNode, nsIDOMElement, - nsIDOMXULElement) + NS_INTERFACE_TABLE_INHERITED(nsXULElement, nsIDOMNode, nsIDOMElement, + nsIDOMXULElement) NS_ELEMENT_INTERFACE_TABLE_TO_MAP_SEGUE NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMElementCSSInlineStyle, new nsXULElementTearoff(this)) diff --git a/content/xul/document/src/XULDocument.cpp b/content/xul/document/src/XULDocument.cpp index 03ce806188f..463e7170b64 100644 --- a/content/xul/document/src/XULDocument.cpp +++ b/content/xul/document/src/XULDocument.cpp @@ -354,9 +354,9 @@ NS_IMPL_RELEASE_INHERITED(XULDocument, XMLDocument) // QueryInterface implementation for XULDocument NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XULDocument) - NS_INTERFACE_TABLE_INHERITED5(XULDocument, nsIXULDocument, - nsIDOMXULDocument, nsIStreamLoaderObserver, - nsICSSLoaderObserver, nsIOffThreadScriptReceiver) + NS_INTERFACE_TABLE_INHERITED(XULDocument, nsIXULDocument, + nsIDOMXULDocument, nsIStreamLoaderObserver, + nsICSSLoaderObserver, nsIOffThreadScriptReceiver) NS_INTERFACE_TABLE_TAIL_INHERITING(XMLDocument) @@ -4593,8 +4593,8 @@ XULDocument::CachedChromeStreamListener::~CachedChromeStreamListener() } -NS_IMPL_ISUPPORTS2(XULDocument::CachedChromeStreamListener, - nsIRequestObserver, nsIStreamListener) +NS_IMPL_ISUPPORTS(XULDocument::CachedChromeStreamListener, + nsIRequestObserver, nsIStreamListener) NS_IMETHODIMP XULDocument::CachedChromeStreamListener::OnStartRequest(nsIRequest *request, @@ -4642,7 +4642,7 @@ XULDocument::ParserObserver::~ParserObserver() { } -NS_IMPL_ISUPPORTS1(XULDocument::ParserObserver, nsIRequestObserver) +NS_IMPL_ISUPPORTS(XULDocument::ParserObserver, nsIRequestObserver) NS_IMETHODIMP XULDocument::ParserObserver::OnStartRequest(nsIRequest *request, diff --git a/content/xul/document/src/nsXULPrototypeCache.cpp b/content/xul/document/src/nsXULPrototypeCache.cpp index 54c17366c85..97c9316857d 100644 --- a/content/xul/document/src/nsXULPrototypeCache.cpp +++ b/content/xul/document/src/nsXULPrototypeCache.cpp @@ -80,7 +80,7 @@ nsXULPrototypeCache::~nsXULPrototypeCache() } -NS_IMPL_ISUPPORTS1(nsXULPrototypeCache, nsIObserver) +NS_IMPL_ISUPPORTS(nsXULPrototypeCache, nsIObserver) /* static */ nsXULPrototypeCache* nsXULPrototypeCache::GetInstance() diff --git a/content/xul/templates/src/nsXULSortService.cpp b/content/xul/templates/src/nsXULSortService.cpp index 3629fee0f20..246e64dd591 100644 --- a/content/xul/templates/src/nsXULSortService.cpp +++ b/content/xul/templates/src/nsXULSortService.cpp @@ -38,7 +38,7 @@ #include "nsICollation.h" #include "nsUnicharUtils.h" -NS_IMPL_ISUPPORTS1(XULSortServiceImpl, nsIXULSortService) +NS_IMPL_ISUPPORTS(XULSortServiceImpl, nsIXULSortService) void XULSortServiceImpl::SetSortHints(nsIContent *aNode, nsSortState* aSortState) diff --git a/content/xul/templates/src/nsXULTemplateQueryProcessorStorage.cpp b/content/xul/templates/src/nsXULTemplateQueryProcessorStorage.cpp index 4918eb88a03..794ccf1a61f 100644 --- a/content/xul/templates/src/nsXULTemplateQueryProcessorStorage.cpp +++ b/content/xul/templates/src/nsXULTemplateQueryProcessorStorage.cpp @@ -33,7 +33,7 @@ // nsXULTemplateResultSetStorage // -NS_IMPL_ISUPPORTS1(nsXULTemplateResultSetStorage, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsXULTemplateResultSetStorage, nsISimpleEnumerator) nsXULTemplateResultSetStorage::nsXULTemplateResultSetStorage(mozIStorageStatement* aStatement) @@ -142,8 +142,8 @@ nsXULTemplateResultSetStorage::FillColumnValues(nsCOMArray& aArray) // nsXULTemplateQueryProcessorStorage // -NS_IMPL_ISUPPORTS1(nsXULTemplateQueryProcessorStorage, - nsIXULTemplateQueryProcessor) +NS_IMPL_ISUPPORTS(nsXULTemplateQueryProcessorStorage, + nsIXULTemplateQueryProcessor) nsXULTemplateQueryProcessorStorage::nsXULTemplateQueryProcessorStorage() diff --git a/content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp b/content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp index a88247e6345..39c36964333 100644 --- a/content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp +++ b/content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp @@ -28,14 +28,14 @@ using namespace mozilla::dom; -NS_IMPL_ISUPPORTS1(nsXMLQuery, nsXMLQuery) +NS_IMPL_ISUPPORTS(nsXMLQuery, nsXMLQuery) //---------------------------------------------------------------------- // // nsXULTemplateResultSetXML // -NS_IMPL_ISUPPORTS1(nsXULTemplateResultSetXML, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsXULTemplateResultSetXML, nsISimpleEnumerator) NS_IMETHODIMP nsXULTemplateResultSetXML::HasMoreElements(bool *aResult) diff --git a/content/xul/templates/src/nsXULTemplateResultSetRDF.cpp b/content/xul/templates/src/nsXULTemplateResultSetRDF.cpp index 8ac065b188c..a0c28df83f3 100644 --- a/content/xul/templates/src/nsXULTemplateResultSetRDF.cpp +++ b/content/xul/templates/src/nsXULTemplateResultSetRDF.cpp @@ -6,7 +6,7 @@ #include "nsXULTemplateResultSetRDF.h" #include "nsXULTemplateQueryProcessorRDF.h" -NS_IMPL_ISUPPORTS1(nsXULTemplateResultSetRDF, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsXULTemplateResultSetRDF, nsISimpleEnumerator) NS_IMETHODIMP nsXULTemplateResultSetRDF::HasMoreElements(bool *aResult) diff --git a/content/xul/templates/src/nsXULTemplateResultStorage.cpp b/content/xul/templates/src/nsXULTemplateResultStorage.cpp index 6b9887c0073..11393be86bc 100644 --- a/content/xul/templates/src/nsXULTemplateResultStorage.cpp +++ b/content/xul/templates/src/nsXULTemplateResultStorage.cpp @@ -9,7 +9,7 @@ #include "nsString.h" #include "nsXULTemplateResultStorage.h" -NS_IMPL_ISUPPORTS1(nsXULTemplateResultStorage, nsIXULTemplateResult) +NS_IMPL_ISUPPORTS(nsXULTemplateResultStorage, nsIXULTemplateResult) nsXULTemplateResultStorage::nsXULTemplateResultStorage(nsXULTemplateResultSetStorage* aResultSet) { diff --git a/content/xul/templates/src/nsXULTemplateResultXML.cpp b/content/xul/templates/src/nsXULTemplateResultXML.cpp index c2e617191a3..2c76d20a682 100644 --- a/content/xul/templates/src/nsXULTemplateResultXML.cpp +++ b/content/xul/templates/src/nsXULTemplateResultXML.cpp @@ -15,7 +15,7 @@ static uint32_t sTemplateId = 0; -NS_IMPL_ISUPPORTS1(nsXULTemplateResultXML, nsIXULTemplateResult) +NS_IMPL_ISUPPORTS(nsXULTemplateResultXML, nsIXULTemplateResult) nsXULTemplateResultXML::nsXULTemplateResultXML(nsXMLQuery* aQuery, nsIDOMNode* aNode, diff --git a/docshell/base/LoadContext.cpp b/docshell/base/LoadContext.cpp index 59f20330102..8f453f6637f 100644 --- a/docshell/base/LoadContext.cpp +++ b/docshell/base/LoadContext.cpp @@ -8,7 +8,7 @@ namespace mozilla { -NS_IMPL_ISUPPORTS2(LoadContext, nsILoadContext, nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(LoadContext, nsILoadContext, nsIInterfaceRequestor) //----------------------------------------------------------------------------- // LoadContext::nsILoadContext diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp index b7bcb35b959..ff233ee1c11 100644 --- a/docshell/base/nsAboutRedirector.cpp +++ b/docshell/base/nsAboutRedirector.cpp @@ -9,7 +9,7 @@ #include "nsAboutProtocolUtils.h" #include "mozilla/ArrayUtils.h" -NS_IMPL_ISUPPORTS1(nsAboutRedirector, nsIAboutModule) +NS_IMPL_ISUPPORTS(nsAboutRedirector, nsIAboutModule) struct RedirEntry { const char* id; diff --git a/docshell/base/nsDefaultURIFixup.cpp b/docshell/base/nsDefaultURIFixup.cpp index 5474132cd07..3f3abbeed8e 100644 --- a/docshell/base/nsDefaultURIFixup.cpp +++ b/docshell/base/nsDefaultURIFixup.cpp @@ -26,7 +26,7 @@ using namespace mozilla; /* Implementation file */ -NS_IMPL_ISUPPORTS1(nsDefaultURIFixup, nsIURIFixup) +NS_IMPL_ISUPPORTS(nsDefaultURIFixup, nsIURIFixup) static bool sFixTypos = true; diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index da6af7c89e8..76ed4567e26 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -443,8 +443,8 @@ private: nsCOMPtr mTimer; }; -NS_IMPL_ISUPPORTS4(nsPingListener, nsIStreamListener, nsIRequestObserver, - nsIInterfaceRequestor, nsIChannelEventSink) +NS_IMPL_ISUPPORTS(nsPingListener, nsIStreamListener, nsIRequestObserver, + nsIInterfaceRequestor, nsIChannelEventSink) nsPingListener::~nsPingListener() { @@ -8746,7 +8746,7 @@ private: bool mInPrivateBrowsing; }; -NS_IMPL_ISUPPORTS1(nsCopyFaviconCallback, nsIFaviconDataCallback) +NS_IMPL_ISUPPORTS(nsCopyFaviconCallback, nsIFaviconDataCallback) #endif // Tell the favicon service that aNewURI has the same favicon as aOldURI. @@ -12163,7 +12163,7 @@ nsDocShell::InterfaceRequestorProxy::~InterfaceRequestorProxy() mWeakPtr = nullptr; } -NS_IMPL_ISUPPORTS1(nsDocShell::InterfaceRequestorProxy, nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(nsDocShell::InterfaceRequestorProxy, nsIInterfaceRequestor) NS_IMETHODIMP nsDocShell::InterfaceRequestorProxy::GetInterface(const nsIID & aIID, void **aSink) diff --git a/docshell/base/nsDocShellEnumerator.cpp b/docshell/base/nsDocShellEnumerator.cpp index 8122a9b464f..4648190b79d 100644 --- a/docshell/base/nsDocShellEnumerator.cpp +++ b/docshell/base/nsDocShellEnumerator.cpp @@ -22,7 +22,7 @@ nsDocShellEnumerator::~nsDocShellEnumerator() { } -NS_IMPL_ISUPPORTS1(nsDocShellEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsDocShellEnumerator, nsISimpleEnumerator) /* nsISupports getNext (); */ diff --git a/docshell/base/nsDocShellTransferableHooks.cpp b/docshell/base/nsDocShellTransferableHooks.cpp index 1e3461220a2..1e7f6472033 100644 --- a/docshell/base/nsDocShellTransferableHooks.cpp +++ b/docshell/base/nsDocShellTransferableHooks.cpp @@ -20,7 +20,7 @@ nsTransferableHookData::~nsTransferableHookData() // nsIClipboardDragDropHookList //***************************************************************************** -NS_IMPL_ISUPPORTS1(nsTransferableHookData, nsIClipboardDragDropHookList) +NS_IMPL_ISUPPORTS(nsTransferableHookData, nsIClipboardDragDropHookList) NS_IMETHODIMP nsTransferableHookData::AddClipboardDragDropHooks( diff --git a/docshell/base/nsDownloadHistory.cpp b/docshell/base/nsDownloadHistory.cpp index 5100c6e9bc1..a03b504ae86 100644 --- a/docshell/base/nsDownloadHistory.cpp +++ b/docshell/base/nsDownloadHistory.cpp @@ -14,7 +14,7 @@ //////////////////////////////////////////////////////////////////////////////// //// nsDownloadHistory -NS_IMPL_ISUPPORTS1(nsDownloadHistory, nsIDownloadHistory) +NS_IMPL_ISUPPORTS(nsDownloadHistory, nsIDownloadHistory) //////////////////////////////////////////////////////////////////////////////// //// nsIDownloadHistory diff --git a/docshell/base/nsWebNavigationInfo.cpp b/docshell/base/nsWebNavigationInfo.cpp index 31f107e175d..1fb38d6d807 100644 --- a/docshell/base/nsWebNavigationInfo.cpp +++ b/docshell/base/nsWebNavigationInfo.cpp @@ -12,7 +12,7 @@ #include "nsContentUtils.h" #include "imgLoader.h" -NS_IMPL_ISUPPORTS1(nsWebNavigationInfo, nsIWebNavigationInfo) +NS_IMPL_ISUPPORTS(nsWebNavigationInfo, nsIWebNavigationInfo) #define CONTENT_DLF_CONTRACT "@mozilla.org/content/document-loader-factory;1" #define PLUGIN_DLF_CONTRACT \ diff --git a/docshell/shistory/src/nsSHEntry.cpp b/docshell/shistory/src/nsSHEntry.cpp index a3e2b711480..8e52757359f 100644 --- a/docshell/shistory/src/nsSHEntry.cpp +++ b/docshell/shistory/src/nsSHEntry.cpp @@ -76,7 +76,7 @@ nsSHEntry::~nsSHEntry() // nsSHEntry: nsISupports //***************************************************************************** -NS_IMPL_ISUPPORTS3(nsSHEntry, nsISHContainer, nsISHEntry, nsISHEntryInternal) +NS_IMPL_ISUPPORTS(nsSHEntry, nsISHContainer, nsISHEntry, nsISHEntryInternal) //***************************************************************************** // nsSHEntry: nsISHEntry diff --git a/docshell/shistory/src/nsSHEntryShared.cpp b/docshell/shistory/src/nsSHEntryShared.cpp index e24a6010d5c..0586c363c9e 100644 --- a/docshell/shistory/src/nsSHEntryShared.cpp +++ b/docshell/shistory/src/nsSHEntryShared.cpp @@ -95,7 +95,7 @@ nsSHEntryShared::~nsSHEntryShared() } } -NS_IMPL_ISUPPORTS2(nsSHEntryShared, nsIBFCacheEntry, nsIMutationObserver) +NS_IMPL_ISUPPORTS(nsSHEntryShared, nsIBFCacheEntry, nsIMutationObserver) already_AddRefed nsSHEntryShared::Duplicate(nsSHEntryShared *aEntry) diff --git a/docshell/shistory/src/nsSHistory.cpp b/docshell/shistory/src/nsSHistory.cpp index fc3a5107a70..5c7f85e204f 100644 --- a/docshell/shistory/src/nsSHistory.cpp +++ b/docshell/shistory/src/nsSHistory.cpp @@ -181,7 +181,7 @@ protected: static nsSHistoryObserver* gObserver = nullptr; -NS_IMPL_ISUPPORTS1(nsSHistoryObserver, nsIObserver) +NS_IMPL_ISUPPORTS(nsSHistoryObserver, nsIObserver) NS_IMETHODIMP nsSHistoryObserver::Observe(nsISupports *aSubject, const char *aTopic, @@ -1838,7 +1838,7 @@ nsSHEnumerator::~nsSHEnumerator() mSHistory = nullptr; } -NS_IMPL_ISUPPORTS1(nsSHEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsSHEnumerator, nsISimpleEnumerator) NS_IMETHODIMP nsSHEnumerator::HasMoreElements(bool * aReturn) diff --git a/dom/alarm/AlarmHalService.cpp b/dom/alarm/AlarmHalService.cpp index e6cc50485f3..47b4c57a723 100644 --- a/dom/alarm/AlarmHalService.cpp +++ b/dom/alarm/AlarmHalService.cpp @@ -10,7 +10,7 @@ namespace alarm { using namespace hal; -NS_IMPL_ISUPPORTS1(AlarmHalService, nsIAlarmHalService) +NS_IMPL_ISUPPORTS(AlarmHalService, nsIAlarmHalService) void AlarmHalService::Init() diff --git a/dom/audiochannel/AudioChannelService.cpp b/dom/audiochannel/AudioChannelService.cpp index 48770e73fc1..6efff476baf 100644 --- a/dom/audiochannel/AudioChannelService.cpp +++ b/dom/audiochannel/AudioChannelService.cpp @@ -84,7 +84,7 @@ AudioChannelService::Shutdown() } } -NS_IMPL_ISUPPORTS2(AudioChannelService, nsIObserver, nsITimerCallback) +NS_IMPL_ISUPPORTS(AudioChannelService, nsIObserver, nsITimerCallback) AudioChannelService::AudioChannelService() : mCurrentHigherChannel(-1) diff --git a/dom/audiochannel/tests/TestAudioChannelService.cpp b/dom/audiochannel/tests/TestAudioChannelService.cpp index 7629e3df2a5..32fd3c110fc 100644 --- a/dom/audiochannel/tests/TestAudioChannelService.cpp +++ b/dom/audiochannel/tests/TestAudioChannelService.cpp @@ -135,8 +135,8 @@ public: AudioChannelState mCanPlay; }; -NS_IMPL_ISUPPORTS2(Agent, nsIAudioChannelAgentCallback, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(Agent, nsIAudioChannelAgentCallback, + nsISupportsWeakReference) nsresult TestDoubleStartPlaying() diff --git a/dom/base/CompositionStringSynthesizer.cpp b/dom/base/CompositionStringSynthesizer.cpp index 9d47a576ded..728e45bfc5a 100644 --- a/dom/base/CompositionStringSynthesizer.cpp +++ b/dom/base/CompositionStringSynthesizer.cpp @@ -16,8 +16,8 @@ namespace mozilla { namespace dom { -NS_IMPL_ISUPPORTS1(CompositionStringSynthesizer, - nsICompositionStringSynthesizer) +NS_IMPL_ISUPPORTS(CompositionStringSynthesizer, + nsICompositionStringSynthesizer) CompositionStringSynthesizer::CompositionStringSynthesizer( nsPIDOMWindow* aWindow) diff --git a/dom/base/DOMException.cpp b/dom/base/DOMException.cpp index fb0a6d7f7a8..9ad82327e00 100644 --- a/dom/base/DOMException.cpp +++ b/dom/base/DOMException.cpp @@ -171,7 +171,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(Exception) tmp->mThrownJSVal.setNull(); NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_IMPL_CI_INTERFACE_GETTER1(Exception, nsIXPCException) +NS_IMPL_CI_INTERFACE_GETTER(Exception, nsIXPCException) Exception::Exception(const nsACString& aMessage, nsresult aResult, diff --git a/dom/base/DOMRequest.cpp b/dom/base/DOMRequest.cpp index a440fc6bf9e..0914314e437 100644 --- a/dom/base/DOMRequest.cpp +++ b/dom/base/DOMRequest.cpp @@ -175,7 +175,7 @@ DOMRequest::RootResultVal() mozilla::HoldJSObjects(this); } -NS_IMPL_ISUPPORTS1(DOMRequestService, nsIDOMRequestService) +NS_IMPL_ISUPPORTS(DOMRequestService, nsIDOMRequestService) NS_IMETHODIMP DOMRequestService::CreateRequest(nsIDOMWindow* aWindow, diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 7ac36c43279..df1eaa6b510 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -658,7 +658,7 @@ private: nsWeakPtr mDocument; }; -NS_IMPL_ISUPPORTS1(VibrateWindowListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(VibrateWindowListener, nsIDOMEventListener) StaticRefPtr gVibrateWindowListener; @@ -1017,9 +1017,9 @@ class BeaconStreamListener MOZ_FINAL : public nsIStreamListener NS_DECL_NSIREQUESTOBSERVER }; -NS_IMPL_ISUPPORTS2(BeaconStreamListener, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(BeaconStreamListener, + nsIStreamListener, + nsIRequestObserver) NS_IMETHODIMP diff --git a/dom/base/nsContentPermissionHelper.cpp b/dom/base/nsContentPermissionHelper.cpp index 53a7b044a0c..f47cc24e30f 100644 --- a/dom/base/nsContentPermissionHelper.cpp +++ b/dom/base/nsContentPermissionHelper.cpp @@ -94,7 +94,7 @@ ContentPermissionRequestParent::IsBeingDestroyed() return tabParent->IsDestroyed(); } -NS_IMPL_ISUPPORTS1(ContentPermissionType, nsIContentPermissionType) +NS_IMPL_ISUPPORTS(ContentPermissionType, nsIContentPermissionType) ContentPermissionType::ContentPermissionType(const nsACString& aType, const nsACString& aAccess, @@ -227,7 +227,7 @@ nsContentPermissionRequestProxy::OnParentDestroyed() mParent = nullptr; } -NS_IMPL_ISUPPORTS1(nsContentPermissionRequestProxy, nsIContentPermissionRequest) +NS_IMPL_ISUPPORTS(nsContentPermissionRequestProxy, nsIContentPermissionRequest) NS_IMETHODIMP nsContentPermissionRequestProxy::GetTypes(nsIArray** aTypes) diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index 1511d78f4f2..aee6f7fe411 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -502,7 +502,7 @@ private: nsGlobalWindow* mWindow; }; -NS_IMPL_ISUPPORTS2(nsGlobalWindowObserver, nsIObserver, nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(nsGlobalWindowObserver, nsIObserver, nsIInterfaceRequestor) nsTimeout::nsTimeout() : mCleared(false), @@ -2154,7 +2154,7 @@ WindowStateHolder::~WindowStateHolder() } } -NS_IMPL_ISUPPORTS1(WindowStateHolder, WindowStateHolder) +NS_IMPL_ISUPPORTS(WindowStateHolder, WindowStateHolder) // We need certain special behavior for remote XUL whitelisted domains, but we // don't want that behavior to take effect in automation, because we whitelist diff --git a/dom/base/nsGlobalWindowCommands.cpp b/dom/base/nsGlobalWindowCommands.cpp index 3623fe6b42e..d6d81517008 100644 --- a/dom/base/nsGlobalWindowCommands.cpp +++ b/dom/base/nsGlobalWindowCommands.cpp @@ -132,7 +132,7 @@ public: #endif -NS_IMPL_ISUPPORTS1(nsSelectionCommandsBase, nsIControllerCommand) +NS_IMPL_ISUPPORTS(nsSelectionCommandsBase, nsIControllerCommand) /* boolean isCommandEnabled (in string aCommandName, in nsISupports aCommandContext); */ NS_IMETHODIMP @@ -329,7 +329,7 @@ public: NS_DECL_NSICONTROLLERCOMMAND }; -NS_IMPL_ISUPPORTS1(nsClipboardCommand, nsIControllerCommand) +NS_IMPL_ISUPPORTS(nsClipboardCommand, nsIControllerCommand) nsresult nsClipboardCommand::IsCommandEnabled(const char* aCommandName, nsISupports *aContext, bool *outCmdEnabled) @@ -403,7 +403,7 @@ protected: }; -NS_IMPL_ISUPPORTS1(nsSelectionCommand, nsIControllerCommand) +NS_IMPL_ISUPPORTS(nsSelectionCommand, nsIControllerCommand) /*--------------------------------------------------------------------------- @@ -634,7 +634,7 @@ protected: no params ----------------------------------------------------------------------------*/ -NS_IMPL_ISUPPORTS1(nsWebNavigationBaseCommand, nsIControllerCommand) +NS_IMPL_ISUPPORTS(nsWebNavigationBaseCommand, nsIControllerCommand) NS_IMETHODIMP nsWebNavigationBaseCommand::IsCommandEnabled(const char * aCommandName, @@ -732,7 +732,7 @@ protected: }; -NS_IMPL_ISUPPORTS1(nsClipboardDragDropHookCommand, nsIControllerCommand) +NS_IMPL_ISUPPORTS(nsClipboardDragDropHookCommand, nsIControllerCommand) NS_IMETHODIMP nsClipboardDragDropHookCommand::IsCommandEnabled(const char * aCommandName, diff --git a/dom/base/nsIDOMClassInfo.h b/dom/base/nsIDOMClassInfo.h index d948cd19989..88bf268b3bc 100644 --- a/dom/base/nsIDOMClassInfo.h +++ b/dom/base/nsIDOMClassInfo.h @@ -137,7 +137,7 @@ NS_DOMCI_EXTENSION_NAME(_module)::~NS_DOMCI_EXTENSION_NAME(_module)() \ { \ } \ \ -NS_IMPL_ISUPPORTS1(NS_DOMCI_EXTENSION_NAME(_module), nsIDOMCIExtension) \ +NS_IMPL_ISUPPORTS(NS_DOMCI_EXTENSION_NAME(_module), nsIDOMCIExtension) \ \ NS_IMETHODIMP \ NS_DOMCI_EXTENSION_NAME(_module)::RegisterDOMCI(const char* aName, \ diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index b44ac1c6a6b..441da91694e 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -262,7 +262,7 @@ public: NS_DECL_NSIOBSERVER }; -NS_IMPL_ISUPPORTS1(nsJSEnvironmentObserver, nsIObserver) +NS_IMPL_ISUPPORTS(nsJSEnvironmentObserver, nsIObserver) NS_IMETHODIMP nsJSEnvironmentObserver::Observe(nsISupports* aSubject, const char* aTopic, diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp index d1a30239110..2dd4c5fe5f9 100644 --- a/dom/base/nsScreen.cpp +++ b/dom/base/nsScreen.cpp @@ -327,7 +327,7 @@ nsScreen::WrapObject(JSContext* aCx) return ScreenBinding::Wrap(aCx, this); } -NS_IMPL_ISUPPORTS1(nsScreen::FullScreenEventListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsScreen::FullScreenEventListener, nsIDOMEventListener) NS_IMETHODIMP nsScreen::FullScreenEventListener::HandleEvent(nsIDOMEvent* aEvent) diff --git a/dom/base/nsScriptNameSpaceManager.cpp b/dom/base/nsScriptNameSpaceManager.cpp index a485ffc18bb..6434f7081e8 100644 --- a/dom/base/nsScriptNameSpaceManager.cpp +++ b/dom/base/nsScriptNameSpaceManager.cpp @@ -116,7 +116,7 @@ GlobalNameHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, return true; } -NS_IMPL_ISUPPORTS3( +NS_IMPL_ISUPPORTS( nsScriptNameSpaceManager, nsIObserver, nsISupportsWeakReference, diff --git a/dom/base/nsWindowMemoryReporter.cpp b/dom/base/nsWindowMemoryReporter.cpp index 24289f0df10..8280ec05025 100644 --- a/dom/base/nsWindowMemoryReporter.cpp +++ b/dom/base/nsWindowMemoryReporter.cpp @@ -42,8 +42,8 @@ nsWindowMemoryReporter::~nsWindowMemoryReporter() KillCheckTimer(); } -NS_IMPL_ISUPPORTS3(nsWindowMemoryReporter, nsIMemoryReporter, nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsWindowMemoryReporter, nsIMemoryReporter, nsIObserver, + nsISupportsWeakReference) static nsresult AddNonJSSizeOfWindowAndItsDescendents(nsGlobalWindow* aWindow, @@ -882,8 +882,8 @@ nsWindowMemoryReporter::CheckForGhostWindows( &ghostEnumData); } -NS_IMPL_ISUPPORTS1(nsWindowMemoryReporter::GhostWindowsReporter, - nsIMemoryReporter) +NS_IMPL_ISUPPORTS(nsWindowMemoryReporter::GhostWindowsReporter, + nsIMemoryReporter) /* static */ int64_t nsWindowMemoryReporter::GhostWindowsReporter::DistinguishedAmount() diff --git a/dom/bluetooth/BluetoothHidManager.cpp b/dom/bluetooth/BluetoothHidManager.cpp index 5c8a5c7ecd7..3f08e09b148 100644 --- a/dom/bluetooth/BluetoothHidManager.cpp +++ b/dom/bluetooth/BluetoothHidManager.cpp @@ -267,4 +267,4 @@ BluetoothHidManager::GetAddress(nsAString& aDeviceAddress) aDeviceAddress = mDeviceAddress; } -NS_IMPL_ISUPPORTS1(BluetoothHidManager, nsIObserver) +NS_IMPL_ISUPPORTS(BluetoothHidManager, nsIObserver) diff --git a/dom/bluetooth/BluetoothProfileController.cpp b/dom/bluetooth/BluetoothProfileController.cpp index a7e4cb4dd08..29a2f041fda 100644 --- a/dom/bluetooth/BluetoothProfileController.cpp +++ b/dom/bluetooth/BluetoothProfileController.cpp @@ -197,7 +197,7 @@ BluetoothProfileController::SetupProfiles(bool aAssignServiceClass) } } -NS_IMPL_ISUPPORTS1(CheckProfileStatusCallback, nsITimerCallback) +NS_IMPL_ISUPPORTS(CheckProfileStatusCallback, nsITimerCallback) NS_IMETHODIMP CheckProfileStatusCallback::Notify(nsITimer* aTimer) diff --git a/dom/bluetooth/BluetoothRilListener.cpp b/dom/bluetooth/BluetoothRilListener.cpp index 87c5e238676..b4032bc6f2f 100644 --- a/dom/bluetooth/BluetoothRilListener.cpp +++ b/dom/bluetooth/BluetoothRilListener.cpp @@ -18,7 +18,7 @@ USING_BLUETOOTH_NAMESPACE /** * IccListener */ -NS_IMPL_ISUPPORTS1(IccListener, nsIIccListener) +NS_IMPL_ISUPPORTS(IccListener, nsIIccListener) NS_IMETHODIMP IccListener::NotifyIccInfoChanged() @@ -80,7 +80,7 @@ IccListener::SetOwner(BluetoothRilListener *aOwner) /** * MobileConnectionListener */ -NS_IMPL_ISUPPORTS1(MobileConnectionListener, nsIMobileConnectionListener) +NS_IMPL_ISUPPORTS(MobileConnectionListener, nsIMobileConnectionListener) NS_IMETHODIMP MobileConnectionListener::NotifyVoiceChanged() @@ -168,7 +168,7 @@ MobileConnectionListener::Listen(bool aStart) /** * TelephonyListener Implementation */ -NS_IMPL_ISUPPORTS1(TelephonyListener, nsITelephonyListener) +NS_IMPL_ISUPPORTS(TelephonyListener, nsITelephonyListener) NS_IMETHODIMP TelephonyListener::CallStateChanged(uint32_t aServiceId, diff --git a/dom/bluetooth/BluetoothService.cpp b/dom/bluetooth/BluetoothService.cpp index c1cd2e132db..c2ff5fd2953 100644 --- a/dom/bluetooth/BluetoothService.cpp +++ b/dom/bluetooth/BluetoothService.cpp @@ -205,9 +205,9 @@ public: } }; -NS_IMPL_ISUPPORTS1(BluetoothService::StartupTask, nsISettingsServiceCallback); +NS_IMPL_ISUPPORTS(BluetoothService::StartupTask, nsISettingsServiceCallback); -NS_IMPL_ISUPPORTS1(BluetoothService, nsIObserver) +NS_IMPL_ISUPPORTS(BluetoothService, nsIObserver) bool BluetoothService::IsToggling() const diff --git a/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp b/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp index fd37f0552f8..0c87ac6b238 100644 --- a/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp +++ b/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp @@ -1102,5 +1102,5 @@ BluetoothA2dpManager::GetArtist(nsAString& aArtist) aArtist.Assign(mArtist); } -NS_IMPL_ISUPPORTS1(BluetoothA2dpManager, nsIObserver) +NS_IMPL_ISUPPORTS(BluetoothA2dpManager, nsIObserver) diff --git a/dom/bluetooth/bluedroid/BluetoothOppManager.cpp b/dom/bluetooth/bluedroid/BluetoothOppManager.cpp index c6e591c003d..c55faf3d7a6 100644 --- a/dom/bluetooth/bluedroid/BluetoothOppManager.cpp +++ b/dom/bluetooth/bluedroid/BluetoothOppManager.cpp @@ -1433,7 +1433,7 @@ BluetoothOppManager::Disconnect(BluetoothProfileController* aController) } } -NS_IMPL_ISUPPORTS1(BluetoothOppManager, nsIObserver) +NS_IMPL_ISUPPORTS(BluetoothOppManager, nsIObserver) bool BluetoothOppManager::AcquireSdcardMountLock() diff --git a/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.cpp b/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.cpp index cc55ca7c189..5b698ca9dd5 100644 --- a/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.cpp +++ b/dom/bluetooth/bluedroid/hfp-fallback/BluetoothHfpManager.cpp @@ -186,4 +186,4 @@ BluetoothHfpManager::Reset() MOZ_ASSERT(NS_IsMainThread()); } -NS_IMPL_ISUPPORTS1(BluetoothHfpManager, nsIObserver) +NS_IMPL_ISUPPORTS(BluetoothHfpManager, nsIObserver) diff --git a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp index 5501508b712..71507f456f7 100644 --- a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp +++ b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp @@ -309,8 +309,8 @@ private: nsString mParameter; }; -NS_IMPL_ISUPPORTS1(BluetoothHfpManager::GetVolumeTask, - nsISettingsServiceCallback); +NS_IMPL_ISUPPORTS(BluetoothHfpManager::GetVolumeTask, + nsISettingsServiceCallback); /** * Call @@ -1426,4 +1426,4 @@ BluetoothHfpManager::GetAddress(nsAString& aDeviceAddress) aDeviceAddress = mDeviceAddress; } -NS_IMPL_ISUPPORTS1(BluetoothHfpManager, nsIObserver) +NS_IMPL_ISUPPORTS(BluetoothHfpManager, nsIObserver) diff --git a/dom/bluetooth/bluez/BluetoothA2dpManager.cpp b/dom/bluetooth/bluez/BluetoothA2dpManager.cpp index e77d72797a7..cbf2abe9fc3 100644 --- a/dom/bluetooth/bluez/BluetoothA2dpManager.cpp +++ b/dom/bluetooth/bluez/BluetoothA2dpManager.cpp @@ -473,5 +473,5 @@ BluetoothA2dpManager::GetTitle(nsAString& aTitle) aTitle.Assign(mTitle); } -NS_IMPL_ISUPPORTS1(BluetoothA2dpManager, nsIObserver) +NS_IMPL_ISUPPORTS(BluetoothA2dpManager, nsIObserver) diff --git a/dom/bluetooth/bluez/BluetoothHfpManager.cpp b/dom/bluetooth/bluez/BluetoothHfpManager.cpp index 4c4ee9a3418..a688759ade8 100644 --- a/dom/bluetooth/bluez/BluetoothHfpManager.cpp +++ b/dom/bluetooth/bluez/BluetoothHfpManager.cpp @@ -195,8 +195,8 @@ public: } }; -NS_IMPL_ISUPPORTS1(BluetoothHfpManager::GetVolumeTask, - nsISettingsServiceCallback); +NS_IMPL_ISUPPORTS(BluetoothHfpManager::GetVolumeTask, + nsISettingsServiceCallback); NS_IMETHODIMP BluetoothHfpManager::Observe(nsISupports* aSubject, @@ -2042,5 +2042,5 @@ BluetoothHfpManager::OnDisconnect(const nsAString& aErrorStr) controller->NotifyCompletion(aErrorStr); } -NS_IMPL_ISUPPORTS1(BluetoothHfpManager, nsIObserver) +NS_IMPL_ISUPPORTS(BluetoothHfpManager, nsIObserver) diff --git a/dom/bluetooth/bluez/BluetoothOppManager.cpp b/dom/bluetooth/bluez/BluetoothOppManager.cpp index 2f0a8d4ce0f..b211c460373 100644 --- a/dom/bluetooth/bluez/BluetoothOppManager.cpp +++ b/dom/bluetooth/bluez/BluetoothOppManager.cpp @@ -1576,7 +1576,7 @@ BluetoothOppManager::OnUpdateSdpRecords(const nsAString& aDeviceAddress) } } -NS_IMPL_ISUPPORTS1(BluetoothOppManager, nsIObserver) +NS_IMPL_ISUPPORTS(BluetoothOppManager, nsIObserver) bool BluetoothOppManager::AcquireSdcardMountLock() diff --git a/dom/camera/DOMCameraControl.cpp b/dom/camera/DOMCameraControl.cpp index 32309a58844..36666a0b97e 100644 --- a/dom/camera/DOMCameraControl.cpp +++ b/dom/camera/DOMCameraControl.cpp @@ -106,7 +106,7 @@ StartRecordingHelper::HandleEvent(nsIDOMEvent* aEvent) return NS_OK; } -NS_IMPL_ISUPPORTS1(mozilla::StartRecordingHelper, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(mozilla::StartRecordingHelper, nsIDOMEventListener) nsDOMCameraControl::DOMCameraConfiguration::DOMCameraConfiguration() : CameraConfiguration() diff --git a/dom/cellbroadcast/src/CellBroadcast.cpp b/dom/cellbroadcast/src/CellBroadcast.cpp index cb43c4b9d56..fede3566ed7 100644 --- a/dom/cellbroadcast/src/CellBroadcast.cpp +++ b/dom/cellbroadcast/src/CellBroadcast.cpp @@ -40,7 +40,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(CellBroadcast::Listener, nsICellBroadcastListener) +NS_IMPL_ISUPPORTS(CellBroadcast::Listener, nsICellBroadcastListener) /** * CellBroadcast Implementation. diff --git a/dom/devicestorage/nsDeviceStorage.cpp b/dom/devicestorage/nsDeviceStorage.cpp index b0eba80c369..031769eef3e 100644 --- a/dom/devicestorage/nsDeviceStorage.cpp +++ b/dom/devicestorage/nsDeviceStorage.cpp @@ -438,7 +438,7 @@ DeviceStorageTypeChecker::IsVolumeBased(const nsAString& aType) #endif } -NS_IMPL_ISUPPORTS1(FileUpdateDispatcher, nsIObserver) +NS_IMPL_ISUPPORTS(FileUpdateDispatcher, nsIObserver) mozilla::StaticRefPtr FileUpdateDispatcher::sSingleton; @@ -614,7 +614,7 @@ private: static mozilla::StaticRefPtr sSingleton; }; -NS_IMPL_ISUPPORTS1(OverrideRootDir, nsIObserver) +NS_IMPL_ISUPPORTS(OverrideRootDir, nsIObserver) mozilla::StaticRefPtr OverrideRootDir::sSingleton; diff --git a/dom/events/EventListenerService.cpp b/dom/events/EventListenerService.cpp index 316e403ecee..22fe980edae 100644 --- a/dom/events/EventListenerService.cpp +++ b/dom/events/EventListenerService.cpp @@ -79,7 +79,7 @@ EventListenerInfo::GetListenerObject(JSContext* aCx, * mozilla::EventListenerService ******************************************************************************/ -NS_IMPL_ISUPPORTS1(EventListenerService, nsIEventListenerService) +NS_IMPL_ISUPPORTS(EventListenerService, nsIEventListenerService) bool EventListenerInfo::GetJSVal(JSContext* aCx, diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp index 2191656ecdb..558f701b1ed 100644 --- a/dom/events/EventStateManager.cpp +++ b/dom/events/EventStateManager.cpp @@ -203,7 +203,7 @@ private: uint32_t mPreviousCount; }; -NS_IMPL_ISUPPORTS1(UITimerCallback, nsITimerCallback) +NS_IMPL_ISUPPORTS(UITimerCallback, nsITimerCallback) // If aTimer is nullptr, this method always sends "user-interaction-inactive" // notification. diff --git a/dom/events/FocusEvent.cpp b/dom/events/FocusEvent.cpp index 0419361475c..774fb6a7490 100644 --- a/dom/events/FocusEvent.cpp +++ b/dom/events/FocusEvent.cpp @@ -10,7 +10,7 @@ namespace mozilla { namespace dom { -NS_IMPL_ISUPPORTS_INHERITED1(FocusEvent, UIEvent, nsIDOMFocusEvent) +NS_IMPL_ISUPPORTS_INHERITED(FocusEvent, UIEvent, nsIDOMFocusEvent) FocusEvent::FocusEvent(EventTarget* aOwner, nsPresContext* aPresContext, diff --git a/dom/events/PaintRequest.cpp b/dom/events/PaintRequest.cpp index 31709d21e66..02b9e6eb60c 100644 --- a/dom/events/PaintRequest.cpp +++ b/dom/events/PaintRequest.cpp @@ -20,7 +20,7 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(PaintRequest, mParent) NS_INTERFACE_TABLE_HEAD(PaintRequest) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY - NS_INTERFACE_TABLE1(PaintRequest, nsIDOMPaintRequest) + NS_INTERFACE_TABLE(PaintRequest, nsIDOMPaintRequest) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(PaintRequest) NS_INTERFACE_MAP_END diff --git a/dom/file/ArchiveZipFile.cpp b/dom/file/ArchiveZipFile.cpp index 5a934e59d0e..c206b6488e5 100644 --- a/dom/file/ArchiveZipFile.cpp +++ b/dom/file/ArchiveZipFile.cpp @@ -82,9 +82,9 @@ private: // data } mData; }; -NS_IMPL_ISUPPORTS2(ArchiveInputStream, - nsIInputStream, - nsISeekableStream) +NS_IMPL_ISUPPORTS(ArchiveInputStream, + nsIInputStream, + nsISeekableStream) nsresult ArchiveInputStream::Init() diff --git a/dom/file/AsyncHelper.cpp b/dom/file/AsyncHelper.cpp index 2e1916213da..80d278aa968 100644 --- a/dom/file/AsyncHelper.cpp +++ b/dom/file/AsyncHelper.cpp @@ -14,7 +14,7 @@ USING_FILE_NAMESPACE -NS_IMPL_ISUPPORTS2(AsyncHelper, nsIRunnable, nsIRequest) +NS_IMPL_ISUPPORTS(AsyncHelper, nsIRunnable, nsIRequest) nsresult AsyncHelper::AsyncWork(nsIRequestObserver* aObserver, nsISupports* aCtxt) diff --git a/dom/file/FileHelper.cpp b/dom/file/FileHelper.cpp index c651c71a4fd..40302e0c0d4 100644 --- a/dom/file/FileHelper.cpp +++ b/dom/file/FileHelper.cpp @@ -42,7 +42,7 @@ FileHelper::~FileHelper() !mRequest, "Should have cleared this!"); } -NS_IMPL_ISUPPORTS1(FileHelper, nsIRequestObserver) +NS_IMPL_ISUPPORTS(FileHelper, nsIRequestObserver) nsresult FileHelper::Enqueue() diff --git a/dom/file/FileService.cpp b/dom/file/FileService.cpp index 22ee65ad419..ac2a418880c 100644 --- a/dom/file/FileService.cpp +++ b/dom/file/FileService.cpp @@ -303,7 +303,7 @@ FileService::HasLockedFilesForStorage(nsIFileStorage* aFileStorage) return fileStorageInfo->HasRunningLockedFiles(aFileStorage); } -NS_IMPL_ISUPPORTS1(FileService, nsIObserver) +NS_IMPL_ISUPPORTS(FileService, nsIObserver) NS_IMETHODIMP FileService::Observe(nsISupports* aSubject, const char* aTopic, diff --git a/dom/file/FileStreamWrappers.cpp b/dom/file/FileStreamWrappers.cpp index 0205c9f783d..a38c8e3fc36 100644 --- a/dom/file/FileStreamWrappers.cpp +++ b/dom/file/FileStreamWrappers.cpp @@ -114,9 +114,9 @@ FileInputStreamWrapper::FileInputStreamWrapper(nsISupports* aFileStream, NS_ASSERTION(mInputStream, "This should always succeed!"); } -NS_IMPL_ISUPPORTS_INHERITED1(FileInputStreamWrapper, - FileStreamWrapper, - nsIInputStream) +NS_IMPL_ISUPPORTS_INHERITED(FileInputStreamWrapper, + FileStreamWrapper, + nsIInputStream) NS_IMETHODIMP FileInputStreamWrapper::Close() @@ -233,9 +233,9 @@ FileOutputStreamWrapper::FileOutputStreamWrapper(nsISupports* aFileStream, NS_ASSERTION(mOutputStream, "This should always succeed!"); } -NS_IMPL_ISUPPORTS_INHERITED1(FileOutputStreamWrapper, - FileStreamWrapper, - nsIOutputStream) +NS_IMPL_ISUPPORTS_INHERITED(FileOutputStreamWrapper, + FileStreamWrapper, + nsIOutputStream) NS_IMETHODIMP FileOutputStreamWrapper::Close() @@ -347,7 +347,7 @@ FileOutputStreamWrapper::IsNonBlocking(bool* _retval) return NS_OK; } -NS_IMPL_ISUPPORTS1(ProgressRunnable, nsIRunnable) +NS_IMPL_ISUPPORTS(ProgressRunnable, nsIRunnable) NS_IMETHODIMP ProgressRunnable::Run() @@ -360,7 +360,7 @@ ProgressRunnable::Run() return NS_OK; } -NS_IMPL_ISUPPORTS1(CloseRunnable, nsIRunnable) +NS_IMPL_ISUPPORTS(CloseRunnable, nsIRunnable) NS_IMETHODIMP CloseRunnable::Run() @@ -373,7 +373,7 @@ CloseRunnable::Run() return NS_OK; } -NS_IMPL_ISUPPORTS1(DestroyRunnable, nsIRunnable) +NS_IMPL_ISUPPORTS(DestroyRunnable, nsIRunnable) NS_IMETHODIMP DestroyRunnable::Run() diff --git a/dom/file/LockedFile.cpp b/dom/file/LockedFile.cpp index 47a11bd7635..e436030e5b8 100644 --- a/dom/file/LockedFile.cpp +++ b/dom/file/LockedFile.cpp @@ -816,7 +816,7 @@ FinishHelper::FinishHelper(LockedFile* aLockedFile) mStream.swap(aLockedFile->mStream); } -NS_IMPL_ISUPPORTS1(FinishHelper, nsIRunnable) +NS_IMPL_ISUPPORTS(FinishHelper, nsIRunnable) NS_IMETHODIMP FinishHelper::Run() diff --git a/dom/file/MemoryStreams.cpp b/dom/file/MemoryStreams.cpp index 2cf18360214..4a65da94d04 100644 --- a/dom/file/MemoryStreams.cpp +++ b/dom/file/MemoryStreams.cpp @@ -27,7 +27,7 @@ MemoryOutputStream::Create(uint64_t aSize) return stream.forget(); } -NS_IMPL_ISUPPORTS1(MemoryOutputStream, nsIOutputStream) +NS_IMPL_ISUPPORTS(MemoryOutputStream, nsIOutputStream) NS_IMETHODIMP MemoryOutputStream::Close() diff --git a/dom/filesystem/FileSystemPermissionRequest.cpp b/dom/filesystem/FileSystemPermissionRequest.cpp index 3da37e5fd8a..6ea1966a393 100644 --- a/dom/filesystem/FileSystemPermissionRequest.cpp +++ b/dom/filesystem/FileSystemPermissionRequest.cpp @@ -16,7 +16,7 @@ namespace mozilla { namespace dom { -NS_IMPL_ISUPPORTS2(FileSystemPermissionRequest, nsIRunnable, nsIContentPermissionRequest) +NS_IMPL_ISUPPORTS(FileSystemPermissionRequest, nsIRunnable, nsIContentPermissionRequest) // static void diff --git a/dom/fmradio/FMRadioService.cpp b/dom/fmradio/FMRadioService.cpp index fdbe3d54057..0440914484a 100644 --- a/dom/fmradio/FMRadioService.cpp +++ b/dom/fmradio/FMRadioService.cpp @@ -192,7 +192,7 @@ private: nsRefPtr mPendingRequest; }; -NS_IMPL_ISUPPORTS1(ReadAirplaneModeSettingTask, nsISettingsServiceCallback) +NS_IMPL_ISUPPORTS(ReadAirplaneModeSettingTask, nsISettingsServiceCallback) class DisableRunnable MOZ_FINAL : public nsRunnable { @@ -810,7 +810,7 @@ FMRadioService::Singleton() return sFMRadioService; } -NS_IMPL_ISUPPORTS1(FMRadioService, nsIObserver) +NS_IMPL_ISUPPORTS(FMRadioService, nsIObserver) END_FMRADIO_NAMESPACE diff --git a/dom/gamepad/GamepadService.cpp b/dom/gamepad/GamepadService.cpp index 991f4ee5c33..4479a06dd25 100644 --- a/dom/gamepad/GamepadService.cpp +++ b/dom/gamepad/GamepadService.cpp @@ -46,7 +46,7 @@ StaticRefPtr gGamepadServiceSingleton; bool GamepadService::sShutdown = false; -NS_IMPL_ISUPPORTS1(GamepadService, nsIObserver) +NS_IMPL_ISUPPORTS(GamepadService, nsIObserver) GamepadService::GamepadService() : mStarted(false), @@ -507,7 +507,7 @@ GamepadService::StartCleanupTimer() * of the GamepadService to JavaScript via XPCOM so that we can write Mochitests * that add and remove fake gamepads, avoiding the platform-specific backends. */ -NS_IMPL_ISUPPORTS1(GamepadServiceTest, nsIGamepadServiceTest) +NS_IMPL_ISUPPORTS(GamepadServiceTest, nsIGamepadServiceTest) GamepadServiceTest* GamepadServiceTest::sSingleton = nullptr; diff --git a/dom/icc/src/IccListener.cpp b/dom/icc/src/IccListener.cpp index 303aacdad91..7a2fa3fcc26 100644 --- a/dom/icc/src/IccListener.cpp +++ b/dom/icc/src/IccListener.cpp @@ -12,7 +12,7 @@ using namespace mozilla::dom; -NS_IMPL_ISUPPORTS1(IccListener, nsIIccListener) +NS_IMPL_ISUPPORTS(IccListener, nsIIccListener) IccListener::IccListener(IccManager* aIccManager, uint32_t aClientId) : mClientId(aClientId) diff --git a/dom/indexedDB/AsyncConnectionHelper.cpp b/dom/indexedDB/AsyncConnectionHelper.cpp index 80b5f8a5c0e..2b4f75e84b6 100644 --- a/dom/indexedDB/AsyncConnectionHelper.cpp +++ b/dom/indexedDB/AsyncConnectionHelper.cpp @@ -182,8 +182,8 @@ AsyncConnectionHelper::~AsyncConnectionHelper() NS_ASSERTION(!mOldProgressHandler, "Should not have anything here!"); } -NS_IMPL_ISUPPORTS2(AsyncConnectionHelper, nsIRunnable, - mozIStorageProgressHandler) +NS_IMPL_ISUPPORTS(AsyncConnectionHelper, nsIRunnable, + mozIStorageProgressHandler) NS_IMETHODIMP AsyncConnectionHelper::Run() diff --git a/dom/indexedDB/CheckPermissionsHelper.cpp b/dom/indexedDB/CheckPermissionsHelper.cpp index 9f3aa3522de..34365d25df3 100644 --- a/dom/indexedDB/CheckPermissionsHelper.cpp +++ b/dom/indexedDB/CheckPermissionsHelper.cpp @@ -79,9 +79,9 @@ GetIndexedDBPermissions(nsIDOMWindow* aWindow) } // anonymous namespace -NS_IMPL_ISUPPORTS3(CheckPermissionsHelper, nsIRunnable, - nsIInterfaceRequestor, - nsIObserver) +NS_IMPL_ISUPPORTS(CheckPermissionsHelper, nsIRunnable, + nsIInterfaceRequestor, + nsIObserver) NS_IMETHODIMP CheckPermissionsHelper::Run() diff --git a/dom/indexedDB/FileInfo.cpp b/dom/indexedDB/FileInfo.cpp index 16e263fc3ca..9fd4732877f 100644 --- a/dom/indexedDB/FileInfo.cpp +++ b/dom/indexedDB/FileInfo.cpp @@ -133,8 +133,8 @@ CleanupFileRunnable::CleanupFileRunnable(FileManager* aFileManager, { } -NS_IMPL_ISUPPORTS1(CleanupFileRunnable, - nsIRunnable) +NS_IMPL_ISUPPORTS(CleanupFileRunnable, + nsIRunnable) NS_IMETHODIMP CleanupFileRunnable::Run() diff --git a/dom/indexedDB/IDBTransaction.cpp b/dom/indexedDB/IDBTransaction.cpp index d8fdaabe103..e113d2b9c85 100644 --- a/dom/indexedDB/IDBTransaction.cpp +++ b/dom/indexedDB/IDBTransaction.cpp @@ -85,7 +85,7 @@ NS_IMETHODIMP_(MozExternalRefCountType) StartTransactionRunnable::Release() return 1; } -NS_IMPL_QUERY_INTERFACE1(StartTransactionRunnable, nsIRunnable) +NS_IMPL_QUERY_INTERFACE(StartTransactionRunnable, nsIRunnable) } // anonymous namespace @@ -783,7 +783,7 @@ CommitHelper::~CommitHelper() { } -NS_IMPL_ISUPPORTS1(CommitHelper, nsIRunnable) +NS_IMPL_ISUPPORTS(CommitHelper, nsIRunnable) NS_IMETHODIMP CommitHelper::Run() @@ -980,7 +980,7 @@ CommitHelper::RevertAutoIncrementCounts() } } -NS_IMPL_ISUPPORTS1(UpdateRefcountFunction, mozIStorageFunction) +NS_IMPL_ISUPPORTS(UpdateRefcountFunction, mozIStorageFunction) NS_IMETHODIMP UpdateRefcountFunction::OnFunctionCall(mozIStorageValueArray* aValues, diff --git a/dom/indexedDB/IndexedDatabaseManager.cpp b/dom/indexedDB/IndexedDatabaseManager.cpp index ae26eeefb5c..466d0ffb3df 100644 --- a/dom/indexedDB/IndexedDatabaseManager.cpp +++ b/dom/indexedDB/IndexedDatabaseManager.cpp @@ -647,8 +647,8 @@ IndexedDatabaseManager::BlockAndGetFileReferences( NS_IMPL_ADDREF(IndexedDatabaseManager) NS_IMPL_RELEASE_WITH_DESTROY(IndexedDatabaseManager, Destroy()) -NS_IMPL_QUERY_INTERFACE2(IndexedDatabaseManager, nsIIndexedDatabaseManager, - nsIObserver) +NS_IMPL_QUERY_INTERFACE(IndexedDatabaseManager, nsIIndexedDatabaseManager, + nsIObserver) NS_IMETHODIMP IndexedDatabaseManager::InitWindowless(JS::Handle aGlobal, JSContext* aCx) @@ -812,8 +812,8 @@ AsyncDeleteFileRunnable::AsyncDeleteFileRunnable(FileManager* aFileManager, { } -NS_IMPL_ISUPPORTS1(AsyncDeleteFileRunnable, - nsIRunnable) +NS_IMPL_ISUPPORTS(AsyncDeleteFileRunnable, + nsIRunnable) NS_IMETHODIMP AsyncDeleteFileRunnable::Run() @@ -886,8 +886,8 @@ GetFileReferencesHelper::DispatchAndReturnFileReferences(int32_t* aMemRefCnt, return NS_OK; } -NS_IMPL_ISUPPORTS1(GetFileReferencesHelper, - nsIRunnable) +NS_IMPL_ISUPPORTS(GetFileReferencesHelper, + nsIRunnable) NS_IMETHODIMP GetFileReferencesHelper::Run() diff --git a/dom/indexedDB/OpenDatabaseHelper.cpp b/dom/indexedDB/OpenDatabaseHelper.cpp index bef10fa967f..bcb7ef1daf9 100644 --- a/dom/indexedDB/OpenDatabaseHelper.cpp +++ b/dom/indexedDB/OpenDatabaseHelper.cpp @@ -924,7 +924,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(CompressDataBlobsFunction, mozIStorageFunction) +NS_IMPL_ISUPPORTS(CompressDataBlobsFunction, mozIStorageFunction) nsresult UpgradeSchemaFrom8To9_0(mozIStorageConnection* aConnection) @@ -1182,7 +1182,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(EncodeKeysFunction, mozIStorageFunction) +NS_IMPL_ISUPPORTS(EncodeKeysFunction, mozIStorageFunction) nsresult UpgradeSchemaFrom11_0To12_0(mozIStorageConnection* aConnection) @@ -1709,7 +1709,7 @@ private: } // anonymous namespace -NS_IMPL_ISUPPORTS1(OpenDatabaseHelper, nsIRunnable) +NS_IMPL_ISUPPORTS(OpenDatabaseHelper, nsIRunnable) nsresult OpenDatabaseHelper::Init() diff --git a/dom/indexedDB/TransactionThreadPool.cpp b/dom/indexedDB/TransactionThreadPool.cpp index ff671474054..ab84efc8a5b 100644 --- a/dom/indexedDB/TransactionThreadPool.cpp +++ b/dom/indexedDB/TransactionThreadPool.cpp @@ -565,7 +565,7 @@ TransactionThreadPool::TransactionQueue::Finish(nsIRunnable* aFinishRunnable) mMonitor.Notify(); } -NS_IMPL_ISUPPORTS1(TransactionThreadPool::TransactionQueue, nsIRunnable) +NS_IMPL_ISUPPORTS(TransactionThreadPool::TransactionQueue, nsIRunnable) NS_IMETHODIMP TransactionThreadPool::TransactionQueue::Run() @@ -637,7 +637,7 @@ FinishTransactionRunnable::FinishTransactionRunnable( mFinishRunnable.swap(aFinishRunnable); } -NS_IMPL_ISUPPORTS1(FinishTransactionRunnable, nsIRunnable) +NS_IMPL_ISUPPORTS(FinishTransactionRunnable, nsIRunnable) NS_IMETHODIMP FinishTransactionRunnable::Run() @@ -663,7 +663,7 @@ FinishTransactionRunnable::Run() #ifdef MOZ_ENABLE_PROFILER_SPS -NS_IMPL_ISUPPORTS1(TransactionThreadPoolListener, nsIThreadPoolListener) +NS_IMPL_ISUPPORTS(TransactionThreadPoolListener, nsIThreadPoolListener) NS_IMETHODIMP TransactionThreadPoolListener::OnThreadCreated() diff --git a/dom/indexedDB/ipc/IndexedDBParent.cpp b/dom/indexedDB/ipc/IndexedDBParent.cpp index fb8d5163684..9ee9cfe95cb 100644 --- a/dom/indexedDB/ipc/IndexedDBParent.cpp +++ b/dom/indexedDB/ipc/IndexedDBParent.cpp @@ -2248,7 +2248,7 @@ IndexedDBDeleteDatabaseRequestParent::SetOpenRequest( * WeakEventListener ******************************************************************************/ - NS_IMPL_ISUPPORTS1(WeakEventListenerBase, nsIDOMEventListener) + NS_IMPL_ISUPPORTS(WeakEventListenerBase, nsIDOMEventListener) NS_IMETHODIMP WeakEventListenerBase::HandleEvent(nsIDOMEvent* aEvent) diff --git a/dom/ipc/Blob.cpp b/dom/ipc/Blob.cpp index d234f41cb31..ddce0d44615 100644 --- a/dom/ipc/Blob.cpp +++ b/dom/ipc/Blob.cpp @@ -990,7 +990,7 @@ private: * BlobChild::RemoteBlob Implementation ******************************************************************************/ -NS_IMPL_ISUPPORTS_INHERITED1(BlobChild::RemoteBlob, nsDOMFile, nsIRemoteBlob) +NS_IMPL_ISUPPORTS_INHERITED(BlobChild::RemoteBlob, nsDOMFile, nsIRemoteBlob) already_AddRefed BlobChild:: @@ -1683,7 +1683,7 @@ private: * BlobChild::RemoteBlob Implementation ******************************************************************************/ -NS_IMPL_ISUPPORTS_INHERITED1(BlobParent::RemoteBlob, nsDOMFile, nsIRemoteBlob) +NS_IMPL_ISUPPORTS_INHERITED(BlobParent::RemoteBlob, nsDOMFile, nsIRemoteBlob) already_AddRefed BlobParent:: diff --git a/dom/ipc/ColorPickerParent.cpp b/dom/ipc/ColorPickerParent.cpp index 4a8b72deda0..5bf802650d0 100644 --- a/dom/ipc/ColorPickerParent.cpp +++ b/dom/ipc/ColorPickerParent.cpp @@ -15,8 +15,8 @@ using mozilla::unused; using namespace mozilla::dom; -NS_IMPL_ISUPPORTS1(ColorPickerParent::ColorPickerShownCallback, - nsIColorPickerShownCallback); +NS_IMPL_ISUPPORTS(ColorPickerParent::ColorPickerShownCallback, + nsIColorPickerShownCallback); NS_IMETHODIMP ColorPickerParent::ColorPickerShownCallback::Update(const nsAString& aColor) diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp index 9da77ef3abb..07deef6e134 100644 --- a/dom/ipc/ContentChild.cpp +++ b/dom/ipc/ContentChild.cpp @@ -189,7 +189,7 @@ private: nsString mDMDDumpIdent; }; -NS_IMPL_ISUPPORTS1(MemoryReportRequestChild, nsIRunnable) +NS_IMPL_ISUPPORTS(MemoryReportRequestChild, nsIRunnable) MemoryReportRequestChild::MemoryReportRequestChild(uint32_t aGeneration, const nsAString& aDMDDumpIdent) : mGeneration(aGeneration), mDMDDumpIdent(aDMDDumpIdent) @@ -251,7 +251,7 @@ private: friend class ContentChild; }; -NS_IMPL_ISUPPORTS1(ConsoleListener, nsIConsoleListener) +NS_IMPL_ISUPPORTS(ConsoleListener, nsIConsoleListener) NS_IMETHODIMP ConsoleListener::Observe(nsIConsoleMessage* aMessage) @@ -332,7 +332,7 @@ SystemMessageHandledObserver::Observe(nsISupports* aSubject, return NS_OK; } -NS_IMPL_ISUPPORTS1(SystemMessageHandledObserver, nsIObserver) +NS_IMPL_ISUPPORTS(SystemMessageHandledObserver, nsIObserver) class BackgroundChildPrimer MOZ_FINAL : public nsIIPCBackgroundChildCreateCallback @@ -360,7 +360,7 @@ private: } }; -NS_IMPL_ISUPPORTS1(BackgroundChildPrimer, nsIIPCBackgroundChildCreateCallback) +NS_IMPL_ISUPPORTS(BackgroundChildPrimer, nsIIPCBackgroundChildCreateCallback) ContentChild* ContentChild::sSingleton; @@ -602,7 +602,7 @@ public: private: const nsCString mProcess; }; -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( MemoryReportCallback , nsIMemoryReporterCallback ) diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index e385f8eeda9..9aa9192dc4d 100644 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -269,8 +269,8 @@ public: uint32_t BackgroundTester::sCallbackCount = 0; -NS_IMPL_ISUPPORTS2(BackgroundTester, nsIIPCBackgroundChildCreateCallback, - nsIObserver) +NS_IMPL_ISUPPORTS(BackgroundTester, nsIIPCBackgroundChildCreateCallback, + nsIObserver) #endif // ENABLE_TESTS @@ -345,7 +345,7 @@ public: NS_DECL_NSIMEMORYREPORTER }; -NS_IMPL_ISUPPORTS1(ContentParentsMemoryReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(ContentParentsMemoryReporter, nsIMemoryReporter) NS_IMETHODIMP ContentParentsMemoryReporter::CollectReports(nsIMemoryReporterCallback* cb, @@ -933,8 +933,8 @@ private: StaticAutoPtr > SystemMessageHandledListener::sListeners; -NS_IMPL_ISUPPORTS1(SystemMessageHandledListener, - nsITimerCallback) +NS_IMPL_ISUPPORTS(SystemMessageHandledListener, + nsITimerCallback) } // anonymous namespace @@ -3438,7 +3438,7 @@ ContentParent::DeallocPFileDescriptorSetParent(PFileDescriptorSetParent* aActor) } // namespace dom } // namespace mozilla -NS_IMPL_ISUPPORTS1(ParentIdleListener, nsIObserver) +NS_IMPL_ISUPPORTS(ParentIdleListener, nsIObserver) NS_IMETHODIMP ParentIdleListener::Observe(nsISupports*, const char* aTopic, const char16_t* aData) { diff --git a/dom/ipc/FilePickerParent.cpp b/dom/ipc/FilePickerParent.cpp index 36c2de9cd5d..f584b5de7ea 100644 --- a/dom/ipc/FilePickerParent.cpp +++ b/dom/ipc/FilePickerParent.cpp @@ -22,8 +22,8 @@ using mozilla::unused; using namespace mozilla::dom; -NS_IMPL_ISUPPORTS1(FilePickerParent::FilePickerShownCallback, - nsIFilePickerShownCallback); +NS_IMPL_ISUPPORTS(FilePickerParent::FilePickerShownCallback, + nsIFilePickerShownCallback); NS_IMETHODIMP FilePickerParent::FilePickerShownCallback::Done(int16_t aResult) diff --git a/dom/ipc/PreallocatedProcessManager.cpp b/dom/ipc/PreallocatedProcessManager.cpp index f5ab4abac36..c4f4ac54ed0 100644 --- a/dom/ipc/PreallocatedProcessManager.cpp +++ b/dom/ipc/PreallocatedProcessManager.cpp @@ -109,7 +109,7 @@ PreallocatedProcessManagerImpl::Singleton() return sSingleton; } -NS_IMPL_ISUPPORTS1(PreallocatedProcessManagerImpl, nsIObserver) +NS_IMPL_ISUPPORTS(PreallocatedProcessManagerImpl, nsIObserver) PreallocatedProcessManagerImpl::PreallocatedProcessManagerImpl() : mEnabled(false) diff --git a/dom/ipc/ProcessPriorityManager.cpp b/dom/ipc/ProcessPriorityManager.cpp index 70f3ad74c96..28fbc202b24 100644 --- a/dom/ipc/ProcessPriorityManager.cpp +++ b/dom/ipc/ProcessPriorityManager.cpp @@ -347,8 +347,8 @@ private: /* static */ StaticRefPtr ProcessPriorityManagerImpl::sSingleton; -NS_IMPL_ISUPPORTS1(ProcessPriorityManagerImpl, - nsIObserver); +NS_IMPL_ISUPPORTS(ProcessPriorityManagerImpl, + nsIObserver); /* static */ void ProcessPriorityManagerImpl::PrefChangedCallback(const char* aPref, @@ -587,10 +587,10 @@ ProcessPriorityManagerImpl::NotifyProcessPriorityChanged( } } -NS_IMPL_ISUPPORTS3(ParticularProcessPriorityManager, - nsIObserver, - nsITimerCallback, - nsISupportsWeakReference); +NS_IMPL_ISUPPORTS(ParticularProcessPriorityManager, + nsIObserver, + nsITimerCallback, + nsISupportsWeakReference); ParticularProcessPriorityManager::ParticularProcessPriorityManager( ContentParent* aContentParent) @@ -1166,8 +1166,8 @@ ProcessPriorityManagerChild::Singleton() return sSingleton; } -NS_IMPL_ISUPPORTS1(ProcessPriorityManagerChild, - nsIObserver) +NS_IMPL_ISUPPORTS(ProcessPriorityManagerChild, + nsIObserver) ProcessPriorityManagerChild::ProcessPriorityManagerChild() { diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 4f0b30bd035..ac1fd9d30cf 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -96,7 +96,7 @@ using namespace mozilla::dom::indexedDB; using namespace mozilla::widget; using namespace mozilla::jsipc; -NS_IMPL_ISUPPORTS1(ContentListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(ContentListener, nsIDOMEventListener) static const CSSSize kDefaultViewportSize(980, 480); diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index 8c0b0a50491..b38492cab24 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -199,7 +199,7 @@ TabParent* sEventCapturer; TabParent *TabParent::mIMETabParent = nullptr; -NS_IMPL_ISUPPORTS3(TabParent, nsITabParent, nsIAuthPromptProvider, nsISecureBrowserUI) +NS_IMPL_ISUPPORTS(TabParent, nsITabParent, nsIAuthPromptProvider, nsISecureBrowserUI) TabParent::TabParent(ContentParent* aManager, const TabContext& aContext, uint32_t aChromeFlags) : TabContext(aContext) diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp index a8a7ef1a28b..bfa49334b4a 100644 --- a/dom/media/MediaManager.cpp +++ b/dom/media/MediaManager.cpp @@ -260,7 +260,7 @@ protected: /** * nsIMediaDevice implementation. */ -NS_IMPL_ISUPPORTS1(MediaDevice, nsIMediaDevice) +NS_IMPL_ISUPPORTS(MediaDevice, nsIMediaDevice) MediaDevice* MediaDevice::Create(MediaEngineVideoSource* source) { return new VideoDevice(source); @@ -1206,7 +1206,7 @@ MediaManager::MediaManager() mPrefs.mWidth, mPrefs.mHeight, mPrefs.mFPS, mPrefs.mMinFPS)); } -NS_IMPL_ISUPPORTS2(MediaManager, nsIMediaManagerService, nsIObserver) +NS_IMPL_ISUPPORTS(MediaManager, nsIMediaManagerService, nsIObserver) /* static */ StaticRefPtr MediaManager::sSingleton; diff --git a/dom/media/MediaPermissionGonk.cpp b/dom/media/MediaPermissionGonk.cpp index 408cf9c7307..e7d422bc558 100644 --- a/dom/media/MediaPermissionGonk.cpp +++ b/dom/media/MediaPermissionGonk.cpp @@ -170,7 +170,7 @@ private: }; // MediaPermissionRequest -NS_IMPL_ISUPPORTS1(MediaPermissionRequest, nsIContentPermissionRequest) +NS_IMPL_ISUPPORTS(MediaPermissionRequest, nsIContentPermissionRequest) MediaPermissionRequest::MediaPermissionRequest(nsRefPtr &aRequest, nsTArray > &aDevices) @@ -385,7 +385,7 @@ private: nsRefPtr mRequest; }; -NS_IMPL_ISUPPORTS1(MediaDeviceSuccessCallback, nsIGetUserMediaDevicesSuccessCallback) +NS_IMPL_ISUPPORTS(MediaDeviceSuccessCallback, nsIGetUserMediaDevicesSuccessCallback) // nsIGetUserMediaDevicesSuccessCallback method NS_IMETHODIMP @@ -485,7 +485,7 @@ private: const nsString mCallID; }; -NS_IMPL_ISUPPORTS1(MediaDeviceErrorCallback, nsIDOMGetUserMediaErrorCallback) +NS_IMPL_ISUPPORTS(MediaDeviceErrorCallback, nsIDOMGetUserMediaErrorCallback) // nsIDOMGetUserMediaErrorCallback method NS_IMETHODIMP @@ -497,7 +497,7 @@ MediaDeviceErrorCallback::OnError(const nsAString &aError) } // namespace anonymous // MediaPermissionManager -NS_IMPL_ISUPPORTS1(MediaPermissionManager, nsIObserver) +NS_IMPL_ISUPPORTS(MediaPermissionManager, nsIObserver) MediaPermissionManager* MediaPermissionManager::GetInstance() diff --git a/dom/mobileconnection/src/MobileConnection.cpp b/dom/mobileconnection/src/MobileConnection.cpp index 55e6980bde1..9acb9309e00 100644 --- a/dom/mobileconnection/src/MobileConnection.cpp +++ b/dom/mobileconnection/src/MobileConnection.cpp @@ -45,7 +45,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(MobileConnection::Listener, nsIMobileConnectionListener) +NS_IMPL_ISUPPORTS(MobileConnection::Listener, nsIMobileConnectionListener) DOMCI_DATA(MozMobileConnection, MobileConnection) diff --git a/dom/mobilemessage/src/MobileMessageService.cpp b/dom/mobilemessage/src/MobileMessageService.cpp index e500ae76222..fec30c2ec5c 100644 --- a/dom/mobilemessage/src/MobileMessageService.cpp +++ b/dom/mobilemessage/src/MobileMessageService.cpp @@ -12,7 +12,7 @@ namespace mozilla { namespace dom { namespace mobilemessage { -NS_IMPL_ISUPPORTS1(MobileMessageService, nsIMobileMessageService) +NS_IMPL_ISUPPORTS(MobileMessageService, nsIMobileMessageService) /* static */ StaticRefPtr MobileMessageService::sSingleton; diff --git a/dom/mobilemessage/src/android/MobileMessageDatabaseService.cpp b/dom/mobilemessage/src/android/MobileMessageDatabaseService.cpp index 3c1bd5d8dd0..5c540a512f0 100644 --- a/dom/mobilemessage/src/android/MobileMessageDatabaseService.cpp +++ b/dom/mobilemessage/src/android/MobileMessageDatabaseService.cpp @@ -11,7 +11,7 @@ namespace mozilla { namespace dom { namespace mobilemessage { -NS_IMPL_ISUPPORTS1(MobileMessageDatabaseService, nsIMobileMessageDatabaseService) +NS_IMPL_ISUPPORTS(MobileMessageDatabaseService, nsIMobileMessageDatabaseService) NS_IMETHODIMP MobileMessageDatabaseService::GetMessageMoz(int32_t aMessageId, diff --git a/dom/mobilemessage/src/android/SmsService.cpp b/dom/mobilemessage/src/android/SmsService.cpp index 5f70c4a8ca8..ff383ea3aa6 100644 --- a/dom/mobilemessage/src/android/SmsService.cpp +++ b/dom/mobilemessage/src/android/SmsService.cpp @@ -12,7 +12,7 @@ namespace mozilla { namespace dom { namespace mobilemessage { -NS_IMPL_ISUPPORTS1(SmsService, nsISmsService) +NS_IMPL_ISUPPORTS(SmsService, nsISmsService) NS_IMETHODIMP SmsService::GetSmsDefaultServiceId(uint32_t* aServiceId) diff --git a/dom/mobilemessage/src/gonk/SmsService.cpp b/dom/mobilemessage/src/gonk/SmsService.cpp index c3a21d4f048..14fb02dfbff 100644 --- a/dom/mobilemessage/src/gonk/SmsService.cpp +++ b/dom/mobilemessage/src/gonk/SmsService.cpp @@ -37,9 +37,9 @@ namespace mozilla { namespace dom { namespace mobilemessage { -NS_IMPL_ISUPPORTS2(SmsService, - nsISmsService, - nsIObserver) +NS_IMPL_ISUPPORTS(SmsService, + nsISmsService, + nsIObserver) SmsService::SmsService() { diff --git a/dom/mobilemessage/src/ipc/SmsChild.cpp b/dom/mobilemessage/src/ipc/SmsChild.cpp index 73cf007473b..7e3f12b44a9 100644 --- a/dom/mobilemessage/src/ipc/SmsChild.cpp +++ b/dom/mobilemessage/src/ipc/SmsChild.cpp @@ -247,7 +247,7 @@ SmsRequestChild::Recv__delete__(const MessageReply& aReply) * MobileMessageCursorChild ******************************************************************************/ -NS_IMPL_ISUPPORTS1(MobileMessageCursorChild, nsICursorContinueCallback) +NS_IMPL_ISUPPORTS(MobileMessageCursorChild, nsICursorContinueCallback) MobileMessageCursorChild::MobileMessageCursorChild(nsIMobileMessageCursorCallback* aCallback) : mCursorCallback(aCallback) diff --git a/dom/mobilemessage/src/ipc/SmsIPCService.cpp b/dom/mobilemessage/src/ipc/SmsIPCService.cpp index 1c45baa280f..f0126c7bec7 100644 --- a/dom/mobilemessage/src/ipc/SmsIPCService.cpp +++ b/dom/mobilemessage/src/ipc/SmsIPCService.cpp @@ -99,11 +99,11 @@ getDefaultServiceId(const char* aPrefKey) } // anonymous namespace -NS_IMPL_ISUPPORTS4(SmsIPCService, - nsISmsService, - nsIMmsService, - nsIMobileMessageDatabaseService, - nsIObserver) +NS_IMPL_ISUPPORTS(SmsIPCService, + nsISmsService, + nsIMmsService, + nsIMobileMessageDatabaseService, + nsIObserver) SmsIPCService::SmsIPCService() { diff --git a/dom/mobilemessage/src/ipc/SmsParent.cpp b/dom/mobilemessage/src/ipc/SmsParent.cpp index ff70de3e6fe..2885e38eb25 100644 --- a/dom/mobilemessage/src/ipc/SmsParent.cpp +++ b/dom/mobilemessage/src/ipc/SmsParent.cpp @@ -126,7 +126,7 @@ GetParamsFromSendMmsMessageRequest(JSContext* aCx, return true; } -NS_IMPL_ISUPPORTS1(SmsParent, nsIObserver) +NS_IMPL_ISUPPORTS(SmsParent, nsIObserver) SmsParent::SmsParent() { @@ -444,7 +444,7 @@ SmsParent::DeallocPMobileMessageCursorParent(PMobileMessageCursorParent* aActor) * SmsRequestParent ******************************************************************************/ -NS_IMPL_ISUPPORTS1(SmsRequestParent, nsIMobileMessageCallback) +NS_IMPL_ISUPPORTS(SmsRequestParent, nsIMobileMessageCallback) void SmsRequestParent::ActorDestroy(ActorDestroyReason aWhy) @@ -731,7 +731,7 @@ SmsRequestParent::NotifyGetSmscAddressFailed(int32_t aError) * MobileMessageCursorParent ******************************************************************************/ -NS_IMPL_ISUPPORTS1(MobileMessageCursorParent, nsIMobileMessageCursorCallback) +NS_IMPL_ISUPPORTS(MobileMessageCursorParent, nsIMobileMessageCursorCallback) void MobileMessageCursorParent::ActorDestroy(ActorDestroyReason aWhy) diff --git a/dom/network/src/Connection.cpp b/dom/network/src/Connection.cpp index da8db79d020..cde8f36ac04 100644 --- a/dom/network/src/Connection.cpp +++ b/dom/network/src/Connection.cpp @@ -20,8 +20,8 @@ namespace mozilla { namespace dom { namespace network { -NS_IMPL_QUERY_INTERFACE_INHERITED1(Connection, DOMEventTargetHelper, - nsINetworkProperties) +NS_IMPL_QUERY_INTERFACE_INHERITED(Connection, DOMEventTargetHelper, + nsINetworkProperties) // Don't use |Connection| alone, since that confuses nsTraceRefcnt since // we're not the only class with that name. diff --git a/dom/network/src/UDPSocketChild.cpp b/dom/network/src/UDPSocketChild.cpp index 8607492c890..dcb4fa72405 100644 --- a/dom/network/src/UDPSocketChild.cpp +++ b/dom/network/src/UDPSocketChild.cpp @@ -10,7 +10,7 @@ using mozilla::net::gNeckoChild; namespace mozilla { namespace dom { -NS_IMPL_ISUPPORTS1(UDPSocketChildBase, nsIUDPSocketChild) +NS_IMPL_ISUPPORTS(UDPSocketChildBase, nsIUDPSocketChild) UDPSocketChildBase::UDPSocketChildBase() : mIPCOpen(false) diff --git a/dom/network/src/UDPSocketParent.cpp b/dom/network/src/UDPSocketParent.cpp index d07216aa237..36fbb1a4105 100644 --- a/dom/network/src/UDPSocketParent.cpp +++ b/dom/network/src/UDPSocketParent.cpp @@ -56,7 +56,7 @@ ConvertNetAddrToString(mozilla::net::NetAddr &netAddr, nsACString *address, uint return NS_OK; } -NS_IMPL_ISUPPORTS1(UDPSocketParent, nsIUDPSocketListener) +NS_IMPL_ISUPPORTS(UDPSocketParent, nsIUDPSocketListener) UDPSocketParent::~UDPSocketParent() { diff --git a/dom/plugins/base/nsNPAPIPluginStreamListener.cpp b/dom/plugins/base/nsNPAPIPluginStreamListener.cpp index 9377c86a92d..312628cc900 100644 --- a/dom/plugins/base/nsNPAPIPluginStreamListener.cpp +++ b/dom/plugins/base/nsNPAPIPluginStreamListener.cpp @@ -35,7 +35,7 @@ nsNPAPIStreamWrapper::~nsNPAPIStreamWrapper() } } -NS_IMPL_ISUPPORTS1(nsPluginStreamToFile, nsIOutputStream) +NS_IMPL_ISUPPORTS(nsPluginStreamToFile, nsIOutputStream) nsPluginStreamToFile::nsPluginStreamToFile(const char* target, nsIPluginInstanceOwner* owner) @@ -128,8 +128,8 @@ nsPluginStreamToFile::Close(void) // nsNPAPIPluginStreamListener Methods -NS_IMPL_ISUPPORTS2(nsNPAPIPluginStreamListener, - nsITimerCallback, nsIHTTPHeaderListener) +NS_IMPL_ISUPPORTS(nsNPAPIPluginStreamListener, + nsITimerCallback, nsIHTTPHeaderListener) nsNPAPIPluginStreamListener::nsNPAPIPluginStreamListener(nsNPAPIPluginInstance* inst, void* notifyData, diff --git a/dom/plugins/base/nsPluginDirServiceProvider.cpp b/dom/plugins/base/nsPluginDirServiceProvider.cpp index 33f45694e2e..1d30034ceca 100644 --- a/dom/plugins/base/nsPluginDirServiceProvider.cpp +++ b/dom/plugins/base/nsPluginDirServiceProvider.cpp @@ -177,8 +177,8 @@ nsPluginDirServiceProvider::~nsPluginDirServiceProvider() // nsPluginDirServiceProvider::nsISupports //***************************************************************************** -NS_IMPL_ISUPPORTS1(nsPluginDirServiceProvider, - nsIDirectoryServiceProvider) +NS_IMPL_ISUPPORTS(nsPluginDirServiceProvider, + nsIDirectoryServiceProvider) //***************************************************************************** // nsPluginDirServiceProvider::nsIDirectoryServiceProvider diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp index 8492e7bb169..4544f1bf1ea 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -277,11 +277,11 @@ nsPluginHost::~nsPluginHost() sInst = nullptr; } -NS_IMPL_ISUPPORTS4(nsPluginHost, - nsIPluginHost, - nsIObserver, - nsITimerCallback, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsPluginHost, + nsIPluginHost, + nsIObserver, + nsITimerCallback, + nsISupportsWeakReference) already_AddRefed nsPluginHost::GetInst() diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp index b7aa1b113af..e5cf082c07f 100644 --- a/dom/plugins/base/nsPluginInstanceOwner.cpp +++ b/dom/plugins/base/nsPluginInstanceOwner.cpp @@ -349,11 +349,11 @@ nsPluginInstanceOwner::~nsPluginInstanceOwner() } } -NS_IMPL_ISUPPORTS4(nsPluginInstanceOwner, - nsIPluginInstanceOwner, - nsIDOMEventListener, - nsIPrivacyTransitionObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsPluginInstanceOwner, + nsIPluginInstanceOwner, + nsIDOMEventListener, + nsIPrivacyTransitionObserver, + nsISupportsWeakReference) nsresult nsPluginInstanceOwner::SetInstance(nsNPAPIPluginInstance *aInstance) @@ -3177,8 +3177,8 @@ nsPluginDOMContextMenuListener::~nsPluginDOMContextMenuListener() { } -NS_IMPL_ISUPPORTS1(nsPluginDOMContextMenuListener, - nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsPluginDOMContextMenuListener, + nsIDOMEventListener) NS_IMETHODIMP nsPluginDOMContextMenuListener::HandleEvent(nsIDOMEvent* aEvent) diff --git a/dom/plugins/base/nsPluginPlayPreviewInfo.cpp b/dom/plugins/base/nsPluginPlayPreviewInfo.cpp index 597592edea8..dcb40da769d 100644 --- a/dom/plugins/base/nsPluginPlayPreviewInfo.cpp +++ b/dom/plugins/base/nsPluginPlayPreviewInfo.cpp @@ -26,7 +26,7 @@ nsPluginPlayPreviewInfo::~nsPluginPlayPreviewInfo() { } -NS_IMPL_ISUPPORTS1(nsPluginPlayPreviewInfo, nsIPluginPlayPreviewInfo) +NS_IMPL_ISUPPORTS(nsPluginPlayPreviewInfo, nsIPluginPlayPreviewInfo) NS_IMETHODIMP nsPluginPlayPreviewInfo::GetMimeType(nsACString& aMimeType) diff --git a/dom/plugins/base/nsPluginStreamListenerPeer.cpp b/dom/plugins/base/nsPluginStreamListenerPeer.cpp index 9ae3a294778..44af8a1dba5 100644 --- a/dom/plugins/base/nsPluginStreamListenerPeer.cpp +++ b/dom/plugins/base/nsPluginStreamListenerPeer.cpp @@ -52,10 +52,10 @@ private: bool mRemoveMagicNumber; }; -NS_IMPL_ISUPPORTS3(nsPluginByteRangeStreamListener, - nsIRequestObserver, - nsIStreamListener, - nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(nsPluginByteRangeStreamListener, + nsIRequestObserver, + nsIStreamListener, + nsIInterfaceRequestor) nsPluginByteRangeStreamListener::nsPluginByteRangeStreamListener(nsIWeakReference* aWeakPtr) { @@ -245,13 +245,13 @@ nsPluginByteRangeStreamListener::GetInterface(const nsIID& aIID, void** result) // nsPluginStreamListenerPeer -NS_IMPL_ISUPPORTS6(nsPluginStreamListenerPeer, - nsIStreamListener, - nsIRequestObserver, - nsIHttpHeaderVisitor, - nsISupportsWeakReference, - nsIInterfaceRequestor, - nsIChannelEventSink) +NS_IMPL_ISUPPORTS(nsPluginStreamListenerPeer, + nsIStreamListener, + nsIRequestObserver, + nsIHttpHeaderVisitor, + nsISupportsWeakReference, + nsIInterfaceRequestor, + nsIChannelEventSink) nsPluginStreamListenerPeer::nsPluginStreamListenerPeer() { @@ -1221,7 +1221,7 @@ private: nsCOMPtr mNewChannel; }; -NS_IMPL_ISUPPORTS1(ChannelRedirectProxyCallback, nsIAsyncVerifyRedirectCallback) +NS_IMPL_ISUPPORTS(ChannelRedirectProxyCallback, nsIAsyncVerifyRedirectCallback) NS_IMETHODIMP diff --git a/dom/plugins/base/nsPluginTags.cpp b/dom/plugins/base/nsPluginTags.cpp index eda94e71bbe..0475227350e 100644 --- a/dom/plugins/base/nsPluginTags.cpp +++ b/dom/plugins/base/nsPluginTags.cpp @@ -128,7 +128,7 @@ nsPluginTag::~nsPluginTag() NS_ASSERTION(!mNext, "Risk of exhausting the stack space, bug 486349"); } -NS_IMPL_ISUPPORTS1(nsPluginTag, nsIPluginTag) +NS_IMPL_ISUPPORTS(nsPluginTag, nsIPluginTag) void nsPluginTag::InitMime(const char* const* aMimeTypes, const char* const* aMimeDescriptions, diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp index 9fb0df7b2c7..edc88d12435 100755 --- a/dom/plugins/ipc/PluginModuleParent.cpp +++ b/dom/plugins/ipc/PluginModuleParent.cpp @@ -1760,7 +1760,7 @@ private: PluginModuleParent* mPmp; }; -NS_IMPL_ISUPPORTS2(PluginProfilerObserver, nsIObserver, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(PluginProfilerObserver, nsIObserver, nsISupportsWeakReference) NS_IMETHODIMP PluginProfilerObserver::Observe(nsISupports *aSubject, diff --git a/dom/power/PowerManagerService.cpp b/dom/power/PowerManagerService.cpp index c506c0c69c2..efcacbbbe15 100644 --- a/dom/power/PowerManagerService.cpp +++ b/dom/power/PowerManagerService.cpp @@ -45,7 +45,7 @@ namespace power { using namespace hal; -NS_IMPL_ISUPPORTS1(PowerManagerService, nsIPowerManagerService) +NS_IMPL_ISUPPORTS(PowerManagerService, nsIPowerManagerService) /* static */ StaticRefPtr PowerManagerService::sSingleton; diff --git a/dom/quota/CheckQuotaHelper.cpp b/dom/quota/CheckQuotaHelper.cpp index 0b78f211548..5ffcf359147 100644 --- a/dom/quota/CheckQuotaHelper.cpp +++ b/dom/quota/CheckQuotaHelper.cpp @@ -134,9 +134,9 @@ CheckQuotaHelper::GetQuotaPermission(nsIPrincipal* aPrincipal) return permission; } -NS_IMPL_ISUPPORTS3(CheckQuotaHelper, nsIRunnable, - nsIInterfaceRequestor, - nsIObserver) +NS_IMPL_ISUPPORTS(CheckQuotaHelper, nsIRunnable, + nsIInterfaceRequestor, + nsIObserver) NS_IMETHODIMP CheckQuotaHelper::Run() diff --git a/dom/quota/QuotaManager.cpp b/dom/quota/QuotaManager.cpp index 569d12191d8..73e7cca260d 100644 --- a/dom/quota/QuotaManager.cpp +++ b/dom/quota/QuotaManager.cpp @@ -2195,7 +2195,7 @@ QuotaManager::GetInfoForChrome(nsACString* aGroup, } } -NS_IMPL_ISUPPORTS2(QuotaManager, nsIQuotaManager, nsIObserver) +NS_IMPL_ISUPPORTS(QuotaManager, nsIQuotaManager, nsIObserver) NS_IMETHODIMP QuotaManager::GetUsageForURI(nsIURI* aURI, @@ -3766,7 +3766,7 @@ AsyncUsageRunnable::AddToUsage(QuotaManager* aQuotaManager, return NS_OK; } -NS_IMPL_ISUPPORTS_INHERITED1(AsyncUsageRunnable, nsRunnable, nsIQuotaRequest) +NS_IMPL_ISUPPORTS_INHERITED(AsyncUsageRunnable, nsRunnable, nsIQuotaRequest) NS_IMETHODIMP AsyncUsageRunnable::Run() diff --git a/dom/smil/nsSMILTimeValueSpec.cpp b/dom/smil/nsSMILTimeValueSpec.cpp index b22f912c813..91810d7c328 100644 --- a/dom/smil/nsSMILTimeValueSpec.cpp +++ b/dom/smil/nsSMILTimeValueSpec.cpp @@ -23,7 +23,7 @@ using namespace mozilla::dom; //---------------------------------------------------------------------- // Nested class: EventListener -NS_IMPL_ISUPPORTS1(nsSMILTimeValueSpec::EventListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsSMILTimeValueSpec::EventListener, nsIDOMEventListener) NS_IMETHODIMP nsSMILTimeValueSpec::EventListener::HandleEvent(nsIDOMEvent* aEvent) diff --git a/dom/speakermanager/SpeakerManager.cpp b/dom/speakermanager/SpeakerManager.cpp index 0d5371b69d9..b10b26d0c5d 100644 --- a/dom/speakermanager/SpeakerManager.cpp +++ b/dom/speakermanager/SpeakerManager.cpp @@ -15,8 +15,8 @@ namespace mozilla { namespace dom { -NS_IMPL_QUERY_INTERFACE_INHERITED1(SpeakerManager, DOMEventTargetHelper, - nsIDOMEventListener) +NS_IMPL_QUERY_INTERFACE_INHERITED(SpeakerManager, DOMEventTargetHelper, + nsIDOMEventListener) NS_IMPL_ADDREF_INHERITED(SpeakerManager, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(SpeakerManager, DOMEventTargetHelper) diff --git a/dom/speakermanager/SpeakerManagerService.cpp b/dom/speakermanager/SpeakerManagerService.cpp index f0170010ff6..f44ab59bba1 100644 --- a/dom/speakermanager/SpeakerManagerService.cpp +++ b/dom/speakermanager/SpeakerManagerService.cpp @@ -59,7 +59,7 @@ SpeakerManagerService::Shutdown() } } -NS_IMPL_ISUPPORTS1(SpeakerManagerService, nsIObserver) +NS_IMPL_ISUPPORTS(SpeakerManagerService, nsIObserver) void SpeakerManagerService::ForceSpeaker(bool aEnable, uint64_t aChildId) diff --git a/dom/src/geolocation/nsGeolocation.cpp b/dom/src/geolocation/nsGeolocation.cpp index acd670d7470..6418d9c8aed 100644 --- a/dom/src/geolocation/nsGeolocation.cpp +++ b/dom/src/geolocation/nsGeolocation.cpp @@ -164,7 +164,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(GeolocationSettingsCallback, nsISettingsServiceCallback) +NS_IMPL_ISUPPORTS(GeolocationSettingsCallback, nsISettingsServiceCallback) class RequestPromptEvent : public nsRunnable { diff --git a/dom/src/jsurl/nsJSProtocolHandler.cpp b/dom/src/jsurl/nsJSProtocolHandler.cpp index a01b4416c46..19d8b80307e 100644 --- a/dom/src/jsurl/nsJSProtocolHandler.cpp +++ b/dom/src/jsurl/nsJSProtocolHandler.cpp @@ -77,7 +77,7 @@ protected: // // nsISupports implementation... // -NS_IMPL_ISUPPORTS1(nsJSThunk, nsIInputStream) +NS_IMPL_ISUPPORTS(nsJSThunk, nsIInputStream) nsJSThunk::nsJSThunk() @@ -501,9 +501,9 @@ nsresult nsJSChannel::Init(nsIURI *aURI) // nsISupports implementation... // -NS_IMPL_ISUPPORTS7(nsJSChannel, nsIChannel, nsIRequest, nsIRequestObserver, - nsIStreamListener, nsIScriptChannel, nsIPropertyBag, - nsIPropertyBag2) +NS_IMPL_ISUPPORTS(nsJSChannel, nsIChannel, nsIRequest, nsIRequestObserver, + nsIStreamListener, nsIScriptChannel, nsIPropertyBag, + nsIPropertyBag2) // // nsIRequest implementation... @@ -1131,7 +1131,7 @@ nsJSProtocolHandler::~nsJSProtocolHandler() { } -NS_IMPL_ISUPPORTS1(nsJSProtocolHandler, nsIProtocolHandler) +NS_IMPL_ISUPPORTS(nsJSProtocolHandler, nsIProtocolHandler) nsresult nsJSProtocolHandler::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult) diff --git a/dom/src/notification/DesktopNotification.cpp b/dom/src/notification/DesktopNotification.cpp index 483064ae470..993c1dcc04c 100644 --- a/dom/src/notification/DesktopNotification.cpp +++ b/dom/src/notification/DesktopNotification.cpp @@ -69,7 +69,7 @@ public: /* AlertServiceObserver */ /* ------------------------------------------------------------------------ */ -NS_IMPL_ISUPPORTS1(AlertServiceObserver, nsIObserver) +NS_IMPL_ISUPPORTS(AlertServiceObserver, nsIObserver) /* ------------------------------------------------------------------------ */ /* DesktopNotification */ @@ -308,9 +308,9 @@ DesktopNotificationCenter::WrapObject(JSContext* aCx) /* DesktopNotificationRequest */ /* ------------------------------------------------------------------------ */ -NS_IMPL_ISUPPORTS2(DesktopNotificationRequest, - nsIContentPermissionRequest, - nsIRunnable) +NS_IMPL_ISUPPORTS(DesktopNotificationRequest, + nsIContentPermissionRequest, + nsIRunnable) NS_IMETHODIMP DesktopNotificationRequest::GetPrincipal(nsIPrincipal * *aRequestingPrincipal) diff --git a/dom/src/notification/Notification.cpp b/dom/src/notification/Notification.cpp index 3b556f04909..de71734b972 100644 --- a/dom/src/notification/Notification.cpp +++ b/dom/src/notification/Notification.cpp @@ -371,7 +371,7 @@ NotificationPermissionRequest::Recv__delete__(const bool& aAllow, return true; } -NS_IMPL_ISUPPORTS1(NotificationTask, nsIRunnable) +NS_IMPL_ISUPPORTS(NotificationTask, nsIRunnable) NS_IMETHODIMP NotificationTask::Run() @@ -389,7 +389,7 @@ NotificationTask::Run() return NS_OK; } -NS_IMPL_ISUPPORTS1(NotificationObserver, nsIObserver) +NS_IMPL_ISUPPORTS(NotificationObserver, nsIObserver) NS_IMETHODIMP NotificationObserver::Observe(nsISupports* aSubject, const char* aTopic, diff --git a/dom/src/storage/DOMStorageCache.cpp b/dom/src/storage/DOMStorageCache.cpp index df92033ac4a..a1189b941ef 100644 --- a/dom/src/storage/DOMStorageCache.cpp +++ b/dom/src/storage/DOMStorageCache.cpp @@ -259,7 +259,7 @@ public: DOMStorageCacheHolder(DOMStorageCache* aCache) : mCache(aCache) {} }; -NS_IMPL_ISUPPORTS1(DOMStorageCacheHolder, nsITimerCallback) +NS_IMPL_ISUPPORTS(DOMStorageCacheHolder, nsITimerCallback) } // anon diff --git a/dom/src/storage/DOMStorageDBThread.cpp b/dom/src/storage/DOMStorageDBThread.cpp index 8ddaf41f9c0..3e381930046 100644 --- a/dom/src/storage/DOMStorageDBThread.cpp +++ b/dom/src/storage/DOMStorageDBThread.cpp @@ -346,7 +346,7 @@ class nsReverseStringSQLFunction MOZ_FINAL : public mozIStorageFunction NS_DECL_MOZISTORAGEFUNCTION }; -NS_IMPL_ISUPPORTS1(nsReverseStringSQLFunction, mozIStorageFunction) +NS_IMPL_ISUPPORTS(nsReverseStringSQLFunction, mozIStorageFunction) NS_IMETHODIMP nsReverseStringSQLFunction::OnFunctionCall( diff --git a/dom/src/storage/DOMStorageManager.cpp b/dom/src/storage/DOMStorageManager.cpp index 457d529a8c8..3e7f681249c 100644 --- a/dom/src/storage/DOMStorageManager.cpp +++ b/dom/src/storage/DOMStorageManager.cpp @@ -94,8 +94,8 @@ PrincipalsEqual(nsIPrincipal* aObjectPrincipal, nsIPrincipal* aSubjectPrincipal) return aSubjectPrincipal->Equals(aObjectPrincipal); } -NS_IMPL_ISUPPORTS1(DOMStorageManager, - nsIDOMStorageManager) +NS_IMPL_ISUPPORTS(DOMStorageManager, + nsIDOMStorageManager) DOMStorageManager::DOMStorageManager(nsPIDOMStorage::StorageType aType) : mCaches(10) diff --git a/dom/src/storage/DOMStorageObserver.cpp b/dom/src/storage/DOMStorageObserver.cpp index 0bba85551c5..b90d29bb723 100644 --- a/dom/src/storage/DOMStorageObserver.cpp +++ b/dom/src/storage/DOMStorageObserver.cpp @@ -30,9 +30,9 @@ namespace dom { static const char kStartupTopic[] = "sessionstore-windows-restored"; static const uint32_t kStartupDelay = 0; -NS_IMPL_ISUPPORTS2(DOMStorageObserver, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(DOMStorageObserver, + nsIObserver, + nsISupportsWeakReference) DOMStorageObserver* DOMStorageObserver::sSelf = nullptr; diff --git a/dom/system/OSFileConstants.cpp b/dom/system/OSFileConstants.cpp index ff12e438c61..98576f0206a 100644 --- a/dom/system/OSFileConstants.cpp +++ b/dom/system/OSFileConstants.cpp @@ -208,7 +208,7 @@ class DelayedPathSetter MOZ_FINAL: public nsIObserver DelayedPathSetter() {} }; -NS_IMPL_ISUPPORTS1(DelayedPathSetter, nsIObserver) +NS_IMPL_ISUPPORTS(DelayedPathSetter, nsIObserver) NS_IMETHODIMP DelayedPathSetter::Observe(nsISupports*, const char * aTopic, const char16_t*) @@ -987,7 +987,7 @@ bool DefineOSFileConstants(JSContext *cx, JS::Handle global) return true; } -NS_IMPL_ISUPPORTS1(OSFileConstantsService, nsIOSFileConstantsService) +NS_IMPL_ISUPPORTS(OSFileConstantsService, nsIOSFileConstantsService) OSFileConstantsService::OSFileConstantsService() { diff --git a/dom/system/android/AndroidLocationProvider.cpp b/dom/system/android/AndroidLocationProvider.cpp index 5fab3c175b3..3768360d8d0 100644 --- a/dom/system/android/AndroidLocationProvider.cpp +++ b/dom/system/android/AndroidLocationProvider.cpp @@ -12,7 +12,7 @@ using namespace mozilla; extern nsIGeolocationUpdate *gLocationCallback; -NS_IMPL_ISUPPORTS1(AndroidLocationProvider, nsIGeolocationProvider) +NS_IMPL_ISUPPORTS(AndroidLocationProvider, nsIGeolocationProvider) AndroidLocationProvider::AndroidLocationProvider() { diff --git a/dom/system/android/nsHapticFeedback.cpp b/dom/system/android/nsHapticFeedback.cpp index 8b9fbf07b1d..ef14033d6b2 100644 --- a/dom/system/android/nsHapticFeedback.cpp +++ b/dom/system/android/nsHapticFeedback.cpp @@ -9,7 +9,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS1(nsHapticFeedback, nsIHapticFeedback) +NS_IMPL_ISUPPORTS(nsHapticFeedback, nsIHapticFeedback) NS_IMETHODIMP nsHapticFeedback::PerformSimpleAction(int32_t aType) diff --git a/dom/system/gonk/AudioChannelManager.cpp b/dom/system/gonk/AudioChannelManager.cpp index d5da28d7858..d4800e1d404 100644 --- a/dom/system/gonk/AudioChannelManager.cpp +++ b/dom/system/gonk/AudioChannelManager.cpp @@ -18,8 +18,8 @@ namespace mozilla { namespace dom { namespace system { -NS_IMPL_QUERY_INTERFACE_INHERITED1(AudioChannelManager, DOMEventTargetHelper, - nsIDOMEventListener) +NS_IMPL_QUERY_INTERFACE_INHERITED(AudioChannelManager, DOMEventTargetHelper, + nsIDOMEventListener) NS_IMPL_ADDREF_INHERITED(AudioChannelManager, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(AudioChannelManager, DOMEventTargetHelper) diff --git a/dom/system/gonk/AudioManager.cpp b/dom/system/gonk/AudioManager.cpp index 6b52407b4eb..7c09e3f31a7 100644 --- a/dom/system/gonk/AudioManager.cpp +++ b/dom/system/gonk/AudioManager.cpp @@ -159,7 +159,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(AudioChannelVolInitCallback, nsISettingsServiceCallback) +NS_IMPL_ISUPPORTS(AudioChannelVolInitCallback, nsISettingsServiceCallback) } /* namespace gonk */ } /* namespace dom */ } /* namespace mozilla */ @@ -192,7 +192,7 @@ static void ProcessDelayedAudioRoute(SwitchState aState) sSwitchDone = true; } -NS_IMPL_ISUPPORTS2(AudioManager, nsIAudioManager, nsIObserver) +NS_IMPL_ISUPPORTS(AudioManager, nsIAudioManager, nsIObserver) static void InternalSetAudioRoutesICS(SwitchState aState) diff --git a/dom/system/gonk/AutoMounterSetting.cpp b/dom/system/gonk/AutoMounterSetting.cpp index 3a021ff33ee..3ab353edbe9 100644 --- a/dom/system/gonk/AutoMounterSetting.cpp +++ b/dom/system/gonk/AutoMounterSetting.cpp @@ -57,7 +57,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(SettingsServiceCallback, nsISettingsServiceCallback) +NS_IMPL_ISUPPORTS(SettingsServiceCallback, nsISettingsServiceCallback) class CheckVolumeSettingsCallback MOZ_FINAL : public nsISettingsServiceCallback { @@ -85,7 +85,7 @@ private: nsCString mVolumeName; }; -NS_IMPL_ISUPPORTS1(CheckVolumeSettingsCallback, nsISettingsServiceCallback) +NS_IMPL_ISUPPORTS(CheckVolumeSettingsCallback, nsISettingsServiceCallback) AutoMounterSetting::AutoMounterSetting() : mStatus(AUTOMOUNTER_STATUS_DISABLED) @@ -136,7 +136,7 @@ AutoMounterSetting::~AutoMounterSetting() } } -NS_IMPL_ISUPPORTS1(AutoMounterSetting, nsIObserver) +NS_IMPL_ISUPPORTS(AutoMounterSetting, nsIObserver) const char * AutoMounterSetting::StatusStr(int32_t aStatus) diff --git a/dom/system/gonk/GonkGPSGeolocationProvider.cpp b/dom/system/gonk/GonkGPSGeolocationProvider.cpp index 851cb002633..ab54a444612 100644 --- a/dom/system/gonk/GonkGPSGeolocationProvider.cpp +++ b/dom/system/gonk/GonkGPSGeolocationProvider.cpp @@ -54,10 +54,10 @@ static const char* kNetworkConnStateChangedTopic = "network-connection-state-cha // While most methods of GonkGPSGeolocationProvider should only be // called from main thread, we deliberately put the Init and ShutdownGPS // methods off main thread to avoid blocking. -NS_IMPL_ISUPPORTS3(GonkGPSGeolocationProvider, - nsIGeolocationProvider, - nsIObserver, - nsISettingsServiceCallback) +NS_IMPL_ISUPPORTS(GonkGPSGeolocationProvider, + nsIGeolocationProvider, + nsIObserver, + nsISettingsServiceCallback) /* static */ GonkGPSGeolocationProvider* GonkGPSGeolocationProvider::sSingleton = nullptr; GpsCallbacks GonkGPSGeolocationProvider::mCallbacks = { @@ -655,8 +655,8 @@ GonkGPSGeolocationProvider::SetupAGPS() #endif // MOZ_B2G_RIL -NS_IMPL_ISUPPORTS1(GonkGPSGeolocationProvider::NetworkLocationUpdate, - nsIGeolocationUpdate) +NS_IMPL_ISUPPORTS(GonkGPSGeolocationProvider::NetworkLocationUpdate, + nsIGeolocationUpdate) NS_IMETHODIMP GonkGPSGeolocationProvider::NetworkLocationUpdate::Update(nsIDOMGeoPosition *position) diff --git a/dom/system/gonk/NetworkWorker.cpp b/dom/system/gonk/NetworkWorker.cpp index 1f35052e3f2..61d9c439d31 100644 --- a/dom/system/gonk/NetworkWorker.cpp +++ b/dom/system/gonk/NetworkWorker.cpp @@ -134,7 +134,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(NetworkWorker, nsINetworkWorker) +NS_IMPL_ISUPPORTS(NetworkWorker, nsINetworkWorker) NetworkWorker::NetworkWorker() { diff --git a/dom/system/gonk/SystemWorkerManager.cpp b/dom/system/gonk/SystemWorkerManager.cpp index 6fbaac4eacc..a968fc9cbbc 100644 --- a/dom/system/gonk/SystemWorkerManager.cpp +++ b/dom/system/gonk/SystemWorkerManager.cpp @@ -246,10 +246,10 @@ SystemWorkerManager::InitKeyStore(JSContext *cx) return NS_OK; } -NS_IMPL_ISUPPORTS3(SystemWorkerManager, - nsIObserver, - nsIInterfaceRequestor, - nsISystemWorkerManager) +NS_IMPL_ISUPPORTS(SystemWorkerManager, + nsIObserver, + nsIInterfaceRequestor, + nsISystemWorkerManager) NS_IMETHODIMP SystemWorkerManager::Observe(nsISupports *aSubject, const char *aTopic, diff --git a/dom/system/gonk/TimeZoneSettingObserver.cpp b/dom/system/gonk/TimeZoneSettingObserver.cpp index c4e6528e47e..06fc0800b25 100644 --- a/dom/system/gonk/TimeZoneSettingObserver.cpp +++ b/dom/system/gonk/TimeZoneSettingObserver.cpp @@ -109,7 +109,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(TimeZoneSettingCb, nsISettingsServiceCallback) +NS_IMPL_ISUPPORTS(TimeZoneSettingCb, nsISettingsServiceCallback) TimeZoneSettingObserver::TimeZoneSettingObserver() { @@ -180,7 +180,7 @@ TimeZoneSettingObserver::~TimeZoneSettingObserver() } } -NS_IMPL_ISUPPORTS1(TimeZoneSettingObserver, nsIObserver) +NS_IMPL_ISUPPORTS(TimeZoneSettingObserver, nsIObserver) NS_IMETHODIMP TimeZoneSettingObserver::Observe(nsISupports *aSubject, diff --git a/dom/system/gonk/VolumeServiceTest.cpp b/dom/system/gonk/VolumeServiceTest.cpp index 0166f9097dc..81453a531e8 100644 --- a/dom/system/gonk/VolumeServiceTest.cpp +++ b/dom/system/gonk/VolumeServiceTest.cpp @@ -89,7 +89,7 @@ public: }; static nsCOMPtr sTestObserver; -NS_IMPL_ISUPPORTS1(VolumeTestObserver, nsIObserver) +NS_IMPL_ISUPPORTS(VolumeTestObserver, nsIObserver) NS_IMETHODIMP VolumeTestObserver::Observe(nsISupports* aSubject, diff --git a/dom/system/gonk/nsVolume.cpp b/dom/system/gonk/nsVolume.cpp index 5424abc0f33..76d5fa6e0f0 100644 --- a/dom/system/gonk/nsVolume.cpp +++ b/dom/system/gonk/nsVolume.cpp @@ -45,7 +45,7 @@ NS_VolumeStateStr(int32_t aState) // allocate an nsVolume which is then passed to MainThread. Since we // have a situation where we allocate on one thread and free on another // we use a thread safe AddRef implementation. -NS_IMPL_ISUPPORTS1(nsVolume, nsIVolume) +NS_IMPL_ISUPPORTS(nsVolume, nsIVolume) nsVolume::nsVolume(const Volume* aVolume) : mName(NS_ConvertUTF8toUTF16(aVolume->Name())), diff --git a/dom/system/gonk/nsVolumeMountLock.cpp b/dom/system/gonk/nsVolumeMountLock.cpp index f3917a7ab4d..235613b8b1d 100644 --- a/dom/system/gonk/nsVolumeMountLock.cpp +++ b/dom/system/gonk/nsVolumeMountLock.cpp @@ -25,8 +25,8 @@ using namespace mozilla::services; namespace mozilla { namespace system { -NS_IMPL_ISUPPORTS3(nsVolumeMountLock, nsIVolumeMountLock, - nsIObserver, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsVolumeMountLock, nsIVolumeMountLock, + nsIObserver, nsISupportsWeakReference) // static already_AddRefed diff --git a/dom/system/gonk/nsVolumeService.cpp b/dom/system/gonk/nsVolumeService.cpp index e909c988eff..3ff86b84222 100644 --- a/dom/system/gonk/nsVolumeService.cpp +++ b/dom/system/gonk/nsVolumeService.cpp @@ -39,9 +39,9 @@ using namespace mozilla::services; namespace mozilla { namespace system { -NS_IMPL_ISUPPORTS2(nsVolumeService, - nsIVolumeService, - nsIDOMMozWakeLockListener) +NS_IMPL_ISUPPORTS(nsVolumeService, + nsIVolumeService, + nsIDOMMozWakeLockListener) StaticRefPtr nsVolumeService::sSingleton; diff --git a/dom/system/gonk/nsVolumeStat.cpp b/dom/system/gonk/nsVolumeStat.cpp index aa244016b49..1928abaf923 100644 --- a/dom/system/gonk/nsVolumeStat.cpp +++ b/dom/system/gonk/nsVolumeStat.cpp @@ -8,7 +8,7 @@ namespace mozilla { namespace system { -NS_IMPL_ISUPPORTS1(nsVolumeStat, nsIVolumeStat) +NS_IMPL_ISUPPORTS(nsVolumeStat, nsIVolumeStat) nsVolumeStat::nsVolumeStat(const nsAString& aPath) { diff --git a/dom/system/mac/CoreLocationLocationProvider.mm b/dom/system/mac/CoreLocationLocationProvider.mm index fd2afd11825..cff2571648c 100644 --- a/dom/system/mac/CoreLocationLocationProvider.mm +++ b/dom/system/mac/CoreLocationLocationProvider.mm @@ -124,7 +124,7 @@ public: CLLocationManager* mLocationManager; }; -NS_IMPL_ISUPPORTS1(CoreLocationLocationProvider, nsIGeolocationProvider) +NS_IMPL_ISUPPORTS(CoreLocationLocationProvider, nsIGeolocationProvider) CoreLocationLocationProvider::CoreLocationLocationProvider() : mCLObjects(nullptr) diff --git a/dom/system/nsDeviceSensors.cpp b/dom/system/nsDeviceSensors.cpp index 9ac796f2b7a..4517a948050 100644 --- a/dom/system/nsDeviceSensors.cpp +++ b/dom/system/nsDeviceSensors.cpp @@ -94,7 +94,7 @@ NS_IMETHODIMP nsDeviceSensorData::GetZ(double *aZ) return NS_OK; } -NS_IMPL_ISUPPORTS1(nsDeviceSensors, nsIDeviceSensors) +NS_IMPL_ISUPPORTS(nsDeviceSensors, nsIDeviceSensors) nsDeviceSensors::nsDeviceSensors() { diff --git a/dom/system/qt/QTMLocationProvider.cpp b/dom/system/qt/QTMLocationProvider.cpp index 7e902d6fab5..ba238b8a879 100644 --- a/dom/system/qt/QTMLocationProvider.cpp +++ b/dom/system/qt/QTMLocationProvider.cpp @@ -8,7 +8,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS1(QTMLocationProvider, nsIGeolocationProvider) +NS_IMPL_ISUPPORTS(QTMLocationProvider, nsIGeolocationProvider) QTMLocationProvider::QTMLocationProvider() { diff --git a/dom/system/qt/QtHapticFeedback.cpp b/dom/system/qt/QtHapticFeedback.cpp index 8e2177578bf..91aa1592d31 100644 --- a/dom/system/qt/QtHapticFeedback.cpp +++ b/dom/system/qt/QtHapticFeedback.cpp @@ -6,7 +6,7 @@ #include #include "QtHapticFeedback.h" -NS_IMPL_ISUPPORTS1(QtHapticFeedback, nsIHapticFeedback) +NS_IMPL_ISUPPORTS(QtHapticFeedback, nsIHapticFeedback) NS_IMETHODIMP QtHapticFeedback::PerformSimpleAction(int32_t aType) diff --git a/dom/system/windows/nsHapticFeedback.cpp b/dom/system/windows/nsHapticFeedback.cpp index 115c175ad53..382036c0a96 100644 --- a/dom/system/windows/nsHapticFeedback.cpp +++ b/dom/system/windows/nsHapticFeedback.cpp @@ -5,7 +5,7 @@ #include "nsHapticFeedback.h" -NS_IMPL_ISUPPORTS1(nsHapticFeedback, nsIHapticFeedback) +NS_IMPL_ISUPPORTS(nsHapticFeedback, nsIHapticFeedback) NS_IMETHODIMP nsHapticFeedback::PerformSimpleAction(int32_t aType) diff --git a/dom/telephony/Telephony.cpp b/dom/telephony/Telephony.cpp index 62d0458a318..7f14c9ed21f 100644 --- a/dom/telephony/Telephony.cpp +++ b/dom/telephony/Telephony.cpp @@ -379,8 +379,8 @@ NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(Telephony, DOMEventTargetHelper) NS_IMPL_RELEASE_INHERITED(Telephony, DOMEventTargetHelper) -NS_IMPL_ISUPPORTS1(Telephony::Listener, nsITelephonyListener) -NS_IMPL_ISUPPORTS1(Telephony::Callback, nsITelephonyCallback) +NS_IMPL_ISUPPORTS(Telephony::Listener, nsITelephonyListener) +NS_IMPL_ISUPPORTS(Telephony::Callback, nsITelephonyCallback) // Telephony WebIDL diff --git a/dom/telephony/ipc/TelephonyIPCProvider.cpp b/dom/telephony/ipc/TelephonyIPCProvider.cpp index 4f5adbabca0..f194b25282b 100644 --- a/dom/telephony/ipc/TelephonyIPCProvider.cpp +++ b/dom/telephony/ipc/TelephonyIPCProvider.cpp @@ -36,10 +36,10 @@ getDefaultServiceId() } // Anonymous namespace -NS_IMPL_ISUPPORTS3(TelephonyIPCProvider, - nsITelephonyProvider, - nsITelephonyListener, - nsIObserver) +NS_IMPL_ISUPPORTS(TelephonyIPCProvider, + nsITelephonyProvider, + nsITelephonyListener, + nsIObserver) TelephonyIPCProvider::TelephonyIPCProvider() { diff --git a/dom/telephony/ipc/TelephonyParent.cpp b/dom/telephony/ipc/TelephonyParent.cpp index 2fadb78955d..4b57dee5ba7 100644 --- a/dom/telephony/ipc/TelephonyParent.cpp +++ b/dom/telephony/ipc/TelephonyParent.cpp @@ -12,7 +12,7 @@ USING_TELEPHONY_NAMESPACE * TelephonyParent ******************************************************************************/ -NS_IMPL_ISUPPORTS1(TelephonyParent, nsITelephonyListener) +NS_IMPL_ISUPPORTS(TelephonyParent, nsITelephonyListener) TelephonyParent::TelephonyParent() : mActorDestroyed(false) @@ -374,9 +374,9 @@ TelephonyParent::SupplementaryServiceNotification(uint32_t aClientId, * TelephonyRequestParent ******************************************************************************/ -NS_IMPL_ISUPPORTS2(TelephonyRequestParent, - nsITelephonyListener, - nsITelephonyCallback) +NS_IMPL_ISUPPORTS(TelephonyRequestParent, + nsITelephonyListener, + nsITelephonyCallback) TelephonyRequestParent::TelephonyRequestParent() : mActorDestroyed(false) diff --git a/dom/time/TimeService.cpp b/dom/time/TimeService.cpp index a9cb973b79d..d7ed704478b 100644 --- a/dom/time/TimeService.cpp +++ b/dom/time/TimeService.cpp @@ -12,7 +12,7 @@ namespace mozilla { namespace dom { namespace time { -NS_IMPL_ISUPPORTS1(TimeService, nsITimeService) +NS_IMPL_ISUPPORTS(TimeService, nsITimeService) /* static */ StaticRefPtr TimeService::sSingleton; diff --git a/dom/voicemail/Voicemail.cpp b/dom/voicemail/Voicemail.cpp index b639e8c7d67..4a06c7c93b6 100644 --- a/dom/voicemail/Voicemail.cpp +++ b/dom/voicemail/Voicemail.cpp @@ -42,7 +42,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(Voicemail::Listener, nsIVoicemailListener) +NS_IMPL_ISUPPORTS(Voicemail::Listener, nsIVoicemailListener) Voicemail::Voicemail(nsPIDOMWindow* aWindow, nsIVoicemailProvider* aProvider) diff --git a/dom/wifi/WifiProxyService.cpp b/dom/wifi/WifiProxyService.cpp index 1b93789a023..3607b4a782c 100644 --- a/dom/wifi/WifiProxyService.cpp +++ b/dom/wifi/WifiProxyService.cpp @@ -158,7 +158,7 @@ private: nsCString mInterface; }; -NS_IMPL_ISUPPORTS1(WifiProxyService, nsIWifiProxyService) +NS_IMPL_ISUPPORTS(WifiProxyService, nsIWifiProxyService) WifiProxyService::WifiProxyService() { diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp index 87f0c5f42da..b34cba320f7 100644 --- a/dom/workers/RuntimeService.cpp +++ b/dom/workers/RuntimeService.cpp @@ -2275,7 +2275,7 @@ RuntimeService::SendOfflineStatusChangeEventToAllWorkers(bool aIsOffline) } // nsISupports -NS_IMPL_ISUPPORTS1(RuntimeService, nsIObserver) +NS_IMPL_ISUPPORTS(RuntimeService, nsIObserver) // nsIObserver NS_IMETHODIMP @@ -2444,7 +2444,7 @@ RuntimeService::WorkerThread::Dispatch(nsIRunnable* aRunnable, uint32_t aFlags) return NS_OK; } -NS_IMPL_ISUPPORTS1(RuntimeService::WorkerThread::Observer, nsIThreadObserver) +NS_IMPL_ISUPPORTS(RuntimeService::WorkerThread::Observer, nsIThreadObserver) NS_IMETHODIMP RuntimeService::WorkerThread::Observer::OnDispatchedEvent( diff --git a/dom/workers/ScriptLoader.cpp b/dom/workers/ScriptLoader.cpp index 60f51e9cfa5..3207a42f053 100644 --- a/dom/workers/ScriptLoader.cpp +++ b/dom/workers/ScriptLoader.cpp @@ -611,7 +611,7 @@ private: } }; -NS_IMPL_ISUPPORTS2(ScriptLoaderRunnable, nsIRunnable, nsIStreamLoaderObserver) +NS_IMPL_ISUPPORTS(ScriptLoaderRunnable, nsIRunnable, nsIStreamLoaderObserver) class ChannelGetterRunnable MOZ_FINAL : public nsRunnable { diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp index 47a9e943a3a..23510ffd383 100644 --- a/dom/workers/WorkerPrivate.cpp +++ b/dom/workers/WorkerPrivate.cpp @@ -1811,7 +1811,7 @@ NS_IMPL_ISUPPORTS_INHERITED0(MainThreadReleaseRunnable, nsRunnable) NS_IMPL_ISUPPORTS_INHERITED0(TopLevelWorkerFinishedRunnable, nsRunnable) -NS_IMPL_ISUPPORTS1(TimerThreadEventTarget, nsIEventTarget) +NS_IMPL_ISUPPORTS(TimerThreadEventTarget, nsIEventTarget) template class WorkerPrivateParent::SynchronizeAndResumeRunnable MOZ_FINAL @@ -2078,7 +2078,7 @@ private: } }; -NS_IMPL_ISUPPORTS1(WorkerPrivate::MemoryReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(WorkerPrivate::MemoryReporter, nsIMemoryReporter) WorkerPrivate::SyncLoopInfo::SyncLoopInfo(EventTarget* aEventTarget) : mEventTarget(aEventTarget), mCompleted(false), mResult(false) diff --git a/dom/workers/XMLHttpRequest.cpp b/dom/workers/XMLHttpRequest.cpp index c3f92385fa3..cd9c13069ee 100644 --- a/dom/workers/XMLHttpRequest.cpp +++ b/dom/workers/XMLHttpRequest.cpp @@ -999,7 +999,7 @@ Proxy::AddRemoveEventListeners(bool aUpload, bool aAdd) return true; } -NS_IMPL_ISUPPORTS1(Proxy, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(Proxy, nsIDOMEventListener) NS_IMETHODIMP Proxy::HandleEvent(nsIDOMEvent* aEvent) @@ -1082,8 +1082,8 @@ NS_IMPL_ISUPPORTS_INHERITED0(WorkerThreadProxySyncRunnable, nsRunnable) NS_IMPL_ISUPPORTS_INHERITED0(AsyncTeardownRunnable, nsRunnable) -NS_IMPL_ISUPPORTS_INHERITED1(LoadStartDetectionRunnable, nsRunnable, - nsIDOMEventListener) +NS_IMPL_ISUPPORTS_INHERITED(LoadStartDetectionRunnable, nsRunnable, + nsIDOMEventListener) NS_IMETHODIMP LoadStartDetectionRunnable::Run() diff --git a/dom/xbl/XBLChildrenElement.cpp b/dom/xbl/XBLChildrenElement.cpp index 2dcc8e0c434..c1089135a12 100644 --- a/dom/xbl/XBLChildrenElement.cpp +++ b/dom/xbl/XBLChildrenElement.cpp @@ -19,8 +19,8 @@ NS_IMPL_ADDREF_INHERITED(XBLChildrenElement, Element) NS_IMPL_RELEASE_INHERITED(XBLChildrenElement, Element) NS_INTERFACE_TABLE_HEAD(XBLChildrenElement) - NS_INTERFACE_TABLE_INHERITED2(XBLChildrenElement, nsIDOMNode, - nsIDOMElement) + NS_INTERFACE_TABLE_INHERITED(XBLChildrenElement, nsIDOMNode, + nsIDOMElement) NS_ELEMENT_INTERFACE_TABLE_TO_MAP_SEGUE NS_INTERFACE_MAP_END_INHERITING(Element) @@ -82,8 +82,8 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsAnonymousContentList) NS_INTERFACE_TABLE_HEAD(nsAnonymousContentList) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY - NS_INTERFACE_TABLE_INHERITED2(nsAnonymousContentList, nsINodeList, - nsIDOMNodeList) + NS_INTERFACE_TABLE_INHERITED(nsAnonymousContentList, nsINodeList, + nsIDOMNodeList) NS_INTERFACE_TABLE_TO_MAP_SEGUE NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsAnonymousContentList) NS_INTERFACE_MAP_ENTRY(nsISupports) diff --git a/dom/xbl/nsXBLEventHandler.cpp b/dom/xbl/nsXBLEventHandler.cpp index 000759150af..5dfe99d733d 100644 --- a/dom/xbl/nsXBLEventHandler.cpp +++ b/dom/xbl/nsXBLEventHandler.cpp @@ -24,7 +24,7 @@ nsXBLEventHandler::~nsXBLEventHandler() { } -NS_IMPL_ISUPPORTS1(nsXBLEventHandler, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsXBLEventHandler, nsIDOMEventListener) NS_IMETHODIMP nsXBLEventHandler::HandleEvent(nsIDOMEvent* aEvent) @@ -79,7 +79,7 @@ nsXBLKeyEventHandler::~nsXBLKeyEventHandler() { } -NS_IMPL_ISUPPORTS1(nsXBLKeyEventHandler, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsXBLKeyEventHandler, nsIDOMEventListener) bool nsXBLKeyEventHandler::ExecuteMatchedHandlers(nsIDOMKeyEvent* aKeyEvent, diff --git a/dom/xbl/nsXBLService.cpp b/dom/xbl/nsXBLService.cpp index 8c2142f3cdc..32de6970bbe 100644 --- a/dom/xbl/nsXBLService.cpp +++ b/dom/xbl/nsXBLService.cpp @@ -183,10 +183,10 @@ private: }; /* Implementation file */ -NS_IMPL_ISUPPORTS3(nsXBLStreamListener, - nsIStreamListener, - nsIRequestObserver, - nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsXBLStreamListener, + nsIStreamListener, + nsIRequestObserver, + nsIDOMEventListener) nsXBLStreamListener::nsXBLStreamListener(nsIDocument* aBoundDocument, nsIXMLContentSink* aSink, @@ -368,7 +368,7 @@ nsXBLStreamListener::HandleEvent(nsIDOMEvent* aEvent) bool nsXBLService::gAllowDataURIs = false; // Implement our nsISupports methods -NS_IMPL_ISUPPORTS1(nsXBLService, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsXBLService, nsISupportsWeakReference) void nsXBLService::Init() diff --git a/dom/xbl/nsXBLWindowKeyHandler.cpp b/dom/xbl/nsXBLWindowKeyHandler.cpp index 1d5a2afeb4f..858f2ba72ab 100644 --- a/dom/xbl/nsXBLWindowKeyHandler.cpp +++ b/dom/xbl/nsXBLWindowKeyHandler.cpp @@ -67,7 +67,7 @@ public: const char nsXBLSpecialDocInfo::sHTMLBindingStr[] = "chrome://global/content/platformHTMLBindings.xml"; -NS_IMPL_ISUPPORTS1(nsXBLSpecialDocInfo, nsIObserver) +NS_IMPL_ISUPPORTS(nsXBLSpecialDocInfo, nsIObserver) NS_IMETHODIMP nsXBLSpecialDocInfo::Observe(nsISupports* aSubject, @@ -183,8 +183,8 @@ nsXBLWindowKeyHandler::~nsXBLWindowKeyHandler() } } -NS_IMPL_ISUPPORTS1(nsXBLWindowKeyHandler, - nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsXBLWindowKeyHandler, + nsIDOMEventListener) static void BuildHandlerChain(nsIContent* aContent, nsXBLPrototypeHandler** aResult) diff --git a/dom/xslt/xpath/XPathEvaluator.cpp b/dom/xslt/xpath/XPathEvaluator.cpp index 283de43b6c4..73e17a6f38b 100644 --- a/dom/xslt/xpath/XPathEvaluator.cpp +++ b/dom/xslt/xpath/XPathEvaluator.cpp @@ -58,7 +58,7 @@ private: bool mIsCaseSensitive; }; -NS_IMPL_ISUPPORTS1(XPathEvaluator, nsIDOMXPathEvaluator) +NS_IMPL_ISUPPORTS(XPathEvaluator, nsIDOMXPathEvaluator) XPathEvaluator::XPathEvaluator(nsIDocument* aDocument) : mDocument(do_GetWeakReference(aDocument)) diff --git a/dom/xslt/xpath/txNodeSetAdaptor.cpp b/dom/xslt/xpath/txNodeSetAdaptor.cpp index c7ff541809e..d2d16d5ef5b 100644 --- a/dom/xslt/xpath/txNodeSetAdaptor.cpp +++ b/dom/xslt/xpath/txNodeSetAdaptor.cpp @@ -18,7 +18,7 @@ txNodeSetAdaptor::txNodeSetAdaptor(txNodeSet *aNodeSet) { } -NS_IMPL_ISUPPORTS_INHERITED1(txNodeSetAdaptor, txXPathObjectAdaptor, txINodeSet) +NS_IMPL_ISUPPORTS_INHERITED(txNodeSetAdaptor, txXPathObjectAdaptor, txINodeSet) nsresult txNodeSetAdaptor::Init() diff --git a/dom/xslt/xpath/txXPCOMExtensionFunction.cpp b/dom/xslt/xpath/txXPCOMExtensionFunction.cpp index f682ba8f73b..e81ff27a65f 100644 --- a/dom/xslt/xpath/txXPCOMExtensionFunction.cpp +++ b/dom/xslt/xpath/txXPCOMExtensionFunction.cpp @@ -20,7 +20,7 @@ #include "nsIClassInfo.h" #include "nsIInterfaceInfo.h" -NS_IMPL_ISUPPORTS1(txXPathObjectAdaptor, txIXPathObject) +NS_IMPL_ISUPPORTS(txXPathObjectAdaptor, txIXPathObject) class txFunctionEvaluationContext MOZ_FINAL : public txIFunctionEvaluationContext { @@ -47,7 +47,7 @@ txFunctionEvaluationContext::txFunctionEvaluationContext(txIEvalContext *aContex { } -NS_IMPL_ISUPPORTS1(txFunctionEvaluationContext, txIFunctionEvaluationContext) +NS_IMPL_ISUPPORTS(txFunctionEvaluationContext, txIFunctionEvaluationContext) NS_IMETHODIMP txFunctionEvaluationContext::GetPosition(uint32_t *aPosition) diff --git a/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp b/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp index 1815092606c..18a3eb522da 100644 --- a/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp +++ b/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp @@ -106,13 +106,13 @@ txStylesheetSink::txStylesheetSink(txStylesheetCompiler* aCompiler, mListener = do_QueryInterface(aParser); } -NS_IMPL_ISUPPORTS6(txStylesheetSink, - nsIXMLContentSink, - nsIContentSink, - nsIExpatSink, - nsIStreamListener, - nsIRequestObserver, - nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(txStylesheetSink, + nsIXMLContentSink, + nsIContentSink, + nsIExpatSink, + nsIStreamListener, + nsIRequestObserver, + nsIInterfaceRequestor) NS_IMETHODIMP txStylesheetSink::HandleStartElement(const char16_t *aName, diff --git a/dom/xslt/xslt/txMozillaXMLOutput.cpp b/dom/xslt/xslt/txMozillaXMLOutput.cpp index 978fac787c8..6b953453996 100644 --- a/dom/xslt/xslt/txMozillaXMLOutput.cpp +++ b/dom/xslt/xslt/txMozillaXMLOutput.cpp @@ -949,9 +949,9 @@ txTransformNotifier::txTransformNotifier() { } -NS_IMPL_ISUPPORTS2(txTransformNotifier, - nsIScriptLoaderObserver, - nsICSSLoaderObserver) +NS_IMPL_ISUPPORTS(txTransformNotifier, + nsIScriptLoaderObserver, + nsICSSLoaderObserver) NS_IMETHODIMP txTransformNotifier::ScriptAvailable(nsresult aResult, diff --git a/editor/composer/src/nsComposeTxtSrvFilter.cpp b/editor/composer/src/nsComposeTxtSrvFilter.cpp index 00e38fd85cb..aee839d864f 100644 --- a/editor/composer/src/nsComposeTxtSrvFilter.cpp +++ b/editor/composer/src/nsComposeTxtSrvFilter.cpp @@ -16,7 +16,7 @@ nsComposeTxtSrvFilter::nsComposeTxtSrvFilter() : { } -NS_IMPL_ISUPPORTS1(nsComposeTxtSrvFilter, nsITextServicesFilter) +NS_IMPL_ISUPPORTS(nsComposeTxtSrvFilter, nsITextServicesFilter) NS_IMETHODIMP nsComposeTxtSrvFilter::Skip(nsIDOMNode* aNode, bool *_retval) diff --git a/editor/composer/src/nsComposerCommands.cpp b/editor/composer/src/nsComposerCommands.cpp index 98ec84d1dd9..401a5c89fad 100644 --- a/editor/composer/src/nsComposerCommands.cpp +++ b/editor/composer/src/nsComposerCommands.cpp @@ -52,7 +52,7 @@ nsBaseComposerCommand::nsBaseComposerCommand() { } -NS_IMPL_ISUPPORTS1(nsBaseComposerCommand, nsIControllerCommand) +NS_IMPL_ISUPPORTS(nsBaseComposerCommand, nsIControllerCommand) nsBaseStateUpdatingCommand::nsBaseStateUpdatingCommand(nsIAtom* aTagName) diff --git a/editor/composer/src/nsComposerCommandsUpdater.cpp b/editor/composer/src/nsComposerCommandsUpdater.cpp index d02b158b86b..5edb1b7af03 100644 --- a/editor/composer/src/nsComposerCommandsUpdater.cpp +++ b/editor/composer/src/nsComposerCommandsUpdater.cpp @@ -40,8 +40,8 @@ nsComposerCommandsUpdater::~nsComposerCommandsUpdater() } } -NS_IMPL_ISUPPORTS4(nsComposerCommandsUpdater, nsISelectionListener, - nsIDocumentStateListener, nsITransactionListener, nsITimerCallback) +NS_IMPL_ISUPPORTS(nsComposerCommandsUpdater, nsISelectionListener, + nsIDocumentStateListener, nsITransactionListener, nsITimerCallback) #if 0 #pragma mark - diff --git a/editor/composer/src/nsEditingSession.cpp b/editor/composer/src/nsEditingSession.cpp index bfbfc059de6..97092bc1f6a 100644 --- a/editor/composer/src/nsEditingSession.cpp +++ b/editor/composer/src/nsEditingSession.cpp @@ -86,8 +86,8 @@ nsEditingSession::~nsEditingSession() mLoadBlankDocTimer->Cancel(); } -NS_IMPL_ISUPPORTS3(nsEditingSession, nsIEditingSession, nsIWebProgressListener, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsEditingSession, nsIEditingSession, nsIWebProgressListener, + nsISupportsWeakReference) /*--------------------------------------------------------------------------- diff --git a/editor/composer/src/nsEditorSpellCheck.cpp b/editor/composer/src/nsEditorSpellCheck.cpp index 89bd8898486..90a08f70084 100644 --- a/editor/composer/src/nsEditorSpellCheck.cpp +++ b/editor/composer/src/nsEditorSpellCheck.cpp @@ -146,7 +146,7 @@ public: private: nsRefPtr mSpellCheck; }; -NS_IMPL_ISUPPORTS1(DictionaryFetcher, nsIContentPrefCallback2) +NS_IMPL_ISUPPORTS(DictionaryFetcher, nsIContentPrefCallback2) NS_IMETHODIMP DictionaryFetcher::Fetch(nsIEditor* aEditor) diff --git a/editor/libeditor/base/nsEditorCommands.cpp b/editor/libeditor/base/nsEditorCommands.cpp index 4f2890fce6f..576703f0d65 100644 --- a/editor/libeditor/base/nsEditorCommands.cpp +++ b/editor/libeditor/base/nsEditorCommands.cpp @@ -36,7 +36,7 @@ nsBaseEditorCommand::nsBaseEditorCommand() { } -NS_IMPL_ISUPPORTS1(nsBaseEditorCommand, nsIControllerCommand) +NS_IMPL_ISUPPORTS(nsBaseEditorCommand, nsIControllerCommand) NS_IMETHODIMP diff --git a/editor/libeditor/base/nsEditorEventListener.cpp b/editor/libeditor/base/nsEditorEventListener.cpp index 1e0e7e54f1f..73d352106af 100644 --- a/editor/libeditor/base/nsEditorEventListener.cpp +++ b/editor/libeditor/base/nsEditorEventListener.cpp @@ -301,7 +301,7 @@ nsEditorEventListener::GetPresShell() * nsISupports implementation */ -NS_IMPL_ISUPPORTS1(nsEditorEventListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsEditorEventListener, nsIDOMEventListener) /** * nsIDOMEventListener implementation diff --git a/editor/libeditor/html/nsHTMLAnonymousUtils.cpp b/editor/libeditor/html/nsHTMLAnonymousUtils.cpp index 2b8a55a0757..da2632de592 100644 --- a/editor/libeditor/html/nsHTMLAnonymousUtils.cpp +++ b/editor/libeditor/html/nsHTMLAnonymousUtils.cpp @@ -104,7 +104,7 @@ protected: nsINode* mObservedNode; }; -NS_IMPL_ISUPPORTS1(nsElementDeletionObserver, nsIMutationObserver) +NS_IMPL_ISUPPORTS(nsElementDeletionObserver, nsIMutationObserver) NS_IMPL_NSIMUTATIONOBSERVER_CONTENT(nsElementDeletionObserver) void diff --git a/editor/libeditor/html/nsHTMLEditRules.cpp b/editor/libeditor/html/nsHTMLEditRules.cpp index b55effe8891..6782904452b 100644 --- a/editor/libeditor/html/nsHTMLEditRules.cpp +++ b/editor/libeditor/html/nsHTMLEditRules.cpp @@ -220,7 +220,7 @@ nsHTMLEditRules::~nsHTMLEditRules() NS_IMPL_ADDREF_INHERITED(nsHTMLEditRules, nsTextEditRules) NS_IMPL_RELEASE_INHERITED(nsHTMLEditRules, nsTextEditRules) -NS_IMPL_QUERY_INTERFACE_INHERITED1(nsHTMLEditRules, nsTextEditRules, nsIEditActionListener) +NS_IMPL_QUERY_INTERFACE_INHERITED(nsHTMLEditRules, nsTextEditRules, nsIEditActionListener) /******************************************************** diff --git a/editor/libeditor/html/nsHTMLObjectResizer.cpp b/editor/libeditor/html/nsHTMLObjectResizer.cpp index a0e8cee9838..494c6d8cd50 100644 --- a/editor/libeditor/html/nsHTMLObjectResizer.cpp +++ b/editor/libeditor/html/nsHTMLObjectResizer.cpp @@ -54,7 +54,7 @@ class nsHTMLEditUtils; // ================================================================== // DocumentResizeEventListener // ================================================================== -NS_IMPL_ISUPPORTS1(DocumentResizeEventListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(DocumentResizeEventListener, nsIDOMEventListener) DocumentResizeEventListener::DocumentResizeEventListener(nsIHTMLEditor * aEditor) { @@ -78,7 +78,7 @@ DocumentResizeEventListener::HandleEvent(nsIDOMEvent* aMouseEvent) // ResizerSelectionListener // ================================================================== -NS_IMPL_ISUPPORTS1(ResizerSelectionListener, nsISelectionListener) +NS_IMPL_ISUPPORTS(ResizerSelectionListener, nsISelectionListener) ResizerSelectionListener::ResizerSelectionListener(nsIHTMLEditor * aEditor) { @@ -110,7 +110,7 @@ ResizerSelectionListener::NotifySelectionChanged(nsIDOMDocument *, nsISelection // ResizerMouseMotionListener // ================================================================== -NS_IMPL_ISUPPORTS1(ResizerMouseMotionListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(ResizerMouseMotionListener, nsIDOMEventListener) ResizerMouseMotionListener::ResizerMouseMotionListener(nsIHTMLEditor * aEditor) { diff --git a/editor/libeditor/html/nsHTMLURIRefObject.cpp b/editor/libeditor/html/nsHTMLURIRefObject.cpp index 11374b8017c..8d7dbb0264f 100644 --- a/editor/libeditor/html/nsHTMLURIRefObject.cpp +++ b/editor/libeditor/html/nsHTMLURIRefObject.cpp @@ -92,7 +92,7 @@ nsHTMLURIRefObject::~nsHTMLURIRefObject() } //Interfaces for addref and release and queryinterface -NS_IMPL_ISUPPORTS1(nsHTMLURIRefObject, nsIURIRefObject) +NS_IMPL_ISUPPORTS(nsHTMLURIRefObject, nsIURIRefObject) NS_IMETHODIMP nsHTMLURIRefObject::Reset() diff --git a/editor/txmgr/src/nsTransactionList.cpp b/editor/txmgr/src/nsTransactionList.cpp index 450ebc50393..57c0a5b2a47 100644 --- a/editor/txmgr/src/nsTransactionList.cpp +++ b/editor/txmgr/src/nsTransactionList.cpp @@ -15,7 +15,7 @@ #include "nsTransactionStack.h" #include "nscore.h" -NS_IMPL_ISUPPORTS1(nsTransactionList, nsITransactionList) +NS_IMPL_ISUPPORTS(nsTransactionList, nsITransactionList) nsTransactionList::nsTransactionList(nsITransactionManager *aTxnMgr, nsTransactionStack *aTxnStack) : mTxnStack(aTxnStack) diff --git a/editor/txmgr/tests/TestTXMgr.cpp b/editor/txmgr/tests/TestTXMgr.cpp index eb8900836ab..7373db175b5 100644 --- a/editor/txmgr/tests/TestTXMgr.cpp +++ b/editor/txmgr/tests/TestTXMgr.cpp @@ -413,7 +413,7 @@ public: NS_DECL_ISUPPORTS }; -NS_IMPL_ISUPPORTS1(TestTransaction, nsITransaction) +NS_IMPL_ISUPPORTS(TestTransaction, nsITransaction) class SimpleTransaction : public TestTransaction { diff --git a/embedding/browser/webBrowser/nsContextMenuInfo.cpp b/embedding/browser/webBrowser/nsContextMenuInfo.cpp index 7717010ba53..6a15401444b 100644 --- a/embedding/browser/webBrowser/nsContextMenuInfo.cpp +++ b/embedding/browser/webBrowser/nsContextMenuInfo.cpp @@ -34,7 +34,7 @@ // class nsContextMenuInfo //***************************************************************************** -NS_IMPL_ISUPPORTS1(nsContextMenuInfo, nsIContextMenuInfo) +NS_IMPL_ISUPPORTS(nsContextMenuInfo, nsIContextMenuInfo) nsContextMenuInfo::nsContextMenuInfo() { diff --git a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp index ae6088d776d..622ab27d443 100644 --- a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp +++ b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp @@ -1003,7 +1003,7 @@ protected: nsCOMPtr mTag_window; }; -NS_IMPL_ISUPPORTS1(DefaultTooltipTextProvider, nsITooltipTextProvider) +NS_IMPL_ISUPPORTS(DefaultTooltipTextProvider, nsITooltipTextProvider) DefaultTooltipTextProvider::DefaultTooltipTextProvider() { @@ -1132,7 +1132,7 @@ DefaultTooltipTextProvider::GetNodeText(nsIDOMNode *aNode, char16_t **aText, /////////////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS1(ChromeTooltipListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(ChromeTooltipListener, nsIDOMEventListener) // // ChromeTooltipListener ctor @@ -1525,7 +1525,7 @@ ChromeTooltipListener::sAutoHideCallback(nsITimer *aTimer, void* aListener) } // sAutoHideCallback -NS_IMPL_ISUPPORTS1(ChromeContextMenuListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(ChromeContextMenuListener, nsIDOMEventListener) // diff --git a/embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp b/embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp index debeffca97b..7ad29823a2a 100644 --- a/embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp +++ b/embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp @@ -21,7 +21,7 @@ nsWebBrowserContentPolicy::~nsWebBrowserContentPolicy() MOZ_COUNT_DTOR(nsWebBrowserContentPolicy); } -NS_IMPL_ISUPPORTS1(nsWebBrowserContentPolicy, nsIContentPolicy) +NS_IMPL_ISUPPORTS(nsWebBrowserContentPolicy, nsIContentPolicy) NS_IMETHODIMP nsWebBrowserContentPolicy::ShouldLoad(uint32_t contentType, diff --git a/embedding/components/appstartup/src/nsAppStartupNotifier.cpp b/embedding/components/appstartup/src/nsAppStartupNotifier.cpp index ce64ab4e4cd..4ef38fb8d3c 100644 --- a/embedding/components/appstartup/src/nsAppStartupNotifier.cpp +++ b/embedding/components/appstartup/src/nsAppStartupNotifier.cpp @@ -13,7 +13,7 @@ #include "nsAppStartupNotifier.h" #include "nsISimpleEnumerator.h" -NS_IMPL_ISUPPORTS1(nsAppStartupNotifier, nsIObserver) +NS_IMPL_ISUPPORTS(nsAppStartupNotifier, nsIObserver) nsAppStartupNotifier::nsAppStartupNotifier() { diff --git a/embedding/components/commandhandler/src/nsCommandGroup.cpp b/embedding/components/commandhandler/src/nsCommandGroup.cpp index 8d5281fcbf9..37a2c4778f1 100644 --- a/embedding/components/commandhandler/src/nsCommandGroup.cpp +++ b/embedding/components/commandhandler/src/nsCommandGroup.cpp @@ -41,7 +41,7 @@ protected: }; /* Implementation file */ -NS_IMPL_ISUPPORTS1(nsGroupsEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsGroupsEnumerator, nsISimpleEnumerator) nsGroupsEnumerator::nsGroupsEnumerator(nsHashtable& inHashTable) : mHashTable(inHashTable) @@ -159,7 +159,7 @@ nsNamedGroupEnumerator::~nsNamedGroupEnumerator() { } -NS_IMPL_ISUPPORTS1(nsNamedGroupEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsNamedGroupEnumerator, nsISimpleEnumerator) /* boolean hasMoreElements (); */ NS_IMETHODIMP @@ -202,7 +202,7 @@ nsNamedGroupEnumerator::GetNext(nsISupports **_retval) /* Implementation file */ -NS_IMPL_ISUPPORTS1(nsControllerCommandGroup, nsIControllerCommandGroup) +NS_IMPL_ISUPPORTS(nsControllerCommandGroup, nsIControllerCommandGroup) nsControllerCommandGroup::nsControllerCommandGroup() { diff --git a/embedding/components/commandhandler/src/nsCommandParams.cpp b/embedding/components/commandhandler/src/nsCommandParams.cpp index 00d5543e760..c885ef539db 100644 --- a/embedding/components/commandhandler/src/nsCommandParams.cpp +++ b/embedding/components/commandhandler/src/nsCommandParams.cpp @@ -25,7 +25,7 @@ const PLDHashTableOps nsCommandParams::sHashOps = }; -NS_IMPL_ISUPPORTS1(nsCommandParams, nsICommandParams) +NS_IMPL_ISUPPORTS(nsCommandParams, nsICommandParams) nsCommandParams::nsCommandParams() : mCurEntry(0) diff --git a/embedding/components/commandhandler/src/nsControllerCommandTable.cpp b/embedding/components/commandhandler/src/nsControllerCommandTable.cpp index dc3ff0859fe..34e5095c4b8 100644 --- a/embedding/components/commandhandler/src/nsControllerCommandTable.cpp +++ b/embedding/components/commandhandler/src/nsControllerCommandTable.cpp @@ -27,7 +27,7 @@ nsControllerCommandTable::~nsControllerCommandTable() { } -NS_IMPL_ISUPPORTS2(nsControllerCommandTable, nsIControllerCommandTable, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsControllerCommandTable, nsIControllerCommandTable, nsISupportsWeakReference) NS_IMETHODIMP nsControllerCommandTable::MakeImmutable(void) diff --git a/embedding/components/find/src/nsWebBrowserFind.cpp b/embedding/components/find/src/nsWebBrowserFind.cpp index ee8392d1af8..2fb01808b9a 100644 --- a/embedding/components/find/src/nsWebBrowserFind.cpp +++ b/embedding/components/find/src/nsWebBrowserFind.cpp @@ -63,7 +63,7 @@ nsWebBrowserFind::~nsWebBrowserFind() { } -NS_IMPL_ISUPPORTS2(nsWebBrowserFind, nsIWebBrowserFind, nsIWebBrowserFindInFrames) +NS_IMPL_ISUPPORTS(nsWebBrowserFind, nsIWebBrowserFind, nsIWebBrowserFindInFrames) /* boolean findNext (); */ diff --git a/embedding/components/printingui/src/mac/nsPrintProgressParams.cpp b/embedding/components/printingui/src/mac/nsPrintProgressParams.cpp index 939af3455d8..a2ffb1184ba 100644 --- a/embedding/components/printingui/src/mac/nsPrintProgressParams.cpp +++ b/embedding/components/printingui/src/mac/nsPrintProgressParams.cpp @@ -7,7 +7,7 @@ #include "nsReadableUtils.h" -NS_IMPL_ISUPPORTS1(nsPrintProgressParams, nsIPrintProgressParams) +NS_IMPL_ISUPPORTS(nsPrintProgressParams, nsIPrintProgressParams) nsPrintProgressParams::nsPrintProgressParams() { diff --git a/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.mm b/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.mm index 966dda08042..cb4261a3567 100644 --- a/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.mm +++ b/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.mm @@ -17,7 +17,7 @@ // nsPrintingPromptService //***************************************************************************** -NS_IMPL_ISUPPORTS2(nsPrintingPromptService, nsIPrintingPromptService, nsIWebProgressListener) +NS_IMPL_ISUPPORTS(nsPrintingPromptService, nsIPrintingPromptService, nsIWebProgressListener) nsPrintingPromptService::nsPrintingPromptService() { diff --git a/embedding/components/printingui/src/unixshared/nsPrintProgressParams.cpp b/embedding/components/printingui/src/unixshared/nsPrintProgressParams.cpp index 939af3455d8..a2ffb1184ba 100644 --- a/embedding/components/printingui/src/unixshared/nsPrintProgressParams.cpp +++ b/embedding/components/printingui/src/unixshared/nsPrintProgressParams.cpp @@ -7,7 +7,7 @@ #include "nsReadableUtils.h" -NS_IMPL_ISUPPORTS1(nsPrintProgressParams, nsIPrintProgressParams) +NS_IMPL_ISUPPORTS(nsPrintProgressParams, nsIPrintProgressParams) nsPrintProgressParams::nsPrintProgressParams() { diff --git a/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp b/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp index b36a477416e..48f8f7d23d6 100644 --- a/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp +++ b/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp @@ -53,7 +53,7 @@ private: ***************** nsPrintingPromptService ********************** ****************************************************************/ -NS_IMPL_ISUPPORTS2(nsPrintingPromptService, nsIPrintingPromptService, nsIWebProgressListener) +NS_IMPL_ISUPPORTS(nsPrintingPromptService, nsIPrintingPromptService, nsIWebProgressListener) nsPrintingPromptService::nsPrintingPromptService() { diff --git a/embedding/components/printingui/src/win/nsPrintProgressParams.cpp b/embedding/components/printingui/src/win/nsPrintProgressParams.cpp index 939af3455d8..a2ffb1184ba 100644 --- a/embedding/components/printingui/src/win/nsPrintProgressParams.cpp +++ b/embedding/components/printingui/src/win/nsPrintProgressParams.cpp @@ -7,7 +7,7 @@ #include "nsReadableUtils.h" -NS_IMPL_ISUPPORTS1(nsPrintProgressParams, nsIPrintProgressParams) +NS_IMPL_ISUPPORTS(nsPrintProgressParams, nsIPrintProgressParams) nsPrintProgressParams::nsPrintProgressParams() { diff --git a/embedding/components/printingui/src/win/nsPrintingPromptService.cpp b/embedding/components/printingui/src/win/nsPrintingPromptService.cpp index fc0a24b01b9..302536f655e 100644 --- a/embedding/components/printingui/src/win/nsPrintingPromptService.cpp +++ b/embedding/components/printingui/src/win/nsPrintingPromptService.cpp @@ -68,7 +68,7 @@ private: //***************************************************************************** -NS_IMPL_ISUPPORTS2(nsPrintingPromptService, nsIPrintingPromptService, nsIWebProgressListener) +NS_IMPL_ISUPPORTS(nsPrintingPromptService, nsIPrintingPromptService, nsIWebProgressListener) nsPrintingPromptService::nsPrintingPromptService() { diff --git a/embedding/components/windowwatcher/src/nsDialogParamBlock.cpp b/embedding/components/windowwatcher/src/nsDialogParamBlock.cpp index df92a8fe71f..1df20131210 100644 --- a/embedding/components/windowwatcher/src/nsDialogParamBlock.cpp +++ b/embedding/components/windowwatcher/src/nsDialogParamBlock.cpp @@ -7,7 +7,7 @@ #include "nsString.h" #include "nsReadableUtils.h" -NS_IMPL_ISUPPORTS1(nsDialogParamBlock, nsIDialogParamBlock) +NS_IMPL_ISUPPORTS(nsDialogParamBlock, nsIDialogParamBlock) nsDialogParamBlock::nsDialogParamBlock() : mNumStrings(0), mString(nullptr) { diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp index bdb0ebe951c..0868150e530 100644 --- a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp +++ b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp @@ -161,7 +161,7 @@ private: NS_IMPL_ADDREF(nsWatcherWindowEnumerator) NS_IMPL_RELEASE(nsWatcherWindowEnumerator) -NS_IMPL_QUERY_INTERFACE1(nsWatcherWindowEnumerator, nsISimpleEnumerator) +NS_IMPL_QUERY_INTERFACE(nsWatcherWindowEnumerator, nsISimpleEnumerator) nsWatcherWindowEnumerator::nsWatcherWindowEnumerator(nsWindowWatcher *inWatcher) : mWindowWatcher(inWatcher), @@ -240,10 +240,10 @@ void nsWatcherWindowEnumerator::WindowRemoved(nsWatcherWindowEntry *inInfo) { NS_IMPL_ADDREF(nsWindowWatcher) NS_IMPL_RELEASE(nsWindowWatcher) -NS_IMPL_QUERY_INTERFACE3(nsWindowWatcher, - nsIWindowWatcher, - nsIPromptFactory, - nsPIWindowWatcher) +NS_IMPL_QUERY_INTERFACE(nsWindowWatcher, + nsIWindowWatcher, + nsIPromptFactory, + nsPIWindowWatcher) nsWindowWatcher::nsWindowWatcher() : mEnumeratorList(), diff --git a/embedding/tests/winEmbed/WindowCreator.cpp b/embedding/tests/winEmbed/WindowCreator.cpp index 0654b394364..a7ac6bf87e7 100644 --- a/embedding/tests/winEmbed/WindowCreator.cpp +++ b/embedding/tests/winEmbed/WindowCreator.cpp @@ -40,7 +40,7 @@ WindowCreator::~WindowCreator() { } -NS_IMPL_ISUPPORTS1(WindowCreator, nsIWindowCreator) +NS_IMPL_ISUPPORTS(WindowCreator, nsIWindowCreator) NS_IMETHODIMP WindowCreator::CreateChromeWindow(nsIWebBrowserChrome *parent, diff --git a/extensions/auth/nsAuthGSSAPI.cpp b/extensions/auth/nsAuthGSSAPI.cpp index d929243ce66..29c554880d6 100644 --- a/extensions/auth/nsAuthGSSAPI.cpp +++ b/extensions/auth/nsAuthGSSAPI.cpp @@ -358,7 +358,7 @@ nsAuthGSSAPI::Shutdown() } /* Limitations apply to this class's thread safety. See the header file */ -NS_IMPL_ISUPPORTS1(nsAuthGSSAPI, nsIAuthModule) +NS_IMPL_ISUPPORTS(nsAuthGSSAPI, nsIAuthModule) NS_IMETHODIMP nsAuthGSSAPI::Init(const char *serviceName, diff --git a/extensions/auth/nsAuthSASL.cpp b/extensions/auth/nsAuthSASL.cpp index 6782d4fc560..75830d365f6 100644 --- a/extensions/auth/nsAuthSASL.cpp +++ b/extensions/auth/nsAuthSASL.cpp @@ -23,7 +23,7 @@ void nsAuthSASL::Reset() } /* Limitations apply to this class's thread safety. See the header file */ -NS_IMPL_ISUPPORTS1(nsAuthSASL, nsIAuthModule) +NS_IMPL_ISUPPORTS(nsAuthSASL, nsIAuthModule) NS_IMETHODIMP nsAuthSASL::Init(const char *serviceName, diff --git a/extensions/auth/nsAuthSSPI.cpp b/extensions/auth/nsAuthSSPI.cpp index 55d7fe826bd..27b68155893 100644 --- a/extensions/auth/nsAuthSSPI.cpp +++ b/extensions/auth/nsAuthSSPI.cpp @@ -178,7 +178,7 @@ nsAuthSSPI::Reset() } } -NS_IMPL_ISUPPORTS1(nsAuthSSPI, nsIAuthModule) +NS_IMPL_ISUPPORTS(nsAuthSSPI, nsIAuthModule) NS_IMETHODIMP nsAuthSSPI::Init(const char *serviceName, diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp index ecb1778151d..db17304906c 100644 --- a/extensions/auth/nsAuthSambaNTLM.cpp +++ b/extensions/auth/nsAuthSambaNTLM.cpp @@ -44,7 +44,7 @@ nsAuthSambaNTLM::Shutdown() } } -NS_IMPL_ISUPPORTS1(nsAuthSambaNTLM, nsIAuthModule) +NS_IMPL_ISUPPORTS(nsAuthSambaNTLM, nsIAuthModule) static bool SpawnIOChild(char* const* aArgs, PRProcess** aPID, diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp b/extensions/auth/nsHttpNegotiateAuth.cpp index ae5124b8443..dab22b93f54 100644 --- a/extensions/auth/nsHttpNegotiateAuth.cpp +++ b/extensions/auth/nsHttpNegotiateAuth.cpp @@ -170,7 +170,7 @@ nsHttpNegotiateAuth::ChallengeReceived(nsIHttpAuthenticableChannel *authChannel, return NS_OK; } -NS_IMPL_ISUPPORTS1(nsHttpNegotiateAuth, nsIHttpAuthenticator) +NS_IMPL_ISUPPORTS(nsHttpNegotiateAuth, nsIHttpAuthenticator) // // GenerateCredentials diff --git a/extensions/cookie/nsCookiePermission.cpp b/extensions/cookie/nsCookiePermission.cpp index fbfbce91294..b7dd54bfd59 100644 --- a/extensions/cookie/nsCookiePermission.cpp +++ b/extensions/cookie/nsCookiePermission.cpp @@ -52,9 +52,9 @@ static const char kCookiesAskPermission[] = "network.cookie.warnAboutCookies"; static const char kPermissionType[] = "cookie"; -NS_IMPL_ISUPPORTS2(nsCookiePermission, - nsICookiePermission, - nsIObserver) +NS_IMPL_ISUPPORTS(nsCookiePermission, + nsICookiePermission, + nsIObserver) bool nsCookiePermission::Init() diff --git a/extensions/cookie/nsCookiePromptService.cpp b/extensions/cookie/nsCookiePromptService.cpp index b2e325dee08..32c875d56b7 100644 --- a/extensions/cookie/nsCookiePromptService.cpp +++ b/extensions/cookie/nsCookiePromptService.cpp @@ -18,7 +18,7 @@ ************************ nsCookiePromptService ***************** ****************************************************************/ -NS_IMPL_ISUPPORTS1(nsCookiePromptService, nsICookiePromptService) +NS_IMPL_ISUPPORTS(nsCookiePromptService, nsICookiePromptService) nsCookiePromptService::nsCookiePromptService() { } diff --git a/extensions/cookie/nsPermission.cpp b/extensions/cookie/nsPermission.cpp index 06d22fea873..bdd3abad0e5 100644 --- a/extensions/cookie/nsPermission.cpp +++ b/extensions/cookie/nsPermission.cpp @@ -9,7 +9,7 @@ // nsPermission Implementation NS_IMPL_CLASSINFO(nsPermission, nullptr, 0, {0}) -NS_IMPL_ISUPPORTS1_CI(nsPermission, nsIPermission) +NS_IMPL_ISUPPORTS_CI(nsPermission, nsIPermission) nsPermission::nsPermission(const nsACString &aHost, uint32_t aAppId, diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp index c626292b74d..4157725d392 100644 --- a/extensions/cookie/nsPermissionManager.cpp +++ b/extensions/cookie/nsPermissionManager.cpp @@ -212,7 +212,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(AppClearDataObserver, nsIObserver) +NS_IMPL_ISUPPORTS(AppClearDataObserver, nsIObserver) static bool IsExpandedPrincipal(nsIPrincipal* aPrincipal) @@ -260,7 +260,7 @@ protected: bool mRebuildOnSuccess; }; -NS_IMPL_ISUPPORTS1(CloseDatabaseListener, mozIStorageCompletionCallback) +NS_IMPL_ISUPPORTS(CloseDatabaseListener, mozIStorageCompletionCallback) CloseDatabaseListener::CloseDatabaseListener(nsPermissionManager* aManager, bool aRebuildOnSuccess) @@ -306,7 +306,7 @@ protected: nsRefPtr mManager; }; -NS_IMPL_ISUPPORTS1(DeleteFromMozHostListener, mozIStorageStatementCallback) +NS_IMPL_ISUPPORTS(DeleteFromMozHostListener, mozIStorageStatementCallback) DeleteFromMozHostListener:: DeleteFromMozHostListener(nsPermissionManager* aManager) @@ -354,7 +354,7 @@ static const char kHostpermFileName[] = "hostperm.1"; static const char kPermissionChangeNotification[] = PERM_CHANGE_NOTIFICATION; -NS_IMPL_ISUPPORTS3(nsPermissionManager, nsIPermissionManager, nsIObserver, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsPermissionManager, nsIPermissionManager, nsIObserver, nsISupportsWeakReference) nsPermissionManager::nsPermissionManager() : mLargestID(0) diff --git a/extensions/cookie/nsPopupWindowManager.cpp b/extensions/cookie/nsPopupWindowManager.cpp index e6b05470619..52e51c8a09e 100644 --- a/extensions/cookie/nsPopupWindowManager.cpp +++ b/extensions/cookie/nsPopupWindowManager.cpp @@ -31,10 +31,10 @@ nsPopupWindowManager::~nsPopupWindowManager() { } -NS_IMPL_ISUPPORTS3(nsPopupWindowManager, - nsIPopupWindowManager, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsPopupWindowManager, + nsIPopupWindowManager, + nsIObserver, + nsISupportsWeakReference) nsresult nsPopupWindowManager::Init() diff --git a/extensions/gio/nsGIOProtocolHandler.cpp b/extensions/gio/nsGIOProtocolHandler.cpp index 2d9820b2510..2972e642013 100644 --- a/extensions/gio/nsGIOProtocolHandler.cpp +++ b/extensions/gio/nsGIOProtocolHandler.cpp @@ -580,7 +580,7 @@ nsGIOInputStream::SetContentTypeOfChannel(const char *contentType) return rv; } -NS_IMPL_ISUPPORTS1(nsGIOInputStream, nsIInputStream) +NS_IMPL_ISUPPORTS(nsGIOInputStream, nsIInputStream) /** * Free all used memory and close stream. @@ -898,7 +898,7 @@ class nsGIOProtocolHandler MOZ_FINAL : public nsIProtocolHandler nsCString mSupportedProtocols; }; -NS_IMPL_ISUPPORTS2(nsGIOProtocolHandler, nsIProtocolHandler, nsIObserver) +NS_IMPL_ISUPPORTS(nsGIOProtocolHandler, nsIProtocolHandler, nsIObserver) nsresult nsGIOProtocolHandler::Init() diff --git a/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp b/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp index 941a0715ed1..beab6d13d86 100644 --- a/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp +++ b/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp @@ -631,7 +631,7 @@ nsGnomeVFSInputStream::SetContentTypeOfChannel(const char *contentType) return rv; } -NS_IMPL_ISUPPORTS1(nsGnomeVFSInputStream, nsIInputStream) +NS_IMPL_ISUPPORTS(nsGnomeVFSInputStream, nsIInputStream) NS_IMETHODIMP nsGnomeVFSInputStream::Close() @@ -755,7 +755,7 @@ class nsGnomeVFSProtocolHandler MOZ_FINAL : public nsIProtocolHandler nsCString mSupportedProtocols; }; -NS_IMPL_ISUPPORTS2(nsGnomeVFSProtocolHandler, nsIProtocolHandler, nsIObserver) +NS_IMPL_ISUPPORTS(nsGnomeVFSProtocolHandler, nsIProtocolHandler, nsIObserver) nsresult nsGnomeVFSProtocolHandler::Init() diff --git a/extensions/permissions/nsContentBlocker.cpp b/extensions/permissions/nsContentBlocker.cpp index 1ecf4c4ee3b..8e447783991 100644 --- a/extensions/permissions/nsContentBlocker.cpp +++ b/extensions/permissions/nsContentBlocker.cpp @@ -44,10 +44,10 @@ static const char *kTypeString[] = {"other", #define NUMBER_OF_TYPES MOZ_ARRAY_LENGTH(kTypeString) uint8_t nsContentBlocker::mBehaviorPref[NUMBER_OF_TYPES]; -NS_IMPL_ISUPPORTS3(nsContentBlocker, - nsIContentPolicy, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsContentBlocker, + nsIContentPolicy, + nsIObserver, + nsISupportsWeakReference) nsContentBlocker::nsContentBlocker() { diff --git a/extensions/pref/autoconfig/src/nsAutoConfig.cpp b/extensions/pref/autoconfig/src/nsAutoConfig.cpp index 7b6d44b27c9..36203ab9fd8 100644 --- a/extensions/pref/autoconfig/src/nsAutoConfig.cpp +++ b/extensions/pref/autoconfig/src/nsAutoConfig.cpp @@ -33,7 +33,7 @@ extern nsresult EvaluateAdminConfigScript(const char *js_buffer, size_t length, // nsISupports Implementation -NS_IMPL_ISUPPORTS6(nsAutoConfig, nsIAutoConfig, nsITimerCallback, nsIStreamListener, nsIObserver, nsIRequestObserver, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsAutoConfig, nsIAutoConfig, nsITimerCallback, nsIStreamListener, nsIObserver, nsIRequestObserver, nsISupportsWeakReference) nsAutoConfig::nsAutoConfig() { diff --git a/extensions/pref/autoconfig/src/nsReadConfig.cpp b/extensions/pref/autoconfig/src/nsReadConfig.cpp index 3d83f42a74b..5a54e8a78ba 100644 --- a/extensions/pref/autoconfig/src/nsReadConfig.cpp +++ b/extensions/pref/autoconfig/src/nsReadConfig.cpp @@ -73,7 +73,7 @@ static void DisplayError(void) // nsISupports Implementation -NS_IMPL_ISUPPORTS2(nsReadConfig, nsIReadConfig, nsIObserver) +NS_IMPL_ISUPPORTS(nsReadConfig, nsIReadConfig, nsIObserver) nsReadConfig::nsReadConfig() : mRead(false) diff --git a/extensions/spellcheck/hunspell/src/mozHunspellDirProvider.cpp b/extensions/spellcheck/hunspell/src/mozHunspellDirProvider.cpp index 3472a74e4f2..028274152ac 100644 --- a/extensions/spellcheck/hunspell/src/mozHunspellDirProvider.cpp +++ b/extensions/spellcheck/hunspell/src/mozHunspellDirProvider.cpp @@ -40,7 +40,7 @@ #include "mozISpellCheckingEngine.h" #include "nsICategoryManager.h" -NS_IMPL_ISUPPORTS2(mozHunspellDirProvider, +NS_IMPL_ISUPPORTS(mozHunspellDirProvider, nsIDirectoryServiceProvider, nsIDirectoryServiceProvider2) @@ -80,7 +80,7 @@ mozHunspellDirProvider::GetFiles(const char *aKey, return NS_SUCCESS_AGGREGATE_RESULT; } -NS_IMPL_ISUPPORTS1(mozHunspellDirProvider::AppendingEnumerator, +NS_IMPL_ISUPPORTS(mozHunspellDirProvider::AppendingEnumerator, nsISimpleEnumerator) NS_IMETHODIMP diff --git a/extensions/spellcheck/src/mozGenericWordUtils.cpp b/extensions/spellcheck/src/mozGenericWordUtils.cpp index 25dd3874975..e83d0906c73 100644 --- a/extensions/spellcheck/src/mozGenericWordUtils.cpp +++ b/extensions/spellcheck/src/mozGenericWordUtils.cpp @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "mozGenericWordUtils.h" -NS_IMPL_ISUPPORTS1(mozGenericWordUtils, mozISpellI18NUtil) +NS_IMPL_ISUPPORTS(mozGenericWordUtils, mozISpellI18NUtil) // do something sensible but generic ... eventually. For now whine. diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/extensions/spellcheck/src/mozInlineSpellChecker.cpp index ea06fc85624..78c17155b6d 100644 --- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp +++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp @@ -508,7 +508,7 @@ public: private: nsRefPtr mSpellChecker; }; -NS_IMPL_ISUPPORTS1(InitEditorSpellCheckCallback, nsIEditorSpellCheckCallback) +NS_IMPL_ISUPPORTS(InitEditorSpellCheckCallback, nsIEditorSpellCheckCallback) NS_INTERFACE_MAP_BEGIN(mozInlineSpellChecker) @@ -2004,7 +2004,7 @@ private: nsRefPtr mSpellChecker; uint32_t mDisabledAsyncToken; }; -NS_IMPL_ISUPPORTS1(UpdateCurrentDictionaryCallback, nsIEditorSpellCheckCallback) +NS_IMPL_ISUPPORTS(UpdateCurrentDictionaryCallback, nsIEditorSpellCheckCallback) NS_IMETHODIMP mozInlineSpellChecker::UpdateCurrentDictionary() { diff --git a/extensions/spellcheck/src/mozSpellI18NManager.cpp b/extensions/spellcheck/src/mozSpellI18NManager.cpp index 419276682c6..7e4b94bde9e 100644 --- a/extensions/spellcheck/src/mozSpellI18NManager.cpp +++ b/extensions/spellcheck/src/mozSpellI18NManager.cpp @@ -8,7 +8,7 @@ #include "mozGenericWordUtils.h" #include "nsString.h" -NS_IMPL_ISUPPORTS1(mozSpellI18NManager, mozISpellI18NManager) +NS_IMPL_ISUPPORTS(mozSpellI18NManager, mozISpellI18NManager) mozSpellI18NManager::mozSpellI18NManager() { diff --git a/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp b/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp index 7b58be41dba..f8099e1bee1 100644 --- a/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp +++ b/extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp @@ -29,7 +29,7 @@ nsXPCOMDetector::~nsXPCOMDetector() } //--------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsXPCOMDetector, nsICharsetDetector) +NS_IMPL_ISUPPORTS(nsXPCOMDetector, nsICharsetDetector) //--------------------------------------------------------------------- NS_IMETHODIMP nsXPCOMDetector::Init( @@ -104,7 +104,7 @@ nsXPCOMStringDetector::~nsXPCOMStringDetector() { } //--------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsXPCOMStringDetector, nsIStringCharsetDetector) +NS_IMPL_ISUPPORTS(nsXPCOMStringDetector, nsIStringCharsetDetector) //--------------------------------------------------------------------- void nsXPCOMStringDetector::Report(const char *aCharset) { diff --git a/gfx/gl/GfxTexturesReporter.cpp b/gfx/gl/GfxTexturesReporter.cpp index 32561a6faad..3f377f8cab3 100644 --- a/gfx/gl/GfxTexturesReporter.cpp +++ b/gfx/gl/GfxTexturesReporter.cpp @@ -10,7 +10,7 @@ using namespace mozilla; using namespace mozilla::gl; -NS_IMPL_ISUPPORTS1(GfxTexturesReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(GfxTexturesReporter, nsIMemoryReporter) int64_t GfxTexturesReporter::sAmount = 0; diff --git a/gfx/layers/LayerScope.cpp b/gfx/layers/LayerScope.cpp index b70d025498f..29e8b8561fa 100644 --- a/gfx/layers/LayerScope.cpp +++ b/gfx/layers/LayerScope.cpp @@ -269,7 +269,7 @@ private: SocketStateType mState; }; -NS_IMPL_ISUPPORTS1(LayerScopeWebSocketHandler, nsIInputStreamCallback); +NS_IMPL_ISUPPORTS(LayerScopeWebSocketHandler, nsIInputStreamCallback); class LayerScopeWebSocketManager { public: @@ -575,7 +575,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(DebugListener, nsIServerSocketListener); +NS_IMPL_ISUPPORTS(DebugListener, nsIServerSocketListener); class DebugDataSender : public nsIRunnable @@ -635,7 +635,7 @@ protected: LinkedList *mList; }; -NS_IMPL_ISUPPORTS1(DebugDataSender, nsIRunnable); +NS_IMPL_ISUPPORTS(DebugDataSender, nsIRunnable); void LayerScope::CreateServerSocket() diff --git a/gfx/layers/d3d10/ReadbackManagerD3D10.cpp b/gfx/layers/d3d10/ReadbackManagerD3D10.cpp index dfeb8fc9d4e..01c574afdf8 100644 --- a/gfx/layers/d3d10/ReadbackManagerD3D10.cpp +++ b/gfx/layers/d3d10/ReadbackManagerD3D10.cpp @@ -96,7 +96,7 @@ private: nsAutoPtr mTask; }; -NS_IMPL_ISUPPORTS1(ReadbackResultWriter, nsIRunnable) +NS_IMPL_ISUPPORTS(ReadbackResultWriter, nsIRunnable) DWORD WINAPI StartTaskThread(void *aManager) { diff --git a/gfx/layers/ipc/ISurfaceAllocator.cpp b/gfx/layers/ipc/ISurfaceAllocator.cpp index 399c670d608..bf72bf28996 100644 --- a/gfx/layers/ipc/ISurfaceAllocator.cpp +++ b/gfx/layers/ipc/ISurfaceAllocator.cpp @@ -30,7 +30,7 @@ using namespace mozilla::ipc; namespace mozilla { namespace layers { -NS_IMPL_ISUPPORTS1(GfxMemoryImageReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(GfxMemoryImageReporter, nsIMemoryReporter) mozilla::Atomic GfxMemoryImageReporter::sAmount(0); diff --git a/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp b/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp index b532112bb13..dc83cb2907e 100644 --- a/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp +++ b/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp @@ -247,7 +247,7 @@ private: static int64_t sAmount; }; -NS_IMPL_ISUPPORTS1(GrallocReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(GrallocReporter, nsIMemoryReporter) int64_t GrallocReporter::sAmount = 0; diff --git a/gfx/src/gfxCrashReporterUtils.cpp b/gfx/src/gfxCrashReporterUtils.cpp index 197d5fb6fbb..ee7de5e9a36 100644 --- a/gfx/src/gfxCrashReporterUtils.cpp +++ b/gfx/src/gfxCrashReporterUtils.cpp @@ -45,8 +45,8 @@ public: virtual ~ObserverToDestroyFeaturesAlreadyReported() {} }; -NS_IMPL_ISUPPORTS1(ObserverToDestroyFeaturesAlreadyReported, - nsIObserver) +NS_IMPL_ISUPPORTS(ObserverToDestroyFeaturesAlreadyReported, + nsIObserver) NS_IMETHODIMP ObserverToDestroyFeaturesAlreadyReported::Observe(nsISupports* aSubject, diff --git a/gfx/src/nsDeviceContext.cpp b/gfx/src/nsDeviceContext.cpp index bf0ca9dc757..1c6c0cc0bdb 100644 --- a/gfx/src/nsDeviceContext.cpp +++ b/gfx/src/nsDeviceContext.cpp @@ -77,7 +77,7 @@ protected: nsTArray mFontMetrics; }; -NS_IMPL_ISUPPORTS1(nsFontCache, nsIObserver) +NS_IMPL_ISUPPORTS(nsFontCache, nsIObserver) // The Init and Destroy methods are necessary because it's not // safe to call AddObserver from a constructor or RemoveObserver diff --git a/gfx/src/nsScriptableRegion.cpp b/gfx/src/nsScriptableRegion.cpp index 76d04c39171..6b66d58729d 100644 --- a/gfx/src/nsScriptableRegion.cpp +++ b/gfx/src/nsScriptableRegion.cpp @@ -23,7 +23,7 @@ nsScriptableRegion::nsScriptableRegion() { } -NS_IMPL_ISUPPORTS1(nsScriptableRegion, nsIScriptableRegion) +NS_IMPL_ISUPPORTS(nsScriptableRegion, nsIScriptableRegion) NS_IMETHODIMP nsScriptableRegion::Init() { diff --git a/gfx/src/nsThebesFontEnumerator.cpp b/gfx/src/nsThebesFontEnumerator.cpp index 80c7e27a9dd..12739c280e6 100644 --- a/gfx/src/nsThebesFontEnumerator.cpp +++ b/gfx/src/nsThebesFontEnumerator.cpp @@ -17,7 +17,7 @@ #include "nsTArray.h" // for nsTArray, nsTArray_Impl, etc #include "nscore.h" // for char16_t, NS_IMETHODIMP -NS_IMPL_ISUPPORTS1(nsThebesFontEnumerator, nsIFontEnumerator) +NS_IMPL_ISUPPORTS(nsThebesFontEnumerator, nsIFontEnumerator) nsThebesFontEnumerator::nsThebesFontEnumerator() { diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp index 33a5181eade..e75da697af8 100644 --- a/gfx/thebes/gfxASurface.cpp +++ b/gfx/thebes/gfxASurface.cpp @@ -656,7 +656,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(SurfaceMemoryReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(SurfaceMemoryReporter, nsIMemoryReporter) void gfxASurface::RecordMemoryUsedForSurfaceType(gfxSurfaceType aType, diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp index 61a43f30ab6..8f518c00f47 100644 --- a/gfx/thebes/gfxAndroidPlatform.cpp +++ b/gfx/thebes/gfxAndroidPlatform.cpp @@ -71,7 +71,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(FreetypeReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(FreetypeReporter, nsIMemoryReporter) template<> Atomic CountingAllocatorBase::sAmount(0); diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp index 8ab79e81569..0f86e852805 100644 --- a/gfx/thebes/gfxFont.cpp +++ b/gfx/thebes/gfxFont.cpp @@ -1572,7 +1572,7 @@ gfxFontFamily::AddSizeOfIncludingThis(MallocSizeOf aMallocSizeOf, MOZ_DEFINE_MALLOC_SIZE_OF(FontCacheMallocSizeOf) -NS_IMPL_ISUPPORTS1(gfxFontCache::MemoryReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(gfxFontCache::MemoryReporter, nsIMemoryReporter) NS_IMETHODIMP gfxFontCache::MemoryReporter::CollectReports @@ -1599,7 +1599,7 @@ gfxFontCache::MemoryReporter::CollectReports return NS_OK; } -NS_IMPL_ISUPPORTS1(gfxFontCache::Observer, nsIObserver) +NS_IMPL_ISUPPORTS(gfxFontCache::Observer, nsIObserver) NS_IMETHODIMP gfxFontCache::Observer::Observe(nsISupports *aSubject, diff --git a/gfx/thebes/gfxFontInfoLoader.cpp b/gfx/thebes/gfxFontInfoLoader.cpp index d27283f2630..61e4e55370f 100644 --- a/gfx/thebes/gfxFontInfoLoader.cpp +++ b/gfx/thebes/gfxFontInfoLoader.cpp @@ -68,7 +68,7 @@ FontInfoLoadCompleteEvent::Run() return NS_OK; } -NS_IMPL_ISUPPORTS1(FontInfoLoadCompleteEvent, nsIRunnable); +NS_IMPL_ISUPPORTS(FontInfoLoadCompleteEvent, nsIRunnable); // runs on separate thread nsresult @@ -84,9 +84,9 @@ AsyncFontInfoLoader::Run() return NS_OK; } -NS_IMPL_ISUPPORTS1(AsyncFontInfoLoader, nsIRunnable); +NS_IMPL_ISUPPORTS(AsyncFontInfoLoader, nsIRunnable); -NS_IMPL_ISUPPORTS1(gfxFontInfoLoader::ShutdownObserver, nsIObserver) +NS_IMPL_ISUPPORTS(gfxFontInfoLoader::ShutdownObserver, nsIObserver) NS_IMETHODIMP gfxFontInfoLoader::ShutdownObserver::Observe(nsISupports *aSubject, diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp index d74b21c7783..ec85ad298ea 100644 --- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -137,7 +137,7 @@ public: NS_DECL_NSIOBSERVER }; -NS_IMPL_ISUPPORTS2(SRGBOverrideObserver, nsIObserver, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(SRGBOverrideObserver, nsIObserver, nsISupportsWeakReference) #define GFX_DOWNLOADABLE_FONTS_ENABLED "gfx.downloadable_fonts.enabled" @@ -182,7 +182,7 @@ public: NS_DECL_NSIOBSERVER }; -NS_IMPL_ISUPPORTS1(FontPrefsObserver, nsIObserver) +NS_IMPL_ISUPPORTS(FontPrefsObserver, nsIObserver) NS_IMETHODIMP FontPrefsObserver::Observe(nsISupports *aSubject, @@ -206,7 +206,7 @@ public: NS_DECL_NSIOBSERVER }; -NS_IMPL_ISUPPORTS1(MemoryPressureObserver, nsIObserver) +NS_IMPL_ISUPPORTS(MemoryPressureObserver, nsIObserver) NS_IMETHODIMP MemoryPressureObserver::Observe(nsISupports *aSubject, diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp index 7098a7bfab3..6a93ea5e249 100644 --- a/gfx/thebes/gfxPlatformFontList.cpp +++ b/gfx/thebes/gfxPlatformFontList.cpp @@ -62,7 +62,7 @@ public: static gfxFontListPrefObserver* gFontListPrefObserver = nullptr; -NS_IMPL_ISUPPORTS1(gfxFontListPrefObserver, nsIObserver) +NS_IMPL_ISUPPORTS(gfxFontListPrefObserver, nsIObserver) NS_IMETHODIMP gfxFontListPrefObserver::Observe(nsISupports *aSubject, @@ -79,7 +79,7 @@ gfxFontListPrefObserver::Observe(nsISupports *aSubject, MOZ_DEFINE_MALLOC_SIZE_OF(FontListMallocSizeOf) -NS_IMPL_ISUPPORTS1(gfxPlatformFontList::MemoryReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(gfxPlatformFontList::MemoryReporter, nsIMemoryReporter) NS_IMETHODIMP gfxPlatformFontList::MemoryReporter::CollectReports diff --git a/gfx/thebes/gfxUserFontSet.cpp b/gfx/thebes/gfxUserFontSet.cpp index 7ad4c0c92a2..843418d002f 100644 --- a/gfx/thebes/gfxUserFontSet.cpp +++ b/gfx/thebes/gfxUserFontSet.cpp @@ -827,7 +827,7 @@ gfxUserFontSet::FindFamilyFor(gfxFontEntry* aFontEntry) const nsTHashtable* gfxUserFontSet::UserFontCache::sUserFonts = nullptr; -NS_IMPL_ISUPPORTS1(gfxUserFontSet::UserFontCache::Flusher, nsIObserver) +NS_IMPL_ISUPPORTS(gfxUserFontSet::UserFontCache::Flusher, nsIObserver) PLDHashOperator gfxUserFontSet::UserFontCache::Entry::RemoveIfPrivate(Entry* aEntry, diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp index 831d086d5e8..a935962fba2 100644 --- a/gfx/thebes/gfxWindowsPlatform.cpp +++ b/gfx/thebes/gfxWindowsPlatform.cpp @@ -109,7 +109,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(GfxD2DSurfaceReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(GfxD2DSurfaceReporter, nsIMemoryReporter) #endif @@ -139,7 +139,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(GfxD2DVramReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(GfxD2DVramReporter, nsIMemoryReporter) #define GFX_USE_CLEARTYPE_ALWAYS "gfx.font_rendering.cleartype.always_use_for_content" #define GFX_DOWNLOADABLE_FONTS_USE_CLEARTYPE "gfx.font_rendering.cleartype.use_for_downloadable_fonts" @@ -280,7 +280,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(GPUAdapterReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(GPUAdapterReporter, nsIMemoryReporter) static __inline void BuildKeyNameFromFontName(nsAString &aName) diff --git a/hal/HalWakeLock.cpp b/hal/HalWakeLock.cpp index 3cd73e26aae..b08a52f0899 100644 --- a/hal/HalWakeLock.cpp +++ b/hal/HalWakeLock.cpp @@ -102,7 +102,7 @@ public: NS_DECL_NSIOBSERVER }; -NS_IMPL_ISUPPORTS1(ClearHashtableOnShutdown, nsIObserver) +NS_IMPL_ISUPPORTS(ClearHashtableOnShutdown, nsIObserver) NS_IMETHODIMP ClearHashtableOnShutdown::Observe(nsISupports* aSubject, const char* aTopic, const char16_t* data) @@ -121,7 +121,7 @@ public: NS_DECL_NSIOBSERVER }; -NS_IMPL_ISUPPORTS1(CleanupOnContentShutdown, nsIObserver) +NS_IMPL_ISUPPORTS(CleanupOnContentShutdown, nsIObserver) NS_IMETHODIMP CleanupOnContentShutdown::Observe(nsISupports* aSubject, const char* aTopic, const char16_t* data) diff --git a/hal/cocoa/CocoaBattery.cpp b/hal/cocoa/CocoaBattery.cpp index cbca794957a..fae63468444 100644 --- a/hal/cocoa/CocoaBattery.cpp +++ b/hal/cocoa/CocoaBattery.cpp @@ -109,7 +109,7 @@ struct SingletonDestroyer MOZ_FINAL : public nsIObserver NS_DECL_NSIOBSERVER }; -NS_IMPL_ISUPPORTS1(SingletonDestroyer, nsIObserver) +NS_IMPL_ISUPPORTS(SingletonDestroyer, nsIObserver) NS_IMETHODIMP SingletonDestroyer::Observe(nsISupports*, const char* aTopic, const char16_t*) diff --git a/hal/gonk/GonkHal.cpp b/hal/gonk/GonkHal.cpp index ea56e8646d1..5bc56bc6621 100644 --- a/hal/gonk/GonkHal.cpp +++ b/hal/gonk/GonkHal.cpp @@ -155,7 +155,7 @@ private: static bool sShuttingDown; }; -NS_IMPL_ISUPPORTS2(VibratorRunnable, nsIRunnable, nsIObserver); +NS_IMPL_ISUPPORTS(VibratorRunnable, nsIRunnable, nsIObserver); bool VibratorRunnable::sShuttingDown = false; @@ -1091,7 +1091,7 @@ private: double mLastLineChecked; ScopedFreePtr mRegexes; }; -NS_IMPL_ISUPPORTS1(OomVictimLogger, nsIObserver); +NS_IMPL_ISUPPORTS(OomVictimLogger, nsIObserver); NS_IMETHODIMP OomVictimLogger::Observe( diff --git a/hal/windows/WindowsGamepad.cpp b/hal/windows/WindowsGamepad.cpp index a2849017a6c..1ff7d36f18b 100644 --- a/hal/windows/WindowsGamepad.cpp +++ b/hal/windows/WindowsGamepad.cpp @@ -179,7 +179,7 @@ private: bool mObserving; }; -NS_IMPL_ISUPPORTS1(Observer, nsIObserver); +NS_IMPL_ISUPPORTS(Observer, nsIObserver); class WindowsGamepadService { public: diff --git a/image/decoders/icon/android/nsIconChannel.cpp b/image/decoders/icon/android/nsIconChannel.cpp index ae307c63776..07445036664 100644 --- a/image/decoders/icon/android/nsIconChannel.cpp +++ b/image/decoders/icon/android/nsIconChannel.cpp @@ -13,9 +13,9 @@ #include "nsIStringStream.h" #include "nsNetUtil.h" -NS_IMPL_ISUPPORTS2(nsIconChannel, - nsIRequest, - nsIChannel) +NS_IMPL_ISUPPORTS(nsIconChannel, + nsIRequest, + nsIChannel) using namespace mozilla; using mozilla::dom::ContentChild; diff --git a/image/decoders/icon/gtk/nsIconChannel.cpp b/image/decoders/icon/gtk/nsIconChannel.cpp index 17908dfb08a..493c42c2cc5 100644 --- a/image/decoders/icon/gtk/nsIconChannel.cpp +++ b/image/decoders/icon/gtk/nsIconChannel.cpp @@ -38,9 +38,9 @@ extern "C" { #include "nsIconChannel.h" -NS_IMPL_ISUPPORTS2(nsIconChannel, - nsIRequest, - nsIChannel) +NS_IMPL_ISUPPORTS(nsIconChannel, + nsIRequest, + nsIChannel) #ifdef MOZ_ENABLE_GNOMEUI // These let us have a soft dependency on libgnomeui rather than a hard one. These are just basically the prototypes diff --git a/image/decoders/icon/mac/nsIconChannelCocoa.mm b/image/decoders/icon/mac/nsIconChannelCocoa.mm index 565d7f07357..abeec40db3e 100644 --- a/image/decoders/icon/mac/nsIconChannelCocoa.mm +++ b/image/decoders/icon/mac/nsIconChannelCocoa.mm @@ -33,9 +33,9 @@ nsIconChannel::nsIconChannel() nsIconChannel::~nsIconChannel() {} -NS_IMPL_ISUPPORTS4(nsIconChannel, - nsIChannel, - nsIRequest, +NS_IMPL_ISUPPORTS(nsIconChannel, + nsIChannel, + nsIRequest, nsIRequestObserver, nsIStreamListener) diff --git a/image/decoders/icon/nsIconProtocolHandler.cpp b/image/decoders/icon/nsIconProtocolHandler.cpp index 9eead79cacf..ebfa87224ef 100644 --- a/image/decoders/icon/nsIconProtocolHandler.cpp +++ b/image/decoders/icon/nsIconProtocolHandler.cpp @@ -23,7 +23,7 @@ nsIconProtocolHandler::nsIconProtocolHandler() nsIconProtocolHandler::~nsIconProtocolHandler() {} -NS_IMPL_ISUPPORTS2(nsIconProtocolHandler, nsIProtocolHandler, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsIconProtocolHandler, nsIProtocolHandler, nsISupportsWeakReference) //////////////////////////////////////////////////////////////////////////////// diff --git a/image/decoders/icon/nsIconURI.cpp b/image/decoders/icon/nsIconURI.cpp index 299e1cb23b4..34210af95a6 100644 --- a/image/decoders/icon/nsIconURI.cpp +++ b/image/decoders/icon/nsIconURI.cpp @@ -59,7 +59,7 @@ nsMozIconURI::~nsMozIconURI() { } -NS_IMPL_ISUPPORTS2(nsMozIconURI, nsIMozIconURI, nsIURI) +NS_IMPL_ISUPPORTS(nsMozIconURI, nsIMozIconURI, nsIURI) #define MOZICON_SCHEME "moz-icon:" #define MOZICON_SCHEME_LEN (sizeof(MOZICON_SCHEME) - 1) diff --git a/image/decoders/icon/qt/nsIconChannel.cpp b/image/decoders/icon/qt/nsIconChannel.cpp index c0815c87f30..46375a8b53e 100644 --- a/image/decoders/icon/qt/nsIconChannel.cpp +++ b/image/decoders/icon/qt/nsIconChannel.cpp @@ -21,9 +21,9 @@ #include "nsIconChannel.h" #include "nsGtkQtIconsConverter.h" -NS_IMPL_ISUPPORTS2(nsIconChannel, - nsIRequest, - nsIChannel) +NS_IMPL_ISUPPORTS(nsIconChannel, + nsIRequest, + nsIChannel) static nsresult moz_qicon_to_channel(QImage *image, nsIURI *aURI, diff --git a/image/decoders/icon/win/nsIconChannel.cpp b/image/decoders/icon/win/nsIconChannel.cpp index e1aade1a4cb..a2ae36df103 100644 --- a/image/decoders/icon/win/nsIconChannel.cpp +++ b/image/decoders/icon/win/nsIconChannel.cpp @@ -73,11 +73,11 @@ nsIconChannel::nsIconChannel() nsIconChannel::~nsIconChannel() {} -NS_IMPL_ISUPPORTS4(nsIconChannel, - nsIChannel, - nsIRequest, - nsIRequestObserver, - nsIStreamListener) +NS_IMPL_ISUPPORTS(nsIconChannel, + nsIChannel, + nsIRequest, + nsIRequestObserver, + nsIStreamListener) nsresult nsIconChannel::Init(nsIURI* uri) { diff --git a/image/encoders/bmp/nsBMPEncoder.cpp b/image/encoders/bmp/nsBMPEncoder.cpp index 6c3e92ce1ac..2c3536d314e 100644 --- a/image/encoders/bmp/nsBMPEncoder.cpp +++ b/image/encoders/bmp/nsBMPEncoder.cpp @@ -13,7 +13,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS3(nsBMPEncoder, imgIEncoder, nsIInputStream, nsIAsyncInputStream) +NS_IMPL_ISUPPORTS(nsBMPEncoder, imgIEncoder, nsIInputStream, nsIAsyncInputStream) nsBMPEncoder::nsBMPEncoder() : mImageBufferStart(nullptr), mImageBufferCurr(0), diff --git a/image/encoders/ico/nsICOEncoder.cpp b/image/encoders/ico/nsICOEncoder.cpp index 99d93de990d..da0056171af 100644 --- a/image/encoders/ico/nsICOEncoder.cpp +++ b/image/encoders/ico/nsICOEncoder.cpp @@ -15,7 +15,7 @@ using namespace mozilla; using namespace mozilla::image; -NS_IMPL_ISUPPORTS3(nsICOEncoder, imgIEncoder, nsIInputStream, nsIAsyncInputStream) +NS_IMPL_ISUPPORTS(nsICOEncoder, imgIEncoder, nsIInputStream, nsIAsyncInputStream) nsICOEncoder::nsICOEncoder() : mImageBufferStart(nullptr), mImageBufferCurr(0), diff --git a/image/encoders/jpeg/nsJPEGEncoder.cpp b/image/encoders/jpeg/nsJPEGEncoder.cpp index e2fe85688e1..89f32d75d54 100644 --- a/image/encoders/jpeg/nsJPEGEncoder.cpp +++ b/image/encoders/jpeg/nsJPEGEncoder.cpp @@ -14,7 +14,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS3(nsJPEGEncoder, imgIEncoder, nsIInputStream, nsIAsyncInputStream) +NS_IMPL_ISUPPORTS(nsJPEGEncoder, imgIEncoder, nsIInputStream, nsIAsyncInputStream) // used to pass error info through the JPEG library struct encoder_error_mgr { diff --git a/image/encoders/png/nsPNGEncoder.cpp b/image/encoders/png/nsPNGEncoder.cpp index f5df0c3abaf..100e8dacfda 100644 --- a/image/encoders/png/nsPNGEncoder.cpp +++ b/image/encoders/png/nsPNGEncoder.cpp @@ -11,7 +11,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS3(nsPNGEncoder, imgIEncoder, nsIInputStream, nsIAsyncInputStream) +NS_IMPL_ISUPPORTS(nsPNGEncoder, imgIEncoder, nsIInputStream, nsIAsyncInputStream) nsPNGEncoder::nsPNGEncoder() : mPNG(nullptr), mPNGinfo(nullptr), mIsAnimation(false), diff --git a/image/src/ClippedImage.cpp b/image/src/ClippedImage.cpp index 722e72c9f62..183d025948b 100644 --- a/image/src/ClippedImage.cpp +++ b/image/src/ClippedImage.cpp @@ -156,7 +156,7 @@ ClippedImage::ShouldClip() return mShouldClip.ref(); } -NS_IMPL_ISUPPORTS1(ClippedImage, imgIContainer) +NS_IMPL_ISUPPORTS(ClippedImage, imgIContainer) nsIntRect ClippedImage::FrameRect(uint32_t aWhichFrame) diff --git a/image/src/FrozenImage.cpp b/image/src/FrozenImage.cpp index 48bcf21f0be..9594749410b 100644 --- a/image/src/FrozenImage.cpp +++ b/image/src/FrozenImage.cpp @@ -10,7 +10,7 @@ using namespace mozilla::gfx; namespace mozilla { namespace image { -NS_IMPL_ISUPPORTS1(FrozenImage, imgIContainer) +NS_IMPL_ISUPPORTS(FrozenImage, imgIContainer) nsIntRect FrozenImage::FrameRect(uint32_t /* aWhichFrame - ignored */) diff --git a/image/src/ImageWrapper.cpp b/image/src/ImageWrapper.cpp index c1cabd78ad1..8e585bbb565 100644 --- a/image/src/ImageWrapper.cpp +++ b/image/src/ImageWrapper.cpp @@ -150,7 +150,7 @@ ImageWrapper::GetURI() // Methods inherited from XPCOM interfaces. -NS_IMPL_ISUPPORTS1(ImageWrapper, imgIContainer) +NS_IMPL_ISUPPORTS(ImageWrapper, imgIContainer) NS_IMETHODIMP ImageWrapper::GetWidth(int32_t* aWidth) diff --git a/image/src/OrientedImage.cpp b/image/src/OrientedImage.cpp index 47d11539ee2..b9ab9a48f85 100644 --- a/image/src/OrientedImage.cpp +++ b/image/src/OrientedImage.cpp @@ -20,7 +20,7 @@ using mozilla::layers::ImageContainer; namespace mozilla { namespace image { -NS_IMPL_ISUPPORTS1(OrientedImage, imgIContainer) +NS_IMPL_ISUPPORTS(OrientedImage, imgIContainer) nsIntRect OrientedImage::FrameRect(uint32_t aWhichFrame) diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp index ecb4d9dcd51..efdd741266a 100644 --- a/image/src/RasterImage.cpp +++ b/image/src/RasterImage.cpp @@ -380,10 +380,10 @@ namespace image { static nsCOMPtr sScaleWorkerThread = nullptr; #ifndef DEBUG -NS_IMPL_ISUPPORTS2(RasterImage, imgIContainer, nsIProperties) +NS_IMPL_ISUPPORTS(RasterImage, imgIContainer, nsIProperties) #else -NS_IMPL_ISUPPORTS3(RasterImage, imgIContainer, nsIProperties, - imgIContainerDebug) +NS_IMPL_ISUPPORTS(RasterImage, imgIContainer, nsIProperties, + imgIContainerDebug) #endif //****************************************************************************** @@ -3167,8 +3167,8 @@ RasterImage::FinishedSomeDecoding(eShutdownIntent aIntent /* = eShutdownIntent_D return RequestDecodeIfNeeded(rv, aIntent, done, wasSize); } -NS_IMPL_ISUPPORTS1(RasterImage::DecodePool, - nsIObserver) +NS_IMPL_ISUPPORTS(RasterImage::DecodePool, + nsIObserver) /* static */ RasterImage::DecodePool* RasterImage::DecodePool::Singleton() @@ -3201,7 +3201,7 @@ public: ~RIDThreadPoolListener() {} }; -NS_IMPL_ISUPPORTS1(RIDThreadPoolListener, nsIThreadPoolListener) +NS_IMPL_ISUPPORTS(RIDThreadPoolListener, nsIThreadPoolListener) NS_IMETHODIMP RIDThreadPoolListener::OnThreadCreated() diff --git a/image/src/SVGDocumentWrapper.cpp b/image/src/SVGDocumentWrapper.cpp index d5596bc5a7d..b4c04e7ce50 100644 --- a/image/src/SVGDocumentWrapper.cpp +++ b/image/src/SVGDocumentWrapper.cpp @@ -37,11 +37,11 @@ using namespace mozilla::dom; namespace mozilla { namespace image { -NS_IMPL_ISUPPORTS4(SVGDocumentWrapper, - nsIStreamListener, - nsIRequestObserver, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(SVGDocumentWrapper, + nsIStreamListener, + nsIRequestObserver, + nsIObserver, + nsISupportsWeakReference) SVGDocumentWrapper::SVGDocumentWrapper() : mIgnoreInvalidation(false), diff --git a/image/src/SurfaceCache.cpp b/image/src/SurfaceCache.cpp index a27ded36698..93aa8eea244 100644 --- a/image/src/SurfaceCache.cpp +++ b/image/src/SurfaceCache.cpp @@ -435,8 +435,8 @@ private: Cost mAvailableCost; }; -NS_IMPL_ISUPPORTS1(SurfaceCacheImpl, nsIMemoryReporter) -NS_IMPL_ISUPPORTS1(SurfaceCacheImpl::MemoryPressureObserver, nsIObserver) +NS_IMPL_ISUPPORTS(SurfaceCacheImpl, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(SurfaceCacheImpl::MemoryPressureObserver, nsIObserver) /////////////////////////////////////////////////////////////////////////////// // Public API diff --git a/image/src/VectorImage.cpp b/image/src/VectorImage.cpp index 2c74f226e2f..6a4d2a9ad0b 100644 --- a/image/src/VectorImage.cpp +++ b/image/src/VectorImage.cpp @@ -159,7 +159,7 @@ private: VectorImage* const mImage; // Raw pointer to owner. }; -NS_IMPL_ISUPPORTS1(SVGParseCompleteListener, nsIDocumentObserver) +NS_IMPL_ISUPPORTS(SVGParseCompleteListener, nsIDocumentObserver) class SVGLoadEventListener MOZ_FINAL : public nsIDOMEventListener { public: @@ -228,7 +228,7 @@ private: VectorImage* const mImage; // Raw pointer to owner. }; -NS_IMPL_ISUPPORTS1(SVGLoadEventListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(SVGLoadEventListener, nsIDOMEventListener) // Helper-class: SVGDrawingCallback class SVGDrawingCallback : public gfxDrawingCallback { @@ -302,10 +302,10 @@ SVGDrawingCallback::operator()(gfxContext* aContext, } // Implement VectorImage's nsISupports-inherited methods -NS_IMPL_ISUPPORTS3(VectorImage, - imgIContainer, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(VectorImage, + imgIContainer, + nsIStreamListener, + nsIRequestObserver) //------------------------------------------------------------------------------ // Constructor / Destructor diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp index 5dd015c8c90..8e0d11f219c 100644 --- a/image/src/imgLoader.cpp +++ b/image/src/imgLoader.cpp @@ -212,12 +212,12 @@ private: } }; -NS_IMPL_ISUPPORTS1(imgMemoryReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(imgMemoryReporter, nsIMemoryReporter) -NS_IMPL_ISUPPORTS3(nsProgressNotificationProxy, - nsIProgressEventSink, - nsIChannelEventSink, - nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(nsProgressNotificationProxy, + nsIProgressEventSink, + nsIChannelEventSink, + nsIInterfaceRequestor) NS_IMETHODIMP nsProgressNotificationProxy::OnProgress(nsIRequest* request, @@ -672,7 +672,7 @@ public: NS_DECL_NSIOBSERVER }; -NS_IMPL_ISUPPORTS1(imgCacheObserver, nsIObserver) +NS_IMPL_ISUPPORTS(imgCacheObserver, nsIObserver) NS_IMETHODIMP imgCacheObserver::Observe(nsISupports* aSubject, const char* aTopic, const char16_t* aSomeData) @@ -729,7 +729,7 @@ double imgLoader::sCacheTimeWeight; uint32_t imgLoader::sCacheMaxSize; imgMemoryReporter* imgLoader::sMemReporter; -NS_IMPL_ISUPPORTS5(imgLoader, imgILoader, nsIContentSniffer, imgICache, nsISupportsWeakReference, nsIObserver) +NS_IMPL_ISUPPORTS(imgLoader, imgILoader, nsIContentSniffer, imgICache, nsISupportsWeakReference, nsIObserver) static imgLoader* gSingleton = nullptr; static imgLoader* gPBSingleton = nullptr; @@ -2066,10 +2066,10 @@ nsresult imgLoader::GetMimeTypeFromContent(const char* aContents, uint32_t aLeng #include "nsIRequest.h" #include "nsIStreamConverterService.h" -NS_IMPL_ISUPPORTS3(ProxyListener, - nsIStreamListener, - nsIThreadRetargetableStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(ProxyListener, + nsIStreamListener, + nsIThreadRetargetableStreamListener, + nsIRequestObserver) ProxyListener::ProxyListener(nsIStreamListener *dest) : mDestListener(dest) @@ -2168,10 +2168,10 @@ ProxyListener::CheckListenerChain() * http validate class. check a channel for a 304 */ -NS_IMPL_ISUPPORTS6(imgCacheValidator, nsIStreamListener, nsIRequestObserver, - nsIThreadRetargetableStreamListener, - nsIChannelEventSink, nsIInterfaceRequestor, - nsIAsyncVerifyRedirectCallback) +NS_IMPL_ISUPPORTS(imgCacheValidator, nsIStreamListener, nsIRequestObserver, + nsIThreadRetargetableStreamListener, + nsIChannelEventSink, nsIInterfaceRequestor, + nsIAsyncVerifyRedirectCallback) imgCacheValidator::imgCacheValidator(nsProgressNotificationProxy* progress, imgLoader* loader, imgRequest *request, diff --git a/image/src/imgRequest.cpp b/image/src/imgRequest.cpp index 4bfd060a6dd..74a11fae0f7 100644 --- a/image/src/imgRequest.cpp +++ b/image/src/imgRequest.cpp @@ -50,12 +50,12 @@ GetImgLog() } #endif -NS_IMPL_ISUPPORTS6(imgRequest, - nsIStreamListener, nsIRequestObserver, - nsIThreadRetargetableStreamListener, - nsIChannelEventSink, - nsIInterfaceRequestor, - nsIAsyncVerifyRedirectCallback) +NS_IMPL_ISUPPORTS(imgRequest, + nsIStreamListener, nsIRequestObserver, + nsIThreadRetargetableStreamListener, + nsIChannelEventSink, + nsIInterfaceRequestor, + nsIAsyncVerifyRedirectCallback) imgRequest::imgRequest(imgLoader* aLoader) : mLoader(aLoader) diff --git a/image/src/imgTools.cpp b/image/src/imgTools.cpp index cae25b8fce2..e82a4cc908e 100644 --- a/image/src/imgTools.cpp +++ b/image/src/imgTools.cpp @@ -33,7 +33,7 @@ using namespace mozilla::gfx; -NS_IMPL_ISUPPORTS1(imgTools, imgITools) +NS_IMPL_ISUPPORTS(imgTools, imgITools) imgTools::imgTools() { diff --git a/intl/chardet/src/nsCyrillicDetector.cpp b/intl/chardet/src/nsCyrillicDetector.cpp index 03c0863d589..feebeed65a2 100644 --- a/intl/chardet/src/nsCyrillicDetector.cpp +++ b/intl/chardet/src/nsCyrillicDetector.cpp @@ -15,8 +15,8 @@ //---------------------------------------------------------------------- // Interface nsISupports [implementation] -NS_IMPL_ISUPPORTS1(nsCyrXPCOMDetector, nsICharsetDetector) -NS_IMPL_ISUPPORTS1(nsCyrXPCOMStringDetector, nsIStringCharsetDetector) +NS_IMPL_ISUPPORTS(nsCyrXPCOMDetector, nsICharsetDetector) +NS_IMPL_ISUPPORTS(nsCyrXPCOMStringDetector, nsIStringCharsetDetector) void nsCyrillicDetector::HandleData(const char* aBuf, uint32_t aLen) { diff --git a/intl/hyphenation/src/nsHyphenationManager.cpp b/intl/hyphenation/src/nsHyphenationManager.cpp index 9e5a76dfc70..836a1d38424 100644 --- a/intl/hyphenation/src/nsHyphenationManager.cpp +++ b/intl/hyphenation/src/nsHyphenationManager.cpp @@ -27,8 +27,8 @@ static const char kMemoryPressureNotification[] = "memory-pressure"; nsHyphenationManager *nsHyphenationManager::sInstance = nullptr; -NS_IMPL_ISUPPORTS1(nsHyphenationManager::MemoryPressureObserver, - nsIObserver) +NS_IMPL_ISUPPORTS(nsHyphenationManager::MemoryPressureObserver, + nsIObserver) NS_IMETHODIMP nsHyphenationManager::MemoryPressureObserver::Observe(nsISupports *aSubject, diff --git a/intl/locale/src/mac/nsCollationMacUC.cpp b/intl/locale/src/mac/nsCollationMacUC.cpp index 7e56dcb4943..f11d146640f 100644 --- a/intl/locale/src/mac/nsCollationMacUC.cpp +++ b/intl/locale/src/mac/nsCollationMacUC.cpp @@ -9,7 +9,7 @@ #include "prmem.h" #include "nsString.h" -NS_IMPL_ISUPPORTS1(nsCollationMacUC, nsICollation) +NS_IMPL_ISUPPORTS(nsCollationMacUC, nsICollation) nsCollationMacUC::nsCollationMacUC() : mInit(false) diff --git a/intl/locale/src/mac/nsDateTimeFormatMac.cpp b/intl/locale/src/mac/nsDateTimeFormatMac.cpp index 84c6184eebb..19dea322a0b 100644 --- a/intl/locale/src/mac/nsDateTimeFormatMac.cpp +++ b/intl/locale/src/mac/nsDateTimeFormatMac.cpp @@ -15,7 +15,7 @@ #include "nsTArray.h" -NS_IMPL_ISUPPORTS1(nsDateTimeFormatMac, nsIDateTimeFormat) +NS_IMPL_ISUPPORTS(nsDateTimeFormatMac, nsIDateTimeFormat) nsresult nsDateTimeFormatMac::Initialize(nsILocale* locale) { diff --git a/intl/locale/src/mac/nsMacCharset.cpp b/intl/locale/src/mac/nsMacCharset.cpp index 61ab481e516..956560fba83 100644 --- a/intl/locale/src/mac/nsMacCharset.cpp +++ b/intl/locale/src/mac/nsMacCharset.cpp @@ -11,7 +11,7 @@ #include "nsPlatformCharset.h" #include "nsEncoderDecoderUtils.h" -NS_IMPL_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset) +NS_IMPL_ISUPPORTS(nsPlatformCharset, nsIPlatformCharset) nsPlatformCharset::nsPlatformCharset() { diff --git a/intl/locale/src/nsCollation.cpp b/intl/locale/src/nsCollation.cpp index e5710424c59..bfa72ff979b 100644 --- a/intl/locale/src/nsCollation.cpp +++ b/intl/locale/src/nsCollation.cpp @@ -15,7 +15,7 @@ NS_DEFINE_CID(kCollationCID, NS_COLLATION_CID); -NS_IMPL_ISUPPORTS1(nsCollationFactory, nsICollationFactory) +NS_IMPL_ISUPPORTS(nsCollationFactory, nsICollationFactory) nsresult nsCollationFactory::CreateCollation(nsILocale* locale, nsICollation** instancePtr) { diff --git a/intl/locale/src/nsLanguageAtomService.cpp b/intl/locale/src/nsLanguageAtomService.cpp index b1600a64b9a..4efbb6b7f76 100644 --- a/intl/locale/src/nsLanguageAtomService.cpp +++ b/intl/locale/src/nsLanguageAtomService.cpp @@ -11,7 +11,7 @@ #include "mozilla/Services.h" #include "nsServiceManagerUtils.h" -NS_IMPL_ISUPPORTS1(nsLanguageAtomService, nsILanguageAtomService) +NS_IMPL_ISUPPORTS(nsLanguageAtomService, nsILanguageAtomService) nsLanguageAtomService::nsLanguageAtomService() { diff --git a/intl/locale/src/nsLocale.cpp b/intl/locale/src/nsLocale.cpp index e18b64a20c3..e113dc587be 100644 --- a/intl/locale/src/nsLocale.cpp +++ b/intl/locale/src/nsLocale.cpp @@ -14,7 +14,7 @@ /* nsILocale */ -NS_IMPL_ISUPPORTS1(nsLocale, nsILocale) +NS_IMPL_ISUPPORTS(nsLocale, nsILocale) nsLocale::nsLocale(void) : fHashtable(nullptr), fCategoryCount(0) diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp index 1d693ef89d6..2bfb9373402 100644 --- a/intl/locale/src/nsLocaleService.cpp +++ b/intl/locale/src/nsLocaleService.cpp @@ -196,7 +196,7 @@ nsLocaleService::~nsLocaleService(void) { } -NS_IMPL_ISUPPORTS1(nsLocaleService, nsILocaleService) +NS_IMPL_ISUPPORTS(nsLocaleService, nsILocaleService) NS_IMETHODIMP nsLocaleService::NewLocale(const nsAString &aLocale, nsILocale **_retval) diff --git a/intl/locale/src/nsScriptableDateFormat.cpp b/intl/locale/src/nsScriptableDateFormat.cpp index c3b1a5cbeb7..90118e188ef 100644 --- a/intl/locale/src/nsScriptableDateFormat.cpp +++ b/intl/locale/src/nsScriptableDateFormat.cpp @@ -52,7 +52,7 @@ private: nsString mStringOut; }; -NS_IMPL_ISUPPORTS1(nsScriptableDateFormat, nsIScriptableDateFormat) +NS_IMPL_ISUPPORTS(nsScriptableDateFormat, nsIScriptableDateFormat) NS_IMETHODIMP nsScriptableDateFormat::FormatDateTime( const char16_t *aLocale, diff --git a/intl/locale/src/unix/nsAndroidCharset.cpp b/intl/locale/src/unix/nsAndroidCharset.cpp index c0fee425ce9..ed646039c6c 100644 --- a/intl/locale/src/unix/nsAndroidCharset.cpp +++ b/intl/locale/src/unix/nsAndroidCharset.cpp @@ -6,7 +6,7 @@ #include "nsIPlatformCharset.h" #include "nsPlatformCharset.h" -NS_IMPL_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset) +NS_IMPL_ISUPPORTS(nsPlatformCharset, nsIPlatformCharset) nsPlatformCharset::nsPlatformCharset() { diff --git a/intl/locale/src/unix/nsCollationUnix.cpp b/intl/locale/src/unix/nsCollationUnix.cpp index 99f5fd1d2c1..a0b724d4a3b 100644 --- a/intl/locale/src/unix/nsCollationUnix.cpp +++ b/intl/locale/src/unix/nsCollationUnix.cpp @@ -42,7 +42,7 @@ nsCollationUnix::~nsCollationUnix() delete mCollation; } -NS_IMPL_ISUPPORTS1(nsCollationUnix, nsICollation) +NS_IMPL_ISUPPORTS(nsCollationUnix, nsICollation) nsresult nsCollationUnix::Initialize(nsILocale* locale) { diff --git a/intl/locale/src/unix/nsDateTimeFormatUnix.cpp b/intl/locale/src/unix/nsDateTimeFormatUnix.cpp index 12816e20ad2..8a3294f7dfa 100644 --- a/intl/locale/src/unix/nsDateTimeFormatUnix.cpp +++ b/intl/locale/src/unix/nsDateTimeFormatUnix.cpp @@ -15,7 +15,7 @@ #include "nsReadableUtils.h" #include "nsUnicharUtils.h" -NS_IMPL_ISUPPORTS1(nsDateTimeFormatUnix, nsIDateTimeFormat) +NS_IMPL_ISUPPORTS(nsDateTimeFormatUnix, nsIDateTimeFormat) // init this interface to a specified locale nsresult nsDateTimeFormatUnix::Initialize(nsILocale* locale) diff --git a/intl/locale/src/unix/nsUNIXCharset.cpp b/intl/locale/src/unix/nsUNIXCharset.cpp index 4086d3bb413..9522dab638b 100644 --- a/intl/locale/src/unix/nsUNIXCharset.cpp +++ b/intl/locale/src/unix/nsUNIXCharset.cpp @@ -36,7 +36,7 @@ static const char* kUnixCharsets[][3] = { #include "unixcharset.properties.h" }; -NS_IMPL_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset) +NS_IMPL_ISUPPORTS(nsPlatformCharset, nsIPlatformCharset) nsPlatformCharset::nsPlatformCharset() { diff --git a/intl/locale/src/windows/nsCollationWin.cpp b/intl/locale/src/windows/nsCollationWin.cpp index 655ebaec0d8..8dcdb8f071a 100644 --- a/intl/locale/src/windows/nsCollationWin.cpp +++ b/intl/locale/src/windows/nsCollationWin.cpp @@ -17,7 +17,7 @@ #undef CompareString -NS_IMPL_ISUPPORTS1(nsCollationWin, nsICollation) +NS_IMPL_ISUPPORTS(nsCollationWin, nsICollation) nsCollationWin::nsCollationWin() : mCollation(nullptr) diff --git a/intl/locale/src/windows/nsDateTimeFormatWin.cpp b/intl/locale/src/windows/nsDateTimeFormatWin.cpp index f19c8f10561..f65868e1bcc 100644 --- a/intl/locale/src/windows/nsDateTimeFormatWin.cpp +++ b/intl/locale/src/windows/nsDateTimeFormatWin.cpp @@ -15,7 +15,7 @@ #define NSDATETIMEFORMAT_BUFFER_LEN 80 -NS_IMPL_ISUPPORTS1(nsDateTimeFormatWin, nsIDateTimeFormat) +NS_IMPL_ISUPPORTS(nsDateTimeFormatWin, nsIDateTimeFormat) // init this interface to a specified locale diff --git a/intl/locale/src/windows/nsWinCharset.cpp b/intl/locale/src/windows/nsWinCharset.cpp index 100f49c9a51..2423d130c74 100644 --- a/intl/locale/src/windows/nsWinCharset.cpp +++ b/intl/locale/src/windows/nsWinCharset.cpp @@ -21,7 +21,7 @@ static const char* kWinCharsets[][3] = { #include "wincharset.properties.h" }; -NS_IMPL_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset) +NS_IMPL_ISUPPORTS(nsPlatformCharset, nsIPlatformCharset) nsPlatformCharset::nsPlatformCharset() { diff --git a/intl/lwbrk/src/nsJISx4051LineBreaker.cpp b/intl/lwbrk/src/nsJISx4051LineBreaker.cpp index 4d1d372895d..1b2a2382e0f 100644 --- a/intl/lwbrk/src/nsJISx4051LineBreaker.cpp +++ b/intl/lwbrk/src/nsJISx4051LineBreaker.cpp @@ -530,7 +530,7 @@ nsJISx4051LineBreaker::~nsJISx4051LineBreaker() { } -NS_IMPL_ISUPPORTS1(nsJISx4051LineBreaker, nsILineBreaker) +NS_IMPL_ISUPPORTS(nsJISx4051LineBreaker, nsILineBreaker) class ContextState { public: diff --git a/intl/lwbrk/src/nsSampleWordBreaker.cpp b/intl/lwbrk/src/nsSampleWordBreaker.cpp index 1421ed472f3..fa54adeda89 100644 --- a/intl/lwbrk/src/nsSampleWordBreaker.cpp +++ b/intl/lwbrk/src/nsSampleWordBreaker.cpp @@ -13,7 +13,7 @@ nsSampleWordBreaker::~nsSampleWordBreaker() { } -NS_IMPL_ISUPPORTS1(nsSampleWordBreaker, nsIWordBreaker) +NS_IMPL_ISUPPORTS(nsSampleWordBreaker, nsIWordBreaker) bool nsSampleWordBreaker::BreakInBetween( const char16_t* aText1 , uint32_t aTextLen1, diff --git a/intl/lwbrk/src/nsSemanticUnitScanner.cpp b/intl/lwbrk/src/nsSemanticUnitScanner.cpp index f6d6b6dc4ec..584200ad7a7 100644 --- a/intl/lwbrk/src/nsSemanticUnitScanner.cpp +++ b/intl/lwbrk/src/nsSemanticUnitScanner.cpp @@ -5,7 +5,7 @@ #include "nsSemanticUnitScanner.h" -NS_IMPL_ISUPPORTS1(nsSemanticUnitScanner, nsISemanticUnitScanner) +NS_IMPL_ISUPPORTS(nsSemanticUnitScanner, nsISemanticUnitScanner) nsSemanticUnitScanner::nsSemanticUnitScanner() : nsSampleWordBreaker() { diff --git a/intl/strres/src/nsStringBundle.cpp b/intl/strres/src/nsStringBundle.cpp index afdb00125bb..7405a1ad679 100644 --- a/intl/strres/src/nsStringBundle.cpp +++ b/intl/strres/src/nsStringBundle.cpp @@ -172,7 +172,7 @@ nsStringBundle::FormatStringFromName(const char16_t *aName, } -NS_IMPL_ISUPPORTS1(nsStringBundle, nsIStringBundle) +NS_IMPL_ISUPPORTS(nsStringBundle, nsIStringBundle) /* void GetStringFromID (in long aID, out wstring aResult); */ NS_IMETHODIMP @@ -350,7 +350,7 @@ nsStringBundle::FormatString(const char16_t *aFormatStr, return *aResult ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -NS_IMPL_ISUPPORTS1(nsExtensibleStringBundle, nsIStringBundle) +NS_IMPL_ISUPPORTS(nsExtensibleStringBundle, nsIStringBundle) nsExtensibleStringBundle::nsExtensibleStringBundle() { @@ -495,10 +495,10 @@ nsStringBundleService::nsStringBundleService() : NS_ASSERTION(mErrorService, "Couldn't get error service"); } -NS_IMPL_ISUPPORTS3(nsStringBundleService, - nsIStringBundleService, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsStringBundleService, + nsIStringBundleService, + nsIObserver, + nsISupportsWeakReference) nsStringBundleService::~nsStringBundleService() { diff --git a/intl/strres/src/nsStringBundleTextOverride.cpp b/intl/strres/src/nsStringBundleTextOverride.cpp index e14d32f4cf3..1f2366a9691 100644 --- a/intl/strres/src/nsStringBundleTextOverride.cpp +++ b/intl/strres/src/nsStringBundleTextOverride.cpp @@ -29,7 +29,7 @@ private: uint32_t mURLLength; }; -NS_IMPL_ISUPPORTS1(URLPropertyElement, nsIPropertyElement) +NS_IMPL_ISUPPORTS(URLPropertyElement, nsIPropertyElement) // we'll tweak the key on the way through, and remove the url prefix NS_IMETHODIMP @@ -107,8 +107,8 @@ private: // // nsStringBundleTextOverride implementation // -NS_IMPL_ISUPPORTS1(nsStringBundleTextOverride, - nsIStringBundleOverride) +NS_IMPL_ISUPPORTS(nsStringBundleTextOverride, + nsIStringBundleOverride) nsresult nsStringBundleTextOverride::Init() @@ -225,7 +225,7 @@ nsStringBundleTextOverride::EnumerateKeysInBundle(const nsACString& aURL, // -NS_IMPL_ISUPPORTS1(nsPropertyEnumeratorByURL, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsPropertyEnumeratorByURL, nsISimpleEnumerator) NS_IMETHODIMP nsPropertyEnumeratorByURL::GetNext(nsISupports **aResult) diff --git a/intl/uconv/src/nsCharsetConverterManager.cpp b/intl/uconv/src/nsCharsetConverterManager.cpp index 829ffa5395e..48fa2563518 100644 --- a/intl/uconv/src/nsCharsetConverterManager.cpp +++ b/intl/uconv/src/nsCharsetConverterManager.cpp @@ -27,7 +27,7 @@ static nsIStringBundle * sTitleBundle; // Class nsCharsetConverterManager [implementation] -NS_IMPL_ISUPPORTS1(nsCharsetConverterManager, nsICharsetConverterManager) +NS_IMPL_ISUPPORTS(nsCharsetConverterManager, nsICharsetConverterManager) nsCharsetConverterManager::nsCharsetConverterManager() { diff --git a/intl/uconv/src/nsConverterInputStream.cpp b/intl/uconv/src/nsConverterInputStream.cpp index 0953f41cc0a..6c0ec381286 100644 --- a/intl/uconv/src/nsConverterInputStream.cpp +++ b/intl/uconv/src/nsConverterInputStream.cpp @@ -13,8 +13,8 @@ #define CONVERTER_BUFFER_SIZE 8192 -NS_IMPL_ISUPPORTS3(nsConverterInputStream, nsIConverterInputStream, - nsIUnicharInputStream, nsIUnicharLineInputStream) +NS_IMPL_ISUPPORTS(nsConverterInputStream, nsIConverterInputStream, + nsIUnicharInputStream, nsIUnicharLineInputStream) NS_IMETHODIMP diff --git a/intl/uconv/src/nsConverterOutputStream.cpp b/intl/uconv/src/nsConverterOutputStream.cpp index a627df6ce93..e76c6d6ac61 100644 --- a/intl/uconv/src/nsConverterOutputStream.cpp +++ b/intl/uconv/src/nsConverterOutputStream.cpp @@ -11,9 +11,9 @@ #include "nsConverterOutputStream.h" #include "nsServiceManagerUtils.h" -NS_IMPL_ISUPPORTS2(nsConverterOutputStream, - nsIUnicharOutputStream, - nsIConverterOutputStream) +NS_IMPL_ISUPPORTS(nsConverterOutputStream, + nsIUnicharOutputStream, + nsIConverterOutputStream) nsConverterOutputStream::~nsConverterOutputStream() { diff --git a/intl/uconv/src/nsScriptableUConv.cpp b/intl/uconv/src/nsScriptableUConv.cpp index c3cf2b0ed2e..6a4944ef6ff 100644 --- a/intl/uconv/src/nsScriptableUConv.cpp +++ b/intl/uconv/src/nsScriptableUConv.cpp @@ -13,7 +13,7 @@ #include "nsServiceManagerUtils.h" /* Implementation file */ -NS_IMPL_ISUPPORTS1(nsScriptableUnicodeConverter, nsIScriptableUnicodeConverter) +NS_IMPL_ISUPPORTS(nsScriptableUnicodeConverter, nsIScriptableUnicodeConverter) nsScriptableUnicodeConverter::nsScriptableUnicodeConverter() : mIsInternal(false) diff --git a/intl/uconv/src/nsTextToSubURI.cpp b/intl/uconv/src/nsTextToSubURI.cpp index a90155a5329..941c477c0fe 100644 --- a/intl/uconv/src/nsTextToSubURI.cpp +++ b/intl/uconv/src/nsTextToSubURI.cpp @@ -20,7 +20,7 @@ nsTextToSubURI::~nsTextToSubURI() { } -NS_IMPL_ISUPPORTS1(nsTextToSubURI, nsITextToSubURI) +NS_IMPL_ISUPPORTS(nsTextToSubURI, nsITextToSubURI) NS_IMETHODIMP nsTextToSubURI::ConvertAndEscape( const char *charset, const char16_t *text, char **_retval) diff --git a/intl/uconv/src/nsUTF8ConverterService.cpp b/intl/uconv/src/nsUTF8ConverterService.cpp index 48938ec66b1..42b0c140fd8 100644 --- a/intl/uconv/src/nsUTF8ConverterService.cpp +++ b/intl/uconv/src/nsUTF8ConverterService.cpp @@ -11,7 +11,7 @@ #include "nsAutoPtr.h" #include "nsServiceManagerUtils.h" -NS_IMPL_ISUPPORTS1(nsUTF8ConverterService, nsIUTF8ConverterService) +NS_IMPL_ISUPPORTS(nsUTF8ConverterService, nsIUTF8ConverterService) static nsresult ToUTF8(const nsACString &aString, const char *aCharset, diff --git a/intl/uconv/src/nsUnicodeToUTF8.cpp b/intl/uconv/src/nsUnicodeToUTF8.cpp index 6b41916e0ae..57058b71f7f 100644 --- a/intl/uconv/src/nsUnicodeToUTF8.cpp +++ b/intl/uconv/src/nsUnicodeToUTF8.cpp @@ -7,7 +7,7 @@ // Global functions and data [declaration] #include "nsUnicodeToUTF8.h" -NS_IMPL_ISUPPORTS1(nsUnicodeToUTF8, nsIUnicodeEncoder) +NS_IMPL_ISUPPORTS(nsUnicodeToUTF8, nsIUnicodeEncoder) //---------------------------------------------------------------------- // nsUnicodeToUTF8 class [implementation] diff --git a/intl/uconv/util/nsUCSupport.cpp b/intl/uconv/util/nsUCSupport.cpp index c17975970cf..dd666d50c95 100644 --- a/intl/uconv/util/nsUCSupport.cpp +++ b/intl/uconv/util/nsUCSupport.cpp @@ -28,11 +28,11 @@ nsBasicDecoderSupport::~nsBasicDecoderSupport() // Interface nsISupports [implementation] #ifdef DEBUG -NS_IMPL_ISUPPORTS2(nsBasicDecoderSupport, - nsIUnicodeDecoder, - nsIBasicDecoder) +NS_IMPL_ISUPPORTS(nsBasicDecoderSupport, + nsIUnicodeDecoder, + nsIBasicDecoder) #else -NS_IMPL_ISUPPORTS1(nsBasicDecoderSupport, nsIUnicodeDecoder) +NS_IMPL_ISUPPORTS(nsBasicDecoderSupport, nsIUnicodeDecoder) #endif //---------------------------------------------------------------------- @@ -332,12 +332,12 @@ nsBasicEncoder::~nsBasicEncoder() NS_IMPL_ADDREF(nsBasicEncoder) NS_IMPL_RELEASE(nsBasicEncoder) #ifdef DEBUG -NS_IMPL_QUERY_INTERFACE2(nsBasicEncoder, - nsIUnicodeEncoder, - nsIBasicEncoder) +NS_IMPL_QUERY_INTERFACE(nsBasicEncoder, + nsIUnicodeEncoder, + nsIBasicEncoder) #else -NS_IMPL_QUERY_INTERFACE1(nsBasicEncoder, - nsIUnicodeEncoder) +NS_IMPL_QUERY_INTERFACE(nsBasicEncoder, + nsIUnicodeEncoder) #endif //---------------------------------------------------------------------- // Class nsEncoderSupport [implementation] diff --git a/intl/unicharutil/src/nsCaseConversionImp2.cpp b/intl/unicharutil/src/nsCaseConversionImp2.cpp index f2dbd92134d..61750213742 100644 --- a/intl/unicharutil/src/nsCaseConversionImp2.cpp +++ b/intl/unicharutil/src/nsCaseConversionImp2.cpp @@ -16,7 +16,7 @@ NS_IMETHODIMP_(MozExternalRefCountType) nsCaseConversionImp2::Release(void) return (MozExternalRefCountType)1; } -NS_IMPL_QUERY_INTERFACE1(nsCaseConversionImp2, nsICaseConversion) +NS_IMPL_QUERY_INTERFACE(nsCaseConversionImp2, nsICaseConversion) NS_IMETHODIMP nsCaseConversionImp2::ToUpper(char16_t aChar, char16_t* aReturn) { diff --git a/intl/unicharutil/src/nsCategoryImp.cpp b/intl/unicharutil/src/nsCategoryImp.cpp index a2d7a9705ab..7d8c551401e 100644 --- a/intl/unicharutil/src/nsCategoryImp.cpp +++ b/intl/unicharutil/src/nsCategoryImp.cpp @@ -8,7 +8,7 @@ #include "nsCategoryImp.h" #include "nsUnicodeProperties.h" -NS_IMPL_QUERY_INTERFACE1(nsCategoryImp, nsIUGenCategory) +NS_IMPL_QUERY_INTERFACE(nsCategoryImp, nsIUGenCategory) NS_IMETHODIMP_(MozExternalRefCountType) nsCategoryImp::AddRef(void) { diff --git a/intl/unicharutil/src/nsEntityConverter.cpp b/intl/unicharutil/src/nsEntityConverter.cpp index 4821bb789ef..d918d31e5ed 100644 --- a/intl/unicharutil/src/nsEntityConverter.cpp +++ b/intl/unicharutil/src/nsEntityConverter.cpp @@ -135,7 +135,7 @@ nsEntityConverter:: GetVersionBundleInstance(uint32_t versionNumber) // // nsISupports methods // -NS_IMPL_ISUPPORTS1(nsEntityConverter,nsIEntityConverter) +NS_IMPL_ISUPPORTS(nsEntityConverter,nsIEntityConverter) // diff --git a/intl/unicharutil/src/nsSaveAsCharset.cpp b/intl/unicharutil/src/nsSaveAsCharset.cpp index 2895d118da5..602b722a0dd 100644 --- a/intl/unicharutil/src/nsSaveAsCharset.cpp +++ b/intl/unicharutil/src/nsSaveAsCharset.cpp @@ -15,7 +15,7 @@ // // nsISupports methods // -NS_IMPL_ISUPPORTS1(nsSaveAsCharset, nsISaveAsCharset) +NS_IMPL_ISUPPORTS(nsSaveAsCharset, nsISaveAsCharset) // // nsSaveAsCharset diff --git a/intl/unicharutil/src/nsUnicodeNormalizer.cpp b/intl/unicharutil/src/nsUnicodeNormalizer.cpp index 87626a11e20..f8f4ca6b379 100644 --- a/intl/unicharutil/src/nsUnicodeNormalizer.cpp +++ b/intl/unicharutil/src/nsUnicodeNormalizer.cpp @@ -57,7 +57,7 @@ #include "nsUnicodeNormalizer.h" #include "nsString.h" -NS_IMPL_ISUPPORTS1(nsUnicodeNormalizer, nsIUnicodeNormalizer) +NS_IMPL_ISUPPORTS(nsUnicodeNormalizer, nsIUnicodeNormalizer) nsUnicodeNormalizer::nsUnicodeNormalizer() diff --git a/ipc/glue/BackgroundImpl.cpp b/ipc/glue/BackgroundImpl.cpp index 5bb3c8d70cc..22ca3e5379c 100644 --- a/ipc/glue/BackgroundImpl.cpp +++ b/ipc/glue/BackgroundImpl.cpp @@ -1295,7 +1295,7 @@ ParentImpl::ActorDestroy(ActorDestroyReason aWhy) MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToCurrentThread(destroyRunnable))); } -NS_IMPL_ISUPPORTS1(ParentImpl::ShutdownObserver, nsIObserver) +NS_IMPL_ISUPPORTS(ParentImpl::ShutdownObserver, nsIObserver) NS_IMETHODIMP ParentImpl::ShutdownObserver::Observe(nsISupports* aSubject, @@ -1947,7 +1947,7 @@ ChildImpl::ActorDestroy(ActorDestroyReason aWhy) BackgroundChildImpl::ActorDestroy(aWhy); } -NS_IMPL_ISUPPORTS1(ChildImpl::ShutdownObserver, nsIObserver) +NS_IMPL_ISUPPORTS(ChildImpl::ShutdownObserver, nsIObserver) NS_IMETHODIMP ChildImpl::ShutdownObserver::Observe(nsISupports* aSubject, diff --git a/ipc/glue/FileDescriptorUtils.cpp b/ipc/glue/FileDescriptorUtils.cpp index 0623ba15148..3762fa0db83 100644 --- a/ipc/glue/FileDescriptorUtils.cpp +++ b/ipc/glue/FileDescriptorUtils.cpp @@ -35,7 +35,7 @@ CloseFileRunnable::~CloseFileRunnable() } } -NS_IMPL_ISUPPORTS1(CloseFileRunnable, nsIRunnable) +NS_IMPL_ISUPPORTS(CloseFileRunnable, nsIRunnable) void CloseFileRunnable::Dispatch() diff --git a/ipc/glue/MessagePump.cpp b/ipc/glue/MessagePump.cpp index 306dd175fa3..ab9ed72a3ee 100644 --- a/ipc/glue/MessagePump.cpp +++ b/ipc/glue/MessagePump.cpp @@ -211,7 +211,7 @@ MessagePump::DoDelayedWork(base::MessagePump::Delegate* aDelegate) } } -NS_IMPL_ISUPPORTS2(DoWorkRunnable, nsIRunnable, nsITimerCallback) +NS_IMPL_ISUPPORTS(DoWorkRunnable, nsIRunnable, nsITimerCallback) NS_IMETHODIMP DoWorkRunnable::Run() diff --git a/ipc/glue/SharedMemory.cpp b/ipc/glue/SharedMemory.cpp index f3c55928953..2d574885a2b 100644 --- a/ipc/glue/SharedMemory.cpp +++ b/ipc/glue/SharedMemory.cpp @@ -42,7 +42,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(ShmemReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(ShmemReporter, nsIMemoryReporter) SharedMemory::SharedMemory() : mAllocSize(0) diff --git a/ipc/testshell/XPCShellEnvironment.cpp b/ipc/testshell/XPCShellEnvironment.cpp index f0f8fae4a6b..c1b8bcf8027 100644 --- a/ipc/testshell/XPCShellEnvironment.cpp +++ b/ipc/testshell/XPCShellEnvironment.cpp @@ -409,7 +409,7 @@ XPCShellDirProvider::Release() return 1; } -NS_IMPL_QUERY_INTERFACE1(XPCShellDirProvider, nsIDirectoryServiceProvider) +NS_IMPL_QUERY_INTERFACE(XPCShellDirProvider, nsIDirectoryServiceProvider) bool XPCShellDirProvider::SetGREDir(const char *dir) diff --git a/js/ductwork/debugger/JSDebugger.cpp b/js/ductwork/debugger/JSDebugger.cpp index 68b11065a0d..5a3bc605770 100644 --- a/js/ductwork/debugger/JSDebugger.cpp +++ b/js/ductwork/debugger/JSDebugger.cpp @@ -25,7 +25,7 @@ namespace jsdebugger { NS_GENERIC_FACTORY_CONSTRUCTOR(JSDebugger) -NS_IMPL_ISUPPORTS1(JSDebugger, IJSDebugger) +NS_IMPL_ISUPPORTS(JSDebugger, IJSDebugger) JSDebugger::JSDebugger() { diff --git a/js/jsd/jsd_xpc.cpp b/js/jsd/jsd_xpc.cpp index 1381222ad3f..b66b762639e 100644 --- a/js/jsd/jsd_xpc.cpp +++ b/js/jsd/jsd_xpc.cpp @@ -743,7 +743,7 @@ jsds_ScriptHookProc (JSDContext* jsdc, JSDScript* jsdscript, bool creating, /* Contexts */ /* -NS_IMPL_ISUPPORTS2(jsdContext, jsdIContext, jsdIEphemeral); +NS_IMPL_ISUPPORTS(jsdContext, jsdIContext, jsdIEphemeral); NS_IMETHODIMP jsdContext::GetJSDContext(JSDContext **_rval) @@ -754,7 +754,7 @@ jsdContext::GetJSDContext(JSDContext **_rval) */ /* Objects */ -NS_IMPL_ISUPPORTS1(jsdObject, jsdIObject) +NS_IMPL_ISUPPORTS(jsdObject, jsdIObject) NS_IMETHODIMP jsdObject::GetJSDContext(JSDContext **_rval) @@ -808,7 +808,7 @@ jsdObject::GetValue(jsdIValue **_rval) } /* Properties */ -NS_IMPL_ISUPPORTS2(jsdProperty, jsdIProperty, jsdIEphemeral) +NS_IMPL_ISUPPORTS(jsdProperty, jsdIProperty, jsdIEphemeral) jsdProperty::jsdProperty (JSDContext *aCx, JSDProperty *aProperty) : mCx(aCx), mProperty(aProperty) @@ -899,7 +899,7 @@ jsdProperty::GetValue(jsdIValue **_rval) } /* Scripts */ -NS_IMPL_ISUPPORTS2(jsdScript, jsdIScript, jsdIEphemeral) +NS_IMPL_ISUPPORTS(jsdScript, jsdIScript, jsdIEphemeral) static NS_IMETHODIMP AssignToJSString(JSDContext *aCx, nsACString *x, JSString *str_) @@ -1564,7 +1564,7 @@ jsdScript::ClearAllBreakpoints() } /* Contexts */ -NS_IMPL_ISUPPORTS2(jsdContext, jsdIContext, jsdIEphemeral) +NS_IMPL_ISUPPORTS(jsdContext, jsdIContext, jsdIEphemeral) jsdIContext * jsdContext::FromPtr (JSDContext *aJSDCx, JSContext *aJSCx) @@ -1785,7 +1785,7 @@ jsdContext::SetScriptsEnabled (bool _rval) } /* Stack Frames */ -NS_IMPL_ISUPPORTS2(jsdStackFrame, jsdIStackFrame, jsdIEphemeral) +NS_IMPL_ISUPPORTS(jsdStackFrame, jsdIStackFrame, jsdIEphemeral) jsdStackFrame::jsdStackFrame (JSDContext *aCx, JSDThreadState *aThreadState, JSDStackFrameInfo *aStackFrameInfo) : @@ -2057,7 +2057,7 @@ jsdStackFrame::Eval (const nsAString &bytes, const nsACString &fileName, } /* Values */ -NS_IMPL_ISUPPORTS2(jsdValue, jsdIValue, jsdIEphemeral) +NS_IMPL_ISUPPORTS(jsdValue, jsdIValue, jsdIEphemeral) jsdIValue * jsdValue::FromPtr (JSDContext *aCx, JSDValue *aValue) { @@ -3338,7 +3338,7 @@ class jsdASObserver MOZ_FINAL : public nsIObserver jsdASObserver () {} }; -NS_IMPL_ISUPPORTS1(jsdASObserver, nsIObserver) +NS_IMPL_ISUPPORTS(jsdASObserver, nsIObserver) NS_IMETHODIMP jsdASObserver::Observe (nsISupports *aSubject, const char *aTopic, @@ -3436,7 +3436,7 @@ CreateJSDGlobal(JSContext *aCx, const JSClass *aClasp) #if 0 /* Thread States */ -NS_IMPL_ISUPPORTS1(jsdThreadState, jsdIThreadState); +NS_IMPL_ISUPPORTS(jsdThreadState, jsdIThreadState); NS_IMETHODIMP jsdThreadState::GetJSDContext(JSDContext **_rval) diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp index 1bd6b798a4b..4b5b9ecc5f7 100644 --- a/js/xpconnect/loader/mozJSComponentLoader.cpp +++ b/js/xpconnect/loader/mozJSComponentLoader.cpp @@ -337,10 +337,10 @@ mozJSComponentLoader::~mozJSComponentLoader() mozJSComponentLoader* mozJSComponentLoader::sSelf; -NS_IMPL_ISUPPORTS3(mozJSComponentLoader, - mozilla::ModuleLoader, - xpcIJSModuleLoader, - nsIObserver) +NS_IMPL_ISUPPORTS(mozJSComponentLoader, + mozilla::ModuleLoader, + xpcIJSModuleLoader, + nsIObserver) nsresult mozJSComponentLoader::ReallyInit() diff --git a/js/xpconnect/loader/mozJSSubScriptLoader.cpp b/js/xpconnect/loader/mozJSSubScriptLoader.cpp index f4a28a1b89e..f7f3a383133 100644 --- a/js/xpconnect/loader/mozJSSubScriptLoader.cpp +++ b/js/xpconnect/loader/mozJSSubScriptLoader.cpp @@ -84,7 +84,7 @@ mozJSSubScriptLoader::~mozJSSubScriptLoader() /* empty */ } -NS_IMPL_ISUPPORTS1(mozJSSubScriptLoader, mozIJSSubScriptLoader) +NS_IMPL_ISUPPORTS(mozJSSubScriptLoader, mozIJSSubScriptLoader) static nsresult ReportError(JSContext *cx, const char *msg) @@ -411,7 +411,7 @@ private: size_t mScriptLength; }; -NS_IMPL_ISUPPORTS1(ScriptPrecompiler, nsIStreamLoaderObserver); +NS_IMPL_ISUPPORTS(ScriptPrecompiler, nsIStreamLoaderObserver); class NotifyPrecompilationCompleteRunnable : public nsRunnable { diff --git a/js/xpconnect/src/Sandbox.cpp b/js/xpconnect/src/Sandbox.cpp index a73afb9af7a..6ccbe373d46 100644 --- a/js/xpconnect/src/Sandbox.cpp +++ b/js/xpconnect/src/Sandbox.cpp @@ -1642,7 +1642,7 @@ private: nsCOMPtr mPrincipal; }; -NS_IMPL_ISUPPORTS1(ContextHolder, nsIScriptObjectPrincipal) +NS_IMPL_ISUPPORTS(ContextHolder, nsIScriptObjectPrincipal) ContextHolder::ContextHolder(JSContext *aOuterCx, HandleObject aSandbox, diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp index 3657c467739..e794e2eda47 100644 --- a/js/xpconnect/src/XPCComponents.cpp +++ b/js/xpconnect/src/XPCComponents.cpp @@ -3816,7 +3816,7 @@ NS_INTERFACE_MAP_END { 0xae, 0xb0, 0xaf, 0x9a, 0x51, 0xe4, 0x4c, 0x81 } } NS_IMPL_CLASSINFO(nsXPCComponentsBase, &ComponentsSH::Get, nsIClassInfo::DOM_OBJECT, NSXPCCOMPONENTSBASE_CID) -NS_IMPL_ISUPPORTS1_CI(nsXPCComponentsBase, nsIXPCComponentsBase) +NS_IMPL_ISUPPORTS_CI(nsXPCComponentsBase, nsIXPCComponentsBase) NS_IMPL_CLASSINFO(nsXPCComponents, &ComponentsSH::Get, nsIClassInfo::DOM_OBJECT, NSXPCCOMPONENTS_CID) // Below is more or less what NS_IMPL_ISUPPORTS_CI_INHERITED1 would look like @@ -3827,7 +3827,7 @@ NS_INTERFACE_MAP_BEGIN(nsXPCComponents) NS_INTERFACE_MAP_ENTRY(nsIXPCComponents) NS_IMPL_QUERY_CLASSINFO(nsXPCComponents) NS_INTERFACE_MAP_END_INHERITING(nsXPCComponentsBase) -NS_IMPL_CI_INTERFACE_GETTER1(nsXPCComponents, nsIXPCComponents) +NS_IMPL_CI_INTERFACE_GETTER(nsXPCComponents, nsIXPCComponents) // The nsIXPCScriptable map declaration that will generate stubs for us #define XPC_MAP_CLASSNAME ComponentsSH diff --git a/js/xpconnect/src/XPCJSID.cpp b/js/xpconnect/src/XPCJSID.cpp index 6129974439c..5ed50acf307 100644 --- a/js/xpconnect/src/XPCJSID.cpp +++ b/js/xpconnect/src/XPCJSID.cpp @@ -19,7 +19,7 @@ using namespace JS; // nsJSID NS_IMPL_CLASSINFO(nsJSID, nullptr, 0, NS_JS_ID_CID) -NS_IMPL_ISUPPORTS1_CI(nsJSID, nsIJSID) +NS_IMPL_ISUPPORTS_CI(nsJSID, nsIJSID) char nsJSID::gNoString[] = ""; @@ -287,7 +287,7 @@ NS_INTERFACE_MAP_END NS_IMPL_ADDREF(nsJSIID) NS_IMPL_RELEASE(nsJSIID) -NS_IMPL_CI_INTERFACE_GETTER2(nsJSIID, nsIJSID, nsIJSIID) +NS_IMPL_CI_INTERFACE_GETTER(nsJSIID, nsIJSID, nsIJSIID) // The nsIXPCScriptable map declaration that will generate stubs for us... #define XPC_MAP_CLASSNAME nsJSIID @@ -567,7 +567,7 @@ NS_INTERFACE_MAP_END NS_IMPL_ADDREF(nsJSCID) NS_IMPL_RELEASE(nsJSCID) -NS_IMPL_CI_INTERFACE_GETTER2(nsJSCID, nsIJSID, nsIJSCID) +NS_IMPL_CI_INTERFACE_GETTER(nsJSCID, nsIJSID, nsIJSCID) // The nsIXPCScriptable map declaration that will generate stubs for us... #define XPC_MAP_CLASSNAME nsJSCID diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp index 36a3976a8fd..532366ca9db 100644 --- a/js/xpconnect/src/XPCJSRuntime.cpp +++ b/js/xpconnect/src/XPCJSRuntime.cpp @@ -1258,7 +1258,7 @@ class WatchdogManager : public nsIObserver PRTime mTimestamps[TimestampCount]; }; -NS_IMPL_ISUPPORTS1(WatchdogManager, nsIObserver) +NS_IMPL_ISUPPORTS(WatchdogManager, nsIObserver) AutoLockWatchdog::AutoLockWatchdog(Watchdog *aWatchdog) : mWatchdog(aWatchdog) { @@ -1740,7 +1740,7 @@ class JSMainRuntimeTemporaryPeakReporter MOZ_FINAL : public nsIMemoryReporter } }; -NS_IMPL_ISUPPORTS1(JSMainRuntimeTemporaryPeakReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(JSMainRuntimeTemporaryPeakReporter, nsIMemoryReporter) // The REPORT* macros do an unconditional report. The ZCREPORT* macros are for // compartments and zones; they aggregate any entries smaller than @@ -2516,7 +2516,7 @@ class JSMainRuntimeCompartmentsReporter MOZ_FINAL : public nsIMemoryReporter } }; -NS_IMPL_ISUPPORTS1(JSMainRuntimeCompartmentsReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(JSMainRuntimeCompartmentsReporter, nsIMemoryReporter) MOZ_DEFINE_MALLOC_SIZE_OF(OrphanMallocSizeOf) diff --git a/js/xpconnect/src/XPCJSWeakReference.cpp b/js/xpconnect/src/XPCJSWeakReference.cpp index 5e119e2b559..ffa63459eaa 100644 --- a/js/xpconnect/src/XPCJSWeakReference.cpp +++ b/js/xpconnect/src/XPCJSWeakReference.cpp @@ -15,7 +15,7 @@ xpcJSWeakReference::xpcJSWeakReference() { } -NS_IMPL_ISUPPORTS1(xpcJSWeakReference, xpcIJSWeakReference) +NS_IMPL_ISUPPORTS(xpcJSWeakReference, xpcIJSWeakReference) nsresult xpcJSWeakReference::Init(JSContext* cx, const JS::Value& object) { diff --git a/js/xpconnect/src/XPCShellImpl.cpp b/js/xpconnect/src/XPCShellImpl.cpp index 35d8ee747c7..fc99fdc9e52 100644 --- a/js/xpconnect/src/XPCShellImpl.cpp +++ b/js/xpconnect/src/XPCShellImpl.cpp @@ -1207,7 +1207,7 @@ public: TestGlobal(){} }; -NS_IMPL_ISUPPORTS2(TestGlobal, nsIXPCTestNoisy, nsIXPCScriptable) +NS_IMPL_ISUPPORTS(TestGlobal, nsIXPCTestNoisy, nsIXPCScriptable) // The nsIXPCScriptable map declaration that will generate stubs for us... #define XPC_MAP_CLASSNAME TestGlobal @@ -1240,7 +1240,7 @@ public: }; /* Implementation file */ -NS_IMPL_ISUPPORTS1(nsXPCFunctionThisTranslator, nsIXPCFunctionThisTranslator) +NS_IMPL_ISUPPORTS(nsXPCFunctionThisTranslator, nsIXPCFunctionThisTranslator) nsXPCFunctionThisTranslator::nsXPCFunctionThisTranslator() { @@ -1668,9 +1668,9 @@ XPCShellDirProvider::Release() return 1; } -NS_IMPL_QUERY_INTERFACE2(XPCShellDirProvider, - nsIDirectoryServiceProvider, - nsIDirectoryServiceProvider2) +NS_IMPL_QUERY_INTERFACE(XPCShellDirProvider, + nsIDirectoryServiceProvider, + nsIDirectoryServiceProvider2) NS_IMETHODIMP XPCShellDirProvider::GetFile(const char *prop, bool *persistent, diff --git a/js/xpconnect/src/XPCVariant.cpp b/js/xpconnect/src/XPCVariant.cpp index c804f49901a..29f97406148 100644 --- a/js/xpconnect/src/XPCVariant.cpp +++ b/js/xpconnect/src/XPCVariant.cpp @@ -23,7 +23,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(XPCVariant) NS_INTERFACE_MAP_ENTRY(nsISupports) NS_IMPL_QUERY_CLASSINFO(XPCVariant) NS_INTERFACE_MAP_END -NS_IMPL_CI_INTERFACE_GETTER2(XPCVariant, XPCVariant, nsIVariant) +NS_IMPL_CI_INTERFACE_GETTER(XPCVariant, XPCVariant, nsIVariant) NS_IMPL_CYCLE_COLLECTING_ADDREF(XPCVariant) NS_IMPL_CYCLE_COLLECTING_RELEASE(XPCVariant) diff --git a/js/xpconnect/src/XPCWrappedJSClass.cpp b/js/xpconnect/src/XPCWrappedJSClass.cpp index acc6e8943c7..5f770e658c2 100644 --- a/js/xpconnect/src/XPCWrappedJSClass.cpp +++ b/js/xpconnect/src/XPCWrappedJSClass.cpp @@ -25,7 +25,7 @@ using namespace xpc; using namespace JS; using namespace mozilla; -NS_IMPL_ISUPPORTS1(nsXPCWrappedJSClass, nsIXPCWrappedJSClass) +NS_IMPL_ISUPPORTS(nsXPCWrappedJSClass, nsIXPCWrappedJSClass) // the value of this variable is never used - we use its address as a sentinel static uint32_t zero_methods_descriptor; @@ -382,7 +382,7 @@ nsXPCWrappedJSClass::BuildPropertyEnumerator(XPCCallContext& ccx, /***************************************************************************/ -NS_IMPL_ISUPPORTS1(xpcProperty, nsIProperty) +NS_IMPL_ISUPPORTS(xpcProperty, nsIProperty) xpcProperty::xpcProperty(const char16_t* aName, uint32_t aNameLen, nsIVariant* aValue) diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp index c07417e2153..7ad3f07642e 100644 --- a/js/xpconnect/src/XPCWrappedNative.cpp +++ b/js/xpconnect/src/XPCWrappedNative.cpp @@ -2653,7 +2653,7 @@ static void DEBUG_CheckClassInfoClaims(XPCWrappedNative* wrapper) } #endif -NS_IMPL_ISUPPORTS1(XPCJSObjectHolder, nsIXPConnectJSObjectHolder) +NS_IMPL_ISUPPORTS(XPCJSObjectHolder, nsIXPConnectJSObjectHolder) JSObject* XPCJSObjectHolder::GetJSObject() diff --git a/js/xpconnect/src/nsScriptError.cpp b/js/xpconnect/src/nsScriptError.cpp index 01382d8559b..944da2e741e 100644 --- a/js/xpconnect/src/nsScriptError.cpp +++ b/js/xpconnect/src/nsScriptError.cpp @@ -16,7 +16,7 @@ #include "nsILoadContext.h" #include "nsIDocShell.h" -NS_IMPL_ISUPPORTS2(nsScriptError, nsIConsoleMessage, nsIScriptError) +NS_IMPL_ISUPPORTS(nsScriptError, nsIConsoleMessage, nsIScriptError) nsScriptError::nsScriptError() : mMessage(), diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp index 699e8c54576..92cadc55834 100644 --- a/js/xpconnect/src/nsXPConnect.cpp +++ b/js/xpconnect/src/nsXPConnect.cpp @@ -46,11 +46,11 @@ using namespace mozilla::dom; using namespace xpc; using namespace JS; -NS_IMPL_ISUPPORTS4(nsXPConnect, - nsIXPConnect, - nsISupportsWeakReference, - nsIThreadObserver, - nsIJSRuntimeService) +NS_IMPL_ISUPPORTS(nsXPConnect, + nsIXPConnect, + nsISupportsWeakReference, + nsIThreadObserver, + nsIJSRuntimeService) nsXPConnect* nsXPConnect::gSelf = nullptr; bool nsXPConnect::gOnceAliveNowDead = false; diff --git a/js/xpconnect/tests/components/native/xpctest_attributes.cpp b/js/xpconnect/tests/components/native/xpctest_attributes.cpp index 05ad6c6f326..224e7d1ca9c 100644 --- a/js/xpconnect/tests/components/native/xpctest_attributes.cpp +++ b/js/xpconnect/tests/components/native/xpctest_attributes.cpp @@ -6,7 +6,7 @@ #include "xpctest_private.h" -NS_IMPL_ISUPPORTS1(xpcTestObjectReadOnly, nsIXPCTestObjectReadOnly) +NS_IMPL_ISUPPORTS(xpcTestObjectReadOnly, nsIXPCTestObjectReadOnly) xpcTestObjectReadOnly :: xpcTestObjectReadOnly() { boolProperty = true; @@ -54,7 +54,7 @@ NS_IMETHODIMP xpcTestObjectReadOnly :: GetTimeReadOnly(PRTime *aTimeReadOnly){ return NS_OK; } -NS_IMPL_ISUPPORTS1(xpcTestObjectReadWrite, nsIXPCTestObjectReadWrite) +NS_IMPL_ISUPPORTS(xpcTestObjectReadWrite, nsIXPCTestObjectReadWrite) xpcTestObjectReadWrite :: xpcTestObjectReadWrite() { const char s[] = "XPConnect Read-Writable String"; diff --git a/js/xpconnect/tests/components/native/xpctest_params.cpp b/js/xpconnect/tests/components/native/xpctest_params.cpp index 3d595c87436..702014f1c75 100644 --- a/js/xpconnect/tests/components/native/xpctest_params.cpp +++ b/js/xpconnect/tests/components/native/xpctest_params.cpp @@ -6,7 +6,7 @@ #include "xpctest_interfaces.h" #include "js/Value.h" -NS_IMPL_ISUPPORTS1(nsXPCTestParams, nsIXPCTestParams) +NS_IMPL_ISUPPORTS(nsXPCTestParams, nsIXPCTestParams) nsXPCTestParams::nsXPCTestParams() { diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp index a8ff2164aff..5e22edd7c47 100644 --- a/layout/base/nsCaret.cpp +++ b/layout/base/nsCaret.cpp @@ -236,7 +236,7 @@ void nsCaret::Terminate() } //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsCaret, nsISelectionListener) +NS_IMPL_ISUPPORTS(nsCaret, nsISelectionListener) //----------------------------------------------------------------------------- nsISelection* nsCaret::GetCaretDOMSelection() diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp index a8325b6c857..72596494e58 100644 --- a/layout/base/nsDocumentViewer.cpp +++ b/layout/base/nsDocumentViewer.cpp @@ -3310,7 +3310,7 @@ nsDocumentViewer::GetContentSize(int32_t* aWidth, int32_t* aHeight) } -NS_IMPL_ISUPPORTS1(nsDocViewerSelectionListener, nsISelectionListener) +NS_IMPL_ISUPPORTS(nsDocViewerSelectionListener, nsISelectionListener) nsresult nsDocViewerSelectionListener::Init(nsDocumentViewer *aDocViewer) { @@ -3510,8 +3510,8 @@ NS_IMETHODIMP nsDocViewerSelectionListener::NotifySelectionChanged(nsIDOMDocumen } //nsDocViewerFocusListener -NS_IMPL_ISUPPORTS1(nsDocViewerFocusListener, - nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsDocViewerFocusListener, + nsIDOMEventListener) nsDocViewerFocusListener::nsDocViewerFocusListener() :mDocViewer(nullptr) diff --git a/layout/base/nsFrameTraversal.cpp b/layout/base/nsFrameTraversal.cpp index 837329eae67..f1cb49cec23 100644 --- a/layout/base/nsFrameTraversal.cpp +++ b/layout/base/nsFrameTraversal.cpp @@ -165,7 +165,7 @@ nsFrameTraversal::~nsFrameTraversal() { } -NS_IMPL_ISUPPORTS1(nsFrameTraversal,nsIFrameTraversal) +NS_IMPL_ISUPPORTS(nsFrameTraversal,nsIFrameTraversal) NS_IMETHODIMP nsFrameTraversal::NewFrameTraversal(nsIFrameEnumerator **aEnumerator, @@ -183,7 +183,7 @@ NS_IMETHODIMP // nsFrameIterator implementation -NS_IMPL_ISUPPORTS1(nsFrameIterator, nsIFrameEnumerator) +NS_IMPL_ISUPPORTS(nsFrameIterator, nsIFrameEnumerator) nsFrameIterator::nsFrameIterator(nsPresContext* aPresContext, nsIFrame *aStart, nsIteratorType aType, bool aLockInScrollView, diff --git a/layout/base/nsLayoutDebugger.cpp b/layout/base/nsLayoutDebugger.cpp index 635000fc41a..d1573191aca 100644 --- a/layout/base/nsLayoutDebugger.cpp +++ b/layout/base/nsLayoutDebugger.cpp @@ -65,7 +65,7 @@ nsLayoutDebugger::~nsLayoutDebugger() { } -NS_IMPL_ISUPPORTS1(nsLayoutDebugger, nsILayoutDebugger) +NS_IMPL_ISUPPORTS(nsLayoutDebugger, nsILayoutDebugger) NS_IMETHODIMP nsLayoutDebugger::SetShowFrameBorders(bool aEnable) diff --git a/layout/base/nsLayoutHistoryState.cpp b/layout/base/nsLayoutHistoryState.cpp index b8137eb3402..cf16a48e727 100644 --- a/layout/base/nsLayoutHistoryState.cpp +++ b/layout/base/nsLayoutHistoryState.cpp @@ -53,9 +53,9 @@ NS_NewLayoutHistoryState() return state.forget(); } -NS_IMPL_ISUPPORTS2(nsLayoutHistoryState, - nsILayoutHistoryState, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsLayoutHistoryState, + nsILayoutHistoryState, + nsISupportsWeakReference) void nsLayoutHistoryState::AddState(const nsCString& aStateKey, nsPresState* aState) diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index 04802cb0772..4df1c0749c6 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -758,10 +758,10 @@ PresShell::PresShell() mPaintingIsFrozen = false; } -NS_IMPL_ISUPPORTS7(PresShell, nsIPresShell, nsIDocumentObserver, - nsISelectionController, - nsISelectionDisplay, nsIObserver, nsISupportsWeakReference, - nsIMutationObserver) +NS_IMPL_ISUPPORTS(PresShell, nsIPresShell, nsIDocumentObserver, + nsISelectionController, + nsISelectionDisplay, nsIObserver, nsISupportsWeakReference, + nsIMutationObserver) PresShell::~PresShell() { @@ -3600,7 +3600,7 @@ private: PresShell* mShell; }; -NS_IMPL_ISUPPORTS1(PaintTimerCallBack, nsITimerCallback) +NS_IMPL_ISUPPORTS(PaintTimerCallBack, nsITimerCallback) void PresShell::ScheduleViewManagerFlush(PaintType aType) diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp index 0f5d6a03a08..da2bbedbbbb 100644 --- a/layout/base/nsRefreshDriver.cpp +++ b/layout/base/nsRefreshDriver.cpp @@ -990,7 +990,7 @@ nsRefreshDriver::ArrayFor(mozFlushType aFlushType) * nsISupports implementation */ -NS_IMPL_ISUPPORTS1(nsRefreshDriver, nsISupports) +NS_IMPL_ISUPPORTS(nsRefreshDriver, nsISupports) /* * nsITimerCallback implementation diff --git a/layout/base/nsStyleSheetService.cpp b/layout/base/nsStyleSheetService.cpp index 3c90c78b5b1..85f5f815ff6 100644 --- a/layout/base/nsStyleSheetService.cpp +++ b/layout/base/nsStyleSheetService.cpp @@ -42,7 +42,7 @@ nsStyleSheetService::~nsStyleSheetService() nsLayoutStatics::Release(); } -NS_IMPL_ISUPPORTS2( +NS_IMPL_ISUPPORTS( nsStyleSheetService, nsIStyleSheetService, nsIMemoryReporter) void diff --git a/layout/build/nsContentDLF.cpp b/layout/build/nsContentDLF.cpp index 361f459e121..d3081dd951f 100644 --- a/layout/build/nsContentDLF.cpp +++ b/layout/build/nsContentDLF.cpp @@ -111,8 +111,8 @@ nsContentDLF::~nsContentDLF() { } -NS_IMPL_ISUPPORTS1(nsContentDLF, - nsIDocumentLoaderFactory) +NS_IMPL_ISUPPORTS(nsContentDLF, + nsIDocumentLoaderFactory) bool MayUseXULXBL(nsIChannel* aChannel) diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp index 34cc8ba1d81..c91de9b4aa5 100644 --- a/layout/forms/nsComboboxControlFrame.cpp +++ b/layout/forms/nsComboboxControlFrame.cpp @@ -94,8 +94,8 @@ public: nsComboboxControlFrame* mComboBox; }; -NS_IMPL_ISUPPORTS1(nsComboButtonListener, - nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsComboButtonListener, + nsIDOMEventListener) // static class data member for Bug 32920 nsComboboxControlFrame* nsComboboxControlFrame::sFocused = nullptr; diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp index dacee8dd03e..b2ce5df1ff5 100644 --- a/layout/forms/nsFileControlFrame.cpp +++ b/layout/forms/nsFileControlFrame.cpp @@ -324,5 +324,5 @@ nsFileControlFrame::AccessibleType() //////////////////////////////////////////////////////////// // Mouse listener implementation -NS_IMPL_ISUPPORTS1(nsFileControlFrame::MouseListener, - nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsFileControlFrame::MouseListener, + nsIDOMEventListener) diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index ef7b904de36..e2847f9672e 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -2428,7 +2428,7 @@ nsListControlFrame::PostHandleKeyEvent(int32_t aNewIndex, * nsListEventListener *****************************************************************************/ -NS_IMPL_ISUPPORTS1(nsListEventListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsListEventListener, nsIDOMEventListener) NS_IMETHODIMP nsListEventListener::HandleEvent(nsIDOMEvent* aEvent) diff --git a/layout/generic/ScrollbarActivity.cpp b/layout/generic/ScrollbarActivity.cpp index 1def5db7b57..86ef7fc06fd 100644 --- a/layout/generic/ScrollbarActivity.cpp +++ b/layout/generic/ScrollbarActivity.cpp @@ -20,7 +20,7 @@ namespace mozilla { namespace layout { -NS_IMPL_ISUPPORTS1(ScrollbarActivity, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(ScrollbarActivity, nsIDOMEventListener) static bool GetForceAlwaysVisiblePref() diff --git a/layout/generic/nsBulletFrame.cpp b/layout/generic/nsBulletFrame.cpp index ee64fd7862e..65c1712939d 100644 --- a/layout/generic/nsBulletFrame.cpp +++ b/layout/generic/nsBulletFrame.cpp @@ -1893,7 +1893,7 @@ nsBulletFrame::GetBaseline() const -NS_IMPL_ISUPPORTS1(nsBulletListener, imgINotificationObserver) +NS_IMPL_ISUPPORTS(nsBulletListener, imgINotificationObserver) nsBulletListener::nsBulletListener() : mFrame(nullptr) diff --git a/layout/generic/nsFrameUtil.cpp b/layout/generic/nsFrameUtil.cpp index 7e05850f3ad..e9013c205ae 100644 --- a/layout/generic/nsFrameUtil.cpp +++ b/layout/generic/nsFrameUtil.cpp @@ -495,7 +495,7 @@ nsFrameUtil::~nsFrameUtil() { } -NS_IMPL_ISUPPORTS1(nsFrameUtil, nsIFrameUtil) +NS_IMPL_ISUPPORTS(nsFrameUtil, nsIFrameUtil) void nsFrameUtil::DumpNode(Node* aNode, FILE* aOutputFile, int32_t aIndent) diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp index 82647db8f1d..be77bceee01 100644 --- a/layout/generic/nsImageFrame.cpp +++ b/layout/generic/nsImageFrame.cpp @@ -1916,8 +1916,8 @@ nsresult nsImageFrame::LoadIcons(nsPresContext *aPresContext) return rv; } -NS_IMPL_ISUPPORTS2(nsImageFrame::IconLoad, nsIObserver, - imgINotificationObserver) +NS_IMPL_ISUPPORTS(nsImageFrame::IconLoad, nsIObserver, + imgINotificationObserver) static const char* kIconLoadPrefs[] = { "browser.display.force_inline_alttext", @@ -1992,7 +1992,7 @@ nsImageFrame::IconLoad::Notify(imgIRequest *aRequest, int32_t aType, const nsInt return NS_OK; } -NS_IMPL_ISUPPORTS1(nsImageListener, imgINotificationObserver) +NS_IMPL_ISUPPORTS(nsImageListener, imgINotificationObserver) nsImageListener::nsImageListener(nsImageFrame *aFrame) : mFrame(aFrame) diff --git a/layout/generic/nsImageMap.cpp b/layout/generic/nsImageMap.cpp index 5fd24485d20..c66516037be 100644 --- a/layout/generic/nsImageMap.cpp +++ b/layout/generic/nsImageMap.cpp @@ -660,9 +660,9 @@ nsImageMap::~nsImageMap() NS_ASSERTION(mAreas.Length() == 0, "Destroy was not called"); } -NS_IMPL_ISUPPORTS2(nsImageMap, - nsIMutationObserver, - nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsImageMap, + nsIMutationObserver, + nsIDOMEventListener) nsresult nsImageMap::GetBoundsForAreaContent(nsIContent *aContent, diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp index 57c05609a16..8faa68ff3fb 100644 --- a/layout/generic/nsSelection.cpp +++ b/layout/generic/nsSelection.cpp @@ -231,7 +231,7 @@ private: uint32_t mDelay; }; -NS_IMPL_ISUPPORTS1(nsAutoScrollTimer, nsITimerCallback) +NS_IMPL_ISUPPORTS(nsAutoScrollTimer, nsITimerCallback) nsresult NS_NewDomSelection(nsISelection **aDomSelection) { @@ -5830,7 +5830,7 @@ Selection::WrapObject(JSContext* aCx) nsAutoCopyListener* nsAutoCopyListener::sInstance = nullptr; -NS_IMPL_ISUPPORTS1(nsAutoCopyListener, nsISelectionListener) +NS_IMPL_ISUPPORTS(nsAutoCopyListener, nsISelectionListener) /* * What we do now: diff --git a/layout/inspector/inCSSValueSearch.cpp b/layout/inspector/inCSSValueSearch.cpp index 793c50e8fff..7db4fd9f81f 100644 --- a/layout/inspector/inCSSValueSearch.cpp +++ b/layout/inspector/inCSSValueSearch.cpp @@ -46,7 +46,7 @@ inCSSValueSearch::~inCSSValueSearch() nsCSSProps::ReleaseTable(); } -NS_IMPL_ISUPPORTS2(inCSSValueSearch, inISearchProcess, inICSSValueSearch) +NS_IMPL_ISUPPORTS(inCSSValueSearch, inISearchProcess, inICSSValueSearch) /////////////////////////////////////////////////////////////////////////////// // inISearchProcess diff --git a/layout/inspector/inDOMUtils.cpp b/layout/inspector/inDOMUtils.cpp index f2afe9d2f0e..e6858992edf 100644 --- a/layout/inspector/inDOMUtils.cpp +++ b/layout/inspector/inDOMUtils.cpp @@ -56,7 +56,7 @@ inDOMUtils::~inDOMUtils() { } -NS_IMPL_ISUPPORTS1(inDOMUtils, inIDOMUtils) +NS_IMPL_ISUPPORTS(inDOMUtils, inIDOMUtils) /////////////////////////////////////////////////////////////////////////////// // inIDOMUtils diff --git a/layout/inspector/inDOMView.cpp b/layout/inspector/inDOMView.cpp index 46288310d61..09f850c70c8 100644 --- a/layout/inspector/inDOMView.cpp +++ b/layout/inspector/inDOMView.cpp @@ -94,10 +94,10 @@ inDOMView::~inDOMView() //////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS3(inDOMView, - inIDOMView, - nsITreeView, - nsIMutationObserver) +NS_IMPL_ISUPPORTS(inDOMView, + inIDOMView, + nsITreeView, + nsIMutationObserver) //////////////////////////////////////////////////////////////////////// // inIDOMView diff --git a/layout/inspector/inDeepTreeWalker.cpp b/layout/inspector/inDeepTreeWalker.cpp index a1265f27376..81a24cf071a 100644 --- a/layout/inspector/inDeepTreeWalker.cpp +++ b/layout/inspector/inDeepTreeWalker.cpp @@ -37,9 +37,9 @@ inDeepTreeWalker::~inDeepTreeWalker() { } -NS_IMPL_ISUPPORTS2(inDeepTreeWalker, - inIDeepTreeWalker, - nsIDOMTreeWalker) +NS_IMPL_ISUPPORTS(inDeepTreeWalker, + inIDeepTreeWalker, + nsIDOMTreeWalker) //////////////////////////////////////////////////// // inIDeepTreeWalker diff --git a/layout/inspector/inFlasher.cpp b/layout/inspector/inFlasher.cpp index 85c27c857bf..fd2acafb6a9 100644 --- a/layout/inspector/inFlasher.cpp +++ b/layout/inspector/inFlasher.cpp @@ -30,7 +30,7 @@ inFlasher::~inFlasher() { } -NS_IMPL_ISUPPORTS1(inFlasher, inIFlasher) +NS_IMPL_ISUPPORTS(inFlasher, inIFlasher) /////////////////////////////////////////////////////////////////////////////// // inIFlasher diff --git a/layout/inspector/nsFontFace.cpp b/layout/inspector/nsFontFace.cpp index dfbed88b720..eb788d95b72 100644 --- a/layout/inspector/nsFontFace.cpp +++ b/layout/inspector/nsFontFace.cpp @@ -27,7 +27,7 @@ nsFontFace::~nsFontFace() //////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS1(nsFontFace, nsIDOMFontFace) +NS_IMPL_ISUPPORTS(nsFontFace, nsIDOMFontFace) //////////////////////////////////////////////////////////////////////// // nsIDOMFontFace diff --git a/layout/inspector/nsFontFaceList.cpp b/layout/inspector/nsFontFaceList.cpp index f74b8a28602..b0be644fad6 100644 --- a/layout/inspector/nsFontFaceList.cpp +++ b/layout/inspector/nsFontFaceList.cpp @@ -20,7 +20,7 @@ nsFontFaceList::~nsFontFaceList() //////////////////////////////////////////////////////////////////////// // nsISupports -NS_IMPL_ISUPPORTS1(nsFontFaceList, nsIDOMFontFaceList) +NS_IMPL_ISUPPORTS(nsFontFaceList, nsIDOMFontFaceList) //////////////////////////////////////////////////////////////////////// // nsIDOMFontFaceList diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp index b9184b9cb2a..bf994e2d440 100644 --- a/layout/mathml/nsMathMLChar.cpp +++ b/layout/mathml/nsMathMLChar.cpp @@ -600,7 +600,7 @@ private: nsTArray mPropertiesTableList; }; -NS_IMPL_ISUPPORTS1(nsGlyphTableList, nsIObserver) +NS_IMPL_ISUPPORTS(nsGlyphTableList, nsIObserver) // ----------------------------------------------------------------------------- // Here is the global list of applicable glyph tables that we will be using diff --git a/layout/mathml/nsMathMLmactionFrame.cpp b/layout/mathml/nsMathMLmactionFrame.cpp index 18daf52b4c4..d4562761a00 100644 --- a/layout/mathml/nsMathMLmactionFrame.cpp +++ b/layout/mathml/nsMathMLmactionFrame.cpp @@ -236,8 +236,8 @@ nsMathMLmactionFrame::AttributeChanged(int32_t aNameSpaceID, // Event handlers // ################################################################ -NS_IMPL_ISUPPORTS1(nsMathMLmactionFrame::MouseListener, - nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsMathMLmactionFrame::MouseListener, + nsIDOMEventListener) // helper to show a msg on the status bar diff --git a/layout/printing/nsPagePrintTimer.cpp b/layout/printing/nsPagePrintTimer.cpp index 39055fa5a95..01d44d86d81 100644 --- a/layout/printing/nsPagePrintTimer.cpp +++ b/layout/printing/nsPagePrintTimer.cpp @@ -8,7 +8,7 @@ #include "nsIServiceManager.h" #include "nsPrintEngine.h" -NS_IMPL_ISUPPORTS_INHERITED1(nsPagePrintTimer, nsRunnable, nsITimerCallback) +NS_IMPL_ISUPPORTS_INHERITED(nsPagePrintTimer, nsRunnable, nsITimerCallback) nsPagePrintTimer::~nsPagePrintTimer() { diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp index 110eb7d6cd6..b6887ce629c 100644 --- a/layout/printing/nsPrintEngine.cpp +++ b/layout/printing/nsPrintEngine.cpp @@ -216,8 +216,8 @@ protected: bool mSuppressed; }; -NS_IMPL_ISUPPORTS3(nsPrintEngine, nsIWebProgressListener, - nsISupportsWeakReference, nsIObserver) +NS_IMPL_ISUPPORTS(nsPrintEngine, nsIWebProgressListener, + nsISupportsWeakReference, nsIObserver) //--------------------------------------------------- //-- nsPrintEngine Class Impl diff --git a/layout/printing/nsPrintPreviewListener.cpp b/layout/printing/nsPrintPreviewListener.cpp index 14393b0d54f..121995d58ae 100644 --- a/layout/printing/nsPrintPreviewListener.cpp +++ b/layout/printing/nsPrintPreviewListener.cpp @@ -23,7 +23,7 @@ using namespace mozilla; using namespace mozilla::dom; -NS_IMPL_ISUPPORTS1(nsPrintPreviewListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsPrintPreviewListener, nsIDOMEventListener) // diff --git a/layout/style/AnimationCommon.cpp b/layout/style/AnimationCommon.cpp index 7dced2417b7..57ac817273b 100644 --- a/layout/style/AnimationCommon.cpp +++ b/layout/style/AnimationCommon.cpp @@ -78,7 +78,7 @@ CommonAnimationManager::RemoveAllElementData() * nsISupports implementation */ -NS_IMPL_ISUPPORTS1(CommonAnimationManager, nsIStyleRuleProcessor) +NS_IMPL_ISUPPORTS(CommonAnimationManager, nsIStyleRuleProcessor) nsRestyleHint CommonAnimationManager::HasStateDependentStyle(StateRuleProcessorData* aData) @@ -271,7 +271,7 @@ CommonAnimationManager::UpdateThrottledStyle(dom::Element* aElement, return newStyle; } -NS_IMPL_ISUPPORTS1(AnimValuesStyleRule, nsIStyleRule) +NS_IMPL_ISUPPORTS(AnimValuesStyleRule, nsIStyleRule) /* virtual */ void AnimValuesStyleRule::MapRuleInfoInto(nsRuleData* aRuleData) diff --git a/layout/style/Loader.cpp b/layout/style/Loader.cpp index ffb68dd877f..5d07f022f71 100644 --- a/layout/style/Loader.cpp +++ b/layout/style/Loader.cpp @@ -302,8 +302,8 @@ static const char* const gStateStrings[] = { /******************************** * SheetLoadData implementation * ********************************/ -NS_IMPL_ISUPPORTS3(SheetLoadData, nsIUnicharStreamLoaderObserver, nsIRunnable, - nsIThreadObserver) +NS_IMPL_ISUPPORTS(SheetLoadData, nsIUnicharStreamLoaderObserver, nsIRunnable, + nsIThreadObserver) SheetLoadData::SheetLoadData(Loader* aLoader, const nsSubstring& aTitle, diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp index 671e854305b..8d7b997bc29 100644 --- a/layout/style/StyleRule.cpp +++ b/layout/style/StyleRule.cpp @@ -933,7 +933,7 @@ ImportantRule::~ImportantRule() { } -NS_IMPL_ISUPPORTS1(ImportantRule, nsIStyleRule) +NS_IMPL_ISUPPORTS(ImportantRule, nsIStyleRule) /* virtual */ void ImportantRule::MapRuleInfoInto(nsRuleData* aRuleData) diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp index 63de56de2d8..c6585235244 100644 --- a/layout/style/nsCSSRuleProcessor.cpp +++ b/layout/style/nsCSSRuleProcessor.cpp @@ -1088,7 +1088,7 @@ nsCSSRuleProcessor::~nsCSSRuleProcessor() ClearRuleCascades(); } -NS_IMPL_ISUPPORTS1(nsCSSRuleProcessor, nsIStyleRuleProcessor) +NS_IMPL_ISUPPORTS(nsCSSRuleProcessor, nsIStyleRuleProcessor) /* static */ nsresult nsCSSRuleProcessor::Startup() diff --git a/layout/style/nsDOMCSSDeclaration.cpp b/layout/style/nsDOMCSSDeclaration.cpp index 25b4f464596..ea32324cac0 100644 --- a/layout/style/nsDOMCSSDeclaration.cpp +++ b/layout/style/nsDOMCSSDeclaration.cpp @@ -32,9 +32,9 @@ nsDOMCSSDeclaration::WrapObject(JSContext* aCx) } NS_INTERFACE_TABLE_HEAD(nsDOMCSSDeclaration) - NS_INTERFACE_TABLE2(nsDOMCSSDeclaration, - nsICSSDeclaration, - nsIDOMCSSStyleDeclaration) + NS_INTERFACE_TABLE(nsDOMCSSDeclaration, + nsICSSDeclaration, + nsIDOMCSSStyleDeclaration) NS_INTERFACE_TABLE_TO_MAP_SEGUE NS_INTERFACE_MAP_END diff --git a/layout/style/nsFontFaceLoader.cpp b/layout/style/nsFontFaceLoader.cpp index 474914e7bf8..5db16bd38ed 100644 --- a/layout/style/nsFontFaceLoader.cpp +++ b/layout/style/nsFontFaceLoader.cpp @@ -156,7 +156,7 @@ nsFontFaceLoader::LoadTimerCallback(nsITimer* aTimer, void* aClosure) } } -NS_IMPL_ISUPPORTS1(nsFontFaceLoader, nsIStreamLoaderObserver) +NS_IMPL_ISUPPORTS(nsFontFaceLoader, nsIStreamLoaderObserver) NS_IMETHODIMP nsFontFaceLoader::OnStreamComplete(nsIStreamLoader* aLoader, diff --git a/layout/style/nsHTMLCSSStyleSheet.cpp b/layout/style/nsHTMLCSSStyleSheet.cpp index 9a1806772df..a67bb462599 100644 --- a/layout/style/nsHTMLCSSStyleSheet.cpp +++ b/layout/style/nsHTMLCSSStyleSheet.cpp @@ -49,7 +49,7 @@ nsHTMLCSSStyleSheet::~nsHTMLCSSStyleSheet() mCachedStyleAttrs.Enumerate(ClearAttrCache, nullptr); } -NS_IMPL_ISUPPORTS1(nsHTMLCSSStyleSheet, nsIStyleRuleProcessor) +NS_IMPL_ISUPPORTS(nsHTMLCSSStyleSheet, nsIStyleRuleProcessor) /* virtual */ void nsHTMLCSSStyleSheet::RulesMatching(ElementRuleProcessorData* aData) diff --git a/layout/style/nsHTMLStyleSheet.cpp b/layout/style/nsHTMLStyleSheet.cpp index c9178041313..d8af666e9ce 100644 --- a/layout/style/nsHTMLStyleSheet.cpp +++ b/layout/style/nsHTMLStyleSheet.cpp @@ -38,7 +38,7 @@ using namespace mozilla; using namespace mozilla::dom; -NS_IMPL_ISUPPORTS1(nsHTMLStyleSheet::HTMLColorRule, nsIStyleRule) +NS_IMPL_ISUPPORTS(nsHTMLStyleSheet::HTMLColorRule, nsIStyleRule) /* virtual */ void nsHTMLStyleSheet::HTMLColorRule::MapRuleInfoInto(nsRuleData* aRuleData) @@ -61,7 +61,7 @@ nsHTMLStyleSheet::HTMLColorRule::List(FILE* out, int32_t aIndent) const #endif -NS_IMPL_ISUPPORTS1(nsHTMLStyleSheet::GenericTableRule, nsIStyleRule) +NS_IMPL_ISUPPORTS(nsHTMLStyleSheet::GenericTableRule, nsIStyleRule) #ifdef DEBUG /* virtual */ void @@ -98,7 +98,7 @@ nsHTMLStyleSheet::TableQuirkColorRule::MapRuleInfoInto(nsRuleData* aRuleData) } -NS_IMPL_ISUPPORTS1(nsHTMLStyleSheet::LangRule, nsIStyleRule) +NS_IMPL_ISUPPORTS(nsHTMLStyleSheet::LangRule, nsIStyleRule) /* virtual */ void nsHTMLStyleSheet::LangRule::MapRuleInfoInto(nsRuleData* aRuleData) @@ -246,7 +246,7 @@ nsHTMLStyleSheet::~nsHTMLStyleSheet() PL_DHashTableFinish(&mMappedAttrTable); } -NS_IMPL_ISUPPORTS1(nsHTMLStyleSheet, nsIStyleRuleProcessor) +NS_IMPL_ISUPPORTS(nsHTMLStyleSheet, nsIStyleRuleProcessor) /* virtual */ void nsHTMLStyleSheet::RulesMatching(ElementRuleProcessorData* aData) diff --git a/layout/style/nsLayoutStylesheetCache.cpp b/layout/style/nsLayoutStylesheetCache.cpp index df700c07269..7c0a6e2703f 100644 --- a/layout/style/nsLayoutStylesheetCache.cpp +++ b/layout/style/nsLayoutStylesheetCache.cpp @@ -23,7 +23,7 @@ static bool sNumberControlEnabled; #define NUMBER_CONTROL_PREF "dom.forms.number" -NS_IMPL_ISUPPORTS2( +NS_IMPL_ISUPPORTS( nsLayoutStylesheetCache, nsIObserver, nsIMemoryReporter) nsresult diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp index c5c1f2da388..4524edc252c 100644 --- a/layout/style/nsStyleSet.cpp +++ b/layout/style/nsStyleSet.cpp @@ -38,7 +38,7 @@ using namespace mozilla; using namespace mozilla::dom; -NS_IMPL_ISUPPORTS1(nsEmptyStyleRule, nsIStyleRule) +NS_IMPL_ISUPPORTS(nsEmptyStyleRule, nsIStyleRule) /* virtual */ void nsEmptyStyleRule::MapRuleInfoInto(nsRuleData* aRuleData) @@ -54,7 +54,7 @@ nsEmptyStyleRule::List(FILE* out, int32_t aIndent) const } #endif -NS_IMPL_ISUPPORTS1(nsInitialStyleRule, nsIStyleRule) +NS_IMPL_ISUPPORTS(nsInitialStyleRule, nsIStyleRule) /* virtual */ void nsInitialStyleRule::MapRuleInfoInto(nsRuleData* aRuleData) @@ -104,7 +104,7 @@ nsInitialStyleRule::List(FILE* out, int32_t aIndent) const } #endif -NS_IMPL_ISUPPORTS1(nsDisableTextZoomStyleRule, nsIStyleRule) +NS_IMPL_ISUPPORTS(nsDisableTextZoomStyleRule, nsIStyleRule) /* virtual */ void nsDisableTextZoomStyleRule::MapRuleInfoInto(nsRuleData* aRuleData) diff --git a/layout/svg/SVGTextFrame.cpp b/layout/svg/SVGTextFrame.cpp index ff993a7d4db..721e699f71b 100644 --- a/layout/svg/SVGTextFrame.cpp +++ b/layout/svg/SVGTextFrame.cpp @@ -3315,7 +3315,7 @@ SVGTextFrame::ScheduleReflowSVGNonDisplayText() f, nsIPresShell::eStyleChange, NS_FRAME_IS_DIRTY); } -NS_IMPL_ISUPPORTS1(SVGTextFrame::MutationObserver, nsIMutationObserver) +NS_IMPL_ISUPPORTS(SVGTextFrame::MutationObserver, nsIMutationObserver) void SVGTextFrame::MutationObserver::ContentAppended(nsIDocument* aDocument, diff --git a/layout/svg/nsSVGEffects.cpp b/layout/svg/nsSVGEffects.cpp index 3e75ce20167..fdb2aebd102 100644 --- a/layout/svg/nsSVGEffects.cpp +++ b/layout/svg/nsSVGEffects.cpp @@ -21,7 +21,7 @@ using namespace mozilla; using namespace mozilla::dom; // nsSVGRenderingObserver impl -NS_IMPL_ISUPPORTS1(nsSVGRenderingObserver, nsIMutationObserver) +NS_IMPL_ISUPPORTS(nsSVGRenderingObserver, nsIMutationObserver) void nsSVGRenderingObserver::StartListening() @@ -214,7 +214,7 @@ nsSVGRenderingObserver::ContentRemoved(nsIDocument *aDocument, DoUpdate(); } -NS_IMPL_ISUPPORTS1(nsSVGFilterProperty, nsISupports) +NS_IMPL_ISUPPORTS(nsSVGFilterProperty, nsISupports) nsSVGFilterProperty::nsSVGFilterProperty(const nsTArray &aFilters, nsIFrame *aFilteredFrame) : @@ -266,9 +266,9 @@ nsSVGFilterProperty::Invalidate() } } -NS_IMPL_ISUPPORTS_INHERITED1(nsSVGFilterReference, - nsSVGIDRenderingObserver, - nsISVGFilterReference); +NS_IMPL_ISUPPORTS_INHERITED(nsSVGFilterReference, + nsSVGIDRenderingObserver, + nsISVGFilterReference); nsSVGFilterFrame * nsSVGFilterReference::GetFilterFrame() diff --git a/layout/svg/nsSVGImageFrame.cpp b/layout/svg/nsSVGImageFrame.cpp index 617e50fc45d..78e36c74b47 100644 --- a/layout/svg/nsSVGImageFrame.cpp +++ b/layout/svg/nsSVGImageFrame.cpp @@ -569,7 +569,7 @@ nsSVGImageFrame::GetHitTestFlags() //---------------------------------------------------------------------- // nsSVGImageListener implementation -NS_IMPL_ISUPPORTS1(nsSVGImageListener, imgINotificationObserver) +NS_IMPL_ISUPPORTS(nsSVGImageListener, imgINotificationObserver) nsSVGImageListener::nsSVGImageListener(nsSVGImageFrame *aFrame) : mFrame(aFrame) { diff --git a/layout/tools/layout-debug/src/nsLayoutDebugCLH.cpp b/layout/tools/layout-debug/src/nsLayoutDebugCLH.cpp index 74d3b090fd0..757570254e3 100644 --- a/layout/tools/layout-debug/src/nsLayoutDebugCLH.cpp +++ b/layout/tools/layout-debug/src/nsLayoutDebugCLH.cpp @@ -23,7 +23,7 @@ nsLayoutDebugCLH::~nsLayoutDebugCLH() { } -NS_IMPL_ISUPPORTS1(nsLayoutDebugCLH, ICOMMANDLINEHANDLER) +NS_IMPL_ISUPPORTS(nsLayoutDebugCLH, ICOMMANDLINEHANDLER) NS_IMETHODIMP nsLayoutDebugCLH::Handle(nsICommandLine* aCmdLine) diff --git a/layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp b/layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp index 0a73427ce68..928d8606e5f 100644 --- a/layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp +++ b/layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp @@ -94,7 +94,7 @@ nsLayoutDebuggingTools::~nsLayoutDebuggingTools() { } -NS_IMPL_ISUPPORTS1(nsLayoutDebuggingTools, nsILayoutDebuggingTools) +NS_IMPL_ISUPPORTS(nsLayoutDebuggingTools, nsILayoutDebuggingTools) NS_IMETHODIMP nsLayoutDebuggingTools::Init(nsIDOMWindow *aWin) diff --git a/layout/tools/layout-debug/src/nsRegressionTester.cpp b/layout/tools/layout-debug/src/nsRegressionTester.cpp index a0a44addab3..c0d9d7eeb23 100644 --- a/layout/tools/layout-debug/src/nsRegressionTester.cpp +++ b/layout/tools/layout-debug/src/nsRegressionTester.cpp @@ -38,7 +38,7 @@ nsRegressionTester::~nsRegressionTester() { } -NS_IMPL_ISUPPORTS1(nsRegressionTester, nsILayoutRegressionTester) +NS_IMPL_ISUPPORTS(nsRegressionTester, nsILayoutRegressionTester) NS_IMETHODIMP nsRegressionTester::DumpFrameModel(nsIDOMWindow *aWindowToDump, diff --git a/layout/xul/nsBoxLayout.cpp b/layout/xul/nsBoxLayout.cpp index 223cef7f5f4..4783f0269c7 100644 --- a/layout/xul/nsBoxLayout.cpp +++ b/layout/xul/nsBoxLayout.cpp @@ -91,4 +91,4 @@ nsBoxLayout::AddSmallestSize(nsSize& aSize, const nsSize& aSize2) aSize.height = aSize2.height; } -NS_IMPL_ISUPPORTS1(nsBoxLayout, nsBoxLayout) +NS_IMPL_ISUPPORTS(nsBoxLayout, nsBoxLayout) diff --git a/layout/xul/nsImageBoxFrame.cpp b/layout/xul/nsImageBoxFrame.cpp index c733ca5efbb..8321c55b884 100644 --- a/layout/xul/nsImageBoxFrame.cpp +++ b/layout/xul/nsImageBoxFrame.cpp @@ -729,7 +729,7 @@ nsresult nsImageBoxFrame::FrameChanged(imgIRequest *aRequest) return NS_OK; } -NS_IMPL_ISUPPORTS2(nsImageBoxListener, imgINotificationObserver, imgIOnloadBlocker) +NS_IMPL_ISUPPORTS(nsImageBoxListener, imgINotificationObserver, imgIOnloadBlocker) nsImageBoxListener::nsImageBoxListener() { diff --git a/layout/xul/nsListBoxBodyFrame.cpp b/layout/xul/nsListBoxBodyFrame.cpp index 677fe3c266a..14234f61e95 100644 --- a/layout/xul/nsListBoxBodyFrame.cpp +++ b/layout/xul/nsListBoxBodyFrame.cpp @@ -132,7 +132,7 @@ nsListScrollSmoother::Stop() } } -NS_IMPL_ISUPPORTS1(nsListScrollSmoother, nsITimerCallback) +NS_IMPL_ISUPPORTS(nsListScrollSmoother, nsITimerCallback) /////////////// nsListBoxBodyFrame ////////////////// diff --git a/layout/xul/nsListBoxObject.cpp b/layout/xul/nsListBoxObject.cpp index 8464e29f21a..798978cabc6 100644 --- a/layout/xul/nsListBoxObject.cpp +++ b/layout/xul/nsListBoxObject.cpp @@ -34,8 +34,8 @@ protected: nsListBoxBodyFrame *mListBoxBody; }; -NS_IMPL_ISUPPORTS_INHERITED2(nsListBoxObject, nsBoxObject, nsIListBoxObject, - nsPIListBoxObject) +NS_IMPL_ISUPPORTS_INHERITED(nsListBoxObject, nsBoxObject, nsIListBoxObject, + nsPIListBoxObject) nsListBoxObject::nsListBoxObject() : mListBoxBody(nullptr) diff --git a/layout/xul/nsMenuBarListener.cpp b/layout/xul/nsMenuBarListener.cpp index a1c87437c7a..a396fcabffe 100644 --- a/layout/xul/nsMenuBarListener.cpp +++ b/layout/xul/nsMenuBarListener.cpp @@ -27,7 +27,7 @@ using namespace mozilla; * nsMenuBarListener implementation */ -NS_IMPL_ISUPPORTS1(nsMenuBarListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsMenuBarListener, nsIDOMEventListener) #define MODIFIER_SHIFT 1 #define MODIFIER_CONTROL 2 diff --git a/layout/xul/nsMenuBoxObject.cpp b/layout/xul/nsMenuBoxObject.cpp index 3d506969851..837a0fbf176 100644 --- a/layout/xul/nsMenuBoxObject.cpp +++ b/layout/xul/nsMenuBoxObject.cpp @@ -31,7 +31,7 @@ nsMenuBoxObject::~nsMenuBoxObject() { } -NS_IMPL_ISUPPORTS_INHERITED1(nsMenuBoxObject, nsBoxObject, nsIMenuBoxObject) +NS_IMPL_ISUPPORTS_INHERITED(nsMenuBoxObject, nsBoxObject, nsIMenuBoxObject) /* void openMenu (in boolean openFlag); */ NS_IMETHODIMP nsMenuBoxObject::OpenMenu(bool aOpenFlag) diff --git a/layout/xul/nsMenuFrame.cpp b/layout/xul/nsMenuFrame.cpp index c6d0a2a1a88..ebd7343c550 100644 --- a/layout/xul/nsMenuFrame.cpp +++ b/layout/xul/nsMenuFrame.cpp @@ -1467,7 +1467,7 @@ nsIScrollableFrame* nsMenuFrame::GetScrollTargetFrame() } // nsMenuTimerMediator implementation. -NS_IMPL_ISUPPORTS1(nsMenuTimerMediator, nsITimerCallback) +NS_IMPL_ISUPPORTS(nsMenuTimerMediator, nsITimerCallback) /** * Constructs a wrapper around an nsMenuFrame. diff --git a/layout/xul/nsPopupBoxObject.cpp b/layout/xul/nsPopupBoxObject.cpp index 8d88f6591ef..ee446002041 100644 --- a/layout/xul/nsPopupBoxObject.cpp +++ b/layout/xul/nsPopupBoxObject.cpp @@ -33,7 +33,7 @@ protected: nsPopupSetFrame* GetPopupSetFrame(); }; -NS_IMPL_ISUPPORTS_INHERITED1(nsPopupBoxObject, nsBoxObject, nsIPopupBoxObject) +NS_IMPL_ISUPPORTS_INHERITED(nsPopupBoxObject, nsBoxObject, nsIPopupBoxObject) nsPopupSetFrame* nsPopupBoxObject::GetPopupSetFrame() diff --git a/layout/xul/nsRepeatService.cpp b/layout/xul/nsRepeatService.cpp index e54ead6843b..919763d4dc0 100644 --- a/layout/xul/nsRepeatService.cpp +++ b/layout/xul/nsRepeatService.cpp @@ -83,4 +83,4 @@ NS_IMETHODIMP nsRepeatService::Notify(nsITimer *timer) return NS_OK; } -NS_IMPL_ISUPPORTS1(nsRepeatService, nsITimerCallback) +NS_IMPL_ISUPPORTS(nsRepeatService, nsITimerCallback) diff --git a/layout/xul/nsSliderFrame.cpp b/layout/xul/nsSliderFrame.cpp index a4a49229add..b3a259631a3 100644 --- a/layout/xul/nsSliderFrame.cpp +++ b/layout/xul/nsSliderFrame.cpp @@ -1157,5 +1157,5 @@ void nsSliderFrame::Notify(void) } } -NS_IMPL_ISUPPORTS1(nsSliderMediator, - nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsSliderMediator, + nsIDOMEventListener) diff --git a/layout/xul/nsSplitterFrame.cpp b/layout/xul/nsSplitterFrame.cpp index 2081209bcf8..d686b698ee9 100644 --- a/layout/xul/nsSplitterFrame.cpp +++ b/layout/xul/nsSplitterFrame.cpp @@ -124,7 +124,7 @@ public: }; -NS_IMPL_ISUPPORTS1(nsSplitterFrameInner, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsSplitterFrameInner, nsIDOMEventListener) nsSplitterFrameInner::ResizeType nsSplitterFrameInner::GetResizeBefore() diff --git a/layout/xul/nsXULPopupManager.cpp b/layout/xul/nsXULPopupManager.cpp index 6e369256fee..b18672dff82 100644 --- a/layout/xul/nsXULPopupManager.cpp +++ b/layout/xul/nsXULPopupManager.cpp @@ -109,10 +109,10 @@ void nsMenuChainItem::Detach(nsMenuChainItem** aRoot) } } -NS_IMPL_ISUPPORTS3(nsXULPopupManager, - nsIDOMEventListener, - nsITimerCallback, - nsIObserver) +NS_IMPL_ISUPPORTS(nsXULPopupManager, + nsIDOMEventListener, + nsITimerCallback, + nsIObserver) nsXULPopupManager::nsXULPopupManager() : mRangeOffset(0), diff --git a/layout/xul/nsXULTooltipListener.cpp b/layout/xul/nsXULTooltipListener.cpp index 76d7be2e103..0c564ec7244 100644 --- a/layout/xul/nsXULTooltipListener.cpp +++ b/layout/xul/nsXULTooltipListener.cpp @@ -72,7 +72,7 @@ nsXULTooltipListener::~nsXULTooltipListener() } } -NS_IMPL_ISUPPORTS1(nsXULTooltipListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(nsXULTooltipListener, nsIDOMEventListener) void nsXULTooltipListener::MouseOut(nsIDOMEvent* aEvent) diff --git a/layout/xul/tree/nsTreeImageListener.cpp b/layout/xul/tree/nsTreeImageListener.cpp index 1680a4b5bc5..2a8ab08fd38 100644 --- a/layout/xul/tree/nsTreeImageListener.cpp +++ b/layout/xul/tree/nsTreeImageListener.cpp @@ -8,7 +8,7 @@ #include "imgIRequest.h" #include "imgIContainer.h" -NS_IMPL_ISUPPORTS1(nsTreeImageListener, imgINotificationObserver) +NS_IMPL_ISUPPORTS(nsTreeImageListener, imgINotificationObserver) nsTreeImageListener::nsTreeImageListener(nsTreeBodyFrame* aTreeFrame) : mTreeFrame(aTreeFrame), diff --git a/media/mtransport/nr_socket_prsock.cpp b/media/mtransport/nr_socket_prsock.cpp index ef95159ad9b..62c8c171b27 100644 --- a/media/mtransport/nr_socket_prsock.cpp +++ b/media/mtransport/nr_socket_prsock.cpp @@ -657,7 +657,7 @@ abort: } // NrSocketIpc Implementation -NS_IMPL_ISUPPORTS1(NrSocketIpc, nsIUDPSocketInternal) +NS_IMPL_ISUPPORTS(NrSocketIpc, nsIUDPSocketInternal) NrSocketIpc::NrSocketIpc(const nsCOMPtr &main_thread) : err_(false), diff --git a/media/mtransport/nr_timer.cpp b/media/mtransport/nr_timer.cpp index 96518b5eed7..ea495b1c41d 100644 --- a/media/mtransport/nr_timer.cpp +++ b/media/mtransport/nr_timer.cpp @@ -90,7 +90,7 @@ protected: int line_; }; -NS_IMPL_ISUPPORTS1(nrappkitTimerCallback, nsITimerCallback) +NS_IMPL_ISUPPORTS(nrappkitTimerCallback, nsITimerCallback) NS_IMETHODIMP nrappkitTimerCallback::Notify(nsITimer *timer) { r_log(LOG_GENERIC, LOG_DEBUG, "Timer callback fired (set in %s:%d)", diff --git a/media/mtransport/nriceresolver.cpp b/media/mtransport/nriceresolver.cpp index 7814bf93e1d..d4912cfca2e 100644 --- a/media/mtransport/nriceresolver.cpp +++ b/media/mtransport/nriceresolver.cpp @@ -218,5 +218,5 @@ int NrIceResolver::PendingResolution::cancel() { return 0; } -NS_IMPL_ISUPPORTS1(NrIceResolver::PendingResolution, nsIDNSListener); +NS_IMPL_ISUPPORTS(NrIceResolver::PendingResolution, nsIDNSListener); } // End of namespace mozilla diff --git a/media/mtransport/stun_udp_socket_filter.cpp b/media/mtransport/stun_udp_socket_filter.cpp index c5d217ed703..af1796de4cc 100644 --- a/media/mtransport/stun_udp_socket_filter.cpp +++ b/media/mtransport/stun_udp_socket_filter.cpp @@ -100,7 +100,7 @@ class STUNUDPSocketFilter : public nsIUDPSocketFilter { std::set response_allowed_; }; -NS_IMPL_ISUPPORTS1(STUNUDPSocketFilter, nsIUDPSocketFilter) +NS_IMPL_ISUPPORTS(STUNUDPSocketFilter, nsIUDPSocketFilter) NS_IMETHODIMP STUNUDPSocketFilter::FilterPacket(const mozilla::net::NetAddr *remote_addr, @@ -194,7 +194,7 @@ bool STUNUDPSocketFilter::filter_outgoing_packet(const mozilla::net::NetAddr *re } // anonymous namespace -NS_IMPL_ISUPPORTS1(nsStunUDPSocketFilterHandler, nsIUDPSocketFilterHandler) +NS_IMPL_ISUPPORTS(nsStunUDPSocketFilterHandler, nsIUDPSocketFilterHandler) NS_IMETHODIMP nsStunUDPSocketFilterHandler::NewFilter(nsIUDPSocketFilter **result) { diff --git a/media/mtransport/test/sctp_unittest.cpp b/media/mtransport/test/sctp_unittest.cpp index 034e7875fa9..c2c35b643e3 100644 --- a/media/mtransport/test/sctp_unittest.cpp +++ b/media/mtransport/test/sctp_unittest.cpp @@ -57,7 +57,7 @@ class SendPeriodic : public nsITimerCallback { int to_send_; }; -NS_IMPL_ISUPPORTS1(SendPeriodic, nsITimerCallback) +NS_IMPL_ISUPPORTS(SendPeriodic, nsITimerCallback) class TransportTestPeer : public sigslot::has_slots<> { diff --git a/media/mtransport/transportlayerloopback.cpp b/media/mtransport/transportlayerloopback.cpp index 4f4e81bf339..a1a3d2ccdc6 100644 --- a/media/mtransport/transportlayerloopback.cpp +++ b/media/mtransport/transportlayerloopback.cpp @@ -108,7 +108,7 @@ void TransportLayerLoopback::DeliverPackets() { } } -NS_IMPL_ISUPPORTS1(TransportLayerLoopback::Deliverer, nsITimerCallback) +NS_IMPL_ISUPPORTS(TransportLayerLoopback::Deliverer, nsITimerCallback) NS_IMETHODIMP TransportLayerLoopback::Deliverer::Notify(nsITimer *timer) { if (!layer_) diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp index c4d7cbc2841..6d58a026081 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp @@ -159,7 +159,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(PeerConnectionCtxShutdown, nsIObserver); +NS_IMPL_ISUPPORTS(PeerConnectionCtxShutdown, nsIObserver); } using namespace mozilla; diff --git a/media/webrtc/signaling/test/FakeMediaStreamsImpl.h b/media/webrtc/signaling/test/FakeMediaStreamsImpl.h index d3952528c1d..a1e5fa8b071 100644 --- a/media/webrtc/signaling/test/FakeMediaStreamsImpl.h +++ b/media/webrtc/signaling/test/FakeMediaStreamsImpl.h @@ -16,7 +16,7 @@ void LogLatency(AsyncLatencyLogger::LatencyLogIndex index, uint64_t b, int64_t c static const int AUDIO_BUFFER_SIZE = 1600; static const int NUM_CHANNELS = 2; -NS_IMPL_ISUPPORTS1(Fake_DOMMediaStream, nsIDOMMediaStream) +NS_IMPL_ISUPPORTS(Fake_DOMMediaStream, nsIDOMMediaStream) // Fake_SourceMediaStream nsresult Fake_SourceMediaStream::Start() { @@ -109,7 +109,7 @@ void Fake_AudioStreamSource::Periodic() { // Fake_MediaPeriodic -NS_IMPL_ISUPPORTS1(Fake_MediaPeriodic, nsITimerCallback) +NS_IMPL_ISUPPORTS(Fake_MediaPeriodic, nsITimerCallback) NS_IMETHODIMP Fake_MediaPeriodic::Notify(nsITimer *timer) { diff --git a/media/webrtc/signaling/test/signaling_unittests.cpp b/media/webrtc/signaling/test/signaling_unittests.cpp index 2576907e5a6..a588cad6f26 100644 --- a/media/webrtc/signaling/test/signaling_unittests.cpp +++ b/media/webrtc/signaling/test/signaling_unittests.cpp @@ -255,7 +255,7 @@ public: NS_IMETHODIMP OnIceCandidate(uint16_t level, const char *mid, const char *cand, ER&); }; -NS_IMPL_ISUPPORTS1(TestObserver, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(TestObserver, nsISupportsWeakReference) NS_IMETHODIMP TestObserver::OnCreateOfferSuccess(const char* offer, ER&) diff --git a/mobile/android/components/build/nsAndroidHistory.cpp b/mobile/android/components/build/nsAndroidHistory.cpp index db49ef53b91..6ee73a48963 100644 --- a/mobile/android/components/build/nsAndroidHistory.cpp +++ b/mobile/android/components/build/nsAndroidHistory.cpp @@ -15,7 +15,7 @@ using namespace mozilla; using mozilla::dom::Link; -NS_IMPL_ISUPPORTS2(nsAndroidHistory, IHistory, nsIRunnable) +NS_IMPL_ISUPPORTS(nsAndroidHistory, IHistory, nsIRunnable) nsAndroidHistory* nsAndroidHistory::sHistory = nullptr; diff --git a/mobile/android/components/build/nsShellService.cpp b/mobile/android/components/build/nsShellService.cpp index df24e9bdd6c..96949483e2c 100644 --- a/mobile/android/components/build/nsShellService.cpp +++ b/mobile/android/components/build/nsShellService.cpp @@ -10,7 +10,7 @@ using namespace mozilla::widget::android; -NS_IMPL_ISUPPORTS1(nsShellService, nsIShellService) +NS_IMPL_ISUPPORTS(nsShellService, nsIShellService) NS_IMETHODIMP nsShellService::SwitchTask() diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp index 05ea619a342..4fc562ea76d 100644 --- a/modules/libjar/nsJAR.cpp +++ b/modules/libjar/nsJAR.cpp @@ -91,7 +91,7 @@ nsJAR::~nsJAR() Close(); } -NS_IMPL_QUERY_INTERFACE1(nsJAR, nsIZipReader) +NS_IMPL_QUERY_INTERFACE(nsJAR, nsIZipReader) NS_IMPL_ADDREF(nsJAR) // Custom Release method works with nsZipReaderCache... @@ -847,7 +847,7 @@ nsresult nsJAR::CalculateDigest(const char* aInBuf, uint32_t aLen, return hasher->Finish(true, digest); } -NS_IMPL_ISUPPORTS1(nsJAREnumerator, nsIUTF8StringEnumerator) +NS_IMPL_ISUPPORTS(nsJAREnumerator, nsIUTF8StringEnumerator) //---------------------------------------------- // nsJAREnumerator::HasMore @@ -889,7 +889,7 @@ nsJAREnumerator::GetNext(nsACString& aResult) } -NS_IMPL_ISUPPORTS1(nsJARItem, nsIZipEntry) +NS_IMPL_ISUPPORTS(nsJARItem, nsIZipEntry) nsJARItem::nsJARItem(nsZipItem* aZipItem) : mSize(aZipItem->Size()), @@ -1002,7 +1002,7 @@ nsJARItem::GetPermissions(uint32_t* aPermissions) //////////////////////////////////////////////////////////////////////////////// // nsIZipReaderCache -NS_IMPL_ISUPPORTS3(nsZipReaderCache, nsIZipReaderCache, nsIObserver, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsZipReaderCache, nsIZipReaderCache, nsIObserver, nsISupportsWeakReference) nsZipReaderCache::nsZipReaderCache() : mLock("nsZipReaderCache.mLock") diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp index 05d868a42c3..d1909737816 100644 --- a/modules/libjar/nsJARChannel.cpp +++ b/modules/libjar/nsJARChannel.cpp @@ -104,7 +104,7 @@ private: int64_t mContentLength; }; -NS_IMPL_ISUPPORTS1(nsJARInputThunk, nsIInputStream) +NS_IMPL_ISUPPORTS(nsJARInputThunk, nsIInputStream) nsresult nsJARInputThunk::Init() @@ -216,15 +216,15 @@ nsJARChannel::~nsJARChannel() NS_RELEASE(handler); // nullptr parameter } -NS_IMPL_ISUPPORTS_INHERITED7(nsJARChannel, - nsHashPropertyBag, - nsIRequest, - nsIChannel, - nsIStreamListener, - nsIRequestObserver, - nsIDownloadObserver, - nsIRemoteOpenFileListener, - nsIJARChannel) +NS_IMPL_ISUPPORTS_INHERITED(nsJARChannel, + nsHashPropertyBag, + nsIRequest, + nsIChannel, + nsIStreamListener, + nsIRequestObserver, + nsIDownloadObserver, + nsIRemoteOpenFileListener, + nsIJARChannel) nsresult nsJARChannel::Init(nsIURI *uri) diff --git a/modules/libjar/nsJARInputStream.cpp b/modules/libjar/nsJARInputStream.cpp index 0834a4ab6b3..62d24d7edd6 100644 --- a/modules/libjar/nsJARInputStream.cpp +++ b/modules/libjar/nsJARInputStream.cpp @@ -22,7 +22,7 @@ * nsISupports implementation *--------------------------------------------*/ -NS_IMPL_ISUPPORTS1(nsJARInputStream, nsIInputStream) +NS_IMPL_ISUPPORTS(nsJARInputStream, nsIInputStream) /*---------------------------------------------------------- * nsJARInputStream implementation diff --git a/modules/libjar/nsJARProtocolHandler.cpp b/modules/libjar/nsJARProtocolHandler.cpp index 0bce0d7e6df..c0224bb0a06 100644 --- a/modules/libjar/nsJARProtocolHandler.cpp +++ b/modules/libjar/nsJARProtocolHandler.cpp @@ -123,10 +123,10 @@ nsJARProtocolHandler::RemoteOpenFileComplete(nsIHashable *aRemoteFile, } } -NS_IMPL_ISUPPORTS3(nsJARProtocolHandler, - nsIJARProtocolHandler, - nsIProtocolHandler, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsJARProtocolHandler, + nsIJARProtocolHandler, + nsIProtocolHandler, + nsISupportsWeakReference) nsJARProtocolHandler* nsJARProtocolHandler::GetSingleton() diff --git a/modules/libjar/zipwriter/src/nsDeflateConverter.cpp b/modules/libjar/zipwriter/src/nsDeflateConverter.cpp index 3882579572e..77eb825db2d 100644 --- a/modules/libjar/zipwriter/src/nsDeflateConverter.cpp +++ b/modules/libjar/zipwriter/src/nsDeflateConverter.cpp @@ -20,9 +20,9 @@ * nsDeflateConverter is a stream converter applies the deflate compression * method to the data. */ -NS_IMPL_ISUPPORTS3(nsDeflateConverter, nsIStreamConverter, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(nsDeflateConverter, nsIStreamConverter, + nsIStreamListener, + nsIRequestObserver) nsresult nsDeflateConverter::Init() { diff --git a/modules/libjar/zipwriter/src/nsZipDataStream.cpp b/modules/libjar/zipwriter/src/nsZipDataStream.cpp index d9edb4e1008..f7fcb622a58 100644 --- a/modules/libjar/zipwriter/src/nsZipDataStream.cpp +++ b/modules/libjar/zipwriter/src/nsZipDataStream.cpp @@ -22,8 +22,8 @@ * Currently only the deflate compression method is supported. * The CRC checksum for the entry's data is also generated here. */ -NS_IMPL_ISUPPORTS2(nsZipDataStream, nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(nsZipDataStream, nsIStreamListener, + nsIRequestObserver) nsresult nsZipDataStream::Init(nsZipWriter *aWriter, nsIOutputStream *aStream, diff --git a/modules/libjar/zipwriter/src/nsZipHeader.cpp b/modules/libjar/zipwriter/src/nsZipHeader.cpp index b9a2220c860..c377261352a 100644 --- a/modules/libjar/zipwriter/src/nsZipHeader.cpp +++ b/modules/libjar/zipwriter/src/nsZipHeader.cpp @@ -21,7 +21,7 @@ /** * nsZipHeader represents an entry from a zip file. */ -NS_IMPL_ISUPPORTS1(nsZipHeader, nsIZipEntry) +NS_IMPL_ISUPPORTS(nsZipHeader, nsIZipEntry) /* readonly attribute unsigned short compression; */ NS_IMETHODIMP nsZipHeader::GetCompression(uint16_t *aCompression) diff --git a/modules/libjar/zipwriter/src/nsZipWriter.cpp b/modules/libjar/zipwriter/src/nsZipWriter.cpp index 6a74ea902fe..01357c78ea2 100644 --- a/modules/libjar/zipwriter/src/nsZipWriter.cpp +++ b/modules/libjar/zipwriter/src/nsZipWriter.cpp @@ -43,8 +43,8 @@ * [central directory] * [end of central directory record] */ -NS_IMPL_ISUPPORTS2(nsZipWriter, nsIZipWriter, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(nsZipWriter, nsIZipWriter, + nsIRequestObserver) nsZipWriter::nsZipWriter() { diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp index 5c53a27eb87..205bc9f460a 100644 --- a/modules/libpref/src/Preferences.cpp +++ b/modules/libpref/src/Preferences.cpp @@ -154,7 +154,7 @@ public: nsTArray mClosures; }; -NS_IMPL_ISUPPORTS1(ValueObserver, nsIObserver) +NS_IMPL_ISUPPORTS(ValueObserver, nsIObserver) NS_IMETHODIMP ValueObserver::Observe(nsISupports *aSubject, @@ -240,7 +240,7 @@ protected: void* aClosure); }; -NS_IMPL_ISUPPORTS1(PreferenceServiceReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(PreferenceServiceReporter, nsIMemoryReporter) struct PreferencesReferentCount { PreferencesReferentCount() : numStrong(0), numWeakAlive(0), numWeakDead(0) {} diff --git a/modules/libpref/src/nsPrefBranch.cpp b/modules/libpref/src/nsPrefBranch.cpp index 6242546a488..676ea030a9f 100644 --- a/modules/libpref/src/nsPrefBranch.cpp +++ b/modules/libpref/src/nsPrefBranch.cpp @@ -859,7 +859,7 @@ nsPrefLocalizedString::SetDataWithLength(uint32_t aLength, // nsRelativeFilePref //---------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsRelativeFilePref, nsIRelativeFilePref) +NS_IMPL_ISUPPORTS(nsRelativeFilePref, nsIRelativeFilePref) nsRelativeFilePref::nsRelativeFilePref() { diff --git a/netwerk/base/src/ArrayBufferInputStream.cpp b/netwerk/base/src/ArrayBufferInputStream.cpp index 509979953b9..617bdf98bb4 100644 --- a/netwerk/base/src/ArrayBufferInputStream.cpp +++ b/netwerk/base/src/ArrayBufferInputStream.cpp @@ -9,7 +9,7 @@ #include "jsapi.h" #include "jsfriendapi.h" -NS_IMPL_ISUPPORTS2(ArrayBufferInputStream, nsIArrayBufferInputStream, nsIInputStream); +NS_IMPL_ISUPPORTS(ArrayBufferInputStream, nsIArrayBufferInputStream, nsIInputStream); ArrayBufferInputStream::ArrayBufferInputStream() : mBuffer(nullptr) diff --git a/netwerk/base/src/BackgroundFileSaver.cpp b/netwerk/base/src/BackgroundFileSaver.cpp index 0f36eca3721..73d3483e6ae 100644 --- a/netwerk/base/src/BackgroundFileSaver.cpp +++ b/netwerk/base/src/BackgroundFileSaver.cpp @@ -935,11 +935,11 @@ BackgroundFileSaver::ExtractSignatureInfo(const nsAString& filePath) //////////////////////////////////////////////////////////////////////////////// //// BackgroundFileSaverOutputStream -NS_IMPL_ISUPPORTS4(BackgroundFileSaverOutputStream, - nsIBackgroundFileSaver, - nsIOutputStream, - nsIAsyncOutputStream, - nsIOutputStreamCallback) +NS_IMPL_ISUPPORTS(BackgroundFileSaverOutputStream, + nsIBackgroundFileSaver, + nsIOutputStream, + nsIAsyncOutputStream, + nsIOutputStreamCallback) BackgroundFileSaverOutputStream::BackgroundFileSaverOutputStream() : BackgroundFileSaver() @@ -1038,10 +1038,10 @@ BackgroundFileSaverOutputStream::OnOutputStreamReady( //////////////////////////////////////////////////////////////////////////////// //// BackgroundFileSaverStreamListener -NS_IMPL_ISUPPORTS3(BackgroundFileSaverStreamListener, - nsIBackgroundFileSaver, - nsIRequestObserver, - nsIStreamListener) +NS_IMPL_ISUPPORTS(BackgroundFileSaverStreamListener, + nsIBackgroundFileSaver, + nsIRequestObserver, + nsIStreamListener) BackgroundFileSaverStreamListener::BackgroundFileSaverStreamListener() : BackgroundFileSaver() @@ -1202,8 +1202,8 @@ BackgroundFileSaverStreamListener::NotifySuspendOrResume() //////////////////////////////////////////////////////////////////////////////// //// DigestOutputStream -NS_IMPL_ISUPPORTS1(DigestOutputStream, - nsIOutputStream) +NS_IMPL_ISUPPORTS(DigestOutputStream, + nsIOutputStream) DigestOutputStream::DigestOutputStream(nsIOutputStream* aStream, PK11Context* aContext) : diff --git a/netwerk/base/src/Dashboard.cpp b/netwerk/base/src/Dashboard.cpp index a15182359da..9f35192da2b 100644 --- a/netwerk/base/src/Dashboard.cpp +++ b/netwerk/base/src/Dashboard.cpp @@ -159,7 +159,7 @@ public: nsString mStatus; }; -NS_IMPL_ISUPPORTS2(ConnectionData, nsITransportEventSink, nsITimerCallback) +NS_IMPL_ISUPPORTS(ConnectionData, nsITransportEventSink, nsITimerCallback) NS_IMETHODIMP ConnectionData::OnTransportStatus(nsITransport *aTransport, nsresult aStatus, @@ -271,7 +271,7 @@ public: nsresult mStatus; }; -NS_IMPL_ISUPPORTS1(LookupHelper, nsIDNSListener) +NS_IMPL_ISUPPORTS(LookupHelper, nsIDNSListener) NS_IMETHODIMP LookupHelper::OnLookupComplete(nsICancelable *aRequest, @@ -327,7 +327,7 @@ LookupHelper::ConstructAnswer(LookupArgument *aArgument) return NS_OK; } -NS_IMPL_ISUPPORTS2(Dashboard, nsIDashboard, nsIDashboardEventNotifier) +NS_IMPL_ISUPPORTS(Dashboard, nsIDashboard, nsIDashboardEventNotifier) Dashboard::Dashboard() { diff --git a/netwerk/base/src/EventTokenBucket.cpp b/netwerk/base/src/EventTokenBucket.cpp index 0f013d6a79f..ef0da665165 100644 --- a/netwerk/base/src/EventTokenBucket.cpp +++ b/netwerk/base/src/EventTokenBucket.cpp @@ -43,7 +43,7 @@ private: ATokenBucketEvent *mEvent; }; -NS_IMPL_ISUPPORTS1(TokenBucketCancelable, nsICancelable) +NS_IMPL_ISUPPORTS(TokenBucketCancelable, nsICancelable) TokenBucketCancelable::TokenBucketCancelable(ATokenBucketEvent *event) : mEvent(event) @@ -73,7 +73,7 @@ TokenBucketCancelable::Fire() // EventTokenBucket //////////////////////////////////////////// -NS_IMPL_ISUPPORTS1(EventTokenBucket, nsITimerCallback) +NS_IMPL_ISUPPORTS(EventTokenBucket, nsITimerCallback) // by default 1hz with no burst EventTokenBucket::EventTokenBucket(uint32_t eventsPerSecond, diff --git a/netwerk/base/src/LoadContextInfo.cpp b/netwerk/base/src/LoadContextInfo.cpp index 91c7bca1e3e..1f27489d868 100644 --- a/netwerk/base/src/LoadContextInfo.cpp +++ b/netwerk/base/src/LoadContextInfo.cpp @@ -11,7 +11,7 @@ namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS1(LoadContextInfo, nsILoadContextInfo) +NS_IMPL_ISUPPORTS(LoadContextInfo, nsILoadContextInfo) LoadContextInfo::LoadContextInfo(bool aIsPrivate, uint32_t aAppId, bool aIsInBrowser, bool aIsAnonymous) : mAppId(aAppId) diff --git a/netwerk/base/src/ProxyAutoConfig.cpp b/netwerk/base/src/ProxyAutoConfig.cpp index d0173321798..176e9143610 100644 --- a/netwerk/base/src/ProxyAutoConfig.cpp +++ b/netwerk/base/src/ProxyAutoConfig.cpp @@ -288,7 +288,7 @@ public: nsCOMPtr mResponse; nsCOMPtr mTimer; }; -NS_IMPL_ISUPPORTS2(PACResolver, nsIDNSListener, nsITimerCallback) +NS_IMPL_ISUPPORTS(PACResolver, nsIDNSListener, nsITimerCallback) static void PACLogToConsole(nsString &aMessage) diff --git a/netwerk/base/src/RedirectChannelRegistrar.cpp b/netwerk/base/src/RedirectChannelRegistrar.cpp index ab2e1961ed9..182185f6cf0 100644 --- a/netwerk/base/src/RedirectChannelRegistrar.cpp +++ b/netwerk/base/src/RedirectChannelRegistrar.cpp @@ -7,7 +7,7 @@ namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS1(RedirectChannelRegistrar, nsIRedirectChannelRegistrar) +NS_IMPL_ISUPPORTS(RedirectChannelRegistrar, nsIRedirectChannelRegistrar) RedirectChannelRegistrar::RedirectChannelRegistrar() : mRealChannels(64) diff --git a/netwerk/base/src/Seer.cpp b/netwerk/base/src/Seer.cpp index a7319afca4f..bb8ef3bb44a 100644 --- a/netwerk/base/src/Seer.cpp +++ b/netwerk/base/src/Seer.cpp @@ -149,7 +149,7 @@ public: { } }; -NS_IMPL_ISUPPORTS1(SeerDNSListener, nsIDNSListener); +NS_IMPL_ISUPPORTS(SeerDNSListener, nsIDNSListener); NS_IMETHODIMP SeerDNSListener::OnLookupComplete(nsICancelable *request, @@ -172,11 +172,11 @@ static PRLogModuleInfo *gSeerLog = nullptr; #define SEER_LOG(args) #endif -NS_IMPL_ISUPPORTS4(Seer, - nsINetworkSeer, - nsIObserver, - nsISpeculativeConnectionOverrider, - nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(Seer, + nsINetworkSeer, + nsIObserver, + nsISpeculativeConnectionOverrider, + nsIInterfaceRequestor) Seer::Seer() :mInitialized(false) diff --git a/netwerk/base/src/StreamingProtocolService.cpp b/netwerk/base/src/StreamingProtocolService.cpp index 9a6a7306255..3e1396f85de 100644 --- a/netwerk/base/src/StreamingProtocolService.cpp +++ b/netwerk/base/src/StreamingProtocolService.cpp @@ -17,8 +17,8 @@ namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS1(StreamingProtocolControllerService, - nsIStreamingProtocolControllerService) +NS_IMPL_ISUPPORTS(StreamingProtocolControllerService, + nsIStreamingProtocolControllerService) /* static */ StaticRefPtr sSingleton; diff --git a/netwerk/base/src/Tickler.cpp b/netwerk/base/src/Tickler.cpp index 6ee66029c6e..0b8b619ba47 100644 --- a/netwerk/base/src/Tickler.cpp +++ b/netwerk/base/src/Tickler.cpp @@ -18,7 +18,7 @@ namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS2(Tickler, nsISupportsWeakReference, Tickler) +NS_IMPL_ISUPPORTS(Tickler, nsISupportsWeakReference, Tickler) Tickler::Tickler() : mLock("Tickler::mLock") @@ -257,7 +257,7 @@ void Tickler::SetIPV4Port(uint16_t port) mAddr.inet.port = port; } -NS_IMPL_ISUPPORTS1(TicklerTimer, nsITimerCallback) +NS_IMPL_ISUPPORTS(TicklerTimer, nsITimerCallback) NS_IMETHODIMP TicklerTimer::Notify(nsITimer *timer) { diff --git a/netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp b/netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp index b4cfc7ba0e3..b48ec6284d8 100644 --- a/netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp +++ b/netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp @@ -32,9 +32,9 @@ GetRedirectLog() #define LOG(args) #endif -NS_IMPL_ISUPPORTS2(nsAsyncRedirectVerifyHelper, - nsIAsyncVerifyRedirectCallback, - nsIRunnable) +NS_IMPL_ISUPPORTS(nsAsyncRedirectVerifyHelper, + nsIAsyncVerifyRedirectCallback, + nsIRunnable) class nsAsyncVerifyRedirectCallbackEvent : public nsRunnable { public: diff --git a/netwerk/base/src/nsAuthInformationHolder.cpp b/netwerk/base/src/nsAuthInformationHolder.cpp index a1f2acc3eeb..f52ff5454ae 100644 --- a/netwerk/base/src/nsAuthInformationHolder.cpp +++ b/netwerk/base/src/nsAuthInformationHolder.cpp @@ -4,7 +4,7 @@ #include "nsAuthInformationHolder.h" -NS_IMPL_ISUPPORTS1(nsAuthInformationHolder, nsIAuthInformation) +NS_IMPL_ISUPPORTS(nsAuthInformationHolder, nsIAuthInformation) NS_IMETHODIMP nsAuthInformationHolder::GetFlags(uint32_t* aFlags) diff --git a/netwerk/base/src/nsBase64Encoder.cpp b/netwerk/base/src/nsBase64Encoder.cpp index 0a00c30fd99..f112be75081 100644 --- a/netwerk/base/src/nsBase64Encoder.cpp +++ b/netwerk/base/src/nsBase64Encoder.cpp @@ -7,7 +7,7 @@ #include "plbase64.h" #include "prmem.h" -NS_IMPL_ISUPPORTS1(nsBase64Encoder, nsIOutputStream) +NS_IMPL_ISUPPORTS(nsBase64Encoder, nsIOutputStream) NS_IMETHODIMP nsBase64Encoder::Close() diff --git a/netwerk/base/src/nsBaseChannel.cpp b/netwerk/base/src/nsBaseChannel.cpp index 62ca2a21f93..75a769c808e 100644 --- a/netwerk/base/src/nsBaseChannel.cpp +++ b/netwerk/base/src/nsBaseChannel.cpp @@ -285,16 +285,16 @@ nsBaseChannel::ClassifyURI() //----------------------------------------------------------------------------- // nsBaseChannel::nsISupports -NS_IMPL_ISUPPORTS_INHERITED8(nsBaseChannel, - nsHashPropertyBag, - nsIRequest, - nsIChannel, - nsIInterfaceRequestor, - nsITransportEventSink, - nsIRequestObserver, - nsIStreamListener, - nsIAsyncVerifyRedirectCallback, - nsIPrivateBrowsingChannel) +NS_IMPL_ISUPPORTS_INHERITED(nsBaseChannel, + nsHashPropertyBag, + nsIRequest, + nsIChannel, + nsIInterfaceRequestor, + nsITransportEventSink, + nsIRequestObserver, + nsIStreamListener, + nsIAsyncVerifyRedirectCallback, + nsIPrivateBrowsingChannel) //----------------------------------------------------------------------------- // nsBaseChannel::nsIRequest diff --git a/netwerk/base/src/nsBufferedStreams.cpp b/netwerk/base/src/nsBufferedStreams.cpp index 7387e5f6cfc..8e8c35fa4e8 100644 --- a/netwerk/base/src/nsBufferedStreams.cpp +++ b/netwerk/base/src/nsBufferedStreams.cpp @@ -59,7 +59,7 @@ nsBufferedStream::~nsBufferedStream() Close(); } -NS_IMPL_ISUPPORTS1(nsBufferedStream, nsISeekableStream) +NS_IMPL_ISUPPORTS(nsBufferedStream, nsISeekableStream) nsresult nsBufferedStream::Init(nsISupports* stream, uint32_t bufferSize) @@ -258,11 +258,11 @@ NS_INTERFACE_MAP_BEGIN(nsBufferedInputStream) NS_IMPL_QUERY_CLASSINFO(nsBufferedInputStream) NS_INTERFACE_MAP_END_INHERITING(nsBufferedStream) -NS_IMPL_CI_INTERFACE_GETTER4(nsBufferedInputStream, - nsIInputStream, - nsIBufferedInputStream, - nsISeekableStream, - nsIStreamBufferAccess) +NS_IMPL_CI_INTERFACE_GETTER(nsBufferedInputStream, + nsIInputStream, + nsIBufferedInputStream, + nsISeekableStream, + nsIStreamBufferAccess) nsresult nsBufferedInputStream::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult) diff --git a/netwerk/base/src/nsChannelClassifier.cpp b/netwerk/base/src/nsChannelClassifier.cpp index f1c59b3ddd0..d286fc766b1 100644 --- a/netwerk/base/src/nsChannelClassifier.cpp +++ b/netwerk/base/src/nsChannelClassifier.cpp @@ -21,8 +21,8 @@ static PRLogModuleInfo *gChannelClassifierLog; #undef LOG #define LOG(args) PR_LOG(gChannelClassifierLog, PR_LOG_DEBUG, args) -NS_IMPL_ISUPPORTS1(nsChannelClassifier, - nsIURIClassifierCallback) +NS_IMPL_ISUPPORTS(nsChannelClassifier, + nsIURIClassifierCallback) nsChannelClassifier::nsChannelClassifier() { diff --git a/netwerk/base/src/nsDNSPrefetch.cpp b/netwerk/base/src/nsDNSPrefetch.cpp index a9cf8656f83..e09315ed1f6 100644 --- a/netwerk/base/src/nsDNSPrefetch.cpp +++ b/netwerk/base/src/nsDNSPrefetch.cpp @@ -86,7 +86,7 @@ nsDNSPrefetch::PrefetchHigh(bool refreshDNS) } -NS_IMPL_ISUPPORTS1(nsDNSPrefetch, nsIDNSListener) +NS_IMPL_ISUPPORTS(nsDNSPrefetch, nsIDNSListener) NS_IMETHODIMP nsDNSPrefetch::OnLookupComplete(nsICancelable *request, diff --git a/netwerk/base/src/nsDirectoryIndexStream.cpp b/netwerk/base/src/nsDirectoryIndexStream.cpp index f5c174f403e..e4ac422c45b 100644 --- a/netwerk/base/src/nsDirectoryIndexStream.cpp +++ b/netwerk/base/src/nsDirectoryIndexStream.cpp @@ -186,7 +186,7 @@ nsDirectoryIndexStream::Create(nsIFile* aDir, nsIInputStream** aResult) return NS_OK; } -NS_IMPL_ISUPPORTS1(nsDirectoryIndexStream, nsIInputStream) +NS_IMPL_ISUPPORTS(nsDirectoryIndexStream, nsIInputStream) // The below routines are proxied to the UI thread! NS_IMETHODIMP diff --git a/netwerk/base/src/nsDownloader.cpp b/netwerk/base/src/nsDownloader.cpp index 1595b7db898..3e6583ca670 100644 --- a/netwerk/base/src/nsDownloader.cpp +++ b/netwerk/base/src/nsDownloader.cpp @@ -26,10 +26,10 @@ nsDownloader::~nsDownloader() } } -NS_IMPL_ISUPPORTS3(nsDownloader, - nsIDownloader, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(nsDownloader, + nsIDownloader, + nsIStreamListener, + nsIRequestObserver) NS_IMETHODIMP nsDownloader::Init(nsIDownloadObserver *observer, nsIFile *location) diff --git a/netwerk/base/src/nsFileStreams.cpp b/netwerk/base/src/nsFileStreams.cpp index f5f21d6206c..2cce0f44d82 100644 --- a/netwerk/base/src/nsFileStreams.cpp +++ b/netwerk/base/src/nsFileStreams.cpp @@ -44,9 +44,9 @@ nsFileStreamBase::~nsFileStreamBase() Close(); } -NS_IMPL_ISUPPORTS2(nsFileStreamBase, - nsISeekableStream, - nsIFileMetadata) +NS_IMPL_ISUPPORTS(nsFileStreamBase, + nsISeekableStream, + nsIFileMetadata) NS_IMETHODIMP nsFileStreamBase::Seek(int32_t whence, int64_t offset) @@ -369,11 +369,11 @@ NS_INTERFACE_MAP_BEGIN(nsFileInputStream) NS_IMPL_QUERY_CLASSINFO(nsFileInputStream) NS_INTERFACE_MAP_END_INHERITING(nsFileStreamBase) -NS_IMPL_CI_INTERFACE_GETTER4(nsFileInputStream, - nsIInputStream, - nsIFileInputStream, - nsISeekableStream, - nsILineInputStream) +NS_IMPL_CI_INTERFACE_GETTER(nsFileInputStream, + nsIInputStream, + nsIFileInputStream, + nsISeekableStream, + nsILineInputStream) nsresult nsFileInputStream::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -632,11 +632,11 @@ NS_INTERFACE_MAP_BEGIN(nsPartialFileInputStream) NS_IMPL_QUERY_CLASSINFO(nsPartialFileInputStream) NS_INTERFACE_MAP_END_INHERITING(nsFileStreamBase) -NS_IMPL_CI_INTERFACE_GETTER4(nsPartialFileInputStream, - nsIInputStream, - nsIPartialFileInputStream, - nsISeekableStream, - nsILineInputStream) +NS_IMPL_CI_INTERFACE_GETTER(nsPartialFileInputStream, + nsIInputStream, + nsIPartialFileInputStream, + nsISeekableStream, + nsILineInputStream) nsresult nsPartialFileInputStream::Create(nsISupports *aOuter, REFNSIID aIID, @@ -795,10 +795,10 @@ nsPartialFileInputStream::Deserialize( //////////////////////////////////////////////////////////////////////////////// // nsFileOutputStream -NS_IMPL_ISUPPORTS_INHERITED2(nsFileOutputStream, - nsFileStreamBase, - nsIOutputStream, - nsIFileOutputStream) +NS_IMPL_ISUPPORTS_INHERITED(nsFileOutputStream, + nsFileStreamBase, + nsIOutputStream, + nsIFileOutputStream) nsresult nsFileOutputStream::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult) @@ -835,11 +835,11 @@ nsFileOutputStream::Init(nsIFile* file, int32_t ioFlags, int32_t perm, //////////////////////////////////////////////////////////////////////////////// // nsAtomicFileOutputStream -NS_IMPL_ISUPPORTS_INHERITED3(nsAtomicFileOutputStream, - nsFileOutputStream, - nsISafeOutputStream, - nsIOutputStream, - nsIFileOutputStream) +NS_IMPL_ISUPPORTS_INHERITED(nsAtomicFileOutputStream, + nsFileOutputStream, + nsISafeOutputStream, + nsIOutputStream, + nsIFileOutputStream) NS_IMETHODIMP nsAtomicFileOutputStream::Init(nsIFile* file, int32_t ioFlags, int32_t perm, @@ -987,11 +987,11 @@ nsSafeFileOutputStream::Finish() //////////////////////////////////////////////////////////////////////////////// // nsFileStream -NS_IMPL_ISUPPORTS_INHERITED3(nsFileStream, - nsFileStreamBase, - nsIInputStream, - nsIOutputStream, - nsIFileStream) +NS_IMPL_ISUPPORTS_INHERITED(nsFileStream, + nsFileStreamBase, + nsIInputStream, + nsIOutputStream, + nsIFileStream) NS_IMETHODIMP nsFileStream::Init(nsIFile* file, int32_t ioFlags, int32_t perm, diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp index 6712088567f..b64e7d3c7d8 100644 --- a/netwerk/base/src/nsIOService.cpp +++ b/netwerk/base/src/nsIOService.cpp @@ -294,13 +294,13 @@ nsIOService::GetInstance() { return gIOService; } -NS_IMPL_ISUPPORTS6(nsIOService, - nsIIOService, - nsIIOService2, - nsINetUtil, - nsISpeculativeConnect, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsIOService, + nsIIOService, + nsIIOService2, + nsINetUtil, + nsISpeculativeConnect, + nsIObserver, + nsISupportsWeakReference) //////////////////////////////////////////////////////////////////////////////// @@ -1194,7 +1194,7 @@ private: nsRefPtr mIOService; }; -NS_IMPL_ISUPPORTS1(IOServiceProxyCallback, nsIProtocolProxyCallback) +NS_IMPL_ISUPPORTS(IOServiceProxyCallback, nsIProtocolProxyCallback) NS_IMETHODIMP IOServiceProxyCallback::OnProxyAvailable(nsICancelable *request, nsIURI *aURI, diff --git a/netwerk/base/src/nsIncrementalDownload.cpp b/netwerk/base/src/nsIncrementalDownload.cpp index b7cdd009441..3a766c13212 100644 --- a/netwerk/base/src/nsIncrementalDownload.cpp +++ b/netwerk/base/src/nsIncrementalDownload.cpp @@ -330,16 +330,16 @@ nsIncrementalDownload::ReadCurrentSize() // nsISupports -NS_IMPL_ISUPPORTS9(nsIncrementalDownload, - nsIIncrementalDownload, - nsIRequest, - nsIStreamListener, - nsIRequestObserver, - nsIObserver, - nsIInterfaceRequestor, - nsIChannelEventSink, - nsISupportsWeakReference, - nsIAsyncVerifyRedirectCallback) +NS_IMPL_ISUPPORTS(nsIncrementalDownload, + nsIIncrementalDownload, + nsIRequest, + nsIStreamListener, + nsIRequestObserver, + nsIObserver, + nsIInterfaceRequestor, + nsIChannelEventSink, + nsISupportsWeakReference, + nsIAsyncVerifyRedirectCallback) // nsIRequest diff --git a/netwerk/base/src/nsInputStreamChannel.cpp b/netwerk/base/src/nsInputStreamChannel.cpp index 7ce942f0c6a..5aa4d70abdd 100644 --- a/netwerk/base/src/nsInputStreamChannel.cpp +++ b/netwerk/base/src/nsInputStreamChannel.cpp @@ -38,9 +38,9 @@ nsInputStreamChannel::OpenContentStream(bool async, nsIInputStream **result, //----------------------------------------------------------------------------- // nsInputStreamChannel::nsISupports -NS_IMPL_ISUPPORTS_INHERITED1(nsInputStreamChannel, - nsBaseChannel, - nsIInputStreamChannel) +NS_IMPL_ISUPPORTS_INHERITED(nsInputStreamChannel, + nsBaseChannel, + nsIInputStreamChannel) //----------------------------------------------------------------------------- // nsInputStreamChannel::nsIInputStreamChannel diff --git a/netwerk/base/src/nsInputStreamPump.cpp b/netwerk/base/src/nsInputStreamPump.cpp index 6df1266f408..e805f5cd954 100644 --- a/netwerk/base/src/nsInputStreamPump.cpp +++ b/netwerk/base/src/nsInputStreamPump.cpp @@ -159,11 +159,11 @@ nsInputStreamPump::EnsureWaiting() // although this class can only be accessed from one thread at a time, we do // allow its ownership to move from thread to thread, assuming the consumer // understands the limitations of this. -NS_IMPL_ISUPPORTS4(nsInputStreamPump, - nsIRequest, - nsIThreadRetargetableRequest, - nsIInputStreamCallback, - nsIInputStreamPump) +NS_IMPL_ISUPPORTS(nsInputStreamPump, + nsIRequest, + nsIThreadRetargetableRequest, + nsIInputStreamCallback, + nsIInputStreamPump) //----------------------------------------------------------------------------- // nsInputStreamPump::nsIRequest diff --git a/netwerk/base/src/nsLoadGroup.cpp b/netwerk/base/src/nsLoadGroup.cpp index 6f2eb646d9a..6d2c400c7ab 100644 --- a/netwerk/base/src/nsLoadGroup.cpp +++ b/netwerk/base/src/nsLoadGroup.cpp @@ -1108,7 +1108,7 @@ private: nsAutoPtr mSpdyCache; }; -NS_IMPL_ISUPPORTS1(nsLoadGroupConnectionInfo, nsILoadGroupConnectionInfo) +NS_IMPL_ISUPPORTS(nsLoadGroupConnectionInfo, nsILoadGroupConnectionInfo) nsLoadGroupConnectionInfo::nsLoadGroupConnectionInfo() : mBlockingTransactionCount(0) diff --git a/netwerk/base/src/nsMIMEInputStream.cpp b/netwerk/base/src/nsMIMEInputStream.cpp index 091deddc642..062cc44bf96 100644 --- a/netwerk/base/src/nsMIMEInputStream.cpp +++ b/netwerk/base/src/nsMIMEInputStream.cpp @@ -71,15 +71,15 @@ NS_IMPL_RELEASE(nsMIMEInputStream) NS_IMPL_CLASSINFO(nsMIMEInputStream, nullptr, nsIClassInfo::THREADSAFE, NS_MIMEINPUTSTREAM_CID) -NS_IMPL_QUERY_INTERFACE4_CI(nsMIMEInputStream, +NS_IMPL_QUERY_INTERFACE_CI(nsMIMEInputStream, + nsIMIMEInputStream, + nsIInputStream, + nsISeekableStream, + nsIIPCSerializableInputStream) +NS_IMPL_CI_INTERFACE_GETTER(nsMIMEInputStream, nsIMIMEInputStream, nsIInputStream, - nsISeekableStream, - nsIIPCSerializableInputStream) -NS_IMPL_CI_INTERFACE_GETTER3(nsMIMEInputStream, - nsIMIMEInputStream, - nsIInputStream, - nsISeekableStream) + nsISeekableStream) nsMIMEInputStream::nsMIMEInputStream() : mAddContentLength(false), mStartedReading(false) diff --git a/netwerk/base/src/nsNetAddr.cpp b/netwerk/base/src/nsNetAddr.cpp index a45de44517f..6709dc082a5 100644 --- a/netwerk/base/src/nsNetAddr.cpp +++ b/netwerk/base/src/nsNetAddr.cpp @@ -10,7 +10,7 @@ using namespace mozilla::net; -NS_IMPL_ISUPPORTS1(nsNetAddr, nsINetAddr) +NS_IMPL_ISUPPORTS(nsNetAddr, nsINetAddr) /* Makes a copy of |addr| */ nsNetAddr::nsNetAddr(NetAddr* addr) diff --git a/netwerk/base/src/nsPACMan.cpp b/netwerk/base/src/nsPACMan.cpp index f38715a948a..7cfce729ed5 100644 --- a/netwerk/base/src/nsPACMan.cpp +++ b/netwerk/base/src/nsPACMan.cpp @@ -555,8 +555,8 @@ nsPACMan::ProcessPending() return true; } -NS_IMPL_ISUPPORTS3(nsPACMan, nsIStreamLoaderObserver, - nsIInterfaceRequestor, nsIChannelEventSink) +NS_IMPL_ISUPPORTS(nsPACMan, nsIStreamLoaderObserver, + nsIInterfaceRequestor, nsIChannelEventSink) NS_IMETHODIMP nsPACMan::OnStreamComplete(nsIStreamLoader *loader, diff --git a/netwerk/base/src/nsPreloadedStream.cpp b/netwerk/base/src/nsPreloadedStream.cpp index a1faefd093d..9160a13a583 100644 --- a/netwerk/base/src/nsPreloadedStream.cpp +++ b/netwerk/base/src/nsPreloadedStream.cpp @@ -12,9 +12,9 @@ namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS2(nsPreloadedStream, - nsIInputStream, - nsIAsyncInputStream) +NS_IMPL_ISUPPORTS(nsPreloadedStream, + nsIInputStream, + nsIAsyncInputStream) nsPreloadedStream::nsPreloadedStream(nsIAsyncInputStream *aStream, const char *data, uint32_t datalen) diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp index 6ebd33fba40..98ea68b7bb0 100644 --- a/netwerk/base/src/nsProtocolProxyService.cpp +++ b/netwerk/base/src/nsProtocolProxyService.cpp @@ -271,7 +271,7 @@ private: nsCOMPtr mProxyInfo; }; -NS_IMPL_ISUPPORTS2(nsAsyncResolveRequest, nsICancelable, nsIRunnable) +NS_IMPL_ISUPPORTS(nsAsyncResolveRequest, nsICancelable, nsIRunnable) //---------------------------------------------------------------------------- @@ -364,13 +364,13 @@ NS_IMPL_ADDREF(nsProtocolProxyService) NS_IMPL_RELEASE(nsProtocolProxyService) NS_IMPL_CLASSINFO(nsProtocolProxyService, nullptr, nsIClassInfo::SINGLETON, NS_PROTOCOLPROXYSERVICE_CID) -NS_IMPL_QUERY_INTERFACE3_CI(nsProtocolProxyService, +NS_IMPL_QUERY_INTERFACE_CI(nsProtocolProxyService, + nsIProtocolProxyService, + nsIProtocolProxyService2, + nsIObserver) +NS_IMPL_CI_INTERFACE_GETTER(nsProtocolProxyService, nsIProtocolProxyService, - nsIProtocolProxyService2, - nsIObserver) -NS_IMPL_CI_INTERFACE_GETTER2(nsProtocolProxyService, - nsIProtocolProxyService, - nsIProtocolProxyService2) + nsIProtocolProxyService2) nsProtocolProxyService::nsProtocolProxyService() : mFilterLocalHosts(false) diff --git a/netwerk/base/src/nsProxyInfo.cpp b/netwerk/base/src/nsProxyInfo.cpp index b700191e76a..4e727c40282 100644 --- a/netwerk/base/src/nsProxyInfo.cpp +++ b/netwerk/base/src/nsProxyInfo.cpp @@ -8,7 +8,7 @@ #include "nsCOMPtr.h" // Yes, we support QI to nsProxyInfo -NS_IMPL_ISUPPORTS2(nsProxyInfo, nsProxyInfo, nsIProxyInfo) +NS_IMPL_ISUPPORTS(nsProxyInfo, nsProxyInfo, nsIProxyInfo) using namespace mozilla; diff --git a/netwerk/base/src/nsRequestObserverProxy.cpp b/netwerk/base/src/nsRequestObserverProxy.cpp index f2328bc3322..0ffbba46bdb 100644 --- a/netwerk/base/src/nsRequestObserverProxy.cpp +++ b/netwerk/base/src/nsRequestObserverProxy.cpp @@ -114,9 +114,9 @@ public: // nsRequestObserverProxy::nsISupports implementation... //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS2(nsRequestObserverProxy, - nsIRequestObserver, - nsIRequestObserverProxy) +NS_IMPL_ISUPPORTS(nsRequestObserverProxy, + nsIRequestObserver, + nsIRequestObserverProxy) //----------------------------------------------------------------------------- // nsRequestObserverProxy::nsIRequestObserver implementation... diff --git a/netwerk/base/src/nsSerializationHelper.cpp b/netwerk/base/src/nsSerializationHelper.cpp index 146ee99188b..a19e0820495 100644 --- a/netwerk/base/src/nsSerializationHelper.cpp +++ b/netwerk/base/src/nsSerializationHelper.cpp @@ -56,7 +56,7 @@ NS_DeserializeObject(const nsCSubstring& str, nsISupports** obj) return objstream->ReadObject(true, obj); } -NS_IMPL_ISUPPORTS1(nsSerializationHelper, nsISerializationHelper) +NS_IMPL_ISUPPORTS(nsSerializationHelper, nsISerializationHelper) NS_IMETHODIMP nsSerializationHelper::SerializeToString(nsISerializable *serializable, diff --git a/netwerk/base/src/nsServerSocket.cpp b/netwerk/base/src/nsServerSocket.cpp index e50f68ee037..5a059ca1812 100644 --- a/netwerk/base/src/nsServerSocket.cpp +++ b/netwerk/base/src/nsServerSocket.cpp @@ -263,7 +263,7 @@ nsServerSocket::KeepWhenOffline(bool *aKeepWhenOffline) // nsServerSocket::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsServerSocket, nsIServerSocket) +NS_IMPL_ISUPPORTS(nsServerSocket, nsIServerSocket) //----------------------------------------------------------------------------- @@ -459,8 +459,8 @@ private: nsCOMPtr mTargetThread; }; -NS_IMPL_ISUPPORTS1(ServerSocketListenerProxy, - nsIServerSocketListener) +NS_IMPL_ISUPPORTS(ServerSocketListenerProxy, + nsIServerSocketListener) NS_IMETHODIMP ServerSocketListenerProxy::OnSocketAccepted(nsIServerSocket* aServ, diff --git a/netwerk/base/src/nsSimpleNestedURI.cpp b/netwerk/base/src/nsSimpleNestedURI.cpp index c3cd03f2d04..8fa872275c4 100644 --- a/netwerk/base/src/nsSimpleNestedURI.cpp +++ b/netwerk/base/src/nsSimpleNestedURI.cpp @@ -10,7 +10,7 @@ #include "nsIObjectOutputStream.h" #include "nsNetUtil.h" -NS_IMPL_ISUPPORTS_INHERITED1(nsSimpleNestedURI, nsSimpleURI, nsINestedURI) +NS_IMPL_ISUPPORTS_INHERITED(nsSimpleNestedURI, nsSimpleURI, nsINestedURI) nsSimpleNestedURI::nsSimpleNestedURI(nsIURI* innerURI) : mInnerURI(innerURI) diff --git a/netwerk/base/src/nsSimpleStreamListener.cpp b/netwerk/base/src/nsSimpleStreamListener.cpp index 5ebf23e36cf..f100a44c07f 100644 --- a/netwerk/base/src/nsSimpleStreamListener.cpp +++ b/netwerk/base/src/nsSimpleStreamListener.cpp @@ -10,10 +10,10 @@ // nsISupports implementation... //---------------------------------------------------------------------------- // -NS_IMPL_ISUPPORTS3(nsSimpleStreamListener, - nsISimpleStreamListener, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(nsSimpleStreamListener, + nsISimpleStreamListener, + nsIStreamListener, + nsIRequestObserver) // //---------------------------------------------------------------------------- diff --git a/netwerk/base/src/nsSimpleURI.cpp b/netwerk/base/src/nsSimpleURI.cpp index c8aef29ac84..1139b41de64 100644 --- a/netwerk/base/src/nsSimpleURI.cpp +++ b/netwerk/base/src/nsSimpleURI.cpp @@ -45,7 +45,7 @@ nsSimpleURI::~nsSimpleURI() NS_IMPL_ADDREF(nsSimpleURI) NS_IMPL_RELEASE(nsSimpleURI) NS_INTERFACE_TABLE_HEAD(nsSimpleURI) -NS_INTERFACE_TABLE5(nsSimpleURI, nsIURI, nsISerializable, nsIClassInfo, +NS_INTERFACE_TABLE(nsSimpleURI, nsIURI, nsISerializable, nsIClassInfo, nsIMutable, nsIIPCSerializableURI) NS_INTERFACE_TABLE_TO_MAP_SEGUE if (aIID.Equals(kThisSimpleURIImplementationCID)) diff --git a/netwerk/base/src/nsSocketTransport2.cpp b/netwerk/base/src/nsSocketTransport2.cpp index ab94fad2870..8448f4447af 100644 --- a/netwerk/base/src/nsSocketTransport2.cpp +++ b/netwerk/base/src/nsSocketTransport2.cpp @@ -306,9 +306,9 @@ nsSocketInputStream::OnSocketReady(nsresult condition) callback->OnInputStreamReady(this); } -NS_IMPL_QUERY_INTERFACE2(nsSocketInputStream, - nsIInputStream, - nsIAsyncInputStream) +NS_IMPL_QUERY_INTERFACE(nsSocketInputStream, + nsIInputStream, + nsIAsyncInputStream) NS_IMETHODIMP_(MozExternalRefCountType) nsSocketInputStream::AddRef() @@ -569,9 +569,9 @@ nsSocketOutputStream::OnSocketReady(nsresult condition) callback->OnOutputStreamReady(this); } -NS_IMPL_QUERY_INTERFACE2(nsSocketOutputStream, - nsIOutputStream, - nsIAsyncOutputStream) +NS_IMPL_QUERY_INTERFACE(nsSocketOutputStream, + nsIOutputStream, + nsIAsyncOutputStream) NS_IMETHODIMP_(MozExternalRefCountType) nsSocketOutputStream::AddRef() @@ -1924,15 +1924,15 @@ nsSocketTransport::IsLocal(bool *aIsLocal) //----------------------------------------------------------------------------- // xpcom api -NS_IMPL_ISUPPORTS4(nsSocketTransport, - nsISocketTransport, - nsITransport, - nsIDNSListener, - nsIClassInfo) -NS_IMPL_CI_INTERFACE_GETTER3(nsSocketTransport, - nsISocketTransport, - nsITransport, - nsIDNSListener) +NS_IMPL_ISUPPORTS(nsSocketTransport, + nsISocketTransport, + nsITransport, + nsIDNSListener, + nsIClassInfo) +NS_IMPL_CI_INTERFACE_GETTER(nsSocketTransport, + nsISocketTransport, + nsITransport, + nsIDNSListener) NS_IMETHODIMP nsSocketTransport::OpenInputStream(uint32_t flags, diff --git a/netwerk/base/src/nsSocketTransportService2.cpp b/netwerk/base/src/nsSocketTransportService2.cpp index 66aa50b5c4a..6c9ba3582b4 100644 --- a/netwerk/base/src/nsSocketTransportService2.cpp +++ b/netwerk/base/src/nsSocketTransportService2.cpp @@ -427,13 +427,13 @@ nsSocketTransportService::Poll(bool wait, uint32_t *interval) //----------------------------------------------------------------------------- // xpcom api -NS_IMPL_ISUPPORTS6(nsSocketTransportService, - nsISocketTransportService, - nsIEventTarget, - nsIThreadObserver, - nsIRunnable, - nsPISocketTransportService, - nsIObserver) +NS_IMPL_ISUPPORTS(nsSocketTransportService, + nsISocketTransportService, + nsIEventTarget, + nsIThreadObserver, + nsIRunnable, + nsPISocketTransportService, + nsIObserver) // called from main thread only NS_IMETHODIMP diff --git a/netwerk/base/src/nsStandardURL.cpp b/netwerk/base/src/nsStandardURL.cpp index 3108b01f012..90fac6eecc8 100644 --- a/netwerk/base/src/nsStandardURL.cpp +++ b/netwerk/base/src/nsStandardURL.cpp @@ -112,7 +112,7 @@ end: #define NS_NET_PREF_ESCAPEUTF8 "network.standard-url.escape-utf8" #define NS_NET_PREF_ALWAYSENCODEINUTF8 "network.standard-url.encode-utf8" -NS_IMPL_ISUPPORTS1(nsStandardURL::nsPrefObserver, nsIObserver) +NS_IMPL_ISUPPORTS(nsStandardURL::nsPrefObserver, nsIObserver) NS_IMETHODIMP nsStandardURL:: nsPrefObserver::Observe(nsISupports *subject, diff --git a/netwerk/base/src/nsStreamListenerTee.cpp b/netwerk/base/src/nsStreamListenerTee.cpp index b438dee646b..455974d7586 100644 --- a/netwerk/base/src/nsStreamListenerTee.cpp +++ b/netwerk/base/src/nsStreamListenerTee.cpp @@ -5,11 +5,11 @@ #include "nsStreamListenerTee.h" #include "nsProxyRelease.h" -NS_IMPL_ISUPPORTS4(nsStreamListenerTee, - nsIStreamListener, - nsIRequestObserver, - nsIStreamListenerTee, - nsIThreadRetargetableStreamListener) +NS_IMPL_ISUPPORTS(nsStreamListenerTee, + nsIStreamListener, + nsIRequestObserver, + nsIStreamListenerTee, + nsIThreadRetargetableStreamListener) NS_IMETHODIMP nsStreamListenerTee::OnStartRequest(nsIRequest *request, diff --git a/netwerk/base/src/nsStreamListenerWrapper.cpp b/netwerk/base/src/nsStreamListenerWrapper.cpp index 7815564d0b9..42b11f4a7c6 100644 --- a/netwerk/base/src/nsStreamListenerWrapper.cpp +++ b/netwerk/base/src/nsStreamListenerWrapper.cpp @@ -7,10 +7,10 @@ #include "MainThreadUtils.h" #endif -NS_IMPL_ISUPPORTS3(nsStreamListenerWrapper, - nsIStreamListener, - nsIRequestObserver, - nsIThreadRetargetableStreamListener) +NS_IMPL_ISUPPORTS(nsStreamListenerWrapper, + nsIStreamListener, + nsIRequestObserver, + nsIThreadRetargetableStreamListener) NS_IMETHODIMP nsStreamListenerWrapper::CheckListenerChain() diff --git a/netwerk/base/src/nsStreamLoader.cpp b/netwerk/base/src/nsStreamLoader.cpp index d695b6ee8c2..635714532eb 100644 --- a/netwerk/base/src/nsStreamLoader.cpp +++ b/netwerk/base/src/nsStreamLoader.cpp @@ -43,8 +43,8 @@ nsStreamLoader::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult) return rv; } -NS_IMPL_ISUPPORTS3(nsStreamLoader, nsIStreamLoader, - nsIRequestObserver, nsIStreamListener) +NS_IMPL_ISUPPORTS(nsStreamLoader, nsIStreamLoader, + nsIRequestObserver, nsIStreamListener) NS_IMETHODIMP nsStreamLoader::GetNumBytesRead(uint32_t* aNumBytes) diff --git a/netwerk/base/src/nsStreamTransportService.cpp b/netwerk/base/src/nsStreamTransportService.cpp index 55116b5f5ec..7d2f4fb220e 100644 --- a/netwerk/base/src/nsStreamTransportService.cpp +++ b/netwerk/base/src/nsStreamTransportService.cpp @@ -69,9 +69,9 @@ private: bool mInProgress; }; -NS_IMPL_ISUPPORTS2(nsInputStreamTransport, - nsITransport, - nsIInputStream) +NS_IMPL_ISUPPORTS(nsInputStreamTransport, + nsITransport, + nsIInputStream) /** nsITransport **/ @@ -269,9 +269,9 @@ private: bool mInProgress; }; -NS_IMPL_ISUPPORTS2(nsOutputStreamTransport, - nsITransport, - nsIOutputStream) +NS_IMPL_ISUPPORTS(nsOutputStreamTransport, + nsITransport, + nsIOutputStream) /** nsITransport **/ @@ -438,7 +438,7 @@ public: ~STSThreadPoolListener() {} }; -NS_IMPL_ISUPPORTS1(STSThreadPoolListener, nsIThreadPoolListener) +NS_IMPL_ISUPPORTS(STSThreadPoolListener, nsIThreadPoolListener) NS_IMETHODIMP STSThreadPoolListener::OnThreadCreated() @@ -490,10 +490,10 @@ nsStreamTransportService::Init() return NS_OK; } -NS_IMPL_ISUPPORTS3(nsStreamTransportService, - nsIStreamTransportService, - nsIEventTarget, - nsIObserver) +NS_IMPL_ISUPPORTS(nsStreamTransportService, + nsIStreamTransportService, + nsIEventTarget, + nsIObserver) NS_IMETHODIMP nsStreamTransportService::Dispatch(nsIRunnable *task, uint32_t flags) diff --git a/netwerk/base/src/nsSyncStreamListener.cpp b/netwerk/base/src/nsSyncStreamListener.cpp index ddd0e7f5649..e80e885c51e 100644 --- a/netwerk/base/src/nsSyncStreamListener.cpp +++ b/netwerk/base/src/nsSyncStreamListener.cpp @@ -34,11 +34,11 @@ nsSyncStreamListener::WaitForData() // nsSyncStreamListener::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS4(nsSyncStreamListener, - nsIStreamListener, - nsIRequestObserver, - nsIInputStream, - nsISyncStreamListener) +NS_IMPL_ISUPPORTS(nsSyncStreamListener, + nsIStreamListener, + nsIRequestObserver, + nsIInputStream, + nsISyncStreamListener) //----------------------------------------------------------------------------- // nsSyncStreamListener::nsISyncStreamListener diff --git a/netwerk/base/src/nsTemporaryFileInputStream.cpp b/netwerk/base/src/nsTemporaryFileInputStream.cpp index 72eef84eb48..60e3aba679e 100644 --- a/netwerk/base/src/nsTemporaryFileInputStream.cpp +++ b/netwerk/base/src/nsTemporaryFileInputStream.cpp @@ -7,7 +7,7 @@ #include "nsStreamUtils.h" #include -NS_IMPL_ISUPPORTS1(nsTemporaryFileInputStream, nsIInputStream) +NS_IMPL_ISUPPORTS(nsTemporaryFileInputStream, nsIInputStream) nsTemporaryFileInputStream::nsTemporaryFileInputStream(FileDescOwner* aFileDescOwner, uint64_t aStartPos, uint64_t aEndPos) : mFileDescOwner(aFileDescOwner), diff --git a/netwerk/base/src/nsTransportUtils.cpp b/netwerk/base/src/nsTransportUtils.cpp index 39e5d8f6bba..c0eda84aed9 100644 --- a/netwerk/base/src/nsTransportUtils.cpp +++ b/netwerk/base/src/nsTransportUtils.cpp @@ -89,7 +89,7 @@ public: uint64_t mProgressMax; }; -NS_IMPL_ISUPPORTS1(nsTransportEventSinkProxy, nsITransportEventSink) +NS_IMPL_ISUPPORTS(nsTransportEventSinkProxy, nsITransportEventSink) NS_IMETHODIMP nsTransportEventSinkProxy::OnTransportStatus(nsITransport *transport, diff --git a/netwerk/base/src/nsUDPSocket.cpp b/netwerk/base/src/nsUDPSocket.cpp index f9084fac0cf..72864999e0c 100644 --- a/netwerk/base/src/nsUDPSocket.cpp +++ b/netwerk/base/src/nsUDPSocket.cpp @@ -67,7 +67,7 @@ ResolveHost(const nsACString &host, nsIDNSListener *listener) //----------------------------------------------------------------------------- // nsUDPOutputStream impl //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsUDPOutputStream, nsIOutputStream) +NS_IMPL_ISUPPORTS(nsUDPOutputStream, nsIOutputStream) nsUDPOutputStream::nsUDPOutputStream(nsUDPSocket* aSocket, PRFileDesc* aFD, @@ -371,7 +371,7 @@ private: FallibleTArray mData; }; -NS_IMPL_ISUPPORTS1(UDPMessageProxy, nsIUDPMessage) +NS_IMPL_ISUPPORTS(UDPMessageProxy, nsIUDPMessage) /* readonly attribute nsINetAddr from; */ NS_IMETHODIMP @@ -522,7 +522,7 @@ nsUDPSocket::IsLocal(bool *aIsLocal) // nsSocket::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsUDPSocket, nsIUDPSocket) +NS_IMPL_ISUPPORTS(nsUDPSocket, nsIUDPSocket) //----------------------------------------------------------------------------- @@ -708,8 +708,8 @@ private: nsCOMPtr mTargetThread; }; -NS_IMPL_ISUPPORTS1(SocketListenerProxy, - nsIUDPSocketListener) +NS_IMPL_ISUPPORTS(SocketListenerProxy, + nsIUDPSocketListener) NS_IMETHODIMP SocketListenerProxy::OnPacketReceived(nsIUDPSocket* aSocket, @@ -778,7 +778,7 @@ private: FallibleTArray mData; }; -NS_IMPL_ISUPPORTS1(PendingSend, nsIDNSListener) +NS_IMPL_ISUPPORTS(PendingSend, nsIDNSListener) NS_IMETHODIMP PendingSend::OnLookupComplete(nsICancelable *request, diff --git a/netwerk/base/src/nsURIChecker.cpp b/netwerk/base/src/nsURIChecker.cpp index 3832eb2e097..9cb1b1d038e 100644 --- a/netwerk/base/src/nsURIChecker.cpp +++ b/netwerk/base/src/nsURIChecker.cpp @@ -26,13 +26,13 @@ ServerIsNES3x(nsIHttpChannel *httpChannel) //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS6(nsURIChecker, - nsIURIChecker, - nsIRequest, - nsIRequestObserver, - nsIStreamListener, - nsIChannelEventSink, - nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(nsURIChecker, + nsIURIChecker, + nsIRequest, + nsIRequestObserver, + nsIStreamListener, + nsIChannelEventSink, + nsIInterfaceRequestor) nsURIChecker::nsURIChecker() : mStatus(NS_OK) diff --git a/netwerk/base/src/nsURLParsers.cpp b/netwerk/base/src/nsURLParsers.cpp index 7ef259d4f8f..81aadd345f2 100644 --- a/netwerk/base/src/nsURLParsers.cpp +++ b/netwerk/base/src/nsURLParsers.cpp @@ -29,8 +29,8 @@ CountConsecutiveSlashes(const char *str, int32_t len) // nsBaseURLParser implementation //---------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsAuthURLParser, nsIURLParser) -NS_IMPL_ISUPPORTS1(nsNoAuthURLParser, nsIURLParser) +NS_IMPL_ISUPPORTS(nsAuthURLParser, nsIURLParser) +NS_IMPL_ISUPPORTS(nsNoAuthURLParser, nsIURLParser) #define SET_RESULT(component, pos, len) \ PR_BEGIN_MACRO \ diff --git a/netwerk/base/src/nsUnicharStreamLoader.cpp b/netwerk/base/src/nsUnicharStreamLoader.cpp index 758b9ce139e..7fa17957092 100644 --- a/netwerk/base/src/nsUnicharStreamLoader.cpp +++ b/netwerk/base/src/nsUnicharStreamLoader.cpp @@ -46,8 +46,8 @@ nsUnicharStreamLoader::Create(nsISupports *aOuter, return rv; } -NS_IMPL_ISUPPORTS3(nsUnicharStreamLoader, nsIUnicharStreamLoader, - nsIRequestObserver, nsIStreamListener) +NS_IMPL_ISUPPORTS(nsUnicharStreamLoader, nsIUnicharStreamLoader, + nsIRequestObserver, nsIStreamListener) /* readonly attribute nsIChannel channel; */ NS_IMETHODIMP diff --git a/netwerk/cache/nsApplicationCacheService.cpp b/netwerk/cache/nsApplicationCacheService.cpp index 9d5b26fdf10..fab51677d71 100644 --- a/netwerk/cache/nsApplicationCacheService.cpp +++ b/netwerk/cache/nsApplicationCacheService.cpp @@ -19,7 +19,7 @@ static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID); // nsApplicationCacheService //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsApplicationCacheService, nsIApplicationCacheService) +NS_IMPL_ISUPPORTS(nsApplicationCacheService, nsIApplicationCacheService) nsApplicationCacheService::nsApplicationCacheService() { @@ -227,7 +227,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(AppCacheClearDataObserver, nsIObserver) +NS_IMPL_ISUPPORTS(AppCacheClearDataObserver, nsIObserver) } // anonymous namespace diff --git a/netwerk/cache/nsCacheEntry.cpp b/netwerk/cache/nsCacheEntry.cpp index 4d687b7e185..6d41c9308a9 100644 --- a/netwerk/cache/nsCacheEntry.cpp +++ b/netwerk/cache/nsCacheEntry.cpp @@ -271,7 +271,7 @@ nsCacheEntry::GetDescriptors( * nsCacheEntryInfo - for implementing about:cache *****************************************************************************/ -NS_IMPL_ISUPPORTS1(nsCacheEntryInfo, nsICacheEntryInfo) +NS_IMPL_ISUPPORTS(nsCacheEntryInfo, nsICacheEntryInfo) NS_IMETHODIMP diff --git a/netwerk/cache/nsCacheEntryDescriptor.cpp b/netwerk/cache/nsCacheEntryDescriptor.cpp index 5d2c947827b..4869fefdfd2 100644 --- a/netwerk/cache/nsCacheEntryDescriptor.cpp +++ b/netwerk/cache/nsCacheEntryDescriptor.cpp @@ -70,9 +70,9 @@ private: }; -NS_IMPL_ISUPPORTS2(nsCacheEntryDescriptor, - nsICacheEntryDescriptor, - nsICacheEntryInfo) +NS_IMPL_ISUPPORTS(nsCacheEntryDescriptor, + nsICacheEntryDescriptor, + nsICacheEntryInfo) nsCacheEntryDescriptor::nsCacheEntryDescriptor(nsCacheEntry * entry, nsCacheAccessMode accessGranted) diff --git a/netwerk/cache/nsCacheService.cpp b/netwerk/cache/nsCacheService.cpp index 7f54d946a41..a1b3c2312de 100644 --- a/netwerk/cache/nsCacheService.cpp +++ b/netwerk/cache/nsCacheService.cpp @@ -201,7 +201,7 @@ private: bool mClearCacheOnShutdown; }; -NS_IMPL_ISUPPORTS1(nsCacheProfilePrefObserver, nsIObserver) +NS_IMPL_ISUPPORTS(nsCacheProfilePrefObserver, nsIObserver) class nsSetDiskSmartSizeCallback MOZ_FINAL : public nsITimerCallback { @@ -218,7 +218,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(nsSetDiskSmartSizeCallback, nsITimerCallback) +NS_IMPL_ISUPPORTS(nsSetDiskSmartSizeCallback, nsITimerCallback) // Runnable sent to main thread after the cache IO thread calculates available // disk space, so that there is no race in setting mDiskCacheCapacity. @@ -1072,8 +1072,8 @@ private: *****************************************************************************/ nsCacheService * nsCacheService::gService = nullptr; -NS_IMPL_ISUPPORTS3(nsCacheService, nsICacheService, nsICacheServiceInternal, - nsIMemoryReporter) +NS_IMPL_ISUPPORTS(nsCacheService, nsICacheService, nsICacheServiceInternal, + nsIMemoryReporter) nsCacheService::nsCacheService() : mObserver(nullptr), diff --git a/netwerk/cache/nsCacheSession.cpp b/netwerk/cache/nsCacheSession.cpp index 7550de81fe1..d82203aec14 100644 --- a/netwerk/cache/nsCacheSession.cpp +++ b/netwerk/cache/nsCacheSession.cpp @@ -9,7 +9,7 @@ #include "nsCRT.h" #include "nsThreadUtils.h" -NS_IMPL_ISUPPORTS1(nsCacheSession, nsICacheSession) +NS_IMPL_ISUPPORTS(nsCacheSession, nsICacheSession) nsCacheSession::nsCacheSession(const char * clientID, nsCacheStoragePolicy storagePolicy, diff --git a/netwerk/cache/nsDiskCacheDevice.cpp b/netwerk/cache/nsDiskCacheDevice.cpp index a0e513d69e5..df9fc160d11 100644 --- a/netwerk/cache/nsDiskCacheDevice.cpp +++ b/netwerk/cache/nsDiskCacheDevice.cpp @@ -193,7 +193,7 @@ private: nsDiskCacheDevice* mDevice; }; -NS_IMPL_ISUPPORTS1(nsDiskCacheDeviceInfo, nsICacheDeviceInfo) +NS_IMPL_ISUPPORTS(nsDiskCacheDeviceInfo, nsICacheDeviceInfo) /* readonly attribute string description; */ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetDescription(char ** aDescription) diff --git a/netwerk/cache/nsDiskCacheDeviceSQL.cpp b/netwerk/cache/nsDiskCacheDeviceSQL.cpp index 2110c5340ec..5492908dc8e 100644 --- a/netwerk/cache/nsDiskCacheDeviceSQL.cpp +++ b/netwerk/cache/nsDiskCacheDeviceSQL.cpp @@ -151,7 +151,7 @@ DCacheHash(const char * key) * nsOfflineCacheEvictionFunction */ -NS_IMPL_ISUPPORTS1(nsOfflineCacheEvictionFunction, mozIStorageFunction) +NS_IMPL_ISUPPORTS(nsOfflineCacheEvictionFunction, mozIStorageFunction) // helper function for directly exposing the same data file binding // path algorithm used in nsOfflineCacheBinding::Create @@ -283,7 +283,7 @@ private: nsOfflineCacheDevice* mDevice; }; -NS_IMPL_ISUPPORTS1(nsOfflineCacheDeviceInfo, nsICacheDeviceInfo) +NS_IMPL_ISUPPORTS(nsOfflineCacheDeviceInfo, nsICacheDeviceInfo) NS_IMETHODIMP nsOfflineCacheDeviceInfo::GetDescription(char **aDescription) @@ -521,7 +521,7 @@ public: nsOfflineCacheRecord *mRec; }; -NS_IMPL_ISUPPORTS1(nsOfflineCacheEntryInfo, nsICacheEntryInfo) +NS_IMPL_ISUPPORTS(nsOfflineCacheEntryInfo, nsICacheEntryInfo) NS_IMETHODIMP nsOfflineCacheEntryInfo::GetClientID(char **result) @@ -591,7 +591,7 @@ nsOfflineCacheEntryInfo::GetDataSize(uint32_t *aDataSize) * nsApplicationCacheNamespace */ -NS_IMPL_ISUPPORTS1(nsApplicationCacheNamespace, nsIApplicationCacheNamespace) +NS_IMPL_ISUPPORTS(nsApplicationCacheNamespace, nsIApplicationCacheNamespace) NS_IMETHODIMP nsApplicationCacheNamespace::Init(uint32_t itemType, @@ -629,9 +629,9 @@ nsApplicationCacheNamespace::GetData(nsACString &out) * nsApplicationCache */ -NS_IMPL_ISUPPORTS2(nsApplicationCache, - nsIApplicationCache, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsApplicationCache, + nsIApplicationCache, + nsISupportsWeakReference) nsApplicationCache::nsApplicationCache() : mDevice(nullptr) diff --git a/netwerk/cache/nsDiskCacheEntry.cpp b/netwerk/cache/nsDiskCacheEntry.cpp index 22c13916e1d..cd5a3497779 100644 --- a/netwerk/cache/nsDiskCacheEntry.cpp +++ b/netwerk/cache/nsDiskCacheEntry.cpp @@ -68,7 +68,7 @@ nsDiskCacheEntry::CreateCacheEntry(nsCacheDevice * device) * nsDiskCacheEntryInfo *****************************************************************************/ -NS_IMPL_ISUPPORTS1(nsDiskCacheEntryInfo, nsICacheEntryInfo) +NS_IMPL_ISUPPORTS(nsDiskCacheEntryInfo, nsICacheEntryInfo) NS_IMETHODIMP nsDiskCacheEntryInfo::GetClientID(char ** clientID) { diff --git a/netwerk/cache/nsDiskCacheStreams.cpp b/netwerk/cache/nsDiskCacheStreams.cpp index 795fe780220..87b921075f4 100644 --- a/netwerk/cache/nsDiskCacheStreams.cpp +++ b/netwerk/cache/nsDiskCacheStreams.cpp @@ -57,7 +57,7 @@ private: }; -NS_IMPL_ISUPPORTS1(nsDiskCacheInputStream, nsIInputStream) +NS_IMPL_ISUPPORTS(nsDiskCacheInputStream, nsIInputStream) nsDiskCacheInputStream::nsDiskCacheInputStream( nsDiskCacheStreamIO * parent, @@ -190,7 +190,7 @@ nsDiskCacheInputStream::IsNonBlocking(bool * nonBlocking) /****************************************************************************** * nsDiskCacheStreamIO *****************************************************************************/ -NS_IMPL_ISUPPORTS1(nsDiskCacheStreamIO, nsIOutputStream) +NS_IMPL_ISUPPORTS(nsDiskCacheStreamIO, nsIOutputStream) nsDiskCacheStreamIO::nsDiskCacheStreamIO(nsDiskCacheBinding * binding) : mBinding(binding) diff --git a/netwerk/cache/nsMemoryCacheDevice.cpp b/netwerk/cache/nsMemoryCacheDevice.cpp index 332f9c2e73d..8e839ff5045 100644 --- a/netwerk/cache/nsMemoryCacheDevice.cpp +++ b/netwerk/cache/nsMemoryCacheDevice.cpp @@ -563,7 +563,7 @@ nsMemoryCacheDevice::CheckEntryCount() *****************************************************************************/ -NS_IMPL_ISUPPORTS1(nsMemoryCacheDeviceInfo, nsICacheDeviceInfo) +NS_IMPL_ISUPPORTS(nsMemoryCacheDeviceInfo, nsICacheDeviceInfo) NS_IMETHODIMP diff --git a/netwerk/cache2/CacheEntry.cpp b/netwerk/cache2/CacheEntry.cpp index 081d233a4ec..6c8518876c3 100644 --- a/netwerk/cache2/CacheEntry.cpp +++ b/netwerk/cache2/CacheEntry.cpp @@ -40,7 +40,7 @@ static uint32_t const ENTRY_NEEDS_REVALIDATION = static uint32_t const ENTRY_NOT_WANTED = nsICacheEntryOpenCallback::ENTRY_NOT_WANTED; -NS_IMPL_ISUPPORTS1(CacheEntryHandle, nsICacheEntry) +NS_IMPL_ISUPPORTS(CacheEntryHandle, nsICacheEntry) // CacheEntryHandle @@ -149,10 +149,10 @@ nsresult CacheEntry::Callback::OnAvailThread(bool *aOnAvailThread) const // CacheEntry -NS_IMPL_ISUPPORTS3(CacheEntry, - nsICacheEntry, - nsIRunnable, - CacheFileListener) +NS_IMPL_ISUPPORTS(CacheEntry, + nsICacheEntry, + nsIRunnable, + CacheFileListener) CacheEntry::CacheEntry(const nsACString& aStorageID, nsIURI* aURI, diff --git a/netwerk/cache2/CacheFile.cpp b/netwerk/cache2/CacheFile.cpp index bd14633e8a5..85a34fc73a7 100644 --- a/netwerk/cache2/CacheFile.cpp +++ b/netwerk/cache2/CacheFile.cpp @@ -159,7 +159,7 @@ private: nsCOMPtr mListener; }; -NS_IMPL_ISUPPORTS1(DoomFileHelper, CacheFileIOListener) +NS_IMPL_ISUPPORTS(DoomFileHelper, CacheFileIOListener) NS_IMPL_ADDREF(CacheFile) diff --git a/netwerk/cache2/CacheFileIOManager.cpp b/netwerk/cache2/CacheFileIOManager.cpp index 33c96b6d4e0..5d7f4dddec2 100644 --- a/netwerk/cache2/CacheFileIOManager.cpp +++ b/netwerk/cache2/CacheFileIOManager.cpp @@ -1147,7 +1147,7 @@ public: CacheFileIOManager * CacheFileIOManager::gInstance = nullptr; -NS_IMPL_ISUPPORTS1(CacheFileIOManager, nsITimerCallback) +NS_IMPL_ISUPPORTS(CacheFileIOManager, nsITimerCallback) CacheFileIOManager::CacheFileIOManager() : mShuttingDown(false) diff --git a/netwerk/cache2/CacheFileMetadata.cpp b/netwerk/cache2/CacheFileMetadata.cpp index 031bb67bee3..5351782df18 100644 --- a/netwerk/cache2/CacheFileMetadata.cpp +++ b/netwerk/cache2/CacheFileMetadata.cpp @@ -26,7 +26,7 @@ namespace net { #define kCacheEntryVersion 1 -NS_IMPL_ISUPPORTS1(CacheFileMetadata, CacheFileIOListener) +NS_IMPL_ISUPPORTS(CacheFileMetadata, CacheFileIOListener) CacheFileMetadata::CacheFileMetadata(CacheFileHandle *aHandle, const nsACString &aKey) : CacheMemoryConsumer(NORMAL) diff --git a/netwerk/cache2/CacheIOThread.cpp b/netwerk/cache2/CacheIOThread.cpp index e708dfff02d..af677f2d0b8 100644 --- a/netwerk/cache2/CacheIOThread.cpp +++ b/netwerk/cache2/CacheIOThread.cpp @@ -17,7 +17,7 @@ namespace net { CacheIOThread* CacheIOThread::sSelf = nullptr; -NS_IMPL_ISUPPORTS1(CacheIOThread, nsIThreadObserver) +NS_IMPL_ISUPPORTS(CacheIOThread, nsIThreadObserver) CacheIOThread::CacheIOThread() : mMonitor("CacheIOThread") diff --git a/netwerk/cache2/CacheIndex.cpp b/netwerk/cache2/CacheIndex.cpp index 37acbbabd6e..0e96970d4e7 100644 --- a/netwerk/cache2/CacheIndex.cpp +++ b/netwerk/cache2/CacheIndex.cpp @@ -225,7 +225,7 @@ NS_IMETHODIMP FileOpenHelper::OnFileOpened(CacheFileHandle *aHandle, return NS_OK; } -NS_IMPL_ISUPPORTS1(FileOpenHelper, CacheFileIOListener); +NS_IMPL_ISUPPORTS(FileOpenHelper, CacheFileIOListener); CacheIndex * CacheIndex::gInstance = nullptr; diff --git a/netwerk/cache2/CacheObserver.cpp b/netwerk/cache2/CacheObserver.cpp index 1058e086e18..ab8c475bc00 100644 --- a/netwerk/cache2/CacheObserver.cpp +++ b/netwerk/cache2/CacheObserver.cpp @@ -71,9 +71,9 @@ bool CacheObserver::sSanitizeOnShutdown = kDefaultSanitizeOnShutdown; static bool kDefaultClearCacheOnShutdown = false; bool CacheObserver::sClearCacheOnShutdown = kDefaultClearCacheOnShutdown; -NS_IMPL_ISUPPORTS2(CacheObserver, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(CacheObserver, + nsIObserver, + nsISupportsWeakReference) // static nsresult diff --git a/netwerk/cache2/CacheStorage.cpp b/netwerk/cache2/CacheStorage.cpp index 66baab84121..e7350fbf9d5 100644 --- a/netwerk/cache2/CacheStorage.cpp +++ b/netwerk/cache2/CacheStorage.cpp @@ -21,7 +21,7 @@ namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS1(CacheStorage, nsICacheStorage) +NS_IMPL_ISUPPORTS(CacheStorage, nsICacheStorage) CacheStorage::CacheStorage(nsILoadContextInfo* aInfo, bool aAllowDisk, diff --git a/netwerk/cache2/CacheStorageService.cpp b/netwerk/cache2/CacheStorageService.cpp index 05afd9abcbb..3459485b1c8 100644 --- a/netwerk/cache2/CacheStorageService.cpp +++ b/netwerk/cache2/CacheStorageService.cpp @@ -99,10 +99,10 @@ CacheStorageService::MemoryPool::Limit() const return 0; } -NS_IMPL_ISUPPORTS3(CacheStorageService, - nsICacheStorageService, - nsIMemoryReporter, - nsITimerCallback) +NS_IMPL_ISUPPORTS(CacheStorageService, + nsICacheStorageService, + nsIMemoryReporter, + nsITimerCallback) CacheStorageService* CacheStorageService::sSelf = nullptr; @@ -1079,7 +1079,7 @@ NS_IMETHODIMP CacheEntryDoomByKeyCallback::OnFileDoomed(CacheFileHandle *aHandle return NS_OK; } -NS_IMPL_ISUPPORTS1(CacheEntryDoomByKeyCallback, CacheFileIOListener); +NS_IMPL_ISUPPORTS(CacheEntryDoomByKeyCallback, CacheFileIOListener); } // anon diff --git a/netwerk/cache2/OldWrappers.cpp b/netwerk/cache2/OldWrappers.cpp index d2e452dc4e1..8b46bf17b5e 100644 --- a/netwerk/cache2/OldWrappers.cpp +++ b/netwerk/cache2/OldWrappers.cpp @@ -105,7 +105,7 @@ private: nsCOMPtr mCB; }; -NS_IMPL_ISUPPORTS1(DoomCallbackWrapper, nsICacheListener); +NS_IMPL_ISUPPORTS(DoomCallbackWrapper, nsICacheListener); NS_IMETHODIMP DoomCallbackWrapper::OnCacheEntryAvailable(nsICacheEntryDescriptor *descriptor, nsCacheAccessMode accessGranted, @@ -148,7 +148,7 @@ private: char* const mDeviceID; }; -NS_IMPL_ISUPPORTS1(VisitCallbackWrapper, nsICacheVisitor) +NS_IMPL_ISUPPORTS(VisitCallbackWrapper, nsICacheVisitor) VisitCallbackWrapper::~VisitCallbackWrapper() { @@ -229,9 +229,9 @@ nsresult _OldGetDiskConsumption::Get(nsICacheStorageConsumptionObserver* aCallba return NS_DispatchToMainThread(cb); } -NS_IMPL_ISUPPORTS_INHERITED1(_OldGetDiskConsumption, - nsRunnable, - nsICacheVisitor) +NS_IMPL_ISUPPORTS_INHERITED(_OldGetDiskConsumption, + nsRunnable, + nsICacheVisitor) _OldGetDiskConsumption::_OldGetDiskConsumption( nsICacheStorageConsumptionObserver* aCallback) @@ -295,7 +295,7 @@ _OldCacheEntryWrapper::~_OldCacheEntryWrapper() LOG(("Destroying _OldCacheEntryWrapper %p for descriptor %p", this, mOldInfo.get())); } -NS_IMPL_ISUPPORTS1(_OldCacheEntryWrapper, nsICacheEntry) +NS_IMPL_ISUPPORTS(_OldCacheEntryWrapper, nsICacheEntry) NS_IMETHODIMP _OldCacheEntryWrapper::AsyncDoom(nsICacheEntryDoomCallback* listener) { @@ -545,7 +545,7 @@ GetCacheSession(nsCSubstring const &aScheme, } // anon -NS_IMPL_ISUPPORTS_INHERITED1(_OldCacheLoad, nsRunnable, nsICacheListener) +NS_IMPL_ISUPPORTS_INHERITED(_OldCacheLoad, nsRunnable, nsICacheListener) _OldCacheLoad::_OldCacheLoad(nsCSubstring const& aScheme, nsCSubstring const& aCacheKey, @@ -781,7 +781,7 @@ _OldCacheLoad::OnCacheEntryDoomed(nsresult) // nsICacheStorage old cache wrapper -NS_IMPL_ISUPPORTS1(_OldStorage, nsICacheStorage) +NS_IMPL_ISUPPORTS(_OldStorage, nsICacheStorage) _OldStorage::_OldStorage(nsILoadContextInfo* aInfo, bool aAllowDisk, diff --git a/netwerk/cookie/CookieServiceChild.cpp b/netwerk/cookie/CookieServiceChild.cpp index b2dbe0ecac8..3edff1aef69 100644 --- a/netwerk/cookie/CookieServiceChild.cpp +++ b/netwerk/cookie/CookieServiceChild.cpp @@ -40,10 +40,10 @@ CookieServiceChild::GetSingleton() return gCookieService; } -NS_IMPL_ISUPPORTS3(CookieServiceChild, - nsICookieService, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(CookieServiceChild, + nsICookieService, + nsIObserver, + nsISupportsWeakReference) CookieServiceChild::CookieServiceChild() : mCookieBehavior(BEHAVIOR_ACCEPT) diff --git a/netwerk/cookie/nsCookie.cpp b/netwerk/cookie/nsCookie.cpp index 34ef96c3a1e..c3242089104 100644 --- a/netwerk/cookie/nsCookie.cpp +++ b/netwerk/cookie/nsCookie.cpp @@ -153,4 +153,4 @@ nsCookie::GetExpires(uint64_t *aExpires) return NS_OK; } -NS_IMPL_ISUPPORTS2(nsCookie, nsICookie2, nsICookie) +NS_IMPL_ISUPPORTS(nsCookie, nsICookie2, nsICookie) diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp index bb5ad69903a..d6f2b7160c7 100644 --- a/netwerk/cookie/nsCookieService.cpp +++ b/netwerk/cookie/nsCookieService.cpp @@ -415,7 +415,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(InsertCookieDBListener, mozIStorageStatementCallback) +NS_IMPL_ISUPPORTS(InsertCookieDBListener, mozIStorageStatementCallback) /****************************************************************************** * UpdateCookieDBListener impl: @@ -441,7 +441,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(UpdateCookieDBListener, mozIStorageStatementCallback) +NS_IMPL_ISUPPORTS(UpdateCookieDBListener, mozIStorageStatementCallback) /****************************************************************************** * RemoveCookieDBListener impl: @@ -467,7 +467,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(RemoveCookieDBListener, mozIStorageStatementCallback) +NS_IMPL_ISUPPORTS(RemoveCookieDBListener, mozIStorageStatementCallback) /****************************************************************************** * ReadCookieDBListener impl: @@ -546,7 +546,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(ReadCookieDBListener, mozIStorageStatementCallback) +NS_IMPL_ISUPPORTS(ReadCookieDBListener, mozIStorageStatementCallback) /****************************************************************************** * CloseCookieDBListener imp: @@ -567,7 +567,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(CloseCookieDBListener, mozIStorageCompletionCallback) +NS_IMPL_ISUPPORTS(CloseCookieDBListener, mozIStorageCompletionCallback) namespace { @@ -594,7 +594,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(AppClearDataObserver, nsIObserver) +NS_IMPL_ISUPPORTS(AppClearDataObserver, nsIObserver) } // anonymous namespace @@ -717,13 +717,13 @@ nsCookieService::AppClearDataObserverInit() * public methods ******************************************************************************/ -NS_IMPL_ISUPPORTS6(nsCookieService, - nsICookieService, - nsICookieManager, - nsICookieManager2, - nsIObserver, - nsISupportsWeakReference, - nsIMemoryReporter) +NS_IMPL_ISUPPORTS(nsCookieService, + nsICookieService, + nsICookieManager, + nsICookieManager2, + nsIObserver, + nsISupportsWeakReference, + nsIMemoryReporter) nsCookieService::nsCookieService() : mDBState(nullptr) diff --git a/netwerk/dns/ChildDNSService.cpp b/netwerk/dns/ChildDNSService.cpp index b19067e1afb..b17e0374eb1 100644 --- a/netwerk/dns/ChildDNSService.cpp +++ b/netwerk/dns/ChildDNSService.cpp @@ -36,10 +36,10 @@ ChildDNSService* ChildDNSService::GetSingleton() return gChildDNSService; } -NS_IMPL_ISUPPORTS3(ChildDNSService, - nsIDNSService, - nsPIDNSService, - nsIObserver) +NS_IMPL_ISUPPORTS(ChildDNSService, + nsIDNSService, + nsPIDNSService, + nsIObserver) ChildDNSService::ChildDNSService() : mFirstTime(true) diff --git a/netwerk/dns/DNSListenerProxy.cpp b/netwerk/dns/DNSListenerProxy.cpp index d3e252fc5e4..34aab680ada 100644 --- a/netwerk/dns/DNSListenerProxy.cpp +++ b/netwerk/dns/DNSListenerProxy.cpp @@ -11,7 +11,7 @@ namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS1(DNSListenerProxy, nsIDNSListener) +NS_IMPL_ISUPPORTS(DNSListenerProxy, nsIDNSListener) NS_IMETHODIMP DNSListenerProxy::OnLookupComplete(nsICancelable* aRequest, diff --git a/netwerk/dns/DNSRequestChild.cpp b/netwerk/dns/DNSRequestChild.cpp index b1f2a449eb5..59f13abcb68 100644 --- a/netwerk/dns/DNSRequestChild.cpp +++ b/netwerk/dns/DNSRequestChild.cpp @@ -40,7 +40,7 @@ private: uint16_t mFlags; }; -NS_IMPL_ISUPPORTS1(ChildDNSRecord, nsIDNSRecord) +NS_IMPL_ISUPPORTS(ChildDNSRecord, nsIDNSRecord) ChildDNSRecord::ChildDNSRecord(const DNSRecord& reply, uint16_t flags) : mCurrent(0) @@ -229,8 +229,8 @@ DNSRequestChild::Recv__delete__(const DNSRequestResponse& reply) // DNSRequestChild::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(DNSRequestChild, - nsICancelable) +NS_IMPL_ISUPPORTS(DNSRequestChild, + nsICancelable) //----------------------------------------------------------------------------- // DNSRequestChild::nsICancelable diff --git a/netwerk/dns/DNSRequestParent.cpp b/netwerk/dns/DNSRequestParent.cpp index 5561671617f..e81f3b7cb26 100644 --- a/netwerk/dns/DNSRequestParent.cpp +++ b/netwerk/dns/DNSRequestParent.cpp @@ -60,8 +60,8 @@ DNSRequestParent::ActorDestroy(ActorDestroyReason why) // DNSRequestParent::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(DNSRequestParent, - nsIDNSListener) +NS_IMPL_ISUPPORTS(DNSRequestParent, + nsIDNSListener) //----------------------------------------------------------------------------- // nsIDNSListener functions diff --git a/netwerk/dns/nsDNSService2.cpp b/netwerk/dns/nsDNSService2.cpp index cbc3f03e7aa..1f6a6dea57a 100644 --- a/netwerk/dns/nsDNSService2.cpp +++ b/netwerk/dns/nsDNSService2.cpp @@ -74,7 +74,7 @@ private: bool mDone; }; -NS_IMPL_ISUPPORTS1(nsDNSRecord, nsIDNSRecord) +NS_IMPL_ISUPPORTS(nsDNSRecord, nsIDNSRecord) NS_IMETHODIMP nsDNSRecord::GetCanonicalName(nsACString &result) @@ -326,7 +326,7 @@ nsDNSAsyncRequest::SizeOfIncludingThis(MallocSizeOf mallocSizeOf) const return n; } -NS_IMPL_ISUPPORTS1(nsDNSAsyncRequest, nsICancelable) +NS_IMPL_ISUPPORTS(nsDNSAsyncRequest, nsICancelable) NS_IMETHODIMP nsDNSAsyncRequest::Cancel(nsresult reason) @@ -433,8 +433,8 @@ nsDNSService::~nsDNSService() { } -NS_IMPL_ISUPPORTS4(nsDNSService, nsIDNSService, nsPIDNSService, nsIObserver, - nsIMemoryReporter) +NS_IMPL_ISUPPORTS(nsDNSService, nsIDNSService, nsPIDNSService, nsIObserver, + nsIMemoryReporter) /****************************************************************************** * nsDNSService impl: diff --git a/netwerk/dns/nsEffectiveTLDService.cpp b/netwerk/dns/nsEffectiveTLDService.cpp index 3d8b8d15329..e54f3b0005f 100644 --- a/netwerk/dns/nsEffectiveTLDService.cpp +++ b/netwerk/dns/nsEffectiveTLDService.cpp @@ -18,8 +18,8 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS2(nsEffectiveTLDService, nsIEffectiveTLDService, - nsIMemoryReporter) +NS_IMPL_ISUPPORTS(nsEffectiveTLDService, nsIEffectiveTLDService, + nsIMemoryReporter) // ---------------------------------------------------------------------- diff --git a/netwerk/dns/nsIDNService.cpp b/netwerk/dns/nsIDNService.cpp index 02acef2b294..0dfd21760ee 100644 --- a/netwerk/dns/nsIDNService.cpp +++ b/netwerk/dns/nsIDNService.cpp @@ -46,10 +46,10 @@ inline bool isOnlySafeChars(const nsAFlatString& in, //----------------------------------------------------------------------------- /* Implementation file */ -NS_IMPL_ISUPPORTS3(nsIDNService, - nsIIDNService, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsIDNService, + nsIIDNService, + nsIObserver, + nsISupportsWeakReference) nsresult nsIDNService::Init() { diff --git a/netwerk/ipc/RemoteOpenFileChild.cpp b/netwerk/ipc/RemoteOpenFileChild.cpp index c15c9550a2f..5045782e351 100644 --- a/netwerk/ipc/RemoteOpenFileChild.cpp +++ b/netwerk/ipc/RemoteOpenFileChild.cpp @@ -64,10 +64,10 @@ private: // RemoteOpenFileChild //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS3(RemoteOpenFileChild, - nsIFile, - nsIHashable, - nsICachedFileDescriptorListener) +NS_IMPL_ISUPPORTS(RemoteOpenFileChild, + nsIFile, + nsIHashable, + nsICachedFileDescriptorListener) RemoteOpenFileChild::RemoteOpenFileChild(const RemoteOpenFileChild& other) : mTabChild(other.mTabChild) diff --git a/netwerk/mime/nsMIMEHeaderParamImpl.cpp b/netwerk/mime/nsMIMEHeaderParamImpl.cpp index aad1d58236d..9e1062eafb9 100644 --- a/netwerk/mime/nsMIMEHeaderParamImpl.cpp +++ b/netwerk/mime/nsMIMEHeaderParamImpl.cpp @@ -42,7 +42,7 @@ static nsresult internalDecodeParameter(const nsACString&, const char*, !nsCRT::strncasecmp((cset), "HZ-GB", 5) || \ !nsCRT::strncasecmp((cset), "UTF-7", 5)) -NS_IMPL_ISUPPORTS1(nsMIMEHeaderParamImpl, nsIMIMEHeaderParam) +NS_IMPL_ISUPPORTS(nsMIMEHeaderParamImpl, nsIMIMEHeaderParam) NS_IMETHODIMP nsMIMEHeaderParamImpl::GetParameter(const nsACString& aHeaderVal, diff --git a/netwerk/protocol/about/nsAboutBlank.cpp b/netwerk/protocol/about/nsAboutBlank.cpp index 4decd6995d9..85d1fb92b73 100644 --- a/netwerk/protocol/about/nsAboutBlank.cpp +++ b/netwerk/protocol/about/nsAboutBlank.cpp @@ -7,7 +7,7 @@ #include "nsStringStream.h" #include "nsNetUtil.h" -NS_IMPL_ISUPPORTS1(nsAboutBlank, nsIAboutModule) +NS_IMPL_ISUPPORTS(nsAboutBlank, nsIAboutModule) NS_IMETHODIMP nsAboutBlank::NewChannel(nsIURI *aURI, nsIChannel **result) diff --git a/netwerk/protocol/about/nsAboutBloat.cpp b/netwerk/protocol/about/nsAboutBloat.cpp index 1ed3cbd1c4a..b997853ac40 100644 --- a/netwerk/protocol/about/nsAboutBloat.cpp +++ b/netwerk/protocol/about/nsAboutBloat.cpp @@ -18,7 +18,7 @@ static void GC_gcollect() {} -NS_IMPL_ISUPPORTS1(nsAboutBloat, nsIAboutModule) +NS_IMPL_ISUPPORTS(nsAboutBloat, nsIAboutModule) NS_IMETHODIMP nsAboutBloat::NewChannel(nsIURI *aURI, nsIChannel **result) diff --git a/netwerk/protocol/about/nsAboutCache.cpp b/netwerk/protocol/about/nsAboutCache.cpp index 4d39b8f7000..1a3f701cdac 100644 --- a/netwerk/protocol/about/nsAboutCache.cpp +++ b/netwerk/protocol/about/nsAboutCache.cpp @@ -14,7 +14,7 @@ #include "nsICacheService.h" -NS_IMPL_ISUPPORTS2(nsAboutCache, nsIAboutModule, nsICacheVisitor) +NS_IMPL_ISUPPORTS(nsAboutCache, nsIAboutModule, nsICacheVisitor) NS_IMETHODIMP nsAboutCache::NewChannel(nsIURI *aURI, nsIChannel **result) diff --git a/netwerk/protocol/about/nsAboutCacheEntry.cpp b/netwerk/protocol/about/nsAboutCacheEntry.cpp index 7c878a5f78b..6888380686f 100644 --- a/netwerk/protocol/about/nsAboutCacheEntry.cpp +++ b/netwerk/protocol/about/nsAboutCacheEntry.cpp @@ -72,9 +72,9 @@ HexDump(uint32_t *state, const char *buf, int32_t n, nsCString &result) //----------------------------------------------------------------------------- // nsAboutCacheEntry::nsISupports -NS_IMPL_ISUPPORTS2(nsAboutCacheEntry, - nsIAboutModule, - nsICacheMetaDataVisitor) +NS_IMPL_ISUPPORTS(nsAboutCacheEntry, + nsIAboutModule, + nsICacheMetaDataVisitor) //----------------------------------------------------------------------------- // nsAboutCacheEntry::nsIAboutModule diff --git a/netwerk/protocol/about/nsAboutProtocolHandler.cpp b/netwerk/protocol/about/nsAboutProtocolHandler.cpp index ab8bd4b289a..fb8bfc5af87 100644 --- a/netwerk/protocol/about/nsAboutProtocolHandler.cpp +++ b/netwerk/protocol/about/nsAboutProtocolHandler.cpp @@ -30,7 +30,7 @@ static bool IsSafeForUntrustedContent(nsIAboutModule *aModule, nsIURI *aURI) { } //////////////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS1(nsAboutProtocolHandler, nsIProtocolHandler) +NS_IMPL_ISUPPORTS(nsAboutProtocolHandler, nsIProtocolHandler) //////////////////////////////////////////////////////////////////////////////// // nsIProtocolHandler methods: @@ -187,7 +187,7 @@ nsAboutProtocolHandler::AllowPort(int32_t port, const char *scheme, bool *_retva //////////////////////////////////////////////////////////////////////////////// // Safe about protocol handler impl -NS_IMPL_ISUPPORTS1(nsSafeAboutProtocolHandler, nsIProtocolHandler) +NS_IMPL_ISUPPORTS(nsSafeAboutProtocolHandler, nsIProtocolHandler) // nsIProtocolHandler methods: diff --git a/netwerk/protocol/app/AppProtocolHandler.cpp b/netwerk/protocol/app/AppProtocolHandler.cpp index 93dfcb5a444..2fe9344f013 100644 --- a/netwerk/protocol/app/AppProtocolHandler.cpp +++ b/netwerk/protocol/app/AppProtocolHandler.cpp @@ -39,7 +39,7 @@ private: nsLoadFlags mLoadFlags; }; -NS_IMPL_ISUPPORTS3(DummyChannel, nsIRequest, nsIChannel, nsIJARChannel) +NS_IMPL_ISUPPORTS(DummyChannel, nsIRequest, nsIChannel, nsIJARChannel) DummyChannel::DummyChannel() : mPending(false) , mSuspendCount(0) @@ -273,7 +273,7 @@ AppProtocolHandler::~AppProtocolHandler() { mAppInfoCache.Clear(); } -NS_IMPL_ISUPPORTS1(AppProtocolHandler, nsIProtocolHandler) +NS_IMPL_ISUPPORTS(AppProtocolHandler, nsIProtocolHandler) /* static */ nsresult diff --git a/netwerk/protocol/data/nsDataHandler.cpp b/netwerk/protocol/data/nsDataHandler.cpp index 030c67f3f12..c231925e4c3 100644 --- a/netwerk/protocol/data/nsDataHandler.cpp +++ b/netwerk/protocol/data/nsDataHandler.cpp @@ -18,7 +18,7 @@ nsDataHandler::nsDataHandler() { nsDataHandler::~nsDataHandler() { } -NS_IMPL_ISUPPORTS1(nsDataHandler, nsIProtocolHandler) +NS_IMPL_ISUPPORTS(nsDataHandler, nsIProtocolHandler) nsresult nsDataHandler::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) { diff --git a/netwerk/protocol/device/AndroidCaptureProvider.cpp b/netwerk/protocol/device/AndroidCaptureProvider.cpp index 8503b3f2118..074c8a2f66d 100644 --- a/netwerk/protocol/device/AndroidCaptureProvider.cpp +++ b/netwerk/protocol/device/AndroidCaptureProvider.cpp @@ -17,7 +17,7 @@ using namespace mozilla::net; -NS_IMPL_ISUPPORTS2(AndroidCameraInputStream, nsIInputStream, nsIAsyncInputStream) +NS_IMPL_ISUPPORTS(AndroidCameraInputStream, nsIInputStream, nsIAsyncInputStream) AndroidCameraInputStream::AndroidCameraInputStream() : mWidth(0), mHeight(0), mCamera(0), mHeaderSent(false), mClosed(true), mFrameSize(0), diff --git a/netwerk/protocol/device/nsDeviceChannel.cpp b/netwerk/protocol/device/nsDeviceChannel.cpp index a4dd82e01d6..58c03a33e58 100644 --- a/netwerk/protocol/device/nsDeviceChannel.cpp +++ b/netwerk/protocol/device/nsDeviceChannel.cpp @@ -44,9 +44,9 @@ void extractAttributeValue(const char* searchString, const char* attributeName, } } -NS_IMPL_ISUPPORTS_INHERITED1(nsDeviceChannel, - nsBaseChannel, - nsIChannel) +NS_IMPL_ISUPPORTS_INHERITED(nsDeviceChannel, + nsBaseChannel, + nsIChannel) // nsDeviceChannel methods nsDeviceChannel::nsDeviceChannel() diff --git a/netwerk/protocol/device/nsDeviceProtocolHandler.cpp b/netwerk/protocol/device/nsDeviceProtocolHandler.cpp index fd2205a41c9..6667818af57 100644 --- a/netwerk/protocol/device/nsDeviceProtocolHandler.cpp +++ b/netwerk/protocol/device/nsDeviceProtocolHandler.cpp @@ -10,8 +10,8 @@ //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsDeviceProtocolHandler, - nsIProtocolHandler) +NS_IMPL_ISUPPORTS(nsDeviceProtocolHandler, + nsIProtocolHandler) nsresult nsDeviceProtocolHandler::Init(){ diff --git a/netwerk/protocol/file/nsFileChannel.cpp b/netwerk/protocol/file/nsFileChannel.cpp index 472c1daceb3..043116a9b36 100644 --- a/netwerk/protocol/file/nsFileChannel.cpp +++ b/netwerk/protocol/file/nsFileChannel.cpp @@ -405,10 +405,10 @@ nsFileChannel::OpenContentStream(bool async, nsIInputStream **result, //----------------------------------------------------------------------------- // nsFileChannel::nsISupports -NS_IMPL_ISUPPORTS_INHERITED2(nsFileChannel, - nsBaseChannel, - nsIUploadChannel, - nsIFileChannel) +NS_IMPL_ISUPPORTS_INHERITED(nsFileChannel, + nsBaseChannel, + nsIUploadChannel, + nsIFileChannel) //----------------------------------------------------------------------------- // nsFileChannel::nsIFileChannel diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp b/netwerk/protocol/file/nsFileProtocolHandler.cpp index 42c52e0354d..ab755aa0399 100644 --- a/netwerk/protocol/file/nsFileProtocolHandler.cpp +++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp @@ -39,10 +39,10 @@ nsFileProtocolHandler::Init() return NS_OK; } -NS_IMPL_ISUPPORTS3(nsFileProtocolHandler, - nsIFileProtocolHandler, - nsIProtocolHandler, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsFileProtocolHandler, + nsIFileProtocolHandler, + nsIProtocolHandler, + nsISupportsWeakReference) //----------------------------------------------------------------------------- // nsIProtocolHandler methods: diff --git a/netwerk/protocol/ftp/FTPChannelChild.cpp b/netwerk/protocol/ftp/FTPChannelChild.cpp index 6130b6d47e0..e940f6fcf6f 100644 --- a/netwerk/protocol/ftp/FTPChannelChild.cpp +++ b/netwerk/protocol/ftp/FTPChannelChild.cpp @@ -71,14 +71,14 @@ FTPChannelChild::ReleaseIPDLReference() // FTPChannelChild::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS_INHERITED6(FTPChannelChild, - nsBaseChannel, - nsIFTPChannel, - nsIUploadChannel, - nsIResumableChannel, - nsIProxiedChannel, - nsIChildChannel, - nsIDivertableChannel) +NS_IMPL_ISUPPORTS_INHERITED(FTPChannelChild, + nsBaseChannel, + nsIFTPChannel, + nsIUploadChannel, + nsIResumableChannel, + nsIProxiedChannel, + nsIChildChannel, + nsIDivertableChannel) //----------------------------------------------------------------------------- diff --git a/netwerk/protocol/ftp/FTPChannelParent.cpp b/netwerk/protocol/ftp/FTPChannelParent.cpp index 296c6c1e0e6..773a91bca4f 100644 --- a/netwerk/protocol/ftp/FTPChannelParent.cpp +++ b/netwerk/protocol/ftp/FTPChannelParent.cpp @@ -53,11 +53,11 @@ FTPChannelParent::ActorDestroy(ActorDestroyReason why) // FTPChannelParent::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS4(FTPChannelParent, - nsIStreamListener, - nsIParentChannel, - nsIInterfaceRequestor, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(FTPChannelParent, + nsIStreamListener, + nsIParentChannel, + nsIInterfaceRequestor, + nsIRequestObserver) //----------------------------------------------------------------------------- // FTPChannelParent::PFTPChannelParent diff --git a/netwerk/protocol/ftp/nsFTPChannel.cpp b/netwerk/protocol/ftp/nsFTPChannel.cpp index 6e9e3f3b4ad..a43b2cf0bef 100644 --- a/netwerk/protocol/ftp/nsFTPChannel.cpp +++ b/netwerk/protocol/ftp/nsFTPChannel.cpp @@ -24,12 +24,12 @@ extern PRLogModuleInfo* gFTPLog; //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS_INHERITED4(nsFtpChannel, - nsBaseChannel, - nsIUploadChannel, - nsIResumableChannel, - nsIFTPChannel, - nsIProxiedChannel) +NS_IMPL_ISUPPORTS_INHERITED(nsFtpChannel, + nsBaseChannel, + nsIUploadChannel, + nsIResumableChannel, + nsIFTPChannel, + nsIProxiedChannel) //----------------------------------------------------------------------------- @@ -165,7 +165,7 @@ private: nsCOMPtr mTargetThread; }; -NS_IMPL_ISUPPORTS1(FTPEventSinkProxy, nsIFTPEventSink) +NS_IMPL_ISUPPORTS(FTPEventSinkProxy, nsIFTPEventSink) NS_IMETHODIMP FTPEventSinkProxy::OnFTPControlLog(bool aServer, const char* aMsg) diff --git a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp index 828ca17a942..6d8d9f1b94c 100644 --- a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp +++ b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp @@ -64,13 +64,13 @@ removeParamsFromPath(nsCString& path) } } -NS_IMPL_ISUPPORTS_INHERITED5(nsFtpState, - nsBaseContentStream, - nsIInputStreamCallback, - nsITransportEventSink, - nsICacheListener, - nsIRequestObserver, - nsIProtocolProxyCallback) +NS_IMPL_ISUPPORTS_INHERITED(nsFtpState, + nsBaseContentStream, + nsIInputStreamCallback, + nsITransportEventSink, + nsICacheListener, + nsIRequestObserver, + nsIProtocolProxyCallback) nsFtpState::nsFtpState() : nsBaseContentStream(true) diff --git a/netwerk/protocol/ftp/nsFtpControlConnection.cpp b/netwerk/protocol/ftp/nsFtpControlConnection.cpp index d829e7ccdba..7f35df2a237 100644 --- a/netwerk/protocol/ftp/nsFtpControlConnection.cpp +++ b/netwerk/protocol/ftp/nsFtpControlConnection.cpp @@ -25,7 +25,7 @@ extern PRLogModuleInfo* gFTPLog; // nsFtpControlConnection implementation ... // -NS_IMPL_ISUPPORTS1(nsFtpControlConnection, nsIInputStreamCallback) +NS_IMPL_ISUPPORTS(nsFtpControlConnection, nsIInputStreamCallback) NS_IMETHODIMP nsFtpControlConnection::OnInputStreamReady(nsIAsyncInputStream *stream) diff --git a/netwerk/protocol/ftp/nsFtpProtocolHandler.cpp b/netwerk/protocol/ftp/nsFtpProtocolHandler.cpp index 36a6f47ae3d..0921a927620 100644 --- a/netwerk/protocol/ftp/nsFtpProtocolHandler.cpp +++ b/netwerk/protocol/ftp/nsFtpProtocolHandler.cpp @@ -88,11 +88,11 @@ nsFtpProtocolHandler::~nsFtpProtocolHandler() gFtpHandler = nullptr; } -NS_IMPL_ISUPPORTS4(nsFtpProtocolHandler, - nsIProtocolHandler, - nsIProxiedProtocolHandler, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsFtpProtocolHandler, + nsIProtocolHandler, + nsIProxiedProtocolHandler, + nsIObserver, + nsISupportsWeakReference) nsresult nsFtpProtocolHandler::Init() diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index b52330b333e..4896a50eea2 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -766,7 +766,7 @@ HttpBaseChannel::nsContentEncodings::GetNext(nsACString& aNextEncoding) // HttpBaseChannel::nsContentEncodings::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(HttpBaseChannel::nsContentEncodings, nsIUTF8StringEnumerator) +NS_IMPL_ISUPPORTS(HttpBaseChannel::nsContentEncodings, nsIUTF8StringEnumerator) //----------------------------------------------------------------------------- // HttpBaseChannel::nsContentEncodings diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp index 597efb7a5df..0dbe1ce56c3 100644 --- a/netwerk/protocol/http/HttpChannelParent.cpp +++ b/netwerk/protocol/http/HttpChannelParent.cpp @@ -103,13 +103,13 @@ HttpChannelParent::Init(const HttpChannelCreationArgs& aArgs) // HttpChannelParent::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS6(HttpChannelParent, - nsIInterfaceRequestor, - nsIProgressEventSink, - nsIRequestObserver, - nsIStreamListener, - nsIParentChannel, - nsIParentRedirectingChannel) +NS_IMPL_ISUPPORTS(HttpChannelParent, + nsIInterfaceRequestor, + nsIProgressEventSink, + nsIRequestObserver, + nsIStreamListener, + nsIParentChannel, + nsIParentRedirectingChannel) //----------------------------------------------------------------------------- // HttpChannelParent::nsIInterfaceRequestor diff --git a/netwerk/protocol/http/HttpChannelParentListener.cpp b/netwerk/protocol/http/HttpChannelParentListener.cpp index 136b96f5605..729bcdaf7e2 100644 --- a/netwerk/protocol/http/HttpChannelParentListener.cpp +++ b/netwerk/protocol/http/HttpChannelParentListener.cpp @@ -33,12 +33,12 @@ HttpChannelParentListener::~HttpChannelParentListener() // HttpChannelParentListener::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS5(HttpChannelParentListener, - nsIInterfaceRequestor, - nsIStreamListener, - nsIRequestObserver, - nsIChannelEventSink, - nsIRedirectResultListener) +NS_IMPL_ISUPPORTS(HttpChannelParentListener, + nsIInterfaceRequestor, + nsIStreamListener, + nsIRequestObserver, + nsIChannelEventSink, + nsIRedirectResultListener) //----------------------------------------------------------------------------- // HttpChannelParentListener::nsIRequestObserver diff --git a/netwerk/protocol/http/SpdyZlibReporter.cpp b/netwerk/protocol/http/SpdyZlibReporter.cpp index 786ffc9a437..77645093c9a 100644 --- a/netwerk/protocol/http/SpdyZlibReporter.cpp +++ b/netwerk/protocol/http/SpdyZlibReporter.cpp @@ -8,7 +8,7 @@ namespace mozilla { -NS_IMPL_ISUPPORTS1(SpdyZlibReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(SpdyZlibReporter, nsIMemoryReporter) /* static */ Atomic SpdyZlibReporter::sAmount; diff --git a/netwerk/protocol/http/nsHttpActivityDistributor.cpp b/netwerk/protocol/http/nsHttpActivityDistributor.cpp index b13934fc630..6cb6dadb66e 100644 --- a/netwerk/protocol/http/nsHttpActivityDistributor.cpp +++ b/netwerk/protocol/http/nsHttpActivityDistributor.cpp @@ -61,9 +61,9 @@ private: ObserverArray mObservers; }; -NS_IMPL_ISUPPORTS2(nsHttpActivityDistributor, - nsIHttpActivityDistributor, - nsIHttpActivityObserver) +NS_IMPL_ISUPPORTS(nsHttpActivityDistributor, + nsIHttpActivityDistributor, + nsIHttpActivityObserver) nsHttpActivityDistributor::nsHttpActivityDistributor() : mLock("nsHttpActivityDistributor.mLock") diff --git a/netwerk/protocol/http/nsHttpAuthCache.cpp b/netwerk/protocol/http/nsHttpAuthCache.cpp index 46738397ce0..58fe8eb20b7 100644 --- a/netwerk/protocol/http/nsHttpAuthCache.cpp +++ b/netwerk/protocol/http/nsHttpAuthCache.cpp @@ -268,7 +268,7 @@ PLHashAllocOps nsHttpAuthCache::gHashAllocOps = nsHttpAuthCache::FreeEntry }; -NS_IMPL_ISUPPORTS1(nsHttpAuthCache::AppDataClearObserver, nsIObserver) +NS_IMPL_ISUPPORTS(nsHttpAuthCache::AppDataClearObserver, nsIObserver) NS_IMETHODIMP nsHttpAuthCache::AppDataClearObserver::Observe(nsISupports *subject, diff --git a/netwerk/protocol/http/nsHttpAuthManager.cpp b/netwerk/protocol/http/nsHttpAuthManager.cpp index 1ea92152e89..70634a59af4 100644 --- a/netwerk/protocol/http/nsHttpAuthManager.cpp +++ b/netwerk/protocol/http/nsHttpAuthManager.cpp @@ -14,7 +14,7 @@ namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS1(nsHttpAuthManager, nsIHttpAuthManager) +NS_IMPL_ISUPPORTS(nsHttpAuthManager, nsIHttpAuthManager) nsHttpAuthManager::nsHttpAuthManager() { diff --git a/netwerk/protocol/http/nsHttpBasicAuth.cpp b/netwerk/protocol/http/nsHttpBasicAuth.cpp index 0a3dd262d2d..4938d8b3fdb 100644 --- a/netwerk/protocol/http/nsHttpBasicAuth.cpp +++ b/netwerk/protocol/http/nsHttpBasicAuth.cpp @@ -29,7 +29,7 @@ nsHttpBasicAuth::~nsHttpBasicAuth() // nsHttpBasicAuth::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsHttpBasicAuth, nsIHttpAuthenticator) +NS_IMPL_ISUPPORTS(nsHttpBasicAuth, nsIHttpAuthenticator) //----------------------------------------------------------------------------- // nsHttpBasicAuth::nsIHttpAuthenticator diff --git a/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp b/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp index def64a31ca4..b909c6a177c 100644 --- a/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp +++ b/netwerk/protocol/http/nsHttpChannelAuthProvider.cpp @@ -1348,8 +1348,8 @@ nsHttpChannelAuthProvider::GetCurrentPath(nsACString &path) return rv; } -NS_IMPL_ISUPPORTS3(nsHttpChannelAuthProvider, nsICancelable, - nsIHttpChannelAuthProvider, nsIAuthPromptCallback) +NS_IMPL_ISUPPORTS(nsHttpChannelAuthProvider, nsICancelable, + nsIHttpChannelAuthProvider, nsIAuthPromptCallback) } // namespace mozilla::net } // namespace mozilla diff --git a/netwerk/protocol/http/nsHttpConnection.cpp b/netwerk/protocol/http/nsHttpConnection.cpp index ee4644fadfa..e4e0a6815e7 100644 --- a/netwerk/protocol/http/nsHttpConnection.cpp +++ b/netwerk/protocol/http/nsHttpConnection.cpp @@ -1758,11 +1758,11 @@ nsHttpConnection::DisableTCPKeepalives() // nsHttpConnection::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS4(nsHttpConnection, - nsIInputStreamCallback, - nsIOutputStreamCallback, - nsITransportEventSink, - nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(nsHttpConnection, + nsIInputStreamCallback, + nsIOutputStreamCallback, + nsITransportEventSink, + nsIInterfaceRequestor) //----------------------------------------------------------------------------- // nsHttpConnection::nsIInputStreamCallback diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp index ac9aadf3892..b414f80b4a2 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -41,7 +41,7 @@ namespace net { //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsHttpConnectionMgr, nsIObserver) +NS_IMPL_ISUPPORTS(nsHttpConnectionMgr, nsIObserver) static void InsertTransactionSorted(nsTArray &pendingQ, nsHttpTransaction *trans) @@ -2710,11 +2710,11 @@ nsHttpConnectionMgr::nsConnectionHandle::PushBack(const char *buf, uint32_t bufL //////////////////////// nsHalfOpenSocket -NS_IMPL_ISUPPORTS4(nsHttpConnectionMgr::nsHalfOpenSocket, - nsIOutputStreamCallback, - nsITransportEventSink, - nsIInterfaceRequestor, - nsITimerCallback) +NS_IMPL_ISUPPORTS(nsHttpConnectionMgr::nsHalfOpenSocket, + nsIOutputStreamCallback, + nsITransportEventSink, + nsIInterfaceRequestor, + nsITimerCallback) nsHttpConnectionMgr:: nsHalfOpenSocket::nsHalfOpenSocket(nsConnectionEntry *ent, diff --git a/netwerk/protocol/http/nsHttpDigestAuth.cpp b/netwerk/protocol/http/nsHttpDigestAuth.cpp index 04b91985e13..9843b1774c8 100644 --- a/netwerk/protocol/http/nsHttpDigestAuth.cpp +++ b/netwerk/protocol/http/nsHttpDigestAuth.cpp @@ -36,7 +36,7 @@ nsHttpDigestAuth::~nsHttpDigestAuth() // nsHttpDigestAuth::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsHttpDigestAuth, nsIHttpAuthenticator) +NS_IMPL_ISUPPORTS(nsHttpDigestAuth, nsIHttpAuthenticator) //----------------------------------------------------------------------------- // nsHttpDigestAuth diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index e7a1c6f51e3..abd461feb2d 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -1583,13 +1583,13 @@ nsHttpHandler::SetAcceptEncodings(const char *aAcceptEncodings) // nsHttpHandler::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS6(nsHttpHandler, - nsIHttpProtocolHandler, - nsIProxiedProtocolHandler, - nsIProtocolHandler, - nsIObserver, - nsISupportsWeakReference, - nsISpeculativeConnect) +NS_IMPL_ISUPPORTS(nsHttpHandler, + nsIHttpProtocolHandler, + nsIProxiedProtocolHandler, + nsIProtocolHandler, + nsIObserver, + nsISupportsWeakReference, + nsISpeculativeConnect) //----------------------------------------------------------------------------- // nsHttpHandler::nsIProtocolHandler @@ -1970,12 +1970,12 @@ nsHttpHandler::TickleWifi(nsIInterfaceRequestor *cb) // nsHttpsHandler implementation //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS5(nsHttpsHandler, - nsIHttpProtocolHandler, - nsIProxiedProtocolHandler, - nsIProtocolHandler, - nsISupportsWeakReference, - nsISpeculativeConnect) +NS_IMPL_ISUPPORTS(nsHttpsHandler, + nsIHttpProtocolHandler, + nsIProxiedProtocolHandler, + nsIProtocolHandler, + nsISupportsWeakReference, + nsISpeculativeConnect) nsresult nsHttpsHandler::Init() diff --git a/netwerk/protocol/http/nsHttpNTLMAuth.cpp b/netwerk/protocol/http/nsHttpNTLMAuth.cpp index 5821e343e33..cc083aa82a3 100644 --- a/netwerk/protocol/http/nsHttpNTLMAuth.cpp +++ b/netwerk/protocol/http/nsHttpNTLMAuth.cpp @@ -221,7 +221,7 @@ NS_IMPL_ISUPPORTS0(nsNTLMSessionState) //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsHttpNTLMAuth, nsIHttpAuthenticator) +NS_IMPL_ISUPPORTS(nsHttpNTLMAuth, nsIHttpAuthenticator) NS_IMETHODIMP nsHttpNTLMAuth::ChallengeReceived(nsIHttpAuthenticableChannel *channel, diff --git a/netwerk/protocol/http/nsHttpTransaction.cpp b/netwerk/protocol/http/nsHttpTransaction.cpp index 2b315250510..6867c0569b9 100644 --- a/netwerk/protocol/http/nsHttpTransaction.cpp +++ b/netwerk/protocol/http/nsHttpTransaction.cpp @@ -1807,9 +1807,9 @@ nsHttpTransaction::Release() return count; } -NS_IMPL_QUERY_INTERFACE2(nsHttpTransaction, - nsIInputStreamCallback, - nsIOutputStreamCallback) +NS_IMPL_QUERY_INTERFACE(nsHttpTransaction, + nsIInputStreamCallback, + nsIOutputStreamCallback) //----------------------------------------------------------------------------- // nsHttpTransaction::nsIInputStreamCallback diff --git a/netwerk/protocol/res/nsResProtocolHandler.cpp b/netwerk/protocol/res/nsResProtocolHandler.cpp index cb42a6d8bdb..797569735e2 100644 --- a/netwerk/protocol/res/nsResProtocolHandler.cpp +++ b/netwerk/protocol/res/nsResProtocolHandler.cpp @@ -192,10 +192,10 @@ nsResProtocolHandler::CollectSubstitutions(InfallibleTArray& aR // nsResProtocolHandler::nsISupports //---------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS3(nsResProtocolHandler, - nsIResProtocolHandler, - nsIProtocolHandler, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsResProtocolHandler, + nsIResProtocolHandler, + nsIProtocolHandler, + nsISupportsWeakReference) //---------------------------------------------------------------------------- // nsResProtocolHandler::nsIProtocolHandler diff --git a/netwerk/protocol/rtsp/RtspChannelChild.cpp b/netwerk/protocol/rtsp/RtspChannelChild.cpp index ac6cdd7d307..d2b2690de30 100644 --- a/netwerk/protocol/rtsp/RtspChannelChild.cpp +++ b/netwerk/protocol/rtsp/RtspChannelChild.cpp @@ -63,10 +63,10 @@ RtspChannelChild::ReleaseIPDLReference() //----------------------------------------------------------------------------- // nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS_INHERITED2(RtspChannelChild, - nsBaseChannel, - nsIChannel, - nsIChildChannel) +NS_IMPL_ISUPPORTS_INHERITED(RtspChannelChild, + nsBaseChannel, + nsIChannel, + nsIChildChannel) //----------------------------------------------------------------------------- // nsBaseChannel::nsIChannel diff --git a/netwerk/protocol/rtsp/RtspChannelParent.cpp b/netwerk/protocol/rtsp/RtspChannelParent.cpp index 1c4e127cfef..401dde50e97 100644 --- a/netwerk/protocol/rtsp/RtspChannelParent.cpp +++ b/netwerk/protocol/rtsp/RtspChannelParent.cpp @@ -33,9 +33,9 @@ RtspChannelParent::ActorDestroy(ActorDestroyReason why) //----------------------------------------------------------------------------- // nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS_INHERITED1(RtspChannelParent, - nsBaseChannel, - nsIParentChannel) +NS_IMPL_ISUPPORTS_INHERITED(RtspChannelParent, + nsBaseChannel, + nsIParentChannel) //----------------------------------------------------------------------------- // RtspChannelParent methods diff --git a/netwerk/protocol/rtsp/RtspHandler.cpp b/netwerk/protocol/rtsp/RtspHandler.cpp index e9a39044f76..5cff6ff5e71 100644 --- a/netwerk/protocol/rtsp/RtspHandler.cpp +++ b/netwerk/protocol/rtsp/RtspHandler.cpp @@ -17,7 +17,7 @@ namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS1(RtspHandler, nsIProtocolHandler) +NS_IMPL_ISUPPORTS(RtspHandler, nsIProtocolHandler) //----------------------------------------------------------------------------- // RtspHandler::nsIProtocolHandler diff --git a/netwerk/protocol/rtsp/controller/RtspController.cpp b/netwerk/protocol/rtsp/controller/RtspController.cpp index bee1b05e673..8eefb6ac9ca 100644 --- a/netwerk/protocol/rtsp/controller/RtspController.cpp +++ b/netwerk/protocol/rtsp/controller/RtspController.cpp @@ -49,8 +49,8 @@ extern PRLogModuleInfo* gRtspLog; namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS1(RtspController, - nsIStreamingProtocolController) +NS_IMPL_ISUPPORTS(RtspController, + nsIStreamingProtocolController) RtspController::RtspController(nsIChannel *channel) : mState(INIT) diff --git a/netwerk/protocol/rtsp/controller/RtspControllerParent.cpp b/netwerk/protocol/rtsp/controller/RtspControllerParent.cpp index 241194606ad..b385c72915f 100644 --- a/netwerk/protocol/rtsp/controller/RtspControllerParent.cpp +++ b/netwerk/protocol/rtsp/controller/RtspControllerParent.cpp @@ -32,9 +32,9 @@ using namespace mozilla::ipc; namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS2(RtspControllerParent, - nsIInterfaceRequestor, - nsIStreamingProtocolListener) +NS_IMPL_ISUPPORTS(RtspControllerParent, + nsIInterfaceRequestor, + nsIStreamingProtocolListener) RtspControllerParent::RtspControllerParent() : mIPCOpen(true) diff --git a/netwerk/protocol/rtsp/controller/RtspMetaData.cpp b/netwerk/protocol/rtsp/controller/RtspMetaData.cpp index a6f2c7ee5d1..e773e325334 100644 --- a/netwerk/protocol/rtsp/controller/RtspMetaData.cpp +++ b/netwerk/protocol/rtsp/controller/RtspMetaData.cpp @@ -12,7 +12,7 @@ using namespace mozilla; namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS1(RtspMetaData, nsIStreamingProtocolMetaData) +NS_IMPL_ISUPPORTS(RtspMetaData, nsIStreamingProtocolMetaData) RtspMetaData::RtspMetaData() : mIndex(0) diff --git a/netwerk/protocol/viewsource/nsViewSourceHandler.cpp b/netwerk/protocol/viewsource/nsViewSourceHandler.cpp index ed268eccf7d..7bc8fbc63b5 100644 --- a/netwerk/protocol/viewsource/nsViewSourceHandler.cpp +++ b/netwerk/protocol/viewsource/nsViewSourceHandler.cpp @@ -13,7 +13,7 @@ //////////////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS1(nsViewSourceHandler, nsIProtocolHandler) +NS_IMPL_ISUPPORTS(nsViewSourceHandler, nsIProtocolHandler) //////////////////////////////////////////////////////////////////////////////// // nsIProtocolHandler methods: diff --git a/netwerk/protocol/websocket/WebSocketChannel.cpp b/netwerk/protocol/websocket/WebSocketChannel.cpp index 5b388d887df..90f023cf9d7 100644 --- a/netwerk/protocol/websocket/WebSocketChannel.cpp +++ b/netwerk/protocol/websocket/WebSocketChannel.cpp @@ -72,20 +72,20 @@ using namespace mozilla::net; namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS13(WebSocketChannel, - nsIWebSocketChannel, - nsIHttpUpgradeListener, - nsIRequestObserver, - nsIStreamListener, - nsIProtocolHandler, - nsIInputStreamCallback, - nsIOutputStreamCallback, - nsITimerCallback, - nsIDNSListener, - nsIProtocolProxyCallback, - nsIInterfaceRequestor, - nsIChannelEventSink, - nsIThreadRetargetableRequest) +NS_IMPL_ISUPPORTS(WebSocketChannel, + nsIWebSocketChannel, + nsIHttpUpgradeListener, + nsIRequestObserver, + nsIStreamListener, + nsIProtocolHandler, + nsIInputStreamCallback, + nsIOutputStreamCallback, + nsITimerCallback, + nsIDNSListener, + nsIProtocolProxyCallback, + nsIInterfaceRequestor, + nsIChannelEventSink, + nsIThreadRetargetableRequest) // We implement RFC 6455, which uses Sec-WebSocket-Version: 13 on the wire. #define SEC_WEBSOCKET_VERSION "13" @@ -586,7 +586,7 @@ private: nsCString mData; int32_t mLen; }; -NS_IMPL_ISUPPORTS1(CallOnMessageAvailable, nsIRunnable) +NS_IMPL_ISUPPORTS(CallOnMessageAvailable, nsIRunnable) //----------------------------------------------------------------------------- // CallOnStop @@ -622,7 +622,7 @@ private: nsRefPtr mChannel; nsresult mReason; }; -NS_IMPL_ISUPPORTS1(CallOnStop, nsIRunnable) +NS_IMPL_ISUPPORTS(CallOnStop, nsIRunnable) //----------------------------------------------------------------------------- // CallOnServerClose @@ -655,7 +655,7 @@ private: uint16_t mCode; nsCString mReason; }; -NS_IMPL_ISUPPORTS1(CallOnServerClose, nsIRunnable) +NS_IMPL_ISUPPORTS(CallOnServerClose, nsIRunnable) //----------------------------------------------------------------------------- // CallAcknowledge @@ -686,7 +686,7 @@ private: nsRefPtr mChannel; uint32_t mSize; }; -NS_IMPL_ISUPPORTS1(CallAcknowledge, nsIRunnable) +NS_IMPL_ISUPPORTS(CallAcknowledge, nsIRunnable) //----------------------------------------------------------------------------- // CallOnTransportAvailable @@ -720,7 +720,7 @@ private: nsCOMPtr mSocketIn; nsCOMPtr mSocketOut; }; -NS_IMPL_ISUPPORTS1(CallOnTransportAvailable, nsIRunnable) +NS_IMPL_ISUPPORTS(CallOnTransportAvailable, nsIRunnable) //----------------------------------------------------------------------------- // OutboundMessage @@ -856,7 +856,7 @@ private: nsRefPtr mChannel; OutboundMessage *mMessage; }; -NS_IMPL_ISUPPORTS1(OutboundEnqueuer, nsIRunnable) +NS_IMPL_ISUPPORTS(OutboundEnqueuer, nsIRunnable) //----------------------------------------------------------------------------- // nsWSCompression diff --git a/netwerk/protocol/websocket/WebSocketChannelParent.cpp b/netwerk/protocol/websocket/WebSocketChannelParent.cpp index 82941e77ee8..99dcbb1bf0f 100644 --- a/netwerk/protocol/websocket/WebSocketChannelParent.cpp +++ b/netwerk/protocol/websocket/WebSocketChannelParent.cpp @@ -16,9 +16,9 @@ using namespace mozilla::ipc; namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS2(WebSocketChannelParent, - nsIWebSocketListener, - nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(WebSocketChannelParent, + nsIWebSocketListener, + nsIInterfaceRequestor) WebSocketChannelParent::WebSocketChannelParent(nsIAuthPromptProvider* aAuthProvider, nsILoadContext* aLoadContext, diff --git a/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp b/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp index 1c5e197f475..8aa1a491404 100644 --- a/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp +++ b/netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp @@ -24,11 +24,11 @@ using namespace mozilla::ipc; namespace mozilla { namespace net { -NS_IMPL_ISUPPORTS4(WyciwygChannelChild, - nsIRequest, - nsIChannel, - nsIWyciwygChannel, - nsIPrivateBrowsingChannel) +NS_IMPL_ISUPPORTS(WyciwygChannelChild, + nsIRequest, + nsIChannel, + nsIWyciwygChannel, + nsIPrivateBrowsingChannel) WyciwygChannelChild::WyciwygChannelChild() diff --git a/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp b/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp index 1d776736f89..28c2df85a54 100644 --- a/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp +++ b/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp @@ -48,10 +48,10 @@ WyciwygChannelParent::ActorDestroy(ActorDestroyReason why) // WyciwygChannelParent::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS3(WyciwygChannelParent, - nsIStreamListener, - nsIInterfaceRequestor, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(WyciwygChannelParent, + nsIStreamListener, + nsIInterfaceRequestor, + nsIRequestObserver) //----------------------------------------------------------------------------- // WyciwygChannelParent::PWyciwygChannelParent diff --git a/netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp b/netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp index 7f2b74faeb2..961364fd8bd 100644 --- a/netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp +++ b/netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp @@ -107,14 +107,14 @@ nsWyciwygChannel::~nsWyciwygChannel() { } -NS_IMPL_ISUPPORTS7(nsWyciwygChannel, - nsIChannel, - nsIRequest, - nsIStreamListener, - nsIRequestObserver, - nsICacheEntryOpenCallback, - nsIWyciwygChannel, - nsIPrivateBrowsingChannel) +NS_IMPL_ISUPPORTS(nsWyciwygChannel, + nsIChannel, + nsIRequest, + nsIStreamListener, + nsIRequestObserver, + nsICacheEntryOpenCallback, + nsIWyciwygChannel, + nsIPrivateBrowsingChannel) nsresult nsWyciwygChannel::Init(nsIURI* uri) diff --git a/netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.cpp b/netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.cpp index 9725215ca5c..e46941e28a7 100644 --- a/netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.cpp +++ b/netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.cpp @@ -36,8 +36,8 @@ nsWyciwygProtocolHandler::~nsWyciwygProtocolHandler() LOG(("Deleting nsWyciwygProtocolHandler [this=%p]\n", this)); } -NS_IMPL_ISUPPORTS1(nsWyciwygProtocolHandler, - nsIProtocolHandler) +NS_IMPL_ISUPPORTS(nsWyciwygProtocolHandler, + nsIProtocolHandler) //////////////////////////////////////////////////////////////////////////////// // nsIProtocolHandler methods: diff --git a/netwerk/sctp/datachannel/DataChannel.cpp b/netwerk/sctp/datachannel/DataChannel.cpp index 31ff2678bc8..5b077f493c7 100644 --- a/netwerk/sctp/datachannel/DataChannel.cpp +++ b/netwerk/sctp/datachannel/DataChannel.cpp @@ -143,7 +143,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(DataChannelShutdown, nsIObserver); +NS_IMPL_ISUPPORTS(DataChannelShutdown, nsIObserver); BufferedMsg::BufferedMsg(struct sctp_sendv_spa &spa, const char *data, @@ -292,8 +292,8 @@ void DataChannelConnection::DestroyOnSTS(struct socket *aMasterSocket, disconnect_all(); } -NS_IMPL_ISUPPORTS1(DataChannelConnection, - nsITimerCallback) +NS_IMPL_ISUPPORTS(DataChannelConnection, + nsITimerCallback) bool DataChannelConnection::Init(unsigned short aPort, uint16_t aNumStreams, bool aUsingDtls) diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp b/netwerk/socket/nsSOCKSIOLayer.cpp index a415ead0ef8..34d29c31e4d 100644 --- a/netwerk/socket/nsSOCKSIOLayer.cpp +++ b/netwerk/socket/nsSOCKSIOLayer.cpp @@ -177,7 +177,7 @@ nsSOCKSSocketInfo::Init(int32_t version, int32_t family, const char *proxyHost, mFlags = flags; } -NS_IMPL_ISUPPORTS2(nsSOCKSSocketInfo, nsISOCKSSocketInfo, nsIDNSListener) +NS_IMPL_ISUPPORTS(nsSOCKSSocketInfo, nsISOCKSSocketInfo, nsIDNSListener) NS_IMETHODIMP nsSOCKSSocketInfo::GetExternalProxyAddr(NetAddr * *aExternalProxyAddr) diff --git a/netwerk/socket/nsSOCKSSocketProvider.cpp b/netwerk/socket/nsSOCKSSocketProvider.cpp index d45adb73eb0..af7c9b5fa80 100644 --- a/netwerk/socket/nsSOCKSSocketProvider.cpp +++ b/netwerk/socket/nsSOCKSSocketProvider.cpp @@ -12,7 +12,7 @@ ////////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS1(nsSOCKSSocketProvider, nsISocketProvider) +NS_IMPL_ISUPPORTS(nsSOCKSSocketProvider, nsISocketProvider) nsresult nsSOCKSSocketProvider::CreateV4(nsISupports *aOuter, REFNSIID aIID, void **aResult) diff --git a/netwerk/socket/nsSocketProviderService.cpp b/netwerk/socket/nsSocketProviderService.cpp index 0f58f50a655..b3fc5d9e720 100644 --- a/netwerk/socket/nsSocketProviderService.cpp +++ b/netwerk/socket/nsSocketProviderService.cpp @@ -23,7 +23,7 @@ nsSocketProviderService::Create(nsISupports *aOuter, REFNSIID aIID, void **aResu return rv; } -NS_IMPL_ISUPPORTS1(nsSocketProviderService, nsISocketProviderService) +NS_IMPL_ISUPPORTS(nsSocketProviderService, nsISocketProviderService) //////////////////////////////////////////////////////////////////////////////// diff --git a/netwerk/socket/nsUDPSocketProvider.cpp b/netwerk/socket/nsUDPSocketProvider.cpp index bc216514f49..4ca7b2977e7 100644 --- a/netwerk/socket/nsUDPSocketProvider.cpp +++ b/netwerk/socket/nsUDPSocketProvider.cpp @@ -6,7 +6,7 @@ #include "nspr.h" -NS_IMPL_ISUPPORTS1(nsUDPSocketProvider, nsISocketProvider) +NS_IMPL_ISUPPORTS(nsUDPSocketProvider, nsISocketProvider) nsUDPSocketProvider::~nsUDPSocketProvider() { diff --git a/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp b/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp index 7a0c1e208a5..14a9e8e9de4 100644 --- a/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp +++ b/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp @@ -1014,11 +1014,11 @@ mozTXTToHTMLConv::~mozTXTToHTMLConv() { } -NS_IMPL_ISUPPORTS4(mozTXTToHTMLConv, - mozITXTToHTMLConv, - nsIStreamConverter, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(mozTXTToHTMLConv, + mozITXTToHTMLConv, + nsIStreamConverter, + nsIStreamListener, + nsIRequestObserver) int32_t mozTXTToHTMLConv::CiteLevelTXT(const char16_t *line, diff --git a/netwerk/streamconv/converters/nsDirIndex.cpp b/netwerk/streamconv/converters/nsDirIndex.cpp index 825e6e443b7..c0fbaba15e9 100644 --- a/netwerk/streamconv/converters/nsDirIndex.cpp +++ b/netwerk/streamconv/converters/nsDirIndex.cpp @@ -6,8 +6,8 @@ #include "nsDirIndex.h" #include "nsISupportsObsolete.h" -NS_IMPL_ISUPPORTS1(nsDirIndex, - nsIDirIndex) +NS_IMPL_ISUPPORTS(nsDirIndex, + nsIDirIndex) nsDirIndex::nsDirIndex() : mType(TYPE_UNKNOWN), mSize(UINT64_MAX), diff --git a/netwerk/streamconv/converters/nsDirIndexParser.cpp b/netwerk/streamconv/converters/nsDirIndexParser.cpp index e3efc6e3749..f68d3df3b89 100644 --- a/netwerk/streamconv/converters/nsDirIndexParser.cpp +++ b/netwerk/streamconv/converters/nsDirIndexParser.cpp @@ -20,10 +20,10 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS3(nsDirIndexParser, - nsIRequestObserver, - nsIStreamListener, - nsIDirIndexParser) +NS_IMPL_ISUPPORTS(nsDirIndexParser, + nsIRequestObserver, + nsIStreamListener, + nsIDirIndexParser) nsDirIndexParser::nsDirIndexParser() { } diff --git a/netwerk/streamconv/converters/nsFTPDirListingConv.cpp b/netwerk/streamconv/converters/nsFTPDirListingConv.cpp index 5a9904d1a34..4c43e451b8b 100644 --- a/netwerk/streamconv/converters/nsFTPDirListingConv.cpp +++ b/netwerk/streamconv/converters/nsFTPDirListingConv.cpp @@ -36,10 +36,10 @@ PRLogModuleInfo* gFTPDirListConvLog = nullptr; #endif /* PR_LOGGING */ // nsISupports implementation -NS_IMPL_ISUPPORTS3(nsFTPDirListingConv, - nsIStreamConverter, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(nsFTPDirListingConv, + nsIStreamConverter, + nsIStreamListener, + nsIRequestObserver) // nsIStreamConverter implementation diff --git a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp index 208683bad79..db4cb39545b 100644 --- a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp +++ b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp @@ -14,10 +14,10 @@ #include "nsComponentManagerUtils.h" // nsISupports implementation -NS_IMPL_ISUPPORTS3(nsHTTPCompressConv, - nsIStreamConverter, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(nsHTTPCompressConv, + nsIStreamConverter, + nsIStreamListener, + nsIRequestObserver) // nsFTPDirListingConv methods nsHTTPCompressConv::nsHTTPCompressConv() diff --git a/netwerk/streamconv/converters/nsIndexedToHTML.cpp b/netwerk/streamconv/converters/nsIndexedToHTML.cpp index ce956bc1df0..0b5b700bf92 100644 --- a/netwerk/streamconv/converters/nsIndexedToHTML.cpp +++ b/netwerk/streamconv/converters/nsIndexedToHTML.cpp @@ -25,11 +25,11 @@ #include "nsXPIDLString.h" #include -NS_IMPL_ISUPPORTS4(nsIndexedToHTML, - nsIDirIndexListener, - nsIStreamConverter, - nsIRequestObserver, - nsIStreamListener) +NS_IMPL_ISUPPORTS(nsIndexedToHTML, + nsIDirIndexListener, + nsIStreamConverter, + nsIRequestObserver, + nsIStreamListener) static void AppendNonAsciiToNCR(const nsAString& in, nsCString& out) { diff --git a/netwerk/streamconv/converters/nsMultiMixedConv.cpp b/netwerk/streamconv/converters/nsMultiMixedConv.cpp index 9d5f39ef6cf..f5137cf8c67 100644 --- a/netwerk/streamconv/converters/nsMultiMixedConv.cpp +++ b/netwerk/streamconv/converters/nsMultiMixedConv.cpp @@ -409,10 +409,10 @@ nsPartChannel::GetBaseChannel(nsIChannel ** aReturn) // nsISupports implementation -NS_IMPL_ISUPPORTS3(nsMultiMixedConv, - nsIStreamConverter, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(nsMultiMixedConv, + nsIStreamConverter, + nsIStreamListener, + nsIRequestObserver) // nsIStreamConverter implementation diff --git a/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp b/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp index b0e58cb01ef..591b7ddb87d 100644 --- a/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp +++ b/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp @@ -13,11 +13,11 @@ #define TOKEN_DELIMITERS MOZ_UTF16("\t\r\n ") // nsISupports methods -NS_IMPL_ISUPPORTS4(nsTXTToHTMLConv, - nsIStreamConverter, - nsITXTToHTMLConv, - nsIRequestObserver, - nsIStreamListener) +NS_IMPL_ISUPPORTS(nsTXTToHTMLConv, + nsIStreamConverter, + nsITXTToHTMLConv, + nsIRequestObserver, + nsIStreamListener) // nsIStreamConverter methods diff --git a/netwerk/streamconv/src/nsStreamConverterService.cpp b/netwerk/streamconv/src/nsStreamConverterService.cpp index f500c6ced14..f549990b63a 100644 --- a/netwerk/streamconv/src/nsStreamConverterService.cpp +++ b/netwerk/streamconv/src/nsStreamConverterService.cpp @@ -66,7 +66,7 @@ struct BFSTableData { //////////////////////////////////////////////////////////// // nsISupports methods -NS_IMPL_ISUPPORTS1(nsStreamConverterService, nsIStreamConverterService) +NS_IMPL_ISUPPORTS(nsStreamConverterService, nsIStreamConverterService) //////////////////////////////////////////////////////////// diff --git a/netwerk/streamconv/test/Converters.cpp b/netwerk/streamconv/test/Converters.cpp index 8a4dfb588fc..61b114d77d4 100644 --- a/netwerk/streamconv/test/Converters.cpp +++ b/netwerk/streamconv/test/Converters.cpp @@ -19,10 +19,10 @@ NS_DEFINE_CID(kTestConverterCID, NS_TESTCONVERTER_CID); -NS_IMPL_ISUPPORTS3(TestConverter, - nsIStreamConverter, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(TestConverter, + nsIStreamConverter, + nsIStreamListener, + nsIRequestObserver) TestConverter::TestConverter() { } diff --git a/netwerk/streamconv/test/TestStreamConv.cpp b/netwerk/streamconv/test/TestStreamConv.cpp index 491e93f53a3..90719db0ae2 100644 --- a/netwerk/streamconv/test/TestStreamConv.cpp +++ b/netwerk/streamconv/test/TestStreamConv.cpp @@ -86,9 +86,9 @@ public: nsresult aStatus) { return NS_OK; } }; -NS_IMPL_ISUPPORTS2(EndListener, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(EndListener, + nsIStreamListener, + nsIRequestObserver) //////////////////////////////////////////////////////////////////////// // EndListener END diff --git a/netwerk/system/android/nsAndroidNetworkLinkService.cpp b/netwerk/system/android/nsAndroidNetworkLinkService.cpp index 97629673a94..ca5f00a8899 100644 --- a/netwerk/system/android/nsAndroidNetworkLinkService.cpp +++ b/netwerk/system/android/nsAndroidNetworkLinkService.cpp @@ -12,8 +12,8 @@ using namespace mozilla::widget::android; -NS_IMPL_ISUPPORTS1(nsAndroidNetworkLinkService, - nsINetworkLinkService) +NS_IMPL_ISUPPORTS(nsAndroidNetworkLinkService, + nsINetworkLinkService) nsAndroidNetworkLinkService::nsAndroidNetworkLinkService() { diff --git a/netwerk/system/mac/nsNetworkLinkService.mm b/netwerk/system/mac/nsNetworkLinkService.mm index 7b61a35cbce..51b6235ad4d 100644 --- a/netwerk/system/mac/nsNetworkLinkService.mm +++ b/netwerk/system/mac/nsNetworkLinkService.mm @@ -13,9 +13,9 @@ #import #import -NS_IMPL_ISUPPORTS2(nsNetworkLinkService, - nsINetworkLinkService, - nsIObserver) +NS_IMPL_ISUPPORTS(nsNetworkLinkService, + nsINetworkLinkService, + nsIObserver) nsNetworkLinkService::nsNetworkLinkService() : mLinkUp(true) diff --git a/netwerk/system/qt/nsQtNetworkLinkService.cpp b/netwerk/system/qt/nsQtNetworkLinkService.cpp index 888dfd1c2dd..f08aabbd8ed 100644 --- a/netwerk/system/qt/nsQtNetworkLinkService.cpp +++ b/netwerk/system/qt/nsQtNetworkLinkService.cpp @@ -11,9 +11,9 @@ #include "mozilla/Services.h" #include "nsCRT.h" -NS_IMPL_ISUPPORTS2(nsQtNetworkLinkService, - nsINetworkLinkService, - nsIObserver) +NS_IMPL_ISUPPORTS(nsQtNetworkLinkService, + nsINetworkLinkService, + nsIObserver) nsQtNetworkLinkService::nsQtNetworkLinkService() { diff --git a/netwerk/system/win32/nsNotifyAddrListener.cpp b/netwerk/system/win32/nsNotifyAddrListener.cpp index ad9e9bccb52..dc19596591a 100644 --- a/netwerk/system/win32/nsNotifyAddrListener.cpp +++ b/netwerk/system/win32/nsNotifyAddrListener.cpp @@ -49,10 +49,10 @@ static void FreeDynamicLibraries(void) } } -NS_IMPL_ISUPPORTS3(nsNotifyAddrListener, - nsINetworkLinkService, - nsIRunnable, - nsIObserver) +NS_IMPL_ISUPPORTS(nsNotifyAddrListener, + nsINetworkLinkService, + nsIRunnable, + nsIObserver) nsNotifyAddrListener::nsNotifyAddrListener() : mLinkUp(true) // assume true by default diff --git a/netwerk/test/TestCallbacks.cpp b/netwerk/test/TestCallbacks.cpp index 499bb1b2d2c..a7261c52c31 100644 --- a/netwerk/test/TestCallbacks.cpp +++ b/netwerk/test/TestCallbacks.cpp @@ -56,7 +56,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(ConsumerContext, nsIEquals) +NS_IMPL_ISUPPORTS(ConsumerContext, nsIEquals) class Consumer : public nsIStreamListener { public: @@ -79,7 +79,7 @@ public: }; // nsISupports implementation -NS_IMPL_ISUPPORTS2(Consumer, nsIStreamListener, nsIRequestObserver) +NS_IMPL_ISUPPORTS(Consumer, nsIStreamListener, nsIRequestObserver) // nsIRequestObserver implementation diff --git a/netwerk/test/TestCommon.h b/netwerk/test/TestCommon.h index 072cba8ae33..963703ca502 100644 --- a/netwerk/test/TestCommon.h +++ b/netwerk/test/TestCommon.h @@ -26,7 +26,7 @@ public: return NS_OK; } }; -NS_IMPL_ISUPPORTS1(nsQuitPumpingEvent, nsIRunnable) +NS_IMPL_ISUPPORTS(nsQuitPumpingEvent, nsIRunnable) static inline void PumpEvents() { diff --git a/netwerk/test/TestDNS.cpp b/netwerk/test/TestDNS.cpp index 4fe4fe8fb05..06ab3597182 100644 --- a/netwerk/test/TestDNS.cpp +++ b/netwerk/test/TestDNS.cpp @@ -57,7 +57,7 @@ private: int32_t mIndex; }; -NS_IMPL_ISUPPORTS1(myDNSListener, nsIDNSListener) +NS_IMPL_ISUPPORTS(myDNSListener, nsIDNSListener) static bool IsAscii(const char *s) { diff --git a/netwerk/test/TestFileInput2.cpp b/netwerk/test/TestFileInput2.cpp index 1450846560f..dac2a0ec5e5 100644 --- a/netwerk/test/TestFileInput2.cpp +++ b/netwerk/test/TestFileInput2.cpp @@ -218,7 +218,7 @@ protected: uint32_t mBufferSize; }; -NS_IMPL_ISUPPORTS1(FileSpecWorker, nsIRunnable) +NS_IMPL_ISUPPORTS(FileSpecWorker, nsIRunnable) //////////////////////////////////////////////////////////////////////////////// @@ -310,7 +310,7 @@ protected: uint32_t mBufferSize; }; -NS_IMPL_ISUPPORTS1(FileChannelWorker, nsIRunnable) +NS_IMPL_ISUPPORTS(FileChannelWorker, nsIRunnable) //////////////////////////////////////////////////////////////////////////////// diff --git a/netwerk/test/TestHttp.cpp b/netwerk/test/TestHttp.cpp index 7e8f270b8df..e1883758fac 100644 --- a/netwerk/test/TestHttp.cpp +++ b/netwerk/test/TestHttp.cpp @@ -34,9 +34,9 @@ public: virtual ~MyListener() {} }; -NS_IMPL_ISUPPORTS2(MyListener, - nsIRequestObserver, - nsIStreamListener) +NS_IMPL_ISUPPORTS(MyListener, + nsIRequestObserver, + nsIStreamListener) NS_IMETHODIMP MyListener::OnStartRequest(nsIRequest *req, nsISupports *ctxt) @@ -96,9 +96,9 @@ public: virtual ~MyNotifications() {} }; -NS_IMPL_ISUPPORTS2(MyNotifications, - nsIInterfaceRequestor, - nsIProgressEventSink) +NS_IMPL_ISUPPORTS(MyNotifications, + nsIInterfaceRequestor, + nsIProgressEventSink) NS_IMETHODIMP MyNotifications::GetInterface(const nsIID &iid, void **result) diff --git a/netwerk/test/TestIOThreads.cpp b/netwerk/test/TestIOThreads.cpp index a594f8f7237..f2ca8aeb693 100644 --- a/netwerk/test/TestIOThreads.cpp +++ b/netwerk/test/TestIOThreads.cpp @@ -33,7 +33,7 @@ public: private: int mIndex; }; -NS_IMPL_ISUPPORTS1(nsIOEvent, nsIRunnable) +NS_IMPL_ISUPPORTS(nsIOEvent, nsIRunnable) static nsresult RunTest() { diff --git a/netwerk/test/TestIncrementalDownload.cpp b/netwerk/test/TestIncrementalDownload.cpp index 46dd1527d88..d6f5b6ab4c2 100644 --- a/netwerk/test/TestIncrementalDownload.cpp +++ b/netwerk/test/TestIncrementalDownload.cpp @@ -27,8 +27,8 @@ public: NS_DECL_NSIPROGRESSEVENTSINK }; -NS_IMPL_ISUPPORTS2(FetchObserver, nsIRequestObserver, - nsIProgressEventSink) +NS_IMPL_ISUPPORTS(FetchObserver, nsIRequestObserver, + nsIProgressEventSink) NS_IMETHODIMP FetchObserver::OnStartRequest(nsIRequest *request, nsISupports *context) diff --git a/netwerk/test/TestMCTransport.cpp b/netwerk/test/TestMCTransport.cpp index a58a0547a6f..0655c966b92 100644 --- a/netwerk/test/TestMCTransport.cpp +++ b/netwerk/test/TestMCTransport.cpp @@ -54,9 +54,9 @@ private: FILE *mFile; }; -NS_IMPL_ISUPPORTS2(TestListener, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(TestListener, + nsIStreamListener, + nsIRequestObserver) TestListener::TestListener(char *filename) : mFilename(filename) diff --git a/netwerk/test/TestOverlappedIO.cpp b/netwerk/test/TestOverlappedIO.cpp index 59417147da6..98012c96259 100644 --- a/netwerk/test/TestOverlappedIO.cpp +++ b/netwerk/test/TestOverlappedIO.cpp @@ -57,9 +57,9 @@ public: NS_DECL_NSISTREAMLISTENER }; -NS_IMPL_ISUPPORTS2(TestListener, - nsIRequestObserver, - nsIStreamListener); +NS_IMPL_ISUPPORTS(TestListener, + nsIRequestObserver, + nsIStreamListener); NS_IMETHODIMP TestListener::OnStartRequest(nsIRequest* request, nsISupports* context) @@ -122,9 +122,9 @@ protected: uint32_t mRequestCount; }; -NS_IMPL_ISUPPORTS2(TestProvider, - nsIStreamProvider, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(TestProvider, + nsIStreamProvider, + nsIRequestObserver) TestProvider::TestProvider(char *data) { diff --git a/netwerk/test/TestPageLoad.cpp b/netwerk/test/TestPageLoad.cpp index 8b8072fbf79..848a5077d31 100644 --- a/netwerk/test/TestPageLoad.cpp +++ b/netwerk/test/TestPageLoad.cpp @@ -137,9 +137,9 @@ public: virtual ~MyListener() {} }; -NS_IMPL_ISUPPORTS2(MyListener, - nsIRequestObserver, - nsIStreamListener) +NS_IMPL_ISUPPORTS(MyListener, + nsIRequestObserver, + nsIStreamListener) NS_IMETHODIMP MyListener::OnStartRequest(nsIRequest *req, nsISupports *ctxt) @@ -204,9 +204,9 @@ public: virtual ~MyNotifications() {} }; -NS_IMPL_ISUPPORTS2(MyNotifications, - nsIInterfaceRequestor, - nsIProgressEventSink) +NS_IMPL_ISUPPORTS(MyNotifications, + nsIInterfaceRequestor, + nsIProgressEventSink) NS_IMETHODIMP MyNotifications::GetInterface(const nsIID &iid, void **result) diff --git a/netwerk/test/TestPerf.cpp b/netwerk/test/TestPerf.cpp index f8c8ddd9367..e8b91535862 100644 --- a/netwerk/test/TestPerf.cpp +++ b/netwerk/test/TestPerf.cpp @@ -67,7 +67,7 @@ public: virtual ~MyListener() {} }; -NS_IMPL_ISUPPORTS2(MyListener, nsIStreamListener, nsIRequestObserver) +NS_IMPL_ISUPPORTS(MyListener, nsIStreamListener, nsIRequestObserver) NS_IMETHODIMP MyListener::OnStartRequest(nsIRequest *req, nsISupports *ctx) diff --git a/netwerk/test/TestProtocols.cpp b/netwerk/test/TestProtocols.cpp index 0c367f4872b..1dc01d9f675 100644 --- a/netwerk/test/TestProtocols.cpp +++ b/netwerk/test/TestProtocols.cpp @@ -173,7 +173,7 @@ public: HeaderVisitor() { } virtual ~HeaderVisitor() {} }; -NS_IMPL_ISUPPORTS1(HeaderVisitor, nsIHttpHeaderVisitor) +NS_IMPL_ISUPPORTS(HeaderVisitor, nsIHttpHeaderVisitor) NS_IMETHODIMP HeaderVisitor::VisitHeader(const nsACString &header, const nsACString &value) @@ -241,7 +241,7 @@ TestChannelEventSink::~TestChannelEventSink() } -NS_IMPL_ISUPPORTS1(TestChannelEventSink, nsIChannelEventSink) +NS_IMPL_ISUPPORTS(TestChannelEventSink, nsIChannelEventSink) NS_IMETHODIMP TestChannelEventSink::AsyncOnChannelRedirect(nsIChannel *channel, @@ -269,7 +269,7 @@ public: virtual ~TestAuthPrompt(); }; -NS_IMPL_ISUPPORTS1(TestAuthPrompt, nsIAuthPrompt) +NS_IMPL_ISUPPORTS(TestAuthPrompt, nsIAuthPrompt) TestAuthPrompt::TestAuthPrompt() { @@ -370,7 +370,7 @@ InputTestConsumer::~InputTestConsumer() { } -NS_IMPL_ISUPPORTS2(InputTestConsumer, nsIStreamListener, nsIRequestObserver) +NS_IMPL_ISUPPORTS(InputTestConsumer, nsIStreamListener, nsIRequestObserver) NS_IMETHODIMP InputTestConsumer::OnStartRequest(nsIRequest *request, nsISupports* context) @@ -595,7 +595,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(NotificationCallbacks, nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(NotificationCallbacks, nsIInterfaceRequestor) //----------------------------------------------------------------------------- // helpers... diff --git a/netwerk/test/TestRes.cpp b/netwerk/test/TestRes.cpp index 74e7d00261b..bf4b236de81 100644 --- a/netwerk/test/TestRes.cpp +++ b/netwerk/test/TestRes.cpp @@ -166,7 +166,7 @@ public: } }; -NS_IMPL_ISUPPORTS2(Listener, nsIStreamListener, nsIRequestObserver) +NS_IMPL_ISUPPORTS(Listener, nsIStreamListener, nsIRequestObserver) nsresult TestAsyncRead(const char* url) diff --git a/netwerk/test/TestServ.cpp b/netwerk/test/TestServ.cpp index 596d903f3d9..cdf0069f19d 100644 --- a/netwerk/test/TestServ.cpp +++ b/netwerk/test/TestServ.cpp @@ -31,7 +31,7 @@ public: virtual ~MySocketListener() {} }; -NS_IMPL_ISUPPORTS1(MySocketListener, nsIServerSocketListener) +NS_IMPL_ISUPPORTS(MySocketListener, nsIServerSocketListener) NS_IMETHODIMP MySocketListener::OnSocketAccepted(nsIServerSocket *serv, diff --git a/netwerk/test/TestSocketIO.cpp b/netwerk/test/TestSocketIO.cpp index 5da97bffbea..bbeb2d05599 100644 --- a/netwerk/test/TestSocketIO.cpp +++ b/netwerk/test/TestSocketIO.cpp @@ -56,9 +56,9 @@ public: NS_DECL_NSISTREAMLISTENER }; -NS_IMPL_ISUPPORTS2(TestListener, - nsIRequestObserver, - nsIStreamListener); +NS_IMPL_ISUPPORTS(TestListener, + nsIRequestObserver, + nsIStreamListener); NS_IMETHODIMP TestListener::OnStartRequest(nsIRequest* request, nsISupports* context) @@ -117,9 +117,9 @@ protected: nsCOMPtr mData; }; -NS_IMPL_ISUPPORTS2(TestProvider, - nsIStreamProvider, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(TestProvider, + nsIStreamProvider, + nsIRequestObserver) TestProvider::TestProvider(char *data) { diff --git a/netwerk/test/TestSocketInput.cpp b/netwerk/test/TestSocketInput.cpp index e06026a0755..c3e58bd1eb4 100644 --- a/netwerk/test/TestSocketInput.cpp +++ b/netwerk/test/TestSocketInput.cpp @@ -49,7 +49,7 @@ InputTestConsumer::~InputTestConsumer() } -NS_IMPL_ISUPPORTS2(InputTestConsumer, nsIRequestObserver, nsIStreamListener) +NS_IMPL_ISUPPORTS(InputTestConsumer, nsIRequestObserver, nsIStreamListener) NS_IMETHODIMP diff --git a/netwerk/test/TestSocketTransport.cpp b/netwerk/test/TestSocketTransport.cpp index dfdfa98c49f..6179976f10a 100644 --- a/netwerk/test/TestSocketTransport.cpp +++ b/netwerk/test/TestSocketTransport.cpp @@ -115,9 +115,9 @@ private: uint32_t mWriteOffset; }; -NS_IMPL_ISUPPORTS2(MyHandler, - nsIOutputStreamCallback, - nsIInputStreamCallback) +NS_IMPL_ISUPPORTS(MyHandler, + nsIOutputStreamCallback, + nsIInputStreamCallback) //////////////////////////////////////////////////////////////////////////////// diff --git a/netwerk/test/TestStreamChannel.cpp b/netwerk/test/TestStreamChannel.cpp index 8de4f49747e..1636f7b0d9c 100644 --- a/netwerk/test/TestStreamChannel.cpp +++ b/netwerk/test/TestStreamChannel.cpp @@ -88,9 +88,9 @@ public: } }; -NS_IMPL_ISUPPORTS2(MyListener, - nsIRequestObserver, - nsIStreamListener) +NS_IMPL_ISUPPORTS(MyListener, + nsIRequestObserver, + nsIStreamListener) //////////////////////////////////////////////////////////////////////////////// @@ -123,9 +123,9 @@ public: } }; -NS_IMPL_ISUPPORTS2(MyCallbacks, - nsIInterfaceRequestor, - nsIProgressEventSink) +NS_IMPL_ISUPPORTS(MyCallbacks, + nsIInterfaceRequestor, + nsIProgressEventSink) //////////////////////////////////////////////////////////////////////////////// diff --git a/netwerk/test/TestStreamLoader.cpp b/netwerk/test/TestStreamLoader.cpp index db6a3997fec..f207107064b 100644 --- a/netwerk/test/TestStreamLoader.cpp +++ b/netwerk/test/TestStreamLoader.cpp @@ -20,7 +20,7 @@ public: NS_DECL_NSISTREAMLOADEROBSERVER }; -NS_IMPL_ISUPPORTS1(MyStreamLoaderObserver, nsIStreamLoaderObserver) +NS_IMPL_ISUPPORTS(MyStreamLoaderObserver, nsIStreamLoaderObserver) NS_IMETHODIMP MyStreamLoaderObserver::OnStreamComplete(nsIStreamLoader *loader, diff --git a/netwerk/test/TestStreamPump.cpp b/netwerk/test/TestStreamPump.cpp index 12c3f6d17cb..ffbfa74e6e0 100644 --- a/netwerk/test/TestStreamPump.cpp +++ b/netwerk/test/TestStreamPump.cpp @@ -89,9 +89,9 @@ public: } }; -NS_IMPL_ISUPPORTS2(MyListener, - nsIRequestObserver, - nsIStreamListener) +NS_IMPL_ISUPPORTS(MyListener, + nsIRequestObserver, + nsIStreamListener) //////////////////////////////////////////////////////////////////////////////// diff --git a/netwerk/test/TestStreamTransport.cpp b/netwerk/test/TestStreamTransport.cpp index 96e2b3250ab..e0abe5066fc 100644 --- a/netwerk/test/TestStreamTransport.cpp +++ b/netwerk/test/TestStreamTransport.cpp @@ -162,9 +162,9 @@ protected: nsresult mInputCondition; }; -NS_IMPL_ISUPPORTS2(MyCopier, - nsIInputStreamCallback, - nsIOutputStreamCallback) +NS_IMPL_ISUPPORTS(MyCopier, + nsIInputStreamCallback, + nsIOutputStreamCallback) //////////////////////////////////////////////////////////////////////////////// diff --git a/netwerk/test/TestThreadedIO.cpp b/netwerk/test/TestThreadedIO.cpp index ab21634e174..d7a17bfdc15 100644 --- a/netwerk/test/TestThreadedIO.cpp +++ b/netwerk/test/TestThreadedIO.cpp @@ -93,7 +93,7 @@ TestListener::~TestListener() { printf( "TestListener dtor called on thread %d\n", mThreadNo ); } -NS_IMPL_ISUPPORTS2( TestListener, nsIStreamListener, nsIRequestObserver ) +NS_IMPL_ISUPPORTS( TestListener, nsIStreamListener, nsIRequestObserver ) NS_IMETHODIMP TestListener::OnStartRequest( nsIChannel *aChannel, nsISupports *aContext ) { diff --git a/netwerk/test/TestUDPSocket.cpp b/netwerk/test/TestUDPSocket.cpp index 3f083220de5..107c059bc15 100644 --- a/netwerk/test/TestUDPSocket.cpp +++ b/netwerk/test/TestUDPSocket.cpp @@ -99,7 +99,7 @@ public: nsresult mResult; }; -NS_IMPL_ISUPPORTS1(UDPClientListener, nsIUDPSocketListener) +NS_IMPL_ISUPPORTS(UDPClientListener, nsIUDPSocketListener) UDPClientListener::~UDPClientListener() { @@ -160,7 +160,7 @@ public: nsresult mResult; }; -NS_IMPL_ISUPPORTS1(UDPServerListener, nsIUDPSocketListener) +NS_IMPL_ISUPPORTS(UDPServerListener, nsIUDPSocketListener) UDPServerListener::~UDPServerListener() { diff --git a/netwerk/test/TestUpload.cpp b/netwerk/test/TestUpload.cpp index 88675c6e52a..6ce6b6d65f0 100644 --- a/netwerk/test/TestUpload.cpp +++ b/netwerk/test/TestUpload.cpp @@ -51,9 +51,9 @@ InputTestConsumer::~InputTestConsumer() { } -NS_IMPL_ISUPPORTS2(InputTestConsumer, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(InputTestConsumer, + nsIStreamListener, + nsIRequestObserver) NS_IMETHODIMP InputTestConsumer::OnStartRequest(nsIRequest *request, nsISupports* context) diff --git a/netwerk/wifi/nsWifiAccessPoint.cpp b/netwerk/wifi/nsWifiAccessPoint.cpp index 0611cbe753f..f2ae1ff0116 100644 --- a/netwerk/wifi/nsWifiAccessPoint.cpp +++ b/netwerk/wifi/nsWifiAccessPoint.cpp @@ -13,7 +13,7 @@ extern PRLogModuleInfo *gWifiMonitorLog; #define LOG(args) PR_LOG(gWifiMonitorLog, PR_LOG_DEBUG, args) -NS_IMPL_ISUPPORTS1(nsWifiAccessPoint, nsIWifiAccessPoint) +NS_IMPL_ISUPPORTS(nsWifiAccessPoint, nsIWifiAccessPoint) nsWifiAccessPoint::nsWifiAccessPoint() { diff --git a/netwerk/wifi/nsWifiMonitor.cpp b/netwerk/wifi/nsWifiMonitor.cpp index b1e595be759..1bb4dd024c9 100644 --- a/netwerk/wifi/nsWifiMonitor.cpp +++ b/netwerk/wifi/nsWifiMonitor.cpp @@ -24,10 +24,10 @@ using namespace mozilla; PRLogModuleInfo *gWifiMonitorLog; #endif -NS_IMPL_ISUPPORTS3(nsWifiMonitor, - nsIRunnable, - nsIObserver, - nsIWifiMonitor) +NS_IMPL_ISUPPORTS(nsWifiMonitor, + nsIRunnable, + nsIObserver, + nsIWifiMonitor) nsWifiMonitor::nsWifiMonitor() : mKeepGoing(true) @@ -131,8 +131,8 @@ class nsPassErrorToWifiListeners MOZ_FINAL : public nsIRunnable nsresult mResult; }; -NS_IMPL_ISUPPORTS1(nsPassErrorToWifiListeners, - nsIRunnable) +NS_IMPL_ISUPPORTS(nsPassErrorToWifiListeners, + nsIRunnable) NS_IMETHODIMP nsPassErrorToWifiListeners::Run() { @@ -191,8 +191,8 @@ class nsCallWifiListeners MOZ_FINAL : public nsIRunnable nsAutoPtr > mAccessPoints; }; -NS_IMPL_ISUPPORTS1(nsCallWifiListeners, - nsIRunnable) +NS_IMPL_ISUPPORTS(nsCallWifiListeners, + nsIRunnable) NS_IMETHODIMP nsCallWifiListeners::Run() { diff --git a/netwerk/wifi/nsWifiMonitorGonk.cpp b/netwerk/wifi/nsWifiMonitorGonk.cpp index 1c26fa30d1f..7023b0590dd 100644 --- a/netwerk/wifi/nsWifiMonitorGonk.cpp +++ b/netwerk/wifi/nsWifiMonitorGonk.cpp @@ -26,10 +26,10 @@ using namespace mozilla; PRLogModuleInfo *gWifiMonitorLog; #endif -NS_IMPL_ISUPPORTS3(nsWifiMonitor, - nsIWifiMonitor, - nsIObserver, - nsIWifiScanResultsReady) +NS_IMPL_ISUPPORTS(nsWifiMonitor, + nsIWifiMonitor, + nsIObserver, + nsIWifiScanResultsReady) nsWifiMonitor::nsWifiMonitor() { diff --git a/parser/html/nsHtml5Module.cpp b/parser/html/nsHtml5Module.cpp index f228279968f..7297759f9fa 100644 --- a/parser/html/nsHtml5Module.cpp +++ b/parser/html/nsHtml5Module.cpp @@ -106,7 +106,7 @@ class nsHtml5ParserThreadTerminator MOZ_FINAL : public nsIObserver nsCOMPtr mThread; }; -NS_IMPL_ISUPPORTS1(nsHtml5ParserThreadTerminator, nsIObserver) +NS_IMPL_ISUPPORTS(nsHtml5ParserThreadTerminator, nsIObserver) // static nsIThread* diff --git a/parser/html/nsHtml5Parser.cpp b/parser/html/nsHtml5Parser.cpp index 9fb1b7de8eb..a485be464f3 100644 --- a/parser/html/nsHtml5Parser.cpp +++ b/parser/html/nsHtml5Parser.cpp @@ -15,7 +15,7 @@ #include "nsNetUtil.h" NS_INTERFACE_TABLE_HEAD(nsHtml5Parser) - NS_INTERFACE_TABLE2(nsHtml5Parser, nsIParser, nsISupportsWeakReference) + NS_INTERFACE_TABLE(nsHtml5Parser, nsIParser, nsISupportsWeakReference) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsHtml5Parser) NS_INTERFACE_MAP_END diff --git a/parser/html/nsHtml5StreamParser.cpp b/parser/html/nsHtml5StreamParser.cpp index f5b2d76a424..47905682dd9 100644 --- a/parser/html/nsHtml5StreamParser.cpp +++ b/parser/html/nsHtml5StreamParser.cpp @@ -73,8 +73,8 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(nsHtml5StreamParser) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsHtml5StreamParser) NS_INTERFACE_TABLE_HEAD(nsHtml5StreamParser) - NS_INTERFACE_TABLE1(nsHtml5StreamParser, - nsICharsetDetectionObserver) + NS_INTERFACE_TABLE(nsHtml5StreamParser, + nsICharsetDetectionObserver) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsHtml5StreamParser) NS_INTERFACE_MAP_END diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp index 25ce068e138..ebcafca8b77 100644 --- a/parser/html/nsHtml5TreeOpExecutor.cpp +++ b/parser/html/nsHtml5TreeOpExecutor.cpp @@ -34,8 +34,8 @@ using namespace mozilla; NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHtml5TreeOpExecutor) - NS_INTERFACE_TABLE_INHERITED1(nsHtml5TreeOpExecutor, - nsIContentSink) + NS_INTERFACE_TABLE_INHERITED(nsHtml5TreeOpExecutor, + nsIContentSink) NS_INTERFACE_TABLE_TAIL_INHERITING(nsHtml5DocumentBuilder) NS_IMPL_ADDREF_INHERITED(nsHtml5TreeOpExecutor, nsContentSink) diff --git a/parser/html/nsParserUtils.cpp b/parser/html/nsParserUtils.cpp index d694039befb..4015e7b29d1 100644 --- a/parser/html/nsParserUtils.cpp +++ b/parser/html/nsParserUtils.cpp @@ -41,9 +41,9 @@ using namespace mozilla::dom; -NS_IMPL_ISUPPORTS2(nsParserUtils, - nsIScriptableUnescapeHTML, - nsIParserUtils) +NS_IMPL_ISUPPORTS(nsParserUtils, + nsIScriptableUnescapeHTML, + nsIParserUtils) static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID); diff --git a/parser/htmlparser/src/CNavDTD.cpp b/parser/htmlparser/src/CNavDTD.cpp index 652e7a7bb80..ce4ac796da0 100644 --- a/parser/htmlparser/src/CNavDTD.cpp +++ b/parser/htmlparser/src/CNavDTD.cpp @@ -10,7 +10,7 @@ #include "CNavDTD.h" #include "nsIHTMLContentSink.h" -NS_IMPL_ISUPPORTS1(CNavDTD, nsIDTD); +NS_IMPL_ISUPPORTS(CNavDTD, nsIDTD); CNavDTD::CNavDTD() { diff --git a/parser/htmlparser/src/nsHTMLTokenizer.cpp b/parser/htmlparser/src/nsHTMLTokenizer.cpp index 5b55a153021..f60a48c3c43 100644 --- a/parser/htmlparser/src/nsHTMLTokenizer.cpp +++ b/parser/htmlparser/src/nsHTMLTokenizer.cpp @@ -25,7 +25,7 @@ /** * Satisfy the nsISupports interface. */ -NS_IMPL_ISUPPORTS1(nsHTMLTokenizer, nsITokenizer) +NS_IMPL_ISUPPORTS(nsHTMLTokenizer, nsITokenizer) /** * Default constructor diff --git a/parser/htmlparser/src/nsParserService.cpp b/parser/htmlparser/src/nsParserService.cpp index ea714b01491..d89badd01df 100644 --- a/parser/htmlparser/src/nsParserService.cpp +++ b/parser/htmlparser/src/nsParserService.cpp @@ -20,7 +20,7 @@ nsParserService::~nsParserService() { } -NS_IMPL_ISUPPORTS1(nsParserService, nsIParserService) +NS_IMPL_ISUPPORTS(nsParserService, nsIParserService) int32_t nsParserService::HTMLAtomTagToId(nsIAtom* aAtom) const diff --git a/parser/xml/src/nsSAXAttributes.cpp b/parser/xml/src/nsSAXAttributes.cpp index 32b79fb783b..3984186e4ad 100644 --- a/parser/xml/src/nsSAXAttributes.cpp +++ b/parser/xml/src/nsSAXAttributes.cpp @@ -5,7 +5,7 @@ #include "nsSAXAttributes.h" -NS_IMPL_ISUPPORTS2(nsSAXAttributes, nsISAXAttributes, nsISAXMutableAttributes) +NS_IMPL_ISUPPORTS(nsSAXAttributes, nsISAXAttributes, nsISAXMutableAttributes) NS_IMETHODIMP nsSAXAttributes::GetIndexFromName(const nsAString &aURI, diff --git a/parser/xml/src/nsSAXLocator.cpp b/parser/xml/src/nsSAXLocator.cpp index 171375a6085..16a056ac6f4 100644 --- a/parser/xml/src/nsSAXLocator.cpp +++ b/parser/xml/src/nsSAXLocator.cpp @@ -5,7 +5,7 @@ #include "nsSAXLocator.h" -NS_IMPL_ISUPPORTS1(nsSAXLocator, nsISAXLocator) +NS_IMPL_ISUPPORTS(nsSAXLocator, nsISAXLocator) nsSAXLocator::nsSAXLocator(nsString& aPublicId, nsString& aSystemId, diff --git a/profile/dirserviceprovider/src/nsProfileDirServiceProvider.cpp b/profile/dirserviceprovider/src/nsProfileDirServiceProvider.cpp index be184b14d9e..0091c31bec3 100644 --- a/profile/dirserviceprovider/src/nsProfileDirServiceProvider.cpp +++ b/profile/dirserviceprovider/src/nsProfileDirServiceProvider.cpp @@ -138,8 +138,8 @@ nsProfileDirServiceProvider::Shutdown() // nsProfileDirServiceProvider::nsISupports //***************************************************************************** -NS_IMPL_ISUPPORTS1(nsProfileDirServiceProvider, - nsIDirectoryServiceProvider) +NS_IMPL_ISUPPORTS(nsProfileDirServiceProvider, + nsIDirectoryServiceProvider) //***************************************************************************** // nsProfileDirServiceProvider::nsIDirectoryServiceProvider diff --git a/rdf/base/src/nsCompositeDataSource.cpp b/rdf/base/src/nsCompositeDataSource.cpp index 76ad9f51001..423b485c5d5 100644 --- a/rdf/base/src/nsCompositeDataSource.cpp +++ b/rdf/base/src/nsCompositeDataSource.cpp @@ -160,7 +160,7 @@ CompositeEnumeratorImpl::~CompositeEnumeratorImpl(void) NS_IMPL_ADDREF(CompositeEnumeratorImpl) NS_IMPL_RELEASE(CompositeEnumeratorImpl) -NS_IMPL_QUERY_INTERFACE1(CompositeEnumeratorImpl, nsISimpleEnumerator) +NS_IMPL_QUERY_INTERFACE(CompositeEnumeratorImpl, nsISimpleEnumerator) NS_IMETHODIMP CompositeEnumeratorImpl::HasMoreElements(bool* aResult) diff --git a/rdf/base/src/nsContainerEnumerator.cpp b/rdf/base/src/nsContainerEnumerator.cpp index cfe3ae493b6..2e14577b0bb 100644 --- a/rdf/base/src/nsContainerEnumerator.cpp +++ b/rdf/base/src/nsContainerEnumerator.cpp @@ -107,7 +107,7 @@ ContainerEnumeratorImpl::~ContainerEnumeratorImpl() } } -NS_IMPL_ISUPPORTS1(ContainerEnumeratorImpl, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(ContainerEnumeratorImpl, nsISimpleEnumerator) NS_IMETHODIMP diff --git a/rdf/base/src/nsInMemoryDataSource.cpp b/rdf/base/src/nsInMemoryDataSource.cpp index 11e653f1dc5..fb92fa773fa 100644 --- a/rdf/base/src/nsInMemoryDataSource.cpp +++ b/rdf/base/src/nsInMemoryDataSource.cpp @@ -469,7 +469,7 @@ InMemoryAssertionEnumeratorImpl::~InMemoryAssertionEnumeratorImpl() NS_IMPL_ADDREF(InMemoryAssertionEnumeratorImpl) NS_IMPL_RELEASE(InMemoryAssertionEnumeratorImpl) -NS_IMPL_QUERY_INTERFACE1(InMemoryAssertionEnumeratorImpl, nsISimpleEnumerator) +NS_IMPL_QUERY_INTERFACE(InMemoryAssertionEnumeratorImpl, nsISimpleEnumerator) NS_IMETHODIMP InMemoryAssertionEnumeratorImpl::HasMoreElements(bool* aResult) @@ -637,7 +637,7 @@ InMemoryArcsEnumeratorImpl::~InMemoryArcsEnumeratorImpl() NS_IMPL_ADDREF(InMemoryArcsEnumeratorImpl) NS_IMPL_RELEASE(InMemoryArcsEnumeratorImpl) -NS_IMPL_QUERY_INTERFACE1(InMemoryArcsEnumeratorImpl, nsISimpleEnumerator) +NS_IMPL_QUERY_INTERFACE(InMemoryArcsEnumeratorImpl, nsISimpleEnumerator) NS_IMETHODIMP InMemoryArcsEnumeratorImpl::HasMoreElements(bool* aResult) diff --git a/rdf/base/src/nsRDFContainer.cpp b/rdf/base/src/nsRDFContainer.cpp index 76b6acb7046..c60da28100c 100644 --- a/rdf/base/src/nsRDFContainer.cpp +++ b/rdf/base/src/nsRDFContainer.cpp @@ -88,7 +88,7 @@ nsIRDFResource* RDFContainerImpl::kRDF_nextVal; //////////////////////////////////////////////////////////////////////// // nsISupports interface -NS_IMPL_ISUPPORTS1(RDFContainerImpl, nsIRDFContainer) +NS_IMPL_ISUPPORTS(RDFContainerImpl, nsIRDFContainer) diff --git a/rdf/base/src/nsRDFContainerUtils.cpp b/rdf/base/src/nsRDFContainerUtils.cpp index 31c1648d105..360d75fb6df 100644 --- a/rdf/base/src/nsRDFContainerUtils.cpp +++ b/rdf/base/src/nsRDFContainerUtils.cpp @@ -70,7 +70,7 @@ const char RDFContainerUtilsImpl::kRDFNameSpaceURI[] = RDF_NAMESPACE_URI; //////////////////////////////////////////////////////////////////////// // nsISupports interface -NS_IMPL_ISUPPORTS1(RDFContainerUtilsImpl, nsIRDFContainerUtils) +NS_IMPL_ISUPPORTS(RDFContainerUtilsImpl, nsIRDFContainerUtils) //////////////////////////////////////////////////////////////////////// // nsIRDFContainerUtils interface diff --git a/rdf/base/src/nsRDFService.cpp b/rdf/base/src/nsRDFService.cpp index 26b929d9eb4..bcfdce3f20a 100644 --- a/rdf/base/src/nsRDFService.cpp +++ b/rdf/base/src/nsRDFService.cpp @@ -301,7 +301,7 @@ public: Data mData; }; -NS_IMPL_ISUPPORTS2(BlobImpl, nsIRDFNode, nsIRDFBlob) +NS_IMPL_ISUPPORTS(BlobImpl, nsIRDFNode, nsIRDFBlob) NS_IMETHODIMP BlobImpl::EqualsNode(nsIRDFNode *aNode, bool *aEquals) @@ -827,7 +827,7 @@ RDFServiceImpl::CreateSingleton(nsISupports* aOuter, return serv->QueryInterface(aIID, aResult); } -NS_IMPL_ISUPPORTS2(RDFServiceImpl, nsIRDFService, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(RDFServiceImpl, nsIRDFService, nsISupportsWeakReference) // Per RFC2396. static const uint8_t diff --git a/rdf/base/src/nsRDFXMLParser.cpp b/rdf/base/src/nsRDFXMLParser.cpp index aefb384bc4d..03210658f30 100644 --- a/rdf/base/src/nsRDFXMLParser.cpp +++ b/rdf/base/src/nsRDFXMLParser.cpp @@ -16,7 +16,7 @@ static NS_DEFINE_CID(kParserCID, NS_PARSER_CID); -NS_IMPL_ISUPPORTS1(nsRDFXMLParser, nsIRDFXMLParser) +NS_IMPL_ISUPPORTS(nsRDFXMLParser, nsIRDFXMLParser) nsresult nsRDFXMLParser::Create(nsISupports* aOuter, REFNSIID aIID, void** aResult) diff --git a/rdf/base/src/nsRDFXMLSerializer.cpp b/rdf/base/src/nsRDFXMLSerializer.cpp index 4b3c392a2c4..4982c3b4031 100644 --- a/rdf/base/src/nsRDFXMLSerializer.cpp +++ b/rdf/base/src/nsRDFXMLSerializer.cpp @@ -113,7 +113,7 @@ nsRDFXMLSerializer::~nsRDFXMLSerializer() } } -NS_IMPL_ISUPPORTS2(nsRDFXMLSerializer, nsIRDFXMLSerializer, nsIRDFXMLSource) +NS_IMPL_ISUPPORTS(nsRDFXMLSerializer, nsIRDFXMLSerializer, nsIRDFXMLSource) NS_IMETHODIMP nsRDFXMLSerializer::Init(nsIRDFDataSource* aDataSource) @@ -1016,7 +1016,7 @@ private: nsRDFXMLSerializer* mParent; }; -NS_IMPL_ISUPPORTS1(QNameCollector, rdfITripleVisitor) +NS_IMPL_ISUPPORTS(QNameCollector, rdfITripleVisitor) nsresult QNameCollector::Visit(nsIRDFNode* aSubject, nsIRDFResource* aPredicate, nsIRDFNode* aObject, bool aTruthValue) diff --git a/rdf/base/src/rdfTriplesSerializer.cpp b/rdf/base/src/rdfTriplesSerializer.cpp index 351fafd6cd8..43a1d8e5e7a 100644 --- a/rdf/base/src/rdfTriplesSerializer.cpp +++ b/rdf/base/src/rdfTriplesSerializer.cpp @@ -32,7 +32,7 @@ protected: nsIOutputStream* mOut; }; -NS_IMPL_ISUPPORTS1(TriplesVisitor, rdfITripleVisitor) +NS_IMPL_ISUPPORTS(TriplesVisitor, rdfITripleVisitor) nsresult TriplesVisitor::writeResource(nsIRDFResource *aResource) @@ -124,7 +124,7 @@ NS_NewTriplesSerializer(rdfISerializer** aResult) return NS_OK; } -NS_IMPL_ISUPPORTS1(rdfTriplesSerializer, rdfISerializer) +NS_IMPL_ISUPPORTS(rdfTriplesSerializer, rdfISerializer) rdfTriplesSerializer::rdfTriplesSerializer() { diff --git a/rdf/datasource/src/nsFileSystemDataSource.cpp b/rdf/datasource/src/nsFileSystemDataSource.cpp index 46e2b81cc1e..4ccca1d6009 100644 --- a/rdf/datasource/src/nsFileSystemDataSource.cpp +++ b/rdf/datasource/src/nsFileSystemDataSource.cpp @@ -208,7 +208,7 @@ FileSystemDataSource::Create(nsISupports* aOuter, const nsIID& aIID, void **aRes return self->QueryInterface(aIID, aResult); } -NS_IMPL_ISUPPORTS1(FileSystemDataSource, nsIRDFDataSource) +NS_IMPL_ISUPPORTS(FileSystemDataSource, nsIRDFDataSource) NS_IMETHODIMP FileSystemDataSource::GetURI(char **uri) diff --git a/rdf/tests/rdfcat/rdfcat.cpp b/rdf/tests/rdfcat/rdfcat.cpp index e5e16c4bddc..e1dbcb0ceec 100644 --- a/rdf/tests/rdfcat/rdfcat.cpp +++ b/rdf/tests/rdfcat/rdfcat.cpp @@ -98,7 +98,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(ConsoleOutputStreamImpl, nsIOutputStream) +NS_IMPL_ISUPPORTS(ConsoleOutputStreamImpl, nsIOutputStream) //////////////////////////////////////////////////////////////////////// diff --git a/rdf/tests/rdfpoll/rdfpoll.cpp b/rdf/tests/rdfpoll/rdfpoll.cpp index 68b9caa598e..bd1269aab64 100644 --- a/rdf/tests/rdfpoll/rdfpoll.cpp +++ b/rdf/tests/rdfpoll/rdfpoll.cpp @@ -70,7 +70,7 @@ Observer::Observer() { } -NS_IMPL_ISUPPORTS1(Observer, nsIRDFObserver) +NS_IMPL_ISUPPORTS(Observer, nsIRDFObserver) static nsresult rdf_WriteOp(const char* aOp, diff --git a/rdf/tests/triplescat/triplescat.cpp b/rdf/tests/triplescat/triplescat.cpp index ce5fe7cf3a1..b9533f67282 100644 --- a/rdf/tests/triplescat/triplescat.cpp +++ b/rdf/tests/triplescat/triplescat.cpp @@ -96,7 +96,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(ConsoleOutputStreamImpl, nsIOutputStream) +NS_IMPL_ISUPPORTS(ConsoleOutputStreamImpl, nsIOutputStream) //////////////////////////////////////////////////////////////////////// diff --git a/rdf/util/src/nsRDFResource.cpp b/rdf/util/src/nsRDFResource.cpp index 43121970d1b..008138bd67d 100644 --- a/rdf/util/src/nsRDFResource.cpp +++ b/rdf/util/src/nsRDFResource.cpp @@ -42,7 +42,7 @@ nsRDFResource::~nsRDFResource(void) NS_RELEASE(gRDFService); } -NS_IMPL_ISUPPORTS2(nsRDFResource, nsIRDFResource, nsIRDFNode) +NS_IMPL_ISUPPORTS(nsRDFResource, nsIRDFResource, nsIRDFNode) //////////////////////////////////////////////////////////////////////////////// // nsIRDFNode methods: diff --git a/security/manager/boot/src/nsEntropyCollector.cpp b/security/manager/boot/src/nsEntropyCollector.cpp index ade1e614fcb..ef53d8717ec 100644 --- a/security/manager/boot/src/nsEntropyCollector.cpp +++ b/security/manager/boot/src/nsEntropyCollector.cpp @@ -23,9 +23,9 @@ nsEntropyCollector::~nsEntropyCollector() { } -NS_IMPL_ISUPPORTS2(nsEntropyCollector, - nsIEntropyCollector, - nsIBufEntropyCollector) +NS_IMPL_ISUPPORTS(nsEntropyCollector, + nsIEntropyCollector, + nsIBufEntropyCollector) NS_IMETHODIMP nsEntropyCollector::RandomUpdate(void *new_entropy, int32_t bufLen) diff --git a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp index bd669a8f28b..6845c3a03f0 100644 --- a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp +++ b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp @@ -149,12 +149,12 @@ nsSecureBrowserUIImpl::~nsSecureBrowserUIImpl() } } -NS_IMPL_ISUPPORTS5(nsSecureBrowserUIImpl, - nsISecureBrowserUI, - nsIWebProgressListener, - nsIFormSubmitObserver, - nsISupportsWeakReference, - nsISSLStatusProvider) +NS_IMPL_ISUPPORTS(nsSecureBrowserUIImpl, + nsISecureBrowserUI, + nsIWebProgressListener, + nsIFormSubmitObserver, + nsISupportsWeakReference, + nsISSLStatusProvider) NS_IMETHODIMP nsSecureBrowserUIImpl::Init(nsIDOMWindow *aWindow) @@ -1614,7 +1614,7 @@ private: nsCOMPtr mWindow; }; -NS_IMPL_ISUPPORTS1(nsUIContext, nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(nsUIContext, nsIInterfaceRequestor) nsUIContext::nsUIContext(nsIDOMWindow *aWindow) : mWindow(aWindow) diff --git a/security/manager/boot/src/nsSecurityWarningDialogs.cpp b/security/manager/boot/src/nsSecurityWarningDialogs.cpp index 29ca482d158..110afc7b92d 100644 --- a/security/manager/boot/src/nsSecurityWarningDialogs.cpp +++ b/security/manager/boot/src/nsSecurityWarningDialogs.cpp @@ -19,7 +19,7 @@ #include "mozilla/Telemetry.h" #include "nsISecurityUITelemetry.h" -NS_IMPL_ISUPPORTS1(nsSecurityWarningDialogs, nsISecurityWarningDialogs) +NS_IMPL_ISUPPORTS(nsSecurityWarningDialogs, nsISecurityWarningDialogs) #define STRING_BUNDLE_URL "chrome://pipnss/locale/security.properties" diff --git a/security/manager/boot/src/nsSiteSecurityService.cpp b/security/manager/boot/src/nsSiteSecurityService.cpp index 409a30bb02c..87745af008d 100644 --- a/security/manager/boot/src/nsSiteSecurityService.cpp +++ b/security/manager/boot/src/nsSiteSecurityService.cpp @@ -80,9 +80,9 @@ nsSiteSecurityService::~nsSiteSecurityService() { } -NS_IMPL_ISUPPORTS2(nsSiteSecurityService, - nsIObserver, - nsISiteSecurityService) +NS_IMPL_ISUPPORTS(nsSiteSecurityService, + nsIObserver, + nsISiteSecurityService) nsresult nsSiteSecurityService::Init() diff --git a/security/manager/pki/src/nsASN1Tree.cpp b/security/manager/pki/src/nsASN1Tree.cpp index 54a543bd95c..2b838297aad 100644 --- a/security/manager/pki/src/nsASN1Tree.cpp +++ b/security/manager/pki/src/nsASN1Tree.cpp @@ -8,7 +8,7 @@ #include "nsIMutableArray.h" #include "nsArrayUtils.h" -NS_IMPL_ISUPPORTS2(nsNSSASN1Tree, nsIASN1Tree, nsITreeView) +NS_IMPL_ISUPPORTS(nsNSSASN1Tree, nsIASN1Tree, nsITreeView) nsNSSASN1Tree::nsNSSASN1Tree() :mTopNode(nullptr) diff --git a/security/manager/pki/src/nsFormSigningDialog.cpp b/security/manager/pki/src/nsFormSigningDialog.cpp index ac0e7e79181..ac5ab55978e 100644 --- a/security/manager/pki/src/nsFormSigningDialog.cpp +++ b/security/manager/pki/src/nsFormSigningDialog.cpp @@ -21,7 +21,7 @@ nsFormSigningDialog::~nsFormSigningDialog() { } -NS_IMPL_ISUPPORTS1(nsFormSigningDialog, nsIFormSigningDialog) +NS_IMPL_ISUPPORTS(nsFormSigningDialog, nsIFormSigningDialog) NS_IMETHODIMP nsFormSigningDialog::ConfirmSignText(nsIInterfaceRequestor *aContext, diff --git a/security/manager/pki/src/nsNSSDialogs.cpp b/security/manager/pki/src/nsNSSDialogs.cpp index 02fe41b2e71..b9bead12cf9 100644 --- a/security/manager/pki/src/nsNSSDialogs.cpp +++ b/security/manager/pki/src/nsNSSDialogs.cpp @@ -47,14 +47,14 @@ nsNSSDialogs::~nsNSSDialogs() { } -NS_IMPL_ISUPPORTS8(nsNSSDialogs, nsITokenPasswordDialogs, - nsICertificateDialogs, - nsIClientAuthDialogs, - nsICertPickDialogs, - nsITokenDialogs, - nsIDOMCryptoDialogs, - nsIGeneratingKeypairInfoDialogs, - nsISSLCertErrorDialog) +NS_IMPL_ISUPPORTS(nsNSSDialogs, nsITokenPasswordDialogs, + nsICertificateDialogs, + nsIClientAuthDialogs, + nsICertPickDialogs, + nsITokenDialogs, + nsIDOMCryptoDialogs, + nsIGeneratingKeypairInfoDialogs, + nsISSLCertErrorDialog) nsresult nsNSSDialogs::Init() diff --git a/security/manager/pki/src/nsPKIParamBlock.cpp b/security/manager/pki/src/nsPKIParamBlock.cpp index 35b87604534..3cc96b603f8 100644 --- a/security/manager/pki/src/nsPKIParamBlock.cpp +++ b/security/manager/pki/src/nsPKIParamBlock.cpp @@ -9,7 +9,7 @@ #include "nsIDialogParamBlock.h" #include "nsIMutableArray.h" -NS_IMPL_ISUPPORTS2(nsPKIParamBlock, nsIPKIParamBlock, nsIDialogParamBlock) +NS_IMPL_ISUPPORTS(nsPKIParamBlock, nsIPKIParamBlock, nsIDialogParamBlock) nsPKIParamBlock::nsPKIParamBlock() { diff --git a/security/manager/ssl/src/NSSErrorsService.cpp b/security/manager/ssl/src/NSSErrorsService.cpp index 11e91131b93..12fff0d09a5 100644 --- a/security/manager/ssl/src/NSSErrorsService.cpp +++ b/security/manager/ssl/src/NSSErrorsService.cpp @@ -15,7 +15,7 @@ namespace mozilla { namespace psm { -NS_IMPL_ISUPPORTS1(NSSErrorsService, nsINSSErrorsService) +NS_IMPL_ISUPPORTS(NSSErrorsService, nsINSSErrorsService) nsresult NSSErrorsService::Init() diff --git a/security/manager/ssl/src/PSMContentListener.cpp b/security/manager/ssl/src/PSMContentListener.cpp index cdc28ca0cda..af9f0daab79 100644 --- a/security/manager/ssl/src/PSMContentListener.cpp +++ b/security/manager/ssl/src/PSMContentListener.cpp @@ -69,7 +69,7 @@ PSMContentDownloader::~PSMContentDownloader() nsMemory::Free(mByteData); } -NS_IMPL_ISUPPORTS2(PSMContentDownloader, nsIStreamListener, nsIRequestObserver) +NS_IMPL_ISUPPORTS(PSMContentDownloader, nsIStreamListener, nsIRequestObserver) const int32_t kDefaultCertAllocLength = 2048; @@ -213,9 +213,9 @@ getPSMContentType(const char * aContentType) } // unnamed namespace -NS_IMPL_ISUPPORTS2(PSMContentListener, - nsIURIContentListener, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(PSMContentListener, + nsIURIContentListener, + nsISupportsWeakReference) PSMContentListener::PSMContentListener() { diff --git a/security/manager/ssl/src/SharedSSLState.cpp b/security/manager/ssl/src/SharedSSLState.cpp index 3ff2d684e73..fd2ede33c8f 100644 --- a/security/manager/ssl/src/SharedSSLState.cpp +++ b/security/manager/ssl/src/SharedSSLState.cpp @@ -118,7 +118,7 @@ SharedSSLState* gPublicState; SharedSSLState* gPrivateState; } // anonymous namespace -NS_IMPL_ISUPPORTS1(PrivateBrowsingObserver, nsIObserver) +NS_IMPL_ISUPPORTS(PrivateBrowsingObserver, nsIObserver) NS_IMETHODIMP PrivateBrowsingObserver::Observe(nsISupports *aSubject, diff --git a/security/manager/ssl/src/TransportSecurityInfo.cpp b/security/manager/ssl/src/TransportSecurityInfo.cpp index 2261e13f406..deb36a0c857 100644 --- a/security/manager/ssl/src/TransportSecurityInfo.cpp +++ b/security/manager/ssl/src/TransportSecurityInfo.cpp @@ -62,13 +62,13 @@ TransportSecurityInfo::virtualDestroyNSSReference() { } -NS_IMPL_ISUPPORTS6(TransportSecurityInfo, - nsITransportSecurityInfo, - nsIInterfaceRequestor, - nsISSLStatusProvider, - nsIAssociatedContentSecurity, - nsISerializable, - nsIClassInfo) +NS_IMPL_ISUPPORTS(TransportSecurityInfo, + nsITransportSecurityInfo, + nsIInterfaceRequestor, + nsISSLStatusProvider, + nsIAssociatedContentSecurity, + nsISerializable, + nsIClassInfo) nsresult TransportSecurityInfo::SetHostName(const char* host) diff --git a/security/manager/ssl/src/nsCMS.cpp b/security/manager/ssl/src/nsCMS.cpp index 7ce78034a04..70a3c49dc32 100644 --- a/security/manager/ssl/src/nsCMS.cpp +++ b/security/manager/ssl/src/nsCMS.cpp @@ -28,7 +28,7 @@ extern PRLogModuleInfo* gPIPNSSLog; using namespace mozilla; -NS_IMPL_ISUPPORTS2(nsCMSMessage, nsICMSMessage, nsICMSMessage2) +NS_IMPL_ISUPPORTS(nsCMSMessage, nsICMSMessage, nsICMSMessage2) nsCMSMessage::nsCMSMessage() { @@ -718,7 +718,7 @@ loser: return rv; } -NS_IMPL_ISUPPORTS1(nsCMSDecoder, nsICMSDecoder) +NS_IMPL_ISUPPORTS(nsCMSDecoder, nsICMSDecoder) nsCMSDecoder::nsCMSDecoder() : m_dcx(nullptr) @@ -801,7 +801,7 @@ NS_IMETHODIMP nsCMSDecoder::Finish(nsICMSMessage ** aCMSMsg) return NS_OK; } -NS_IMPL_ISUPPORTS1(nsCMSEncoder, nsICMSEncoder) +NS_IMPL_ISUPPORTS(nsCMSEncoder, nsICMSEncoder) nsCMSEncoder::nsCMSEncoder() : m_ecx(nullptr) diff --git a/security/manager/ssl/src/nsCMSSecureMessage.cpp b/security/manager/ssl/src/nsCMSSecureMessage.cpp index 1155ca79140..ea38bc21f90 100644 --- a/security/manager/ssl/src/nsCMSSecureMessage.cpp +++ b/security/manager/ssl/src/nsCMSSecureMessage.cpp @@ -38,7 +38,7 @@ extern PRLogModuleInfo* gPIPNSSLog; *****/ // Standard ISupports implementation -NS_IMPL_ISUPPORTS1(nsCMSSecureMessage, nsICMSSecureMessage) +NS_IMPL_ISUPPORTS(nsCMSSecureMessage, nsICMSSecureMessage) // nsCMSSecureMessage constructor nsCMSSecureMessage::nsCMSSecureMessage() diff --git a/security/manager/ssl/src/nsCertOverrideService.cpp b/security/manager/ssl/src/nsCertOverrideService.cpp index d3c1f1d5fdc..eafd503a501 100644 --- a/security/manager/ssl/src/nsCertOverrideService.cpp +++ b/security/manager/ssl/src/nsCertOverrideService.cpp @@ -84,10 +84,10 @@ nsCertOverride::convertStringToBits(const nsACString &str, OverrideBits &ob) } } -NS_IMPL_ISUPPORTS3(nsCertOverrideService, - nsICertOverrideService, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsCertOverrideService, + nsICertOverrideService, + nsIObserver, + nsISupportsWeakReference) nsCertOverrideService::nsCertOverrideService() : monitor("nsCertOverrideService.monitor") diff --git a/security/manager/ssl/src/nsCertPicker.cpp b/security/manager/ssl/src/nsCertPicker.cpp index 156416b7e96..dc7f61da4b3 100644 --- a/security/manager/ssl/src/nsCertPicker.cpp +++ b/security/manager/ssl/src/nsCertPicker.cpp @@ -21,7 +21,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS1(nsCertPicker, nsIUserCertPicker) +NS_IMPL_ISUPPORTS(nsCertPicker, nsIUserCertPicker) nsCertPicker::nsCertPicker() { diff --git a/security/manager/ssl/src/nsCertTree.cpp b/security/manager/ssl/src/nsCertTree.cpp index 3d4d0a9a5c7..baf7433399a 100644 --- a/security/manager/ssl/src/nsCertTree.cpp +++ b/security/manager/ssl/src/nsCertTree.cpp @@ -103,7 +103,7 @@ static const PLDHashTableOps gMapOps = { }; NS_IMPL_ISUPPORTS0(nsCertAddonInfo) -NS_IMPL_ISUPPORTS1(nsCertTreeDispInfo, nsICertTreeItem) +NS_IMPL_ISUPPORTS(nsCertTreeDispInfo, nsICertTreeItem) nsCertTreeDispInfo::nsCertTreeDispInfo() :mAddonInfo(nullptr) @@ -158,7 +158,7 @@ nsCertTreeDispInfo::GetHostPort(nsAString &aHostPort) return NS_OK; } -NS_IMPL_ISUPPORTS2(nsCertTree, nsICertTree, nsITreeView) +NS_IMPL_ISUPPORTS(nsCertTree, nsICertTree, nsITreeView) nsCertTree::nsCertTree() : mTreeArray(nullptr) { diff --git a/security/manager/ssl/src/nsCertVerificationThread.cpp b/security/manager/ssl/src/nsCertVerificationThread.cpp index b2bbf99ef3e..a3a5c11c88c 100644 --- a/security/manager/ssl/src/nsCertVerificationThread.cpp +++ b/security/manager/ssl/src/nsCertVerificationThread.cpp @@ -10,7 +10,7 @@ using namespace mozilla; nsCertVerificationThread *nsCertVerificationThread::verification_thread_singleton; -NS_IMPL_ISUPPORTS1(nsCertVerificationResult, nsICertVerificationResult) +NS_IMPL_ISUPPORTS(nsCertVerificationResult, nsICertVerificationResult) namespace { class DispatchCertVerificationResult : public nsRunnable diff --git a/security/manager/ssl/src/nsCertificatePrincipal.cpp b/security/manager/ssl/src/nsCertificatePrincipal.cpp index 7080a636d35..0566d06228c 100644 --- a/security/manager/ssl/src/nsCertificatePrincipal.cpp +++ b/security/manager/ssl/src/nsCertificatePrincipal.cpp @@ -5,7 +5,7 @@ #include "nsCertificatePrincipal.h" -NS_IMPL_ISUPPORTS1(nsCertificatePrincipal, nsICertificatePrincipal) +NS_IMPL_ISUPPORTS(nsCertificatePrincipal, nsICertificatePrincipal) NS_IMETHODIMP nsCertificatePrincipal::GetFingerprint(nsACString& aFingerprint) diff --git a/security/manager/ssl/src/nsClientAuthRemember.cpp b/security/manager/ssl/src/nsClientAuthRemember.cpp index cb8e3b3db86..1f46fa00ceb 100644 --- a/security/manager/ssl/src/nsClientAuthRemember.cpp +++ b/security/manager/ssl/src/nsClientAuthRemember.cpp @@ -27,9 +27,9 @@ using namespace mozilla; using namespace mozilla::psm; -NS_IMPL_ISUPPORTS2(nsClientAuthRememberService, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsClientAuthRememberService, + nsIObserver, + nsISupportsWeakReference) nsClientAuthRememberService::nsClientAuthRememberService() : monitor("nsClientAuthRememberService.monitor") diff --git a/security/manager/ssl/src/nsCrypto.cpp b/security/manager/ssl/src/nsCrypto.cpp index d947cdc9ca9..b025a394bf7 100644 --- a/security/manager/ssl/src/nsCrypto.cpp +++ b/security/manager/ssl/src/nsCrypto.cpp @@ -232,10 +232,10 @@ NS_IMPL_RELEASE(nsPkcs11) #ifndef MOZ_DISABLE_CRYPTOLEGACY // ISupports implementation for nsCryptoRunnable -NS_IMPL_ISUPPORTS1(nsCryptoRunnable, nsIRunnable) +NS_IMPL_ISUPPORTS(nsCryptoRunnable, nsIRunnable) // ISupports implementation for nsP12Runnable -NS_IMPL_ISUPPORTS1(nsP12Runnable, nsIRunnable) +NS_IMPL_ISUPPORTS(nsP12Runnable, nsIRunnable) // ISupports implementation for nsCryptoRunArgs NS_IMPL_ISUPPORTS0(nsCryptoRunArgs) diff --git a/security/manager/ssl/src/nsCryptoHash.cpp b/security/manager/ssl/src/nsCryptoHash.cpp index b8e000b932c..b7a7124c777 100644 --- a/security/manager/ssl/src/nsCryptoHash.cpp +++ b/security/manager/ssl/src/nsCryptoHash.cpp @@ -55,7 +55,7 @@ void nsCryptoHash::destructorSafeDestroyNSSReference() mHashContext = nullptr; } -NS_IMPL_ISUPPORTS1(nsCryptoHash, nsICryptoHash) +NS_IMPL_ISUPPORTS(nsCryptoHash, nsICryptoHash) NS_IMETHODIMP nsCryptoHash::Init(uint32_t algorithm) @@ -208,7 +208,7 @@ nsCryptoHash::Finish(bool ascii, nsACString & _retval) // Implementing nsICryptoHMAC //--------------------------------------------- -NS_IMPL_ISUPPORTS1(nsCryptoHMAC, nsICryptoHMAC) +NS_IMPL_ISUPPORTS(nsCryptoHMAC, nsICryptoHMAC) nsCryptoHMAC::nsCryptoHMAC() { diff --git a/security/manager/ssl/src/nsDataSignatureVerifier.cpp b/security/manager/ssl/src/nsDataSignatureVerifier.cpp index ed63206b10a..5215de24be9 100644 --- a/security/manager/ssl/src/nsDataSignatureVerifier.cpp +++ b/security/manager/ssl/src/nsDataSignatureVerifier.cpp @@ -14,7 +14,7 @@ SEC_ASN1_MKSUB(SECOID_AlgorithmIDTemplate) -NS_IMPL_ISUPPORTS1(nsDataSignatureVerifier, nsIDataSignatureVerifier) +NS_IMPL_ISUPPORTS(nsDataSignatureVerifier, nsIDataSignatureVerifier) const SEC_ASN1Template CERT_SignatureDataTemplate[] = { diff --git a/security/manager/ssl/src/nsKeyModule.cpp b/security/manager/ssl/src/nsKeyModule.cpp index 48c350e3514..43b1a2c5c94 100644 --- a/security/manager/ssl/src/nsKeyModule.cpp +++ b/security/manager/ssl/src/nsKeyModule.cpp @@ -11,7 +11,7 @@ using namespace mozilla; using namespace mozilla::psm; -NS_IMPL_ISUPPORTS1(nsKeyObject, nsIKeyObject) +NS_IMPL_ISUPPORTS(nsKeyObject, nsIKeyObject) nsKeyObject::nsKeyObject() : mKeyType(0), mSymKey(nullptr), mPrivateKey(nullptr), @@ -124,7 +124,7 @@ nsKeyObject::GetType(int16_t *_retval) ////////////////////////////////////////////////////////////////////////////// // nsIKeyObjectFactory -NS_IMPL_ISUPPORTS1(nsKeyObjectFactory, nsIKeyObjectFactory) +NS_IMPL_ISUPPORTS(nsKeyObjectFactory, nsIKeyObjectFactory) nsKeyObjectFactory::nsKeyObjectFactory() { diff --git a/security/manager/ssl/src/nsKeygenHandler.cpp b/security/manager/ssl/src/nsKeygenHandler.cpp index e93deab0e0e..cc94e72bf3e 100644 --- a/security/manager/ssl/src/nsKeygenHandler.cpp +++ b/security/manager/ssl/src/nsKeygenHandler.cpp @@ -256,7 +256,7 @@ decode_ec_params(const char *curve) return ecparams; } -NS_IMPL_ISUPPORTS1(nsKeygenFormProcessor, nsIFormProcessor) +NS_IMPL_ISUPPORTS(nsKeygenFormProcessor, nsIFormProcessor) nsKeygenFormProcessor::nsKeygenFormProcessor() { diff --git a/security/manager/ssl/src/nsKeygenThread.cpp b/security/manager/ssl/src/nsKeygenThread.cpp index 8d1c341573e..b295c4f3689 100644 --- a/security/manager/ssl/src/nsKeygenThread.cpp +++ b/security/manager/ssl/src/nsKeygenThread.cpp @@ -16,7 +16,7 @@ using namespace mozilla; using namespace mozilla::psm; -NS_IMPL_ISUPPORTS1(nsKeygenThread, nsIKeygenThread) +NS_IMPL_ISUPPORTS(nsKeygenThread, nsIKeygenThread) nsKeygenThread::nsKeygenThread() diff --git a/security/manager/ssl/src/nsNSSASN1Object.cpp b/security/manager/ssl/src/nsNSSASN1Object.cpp index 7ab68e4897f..2f10dbe499b 100644 --- a/security/manager/ssl/src/nsNSSASN1Object.cpp +++ b/security/manager/ssl/src/nsNSSASN1Object.cpp @@ -9,8 +9,8 @@ #include "nsArrayUtils.h" #include "nsXPCOMCID.h" -NS_IMPL_ISUPPORTS2(nsNSSASN1Sequence, nsIASN1Sequence, nsIASN1Object) -NS_IMPL_ISUPPORTS2(nsNSSASN1PrintableItem, nsIASN1PrintableItem, nsIASN1Object) +NS_IMPL_ISUPPORTS(nsNSSASN1Sequence, nsIASN1Sequence, nsIASN1Object) +NS_IMPL_ISUPPORTS(nsNSSASN1PrintableItem, nsIASN1PrintableItem, nsIASN1Object) // This function is used to interpret an integer that // was encoded in a DER buffer. This function is used diff --git a/security/manager/ssl/src/nsNSSCallbacks.cpp b/security/manager/ssl/src/nsNSSCallbacks.cpp index 31e30564268..a389b38083b 100644 --- a/security/manager/ssl/src/nsNSSCallbacks.cpp +++ b/security/manager/ssl/src/nsNSSCallbacks.cpp @@ -620,7 +620,7 @@ nsHTTPListener::~nsHTTPListener() } } -NS_IMPL_ISUPPORTS1(nsHTTPListener, nsIStreamLoaderObserver) +NS_IMPL_ISUPPORTS(nsHTTPListener, nsIStreamLoaderObserver) void nsHTTPListener::FreeLoadGroup(bool aCancelLoad) diff --git a/security/manager/ssl/src/nsNSSCertCache.cpp b/security/manager/ssl/src/nsNSSCertCache.cpp index c4ec7b1599f..62deda751cf 100644 --- a/security/manager/ssl/src/nsNSSCertCache.cpp +++ b/security/manager/ssl/src/nsNSSCertCache.cpp @@ -11,7 +11,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS1(nsNSSCertCache, nsINSSCertCache) +NS_IMPL_ISUPPORTS(nsNSSCertCache, nsINSSCertCache) nsNSSCertCache::nsNSSCertCache() :mutex("nsNSSCertCache.mutex"), mCertList(nullptr) diff --git a/security/manager/ssl/src/nsNSSCertValidity.cpp b/security/manager/ssl/src/nsNSSCertValidity.cpp index 459565852ab..2d9bbc6a9c9 100644 --- a/security/manager/ssl/src/nsNSSCertValidity.cpp +++ b/security/manager/ssl/src/nsNSSCertValidity.cpp @@ -12,7 +12,7 @@ #include "cert.h" /* Implementation file */ -NS_IMPL_ISUPPORTS1(nsX509CertValidity, nsIX509CertValidity) +NS_IMPL_ISUPPORTS(nsX509CertValidity, nsIX509CertValidity) nsX509CertValidity::nsX509CertValidity() : mTimesInitialized(false) { diff --git a/security/manager/ssl/src/nsNSSCertificate.cpp b/security/manager/ssl/src/nsNSSCertificate.cpp index 76a60420638..976691d43b7 100644 --- a/security/manager/ssl/src/nsNSSCertificate.cpp +++ b/security/manager/ssl/src/nsNSSCertificate.cpp @@ -67,14 +67,14 @@ NSSCleanupAutoPtrClass_WithParam(PLArenaPool, PORT_FreeArena, FalseParam, false) // in the list to mean not yet initialized. #define CERT_TYPE_NOT_YET_INITIALIZED (1 << 30) -NS_IMPL_ISUPPORTS7(nsNSSCertificate, - nsIX509Cert, - nsIX509Cert2, - nsIX509Cert3, - nsIIdentityInfo, - nsISMimeCert, - nsISerializable, - nsIClassInfo) +NS_IMPL_ISUPPORTS(nsNSSCertificate, + nsIX509Cert, + nsIX509Cert2, + nsIX509Cert3, + nsIIdentityInfo, + nsISMimeCert, + nsISerializable, + nsIClassInfo) /*static*/ nsNSSCertificate* nsNSSCertificate::Create(CERTCertificate* cert, SECOidTag* evOidPolicy) @@ -1566,7 +1566,7 @@ nsNSSCertificate::GetValidEVPolicyOid(nsACString& outDottedOid) return NS_OK; } -NS_IMPL_ISUPPORTS1(nsNSSCertList, nsIX509CertList) +NS_IMPL_ISUPPORTS(nsNSSCertList, nsIX509CertList) nsNSSCertList::nsNSSCertList(mozilla::pkix::ScopedCERTCertList& certList, const nsNSSShutDownPreventionLock& proofOfLock) @@ -1706,7 +1706,7 @@ nsNSSCertList::GetEnumerator(nsISimpleEnumerator** _retval) return NS_OK; } -NS_IMPL_ISUPPORTS1(nsNSSCertListEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsNSSCertListEnumerator, nsISimpleEnumerator) nsNSSCertListEnumerator::nsNSSCertListEnumerator( CERTCertList* certList, const nsNSSShutDownPreventionLock& proofOfLock) diff --git a/security/manager/ssl/src/nsNSSCertificateDB.cpp b/security/manager/ssl/src/nsNSSCertificateDB.cpp index eaea2c5ec51..40b03c1d673 100644 --- a/security/manager/ssl/src/nsNSSCertificateDB.cpp +++ b/security/manager/ssl/src/nsNSSCertificateDB.cpp @@ -83,7 +83,7 @@ attemptToLogInWithDefaultPassword() return NS_OK; } -NS_IMPL_ISUPPORTS2(nsNSSCertificateDB, nsIX509CertDB, nsIX509CertDB2) +NS_IMPL_ISUPPORTS(nsNSSCertificateDB, nsIX509CertDB, nsIX509CertDB2) nsNSSCertificateDB::nsNSSCertificateDB() : mBadCertsLock("nsNSSCertificateDB::mBadCertsLock") diff --git a/security/manager/ssl/src/nsNSSCertificateFakeTransport.cpp b/security/manager/ssl/src/nsNSSCertificateFakeTransport.cpp index 88ca1e34710..4179ded9ac1 100644 --- a/security/manager/ssl/src/nsNSSCertificateFakeTransport.cpp +++ b/security/manager/ssl/src/nsNSSCertificateFakeTransport.cpp @@ -20,10 +20,10 @@ extern PRLogModuleInfo* gPIPNSSLog; /* nsNSSCertificateFakeTransport */ -NS_IMPL_ISUPPORTS3(nsNSSCertificateFakeTransport, - nsIX509Cert, - nsISerializable, - nsIClassInfo) +NS_IMPL_ISUPPORTS(nsNSSCertificateFakeTransport, + nsIX509Cert, + nsISerializable, + nsIClassInfo) nsNSSCertificateFakeTransport::nsNSSCertificateFakeTransport() : mCertSerialization(nullptr) diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp index fc53f5bf5c8..97dc8eb9a5c 100644 --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp @@ -98,7 +98,7 @@ private: }; // ISuuports implementation for nsTokenEventRunnable -NS_IMPL_ISUPPORTS1(nsTokenEventRunnable, nsIRunnable) +NS_IMPL_ISUPPORTS(nsTokenEventRunnable, nsIRunnable) nsTokenEventRunnable::nsTokenEventRunnable(const nsAString& aType, const nsAString& aTokenName) @@ -875,7 +875,7 @@ private: CipherSuiteChangeObserver() {} }; -NS_IMPL_ISUPPORTS1(CipherSuiteChangeObserver, nsIObserver) +NS_IMPL_ISUPPORTS(CipherSuiteChangeObserver, nsIObserver) // static StaticRefPtr CipherSuiteChangeObserver::sObserver; @@ -1365,12 +1365,12 @@ nsNSSComponent::Init() } // nsISupports Implementation for the class -NS_IMPL_ISUPPORTS5(nsNSSComponent, - nsISignatureVerifier, - nsIEntropyCollector, - nsINSSComponent, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsNSSComponent, + nsISignatureVerifier, + nsIEntropyCollector, + nsINSSComponent, + nsIObserver, + nsISupportsWeakReference) // Callback functions for decoder. For now, use empty/default functions. @@ -1859,7 +1859,7 @@ GetDefaultCertVerifier() } } // namespace mozilla::psm -NS_IMPL_ISUPPORTS1(PipUIContext, nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(PipUIContext, nsIInterfaceRequestor) PipUIContext::PipUIContext() { diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp index b6a099abe4b..43bb013de9e 100644 --- a/security/manager/ssl/src/nsNSSIOLayer.cpp +++ b/security/manager/ssl/src/nsNSSIOLayer.cpp @@ -142,9 +142,9 @@ nsNSSSocketInfo::nsNSSSocketInfo(SharedSSLState& aState, uint32_t providerFlags) mTLSVersionRange.max = 0; } -NS_IMPL_ISUPPORTS_INHERITED2(nsNSSSocketInfo, TransportSecurityInfo, - nsISSLSocketControl, - nsIClientAuthUserDecision) +NS_IMPL_ISUPPORTS_INHERITED(nsNSSSocketInfo, TransportSecurityInfo, + nsISSLSocketControl, + nsIClientAuthUserDecision) NS_IMETHODIMP nsNSSSocketInfo::GetProviderFlags(uint32_t* aProviderFlags) @@ -1374,7 +1374,7 @@ private: } // unnamed namespace -NS_IMPL_ISUPPORTS1(PrefObserver, nsIObserver) +NS_IMPL_ISUPPORTS(PrefObserver, nsIObserver) NS_IMETHODIMP PrefObserver::Observe(nsISupports* aSubject, const char* aTopic, diff --git a/security/manager/ssl/src/nsNSSVersion.cpp b/security/manager/ssl/src/nsNSSVersion.cpp index 6f891676a17..854f7fb57bf 100644 --- a/security/manager/ssl/src/nsNSSVersion.cpp +++ b/security/manager/ssl/src/nsNSSVersion.cpp @@ -11,7 +11,7 @@ #include "ssl.h" #include "smime.h" -NS_IMPL_ISUPPORTS1(nsNSSVersion, nsINSSVersion) +NS_IMPL_ISUPPORTS(nsNSSVersion, nsINSSVersion) nsNSSVersion::nsNSSVersion() { diff --git a/security/manager/ssl/src/nsNTLMAuthModule.cpp b/security/manager/ssl/src/nsNTLMAuthModule.cpp index ecce635e3a5..7f237d6b149 100644 --- a/security/manager/ssl/src/nsNTLMAuthModule.cpp +++ b/security/manager/ssl/src/nsNTLMAuthModule.cpp @@ -747,7 +747,7 @@ GenerateType3Msg(const nsString &domain, //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsNTLMAuthModule, nsIAuthModule) +NS_IMPL_ISUPPORTS(nsNTLMAuthModule, nsIAuthModule) nsNTLMAuthModule::~nsNTLMAuthModule() { diff --git a/security/manager/ssl/src/nsPK11TokenDB.cpp b/security/manager/ssl/src/nsPK11TokenDB.cpp index 8b3882c8849..176e8233f33 100644 --- a/security/manager/ssl/src/nsPK11TokenDB.cpp +++ b/security/manager/ssl/src/nsPK11TokenDB.cpp @@ -18,7 +18,7 @@ extern PRLogModuleInfo* gPIPNSSLog; #endif -NS_IMPL_ISUPPORTS1(nsPK11Token, nsIPK11Token) +NS_IMPL_ISUPPORTS(nsPK11Token, nsIPK11Token) nsPK11Token::nsPK11Token(PK11SlotInfo *slot) { @@ -422,7 +422,7 @@ NS_IMETHODIMP nsPK11Token::IsFriendly(bool *_retval) /*=========================================================*/ -NS_IMPL_ISUPPORTS1(nsPK11TokenDB, nsIPK11TokenDB) +NS_IMPL_ISUPPORTS(nsPK11TokenDB, nsIPK11TokenDB) nsPK11TokenDB::nsPK11TokenDB() { diff --git a/security/manager/ssl/src/nsPKCS11Slot.cpp b/security/manager/ssl/src/nsPKCS11Slot.cpp index ae70ce34f0f..e4a807df990 100644 --- a/security/manager/ssl/src/nsPKCS11Slot.cpp +++ b/security/manager/ssl/src/nsPKCS11Slot.cpp @@ -17,7 +17,7 @@ extern PRLogModuleInfo* gPIPNSSLog; #endif -NS_IMPL_ISUPPORTS1(nsPKCS11Slot, nsIPKCS11Slot) +NS_IMPL_ISUPPORTS(nsPKCS11Slot, nsIPKCS11Slot) nsPKCS11Slot::nsPKCS11Slot(PK11SlotInfo *slot) { @@ -223,7 +223,7 @@ nsPKCS11Slot::GetStatus(uint32_t *_retval) return NS_OK; } -NS_IMPL_ISUPPORTS1(nsPKCS11Module, nsIPKCS11Module) +NS_IMPL_ISUPPORTS(nsPKCS11Module, nsIPKCS11Module) nsPKCS11Module::nsPKCS11Module(SECMODModule *module) { @@ -363,7 +363,7 @@ nsPKCS11Module::ListSlots(nsIEnumerator **_retval) return rv; } -NS_IMPL_ISUPPORTS2(nsPKCS11ModuleDB, nsIPKCS11ModuleDB, nsICryptoFIPSInfo) +NS_IMPL_ISUPPORTS(nsPKCS11ModuleDB, nsIPKCS11ModuleDB, nsICryptoFIPSInfo) nsPKCS11ModuleDB::nsPKCS11ModuleDB() { diff --git a/security/manager/ssl/src/nsProtectedAuthThread.cpp b/security/manager/ssl/src/nsProtectedAuthThread.cpp index e7abec8a3d9..ad841b81f9f 100644 --- a/security/manager/ssl/src/nsProtectedAuthThread.cpp +++ b/security/manager/ssl/src/nsProtectedAuthThread.cpp @@ -15,7 +15,7 @@ using namespace mozilla; using namespace mozilla::psm; -NS_IMPL_ISUPPORTS1(nsProtectedAuthThread, nsIProtectedAuthThread) +NS_IMPL_ISUPPORTS(nsProtectedAuthThread, nsIProtectedAuthThread) static void nsProtectedAuthThreadRunner(void *arg) { diff --git a/security/manager/ssl/src/nsRandomGenerator.cpp b/security/manager/ssl/src/nsRandomGenerator.cpp index 2d4547c6fec..546d8f6557a 100644 --- a/security/manager/ssl/src/nsRandomGenerator.cpp +++ b/security/manager/ssl/src/nsRandomGenerator.cpp @@ -11,7 +11,7 @@ //////////////////////////////////////////////////////////////////////////////// //// nsRandomGenerator -NS_IMPL_ISUPPORTS1(nsRandomGenerator, nsIRandomGenerator) +NS_IMPL_ISUPPORTS(nsRandomGenerator, nsIRandomGenerator) //////////////////////////////////////////////////////////////////////////////// //// nsIRandomGenerator diff --git a/security/manager/ssl/src/nsRecentBadCerts.cpp b/security/manager/ssl/src/nsRecentBadCerts.cpp index e747600940c..4420fceacdb 100644 --- a/security/manager/ssl/src/nsRecentBadCerts.cpp +++ b/security/manager/ssl/src/nsRecentBadCerts.cpp @@ -24,7 +24,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS1(nsRecentBadCerts, nsIRecentBadCerts) +NS_IMPL_ISUPPORTS(nsRecentBadCerts, nsIRecentBadCerts) nsRecentBadCerts::nsRecentBadCerts() :monitor("nsRecentBadCerts.monitor") diff --git a/security/manager/ssl/src/nsSDR.cpp b/security/manager/ssl/src/nsSDR.cpp index 8c4f5fd3ed0..767cbdd4c14 100644 --- a/security/manager/ssl/src/nsSDR.cpp +++ b/security/manager/ssl/src/nsSDR.cpp @@ -34,7 +34,7 @@ using namespace mozilla; // Standard ISupports implementation // NOTE: Should these be the thread-safe versions? -NS_IMPL_ISUPPORTS2(nsSecretDecoderRing, nsISecretDecoderRing, nsISecretDecoderRingConfig) +NS_IMPL_ISUPPORTS(nsSecretDecoderRing, nsISecretDecoderRing, nsISecretDecoderRingConfig) // nsSecretDecoderRing constructor nsSecretDecoderRing::nsSecretDecoderRing() diff --git a/security/manager/ssl/src/nsSSLSocketProvider.cpp b/security/manager/ssl/src/nsSSLSocketProvider.cpp index de9d8edc8eb..fd37f4c1c66 100644 --- a/security/manager/ssl/src/nsSSLSocketProvider.cpp +++ b/security/manager/ssl/src/nsSSLSocketProvider.cpp @@ -16,7 +16,7 @@ nsSSLSocketProvider::~nsSSLSocketProvider() { } -NS_IMPL_ISUPPORTS1(nsSSLSocketProvider, nsISocketProvider) +NS_IMPL_ISUPPORTS(nsSSLSocketProvider, nsISocketProvider) NS_IMETHODIMP nsSSLSocketProvider::NewSocket(int32_t family, diff --git a/security/manager/ssl/src/nsSSLStatus.cpp b/security/manager/ssl/src/nsSSLStatus.cpp index d3d194e5804..235d872fac4 100644 --- a/security/manager/ssl/src/nsSSLStatus.cpp +++ b/security/manager/ssl/src/nsSSLStatus.cpp @@ -257,7 +257,7 @@ nsSSLStatus::nsSSLStatus() mCipherName = ""; } -NS_IMPL_ISUPPORTS3(nsSSLStatus, nsISSLStatus, nsISerializable, nsIClassInfo) +NS_IMPL_ISUPPORTS(nsSSLStatus, nsISSLStatus, nsISerializable, nsIClassInfo) nsSSLStatus::~nsSSLStatus() { diff --git a/security/manager/ssl/src/nsStreamCipher.cpp b/security/manager/ssl/src/nsStreamCipher.cpp index f8263c1fa0e..232c82ea70a 100644 --- a/security/manager/ssl/src/nsStreamCipher.cpp +++ b/security/manager/ssl/src/nsStreamCipher.cpp @@ -7,7 +7,7 @@ #include "nsStreamUtils.h" #include "base64.h" -NS_IMPL_ISUPPORTS1(nsStreamCipher, nsIStreamCipher) +NS_IMPL_ISUPPORTS(nsStreamCipher, nsIStreamCipher) nsStreamCipher::nsStreamCipher() : mContext(nullptr) diff --git a/security/manager/ssl/src/nsTLSSocketProvider.cpp b/security/manager/ssl/src/nsTLSSocketProvider.cpp index 822051664e4..029b2c50cba 100644 --- a/security/manager/ssl/src/nsTLSSocketProvider.cpp +++ b/security/manager/ssl/src/nsTLSSocketProvider.cpp @@ -16,7 +16,7 @@ nsTLSSocketProvider::~nsTLSSocketProvider() { } -NS_IMPL_ISUPPORTS1(nsTLSSocketProvider, nsISocketProvider) +NS_IMPL_ISUPPORTS(nsTLSSocketProvider, nsISocketProvider) NS_IMETHODIMP nsTLSSocketProvider::NewSocket(int32_t family, diff --git a/services/crypto/component/nsSyncJPAKE.h b/services/crypto/component/nsSyncJPAKE.h index 9399c70ab08..892f9d5a484 100644 --- a/services/crypto/component/nsSyncJPAKE.h +++ b/services/crypto/component/nsSyncJPAKE.h @@ -26,6 +26,6 @@ private: PK11SymKey * key; }; -NS_IMPL_ISUPPORTS1(nsSyncJPAKE, nsISyncJPAKE) +NS_IMPL_ISUPPORTS(nsSyncJPAKE, nsISyncJPAKE) #endif // nsSyncJPAKE_h__ diff --git a/startupcache/StartupCache.cpp b/startupcache/StartupCache.cpp index a271ae76a74..0342666dcfc 100644 --- a/startupcache/StartupCache.cpp +++ b/startupcache/StartupCache.cpp @@ -127,7 +127,7 @@ bool StartupCache::gShutdownInitiated; bool StartupCache::gIgnoreDiskCache; enum StartupCache::TelemetrifyAge StartupCache::gPostFlushAgeAction = StartupCache::IGNORE_AGE; -NS_IMPL_ISUPPORTS1(StartupCache, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(StartupCache, nsIMemoryReporter) StartupCache::StartupCache() : mArchive(nullptr), mStartupWriteInitiated(false), mWriteThread(nullptr) @@ -578,7 +578,7 @@ StartupCache::WriteTimeout(nsITimer *aTimer, void *aClosure) // We don't want to refcount StartupCache, so we'll just // hold a ref to this and pass it to observerService instead. -NS_IMPL_ISUPPORTS1(StartupCacheListener, nsIObserver) +NS_IMPL_ISUPPORTS(StartupCacheListener, nsIObserver) nsresult StartupCacheListener::Observe(nsISupports *subject, const char* topic, const char16_t* data) @@ -638,8 +638,8 @@ StartupCache::RecordAgesAlways() // StartupCacheDebugOutputStream implementation #ifdef DEBUG -NS_IMPL_ISUPPORTS3(StartupCacheDebugOutputStream, nsIObjectOutputStream, - nsIBinaryOutputStream, nsIOutputStream) +NS_IMPL_ISUPPORTS(StartupCacheDebugOutputStream, nsIObjectOutputStream, + nsIBinaryOutputStream, nsIOutputStream) bool StartupCacheDebugOutputStream::CheckReferences(nsISupports* aObject) @@ -733,7 +733,7 @@ StartupCacheDebugOutputStream::PutBuffer(char* aBuffer, uint32_t aLength) StartupCacheWrapper* StartupCacheWrapper::gStartupCacheWrapper = nullptr; -NS_IMPL_ISUPPORTS1(StartupCacheWrapper, nsIStartupCache) +NS_IMPL_ISUPPORTS(StartupCacheWrapper, nsIStartupCache) StartupCacheWrapper* StartupCacheWrapper::GetSingleton() { diff --git a/storage/src/VacuumManager.cpp b/storage/src/VacuumManager.cpp index 4b7314bbe1b..2cbeb243e3c 100644 --- a/storage/src/VacuumManager.cpp +++ b/storage/src/VacuumManager.cpp @@ -96,7 +96,7 @@ BaseCallback::HandleCompletion(uint16_t aReason) return NS_OK; } -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( BaseCallback , mozIStorageStatementCallback ) @@ -307,7 +307,7 @@ Vacuumer::notifyCompletion(bool aSucceeded) //////////////////////////////////////////////////////////////////////////////// //// VacuumManager -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( VacuumManager , nsIObserver ) diff --git a/storage/src/Variant_inl.h b/storage/src/Variant_inl.h index 01b708fb0c8..2e0571ae2d8 100644 --- a/storage/src/Variant_inl.h +++ b/storage/src/Variant_inl.h @@ -20,7 +20,7 @@ namespace storage { inline NS_IMPL_ADDREF(Variant_base) inline NS_IMPL_RELEASE(Variant_base) -inline NS_IMPL_QUERY_INTERFACE1( +inline NS_IMPL_QUERY_INTERFACE( Variant_base, nsIVariant ) diff --git a/storage/src/mozStorageArgValueArray.cpp b/storage/src/mozStorageArgValueArray.cpp index 02dd7242855..019788512ea 100644 --- a/storage/src/mozStorageArgValueArray.cpp +++ b/storage/src/mozStorageArgValueArray.cpp @@ -24,7 +24,7 @@ ArgValueArray::ArgValueArray(int32_t aArgc, { } -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( ArgValueArray, mozIStorageValueArray ) diff --git a/storage/src/mozStorageAsyncStatement.cpp b/storage/src/mozStorageAsyncStatement.cpp index 3ffcfa18a02..d62b84cb8be 100644 --- a/storage/src/mozStorageAsyncStatement.cpp +++ b/storage/src/mozStorageAsyncStatement.cpp @@ -38,13 +38,11 @@ namespace storage { //////////////////////////////////////////////////////////////////////////////// //// nsIClassInfo -NS_IMPL_CI_INTERFACE_GETTER4( - AsyncStatement -, mozIStorageAsyncStatement -, mozIStorageBaseStatement -, mozIStorageBindingParams -, mozilla::storage::StorageBaseStatementInternal -) +NS_IMPL_CI_INTERFACE_GETTER(AsyncStatement, + mozIStorageAsyncStatement, + mozIStorageBaseStatement, + mozIStorageBindingParams, + mozilla::storage::StorageBaseStatementInternal) class AsyncStatementClassInfo : public nsIClassInfo { @@ -116,7 +114,7 @@ public: NS_IMETHODIMP_(MozExternalRefCountType) AsyncStatementClassInfo::AddRef() { return 2; } NS_IMETHODIMP_(MozExternalRefCountType) AsyncStatementClassInfo::Release() { return 1; } -NS_IMPL_QUERY_INTERFACE1(AsyncStatementClassInfo, nsIClassInfo) +NS_IMPL_QUERY_INTERFACE(AsyncStatementClassInfo, nsIClassInfo) static AsyncStatementClassInfo sAsyncStatementClassInfo; diff --git a/storage/src/mozStorageAsyncStatementExecution.cpp b/storage/src/mozStorageAsyncStatementExecution.cpp index 97338fb342f..f4c7660df67 100644 --- a/storage/src/mozStorageAsyncStatementExecution.cpp +++ b/storage/src/mozStorageAsyncStatementExecution.cpp @@ -519,7 +519,7 @@ AsyncExecuteStatements::notifyResults() return rv; } -NS_IMPL_ISUPPORTS2( +NS_IMPL_ISUPPORTS( AsyncExecuteStatements, nsIRunnable, mozIStoragePendingStatement diff --git a/storage/src/mozStorageAsyncStatementParams.cpp b/storage/src/mozStorageAsyncStatementParams.cpp index 9d70b4611ee..7e7f19a7b64 100644 --- a/storage/src/mozStorageAsyncStatementParams.cpp +++ b/storage/src/mozStorageAsyncStatementParams.cpp @@ -27,7 +27,7 @@ AsyncStatementParams::AsyncStatementParams(AsyncStatement *aStatement) NS_ASSERTION(mStatement != nullptr, "mStatement is null"); } -NS_IMPL_ISUPPORTS2( +NS_IMPL_ISUPPORTS( AsyncStatementParams , mozIStorageStatementParams , nsIXPCScriptable diff --git a/storage/src/mozStorageBindingParams.cpp b/storage/src/mozStorageBindingParams.cpp index dc18ea73bdb..15cccd31ff3 100644 --- a/storage/src/mozStorageBindingParams.cpp +++ b/storage/src/mozStorageBindingParams.cpp @@ -201,7 +201,7 @@ AsyncBindingParams::iterateOverNamedParameters(const nsACString &aName, //////////////////////////////////////////////////////////////////////////////// //// nsISupports -NS_IMPL_ISUPPORTS2( +NS_IMPL_ISUPPORTS( BindingParams , mozIStorageBindingParams , IStorageBindingParamsInternal diff --git a/storage/src/mozStorageBindingParamsArray.cpp b/storage/src/mozStorageBindingParamsArray.cpp index a543a754f30..fb7c9f14a2d 100644 --- a/storage/src/mozStorageBindingParamsArray.cpp +++ b/storage/src/mozStorageBindingParamsArray.cpp @@ -39,7 +39,7 @@ BindingParamsArray::getOwner() const return mOwningStatement; } -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( BindingParamsArray, mozIStorageBindingParamsArray ) diff --git a/storage/src/mozStorageError.cpp b/storage/src/mozStorageError.cpp index d8088851b87..1ddf253148e 100644 --- a/storage/src/mozStorageError.cpp +++ b/storage/src/mozStorageError.cpp @@ -23,7 +23,7 @@ Error::Error(int aResult, * Note: This object is only ever accessed on one thread at a time. It it not * threadsafe, but it does need threadsafe AddRef and Release. */ -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( Error, mozIStorageError ) diff --git a/storage/src/mozStorageResultSet.cpp b/storage/src/mozStorageResultSet.cpp index 67449519935..e4f3d1f3584 100644 --- a/storage/src/mozStorageResultSet.cpp +++ b/storage/src/mozStorageResultSet.cpp @@ -33,7 +33,7 @@ ResultSet::add(mozIStorageRow *aRow) * Note: This object is only ever accessed on one thread at a time. It it not * threadsafe, but it does need threadsafe AddRef and Release. */ -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( ResultSet, mozIStorageResultSet ) diff --git a/storage/src/mozStorageRow.cpp b/storage/src/mozStorageRow.cpp index c42bceef164..9f28151e097 100644 --- a/storage/src/mozStorageRow.cpp +++ b/storage/src/mozStorageRow.cpp @@ -75,7 +75,7 @@ Row::initialize(sqlite3_stmt *aStatement) * Note: This object is only ever accessed on one thread at a time. It it not * threadsafe, but it does need threadsafe AddRef and Release. */ -NS_IMPL_ISUPPORTS2( +NS_IMPL_ISUPPORTS( Row, mozIStorageRow, mozIStorageValueArray diff --git a/storage/src/mozStorageService.cpp b/storage/src/mozStorageService.cpp index 7e6fe37b65d..abb27f00363 100644 --- a/storage/src/mozStorageService.cpp +++ b/storage/src/mozStorageService.cpp @@ -197,7 +197,7 @@ Service::CollectReports(nsIHandleReportCallback *aHandleReport, //////////////////////////////////////////////////////////////////////////////// //// Service -NS_IMPL_ISUPPORTS3( +NS_IMPL_ISUPPORTS( Service, mozIStorageService, nsIObserver, diff --git a/storage/src/mozStorageStatement.cpp b/storage/src/mozStorageStatement.cpp index efd6e8657d5..87086b27a8e 100644 --- a/storage/src/mozStorageStatement.cpp +++ b/storage/src/mozStorageStatement.cpp @@ -39,14 +39,12 @@ namespace storage { //////////////////////////////////////////////////////////////////////////////// //// nsIClassInfo -NS_IMPL_CI_INTERFACE_GETTER5( - Statement, - mozIStorageStatement, - mozIStorageBaseStatement, - mozIStorageBindingParams, - mozIStorageValueArray, - mozilla::storage::StorageBaseStatementInternal -) +NS_IMPL_CI_INTERFACE_GETTER(Statement, + mozIStorageStatement, + mozIStorageBaseStatement, + mozIStorageBindingParams, + mozIStorageValueArray, + mozilla::storage::StorageBaseStatementInternal) class StatementClassInfo : public nsIClassInfo { @@ -118,7 +116,7 @@ public: NS_IMETHODIMP_(MozExternalRefCountType) StatementClassInfo::AddRef() { return 2; } NS_IMETHODIMP_(MozExternalRefCountType) StatementClassInfo::Release() { return 1; } -NS_IMPL_QUERY_INTERFACE1(StatementClassInfo, nsIClassInfo) +NS_IMPL_QUERY_INTERFACE(StatementClassInfo, nsIClassInfo) static StatementClassInfo sStatementClassInfo; diff --git a/storage/src/mozStorageStatementParams.cpp b/storage/src/mozStorageStatementParams.cpp index d763e4f392a..b82d544b840 100644 --- a/storage/src/mozStorageStatementParams.cpp +++ b/storage/src/mozStorageStatementParams.cpp @@ -26,7 +26,7 @@ StatementParams::StatementParams(mozIStorageStatement *aStatement) : (void)mStatement->GetParameterCount(&mParamCount); } -NS_IMPL_ISUPPORTS2( +NS_IMPL_ISUPPORTS( StatementParams, mozIStorageStatementParams, nsIXPCScriptable diff --git a/storage/src/mozStorageStatementRow.cpp b/storage/src/mozStorageStatementRow.cpp index c13c89de0b0..77433a4bfe8 100644 --- a/storage/src/mozStorageStatementRow.cpp +++ b/storage/src/mozStorageStatementRow.cpp @@ -23,7 +23,7 @@ StatementRow::StatementRow(Statement *aStatement) { } -NS_IMPL_ISUPPORTS2( +NS_IMPL_ISUPPORTS( StatementRow, mozIStorageStatementRow, nsIXPCScriptable diff --git a/storage/style.txt b/storage/style.txt index 6b89c9a9324..03652e6066e 100644 --- a/storage/style.txt +++ b/storage/style.txt @@ -108,7 +108,7 @@ public: * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -NS_IMPL_ISUPPORTS2( +NS_IMPL_ISUPPORTS( Foo , IBar , IBaz diff --git a/storage/test/storage_test_harness.h b/storage/test/storage_test_harness.h index ed654654b2e..dcfdfe7a9f6 100644 --- a/storage/test/storage_test_harness.h +++ b/storage/test/storage_test_harness.h @@ -131,9 +131,9 @@ protected: volatile bool mCompleted; }; -NS_IMPL_ISUPPORTS2(AsyncStatementSpinner, - mozIStorageStatementCallback, - mozIStorageCompletionCallback) +NS_IMPL_ISUPPORTS(AsyncStatementSpinner, + mozIStorageStatementCallback, + mozIStorageCompletionCallback) AsyncStatementSpinner::AsyncStatementSpinner() : completionReason(0) diff --git a/storage/test/test_async_callbacks_with_spun_event_loops.cpp b/storage/test/test_async_callbacks_with_spun_event_loops.cpp index 5d3eb415808..82602e8a2b4 100644 --- a/storage/test/test_async_callbacks_with_spun_event_loops.cpp +++ b/storage/test/test_async_callbacks_with_spun_event_loops.cpp @@ -87,7 +87,7 @@ protected: bool mCompleted; }; -NS_IMPL_ISUPPORTS1(UnownedCallback, mozIStorageStatementCallback) +NS_IMPL_ISUPPORTS(UnownedCallback, mozIStorageStatementCallback) bool UnownedCallback::sAlive = false; bool UnownedCallback::sResult = false; diff --git a/toolkit/components/alerts/nsAlertsService.cpp b/toolkit/components/alerts/nsAlertsService.cpp index b8868ec2d9f..ee32f063d73 100644 --- a/toolkit/components/alerts/nsAlertsService.cpp +++ b/toolkit/components/alerts/nsAlertsService.cpp @@ -26,7 +26,7 @@ using namespace mozilla; using mozilla::dom::ContentChild; -NS_IMPL_ISUPPORTS2(nsAlertsService, nsIAlertsService, nsIAlertsProgressListener) +NS_IMPL_ISUPPORTS(nsAlertsService, nsIAlertsService, nsIAlertsProgressListener) nsAlertsService::nsAlertsService() { diff --git a/toolkit/components/alerts/nsXULAlerts.cpp b/toolkit/components/alerts/nsXULAlerts.cpp index c48bb5dc09b..3d3b685ce05 100644 --- a/toolkit/components/alerts/nsXULAlerts.cpp +++ b/toolkit/components/alerts/nsXULAlerts.cpp @@ -17,7 +17,7 @@ using namespace mozilla; #define ALERT_CHROME_URL "chrome://global/content/alerts/alert.xul" -NS_IMPL_ISUPPORTS1(nsXULAlertObserver, nsIObserver) +NS_IMPL_ISUPPORTS(nsXULAlertObserver, nsIObserver) NS_IMETHODIMP nsXULAlertObserver::Observe(nsISupports* aSubject, const char* aTopic, diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.cpp b/toolkit/components/autocomplete/nsAutoCompleteController.cpp index 964c0dbf01d..1ec4eb828ab 100644 --- a/toolkit/components/autocomplete/nsAutoCompleteController.cpp +++ b/toolkit/components/autocomplete/nsAutoCompleteController.cpp @@ -37,8 +37,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsAutoCompleteController) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsAutoCompleteController) NS_INTERFACE_TABLE_HEAD(nsAutoCompleteController) - NS_INTERFACE_TABLE4(nsAutoCompleteController, nsIAutoCompleteController, - nsIAutoCompleteObserver, nsITimerCallback, nsITreeView) + NS_INTERFACE_TABLE(nsAutoCompleteController, nsIAutoCompleteController, + nsIAutoCompleteObserver, nsITimerCallback, nsITreeView) NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsAutoCompleteController) NS_INTERFACE_MAP_END diff --git a/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.cpp b/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.cpp index e0285214ab1..9c4c464eee6 100644 --- a/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.cpp +++ b/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.cpp @@ -4,9 +4,9 @@ #include "nsAutoCompleteSimpleResult.h" -NS_IMPL_ISUPPORTS2(nsAutoCompleteSimpleResult, - nsIAutoCompleteResult, - nsIAutoCompleteSimpleResult) +NS_IMPL_ISUPPORTS(nsAutoCompleteSimpleResult, + nsIAutoCompleteResult, + nsIAutoCompleteSimpleResult) nsAutoCompleteSimpleResult::nsAutoCompleteSimpleResult() : mDefaultIndex(-1), diff --git a/toolkit/components/commandlines/nsCommandLine.cpp b/toolkit/components/commandlines/nsCommandLine.cpp index 3b13d8b3da7..1a7649da1b5 100644 --- a/toolkit/components/commandlines/nsCommandLine.cpp +++ b/toolkit/components/commandlines/nsCommandLine.cpp @@ -83,9 +83,9 @@ nsCommandLine::nsCommandLine() : NS_IMPL_CLASSINFO(nsCommandLine, nullptr, 0, NS_COMMANDLINE_CID) -NS_IMPL_ISUPPORTS2_CI(nsCommandLine, - nsICommandLine, - nsICommandLineRunner) +NS_IMPL_ISUPPORTS_CI(nsCommandLine, + nsICommandLine, + nsICommandLineRunner) NS_IMETHODIMP nsCommandLine::GetLength(int32_t *aResult) diff --git a/toolkit/components/ctypes/ctypes.cpp b/toolkit/components/ctypes/ctypes.cpp index c5cfcfeb0a9..58db1435386 100644 --- a/toolkit/components/ctypes/ctypes.cpp +++ b/toolkit/components/ctypes/ctypes.cpp @@ -48,7 +48,7 @@ static JSCTypesCallbacks sCallbacks = { NS_GENERIC_FACTORY_CONSTRUCTOR(Module) -NS_IMPL_ISUPPORTS1(Module, nsIXPCScriptable) +NS_IMPL_ISUPPORTS(Module, nsIXPCScriptable) Module::Module() { diff --git a/toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp b/toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp index cde909c9752..6f0a8a7066c 100644 --- a/toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp +++ b/toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp @@ -18,7 +18,7 @@ using namespace mozilla; StaticRefPtr gDiskSpaceWatcher; -NS_IMPL_ISUPPORTS2(DiskSpaceWatcher, nsIDiskSpaceWatcher, nsIObserver) +NS_IMPL_ISUPPORTS(DiskSpaceWatcher, nsIDiskSpaceWatcher, nsIObserver) uint64_t DiskSpaceWatcher::sFreeSpace = 0; bool DiskSpaceWatcher::sIsDiskFull = false; diff --git a/toolkit/components/downloads/ApplicationReputation.cpp b/toolkit/components/downloads/ApplicationReputation.cpp index b5ba3738581..339ed0f2146 100644 --- a/toolkit/components/downloads/ApplicationReputation.cpp +++ b/toolkit/components/downloads/ApplicationReputation.cpp @@ -219,8 +219,8 @@ private: nsresult LookupSpecInternal(const nsACString& aSpec); }; -NS_IMPL_ISUPPORTS1(PendingDBLookup, - nsIUrlClassifierCallback) +NS_IMPL_ISUPPORTS(PendingDBLookup, + nsIUrlClassifierCallback) PendingDBLookup::PendingDBLookup(PendingLookup* aPendingLookup) : mAllowlistOnly(false), @@ -318,9 +318,9 @@ PendingDBLookup::HandleEvent(const nsACString& tables) return mPendingLookup->LookupNext(); } -NS_IMPL_ISUPPORTS2(PendingLookup, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(PendingLookup, + nsIStreamListener, + nsIRequestObserver) PendingLookup::PendingLookup(nsIApplicationReputationQuery* aQuery, nsIApplicationReputationCallback* aCallback) : @@ -879,8 +879,8 @@ PendingLookup::OnStopRequestInternal(nsIRequest *aRequest, return NS_OK; } -NS_IMPL_ISUPPORTS1(ApplicationReputationService, - nsIApplicationReputationService) +NS_IMPL_ISUPPORTS(ApplicationReputationService, + nsIApplicationReputationService) ApplicationReputationService* ApplicationReputationService::gApplicationReputationService = nullptr; diff --git a/toolkit/components/downloads/SQLFunctions.cpp b/toolkit/components/downloads/SQLFunctions.cpp index d71bb28e4df..0ee3b393a6f 100644 --- a/toolkit/components/downloads/SQLFunctions.cpp +++ b/toolkit/components/downloads/SQLFunctions.cpp @@ -40,7 +40,7 @@ GenerateGUIDFunction::create(mozIStorageConnection *aDBConn) return NS_OK; } -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( GenerateGUIDFunction, mozIStorageFunction ) diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp index 590271757ae..9ac28e96269 100644 --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp @@ -86,7 +86,7 @@ static const int64_t gUpdateInterval = 400 * PR_USEC_PER_MSEC; //////////////////////////////////////////////////////////////////////////////// //// nsDownloadManager -NS_IMPL_ISUPPORTS4( +NS_IMPL_ISUPPORTS( nsDownloadManager , nsIDownloadManager , nsINavHistoryObserver @@ -2592,7 +2592,7 @@ nsDownloadManager::ConfirmCancelDownloads(int32_t aCount, //// nsDownload NS_IMPL_CLASSINFO(nsDownload, nullptr, 0, NS_DOWNLOAD_CID) -NS_IMPL_ISUPPORTS4_CI( +NS_IMPL_ISUPPORTS_CI( nsDownload , nsIDownload , nsITransfer diff --git a/toolkit/components/downloads/nsDownloadProxy.h b/toolkit/components/downloads/nsDownloadProxy.h index 8821638bb35..30ff523f5c6 100644 --- a/toolkit/components/downloads/nsDownloadProxy.h +++ b/toolkit/components/downloads/nsDownloadProxy.h @@ -164,7 +164,7 @@ private: nsCOMPtr mInner; }; -NS_IMPL_ISUPPORTS3(nsDownloadProxy, nsITransfer, - nsIWebProgressListener, nsIWebProgressListener2) +NS_IMPL_ISUPPORTS(nsDownloadProxy, nsITransfer, + nsIWebProgressListener, nsIWebProgressListener2) #endif diff --git a/toolkit/components/filepicker/nsFileView.cpp b/toolkit/components/filepicker/nsFileView.cpp index 1eb1916fd11..23e934aa99e 100644 --- a/toolkit/components/filepicker/nsFileView.cpp +++ b/toolkit/components/filepicker/nsFileView.cpp @@ -49,7 +49,7 @@ public: uint16_t mSearchResult; }; -NS_IMPL_ISUPPORTS1(nsFileResult, nsIAutoCompleteResult) +NS_IMPL_ISUPPORTS(nsFileResult, nsIAutoCompleteResult) nsFileResult::nsFileResult(const nsAString& aSearchString, const nsAString& aSearchParam): @@ -190,7 +190,7 @@ public: NS_DECL_NSIAUTOCOMPLETESEARCH }; -NS_IMPL_ISUPPORTS1(nsFileComplete, nsIAutoCompleteSearch) +NS_IMPL_ISUPPORTS(nsFileComplete, nsIAutoCompleteSearch) NS_IMETHODIMP nsFileComplete::StartSearch(const nsAString& aSearchString, @@ -305,7 +305,7 @@ nsFileView::Init() // nsISupports implementation -NS_IMPL_ISUPPORTS2(nsFileView, nsITreeView, nsIFileView) +NS_IMPL_ISUPPORTS(nsFileView, nsITreeView, nsIFileView) // nsIFileView implementation diff --git a/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp b/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp index 33bef494e36..225364b3ede 100644 --- a/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp +++ b/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp @@ -171,7 +171,7 @@ static const JSFunctionSpec sWitnessClassFunctions[] = { } -NS_IMPL_ISUPPORTS1(FinalizationWitnessService, nsIFinalizationWitnessService) +NS_IMPL_ISUPPORTS(FinalizationWitnessService, nsIFinalizationWitnessService) /** * Create a new Finalization Witness. diff --git a/toolkit/components/find/nsFindService.cpp b/toolkit/components/find/nsFindService.cpp index 2fa0c8c90ee..36b5faf9dfb 100644 --- a/toolkit/components/find/nsFindService.cpp +++ b/toolkit/components/find/nsFindService.cpp @@ -26,7 +26,7 @@ nsFindService::~nsFindService() { } -NS_IMPL_ISUPPORTS1(nsFindService, nsIFindService) +NS_IMPL_ISUPPORTS(nsFindService, nsIFindService) /* attribute AString searchString; */ NS_IMETHODIMP nsFindService::GetSearchString(nsAString & aSearchString) diff --git a/toolkit/components/intl/nsCharsetMenu.cpp b/toolkit/components/intl/nsCharsetMenu.cpp index a666380dac9..647307d95ee 100644 --- a/toolkit/components/intl/nsCharsetMenu.cpp +++ b/toolkit/components/intl/nsCharsetMenu.cpp @@ -366,7 +366,7 @@ private: nsCharsetMenu* mCharsetMenu; }; -NS_IMPL_ISUPPORTS1(nsCharsetMenuObserver, nsIObserver) +NS_IMPL_ISUPPORTS(nsCharsetMenuObserver, nsIObserver) NS_IMETHODIMP nsCharsetMenuObserver::Observe(nsISupports *aSubject, const char *aTopic, const char16_t *someData) { diff --git a/toolkit/components/jsdownloads/src/DownloadPlatform.cpp b/toolkit/components/jsdownloads/src/DownloadPlatform.cpp index c1807e13a8f..5ce18184b02 100644 --- a/toolkit/components/jsdownloads/src/DownloadPlatform.cpp +++ b/toolkit/components/jsdownloads/src/DownloadPlatform.cpp @@ -33,7 +33,7 @@ using namespace mozilla; DownloadPlatform *DownloadPlatform::gDownloadPlatformService = nullptr; -NS_IMPL_ISUPPORTS1(DownloadPlatform, mozIDownloadPlatform); +NS_IMPL_ISUPPORTS(DownloadPlatform, mozIDownloadPlatform); DownloadPlatform* DownloadPlatform::GetDownloadPlatform() { diff --git a/toolkit/components/mediasniffer/nsMediaSniffer.cpp b/toolkit/components/mediasniffer/nsMediaSniffer.cpp index 47e6780b1eb..5ae9bdc1365 100644 --- a/toolkit/components/mediasniffer/nsMediaSniffer.cpp +++ b/toolkit/components/mediasniffer/nsMediaSniffer.cpp @@ -27,7 +27,7 @@ static const uint32_t MAX_BYTES_SNIFFED = 512; // This is 320kbps * 144 / 32kHz + 1 padding byte + 4 bytes of capture pattern. static const uint32_t MAX_BYTES_SNIFFED_MP3 = 320 * 144 / 32 + 1 + 4; -NS_IMPL_ISUPPORTS1(nsMediaSniffer, nsIContentSniffer) +NS_IMPL_ISUPPORTS(nsMediaSniffer, nsIContentSniffer) nsMediaSniffer::nsMediaSnifferEntry nsMediaSniffer::sSnifferEntries[] = { // The string OggS, followed by the null byte. diff --git a/toolkit/components/osfile/NativeOSFileInternals.cpp b/toolkit/components/osfile/NativeOSFileInternals.cpp index ae6ba8106fa..aac2276c192 100644 --- a/toolkit/components/osfile/NativeOSFileInternals.cpp +++ b/toolkit/components/osfile/NativeOSFileInternals.cpp @@ -859,7 +859,7 @@ protected: // The OS.File service -NS_IMPL_ISUPPORTS1(NativeOSFileInternalsService, nsINativeOSFileInternalsService); +NS_IMPL_ISUPPORTS(NativeOSFileInternalsService, nsINativeOSFileInternalsService); NS_IMETHODIMP NativeOSFileInternalsService::Read(const nsAString& aPath, diff --git a/toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp b/toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp index 79241832fb7..c98156dc9fc 100644 --- a/toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp +++ b/toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp @@ -17,7 +17,7 @@ static const CLSID CLSID_WinParentalControls = {0xE77CC89B,0x7401,0x4C04,{0x8C,0xED,0x14,0x9D,0xB3,0x5A,0xDD,0x04}}; static const IID IID_IWinParentalControls = {0x28B4D88B,0xE072,0x49E6,{0x80,0x4D,0x26,0xED,0xBE,0x21,0xA7,0xB9}}; -NS_IMPL_ISUPPORTS1(nsParentalControlsServiceWin, nsIParentalControlsService) +NS_IMPL_ISUPPORTS(nsParentalControlsServiceWin, nsIParentalControlsService) static HINSTANCE gAdvAPIDLLInst = nullptr; diff --git a/toolkit/components/perf/PerfMeasurement.cpp b/toolkit/components/perf/PerfMeasurement.cpp index 0c3b4105666..5f4a97991e3 100644 --- a/toolkit/components/perf/PerfMeasurement.cpp +++ b/toolkit/components/perf/PerfMeasurement.cpp @@ -23,7 +23,7 @@ namespace jsperf { NS_GENERIC_FACTORY_CONSTRUCTOR(Module) -NS_IMPL_ISUPPORTS1(Module, nsIXPCScriptable) +NS_IMPL_ISUPPORTS(Module, nsIXPCScriptable) Module::Module() { diff --git a/toolkit/components/places/AsyncFaviconHelpers.cpp b/toolkit/components/places/AsyncFaviconHelpers.cpp index 2abce3e3f36..6ca7c513edf 100644 --- a/toolkit/components/places/AsyncFaviconHelpers.cpp +++ b/toolkit/components/places/AsyncFaviconHelpers.cpp @@ -500,7 +500,7 @@ AsyncFetchAndSetIconForPage::Run() //////////////////////////////////////////////////////////////////////////////// //// AsyncFetchAndSetIconFromNetwork -NS_IMPL_ISUPPORTS_INHERITED3( +NS_IMPL_ISUPPORTS_INHERITED( AsyncFetchAndSetIconFromNetwork , nsRunnable , nsIStreamListener diff --git a/toolkit/components/places/Database.cpp b/toolkit/components/places/Database.cpp index dd300c34306..a960bfc7b93 100644 --- a/toolkit/components/places/Database.cpp +++ b/toolkit/components/places/Database.cpp @@ -245,7 +245,7 @@ ConnectionCloseCallback::ConnectionCloseCallback() MOZ_ASSERT(NS_IsMainThread()); } -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( ConnectionCloseCallback , mozIStorageCompletionCallback ) @@ -328,7 +328,7 @@ CreateRoot(nsCOMPtr& aDBConn, PLACES_FACTORY_SINGLETON_IMPLEMENTATION(Database, gDatabase) -NS_IMPL_ISUPPORTS2(Database +NS_IMPL_ISUPPORTS(Database , nsIObserver , nsISupportsWeakReference ) diff --git a/toolkit/components/places/Helpers.cpp b/toolkit/components/places/Helpers.cpp index 2488fe6fc55..1f20b986afb 100644 --- a/toolkit/components/places/Helpers.cpp +++ b/toolkit/components/places/Helpers.cpp @@ -20,7 +20,7 @@ namespace places { //////////////////////////////////////////////////////////////////////////////// //// AsyncStatementCallback -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( AsyncStatementCallback , mozIStorageStatementCallback ) @@ -370,7 +370,7 @@ PlacesEvent::Notify() } } -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( PlacesEvent , nsIRunnable ) diff --git a/toolkit/components/places/History.cpp b/toolkit/components/places/History.cpp index 3e9d9bf1022..d271cbcc4b2 100644 --- a/toolkit/components/places/History.cpp +++ b/toolkit/components/places/History.cpp @@ -1529,7 +1529,7 @@ private: */ nsRefPtr mHistory; }; -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( SetDownloadAnnotations, mozIVisitInfoCallback ) @@ -2930,7 +2930,7 @@ History::Observe(nsISupports* aSubject, const char* aTopic, //////////////////////////////////////////////////////////////////////////////// //// nsISupports -NS_IMPL_ISUPPORTS5( +NS_IMPL_ISUPPORTS( History , IHistory , nsIDownloadHistory diff --git a/toolkit/components/places/PlaceInfo.cpp b/toolkit/components/places/PlaceInfo.cpp index f31d874b671..29ac5bf5dbd 100644 --- a/toolkit/components/places/PlaceInfo.cpp +++ b/toolkit/components/places/PlaceInfo.cpp @@ -130,7 +130,7 @@ PlaceInfo::GetVisits(JSContext* aContext, //////////////////////////////////////////////////////////////////////////////// //// nsISupports -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( PlaceInfo , mozIPlaceInfo ) diff --git a/toolkit/components/places/SQLFunctions.cpp b/toolkit/components/places/SQLFunctions.cpp index 62ea36c130f..5e06852a8a3 100644 --- a/toolkit/components/places/SQLFunctions.cpp +++ b/toolkit/components/places/SQLFunctions.cpp @@ -315,7 +315,7 @@ namespace places { }; } - NS_IMPL_ISUPPORTS1( + NS_IMPL_ISUPPORTS( MatchAutoCompleteFunction, mozIStorageFunction ) @@ -431,7 +431,7 @@ namespace places { return NS_OK; } - NS_IMPL_ISUPPORTS1( + NS_IMPL_ISUPPORTS( CalculateFrecencyFunction, mozIStorageFunction ) @@ -624,7 +624,7 @@ namespace places { return NS_OK; } - NS_IMPL_ISUPPORTS1( + NS_IMPL_ISUPPORTS( GenerateGUIDFunction, mozIStorageFunction ) @@ -663,7 +663,7 @@ namespace places { return NS_OK; } - NS_IMPL_ISUPPORTS1( + NS_IMPL_ISUPPORTS( GetUnreversedHostFunction, mozIStorageFunction ) @@ -717,7 +717,7 @@ namespace places { return NS_OK; } - NS_IMPL_ISUPPORTS1( + NS_IMPL_ISUPPORTS( FixupURLFunction, mozIStorageFunction ) @@ -766,7 +766,7 @@ namespace places { return NS_OK; } - NS_IMPL_ISUPPORTS1( + NS_IMPL_ISUPPORTS( FrecencyNotificationFunction, mozIStorageFunction ) diff --git a/toolkit/components/places/VisitInfo.cpp b/toolkit/components/places/VisitInfo.cpp index 592abadfe8f..2758b250166 100644 --- a/toolkit/components/places/VisitInfo.cpp +++ b/toolkit/components/places/VisitInfo.cpp @@ -56,7 +56,7 @@ VisitInfo::GetReferrerURI(nsIURI** _referrer) //////////////////////////////////////////////////////////////////////////////// //// nsISupports -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( VisitInfo , mozIVisitInfo ) diff --git a/toolkit/components/places/nsAnnoProtocolHandler.cpp b/toolkit/components/places/nsAnnoProtocolHandler.cpp index ab670d86bc8..ddd2b01ff50 100644 --- a/toolkit/components/places/nsAnnoProtocolHandler.cpp +++ b/toolkit/components/places/nsAnnoProtocolHandler.cpp @@ -185,7 +185,7 @@ private: bool mReturnDefaultIcon; }; -NS_IMPL_ISUPPORTS_INHERITED1( +NS_IMPL_ISUPPORTS_INHERITED( faviconAsyncLoader, AsyncStatementCallback, nsIRequestObserver @@ -196,7 +196,7 @@ NS_IMPL_ISUPPORTS_INHERITED1( //////////////////////////////////////////////////////////////////////////////// //// nsAnnoProtocolHandler -NS_IMPL_ISUPPORTS1(nsAnnoProtocolHandler, nsIProtocolHandler) +NS_IMPL_ISUPPORTS(nsAnnoProtocolHandler, nsIProtocolHandler) // nsAnnoProtocolHandler::GetScheme diff --git a/toolkit/components/places/nsAnnotationService.cpp b/toolkit/components/places/nsAnnotationService.cpp index de6d9006fd8..6c7edf8e443 100644 --- a/toolkit/components/places/nsAnnotationService.cpp +++ b/toolkit/components/places/nsAnnotationService.cpp @@ -101,14 +101,14 @@ AnnotatedResult::GetAnnotationValue(nsIVariant** _annotationValue) return NS_OK; } -NS_IMPL_ISUPPORTS1(AnnotatedResult, mozIAnnotatedResult) +NS_IMPL_ISUPPORTS(AnnotatedResult, mozIAnnotatedResult) } // namespace places } // namespace mozilla PLACES_FACTORY_SINGLETON_IMPLEMENTATION(nsAnnotationService, gAnnotationService) -NS_IMPL_ISUPPORTS3(nsAnnotationService +NS_IMPL_ISUPPORTS(nsAnnotationService , nsIAnnotationService , nsIObserver , nsISupportsWeakReference diff --git a/toolkit/components/places/nsFaviconService.cpp b/toolkit/components/places/nsFaviconService.cpp index 38763a286c4..2306c96375c 100644 --- a/toolkit/components/places/nsFaviconService.cpp +++ b/toolkit/components/places/nsFaviconService.cpp @@ -67,7 +67,7 @@ public: PLACES_FACTORY_SINGLETON_IMPLEMENTATION(nsFaviconService, gFaviconService) NS_IMPL_CLASSINFO(nsFaviconService, nullptr, 0, NS_FAVICONSERVICE_CID) -NS_IMPL_ISUPPORTS3_CI( +NS_IMPL_ISUPPORTS_CI( nsFaviconService , nsIFaviconService , mozIAsyncFavicons diff --git a/toolkit/components/places/nsNavBookmarks.cpp b/toolkit/components/places/nsNavBookmarks.cpp index 7d4f2191d4b..f146efd0ceb 100644 --- a/toolkit/components/places/nsNavBookmarks.cpp +++ b/toolkit/components/places/nsNavBookmarks.cpp @@ -228,7 +228,7 @@ nsNavBookmarks::~nsNavBookmarks() } -NS_IMPL_ISUPPORTS5(nsNavBookmarks +NS_IMPL_ISUPPORTS(nsNavBookmarks , nsINavBookmarksService , nsINavHistoryObserver , nsIAnnotationObserver @@ -1006,7 +1006,7 @@ nsNavBookmarks::GetIdForItemAt(int64_t aFolder, return NS_OK; } -NS_IMPL_ISUPPORTS1(nsNavBookmarks::RemoveFolderTransaction, nsITransaction) +NS_IMPL_ISUPPORTS(nsNavBookmarks::RemoveFolderTransaction, nsITransaction) NS_IMETHODIMP nsNavBookmarks::GetRemoveFolderTransaction(int64_t aFolderId, nsITransaction** aResult) diff --git a/toolkit/components/places/nsNavHistory.cpp b/toolkit/components/places/nsNavHistory.cpp index 54195f0b54b..3ed773de8da 100644 --- a/toolkit/components/places/nsNavHistory.cpp +++ b/toolkit/components/places/nsNavHistory.cpp @@ -177,11 +177,9 @@ NS_INTERFACE_MAP_BEGIN(nsNavHistory) NS_INTERFACE_MAP_END // We don't care about flattening everything -NS_IMPL_CI_INTERFACE_GETTER2( - nsNavHistory -, nsINavHistoryService -, nsIBrowserHistory -) +NS_IMPL_CI_INTERFACE_GETTER(nsNavHistory, + nsINavHistoryService, + nsIBrowserHistory) namespace { diff --git a/toolkit/components/places/nsNavHistoryQuery.cpp b/toolkit/components/places/nsNavHistoryQuery.cpp index c0d332558d3..027d56d486d 100644 --- a/toolkit/components/places/nsNavHistoryQuery.cpp +++ b/toolkit/components/places/nsNavHistoryQuery.cpp @@ -886,7 +886,7 @@ ParseQueryBooleanString(const nsCString& aString, bool* aValue) // nsINavHistoryQuery ********************************************************** -NS_IMPL_ISUPPORTS2(nsNavHistoryQuery, nsNavHistoryQuery, nsINavHistoryQuery) +NS_IMPL_ISUPPORTS(nsNavHistoryQuery, nsNavHistoryQuery, nsINavHistoryQuery) // nsINavHistoryQuery::nsNavHistoryQuery // @@ -1350,7 +1350,7 @@ NS_IMETHODIMP nsNavHistoryQuery::Clone(nsINavHistoryQuery** _retval) // nsNavHistoryQueryOptions -NS_IMPL_ISUPPORTS2(nsNavHistoryQueryOptions, nsNavHistoryQueryOptions, nsINavHistoryQueryOptions) +NS_IMPL_ISUPPORTS(nsNavHistoryQueryOptions, nsNavHistoryQueryOptions, nsINavHistoryQueryOptions) // sortingMode NS_IMETHODIMP diff --git a/toolkit/components/places/nsNavHistoryResult.cpp b/toolkit/components/places/nsNavHistoryResult.cpp index 51591d33d91..ff4d72be84f 100644 --- a/toolkit/components/places/nsNavHistoryResult.cpp +++ b/toolkit/components/places/nsNavHistoryResult.cpp @@ -1761,9 +1761,9 @@ nsNavHistoryContainerResultNode::GetChildrenReadOnly(bool *aChildrenReadOnly) * a message without doing a requery. For complex changes or complex queries, * we give up and requery. */ -NS_IMPL_ISUPPORTS_INHERITED1(nsNavHistoryQueryResultNode, - nsNavHistoryContainerResultNode, - nsINavHistoryQueryResultNode) +NS_IMPL_ISUPPORTS_INHERITED(nsNavHistoryQueryResultNode, + nsNavHistoryContainerResultNode, + nsINavHistoryQueryResultNode) nsNavHistoryQueryResultNode::nsNavHistoryQueryResultNode( const nsACString& aTitle, const nsACString& aIconURI, @@ -2998,9 +2998,9 @@ nsNavHistoryQueryResultNode::OnItemMoved(int64_t aFolder, * an up-to-date list for the entire bookmark menu structure in every place * it is used. */ -NS_IMPL_ISUPPORTS_INHERITED1(nsNavHistoryFolderResultNode, - nsNavHistoryContainerResultNode, - nsINavHistoryQueryResultNode) +NS_IMPL_ISUPPORTS_INHERITED(nsNavHistoryFolderResultNode, + nsNavHistoryContainerResultNode, + nsINavHistoryQueryResultNode) nsNavHistoryFolderResultNode::nsNavHistoryFolderResultNode( const nsACString& aTitle, nsNavHistoryQueryOptions* aOptions, diff --git a/toolkit/components/places/tests/cpp/mock_Link.h b/toolkit/components/places/tests/cpp/mock_Link.h index 88dc4fac39f..d36e81c4f10 100644 --- a/toolkit/components/places/tests/cpp/mock_Link.h +++ b/toolkit/components/places/tests/cpp/mock_Link.h @@ -61,7 +61,7 @@ private: nsRefPtr mDeathGrip; }; -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( mock_Link, mozilla::dom::Link ) diff --git a/toolkit/components/places/tests/cpp/places_test_harness.h b/toolkit/components/places/tests/cpp/places_test_harness.h index 1d8ccf69608..b7c49be913d 100644 --- a/toolkit/components/places/tests/cpp/places_test_harness.h +++ b/toolkit/components/places/tests/cpp/places_test_harness.h @@ -139,7 +139,7 @@ private: bool mTopicReceived; PRIntervalTime mStartTime; }; -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( WaitForTopicSpinner, nsIObserver ) @@ -161,8 +161,8 @@ protected: volatile bool mCompleted; }; -NS_IMPL_ISUPPORTS1(AsyncStatementSpinner, - mozIStorageStatementCallback) +NS_IMPL_ISUPPORTS(AsyncStatementSpinner, + mozIStorageStatementCallback) AsyncStatementSpinner::AsyncStatementSpinner() : completionReason(0) @@ -402,4 +402,4 @@ public: } }; -NS_IMPL_ISUPPORTS1(WaitForConnectionClosed, nsIObserver) +NS_IMPL_ISUPPORTS(WaitForConnectionClosed, nsIObserver) diff --git a/toolkit/components/places/tests/cpp/test_IHistory.cpp b/toolkit/components/places/tests/cpp/test_IHistory.cpp index 9413e521396..24153ce00d6 100644 --- a/toolkit/components/places/tests/cpp/test_IHistory.cpp +++ b/toolkit/components/places/tests/cpp/test_IHistory.cpp @@ -89,7 +89,7 @@ private: int mVisits; int mExpectedVisits; }; -NS_IMPL_ISUPPORTS1( +NS_IMPL_ISUPPORTS( VisitURIObserver, nsIObserver ) @@ -364,7 +364,7 @@ namespace test_observer_topic_dispatched_helpers { const bool mExpectVisit; bool& mNotified; }; - NS_IMPL_ISUPPORTS1( + NS_IMPL_ISUPPORTS( statusObserver, nsIObserver ) diff --git a/toolkit/components/reflect/reflect.cpp b/toolkit/components/reflect/reflect.cpp index a93994940c6..f2dd8bcbc7f 100644 --- a/toolkit/components/reflect/reflect.cpp +++ b/toolkit/components/reflect/reflect.cpp @@ -21,7 +21,7 @@ namespace reflect { NS_GENERIC_FACTORY_CONSTRUCTOR(Module) -NS_IMPL_ISUPPORTS1(Module, nsIXPCScriptable) +NS_IMPL_ISUPPORTS(Module, nsIXPCScriptable) Module::Module() { diff --git a/toolkit/components/remote/nsGTKRemoteService.cpp b/toolkit/components/remote/nsGTKRemoteService.cpp index 4a0eea87e7d..4edb7089d88 100644 --- a/toolkit/components/remote/nsGTKRemoteService.cpp +++ b/toolkit/components/remote/nsGTKRemoteService.cpp @@ -25,9 +25,9 @@ #include "nsGTKToolkit.h" -NS_IMPL_ISUPPORTS2(nsGTKRemoteService, - nsIRemoteService, - nsIObserver) +NS_IMPL_ISUPPORTS(nsGTKRemoteService, + nsIRemoteService, + nsIObserver) NS_IMETHODIMP nsGTKRemoteService::Startup(const char* aAppName, const char* aProfileName) diff --git a/toolkit/components/remote/nsQtRemoteService.cpp b/toolkit/components/remote/nsQtRemoteService.cpp index f5be5d0ae68..ecf4fc3dc17 100644 --- a/toolkit/components/remote/nsQtRemoteService.cpp +++ b/toolkit/components/remote/nsQtRemoteService.cpp @@ -54,9 +54,9 @@ MozQRemoteEventHandlerWidget::x11Event(XEvent *aEvt) return false; } -NS_IMPL_ISUPPORTS2(nsQtRemoteService, - nsIRemoteService, - nsIObserver) +NS_IMPL_ISUPPORTS(nsQtRemoteService, + nsIRemoteService, + nsIObserver) nsQtRemoteService::nsQtRemoteService(): mServerWindow(0) diff --git a/toolkit/components/satchel/nsFormFillController.cpp b/toolkit/components/satchel/nsFormFillController.cpp index 4c6ac393a19..315fc68437f 100644 --- a/toolkit/components/satchel/nsFormFillController.cpp +++ b/toolkit/components/satchel/nsFormFillController.cpp @@ -39,13 +39,13 @@ using namespace mozilla::dom; -NS_IMPL_ISUPPORTS6(nsFormFillController, - nsIFormFillController, - nsIAutoCompleteInput, - nsIAutoCompleteSearch, - nsIDOMEventListener, - nsIFormAutoCompleteObserver, - nsIMutationObserver) +NS_IMPL_ISUPPORTS(nsFormFillController, + nsIFormFillController, + nsIAutoCompleteInput, + nsIAutoCompleteSearch, + nsIDOMEventListener, + nsIFormAutoCompleteObserver, + nsIMutationObserver) nsFormFillController::nsFormFillController() : mFocusedInput(nullptr), diff --git a/toolkit/components/startup/nsAppStartup.cpp b/toolkit/components/startup/nsAppStartup.cpp index b7c78e20273..e6ce9f17633 100644 --- a/toolkit/components/startup/nsAppStartup.cpp +++ b/toolkit/components/startup/nsAppStartup.cpp @@ -217,12 +217,12 @@ nsAppStartup::Init() // nsAppStartup->nsISupports // -NS_IMPL_ISUPPORTS5(nsAppStartup, - nsIAppStartup, - nsIWindowCreator, - nsIWindowCreator2, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsAppStartup, + nsIAppStartup, + nsIWindowCreator, + nsIWindowCreator2, + nsIObserver, + nsISupportsWeakReference) // diff --git a/toolkit/components/startup/nsUserInfoMac.mm b/toolkit/components/startup/nsUserInfoMac.mm index ed3e3a7981a..1895cf17735 100644 --- a/toolkit/components/startup/nsUserInfoMac.mm +++ b/toolkit/components/startup/nsUserInfoMac.mm @@ -11,7 +11,7 @@ #import #import -NS_IMPL_ISUPPORTS1(nsUserInfo, nsIUserInfo) +NS_IMPL_ISUPPORTS(nsUserInfo, nsIUserInfo) nsUserInfo::nsUserInfo() {} diff --git a/toolkit/components/startup/nsUserInfoUnix.cpp b/toolkit/components/startup/nsUserInfoUnix.cpp index ab3ee1ea6a4..41a9cb5c4c5 100644 --- a/toolkit/components/startup/nsUserInfoUnix.cpp +++ b/toolkit/components/startup/nsUserInfoUnix.cpp @@ -31,7 +31,7 @@ nsUserInfo::~nsUserInfo() { } -NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo) +NS_IMPL_ISUPPORTS(nsUserInfo,nsIUserInfo) NS_IMETHODIMP nsUserInfo::GetFullname(char16_t **aFullname) diff --git a/toolkit/components/startup/nsUserInfoWin.cpp b/toolkit/components/startup/nsUserInfoWin.cpp index e6429f793d4..b27a2c483b1 100644 --- a/toolkit/components/startup/nsUserInfoWin.cpp +++ b/toolkit/components/startup/nsUserInfoWin.cpp @@ -23,7 +23,7 @@ nsUserInfo::~nsUserInfo() { } -NS_IMPL_ISUPPORTS1(nsUserInfo, nsIUserInfo) +NS_IMPL_ISUPPORTS(nsUserInfo, nsIUserInfo) NS_IMETHODIMP nsUserInfo::GetUsername(char **aUsername) diff --git a/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp b/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp index ce6c1605614..464fc2ffe59 100644 --- a/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp +++ b/toolkit/components/statusfilter/nsBrowserStatusFilter.cpp @@ -41,11 +41,11 @@ nsBrowserStatusFilter::~nsBrowserStatusFilter() // nsBrowserStatusFilter::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS4(nsBrowserStatusFilter, - nsIWebProgress, - nsIWebProgressListener, - nsIWebProgressListener2, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsBrowserStatusFilter, + nsIWebProgress, + nsIWebProgressListener, + nsIWebProgressListener2, + nsISupportsWeakReference) //----------------------------------------------------------------------------- // nsBrowserStatusFilter::nsIWebProgress diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp index 2c12a491afc..069e7859923 100644 --- a/toolkit/components/telemetry/Telemetry.cpp +++ b/toolkit/components/telemetry/Telemetry.cpp @@ -2536,7 +2536,7 @@ TelemetryImpl::RecordThreadHangStats(Telemetry::ThreadHangStats& aStats) sTelemetry->mThreadHangStats.append(Move(aStats)); } -NS_IMPL_ISUPPORTS2(TelemetryImpl, nsITelemetry, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(TelemetryImpl, nsITelemetry, nsIMemoryReporter) NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsITelemetry, TelemetryImpl::CreateTelemetryInstance) #define NS_TELEMETRY_CID \ diff --git a/toolkit/components/url-classifier/nsCheckSummedOutputStream.cpp b/toolkit/components/url-classifier/nsCheckSummedOutputStream.cpp index b41fc3ce980..68f9f1f6f4e 100644 --- a/toolkit/components/url-classifier/nsCheckSummedOutputStream.cpp +++ b/toolkit/components/url-classifier/nsCheckSummedOutputStream.cpp @@ -12,11 +12,11 @@ //////////////////////////////////////////////////////////////////////////////// // nsCheckSummedOutputStream -NS_IMPL_ISUPPORTS_INHERITED3(nsCheckSummedOutputStream, - nsSafeFileOutputStream, - nsISafeOutputStream, - nsIOutputStream, - nsIFileOutputStream) +NS_IMPL_ISUPPORTS_INHERITED(nsCheckSummedOutputStream, + nsSafeFileOutputStream, + nsISafeOutputStream, + nsIOutputStream, + nsIFileOutputStream) NS_IMETHODIMP nsCheckSummedOutputStream::Init(nsIFile* file, int32_t ioFlags, int32_t perm, diff --git a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp index 929ff4aa192..50582345c07 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp @@ -189,9 +189,9 @@ private: nsTArray mPendingLookups; }; -NS_IMPL_ISUPPORTS2(nsUrlClassifierDBServiceWorker, - nsIUrlClassifierDBServiceWorker, - nsIUrlClassifierDBService) +NS_IMPL_ISUPPORTS(nsUrlClassifierDBServiceWorker, + nsIUrlClassifierDBServiceWorker, + nsIUrlClassifierDBService) nsUrlClassifierDBServiceWorker::nsUrlClassifierDBServiceWorker() : mInStream(false) @@ -788,9 +788,9 @@ private: nsCOMPtr mCallback; }; -NS_IMPL_ISUPPORTS2(nsUrlClassifierLookupCallback, - nsIUrlClassifierLookupCallback, - nsIUrlClassifierHashCompleterCallback) +NS_IMPL_ISUPPORTS(nsUrlClassifierLookupCallback, + nsIUrlClassifierLookupCallback, + nsIUrlClassifierHashCompleterCallback) nsUrlClassifierLookupCallback::~nsUrlClassifierLookupCallback() { @@ -992,8 +992,8 @@ private: bool mCheckPhishing; }; -NS_IMPL_ISUPPORTS1(nsUrlClassifierClassifyCallback, - nsIUrlClassifierCallback) +NS_IMPL_ISUPPORTS(nsUrlClassifierClassifyCallback, + nsIUrlClassifierCallback) NS_IMETHODIMP nsUrlClassifierClassifyCallback::HandleEvent(const nsACString& tables) @@ -1029,10 +1029,10 @@ nsUrlClassifierClassifyCallback::HandleEvent(const nsACString& tables) // ------------------------------------------------------------------------- // Proxy class implementation -NS_IMPL_ISUPPORTS3(nsUrlClassifierDBService, - nsIUrlClassifierDBService, - nsIURIClassifier, - nsIObserver) +NS_IMPL_ISUPPORTS(nsUrlClassifierDBService, + nsIUrlClassifierDBService, + nsIURIClassifier, + nsIObserver) /* static */ nsUrlClassifierDBService* nsUrlClassifierDBService::GetInstance(nsresult *result) diff --git a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp index 9dcad226493..cd73879fb73 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierPrefixSet.cpp @@ -35,7 +35,7 @@ static const PRLogModuleInfo *gUrlClassifierPrefixSetLog = nullptr; #define LOG_ENABLED() (false) #endif -NS_IMPL_ISUPPORTS2( +NS_IMPL_ISUPPORTS( nsUrlClassifierPrefixSet, nsIUrlClassifierPrefixSet, nsIMemoryReporter) nsUrlClassifierPrefixSet::nsUrlClassifierPrefixSet() diff --git a/toolkit/components/url-classifier/nsUrlClassifierProxies.cpp b/toolkit/components/url-classifier/nsUrlClassifierProxies.cpp index ee3d0af0c88..150d0b2fd5d 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierProxies.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierProxies.cpp @@ -18,8 +18,8 @@ DispatchToWorkerThread(nsIRunnable* r) return t->Dispatch(r, NS_DISPATCH_NORMAL); } -NS_IMPL_ISUPPORTS1(UrlClassifierDBServiceWorkerProxy, - nsIUrlClassifierDBServiceWorker) +NS_IMPL_ISUPPORTS(UrlClassifierDBServiceWorkerProxy, + nsIUrlClassifierDBServiceWorker) NS_IMETHODIMP UrlClassifierDBServiceWorkerProxy::Lookup(nsIPrincipal* aPrincipal, @@ -181,8 +181,8 @@ UrlClassifierDBServiceWorkerProxy::CacheMissesRunnable::Run() } -NS_IMPL_ISUPPORTS1(UrlClassifierLookupCallbackProxy, - nsIUrlClassifierLookupCallback) +NS_IMPL_ISUPPORTS(UrlClassifierLookupCallbackProxy, + nsIUrlClassifierLookupCallback) NS_IMETHODIMP UrlClassifierLookupCallbackProxy::LookupComplete @@ -199,8 +199,8 @@ UrlClassifierLookupCallbackProxy::LookupCompleteRunnable::Run() return NS_OK; } -NS_IMPL_ISUPPORTS1(UrlClassifierCallbackProxy, - nsIUrlClassifierCallback) +NS_IMPL_ISUPPORTS(UrlClassifierCallbackProxy, + nsIUrlClassifierCallback) NS_IMETHODIMP UrlClassifierCallbackProxy::HandleEvent(const nsACString& aValue) @@ -216,8 +216,8 @@ UrlClassifierCallbackProxy::HandleEventRunnable::Run() return NS_OK; } -NS_IMPL_ISUPPORTS1(UrlClassifierUpdateObserverProxy, - nsIUrlClassifierUpdateObserver) +NS_IMPL_ISUPPORTS(UrlClassifierUpdateObserverProxy, + nsIUrlClassifierUpdateObserver) NS_IMETHODIMP UrlClassifierUpdateObserverProxy::UpdateUrlRequested diff --git a/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp b/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp index d85528c4591..0eb42469bc0 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp @@ -48,14 +48,14 @@ nsUrlClassifierStreamUpdater::nsUrlClassifierStreamUpdater() } -NS_IMPL_ISUPPORTS7(nsUrlClassifierStreamUpdater, - nsIUrlClassifierStreamUpdater, - nsIUrlClassifierUpdateObserver, - nsIRequestObserver, - nsIStreamListener, - nsIObserver, - nsIInterfaceRequestor, - nsITimerCallback) +NS_IMPL_ISUPPORTS(nsUrlClassifierStreamUpdater, + nsIUrlClassifierStreamUpdater, + nsIUrlClassifierUpdateObserver, + nsIRequestObserver, + nsIStreamListener, + nsIObserver, + nsIInterfaceRequestor, + nsITimerCallback) /** * Clear out the update. diff --git a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp index 35b7a8996c2..e81992944a0 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp @@ -85,7 +85,7 @@ nsUrlClassifierUtils::Init() return NS_OK; } -NS_IMPL_ISUPPORTS1(nsUrlClassifierUtils, nsIUrlClassifierUtils) +NS_IMPL_ISUPPORTS(nsUrlClassifierUtils, nsIUrlClassifierUtils) ///////////////////////////////////////////////////////////////////////////// // nsIUrlClassifierUtils diff --git a/toolkit/identity/IdentityCryptoService.cpp b/toolkit/identity/IdentityCryptoService.cpp index 89407bbd0f6..3aebc1529ea 100644 --- a/toolkit/identity/IdentityCryptoService.cpp +++ b/toolkit/identity/IdentityCryptoService.cpp @@ -107,7 +107,7 @@ private: void operator=(const KeyPair &) MOZ_DELETE; }; -NS_IMPL_ISUPPORTS1(KeyPair, nsIIdentityKeyPair) +NS_IMPL_ISUPPORTS(KeyPair, nsIIdentityKeyPair) class KeyGenRunnable : public nsRunnable, public nsNSSShutDownObject { @@ -208,7 +208,7 @@ private: void operator=(const IdentityCryptoService &) MOZ_DELETE; }; -NS_IMPL_ISUPPORTS1(IdentityCryptoService, nsIIdentityCryptoService) +NS_IMPL_ISUPPORTS(IdentityCryptoService, nsIIdentityCryptoService) NS_IMETHODIMP IdentityCryptoService::GenerateKeyPair( diff --git a/toolkit/profile/nsToolkitProfileService.cpp b/toolkit/profile/nsToolkitProfileService.cpp index dffcf8e5476..656e04625e0 100644 --- a/toolkit/profile/nsToolkitProfileService.cpp +++ b/toolkit/profile/nsToolkitProfileService.cpp @@ -183,7 +183,7 @@ nsToolkitProfile::nsToolkitProfile(const nsACString& aName, } } -NS_IMPL_ISUPPORTS1(nsToolkitProfile, nsIToolkitProfile) +NS_IMPL_ISUPPORTS(nsToolkitProfile, nsIToolkitProfile) NS_IMETHODIMP nsToolkitProfile::GetRootDir(nsIFile* *aResult) @@ -284,7 +284,7 @@ nsToolkitProfile::Lock(nsIProfileUnlocker* *aUnlocker, nsIProfileLock* *aResult) return NS_OK; } -NS_IMPL_ISUPPORTS1(nsToolkitProfileLock, nsIProfileLock) +NS_IMPL_ISUPPORTS(nsToolkitProfileLock, nsIProfileLock) nsresult nsToolkitProfileLock::Init(nsToolkitProfile* aProfile, nsIProfileUnlocker* *aUnlocker) @@ -374,8 +374,8 @@ nsToolkitProfileLock::~nsToolkitProfileLock() nsToolkitProfileService* nsToolkitProfileService::gService = nullptr; -NS_IMPL_ISUPPORTS1(nsToolkitProfileService, - nsIToolkitProfileService) +NS_IMPL_ISUPPORTS(nsToolkitProfileService, + nsIToolkitProfileService) nsresult nsToolkitProfileService::Init() @@ -524,8 +524,8 @@ nsToolkitProfileService::GetProfiles(nsISimpleEnumerator* *aResult) return NS_OK; } -NS_IMPL_ISUPPORTS1(nsToolkitProfileService::ProfileEnumerator, - nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsToolkitProfileService::ProfileEnumerator, + nsISimpleEnumerator) NS_IMETHODIMP nsToolkitProfileService::ProfileEnumerator::HasMoreElements(bool* aResult) @@ -957,7 +957,7 @@ nsToolkitProfileService::Flush() return NS_OK; } -NS_IMPL_ISUPPORTS1(nsToolkitProfileFactory, nsIFactory) +NS_IMPL_ISUPPORTS(nsToolkitProfileFactory, nsIFactory) NS_IMETHODIMP nsToolkitProfileFactory::CreateInstance(nsISupports* aOuter, const nsID& aIID, diff --git a/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp b/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp index 792893a2bd9..5a98be32ce4 100644 --- a/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp +++ b/toolkit/system/androidproxy/nsAndroidSystemProxySettings.cpp @@ -29,7 +29,7 @@ private: ~nsAndroidSystemProxySettings() {}; }; -NS_IMPL_ISUPPORTS1(nsAndroidSystemProxySettings, nsISystemProxySettings) +NS_IMPL_ISUPPORTS(nsAndroidSystemProxySettings, nsISystemProxySettings) NS_IMETHODIMP nsAndroidSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) diff --git a/toolkit/system/dbus/nsDBusService.cpp b/toolkit/system/dbus/nsDBusService.cpp index 4a32ad019f8..11edd09416f 100644 --- a/toolkit/system/dbus/nsDBusService.cpp +++ b/toolkit/system/dbus/nsDBusService.cpp @@ -27,7 +27,7 @@ nsDBusService::~nsDBusService() { gSingleton = nullptr; } -NS_IMPL_ISUPPORTS1(nsDBusService, nsDBusService) +NS_IMPL_ISUPPORTS(nsDBusService, nsDBusService) nsDBusService* nsDBusService::gSingleton = nullptr; diff --git a/toolkit/system/dbus/nsNetworkManagerListener.cpp b/toolkit/system/dbus/nsNetworkManagerListener.cpp index 7930e5af053..c5919e3afdc 100644 --- a/toolkit/system/dbus/nsNetworkManagerListener.cpp +++ b/toolkit/system/dbus/nsNetworkManagerListener.cpp @@ -38,7 +38,7 @@ nsNetworkManagerListener::~nsNetworkManagerListener() } } -NS_IMPL_ISUPPORTS1(nsNetworkManagerListener, nsINetworkLinkService) +NS_IMPL_ISUPPORTS(nsNetworkManagerListener, nsINetworkLinkService) nsresult nsNetworkManagerListener::GetIsLinkUp(bool* aIsUp) diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp index addc3ca6467..c593160a315 100644 --- a/toolkit/system/gnome/nsAlertsIconListener.cpp +++ b/toolkit/system/gnome/nsAlertsIconListener.cpp @@ -51,8 +51,8 @@ static void notify_closed_marshal(GClosure* closure, NS_RELEASE(alert); } -NS_IMPL_ISUPPORTS3(nsAlertsIconListener, imgINotificationObserver, - nsIObserver, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver, + nsIObserver, nsISupportsWeakReference) nsAlertsIconListener::nsAlertsIconListener() : mLoadedFrame(false), diff --git a/toolkit/system/gnome/nsGConfService.cpp b/toolkit/system/gnome/nsGConfService.cpp index cff67b13dda..529ab97d13b 100644 --- a/toolkit/system/gnome/nsGConfService.cpp +++ b/toolkit/system/gnome/nsGConfService.cpp @@ -94,7 +94,7 @@ nsGConfService::Init() return mClient ? NS_OK : NS_ERROR_FAILURE; } -NS_IMPL_ISUPPORTS1(nsGConfService, nsIGConfService) +NS_IMPL_ISUPPORTS(nsGConfService, nsIGConfService) NS_IMETHODIMP nsGConfService::GetBool(const nsACString &aKey, bool *aResult) diff --git a/toolkit/system/gnome/nsGIOService.cpp b/toolkit/system/gnome/nsGIOService.cpp index 9c826b6dd14..089d407900e 100644 --- a/toolkit/system/gnome/nsGIOService.cpp +++ b/toolkit/system/gnome/nsGIOService.cpp @@ -53,7 +53,7 @@ private: GAppInfo *mApp; }; -NS_IMPL_ISUPPORTS1(nsGIOMimeApp, nsIGIOMimeApp) +NS_IMPL_ISUPPORTS(nsGIOMimeApp, nsIGIOMimeApp) NS_IMETHODIMP nsGIOMimeApp::GetId(nsACString& aId) @@ -118,7 +118,7 @@ public: uint32_t mIndex; }; -NS_IMPL_ISUPPORTS1(GIOUTF8StringEnumerator, nsIUTF8StringEnumerator) +NS_IMPL_ISUPPORTS(GIOUTF8StringEnumerator, nsIUTF8StringEnumerator) NS_IMETHODIMP GIOUTF8StringEnumerator::HasMore(bool* aResult) @@ -253,7 +253,7 @@ nsGIOMimeApp::SetAsDefaultForURIScheme(nsACString const& aURIScheme) return NS_OK; } -NS_IMPL_ISUPPORTS1(nsGIOService, nsIGIOService) +NS_IMPL_ISUPPORTS(nsGIOService, nsIGIOService) NS_IMETHODIMP nsGIOService::GetMimeTypeFromExtension(const nsACString& aExtension, diff --git a/toolkit/system/gnome/nsGSettingsService.cpp b/toolkit/system/gnome/nsGSettingsService.cpp index 184e54ea629..fc7d251ee5e 100644 --- a/toolkit/system/gnome/nsGSettingsService.cpp +++ b/toolkit/system/gnome/nsGSettingsService.cpp @@ -133,7 +133,7 @@ nsGSettingsCollection::SetValue(const nsACString& aKey, aValue); } -NS_IMPL_ISUPPORTS1(nsGSettingsCollection, nsIGSettingsCollection) +NS_IMPL_ISUPPORTS(nsGSettingsCollection, nsIGSettingsCollection) NS_IMETHODIMP nsGSettingsCollection::SetString(const nsACString& aKey, @@ -319,7 +319,7 @@ nsGSettingsService::Init() return NS_OK; } -NS_IMPL_ISUPPORTS1(nsGSettingsService, nsIGSettingsService) +NS_IMPL_ISUPPORTS(nsGSettingsService, nsIGSettingsService) nsGSettingsService::~nsGSettingsService() { diff --git a/toolkit/system/gnome/nsGnomeVFSService.cpp b/toolkit/system/gnome/nsGnomeVFSService.cpp index 98e10805679..a10608e63d0 100644 --- a/toolkit/system/gnome/nsGnomeVFSService.cpp +++ b/toolkit/system/gnome/nsGnomeVFSService.cpp @@ -29,7 +29,7 @@ private: GnomeVFSMimeApplication *mApp; }; -NS_IMPL_ISUPPORTS1(nsGnomeVFSMimeApp, nsIGnomeVFSMimeApp) +NS_IMPL_ISUPPORTS(nsGnomeVFSMimeApp, nsIGnomeVFSMimeApp) NS_IMETHODIMP nsGnomeVFSMimeApp::GetId(nsACString& aId) @@ -99,7 +99,7 @@ public: uint32_t mIndex; }; -NS_IMPL_ISUPPORTS1(UTF8StringEnumerator, nsIUTF8StringEnumerator) +NS_IMPL_ISUPPORTS(UTF8StringEnumerator, nsIUTF8StringEnumerator) NS_IMETHODIMP UTF8StringEnumerator::HasMore(bool *aResult) @@ -150,7 +150,7 @@ nsGnomeVFSService::Init() return gnome_vfs_init() ? NS_OK : NS_ERROR_FAILURE; } -NS_IMPL_ISUPPORTS1(nsGnomeVFSService, nsIGnomeVFSService) +NS_IMPL_ISUPPORTS(nsGnomeVFSService, nsIGnomeVFSService) NS_IMETHODIMP nsGnomeVFSService::GetMimeTypeFromExtension(const nsACString &aExtension, diff --git a/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm b/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm index 7ac114190a4..f6e9ec73548 100644 --- a/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm +++ b/toolkit/system/osxproxy/nsOSXSystemProxySettings.mm @@ -58,7 +58,7 @@ private: static const SchemeMapping gSchemeMappingList[]; }; -NS_IMPL_ISUPPORTS1(nsOSXSystemProxySettings, nsISystemProxySettings) +NS_IMPL_ISUPPORTS(nsOSXSystemProxySettings, nsISystemProxySettings) NS_IMETHODIMP nsOSXSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp index 835e6031b0a..781061f8a61 100644 --- a/toolkit/system/unixproxy/nsLibProxySettings.cpp +++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp @@ -33,7 +33,7 @@ private: pxProxyFactory *mProxyFactory; }; -NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings) +NS_IMPL_ISUPPORTS(nsUnixSystemProxySettings, nsISystemProxySettings) NS_IMETHODIMP nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp index e2fae9acbac..5bbd9a98edc 100644 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp @@ -45,7 +45,7 @@ private: nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult); }; -NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings) +NS_IMPL_ISUPPORTS(nsUnixSystemProxySettings, nsISystemProxySettings) NS_IMETHODIMP nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) diff --git a/toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp b/toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp index 61619020108..9ccd24f027d 100644 --- a/toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp +++ b/toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp @@ -33,7 +33,7 @@ private: bool PatternMatch(const nsACString& aHost, const nsACString& aOverride); }; -NS_IMPL_ISUPPORTS1(nsWindowsSystemProxySettings, nsISystemProxySettings) +NS_IMPL_ISUPPORTS(nsWindowsSystemProxySettings, nsISystemProxySettings) NS_IMETHODIMP nsWindowsSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 160d547a2af..e0873e6fc94 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -1297,7 +1297,7 @@ nsSingletonFactory::nsSingletonFactory(nsISupports* aSingleton) NS_ASSERTION(mSingleton, "Singleton was null!"); } -NS_IMPL_ISUPPORTS1(nsSingletonFactory, nsIFactory) +NS_IMPL_ISUPPORTS(nsSingletonFactory, nsIFactory) NS_IMETHODIMP nsSingletonFactory::CreateInstance(nsISupports* aOuter, diff --git a/toolkit/xre/nsNativeAppSupportBase.cpp b/toolkit/xre/nsNativeAppSupportBase.cpp index f96ffa750a9..877bd3d8acc 100644 --- a/toolkit/xre/nsNativeAppSupportBase.cpp +++ b/toolkit/xre/nsNativeAppSupportBase.cpp @@ -13,7 +13,7 @@ nsNativeAppSupportBase::~nsNativeAppSupportBase() { } -NS_IMPL_ISUPPORTS1(nsNativeAppSupportBase, nsINativeAppSupport) +NS_IMPL_ISUPPORTS(nsNativeAppSupportBase, nsINativeAppSupport) // Start answer defaults to OK. NS_IMETHODIMP diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index b8edd108626..2b9f8b400ba 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -1007,7 +1007,7 @@ ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir, -NS_IMPL_ISUPPORTS1(nsUpdateProcessor, nsIUpdateProcessor) +NS_IMPL_ISUPPORTS(nsUpdateProcessor, nsIUpdateProcessor) nsUpdateProcessor::nsUpdateProcessor() : mUpdaterPID(0) diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index 15f9b02e72c..88a4348bbc9 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -159,10 +159,10 @@ nsXREDirProvider::SetProfile(nsIFile* aDir, nsIFile* aLocalDir) return NS_OK; } -NS_IMPL_QUERY_INTERFACE3(nsXREDirProvider, - nsIDirectoryServiceProvider, - nsIDirectoryServiceProvider2, - nsIProfileStartup) +NS_IMPL_QUERY_INTERFACE(nsXREDirProvider, + nsIDirectoryServiceProvider, + nsIDirectoryServiceProvider2, + nsIProfileStartup) NS_IMETHODIMP_(MozExternalRefCountType) nsXREDirProvider::AddRef() diff --git a/tools/profiler/SaveProfileTask.cpp b/tools/profiler/SaveProfileTask.cpp index c94158de944..49738535557 100644 --- a/tools/profiler/SaveProfileTask.cpp +++ b/tools/profiler/SaveProfileTask.cpp @@ -35,7 +35,7 @@ SaveProfileTask::Run() { return NS_OK; } -NS_IMPL_ISUPPORTS1(ProfileSaveEvent, nsIProfileSaveEvent) +NS_IMPL_ISUPPORTS(ProfileSaveEvent, nsIProfileSaveEvent) nsresult ProfileSaveEvent::AddSubProfile(const char* aProfile) { diff --git a/tools/profiler/nsProfiler.cpp b/tools/profiler/nsProfiler.cpp index 2da9108ed48..c228c5c60d1 100644 --- a/tools/profiler/nsProfiler.cpp +++ b/tools/profiler/nsProfiler.cpp @@ -23,7 +23,7 @@ using std::string; -NS_IMPL_ISUPPORTS1(nsProfiler, nsIProfiler) +NS_IMPL_ISUPPORTS(nsProfiler, nsIProfiler) nsProfiler::nsProfiler() : mLockedForPrivateBrowsing(false) diff --git a/uriloader/exthandler/ExternalHelperAppChild.cpp b/uriloader/exthandler/ExternalHelperAppChild.cpp index f2d54135af0..a37d10e3cf5 100644 --- a/uriloader/exthandler/ExternalHelperAppChild.cpp +++ b/uriloader/exthandler/ExternalHelperAppChild.cpp @@ -16,9 +16,9 @@ namespace mozilla { namespace dom { -NS_IMPL_ISUPPORTS2(ExternalHelperAppChild, - nsIStreamListener, - nsIRequestObserver) +NS_IMPL_ISUPPORTS(ExternalHelperAppChild, + nsIStreamListener, + nsIRequestObserver) ExternalHelperAppChild::ExternalHelperAppChild() : mStatus(NS_OK) diff --git a/uriloader/exthandler/ExternalHelperAppParent.cpp b/uriloader/exthandler/ExternalHelperAppParent.cpp index a61dc529d9e..146a8340a01 100644 --- a/uriloader/exthandler/ExternalHelperAppParent.cpp +++ b/uriloader/exthandler/ExternalHelperAppParent.cpp @@ -27,13 +27,13 @@ using namespace mozilla::ipc; namespace mozilla { namespace dom { -NS_IMPL_ISUPPORTS_INHERITED5(ExternalHelperAppParent, - nsHashPropertyBag, - nsIRequest, - nsIChannel, - nsIMultiPartChannel, - nsIResumableChannel, - nsIStreamListener) +NS_IMPL_ISUPPORTS_INHERITED(ExternalHelperAppParent, + nsHashPropertyBag, + nsIRequest, + nsIChannel, + nsIMultiPartChannel, + nsIResumableChannel, + nsIStreamListener) ExternalHelperAppParent::ExternalHelperAppParent( const OptionalURIParams& uri, diff --git a/uriloader/exthandler/android/nsAndroidHandlerApp.cpp b/uriloader/exthandler/android/nsAndroidHandlerApp.cpp index c8f6063cc4e..8813275b781 100644 --- a/uriloader/exthandler/android/nsAndroidHandlerApp.cpp +++ b/uriloader/exthandler/android/nsAndroidHandlerApp.cpp @@ -9,7 +9,7 @@ using namespace mozilla::widget::android; -NS_IMPL_ISUPPORTS2(nsAndroidHandlerApp, nsIHandlerApp, nsISharingHandlerApp) +NS_IMPL_ISUPPORTS(nsAndroidHandlerApp, nsIHandlerApp, nsISharingHandlerApp) nsAndroidHandlerApp::nsAndroidHandlerApp(const nsAString& aName, const nsAString& aDescription, diff --git a/uriloader/exthandler/android/nsExternalSharingAppService.cpp b/uriloader/exthandler/android/nsExternalSharingAppService.cpp index e7ea5288bea..85770152c16 100644 --- a/uriloader/exthandler/android/nsExternalSharingAppService.cpp +++ b/uriloader/exthandler/android/nsExternalSharingAppService.cpp @@ -14,7 +14,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS1(nsExternalSharingAppService, nsIExternalSharingAppService) +NS_IMPL_ISUPPORTS(nsExternalSharingAppService, nsIExternalSharingAppService) nsExternalSharingAppService::nsExternalSharingAppService() { diff --git a/uriloader/exthandler/android/nsExternalURLHandlerService.cpp b/uriloader/exthandler/android/nsExternalURLHandlerService.cpp index 0d72064414e..f417b5b9f9b 100644 --- a/uriloader/exthandler/android/nsExternalURLHandlerService.cpp +++ b/uriloader/exthandler/android/nsExternalURLHandlerService.cpp @@ -6,7 +6,7 @@ #include "nsExternalURLHandlerService.h" #include "nsMIMEInfoAndroid.h" -NS_IMPL_ISUPPORTS1(nsExternalURLHandlerService, nsIExternalURLHandlerService) +NS_IMPL_ISUPPORTS(nsExternalURLHandlerService, nsIExternalURLHandlerService) nsExternalURLHandlerService::nsExternalURLHandlerService() { diff --git a/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp b/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp index d92838732ca..88d149189e4 100644 --- a/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp +++ b/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp @@ -12,7 +12,7 @@ using namespace mozilla::widget::android; -NS_IMPL_ISUPPORTS2(nsMIMEInfoAndroid, nsIMIMEInfo, nsIHandlerInfo) +NS_IMPL_ISUPPORTS(nsMIMEInfoAndroid, nsIMIMEInfo, nsIHandlerInfo) NS_IMETHODIMP nsMIMEInfoAndroid::LaunchDefaultWithFile(nsIFile* aFile) @@ -378,7 +378,7 @@ nsMIMEInfoAndroid::nsMIMEInfoAndroid(const nsACString& aMIMEType) : mHandlerApps->AppendElement(mPrefApp, false); } -NS_IMPL_ISUPPORTS1(nsMIMEInfoAndroid::SystemChooser, nsIHandlerApp) +NS_IMPL_ISUPPORTS(nsMIMEInfoAndroid::SystemChooser, nsIHandlerApp) nsresult nsMIMEInfoAndroid::SystemChooser::GetName(nsAString & aName) { diff --git a/uriloader/exthandler/nsContentHandlerApp.cpp b/uriloader/exthandler/nsContentHandlerApp.cpp index 6e3564a6d30..ce3f7b90f52 100644 --- a/uriloader/exthandler/nsContentHandlerApp.cpp +++ b/uriloader/exthandler/nsContentHandlerApp.cpp @@ -14,7 +14,7 @@ { 0x43ec2c82, 0xb9db, 0x4835, {0x80, 0x3f, 0x64, 0xc9, 0x72, 0x5a, 0x70, 0x28 } } NS_IMPL_CLASSINFO(nsContentHandlerApp, nullptr, 0, NS_CONTENTHANDLER_CID) -NS_IMPL_ISUPPORTS1_CI(nsContentHandlerApp, nsIHandlerApp) +NS_IMPL_ISUPPORTS_CI(nsContentHandlerApp, nsIHandlerApp) nsContentHandlerApp::nsContentHandlerApp(nsString aName, nsCString aType, ContentAction::Action& aAction) : diff --git a/uriloader/exthandler/nsDBusHandlerApp.cpp b/uriloader/exthandler/nsDBusHandlerApp.cpp index 0f52f6f7f09..e19d4f2de3b 100644 --- a/uriloader/exthandler/nsDBusHandlerApp.cpp +++ b/uriloader/exthandler/nsDBusHandlerApp.cpp @@ -14,7 +14,7 @@ // XXX why does nsMIMEInfoImpl have a threadsafe nsISupports? do we need one // here too? NS_IMPL_CLASSINFO(nsDBusHandlerApp, nullptr, 0, NS_DBUSHANDLERAPP_CID) -NS_IMPL_ISUPPORTS2_CI(nsDBusHandlerApp, nsIDBusHandlerApp, nsIHandlerApp) +NS_IMPL_ISUPPORTS_CI(nsDBusHandlerApp, nsIDBusHandlerApp, nsIHandlerApp) //////////////////////////////////////////////////////////////////////////////// //// nsIHandlerApp diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 6d82c7f5424..f27a619421e 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -578,7 +578,7 @@ static nsDefaultMimeTypeEntry nonDecodableExtensions [] = { { APPLICATION_GZIP, "svgz" } }; -NS_IMPL_ISUPPORTS6( +NS_IMPL_ISUPPORTS( nsExternalHelperAppService, nsIExternalHelperAppService, nsPIExternalAppLauncher, diff --git a/uriloader/exthandler/nsLocalHandlerApp.cpp b/uriloader/exthandler/nsLocalHandlerApp.cpp index 56164f8944d..e06cc39a5ef 100644 --- a/uriloader/exthandler/nsLocalHandlerApp.cpp +++ b/uriloader/exthandler/nsLocalHandlerApp.cpp @@ -10,7 +10,7 @@ // XXX why does nsMIMEInfoImpl have a threadsafe nsISupports? do we need one // here too? -NS_IMPL_ISUPPORTS2(nsLocalHandlerApp, nsILocalHandlerApp, nsIHandlerApp) +NS_IMPL_ISUPPORTS(nsLocalHandlerApp, nsILocalHandlerApp, nsIHandlerApp) //////////////////////////////////////////////////////////////////////////////// //// nsIHandlerApp diff --git a/uriloader/exthandler/unix/nsMeegoExternalSharingAppService.cpp b/uriloader/exthandler/unix/nsMeegoExternalSharingAppService.cpp index 66f4564ecce..2c44e55af1d 100644 --- a/uriloader/exthandler/unix/nsMeegoExternalSharingAppService.cpp +++ b/uriloader/exthandler/unix/nsMeegoExternalSharingAppService.cpp @@ -7,7 +7,7 @@ #include "nsExternalSharingAppService.h" #include "nsString.h" -NS_IMPL_ISUPPORTS1(nsExternalSharingAppService, nsIExternalSharingAppService) +NS_IMPL_ISUPPORTS(nsExternalSharingAppService, nsIExternalSharingAppService) nsExternalSharingAppService::nsExternalSharingAppService() : mShareUi(nullptr) diff --git a/uriloader/exthandler/win/nsMIMEInfoWin.cpp b/uriloader/exthandler/win/nsMIMEInfoWin.cpp index 44124be52a9..a8a1031bdc3 100644 --- a/uriloader/exthandler/win/nsMIMEInfoWin.cpp +++ b/uriloader/exthandler/win/nsMIMEInfoWin.cpp @@ -26,7 +26,7 @@ #define RUNDLL32_EXE L"\\rundll32.exe" -NS_IMPL_ISUPPORTS_INHERITED1(nsMIMEInfoWin, nsMIMEInfoBase, nsIPropertyBag) +NS_IMPL_ISUPPORTS_INHERITED(nsMIMEInfoWin, nsMIMEInfoBase, nsIPropertyBag) nsMIMEInfoWin::~nsMIMEInfoWin() { diff --git a/uriloader/prefetch/OfflineCacheUpdateGlue.cpp b/uriloader/prefetch/OfflineCacheUpdateGlue.cpp index 0c6adefb433..1e33d3a0866 100644 --- a/uriloader/prefetch/OfflineCacheUpdateGlue.cpp +++ b/uriloader/prefetch/OfflineCacheUpdateGlue.cpp @@ -40,10 +40,10 @@ namespace docshell { // OfflineCacheUpdateGlue::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS3(OfflineCacheUpdateGlue, - nsIOfflineCacheUpdate, - nsIOfflineCacheUpdateObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(OfflineCacheUpdateGlue, + nsIOfflineCacheUpdate, + nsIOfflineCacheUpdateObserver, + nsISupportsWeakReference) //----------------------------------------------------------------------------- // OfflineCacheUpdateGlue diff --git a/uriloader/prefetch/OfflineCacheUpdateParent.cpp b/uriloader/prefetch/OfflineCacheUpdateParent.cpp index 6dd062d9fb9..8abc68daa17 100644 --- a/uriloader/prefetch/OfflineCacheUpdateParent.cpp +++ b/uriloader/prefetch/OfflineCacheUpdateParent.cpp @@ -43,9 +43,9 @@ namespace docshell { // OfflineCacheUpdateParent::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS2(OfflineCacheUpdateParent, - nsIOfflineCacheUpdateObserver, - nsILoadContext) +NS_IMPL_ISUPPORTS(OfflineCacheUpdateParent, + nsIOfflineCacheUpdateObserver, + nsILoadContext) //----------------------------------------------------------------------------- // OfflineCacheUpdateParent diff --git a/uriloader/prefetch/nsOfflineCacheUpdate.cpp b/uriloader/prefetch/nsOfflineCacheUpdate.cpp index 276c8355c0e..edbdb480a0b 100644 --- a/uriloader/prefetch/nsOfflineCacheUpdate.cpp +++ b/uriloader/prefetch/nsOfflineCacheUpdate.cpp @@ -161,11 +161,11 @@ private: //----------------------------------------------------------------------------- // nsManifestCheck::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS4(nsManifestCheck, - nsIRequestObserver, - nsIStreamListener, - nsIChannelEventSink, - nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(nsManifestCheck, + nsIRequestObserver, + nsIStreamListener, + nsIChannelEventSink, + nsIInterfaceRequestor) //----------------------------------------------------------------------------- // nsManifestCheck @@ -309,12 +309,12 @@ nsManifestCheck::AsyncOnChannelRedirect(nsIChannel *aOldChannel, // nsOfflineCacheUpdateItem::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS5(nsOfflineCacheUpdateItem, - nsIRequestObserver, - nsIStreamListener, - nsIRunnable, - nsIInterfaceRequestor, - nsIChannelEventSink) +NS_IMPL_ISUPPORTS(nsOfflineCacheUpdateItem, + nsIRequestObserver, + nsIStreamListener, + nsIRunnable, + nsIInterfaceRequestor, + nsIChannelEventSink) //----------------------------------------------------------------------------- // nsOfflineCacheUpdateItem @@ -1146,10 +1146,10 @@ nsOfflineManifestItem::OnStopRequest(nsIRequest *aRequest, // nsOfflineCacheUpdate::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS3(nsOfflineCacheUpdate, - nsIOfflineCacheUpdateObserver, - nsIOfflineCacheUpdate, - nsIRunnable) +NS_IMPL_ISUPPORTS(nsOfflineCacheUpdate, + nsIOfflineCacheUpdateObserver, + nsIOfflineCacheUpdate, + nsIRunnable) //----------------------------------------------------------------------------- // nsOfflineCacheUpdate diff --git a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp index 068b3f50977..38200410c91 100644 --- a/uriloader/prefetch/nsOfflineCacheUpdateService.cpp +++ b/uriloader/prefetch/nsOfflineCacheUpdateService.cpp @@ -160,9 +160,9 @@ private: bool mDidReleaseThis; }; -NS_IMPL_ISUPPORTS2(nsOfflineCachePendingUpdate, - nsIWebProgressListener, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsOfflineCachePendingUpdate, + nsIWebProgressListener, + nsISupportsWeakReference) //----------------------------------------------------------------------------- // nsOfflineCacheUpdateService::nsIWebProgressListener @@ -277,10 +277,10 @@ nsOfflineCachePendingUpdate::OnSecurityChange(nsIWebProgress *aWebProgress, // nsOfflineCacheUpdateService::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS3(nsOfflineCacheUpdateService, - nsIOfflineCacheUpdateService, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsOfflineCacheUpdateService, + nsIOfflineCacheUpdateService, + nsIObserver, + nsISupportsWeakReference) //----------------------------------------------------------------------------- // nsOfflineCacheUpdateService diff --git a/uriloader/prefetch/nsPrefetchService.cpp b/uriloader/prefetch/nsPrefetchService.cpp index f93d265d371..34fde9273de 100644 --- a/uriloader/prefetch/nsPrefetchService.cpp +++ b/uriloader/prefetch/nsPrefetchService.cpp @@ -156,7 +156,7 @@ nsPrefetchQueueEnumerator::Increment() // nsPrefetchQueueEnumerator::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsPrefetchQueueEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsPrefetchQueueEnumerator, nsISimpleEnumerator) //----------------------------------------------------------------------------- // nsPrefetchNode @@ -223,12 +223,12 @@ nsPrefetchNode::CancelChannel(nsresult error) // nsPrefetchNode::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS5(nsPrefetchNode, - nsIRequestObserver, - nsIStreamListener, - nsIInterfaceRequestor, - nsIChannelEventSink, - nsIRedirectResultListener) +NS_IMPL_ISUPPORTS(nsPrefetchNode, + nsIRequestObserver, + nsIStreamListener, + nsIInterfaceRequestor, + nsIChannelEventSink, + nsIRedirectResultListener) //----------------------------------------------------------------------------- // nsPrefetchNode::nsIStreamListener @@ -618,11 +618,11 @@ nsPrefetchService::StopPrefetching() // nsPrefetchService::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS4(nsPrefetchService, - nsIPrefetchService, - nsIWebProgressListener, - nsIObserver, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsPrefetchService, + nsIPrefetchService, + nsIWebProgressListener, + nsIObserver, + nsISupportsWeakReference) //----------------------------------------------------------------------------- // nsPrefetchService::nsIPrefetchService diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp index 6c66c28c6f5..00191602090 100644 --- a/widget/android/AndroidBridge.cpp +++ b/widget/android/AndroidBridge.cpp @@ -1487,7 +1487,7 @@ AndroidBridge::~AndroidBridge() } /* Implementation file */ -NS_IMPL_ISUPPORTS1(nsAndroidBridge, nsIAndroidBridge) +NS_IMPL_ISUPPORTS(nsAndroidBridge, nsIAndroidBridge) nsAndroidBridge::nsAndroidBridge() { diff --git a/widget/android/AndroidJavaWrappers.cpp b/widget/android/AndroidJavaWrappers.cpp index 5fc716cee91..cd0be4728ec 100644 --- a/widget/android/AndroidJavaWrappers.cpp +++ b/widget/android/AndroidJavaWrappers.cpp @@ -862,7 +862,7 @@ AndroidLayerRendererFrame::Dispose(JNIEnv *env) wrapped_obj = 0; } -NS_IMPL_ISUPPORTS1(nsAndroidDisplayport, nsIAndroidDisplayport) +NS_IMPL_ISUPPORTS(nsAndroidDisplayport, nsIAndroidDisplayport) bool AndroidLayerRendererFrame::BeginDrawing(AutoLocalJNIFrame *jniFrame) diff --git a/widget/android/GfxInfo.cpp b/widget/android/GfxInfo.cpp index 223be294464..4f9be5e107a 100644 --- a/widget/android/GfxInfo.cpp +++ b/widget/android/GfxInfo.cpp @@ -106,7 +106,7 @@ public: }; #ifdef DEBUG -NS_IMPL_ISUPPORTS_INHERITED1(GfxInfo, GfxInfoBase, nsIGfxInfoDebug) +NS_IMPL_ISUPPORTS_INHERITED(GfxInfo, GfxInfoBase, nsIGfxInfoDebug) #endif GfxInfo::GfxInfo() diff --git a/widget/android/nsAppShell.cpp b/widget/android/nsAppShell.cpp index f51a5ff5c44..680838bdc06 100644 --- a/widget/android/nsAppShell.cpp +++ b/widget/android/nsAppShell.cpp @@ -68,7 +68,7 @@ nsAutoPtr gLastSizeChange; nsAppShell *nsAppShell::gAppShell = nullptr; -NS_IMPL_ISUPPORTS_INHERITED1(nsAppShell, nsBaseAppShell, nsIObserver) +NS_IMPL_ISUPPORTS_INHERITED(nsAppShell, nsBaseAppShell, nsIObserver) class ThumbnailRunnable : public nsRunnable { public: @@ -115,7 +115,7 @@ class WakeLockListener MOZ_FINAL : public nsIDOMMozWakeLockListener { } }; -NS_IMPL_ISUPPORTS1(WakeLockListener, nsIDOMMozWakeLockListener) +NS_IMPL_ISUPPORTS(WakeLockListener, nsIDOMMozWakeLockListener) nsCOMPtr sPowerManagerService = nullptr; StaticRefPtr sWakeLockListener; diff --git a/widget/android/nsClipboard.cpp b/widget/android/nsClipboard.cpp index eac772481a9..e0a1d63bdb5 100644 --- a/widget/android/nsClipboard.cpp +++ b/widget/android/nsClipboard.cpp @@ -13,7 +13,7 @@ using namespace mozilla; using mozilla::dom::ContentChild; -NS_IMPL_ISUPPORTS1(nsClipboard, nsIClipboard) +NS_IMPL_ISUPPORTS(nsClipboard, nsIClipboard) /* The Android clipboard only supports text and doesn't support mime types * so we assume all clipboard data is text/unicode for now. Documentation diff --git a/widget/android/nsDeviceContextAndroid.cpp b/widget/android/nsDeviceContextAndroid.cpp index e9d489beae7..815e9ee198b 100644 --- a/widget/android/nsDeviceContextAndroid.cpp +++ b/widget/android/nsDeviceContextAndroid.cpp @@ -10,7 +10,7 @@ #include "nsIPrintSettings.h" #include "nsDirectoryServiceDefs.h" -NS_IMPL_ISUPPORTS1(nsDeviceContextSpecAndroid, nsIDeviceContextSpec) +NS_IMPL_ISUPPORTS(nsDeviceContextSpecAndroid, nsIDeviceContextSpec) NS_IMETHODIMP nsDeviceContextSpecAndroid::GetSurfaceForPrinter(gfxASurface** aSurface) diff --git a/widget/android/nsIMEPicker.cpp b/widget/android/nsIMEPicker.cpp index 098bf331e93..a9075acaf79 100644 --- a/widget/android/nsIMEPicker.cpp +++ b/widget/android/nsIMEPicker.cpp @@ -7,7 +7,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS1(nsIMEPicker, nsIIMEPicker) +NS_IMPL_ISUPPORTS(nsIMEPicker, nsIIMEPicker) nsIMEPicker::nsIMEPicker() { diff --git a/widget/android/nsScreenManagerAndroid.cpp b/widget/android/nsScreenManagerAndroid.cpp index cbc83eb2af2..6bf5600b6b6 100644 --- a/widget/android/nsScreenManagerAndroid.cpp +++ b/widget/android/nsScreenManagerAndroid.cpp @@ -62,7 +62,7 @@ nsScreenAndroid::ApplyMinimumBrightness(uint32_t aBrightness) mozilla::widget::android::GeckoAppShell::SetKeepScreenOn(aBrightness == BRIGHTNESS_FULL); } -NS_IMPL_ISUPPORTS1(nsScreenManagerAndroid, nsIScreenManager) +NS_IMPL_ISUPPORTS(nsScreenManagerAndroid, nsIScreenManager) nsScreenManagerAndroid::nsScreenManagerAndroid() { diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp index 365eae5eefb..4531b3436ea 100644 --- a/widget/android/nsWindow.cpp +++ b/widget/android/nsWindow.cpp @@ -113,8 +113,8 @@ class ContentCreationNotifier MOZ_FINAL : public nsIObserver } }; -NS_IMPL_ISUPPORTS1(ContentCreationNotifier, - nsIObserver) +NS_IMPL_ISUPPORTS(ContentCreationNotifier, + nsIObserver) static bool gMenu; static bool gMenuConsumed; diff --git a/widget/cocoa/GfxInfo.mm b/widget/cocoa/GfxInfo.mm index a94f0bd10a6..da4a345eee2 100644 --- a/widget/cocoa/GfxInfo.mm +++ b/widget/cocoa/GfxInfo.mm @@ -34,7 +34,7 @@ using namespace mozilla; using namespace mozilla::widget; #ifdef DEBUG -NS_IMPL_ISUPPORTS_INHERITED1(GfxInfo, GfxInfoBase, nsIGfxInfoDebug) +NS_IMPL_ISUPPORTS_INHERITED(GfxInfo, GfxInfoBase, nsIGfxInfoDebug) #endif GfxInfo::GfxInfo() diff --git a/widget/cocoa/OSXNotificationCenter.mm b/widget/cocoa/OSXNotificationCenter.mm index bc68b472fc4..132eee55960 100644 --- a/widget/cocoa/OSXNotificationCenter.mm +++ b/widget/cocoa/OSXNotificationCenter.mm @@ -181,7 +181,7 @@ OSXNotificationCenter::~OSXNotificationCenter() NS_OBJC_END_TRY_ABORT_BLOCK; } -NS_IMPL_ISUPPORTS3(OSXNotificationCenter, nsIAlertsService, imgINotificationObserver, nsITimerCallback) +NS_IMPL_ISUPPORTS(OSXNotificationCenter, nsIAlertsService, imgINotificationObserver, nsITimerCallback) nsresult OSXNotificationCenter::Init() { diff --git a/widget/cocoa/nsBidiKeyboard.mm b/widget/cocoa/nsBidiKeyboard.mm index 536e866897d..e0fc86aeb79 100644 --- a/widget/cocoa/nsBidiKeyboard.mm +++ b/widget/cocoa/nsBidiKeyboard.mm @@ -13,7 +13,7 @@ using namespace mozilla::widget; -NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) +NS_IMPL_ISUPPORTS(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 2c525de83bf..dae2d042293 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -427,7 +427,7 @@ nsChildView::ReleaseTitlebarCGContext() } } -NS_IMPL_ISUPPORTS_INHERITED1(nsChildView, nsBaseWidget, nsIPluginWidget) +NS_IMPL_ISUPPORTS_INHERITED(nsChildView, nsBaseWidget, nsIPluginWidget) nsresult nsChildView::Create(nsIWidget *aParent, nsNativeWidget aNativeParent, diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm index cea85e4409f..740919bdf90 100644 --- a/widget/cocoa/nsCocoaWindow.mm +++ b/widget/cocoa/nsCocoaWindow.mm @@ -80,7 +80,7 @@ extern "C" { #define NS_APPSHELLSERVICE_CONTRACTID "@mozilla.org/appshell/appShellService;1" -NS_IMPL_ISUPPORTS_INHERITED1(nsCocoaWindow, Inherited, nsPIWidgetCocoa) +NS_IMPL_ISUPPORTS_INHERITED(nsCocoaWindow, Inherited, nsPIWidgetCocoa) // A note on testing to see if your object is a sheet... // |mWindowType == eWindowType_sheet| is true if your gecko nsIWidget is a sheet diff --git a/widget/cocoa/nsColorPicker.mm b/widget/cocoa/nsColorPicker.mm index ff87f28d9bf..b27191d5774 100644 --- a/widget/cocoa/nsColorPicker.mm +++ b/widget/cocoa/nsColorPicker.mm @@ -93,7 +93,7 @@ HexStrToInt(NSString* str) } @end -NS_IMPL_ISUPPORTS1(nsColorPicker, nsIColorPicker) +NS_IMPL_ISUPPORTS(nsColorPicker, nsIColorPicker) NSColorPanelWrapper* nsColorPicker::sColorPanelWrapper = nullptr; diff --git a/widget/cocoa/nsDeviceContextSpecX.mm b/widget/cocoa/nsDeviceContextSpecX.mm index 004182e2596..1ff9188f2b2 100644 --- a/widget/cocoa/nsDeviceContextSpecX.mm +++ b/widget/cocoa/nsDeviceContextSpecX.mm @@ -35,7 +35,7 @@ nsDeviceContextSpecX::~nsDeviceContextSpecX() NS_OBJC_END_TRY_ABORT_BLOCK; } -NS_IMPL_ISUPPORTS1(nsDeviceContextSpecX, nsIDeviceContextSpec) +NS_IMPL_ISUPPORTS(nsDeviceContextSpecX, nsIDeviceContextSpec) NS_IMETHODIMP nsDeviceContextSpecX::Init(nsIWidget *aWidget, nsIPrintSettings* aPS, diff --git a/widget/cocoa/nsFilePicker.mm b/widget/cocoa/nsFilePicker.mm index 38e0d9f5a68..1214992fd7e 100644 --- a/widget/cocoa/nsFilePicker.mm +++ b/widget/cocoa/nsFilePicker.mm @@ -45,7 +45,7 @@ const char kShowHiddenFilesPref[] = "filepicker.showHiddenFiles"; - (void) menuChangedItem:(NSNotification*)aSender; @end -NS_IMPL_ISUPPORTS1(nsFilePicker, nsIFilePicker) +NS_IMPL_ISUPPORTS(nsFilePicker, nsIFilePicker) // We never want to call the secret show hidden files API unless the pref // has been set. Once the pref has been set we always need to call it even diff --git a/widget/cocoa/nsMacDockSupport.mm b/widget/cocoa/nsMacDockSupport.mm index e112e1e46ff..a081903d327 100644 --- a/widget/cocoa/nsMacDockSupport.mm +++ b/widget/cocoa/nsMacDockSupport.mm @@ -9,7 +9,7 @@ #include "nsMacDockSupport.h" #include "nsObjCExceptions.h" -NS_IMPL_ISUPPORTS2(nsMacDockSupport, nsIMacDockSupport, nsITaskbarProgress) +NS_IMPL_ISUPPORTS(nsMacDockSupport, nsIMacDockSupport, nsITaskbarProgress) nsMacDockSupport::nsMacDockSupport() : mAppIcon(nil) diff --git a/widget/cocoa/nsMacWebAppUtils.mm b/widget/cocoa/nsMacWebAppUtils.mm index cc96abf8ed7..1b98cef7cc2 100644 --- a/widget/cocoa/nsMacWebAppUtils.mm +++ b/widget/cocoa/nsMacWebAppUtils.mm @@ -16,7 +16,7 @@ // Note that the OS will return the path to the newest binary, if there is more than one. // The determination of 'newest' is complex and beyond the scope of this comment. -NS_IMPL_ISUPPORTS1(nsMacWebAppUtils, nsIMacWebAppUtils) +NS_IMPL_ISUPPORTS(nsMacWebAppUtils, nsIMacWebAppUtils) NS_IMETHODIMP nsMacWebAppUtils::PathForAppWithIdentifier(const nsAString& bundleIdentifier, nsAString& outPath) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT; diff --git a/widget/cocoa/nsMenuBarX.mm b/widget/cocoa/nsMenuBarX.mm index 392c8a82890..b9eac4ef73d 100644 --- a/widget/cocoa/nsMenuBarX.mm +++ b/widget/cocoa/nsMenuBarX.mm @@ -41,7 +41,7 @@ static nsIContent* sUpdateItemContent = nullptr; static nsIContent* sPrefItemContent = nullptr; static nsIContent* sQuitItemContent = nullptr; -NS_IMPL_ISUPPORTS1(nsNativeMenuServiceX, nsINativeMenuService) +NS_IMPL_ISUPPORTS(nsNativeMenuServiceX, nsINativeMenuService) NS_IMETHODIMP nsNativeMenuServiceX::CreateNativeMenuBar(nsIWidget* aParent, nsIContent* aMenuBarNode) { diff --git a/widget/cocoa/nsMenuGroupOwnerX.mm b/widget/cocoa/nsMenuGroupOwnerX.mm index 866f4a5ce22..c3fd2dd649a 100644 --- a/widget/cocoa/nsMenuGroupOwnerX.mm +++ b/widget/cocoa/nsMenuGroupOwnerX.mm @@ -26,7 +26,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS1(nsMenuGroupOwnerX, nsIMutationObserver) +NS_IMPL_ISUPPORTS(nsMenuGroupOwnerX, nsIMutationObserver) nsMenuGroupOwnerX::nsMenuGroupOwnerX() diff --git a/widget/cocoa/nsMenuItemIconX.mm b/widget/cocoa/nsMenuItemIconX.mm index aea85c49cc1..948675b1567 100644 --- a/widget/cocoa/nsMenuItemIconX.mm +++ b/widget/cocoa/nsMenuItemIconX.mm @@ -56,7 +56,7 @@ static const uint32_t kIconBytes = kIconBytesPerRow * kIconHeight; typedef NS_STDCALL_FUNCPROTO(nsresult, GetRectSideMethod, nsIDOMRect, GetBottom, (nsIDOMCSSPrimitiveValue**)); -NS_IMPL_ISUPPORTS1(nsMenuItemIconX, imgINotificationObserver) +NS_IMPL_ISUPPORTS(nsMenuItemIconX, imgINotificationObserver) nsMenuItemIconX::nsMenuItemIconX(nsMenuObjectX* aMenuItem, nsIContent* aContent, diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm index 00ba7d48582..289e88d0014 100644 --- a/widget/cocoa/nsNativeThemeCocoa.mm +++ b/widget/cocoa/nsNativeThemeCocoa.mm @@ -453,7 +453,7 @@ static BOOL IsActive(nsIFrame* aFrame, BOOL aIsToolbarControl) return FrameIsInActiveWindow(aFrame); } -NS_IMPL_ISUPPORTS_INHERITED1(nsNativeThemeCocoa, nsNativeTheme, nsITheme) +NS_IMPL_ISUPPORTS_INHERITED(nsNativeThemeCocoa, nsNativeTheme, nsITheme) nsNativeThemeCocoa::nsNativeThemeCocoa() diff --git a/widget/cocoa/nsPrintDialogX.mm b/widget/cocoa/nsPrintDialogX.mm index 7d75b845efc..4320fe19edb 100644 --- a/widget/cocoa/nsPrintDialogX.mm +++ b/widget/cocoa/nsPrintDialogX.mm @@ -20,7 +20,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS1(nsPrintDialogServiceX, nsIPrintDialogService) +NS_IMPL_ISUPPORTS(nsPrintDialogServiceX, nsIPrintDialogService) nsPrintDialogServiceX::nsPrintDialogServiceX() { diff --git a/widget/cocoa/nsPrintSettingsX.mm b/widget/cocoa/nsPrintSettingsX.mm index e0609d69643..d2306c87fd2 100644 --- a/widget/cocoa/nsPrintSettingsX.mm +++ b/widget/cocoa/nsPrintSettingsX.mm @@ -17,7 +17,7 @@ using namespace mozilla; #define MAC_OS_X_PAGE_SETUP_PREFNAME "print.macosx.pagesetup-2" -NS_IMPL_ISUPPORTS_INHERITED1(nsPrintSettingsX, nsPrintSettings, nsPrintSettingsX) +NS_IMPL_ISUPPORTS_INHERITED(nsPrintSettingsX, nsPrintSettings, nsPrintSettingsX) nsPrintSettingsX::nsPrintSettingsX() { diff --git a/widget/cocoa/nsScreenManagerCocoa.mm b/widget/cocoa/nsScreenManagerCocoa.mm index 77a24b8a957..3325bece935 100644 --- a/widget/cocoa/nsScreenManagerCocoa.mm +++ b/widget/cocoa/nsScreenManagerCocoa.mm @@ -8,7 +8,7 @@ #include "nsCOMPtr.h" #include "nsCocoaUtils.h" -NS_IMPL_ISUPPORTS1(nsScreenManagerCocoa, nsIScreenManager) +NS_IMPL_ISUPPORTS(nsScreenManagerCocoa, nsIScreenManager) nsScreenManagerCocoa::nsScreenManagerCocoa() { diff --git a/widget/cocoa/nsSound.mm b/widget/cocoa/nsSound.mm index 06809308268..af0eb05ac67 100644 --- a/widget/cocoa/nsSound.mm +++ b/widget/cocoa/nsSound.mm @@ -13,7 +13,7 @@ #import -NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver) +NS_IMPL_ISUPPORTS(nsSound, nsISound, nsIStreamLoaderObserver) nsSound::nsSound() { diff --git a/widget/cocoa/nsStandaloneNativeMenu.mm b/widget/cocoa/nsStandaloneNativeMenu.mm index 043ba97a71b..caec69ac501 100644 --- a/widget/cocoa/nsStandaloneNativeMenu.mm +++ b/widget/cocoa/nsStandaloneNativeMenu.mm @@ -13,7 +13,7 @@ #include "nsObjCExceptions.h" -NS_IMPL_ISUPPORTS2(nsStandaloneNativeMenu, nsIMutationObserver, nsIStandaloneNativeMenu) +NS_IMPL_ISUPPORTS(nsStandaloneNativeMenu, nsIMutationObserver, nsIStandaloneNativeMenu) nsStandaloneNativeMenu::nsStandaloneNativeMenu() : mMenu(nullptr) diff --git a/widget/gonk/GonkMemoryPressureMonitoring.cpp b/widget/gonk/GonkMemoryPressureMonitoring.cpp index 618c4c7583d..2527da31ec0 100644 --- a/widget/gonk/GonkMemoryPressureMonitoring.cpp +++ b/widget/gonk/GonkMemoryPressureMonitoring.cpp @@ -269,7 +269,7 @@ private: ScopedClose mShutdownPipeWrite; }; -NS_IMPL_ISUPPORTS2(MemoryPressureWatcher, nsIRunnable, nsIObserver); +NS_IMPL_ISUPPORTS(MemoryPressureWatcher, nsIRunnable, nsIObserver); } // anonymous namespace diff --git a/widget/gonk/nsAppShell.cpp b/widget/gonk/nsAppShell.cpp index 96dc56b958b..7b3990c9433 100644 --- a/widget/gonk/nsAppShell.cpp +++ b/widget/gonk/nsAppShell.cpp @@ -100,7 +100,7 @@ static int32_t sMicrophoneState; // Amount of time in MS before an input is considered expired. static const uint64_t kInputExpirationThresholdMs = 1000; -NS_IMPL_ISUPPORTS_INHERITED1(nsAppShell, nsBaseAppShell, nsIObserver) +NS_IMPL_ISUPPORTS_INHERITED(nsAppShell, nsBaseAppShell, nsIObserver) static uint64_t nanosecsToMillisecs(nsecs_t nsecs) diff --git a/widget/gonk/nsClipboard.cpp b/widget/gonk/nsClipboard.cpp index 176ee5643f8..aed3782daa2 100644 --- a/widget/gonk/nsClipboard.cpp +++ b/widget/gonk/nsClipboard.cpp @@ -16,7 +16,7 @@ using mozilla::dom::ContentChild; #define LOGI(args...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, ## args) #define LOGE(args...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, ## args) -NS_IMPL_ISUPPORTS1(nsClipboard, nsIClipboard) +NS_IMPL_ISUPPORTS(nsClipboard, nsIClipboard) nsClipboard::nsClipboard() { diff --git a/widget/gonk/nsWindow.cpp b/widget/gonk/nsWindow.cpp index 6e182382c98..bf21cdacd4a 100644 --- a/widget/gonk/nsWindow.cpp +++ b/widget/gonk/nsWindow.cpp @@ -815,7 +815,7 @@ nsScreenGonk::GetConfiguration() colorDepth, colorDepth); } -NS_IMPL_ISUPPORTS1(nsScreenManagerGonk, nsIScreenManager) +NS_IMPL_ISUPPORTS(nsScreenManagerGonk, nsIScreenManager) nsScreenManagerGonk::nsScreenManagerGonk() { diff --git a/widget/gtk/nsBidiKeyboard.cpp b/widget/gtk/nsBidiKeyboard.cpp index a5038d02809..461bf8231ee 100644 --- a/widget/gtk/nsBidiKeyboard.cpp +++ b/widget/gtk/nsBidiKeyboard.cpp @@ -15,7 +15,7 @@ typedef gboolean (*GdkKeymapHaveBidiLayoutsType)(GdkKeymap *keymap); static GdkKeymapHaveBidiLayoutsType GdkKeymapHaveBidiLayouts = nullptr; #endif -NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) +NS_IMPL_ISUPPORTS(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() { diff --git a/widget/gtk/nsClipboard.cpp b/widget/gtk/nsClipboard.cpp index 975e73c413c..7b9d00141f7 100644 --- a/widget/gtk/nsClipboard.cpp +++ b/widget/gtk/nsClipboard.cpp @@ -85,7 +85,7 @@ nsClipboard::~nsClipboard() } } -NS_IMPL_ISUPPORTS1(nsClipboard, nsIClipboard) +NS_IMPL_ISUPPORTS(nsClipboard, nsIClipboard) nsresult nsClipboard::Init(void) diff --git a/widget/gtk/nsColorPicker.cpp b/widget/gtk/nsColorPicker.cpp index 2f9df9b00ec..cacfdb4cc0e 100644 --- a/widget/gtk/nsColorPicker.cpp +++ b/widget/gtk/nsColorPicker.cpp @@ -11,7 +11,7 @@ #include "nsIWidget.h" #include "WidgetUtils.h" -NS_IMPL_ISUPPORTS1(nsColorPicker, nsIColorPicker) +NS_IMPL_ISUPPORTS(nsColorPicker, nsIColorPicker) int nsColorPicker::convertGdkColorComponent(guint16 color_component) { // GdkColor value is in range [0..65535]. We need something in range [0..255] diff --git a/widget/gtk/nsDeviceContextSpecG.cpp b/widget/gtk/nsDeviceContextSpecG.cpp index 8e06757394d..cbc5312a13a 100644 --- a/widget/gtk/nsDeviceContextSpecG.cpp +++ b/widget/gtk/nsDeviceContextSpecG.cpp @@ -104,8 +104,8 @@ nsDeviceContextSpecGTK::~nsDeviceContextSpecGTK() } } -NS_IMPL_ISUPPORTS1(nsDeviceContextSpecGTK, - nsIDeviceContextSpec) +NS_IMPL_ISUPPORTS(nsDeviceContextSpecGTK, + nsIDeviceContextSpec) #include "gfxPDFSurface.h" #include "gfxPSSurface.h" @@ -412,7 +412,7 @@ nsPrinterEnumeratorGTK::nsPrinterEnumeratorGTK() { } -NS_IMPL_ISUPPORTS1(nsPrinterEnumeratorGTK, nsIPrinterEnumerator) +NS_IMPL_ISUPPORTS(nsPrinterEnumeratorGTK, nsIPrinterEnumerator) NS_IMETHODIMP nsPrinterEnumeratorGTK::GetPrinterNameList(nsIStringEnumerator **aPrinterNameList) { diff --git a/widget/gtk/nsDragService.cpp b/widget/gtk/nsDragService.cpp index e44f2c63189..3fe0abb39bf 100644 --- a/widget/gtk/nsDragService.cpp +++ b/widget/gtk/nsDragService.cpp @@ -142,7 +142,7 @@ nsDragService::~nsDragService() } -NS_IMPL_ISUPPORTS_INHERITED1(nsDragService, nsBaseDragService, nsIObserver) +NS_IMPL_ISUPPORTS_INHERITED(nsDragService, nsBaseDragService, nsIObserver) /* static */ nsDragService* nsDragService::GetInstance() diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp index 2522b0bc3b2..562947e9c8e 100644 --- a/widget/gtk/nsFilePicker.cpp +++ b/widget/gtk/nsFilePicker.cpp @@ -148,7 +148,7 @@ MakeCaseInsensitiveShellGlob(const char* aPattern) { return result; } -NS_IMPL_ISUPPORTS1(nsFilePicker, nsIFilePicker) +NS_IMPL_ISUPPORTS(nsFilePicker, nsIFilePicker) nsFilePicker::nsFilePicker() : mSelectedType(0), diff --git a/widget/gtk/nsImageToPixbuf.cpp b/widget/gtk/nsImageToPixbuf.cpp index 47eb16cfcba..ca05b3b8a49 100644 --- a/widget/gtk/nsImageToPixbuf.cpp +++ b/widget/gtk/nsImageToPixbuf.cpp @@ -16,7 +16,7 @@ using mozilla::gfx::DataSourceSurface; using mozilla::gfx::SurfaceFormat; using mozilla::RefPtr; -NS_IMPL_ISUPPORTS1(nsImageToPixbuf, nsIImageToPixbuf) +NS_IMPL_ISUPPORTS(nsImageToPixbuf, nsIImageToPixbuf) inline unsigned char unpremultiply (unsigned char color, diff --git a/widget/gtk/nsNativeThemeGTK.cpp b/widget/gtk/nsNativeThemeGTK.cpp index 685ab5b5e40..247e79fca81 100644 --- a/widget/gtk/nsNativeThemeGTK.cpp +++ b/widget/gtk/nsNativeThemeGTK.cpp @@ -35,8 +35,8 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS_INHERITED2(nsNativeThemeGTK, nsNativeTheme, nsITheme, - nsIObserver) +NS_IMPL_ISUPPORTS_INHERITED(nsNativeThemeGTK, nsNativeTheme, nsITheme, + nsIObserver) static int gLastGdkError; diff --git a/widget/gtk/nsPrintDialogGTK.cpp b/widget/gtk/nsPrintDialogGTK.cpp index 72288fc6d85..b230e18a23e 100644 --- a/widget/gtk/nsPrintDialogGTK.cpp +++ b/widget/gtk/nsPrintDialogGTK.cpp @@ -513,7 +513,7 @@ nsPrintDialogWidgetGTK::ConstructHeaderFooterDropdown(const char16_t *currentStr return dropdown; } -NS_IMPL_ISUPPORTS1(nsPrintDialogServiceGTK, nsIPrintDialogService) +NS_IMPL_ISUPPORTS(nsPrintDialogServiceGTK, nsIPrintDialogService) nsPrintDialogServiceGTK::nsPrintDialogServiceGTK() { diff --git a/widget/gtk/nsPrintSettingsGTK.cpp b/widget/gtk/nsPrintSettingsGTK.cpp index 66c7a4fb823..3130d72ebd6 100644 --- a/widget/gtk/nsPrintSettingsGTK.cpp +++ b/widget/gtk/nsPrintSettingsGTK.cpp @@ -36,9 +36,9 @@ GtkPaperSize* moz_gtk_paper_size_copy_to_new_custom(GtkPaperSize* oldPaperSize) GTK_UNIT_INCH); } -NS_IMPL_ISUPPORTS_INHERITED1(nsPrintSettingsGTK, - nsPrintSettings, - nsPrintSettingsGTK) +NS_IMPL_ISUPPORTS_INHERITED(nsPrintSettingsGTK, + nsPrintSettings, + nsPrintSettingsGTK) /** --------------------------------------------------- */ diff --git a/widget/gtk/nsScreenManagerGtk.cpp b/widget/gtk/nsScreenManagerGtk.cpp index 812f7071625..1bb0f3680f9 100644 --- a/widget/gtk/nsScreenManagerGtk.cpp +++ b/widget/gtk/nsScreenManagerGtk.cpp @@ -79,7 +79,7 @@ nsScreenManagerGtk :: ~nsScreenManagerGtk() // addref, release, QI -NS_IMPL_ISUPPORTS1(nsScreenManagerGtk, nsIScreenManager) +NS_IMPL_ISUPPORTS(nsScreenManagerGtk, nsIScreenManager) // this function will make sure that everything has been initialized. diff --git a/widget/gtk/nsSound.cpp b/widget/gtk/nsSound.cpp index 9fa34340a1e..7135603d0cd 100644 --- a/widget/gtk/nsSound.cpp +++ b/widget/gtk/nsSound.cpp @@ -165,7 +165,7 @@ ca_finish_cb(ca_context *c, } } -NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver) +NS_IMPL_ISUPPORTS(nsSound, nsISound, nsIStreamLoaderObserver) //////////////////////////////////////////////////////////////////////// nsSound::nsSound() diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp index e0546a36ff0..9359d1175c9 100644 --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp @@ -404,8 +404,8 @@ nsWindow::ReleaseGlobals() } } -NS_IMPL_ISUPPORTS_INHERITED1(nsWindow, nsBaseWidget, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS_INHERITED(nsWindow, nsBaseWidget, + nsISupportsWeakReference) void nsWindow::CommonCreate(nsIWidget *aParent, bool aListenForResizes) diff --git a/widget/qt/nsBidiKeyboard.cpp b/widget/qt/nsBidiKeyboard.cpp index 20dd409ec9b..92baf8eb39d 100644 --- a/widget/qt/nsBidiKeyboard.cpp +++ b/widget/qt/nsBidiKeyboard.cpp @@ -10,7 +10,7 @@ #include "nsBidiKeyboard.h" -NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) +NS_IMPL_ISUPPORTS(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { diff --git a/widget/qt/nsClipboard.cpp b/widget/qt/nsClipboard.cpp index d79c83e8d61..16cd3f719ff 100644 --- a/widget/qt/nsClipboard.cpp +++ b/widget/qt/nsClipboard.cpp @@ -30,7 +30,7 @@ using namespace mozilla; using namespace mozilla::gfx; -NS_IMPL_ISUPPORTS1(nsClipboard, nsIClipboard) +NS_IMPL_ISUPPORTS(nsClipboard, nsIClipboard) //------------------------------------------------------------------------- // diff --git a/widget/qt/nsDeviceContextSpecQt.cpp b/widget/qt/nsDeviceContextSpecQt.cpp index a11c1feeded..98dabaf4787 100644 --- a/widget/qt/nsDeviceContextSpecQt.cpp +++ b/widget/qt/nsDeviceContextSpecQt.cpp @@ -52,7 +52,7 @@ nsDeviceContextSpecQt::~nsDeviceContextSpecQt() DO_PR_DEBUG_LOG(("nsDeviceContextSpecQt::~nsDeviceContextSpecQt()\n")); } -NS_IMPL_ISUPPORTS1(nsDeviceContextSpecQt, +NS_IMPL_ISUPPORTS(nsDeviceContextSpecQt, nsIDeviceContextSpec) NS_IMETHODIMP nsDeviceContextSpecQt::GetSurfaceForPrinter( @@ -214,7 +214,7 @@ nsPrinterEnumeratorQt::nsPrinterEnumeratorQt() { } -NS_IMPL_ISUPPORTS1(nsPrinterEnumeratorQt, nsIPrinterEnumerator) +NS_IMPL_ISUPPORTS(nsPrinterEnumeratorQt, nsIPrinterEnumerator) NS_IMETHODIMP nsPrinterEnumeratorQt::GetPrinterNameList( nsIStringEnumerator** aPrinterNameList) diff --git a/widget/qt/nsPrintDialogQt.cpp b/widget/qt/nsPrintDialogQt.cpp index 15d7cf98f72..61711e36c28 100644 --- a/widget/qt/nsPrintDialogQt.cpp +++ b/widget/qt/nsPrintDialogQt.cpp @@ -11,7 +11,7 @@ // print dialog at this point. So, this class's methods are left // un-implemented for now. -NS_IMPL_ISUPPORTS1(nsPrintDialogServiceQt, nsIPrintDialogService) +NS_IMPL_ISUPPORTS(nsPrintDialogServiceQt, nsIPrintDialogService) nsPrintDialogServiceQt::nsPrintDialogServiceQt() { diff --git a/widget/qt/nsPrintSettingsQt.cpp b/widget/qt/nsPrintSettingsQt.cpp index fcb6f0dfc02..02564086be7 100644 --- a/widget/qt/nsPrintSettingsQt.cpp +++ b/widget/qt/nsPrintSettingsQt.cpp @@ -10,9 +10,9 @@ #include "nsIFile.h" #include "nsCRTGlue.h" -NS_IMPL_ISUPPORTS_INHERITED1(nsPrintSettingsQt, - nsPrintSettings, - nsPrintSettingsQt) +NS_IMPL_ISUPPORTS_INHERITED(nsPrintSettingsQt, + nsPrintSettings, + nsPrintSettingsQt) nsPrintSettingsQt::nsPrintSettingsQt(): mQPrinter(new QPrinter()) diff --git a/widget/qt/nsScreenManagerQt.cpp b/widget/qt/nsScreenManagerQt.cpp index 43e66ac01bb..da4ebcef980 100644 --- a/widget/qt/nsScreenManagerQt.cpp +++ b/widget/qt/nsScreenManagerQt.cpp @@ -21,7 +21,7 @@ nsScreenManagerQt::~nsScreenManagerQt() } // addref, release, QI -NS_IMPL_ISUPPORTS1(nsScreenManagerQt, nsIScreenManager) +NS_IMPL_ISUPPORTS(nsScreenManagerQt, nsIScreenManager) void nsScreenManagerQt::init() { diff --git a/widget/qt/nsWindow.cpp b/widget/qt/nsWindow.cpp index 84e833db045..be9b750ca32 100644 --- a/widget/qt/nsWindow.cpp +++ b/widget/qt/nsWindow.cpp @@ -1646,7 +1646,7 @@ InitKeyEvent(WidgetKeyboardEvent &aEvent, QKeyEvent *aQEvent) aEvent.pluginEvent = (void *)aQEvent; } -NS_IMPL_ISUPPORTS_INHERITED1(nsWindow, nsBaseWidget, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS_INHERITED(nsWindow, nsBaseWidget, nsISupportsWeakReference) diff --git a/widget/tests/TestAppShellSteadyState.cpp b/widget/tests/TestAppShellSteadyState.cpp index 8658e53f558..abf952a082a 100644 --- a/widget/tests/TestAppShellSteadyState.cpp +++ b/widget/tests/TestAppShellSteadyState.cpp @@ -302,7 +302,7 @@ public: nsIDOMWindowUtils* EventListener::sWindowUtils = nullptr; nsIAppShell* EventListener::sAppShell = nullptr; -NS_IMPL_ISUPPORTS1(EventListener, nsIDOMEventListener) +NS_IMPL_ISUPPORTS(EventListener, nsIDOMEventListener) already_AddRefed GetAppShell() diff --git a/widget/tests/TestWinTSF.cpp b/widget/tests/TestWinTSF.cpp index 22b0050f628..b3e9a90126d 100644 --- a/widget/tests/TestWinTSF.cpp +++ b/widget/tests/TestWinTSF.cpp @@ -1412,8 +1412,8 @@ TSFDocumentMgrImpl::Release(void) return 0; } -NS_IMPL_ISUPPORTS2(TestApp, nsIWebProgressListener, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(TestApp, nsIWebProgressListener, + nsISupportsWeakReference) nsresult TestApp::Run(void) diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp index 7a3a82d7cde..eec9e5159b9 100644 --- a/widget/windows/GfxInfo.cpp +++ b/widget/windows/GfxInfo.cpp @@ -27,7 +27,7 @@ using namespace mozilla; using namespace mozilla::widget; #ifdef DEBUG -NS_IMPL_ISUPPORTS_INHERITED1(GfxInfo, GfxInfoBase, nsIGfxInfoDebug) +NS_IMPL_ISUPPORTS_INHERITED(GfxInfo, GfxInfoBase, nsIGfxInfoDebug) #endif static const uint32_t allWindowsVersions = 0xffffffff; diff --git a/widget/windows/JumpListBuilder.cpp b/widget/windows/JumpListBuilder.cpp index 4ca8a1b27d3..461fffc48bf 100644 --- a/widget/windows/JumpListBuilder.cpp +++ b/widget/windows/JumpListBuilder.cpp @@ -40,7 +40,7 @@ extern const wchar_t *gMozillaJumpListIDGeneric; bool JumpListBuilder::sBuildingList = false; const char kPrefTaskbarEnabled[] = "browser.taskbar.lists.enabled"; -NS_IMPL_ISUPPORTS2(JumpListBuilder, nsIJumpListBuilder, nsIObserver) +NS_IMPL_ISUPPORTS(JumpListBuilder, nsIJumpListBuilder, nsIObserver) JumpListBuilder::JumpListBuilder() : mMaxItems(0), diff --git a/widget/windows/JumpListItem.cpp b/widget/windows/JumpListItem.cpp index d3e622912f0..7bf47539480 100644 --- a/widget/windows/JumpListItem.cpp +++ b/widget/windows/JumpListItem.cpp @@ -23,16 +23,16 @@ namespace mozilla { namespace widget { // ISUPPORTS Impl's -NS_IMPL_ISUPPORTS1(JumpListItem, - nsIJumpListItem) +NS_IMPL_ISUPPORTS(JumpListItem, + nsIJumpListItem) -NS_IMPL_ISUPPORTS_INHERITED1(JumpListSeparator, - JumpListItem, - nsIJumpListSeparator) +NS_IMPL_ISUPPORTS_INHERITED(JumpListSeparator, + JumpListItem, + nsIJumpListSeparator) -NS_IMPL_ISUPPORTS_INHERITED1(JumpListLink, - JumpListItem, - nsIJumpListLink) +NS_IMPL_ISUPPORTS_INHERITED(JumpListLink, + JumpListItem, + nsIJumpListLink) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(JumpListShortcut) NS_INTERFACE_MAP_ENTRY(nsIJumpListShortcut) diff --git a/widget/windows/LSPAnnotator.cpp b/widget/windows/LSPAnnotator.cpp index e0e552d2c7a..7e393ddd3c7 100644 --- a/widget/windows/LSPAnnotator.cpp +++ b/widget/windows/LSPAnnotator.cpp @@ -32,7 +32,7 @@ public: nsCOMPtr mThread; }; -NS_IMPL_ISUPPORTS1(LSPAnnotationGatherer, nsIRunnable) +NS_IMPL_ISUPPORTS(LSPAnnotationGatherer, nsIRunnable) void LSPAnnotationGatherer::Annotate() diff --git a/widget/windows/TaskbarPreviewButton.cpp b/widget/windows/TaskbarPreviewButton.cpp index f9b712bb263..69cea380929 100644 --- a/widget/windows/TaskbarPreviewButton.cpp +++ b/widget/windows/TaskbarPreviewButton.cpp @@ -16,7 +16,7 @@ namespace mozilla { namespace widget { -NS_IMPL_ISUPPORTS2(TaskbarPreviewButton, nsITaskbarPreviewButton, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(TaskbarPreviewButton, nsITaskbarPreviewButton, nsISupportsWeakReference) TaskbarPreviewButton::TaskbarPreviewButton(TaskbarWindowPreview* preview, uint32_t index) : mPreview(preview), mIndex(index) diff --git a/widget/windows/TaskbarTabPreview.cpp b/widget/windows/TaskbarTabPreview.cpp index a48a705750f..d14c9ea99ad 100644 --- a/widget/windows/TaskbarTabPreview.cpp +++ b/widget/windows/TaskbarTabPreview.cpp @@ -16,7 +16,7 @@ namespace mozilla { namespace widget { -NS_IMPL_ISUPPORTS1(TaskbarTabPreview, nsITaskbarTabPreview) +NS_IMPL_ISUPPORTS(TaskbarTabPreview, nsITaskbarTabPreview) const wchar_t *const kWindowClass = L"MozillaTaskbarPreviewClass"; diff --git a/widget/windows/TaskbarWindowPreview.cpp b/widget/windows/TaskbarWindowPreview.cpp index 83ea74a8686..b5be690f364 100644 --- a/widget/windows/TaskbarWindowPreview.cpp +++ b/widget/windows/TaskbarWindowPreview.cpp @@ -27,9 +27,9 @@ bool WindowHookProc(void *aContext, HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM } } -NS_IMPL_ISUPPORTS4(TaskbarWindowPreview, nsITaskbarWindowPreview, - nsITaskbarProgress, nsITaskbarOverlayIconController, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(TaskbarWindowPreview, nsITaskbarWindowPreview, + nsITaskbarProgress, nsITaskbarOverlayIconController, + nsISupportsWeakReference) /** * These correspond directly to the states defined in nsITaskbarProgress.idl, so diff --git a/widget/windows/WinTaskbar.cpp b/widget/windows/WinTaskbar.cpp index 1f8df8fa38b..1ca35f936bc 100644 --- a/widget/windows/WinTaskbar.cpp +++ b/widget/windows/WinTaskbar.cpp @@ -193,7 +193,7 @@ DefaultController::OnClick(nsITaskbarPreviewButton *button) { return NS_OK; } -NS_IMPL_ISUPPORTS1(DefaultController, nsITaskbarPreviewController) +NS_IMPL_ISUPPORTS(DefaultController, nsITaskbarPreviewController) } namespace mozilla { @@ -202,7 +202,7 @@ namespace widget { /////////////////////////////////////////////////////////////////////////////// // nsIWinTaskbar -NS_IMPL_ISUPPORTS1(WinTaskbar, nsIWinTaskbar) +NS_IMPL_ISUPPORTS(WinTaskbar, nsIWinTaskbar) bool WinTaskbar::Initialize() { diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp index 8f209080fe1..a9dcb733965 100644 --- a/widget/windows/WinUtils.cpp +++ b/widget/windows/WinUtils.cpp @@ -59,13 +59,13 @@ using namespace mozilla::gfx; namespace mozilla { namespace widget { -NS_IMPL_ISUPPORTS1(myDownloadObserver, nsIDownloadObserver) +NS_IMPL_ISUPPORTS(myDownloadObserver, nsIDownloadObserver) #ifdef MOZ_PLACES -NS_IMPL_ISUPPORTS1(AsyncFaviconDataReady, nsIFaviconDataCallback) +NS_IMPL_ISUPPORTS(AsyncFaviconDataReady, nsIFaviconDataCallback) #endif -NS_IMPL_ISUPPORTS1(AsyncEncodeAndWriteIcon, nsIRunnable) -NS_IMPL_ISUPPORTS1(AsyncDeleteIconFromDisk, nsIRunnable) -NS_IMPL_ISUPPORTS1(AsyncDeleteAllFaviconsFromDisk, nsIRunnable) +NS_IMPL_ISUPPORTS(AsyncEncodeAndWriteIcon, nsIRunnable) +NS_IMPL_ISUPPORTS(AsyncDeleteIconFromDisk, nsIRunnable) +NS_IMPL_ISUPPORTS(AsyncDeleteAllFaviconsFromDisk, nsIRunnable) const char FaviconHelper::kJumpListCacheDir[] = "jumpListCache"; diff --git a/widget/windows/nsAppShell.cpp b/widget/windows/nsAppShell.cpp index 80852c5ea60..f72c017fb4d 100644 --- a/widget/windows/nsAppShell.cpp +++ b/widget/windows/nsAppShell.cpp @@ -63,7 +63,7 @@ private: nsTHashtable mLockedTopics; }; -NS_IMPL_ISUPPORTS1(WinWakeLockListener, nsIDOMMozWakeLockListener) +NS_IMPL_ISUPPORTS(WinWakeLockListener, nsIDOMMozWakeLockListener) StaticRefPtr sWakeLockListener; static void diff --git a/widget/windows/nsBidiKeyboard.cpp b/widget/windows/nsBidiKeyboard.cpp index 28897b99908..bb8407b553e 100644 --- a/widget/windows/nsBidiKeyboard.cpp +++ b/widget/windows/nsBidiKeyboard.cpp @@ -9,7 +9,7 @@ #include "prmem.h" #include -NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) +NS_IMPL_ISUPPORTS(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { diff --git a/widget/windows/nsClipboard.cpp b/widget/windows/nsClipboard.cpp index 0fd706deefe..9d5850e4e7f 100644 --- a/widget/windows/nsClipboard.cpp +++ b/widget/windows/nsClipboard.cpp @@ -74,7 +74,7 @@ nsClipboard::~nsClipboard() } -NS_IMPL_ISUPPORTS_INHERITED1(nsClipboard, nsBaseClipboard, nsIObserver) +NS_IMPL_ISUPPORTS_INHERITED(nsClipboard, nsBaseClipboard, nsIObserver) NS_IMETHODIMP nsClipboard::Observe(nsISupports *aSubject, const char *aTopic, diff --git a/widget/windows/nsColorPicker.cpp b/widget/windows/nsColorPicker.cpp index f3b9309f94b..e2150ed6d45 100644 --- a/widget/windows/nsColorPicker.cpp +++ b/widget/windows/nsColorPicker.cpp @@ -150,7 +150,7 @@ nsColorPicker::~nsColorPicker() { } -NS_IMPL_ISUPPORTS1(nsColorPicker, nsIColorPicker) +NS_IMPL_ISUPPORTS(nsColorPicker, nsIColorPicker) NS_IMETHODIMP nsColorPicker::Init(nsIDOMWindow* parent, diff --git a/widget/windows/nsDataObj.cpp b/widget/windows/nsDataObj.cpp index 68dd4cd24db..5d9416ed950 100644 --- a/widget/windows/nsDataObj.cpp +++ b/widget/windows/nsDataObj.cpp @@ -41,7 +41,7 @@ using namespace mozilla::widget; #define DEFAULT_THREAD_TIMEOUT_MS 30000 -NS_IMPL_ISUPPORTS1(nsDataObj::CStream, nsIStreamListener) +NS_IMPL_ISUPPORTS(nsDataObj::CStream, nsIStreamListener) //----------------------------------------------------------------------------- // CStream implementation diff --git a/widget/windows/nsDeviceContextSpecWin.cpp b/widget/windows/nsDeviceContextSpecWin.cpp index 04b389cd7d3..15e41cf03c2 100644 --- a/widget/windows/nsDeviceContextSpecWin.cpp +++ b/widget/windows/nsDeviceContextSpecWin.cpp @@ -152,7 +152,7 @@ nsDeviceContextSpecWin::nsDeviceContextSpecWin() //---------------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsDeviceContextSpecWin, nsIDeviceContextSpec) +NS_IMPL_ISUPPORTS(nsDeviceContextSpecWin, nsIDeviceContextSpec) nsDeviceContextSpecWin::~nsDeviceContextSpecWin() { @@ -610,7 +610,7 @@ nsPrinterEnumeratorWin::~nsPrinterEnumeratorWin() // GlobalPrinters::GetInstance()->FreeGlobalPrinters(); } -NS_IMPL_ISUPPORTS1(nsPrinterEnumeratorWin, nsIPrinterEnumerator) +NS_IMPL_ISUPPORTS(nsPrinterEnumeratorWin, nsIPrinterEnumerator) //---------------------------------------------------------------------------------- // Return the Default Printer name diff --git a/widget/windows/nsFilePicker.cpp b/widget/windows/nsFilePicker.cpp index 63446aae621..eb2e79c3dc6 100644 --- a/widget/windows/nsFilePicker.cpp +++ b/widget/windows/nsFilePicker.cpp @@ -185,7 +185,7 @@ nsFilePicker::~nsFilePicker() CoUninitialize(); } -NS_IMPL_ISUPPORTS1(nsFilePicker, nsIFilePicker) +NS_IMPL_ISUPPORTS(nsFilePicker, nsIFilePicker) NS_IMETHODIMP nsFilePicker::Init(nsIDOMWindow *aParent, const nsAString& aTitle, int16_t aMode) { diff --git a/widget/windows/nsNativeThemeWin.cpp b/widget/windows/nsNativeThemeWin.cpp index 41e2973707d..e6f147d0c63 100644 --- a/widget/windows/nsNativeThemeWin.cpp +++ b/widget/windows/nsNativeThemeWin.cpp @@ -44,7 +44,7 @@ using namespace mozilla::widget; extern PRLogModuleInfo* gWindowsLog; #endif -NS_IMPL_ISUPPORTS_INHERITED1(nsNativeThemeWin, nsNativeTheme, nsITheme) +NS_IMPL_ISUPPORTS_INHERITED(nsNativeThemeWin, nsNativeTheme, nsITheme) nsNativeThemeWin::nsNativeThemeWin() : mProgressDeterminateTimeStamp(TimeStamp::Now()), diff --git a/widget/windows/nsPrintSettingsWin.cpp b/widget/windows/nsPrintSettingsWin.cpp index 12e862ca44b..782ba5eeb8b 100644 --- a/widget/windows/nsPrintSettingsWin.cpp +++ b/widget/windows/nsPrintSettingsWin.cpp @@ -5,9 +5,9 @@ #include "nsPrintSettingsWin.h" #include "nsCRT.h" -NS_IMPL_ISUPPORTS_INHERITED1(nsPrintSettingsWin, - nsPrintSettings, - nsIPrintSettingsWin) +NS_IMPL_ISUPPORTS_INHERITED(nsPrintSettingsWin, + nsPrintSettings, + nsIPrintSettingsWin) /** --------------------------------------------------- * See documentation in nsPrintSettingsWin.h diff --git a/widget/windows/nsScreenManagerWin.cpp b/widget/windows/nsScreenManagerWin.cpp index 6f7dd04eee5..c0c1b24caa5 100644 --- a/widget/windows/nsScreenManagerWin.cpp +++ b/widget/windows/nsScreenManagerWin.cpp @@ -26,7 +26,7 @@ nsScreenManagerWin :: ~nsScreenManagerWin() // addref, release, QI -NS_IMPL_ISUPPORTS1(nsScreenManagerWin, nsIScreenManager) +NS_IMPL_ISUPPORTS(nsScreenManagerWin, nsIScreenManager) // diff --git a/widget/windows/nsSound.cpp b/widget/windows/nsSound.cpp index 3c7b0ac2434..9f50a3a0eb7 100644 --- a/widget/windows/nsSound.cpp +++ b/widget/windows/nsSound.cpp @@ -102,7 +102,7 @@ nsSoundPlayer::SoundReleaser::Run() #define SND_PURGE 0 #endif -NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver) +NS_IMPL_ISUPPORTS(nsSound, nsISound, nsIStreamLoaderObserver) nsSound::nsSound() diff --git a/widget/windows/winrt/UIAAccessibilityBridge.cpp b/widget/windows/winrt/UIAAccessibilityBridge.cpp index b4562afa7bf..ffb33c53785 100644 --- a/widget/windows/winrt/UIAAccessibilityBridge.cpp +++ b/widget/windows/winrt/UIAAccessibilityBridge.cpp @@ -27,7 +27,7 @@ namespace winrt { using namespace Microsoft::WRL; -NS_IMPL_ISUPPORTS1(AccessibilityBridge, nsIObserver) +NS_IMPL_ISUPPORTS(AccessibilityBridge, nsIObserver) nsresult AccessibilityBridge::Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) diff --git a/widget/windows/winrt/WakeLockListener.cpp b/widget/windows/winrt/WakeLockListener.cpp index b9e937499c3..2745b0a2934 100644 --- a/widget/windows/winrt/WakeLockListener.cpp +++ b/widget/windows/winrt/WakeLockListener.cpp @@ -7,7 +7,7 @@ using namespace mozilla::widget::winrt; -NS_IMPL_ISUPPORTS1(WakeLockListener, nsIDOMMozWakeLockListener) +NS_IMPL_ISUPPORTS(WakeLockListener, nsIDOMMozWakeLockListener) NS_IMETHODIMP WakeLockListener::Callback(const nsAString& aTopic, const nsAString& aState) diff --git a/widget/windows/winrt/nsMetroFilePicker.cpp b/widget/windows/winrt/nsMetroFilePicker.cpp index 5ba92fd776e..0d9097fa514 100644 --- a/widget/windows/winrt/nsMetroFilePicker.cpp +++ b/widget/windows/winrt/nsMetroFilePicker.cpp @@ -34,7 +34,7 @@ nsMetroFilePicker::~nsMetroFilePicker() { } -NS_IMPL_ISUPPORTS1(nsMetroFilePicker, nsIFilePicker) +NS_IMPL_ISUPPORTS(nsMetroFilePicker, nsIFilePicker) NS_IMETHODIMP nsMetroFilePicker::Init(nsIDOMWindow *parent, const nsAString& title, int16_t mode) diff --git a/widget/windows/winrt/nsWinMetroUtils.cpp b/widget/windows/winrt/nsWinMetroUtils.cpp index 8de0b6a85b7..67cff5dd533 100644 --- a/widget/windows/winrt/nsWinMetroUtils.cpp +++ b/widget/windows/winrt/nsWinMetroUtils.cpp @@ -38,7 +38,7 @@ namespace widget { bool nsWinMetroUtils::sUpdatePending = false; -NS_IMPL_ISUPPORTS1(nsWinMetroUtils, nsIWinMetroUtils) +NS_IMPL_ISUPPORTS(nsWinMetroUtils, nsIWinMetroUtils) nsWinMetroUtils::nsWinMetroUtils() { diff --git a/widget/xpwidgets/GfxInfoBase.cpp b/widget/xpwidgets/GfxInfoBase.cpp index 0397bccf2ba..c263053be34 100644 --- a/widget/xpwidgets/GfxInfoBase.cpp +++ b/widget/xpwidgets/GfxInfoBase.cpp @@ -67,7 +67,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(ShutdownObserver, nsIObserver) +NS_IMPL_ISUPPORTS(ShutdownObserver, nsIObserver) void InitGfxDriverInfoShutdownObserver() { @@ -89,7 +89,7 @@ void InitGfxDriverInfoShutdownObserver() using namespace mozilla::widget; using namespace mozilla; -NS_IMPL_ISUPPORTS3(GfxInfoBase, nsIGfxInfo, nsIObserver, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(GfxInfoBase, nsIGfxInfo, nsIObserver, nsISupportsWeakReference) #define BLACKLIST_PREF_BRANCH "gfx.blacklist." #define SUGGESTED_VERSION_PREF BLACKLIST_PREF_BRANCH "suggested-driver-version" diff --git a/widget/xpwidgets/GfxInfoX11.cpp b/widget/xpwidgets/GfxInfoX11.cpp index 20db6b4f8f5..b7f7576362e 100644 --- a/widget/xpwidgets/GfxInfoX11.cpp +++ b/widget/xpwidgets/GfxInfoX11.cpp @@ -24,7 +24,7 @@ namespace mozilla { namespace widget { #ifdef DEBUG -NS_IMPL_ISUPPORTS_INHERITED1(GfxInfo, GfxInfoBase, nsIGfxInfoDebug) +NS_IMPL_ISUPPORTS_INHERITED(GfxInfo, GfxInfoBase, nsIGfxInfoDebug) #endif // these global variables will be set when firing the glxtest process diff --git a/widget/xpwidgets/PuppetWidget.cpp b/widget/xpwidgets/PuppetWidget.cpp index edb2f740a7b..c8574f5d963 100644 --- a/widget/xpwidgets/PuppetWidget.cpp +++ b/widget/xpwidgets/PuppetWidget.cpp @@ -72,8 +72,8 @@ MightNeedIMEFocus(const nsWidgetInitData* aInitData) // Arbitrary, fungible. const size_t PuppetWidget::kMaxDimension = 4000; -NS_IMPL_ISUPPORTS_INHERITED1(PuppetWidget, nsBaseWidget, - nsISupportsWeakReference) +NS_IMPL_ISUPPORTS_INHERITED(PuppetWidget, nsBaseWidget, + nsISupportsWeakReference) PuppetWidget::PuppetWidget(TabChild* aTabChild) : mTabChild(aTabChild) @@ -855,7 +855,7 @@ PuppetScreen::SetRotation(uint32_t aRotation) return NS_ERROR_NOT_AVAILABLE; } -NS_IMPL_ISUPPORTS1(PuppetScreenManager, nsIScreenManager) +NS_IMPL_ISUPPORTS(PuppetScreenManager, nsIScreenManager) PuppetScreenManager::PuppetScreenManager() { diff --git a/widget/xpwidgets/nsBaseAppShell.cpp b/widget/xpwidgets/nsBaseAppShell.cpp index 6931d35b61c..aa6468554b9 100644 --- a/widget/xpwidgets/nsBaseAppShell.cpp +++ b/widget/xpwidgets/nsBaseAppShell.cpp @@ -19,7 +19,7 @@ // next thread event for at most this many ticks: #define THREAD_EVENT_STARVATION_LIMIT PR_MillisecondsToInterval(20) -NS_IMPL_ISUPPORTS3(nsBaseAppShell, nsIAppShell, nsIThreadObserver, nsIObserver) +NS_IMPL_ISUPPORTS(nsBaseAppShell, nsIAppShell, nsIThreadObserver, nsIObserver) nsBaseAppShell::nsBaseAppShell() : mSuspendNativeCount(0) diff --git a/widget/xpwidgets/nsBaseClipboard.cpp b/widget/xpwidgets/nsBaseClipboard.cpp index 9ee0ac85d60..2721029dfd3 100644 --- a/widget/xpwidgets/nsBaseClipboard.cpp +++ b/widget/xpwidgets/nsBaseClipboard.cpp @@ -25,7 +25,7 @@ nsBaseClipboard::~nsBaseClipboard() EmptyClipboard(kFindClipboard); } -NS_IMPL_ISUPPORTS1(nsBaseClipboard, nsIClipboard) +NS_IMPL_ISUPPORTS(nsBaseClipboard, nsIClipboard) /** * Sets the transferable object diff --git a/widget/xpwidgets/nsBaseDragService.cpp b/widget/xpwidgets/nsBaseDragService.cpp index 4fd2016a177..0a404df18b4 100644 --- a/widget/xpwidgets/nsBaseDragService.cpp +++ b/widget/xpwidgets/nsBaseDragService.cpp @@ -58,7 +58,7 @@ nsBaseDragService::~nsBaseDragService() { } -NS_IMPL_ISUPPORTS2(nsBaseDragService, nsIDragService, nsIDragSession) +NS_IMPL_ISUPPORTS(nsBaseDragService, nsIDragService, nsIDragSession) //--------------------------------------------------------- NS_IMETHODIMP diff --git a/widget/xpwidgets/nsBaseFilePicker.cpp b/widget/xpwidgets/nsBaseFilePicker.cpp index a79fb2e4279..c513f26e404 100644 --- a/widget/xpwidgets/nsBaseFilePicker.cpp +++ b/widget/xpwidgets/nsBaseFilePicker.cpp @@ -111,7 +111,7 @@ private: nsCOMPtr mIterator; }; -NS_IMPL_ISUPPORTS1(nsBaseFilePickerEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsBaseFilePickerEnumerator, nsISimpleEnumerator) nsBaseFilePicker::nsBaseFilePicker() : mAddToRecentDocs(true) diff --git a/widget/xpwidgets/nsBaseScreen.cpp b/widget/xpwidgets/nsBaseScreen.cpp index dc807ab4a9a..9ddbeb8ac00 100644 --- a/widget/xpwidgets/nsBaseScreen.cpp +++ b/widget/xpwidgets/nsBaseScreen.cpp @@ -9,7 +9,7 @@ #include "nsBaseScreen.h" -NS_IMPL_ISUPPORTS1(nsBaseScreen, nsIScreen) +NS_IMPL_ISUPPORTS(nsBaseScreen, nsIScreen) nsBaseScreen::nsBaseScreen() { diff --git a/widget/xpwidgets/nsBaseWidget.cpp b/widget/xpwidgets/nsBaseWidget.cpp index 383e3da3845..830fbae0e78 100644 --- a/widget/xpwidgets/nsBaseWidget.cpp +++ b/widget/xpwidgets/nsBaseWidget.cpp @@ -82,7 +82,7 @@ bool gDisableNativeTheme = false; int32_t nsIWidget::sPointerIdCounter = 0; // nsBaseWidget -NS_IMPL_ISUPPORTS1(nsBaseWidget, nsIWidget) +NS_IMPL_ISUPPORTS(nsBaseWidget, nsIWidget) nsAutoRollup::nsAutoRollup() @@ -137,7 +137,7 @@ nsBaseWidget::nsBaseWidget() nsContentUtils::RegisterShutdownObserver(mShutdownObserver); } -NS_IMPL_ISUPPORTS1(WidgetShutdownObserver, nsIObserver) +NS_IMPL_ISUPPORTS(WidgetShutdownObserver, nsIObserver) NS_IMETHODIMP WidgetShutdownObserver::Observe(nsISupports *aSubject, @@ -1718,7 +1718,7 @@ class Debug_PrefObserver MOZ_FINAL : public nsIObserver { NS_DECL_NSIOBSERVER }; -NS_IMPL_ISUPPORTS1(Debug_PrefObserver, nsIObserver) +NS_IMPL_ISUPPORTS(Debug_PrefObserver, nsIObserver) NS_IMETHODIMP Debug_PrefObserver::Observe(nsISupports* subject, const char* topic, diff --git a/widget/xpwidgets/nsClipboardHelper.cpp b/widget/xpwidgets/nsClipboardHelper.cpp index e18c75c096e..d17c597f872 100644 --- a/widget/xpwidgets/nsClipboardHelper.cpp +++ b/widget/xpwidgets/nsClipboardHelper.cpp @@ -19,7 +19,7 @@ #include "nsITransferable.h" #include "nsReadableUtils.h" -NS_IMPL_ISUPPORTS1(nsClipboardHelper, nsIClipboardHelper) +NS_IMPL_ISUPPORTS(nsClipboardHelper, nsIClipboardHelper) /***************************************************************************** * nsClipboardHelper ctor / dtor diff --git a/widget/xpwidgets/nsClipboardPrivacyHandler.cpp b/widget/xpwidgets/nsClipboardPrivacyHandler.cpp index c489d37462d..625b5875684 100644 --- a/widget/xpwidgets/nsClipboardPrivacyHandler.cpp +++ b/widget/xpwidgets/nsClipboardPrivacyHandler.cpp @@ -25,7 +25,7 @@ using namespace mozilla; #define NS_MOZ_DATA_FROM_PRIVATEBROWSING "application/x-moz-private-browsing" -NS_IMPL_ISUPPORTS2(nsClipboardPrivacyHandler, nsIObserver, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsClipboardPrivacyHandler, nsIObserver, nsISupportsWeakReference) nsresult nsClipboardPrivacyHandler::Init() diff --git a/widget/xpwidgets/nsClipboardProxy.cpp b/widget/xpwidgets/nsClipboardProxy.cpp index fdd32e21fd3..2f345a41967 100644 --- a/widget/xpwidgets/nsClipboardProxy.cpp +++ b/widget/xpwidgets/nsClipboardProxy.cpp @@ -12,7 +12,7 @@ using namespace mozilla; using mozilla::dom::ContentChild; -NS_IMPL_ISUPPORTS1(nsClipboardProxy, nsIClipboard) +NS_IMPL_ISUPPORTS(nsClipboardProxy, nsIClipboard) nsClipboardProxy::nsClipboardProxy() { diff --git a/widget/xpwidgets/nsColorPickerProxy.cpp b/widget/xpwidgets/nsColorPickerProxy.cpp index 319b0ad6a24..4409470a583 100644 --- a/widget/xpwidgets/nsColorPickerProxy.cpp +++ b/widget/xpwidgets/nsColorPickerProxy.cpp @@ -10,7 +10,7 @@ using namespace mozilla::dom; -NS_IMPL_ISUPPORTS1(nsColorPickerProxy, nsIColorPicker) +NS_IMPL_ISUPPORTS(nsColorPickerProxy, nsIColorPicker) /* void init (in nsIDOMWindow parent, in AString title, in short mode); */ NS_IMETHODIMP diff --git a/widget/xpwidgets/nsFilePickerProxy.cpp b/widget/xpwidgets/nsFilePickerProxy.cpp index e85927e703f..ec2956a9724 100644 --- a/widget/xpwidgets/nsFilePickerProxy.cpp +++ b/widget/xpwidgets/nsFilePickerProxy.cpp @@ -14,7 +14,7 @@ using namespace mozilla::dom; -NS_IMPL_ISUPPORTS1(nsFilePickerProxy, nsIFilePicker) +NS_IMPL_ISUPPORTS(nsFilePickerProxy, nsIFilePicker) nsFilePickerProxy::nsFilePickerProxy() { diff --git a/widget/xpwidgets/nsHTMLFormatConverter.cpp b/widget/xpwidgets/nsHTMLFormatConverter.cpp index 1cd0ff4719f..1641a6044c1 100644 --- a/widget/xpwidgets/nsHTMLFormatConverter.cpp +++ b/widget/xpwidgets/nsHTMLFormatConverter.cpp @@ -27,7 +27,7 @@ nsHTMLFormatConverter::~nsHTMLFormatConverter() { } -NS_IMPL_ISUPPORTS1(nsHTMLFormatConverter, nsIFormatConverter) +NS_IMPL_ISUPPORTS(nsHTMLFormatConverter, nsIFormatConverter) // // GetInputDataFlavors diff --git a/widget/xpwidgets/nsIdleService.cpp b/widget/xpwidgets/nsIdleService.cpp index ec06d43bf74..b2128316627 100644 --- a/widget/xpwidgets/nsIdleService.cpp +++ b/widget/xpwidgets/nsIdleService.cpp @@ -64,7 +64,7 @@ public: //////////////////////////////////////////////////////////////////////////////// //// nsIdleServiceDaily -NS_IMPL_ISUPPORTS2(nsIdleServiceDaily, nsIObserver, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsIdleServiceDaily, nsIObserver, nsISupportsWeakReference) NS_IMETHODIMP nsIdleServiceDaily::Observe(nsISupports *, @@ -416,7 +416,7 @@ nsIdleService::~nsIdleService() gIdleService = nullptr; } -NS_IMPL_ISUPPORTS2(nsIdleService, nsIIdleService, nsIIdleServiceInternal) +NS_IMPL_ISUPPORTS(nsIdleService, nsIIdleService, nsIIdleServiceInternal) NS_IMETHODIMP nsIdleService::AddIdleObserver(nsIObserver* aObserver, uint32_t aIdleTimeInS) diff --git a/widget/xpwidgets/nsNativeTheme.cpp b/widget/xpwidgets/nsNativeTheme.cpp index 22aa73f173a..d647d85c28f 100644 --- a/widget/xpwidgets/nsNativeTheme.cpp +++ b/widget/xpwidgets/nsNativeTheme.cpp @@ -38,7 +38,7 @@ nsNativeTheme::nsNativeTheme() { } -NS_IMPL_ISUPPORTS1(nsNativeTheme, nsITimerCallback) +NS_IMPL_ISUPPORTS(nsNativeTheme, nsITimerCallback) nsIPresShell * nsNativeTheme::GetPresShell(nsIFrame* aFrame) diff --git a/widget/xpwidgets/nsPrintOptionsImpl.cpp b/widget/xpwidgets/nsPrintOptionsImpl.cpp index f32ab234f25..8774b51548f 100644 --- a/widget/xpwidgets/nsPrintOptionsImpl.cpp +++ b/widget/xpwidgets/nsPrintOptionsImpl.cpp @@ -25,7 +25,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS2(nsPrintOptions, nsIPrintOptions, nsIPrintSettingsService) +NS_IMPL_ISUPPORTS(nsPrintOptions, nsIPrintOptions, nsIPrintSettingsService) // Pref Constants static const char kMarginTop[] = "print_margin_top"; diff --git a/widget/xpwidgets/nsPrintSession.cpp b/widget/xpwidgets/nsPrintSession.cpp index d87f3695b5c..c4f265db2ff 100644 --- a/widget/xpwidgets/nsPrintSession.cpp +++ b/widget/xpwidgets/nsPrintSession.cpp @@ -9,7 +9,7 @@ //*** nsPrintSession //***************************************************************************** -NS_IMPL_ISUPPORTS2(nsPrintSession, nsIPrintSession, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsPrintSession, nsIPrintSession, nsISupportsWeakReference) //----------------------------------------------------------------------------- nsPrintSession::nsPrintSession() diff --git a/widget/xpwidgets/nsPrintSettingsImpl.cpp b/widget/xpwidgets/nsPrintSettingsImpl.cpp index 19c007a4ec0..d7d59e0f2dd 100644 --- a/widget/xpwidgets/nsPrintSettingsImpl.cpp +++ b/widget/xpwidgets/nsPrintSettingsImpl.cpp @@ -9,7 +9,7 @@ #define DEFAULT_MARGIN_WIDTH 0.5 -NS_IMPL_ISUPPORTS1(nsPrintSettings, nsIPrintSettings) +NS_IMPL_ISUPPORTS(nsPrintSettings, nsIPrintSettings) /** --------------------------------------------------- * See documentation in nsPrintSettingsImpl.h diff --git a/widget/xpwidgets/nsTransferable.cpp b/widget/xpwidgets/nsTransferable.cpp index a3b89c5f0cd..094836bf851 100644 --- a/widget/xpwidgets/nsTransferable.cpp +++ b/widget/xpwidgets/nsTransferable.cpp @@ -35,7 +35,7 @@ Notes to self: #include "nsILoadContext.h" #include "nsAutoPtr.h" -NS_IMPL_ISUPPORTS1(nsTransferable, nsITransferable) +NS_IMPL_ISUPPORTS(nsTransferable, nsITransferable) uint32_t GetDataForFlavor (const nsTArray& aArray, const char* aDataFlavor) diff --git a/xpcom/base/AvailableMemoryTracker.cpp b/xpcom/base/AvailableMemoryTracker.cpp index 93d9b298adf..c21d89cea22 100644 --- a/xpcom/base/AvailableMemoryTracker.cpp +++ b/xpcom/base/AvailableMemoryTracker.cpp @@ -383,7 +383,7 @@ public: return NS_OK; } }; -NS_IMPL_ISUPPORTS1(LowEventsReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(LowEventsReporter, nsIMemoryReporter) #endif // defined(XP_WIN) @@ -400,7 +400,7 @@ public: NS_DECL_NSIRUNNABLE }; -NS_IMPL_ISUPPORTS1(nsJemallocFreeDirtyPagesRunnable, nsIRunnable) +NS_IMPL_ISUPPORTS(nsJemallocFreeDirtyPagesRunnable, nsIRunnable) NS_IMETHODIMP nsJemallocFreeDirtyPagesRunnable::Run() @@ -431,7 +431,7 @@ private: static bool sFreeDirtyPages; }; -NS_IMPL_ISUPPORTS1(nsMemoryPressureWatcher, nsIObserver) +NS_IMPL_ISUPPORTS(nsMemoryPressureWatcher, nsIObserver) bool nsMemoryPressureWatcher::sFreeDirtyPages = false; diff --git a/xpcom/base/SystemMemoryReporter.cpp b/xpcom/base/SystemMemoryReporter.cpp index ca88894bc40..e0ae56eebad 100644 --- a/xpcom/base/SystemMemoryReporter.cpp +++ b/xpcom/base/SystemMemoryReporter.cpp @@ -726,7 +726,7 @@ private: #undef REPORT }; -NS_IMPL_ISUPPORTS1(SystemReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(SystemReporter, nsIMemoryReporter) // Keep this in sync with SystemReporter::ProcessSizeKind! const char* SystemReporter::kindPathSuffixes[] = { diff --git a/xpcom/base/VisualEventTracer.cpp b/xpcom/base/VisualEventTracer.cpp index fde4116af45..8debcd9ca4e 100644 --- a/xpcom/base/VisualEventTracer.cpp +++ b/xpcom/base/VisualEventTracer.cpp @@ -518,7 +518,7 @@ protected: TimeStamp mProfilerStart; }; -NS_IMPL_ISUPPORTS1(VisualEventTracerLog, nsIVisualEventTracerLog) +NS_IMPL_ISUPPORTS(VisualEventTracerLog, nsIVisualEventTracerLog) VisualEventTracerLog::~VisualEventTracerLog() { @@ -607,7 +607,7 @@ VisualEventTracerLog::WriteToProfilingFile() return NS_OK; } -NS_IMPL_ISUPPORTS1(VisualEventTracer, nsIVisualEventTracer) +NS_IMPL_ISUPPORTS(VisualEventTracer, nsIVisualEventTracer) NS_IMETHODIMP VisualEventTracer::Start(const uint32_t aMaxBacklogSeconds) diff --git a/xpcom/base/nsConsoleMessage.cpp b/xpcom/base/nsConsoleMessage.cpp index 864b9fee545..ca9d728105e 100644 --- a/xpcom/base/nsConsoleMessage.cpp +++ b/xpcom/base/nsConsoleMessage.cpp @@ -10,7 +10,7 @@ #include "nsConsoleMessage.h" #include "jsapi.h" -NS_IMPL_ISUPPORTS1(nsConsoleMessage, nsIConsoleMessage) +NS_IMPL_ISUPPORTS(nsConsoleMessage, nsIConsoleMessage) nsConsoleMessage::nsConsoleMessage() : mTimeStamp(0), diff --git a/xpcom/base/nsConsoleService.cpp b/xpcom/base/nsConsoleService.cpp index dfbc85643f7..a86f08d7769 100644 --- a/xpcom/base/nsConsoleService.cpp +++ b/xpcom/base/nsConsoleService.cpp @@ -34,8 +34,8 @@ using namespace mozilla; NS_IMPL_ADDREF(nsConsoleService) NS_IMPL_RELEASE(nsConsoleService) NS_IMPL_CLASSINFO(nsConsoleService, nullptr, nsIClassInfo::THREADSAFE | nsIClassInfo::SINGLETON, NS_CONSOLESERVICE_CID) -NS_IMPL_QUERY_INTERFACE1_CI(nsConsoleService, nsIConsoleService) -NS_IMPL_CI_INTERFACE_GETTER1(nsConsoleService, nsIConsoleService) +NS_IMPL_QUERY_INTERFACE_CI(nsConsoleService, nsIConsoleService) +NS_IMPL_CI_INTERFACE_GETTER(nsConsoleService, nsIConsoleService) static bool sLoggingEnabled = true; static bool sLoggingBuffered = true; diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp index b819a121e04..7549ab972c7 100644 --- a/xpcom/base/nsCycleCollector.cpp +++ b/xpcom/base/nsCycleCollector.cpp @@ -1250,7 +1250,7 @@ private: void CleanupAfterCollection(); }; -NS_IMPL_ISUPPORTS1(nsCycleCollector, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(nsCycleCollector, nsIMemoryReporter) /** * GraphWalker is templatized over a Visitor class that must provide @@ -1807,7 +1807,7 @@ private: mozilla::LinkedList mDescribers; }; -NS_IMPL_ISUPPORTS1(nsCycleCollectorLogger, nsICycleCollectorListener) +NS_IMPL_ISUPPORTS(nsCycleCollectorLogger, nsICycleCollectorListener) nsresult nsCycleCollectorLoggerConstructor(nsISupports* aOuter, diff --git a/xpcom/base/nsDebugImpl.cpp b/xpcom/base/nsDebugImpl.cpp index 018d8162449..d66ba626071 100644 --- a/xpcom/base/nsDebugImpl.cpp +++ b/xpcom/base/nsDebugImpl.cpp @@ -75,7 +75,7 @@ static const char *sMultiprocessDescription = nullptr; static Atomic gAssertionCount; -NS_IMPL_QUERY_INTERFACE2(nsDebugImpl, nsIDebug, nsIDebug2) +NS_IMPL_QUERY_INTERFACE(nsDebugImpl, nsIDebug, nsIDebug2) NS_IMETHODIMP_(MozExternalRefCountType) nsDebugImpl::AddRef() diff --git a/xpcom/base/nsDumpUtils.cpp b/xpcom/base/nsDumpUtils.cpp index c50ba323fc5..852602e1c39 100644 --- a/xpcom/base/nsDumpUtils.cpp +++ b/xpcom/base/nsDumpUtils.cpp @@ -63,7 +63,7 @@ DumpSignalHandler(int aSignum) } } -NS_IMPL_ISUPPORTS1(FdWatcher, nsIObserver); +NS_IMPL_ISUPPORTS(FdWatcher, nsIObserver); void FdWatcher::Init() { diff --git a/xpcom/base/nsErrorService.cpp b/xpcom/base/nsErrorService.cpp index 85dd7a280a8..297a4fc5975 100644 --- a/xpcom/base/nsErrorService.cpp +++ b/xpcom/base/nsErrorService.cpp @@ -60,7 +60,7 @@ nsInt2StrHashtable::Remove(uint32_t key) //////////////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS1(nsErrorService, nsIErrorService) +NS_IMPL_ISUPPORTS(nsErrorService, nsIErrorService) nsresult nsErrorService::Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr) diff --git a/xpcom/base/nsGZFileWriter.cpp b/xpcom/base/nsGZFileWriter.cpp index 166e199d54c..c4d7e3a9dd6 100644 --- a/xpcom/base/nsGZFileWriter.cpp +++ b/xpcom/base/nsGZFileWriter.cpp @@ -16,7 +16,7 @@ #include #endif -NS_IMPL_ISUPPORTS1(nsGZFileWriter, nsIGZFileWriter) +NS_IMPL_ISUPPORTS(nsGZFileWriter, nsIGZFileWriter) nsGZFileWriter::nsGZFileWriter() : mInitialized(false) diff --git a/xpcom/base/nsIStatusReporter.idl b/xpcom/base/nsIStatusReporter.idl index 36a1b1b6d32..d1045fda4b9 100644 --- a/xpcom/base/nsIStatusReporter.idl +++ b/xpcom/base/nsIStatusReporter.idl @@ -75,7 +75,7 @@ interface nsIStatusReporterManager : nsISupports NS_IMETHOD GetDescription(nsACString &desc) \ { _desc_Function(desc); return NS_OK; } \ }; \ - NS_IMPL_ISUPPORTS1(StatusReporter_##_classname, nsIStatusReporter) + NS_IMPL_ISUPPORTS(StatusReporter_##_classname, nsIStatusReporter) #define NS_STATUS_REPORTER_NAME(_classname) StatusReporter_##_classname diff --git a/xpcom/base/nsInterfaceRequestorAgg.cpp b/xpcom/base/nsInterfaceRequestorAgg.cpp index b49a8ff9a8e..7bb8555f060 100644 --- a/xpcom/base/nsInterfaceRequestorAgg.cpp +++ b/xpcom/base/nsInterfaceRequestorAgg.cpp @@ -34,7 +34,7 @@ private: nsCOMPtr mConsumerTarget; }; -NS_IMPL_ISUPPORTS1(nsInterfaceRequestorAgg, nsIInterfaceRequestor) +NS_IMPL_ISUPPORTS(nsInterfaceRequestorAgg, nsIInterfaceRequestor) NS_IMETHODIMP nsInterfaceRequestorAgg::GetInterface(const nsIID &aIID, void **aResult) diff --git a/xpcom/base/nsMacUtilsImpl.cpp b/xpcom/base/nsMacUtilsImpl.cpp index bf9828ad849..a6f6004cca4 100644 --- a/xpcom/base/nsMacUtilsImpl.cpp +++ b/xpcom/base/nsMacUtilsImpl.cpp @@ -7,7 +7,7 @@ #include -NS_IMPL_ISUPPORTS1(nsMacUtilsImpl, nsIMacUtils) +NS_IMPL_ISUPPORTS(nsMacUtilsImpl, nsIMacUtils) nsresult nsMacUtilsImpl::GetArchString(nsAString& archString) { diff --git a/xpcom/base/nsMemoryImpl.cpp b/xpcom/base/nsMemoryImpl.cpp index a544e0df806..8fd6dddd83f 100644 --- a/xpcom/base/nsMemoryImpl.cpp +++ b/xpcom/base/nsMemoryImpl.cpp @@ -25,7 +25,7 @@ static nsMemoryImpl sGlobalMemory; -NS_IMPL_QUERY_INTERFACE1(nsMemoryImpl, nsIMemory) +NS_IMPL_QUERY_INTERFACE(nsMemoryImpl, nsIMemory) NS_IMETHODIMP_(void*) nsMemoryImpl::Alloc(size_t size) @@ -175,7 +175,7 @@ nsMemoryImpl::RunFlushers(const char16_t* aReason) // XXX need NS_IMPL_STATIC_ADDREF/RELEASE NS_IMETHODIMP_(MozExternalRefCountType) nsMemoryImpl::FlushEvent::AddRef() { return 2; } NS_IMETHODIMP_(MozExternalRefCountType) nsMemoryImpl::FlushEvent::Release() { return 1; } -NS_IMPL_QUERY_INTERFACE1(nsMemoryImpl::FlushEvent, nsIRunnable) +NS_IMPL_QUERY_INTERFACE(nsMemoryImpl::FlushEvent, nsIRunnable) NS_IMETHODIMP nsMemoryImpl::FlushEvent::Run() diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp index 52dc0a60ca9..c725a3544a2 100644 --- a/xpcom/base/nsMemoryInfoDumper.cpp +++ b/xpcom/base/nsMemoryInfoDumper.cpp @@ -225,7 +225,7 @@ void OnFifoEnabledChange(const char* /*unused*/, void* /*unused*/) } // anonymous namespace #endif // MOZ_SUPPORTS_FIFO } -NS_IMPL_ISUPPORTS1(nsMemoryInfoDumper, nsIMemoryInfoDumper) +NS_IMPL_ISUPPORTS(nsMemoryInfoDumper, nsIMemoryInfoDumper) nsMemoryInfoDumper::nsMemoryInfoDumper() { @@ -403,7 +403,7 @@ private: nsRefPtr mWriter; }; -NS_IMPL_ISUPPORTS1(DumpReportCallback, nsIHandleReportCallback) +NS_IMPL_ISUPPORTS(DumpReportCallback, nsIHandleReportCallback) } // namespace mozilla @@ -494,7 +494,7 @@ private: nsString mIdentifier; }; -NS_IMPL_ISUPPORTS1(TempDirMemoryFinishCallback, nsIFinishReportingCallback) +NS_IMPL_ISUPPORTS(TempDirMemoryFinishCallback, nsIFinishReportingCallback) NS_IMETHODIMP nsMemoryInfoDumper::DumpMemoryInfoToTempDir(const nsAString& aIdentifier, @@ -712,7 +712,7 @@ private: nsCOMPtr mFinishDumpingData; }; -NS_IMPL_ISUPPORTS1(FinishReportingCallback, nsIFinishReportingCallback) +NS_IMPL_ISUPPORTS(FinishReportingCallback, nsIFinishReportingCallback) NS_IMETHODIMP nsMemoryInfoDumper::DumpMemoryReportsToNamedFile( diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp index 90bda2bf0e0..8650b26fb95 100644 --- a/xpcom/base/nsMemoryReporterManager.cpp +++ b/xpcom/base/nsMemoryReporterManager.cpp @@ -120,7 +120,7 @@ public: "closed this process."); } }; -NS_IMPL_ISUPPORTS1(ResidentUniqueReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(ResidentUniqueReporter, nsIMemoryReporter) #elif defined(__DragonFly__) || defined(__FreeBSD__) \ || defined(__NetBSD__) || defined(__OpenBSD__) \ @@ -513,7 +513,7 @@ public: "memory."); } }; -NS_IMPL_ISUPPORTS1(VsizeMaxContiguousReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(VsizeMaxContiguousReporter, nsIMemoryReporter) #endif #ifdef HAVE_PRIVATE_REPORTER @@ -535,7 +535,7 @@ public: "pages that have been written to."); } }; -NS_IMPL_ISUPPORTS1(PrivateReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(PrivateReporter, nsIMemoryReporter) #endif #ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS @@ -562,7 +562,7 @@ public: "resources used by the process."); } }; -NS_IMPL_ISUPPORTS1(VsizeReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(VsizeReporter, nsIMemoryReporter) class ResidentReporter MOZ_FINAL : public nsIMemoryReporter { @@ -586,7 +586,7 @@ public: "time."); } }; -NS_IMPL_ISUPPORTS1(ResidentReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(ResidentReporter, nsIMemoryReporter) #endif // HAVE_VSIZE_AND_RESIDENT_REPORTERS @@ -624,7 +624,7 @@ public: "they impact performance much less than hard page faults."); } }; -NS_IMPL_ISUPPORTS1(PageFaultsSoftReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(PageFaultsSoftReporter, nsIMemoryReporter) static nsresult PageFaultsHardDistinguishedAmount(int64_t* aAmount) @@ -664,7 +664,7 @@ public: "second."); } }; -NS_IMPL_ISUPPORTS1(PageFaultsHardReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(PageFaultsHardReporter, nsIMemoryReporter) #endif // HAVE_PAGE_FAULT_REPORTERS @@ -755,7 +755,7 @@ public: return NS_OK; } }; -NS_IMPL_ISUPPORTS1(JemallocHeapReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(JemallocHeapReporter, nsIMemoryReporter) #endif // HAVE_JEMALLOC_STATS @@ -780,7 +780,7 @@ public: "Memory used by the dynamic and static atoms tables."); } }; -NS_IMPL_ISUPPORTS1(AtomTablesReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(AtomTablesReporter, nsIMemoryReporter) #ifdef MOZ_DMD @@ -832,7 +832,7 @@ public: return NS_OK; } }; -NS_IMPL_ISUPPORTS1(DMDReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(DMDReporter, nsIMemoryReporter) } // namespace dmd } // namespace mozilla @@ -843,7 +843,7 @@ NS_IMPL_ISUPPORTS1(DMDReporter, nsIMemoryReporter) ** nsMemoryReporterManager implementation **/ -NS_IMPL_ISUPPORTS1(nsMemoryReporterManager, nsIMemoryReporterManager) +NS_IMPL_ISUPPORTS(nsMemoryReporterManager, nsIMemoryReporterManager) NS_IMETHODIMP nsMemoryReporterManager::Init() @@ -1435,7 +1435,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(ExplicitCallback, nsIHandleReportCallback) +NS_IMPL_ISUPPORTS(ExplicitCallback, nsIHandleReportCallback) NS_IMETHODIMP nsMemoryReporterManager::GetExplicit(int64_t* aAmount) @@ -1881,7 +1881,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(DoNothingCallback, nsIHandleReportCallback) +NS_IMPL_ISUPPORTS(DoNothingCallback, nsIHandleReportCallback) void RunReportersForThisProcess() diff --git a/xpcom/base/nsMessageLoop.cpp b/xpcom/base/nsMessageLoop.cpp index 207ac4d907a..eb47bcfad92 100644 --- a/xpcom/base/nsMessageLoop.cpp +++ b/xpcom/base/nsMessageLoop.cpp @@ -134,11 +134,11 @@ MessageLoopTimerCallback::Notify(nsITimer* aTimer) return NS_OK; } -NS_IMPL_ISUPPORTS1(MessageLoopTimerCallback, nsITimerCallback) +NS_IMPL_ISUPPORTS(MessageLoopTimerCallback, nsITimerCallback) } // anonymous namespace -NS_IMPL_ISUPPORTS1(nsMessageLoop, nsIMessageLoop) +NS_IMPL_ISUPPORTS(nsMessageLoop, nsIMessageLoop) NS_IMETHODIMP nsMessageLoop::PostIdleTask(nsIRunnable* aTask, uint32_t aEnsureRunsAfterMS) diff --git a/xpcom/base/nsSecurityConsoleMessage.cpp b/xpcom/base/nsSecurityConsoleMessage.cpp index c4755889006..47cd2c15b1e 100644 --- a/xpcom/base/nsSecurityConsoleMessage.cpp +++ b/xpcom/base/nsSecurityConsoleMessage.cpp @@ -4,7 +4,7 @@ #include "nsSecurityConsoleMessage.h" -NS_IMPL_ISUPPORTS1(nsSecurityConsoleMessage, nsISecurityConsoleMessage) +NS_IMPL_ISUPPORTS(nsSecurityConsoleMessage, nsISecurityConsoleMessage) nsSecurityConsoleMessage::nsSecurityConsoleMessage() { diff --git a/xpcom/base/nsStatusReporterManager.cpp b/xpcom/base/nsStatusReporterManager.cpp index a474fc6b06d..4ec0429e567 100644 --- a/xpcom/base/nsStatusReporterManager.cpp +++ b/xpcom/base/nsStatusReporterManager.cpp @@ -111,7 +111,7 @@ DumpReport(nsIFileOutputStream* aOStream, const nsCString& aProcess, ** nsStatusReporterManager implementation **/ -NS_IMPL_ISUPPORTS1(nsStatusReporterManager, nsIStatusReporterManager) +NS_IMPL_ISUPPORTS(nsStatusReporterManager, nsIStatusReporterManager) nsStatusReporterManager::nsStatusReporterManager() { diff --git a/xpcom/base/nsUUIDGenerator.cpp b/xpcom/base/nsUUIDGenerator.cpp index 07048a47ac7..edc9d1c3103 100644 --- a/xpcom/base/nsUUIDGenerator.cpp +++ b/xpcom/base/nsUUIDGenerator.cpp @@ -17,7 +17,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS1(nsUUIDGenerator, nsIUUIDGenerator) +NS_IMPL_ISUPPORTS(nsUUIDGenerator, nsIUUIDGenerator) nsUUIDGenerator::nsUUIDGenerator() : mLock("nsUUIDGenerator.mLock") diff --git a/xpcom/base/nsVersionComparatorImpl.cpp b/xpcom/base/nsVersionComparatorImpl.cpp index d1a1024e18b..0f49ba78905 100644 --- a/xpcom/base/nsVersionComparatorImpl.cpp +++ b/xpcom/base/nsVersionComparatorImpl.cpp @@ -6,7 +6,7 @@ #include "nsVersionComparator.h" #include "nsString.h" -NS_IMPL_ISUPPORTS1(nsVersionComparatorImpl, nsIVersionComparator) +NS_IMPL_ISUPPORTS(nsVersionComparatorImpl, nsIVersionComparator) NS_IMETHODIMP nsVersionComparatorImpl::Compare(const nsACString& A, const nsACString& B, diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp index a07430f5586..958a1fde79e 100644 --- a/xpcom/build/nsXPComInit.cpp +++ b/xpcom/build/nsXPComInit.cpp @@ -375,7 +375,7 @@ private: } }; -NS_IMPL_ISUPPORTS1(ICUReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(ICUReporter, nsIMemoryReporter) /* static */ template<> Atomic CountingAllocatorBase::sAmount(0); @@ -395,7 +395,7 @@ private: } }; -NS_IMPL_ISUPPORTS1(OggReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(OggReporter, nsIMemoryReporter) /* static */ template<> Atomic CountingAllocatorBase::sAmount(0); @@ -416,7 +416,7 @@ private: } }; -NS_IMPL_ISUPPORTS1(VPXReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(VPXReporter, nsIMemoryReporter) /* static */ template<> Atomic CountingAllocatorBase::sAmount(0); #endif /* MOZ_VPX */ @@ -438,7 +438,7 @@ private: } }; -NS_IMPL_ISUPPORTS1(NesteggReporter, nsIMemoryReporter) +NS_IMPL_ISUPPORTS(NesteggReporter, nsIMemoryReporter) /* static */ template<> Atomic CountingAllocatorBase::sAmount(0); #endif /* MOZ_WEBM */ diff --git a/xpcom/components/nsCategoryManager.cpp b/xpcom/components/nsCategoryManager.cpp index 622168e79aa..81df11c1c9d 100644 --- a/xpcom/components/nsCategoryManager.cpp +++ b/xpcom/components/nsCategoryManager.cpp @@ -93,7 +93,7 @@ protected: uint32_t mStringCurItem; }; -NS_IMPL_ISUPPORTS2(BaseStringEnumerator, nsISimpleEnumerator, nsIUTF8StringEnumerator) +NS_IMPL_ISUPPORTS(BaseStringEnumerator, nsISimpleEnumerator, nsIUTF8StringEnumerator) NS_IMETHODIMP BaseStringEnumerator::HasMoreElements(bool *_retval) @@ -400,7 +400,7 @@ CategoryEnumerator::enumfunc_createenumerator(const char* aStr, CategoryNode* aN // nsCategoryManager implementations // -NS_IMPL_QUERY_INTERFACE2(nsCategoryManager, nsICategoryManager, nsIMemoryReporter) +NS_IMPL_QUERY_INTERFACE(nsCategoryManager, nsICategoryManager, nsIMemoryReporter) NS_IMETHODIMP_(MozExternalRefCountType) nsCategoryManager::AddRef() diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp index 356e3f7a978..f24de6fd6b2 100644 --- a/xpcom/components/nsComponentManager.cpp +++ b/xpcom/components/nsComponentManager.cpp @@ -813,7 +813,7 @@ nsComponentManagerImpl::~nsComponentManagerImpl() PR_LOG(nsComponentManagerLog, PR_LOG_DEBUG, ("nsComponentManager: Destroyed.")); } -NS_IMPL_ISUPPORTS6( +NS_IMPL_ISUPPORTS( nsComponentManagerImpl, nsIComponentManager, nsIServiceManager, diff --git a/xpcom/components/nsNativeComponentLoader.cpp b/xpcom/components/nsNativeComponentLoader.cpp index 56b5fda2fc3..3fd40f5669f 100644 --- a/xpcom/components/nsNativeComponentLoader.cpp +++ b/xpcom/components/nsNativeComponentLoader.cpp @@ -64,8 +64,8 @@ GetNativeModuleLoaderLog() #define LOG(level, args) PR_LOG(GetNativeModuleLoaderLog(), level, args) -NS_IMPL_QUERY_INTERFACE1(nsNativeModuleLoader, - mozilla::ModuleLoader) +NS_IMPL_QUERY_INTERFACE(nsNativeModuleLoader, + mozilla::ModuleLoader) NS_IMPL_ADDREF_USING_AGGREGATOR(nsNativeModuleLoader, nsComponentManagerImpl::gComponentManager) diff --git a/xpcom/ds/nsAtomService.cpp b/xpcom/ds/nsAtomService.cpp index 05b32b00ac2..54e42cc93a3 100644 --- a/xpcom/ds/nsAtomService.cpp +++ b/xpcom/ds/nsAtomService.cpp @@ -6,7 +6,7 @@ #include "nsAtomService.h" #include "nsIAtom.h" -NS_IMPL_ISUPPORTS1(nsAtomService, nsIAtomService) +NS_IMPL_ISUPPORTS(nsAtomService, nsIAtomService) nsAtomService::nsAtomService() { diff --git a/xpcom/ds/nsAtomTable.cpp b/xpcom/ds/nsAtomTable.cpp index a448ece41fb..fdbeef5ac57 100644 --- a/xpcom/ds/nsAtomTable.cpp +++ b/xpcom/ds/nsAtomTable.cpp @@ -385,7 +385,7 @@ AtomImpl::~AtomImpl() nsStringBuffer::FromData(mString)->Release(); } -NS_IMPL_ISUPPORTS1(AtomImpl, nsIAtom) +NS_IMPL_ISUPPORTS(AtomImpl, nsIAtom) PermanentAtomImpl::~PermanentAtomImpl() { diff --git a/xpcom/ds/nsExpirationTracker.h b/xpcom/ds/nsExpirationTracker.h index e71af321619..085bcf4d899 100644 --- a/xpcom/ds/nsExpirationTracker.h +++ b/xpcom/ds/nsExpirationTracker.h @@ -376,7 +376,7 @@ nsExpirationTracker::ExpirationTrackerObserver::QueryInterface(REFNSIID aII NS_ASSERTION(aInstancePtr, "QueryInterface requires a non-NULL destination!"); nsresult rv = NS_ERROR_FAILURE; - NS_INTERFACE_TABLE1(ExpirationTrackerObserver, nsIObserver) + NS_INTERFACE_TABLE(ExpirationTrackerObserver, nsIObserver) return rv; } diff --git a/xpcom/ds/nsHashPropertyBag.cpp b/xpcom/ds/nsHashPropertyBag.cpp index 9f60de99aed..e95c4d3ab6c 100644 --- a/xpcom/ds/nsHashPropertyBag.cpp +++ b/xpcom/ds/nsHashPropertyBag.cpp @@ -107,7 +107,7 @@ protected: nsCOMPtr mValue; }; -NS_IMPL_ISUPPORTS1(nsSimpleProperty, nsIProperty) +NS_IMPL_ISUPPORTS(nsSimpleProperty, nsIProperty) NS_IMETHODIMP nsSimpleProperty::GetName(nsAString& aName) diff --git a/xpcom/ds/nsINIParserImpl.cpp b/xpcom/ds/nsINIParserImpl.cpp index b7dd443414d..ab060caa6c0 100644 --- a/xpcom/ds/nsINIParserImpl.cpp +++ b/xpcom/ds/nsINIParserImpl.cpp @@ -24,9 +24,9 @@ private: nsINIParser mParser; }; -NS_IMPL_ISUPPORTS2(nsINIParserFactory, - nsIINIParserFactory, - nsIFactory) +NS_IMPL_ISUPPORTS(nsINIParserFactory, + nsIINIParserFactory, + nsIFactory) NS_IMETHODIMP nsINIParserFactory::CreateINIParser(nsIFile* aINIFile, @@ -64,8 +64,8 @@ nsINIParserFactory::LockFactory(bool aLock) return NS_OK; } -NS_IMPL_ISUPPORTS1(nsINIParserImpl, - nsIINIParser) +NS_IMPL_ISUPPORTS(nsINIParserImpl, + nsIINIParser) static bool SectionCB(const char* aSection, void *aClosure) diff --git a/xpcom/ds/nsObserverList.cpp b/xpcom/ds/nsObserverList.cpp index 8be87894c7c..51a0c1cc5eb 100644 --- a/xpcom/ds/nsObserverList.cpp +++ b/xpcom/ds/nsObserverList.cpp @@ -107,7 +107,7 @@ nsObserverList::UnmarkGrayStrongObservers() } } -NS_IMPL_ISUPPORTS1(nsObserverEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsObserverEnumerator, nsISimpleEnumerator) nsObserverEnumerator::nsObserverEnumerator(nsObserverList* aObserverList) : mIndex(0) diff --git a/xpcom/ds/nsObserverService.cpp b/xpcom/ds/nsObserverService.cpp index fddf7d2b6ff..aba0ac60094 100644 --- a/xpcom/ds/nsObserverService.cpp +++ b/xpcom/ds/nsObserverService.cpp @@ -168,7 +168,7 @@ nsObserverService::CollectReports(nsIHandleReportCallback* aHandleReport, // nsObserverService Implementation -NS_IMPL_ISUPPORTS3( +NS_IMPL_ISUPPORTS( nsObserverService, nsIObserverService, nsObserverService, diff --git a/xpcom/ds/nsPersistentProperties.cpp b/xpcom/ds/nsPersistentProperties.cpp index 64ae11d237d..2cbf91e1a04 100644 --- a/xpcom/ds/nsPersistentProperties.cpp +++ b/xpcom/ds/nsPersistentProperties.cpp @@ -470,7 +470,7 @@ nsPersistentProperties::Create(nsISupports *aOuter, REFNSIID aIID, void **aResul return props->QueryInterface(aIID, aResult); } -NS_IMPL_ISUPPORTS2(nsPersistentProperties, nsIPersistentProperties, nsIProperties) +NS_IMPL_ISUPPORTS(nsPersistentProperties, nsIPersistentProperties, nsIProperties) NS_IMETHODIMP nsPersistentProperties::Load(nsIInputStream *aIn) @@ -650,7 +650,7 @@ nsPropertyElement::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult) return propElem->QueryInterface(aIID, aResult); } -NS_IMPL_ISUPPORTS1(nsPropertyElement, nsIPropertyElement) +NS_IMPL_ISUPPORTS(nsPropertyElement, nsIPropertyElement) NS_IMETHODIMP nsPropertyElement::GetKey(nsACString& aReturnKey) diff --git a/xpcom/ds/nsStringEnumerator.cpp b/xpcom/ds/nsStringEnumerator.cpp index 8af28335460..463796dc225 100644 --- a/xpcom/ds/nsStringEnumerator.cpp +++ b/xpcom/ds/nsStringEnumerator.cpp @@ -76,10 +76,10 @@ private: bool mIsUnicode; }; -NS_IMPL_ISUPPORTS3(nsStringEnumerator, - nsIStringEnumerator, - nsIUTF8StringEnumerator, - nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsStringEnumerator, + nsIStringEnumerator, + nsIUTF8StringEnumerator, + nsISimpleEnumerator) NS_IMETHODIMP nsStringEnumerator::HasMore(bool* aResult) diff --git a/xpcom/ds/nsSupportsArray.cpp b/xpcom/ds/nsSupportsArray.cpp index 1c742f0eff6..ce3463f87e7 100644 --- a/xpcom/ds/nsSupportsArray.cpp +++ b/xpcom/ds/nsSupportsArray.cpp @@ -173,7 +173,7 @@ nsSupportsArray::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult) return it->QueryInterface(aIID, aResult); } -NS_IMPL_ISUPPORTS3(nsSupportsArray, nsISupportsArray, nsICollection, nsISerializable) +NS_IMPL_ISUPPORTS(nsSupportsArray, nsISupportsArray, nsICollection, nsISerializable) NS_IMETHODIMP nsSupportsArray::Read(nsIObjectInputStream *aStream) diff --git a/xpcom/ds/nsSupportsArrayEnumerator.cpp b/xpcom/ds/nsSupportsArrayEnumerator.cpp index d123f7e8b87..da18e13cbfc 100644 --- a/xpcom/ds/nsSupportsArrayEnumerator.cpp +++ b/xpcom/ds/nsSupportsArrayEnumerator.cpp @@ -18,7 +18,7 @@ nsSupportsArrayEnumerator::~nsSupportsArrayEnumerator() NS_RELEASE(mArray); } -NS_IMPL_ISUPPORTS2(nsSupportsArrayEnumerator, nsIBidirectionalEnumerator, nsIEnumerator) +NS_IMPL_ISUPPORTS(nsSupportsArrayEnumerator, nsIBidirectionalEnumerator, nsIEnumerator) NS_IMETHODIMP nsSupportsArrayEnumerator::First() diff --git a/xpcom/ds/nsSupportsPrimitives.cpp b/xpcom/ds/nsSupportsPrimitives.cpp index d446834790c..bc2c308ced0 100644 --- a/xpcom/ds/nsSupportsPrimitives.cpp +++ b/xpcom/ds/nsSupportsPrimitives.cpp @@ -11,7 +11,7 @@ using mozilla::fallible_t; /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsIDImpl, nsISupportsID, nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsIDImpl, nsISupportsID, nsISupportsPrimitive) nsSupportsIDImpl::nsSupportsIDImpl() : mData(nullptr) @@ -71,8 +71,8 @@ NS_IMETHODIMP nsSupportsIDImpl::ToString(char **_retval) * nsSupportsCStringImpl *****************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsCStringImpl, nsISupportsCString, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsCStringImpl, nsISupportsCString, + nsISupportsPrimitive) NS_IMETHODIMP nsSupportsCStringImpl::GetType(uint16_t *aType) { @@ -110,8 +110,8 @@ NS_IMETHODIMP nsSupportsCStringImpl::SetData(const nsACString& aData) * nsSupportsStringImpl *****************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsStringImpl, nsISupportsString, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsStringImpl, nsISupportsString, + nsISupportsPrimitive) NS_IMETHODIMP nsSupportsStringImpl::GetType(uint16_t *aType) { @@ -147,8 +147,8 @@ NS_IMETHODIMP nsSupportsStringImpl::SetData(const nsAString& aData) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsPRBoolImpl, nsISupportsPRBool, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsPRBoolImpl, nsISupportsPRBool, + nsISupportsPrimitive) nsSupportsPRBoolImpl::nsSupportsPRBoolImpl() : mData(false) @@ -188,8 +188,8 @@ NS_IMETHODIMP nsSupportsPRBoolImpl::ToString(char **_retval) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsPRUint8Impl, nsISupportsPRUint8, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsPRUint8Impl, nsISupportsPRUint8, + nsISupportsPrimitive) nsSupportsPRUint8Impl::nsSupportsPRUint8Impl() : mData(0) @@ -233,8 +233,8 @@ NS_IMETHODIMP nsSupportsPRUint8Impl::ToString(char **_retval) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsPRUint16Impl, nsISupportsPRUint16, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsPRUint16Impl, nsISupportsPRUint16, + nsISupportsPrimitive) nsSupportsPRUint16Impl::nsSupportsPRUint16Impl() : mData(0) @@ -278,8 +278,8 @@ NS_IMETHODIMP nsSupportsPRUint16Impl::ToString(char **_retval) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsPRUint32Impl, nsISupportsPRUint32, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsPRUint32Impl, nsISupportsPRUint32, + nsISupportsPrimitive) nsSupportsPRUint32Impl::nsSupportsPRUint32Impl() : mData(0) @@ -323,8 +323,8 @@ NS_IMETHODIMP nsSupportsPRUint32Impl::ToString(char **_retval) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsPRUint64Impl, nsISupportsPRUint64, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsPRUint64Impl, nsISupportsPRUint64, + nsISupportsPrimitive) nsSupportsPRUint64Impl::nsSupportsPRUint64Impl() : mData(0) @@ -368,8 +368,8 @@ NS_IMETHODIMP nsSupportsPRUint64Impl::ToString(char **_retval) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsPRTimeImpl, nsISupportsPRTime, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsPRTimeImpl, nsISupportsPRTime, + nsISupportsPrimitive) nsSupportsPRTimeImpl::nsSupportsPRTimeImpl() : mData(0) @@ -413,8 +413,8 @@ NS_IMETHODIMP nsSupportsPRTimeImpl::ToString(char **_retval) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsCharImpl, nsISupportsChar, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsCharImpl, nsISupportsChar, + nsISupportsPrimitive) nsSupportsCharImpl::nsSupportsCharImpl() : mData(0) @@ -458,8 +458,8 @@ NS_IMETHODIMP nsSupportsCharImpl::ToString(char **_retval) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsPRInt16Impl, nsISupportsPRInt16, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsPRInt16Impl, nsISupportsPRInt16, + nsISupportsPrimitive) nsSupportsPRInt16Impl::nsSupportsPRInt16Impl() : mData(0) @@ -503,8 +503,8 @@ NS_IMETHODIMP nsSupportsPRInt16Impl::ToString(char **_retval) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsPRInt32Impl, nsISupportsPRInt32, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsPRInt32Impl, nsISupportsPRInt32, + nsISupportsPrimitive) nsSupportsPRInt32Impl::nsSupportsPRInt32Impl() : mData(0) @@ -548,8 +548,8 @@ NS_IMETHODIMP nsSupportsPRInt32Impl::ToString(char **_retval) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsPRInt64Impl, nsISupportsPRInt64, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsPRInt64Impl, nsISupportsPRInt64, + nsISupportsPrimitive) nsSupportsPRInt64Impl::nsSupportsPRInt64Impl() : mData(0) @@ -593,8 +593,8 @@ NS_IMETHODIMP nsSupportsPRInt64Impl::ToString(char **_retval) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsFloatImpl, nsISupportsFloat, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsFloatImpl, nsISupportsFloat, + nsISupportsPrimitive) nsSupportsFloatImpl::nsSupportsFloatImpl() : mData(float(0.0)) @@ -638,8 +638,8 @@ NS_IMETHODIMP nsSupportsFloatImpl::ToString(char **_retval) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsDoubleImpl, nsISupportsDouble, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsDoubleImpl, nsISupportsDouble, + nsISupportsPrimitive) nsSupportsDoubleImpl::nsSupportsDoubleImpl() : mData(double(0.0)) @@ -684,8 +684,8 @@ NS_IMETHODIMP nsSupportsDoubleImpl::ToString(char **_retval) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsVoidImpl, nsISupportsVoid, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsVoidImpl, nsISupportsVoid, + nsISupportsPrimitive) nsSupportsVoidImpl::nsSupportsVoidImpl() : mData(nullptr) @@ -726,9 +726,9 @@ NS_IMETHODIMP nsSupportsVoidImpl::ToString(char **_retval) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsInterfacePointerImpl, - nsISupportsInterfacePointer, - nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsInterfacePointerImpl, + nsISupportsInterfacePointer, + nsISupportsPrimitive) nsSupportsInterfacePointerImpl::nsSupportsInterfacePointerImpl() : mIID(nullptr) @@ -807,7 +807,7 @@ NS_IMETHODIMP nsSupportsInterfacePointerImpl::ToString(char **_retval) /***************************************************************************/ -NS_IMPL_ISUPPORTS2(nsSupportsDependentCString,nsISupportsCString,nsISupportsPrimitive) +NS_IMPL_ISUPPORTS(nsSupportsDependentCString,nsISupportsCString,nsISupportsPrimitive) nsSupportsDependentCString::nsSupportsDependentCString(const char* aStr) : mData(aStr) diff --git a/xpcom/ds/nsVariant.cpp b/xpcom/ds/nsVariant.cpp index bc4b13ca013..f27bbbfe2a8 100644 --- a/xpcom/ds/nsVariant.cpp +++ b/xpcom/ds/nsVariant.cpp @@ -1664,7 +1664,7 @@ nsVariant::Traverse(const nsDiscriminatedUnion& data, /***************************************************************************/ // members... -NS_IMPL_ISUPPORTS2(nsVariant, nsIVariant, nsIWritableVariant) +NS_IMPL_ISUPPORTS(nsVariant, nsIVariant, nsIWritableVariant) nsVariant::nsVariant() : mWritable(true) diff --git a/xpcom/ds/nsWindowsRegKey.cpp b/xpcom/ds/nsWindowsRegKey.cpp index 0acbca5985f..e76230e08d4 100644 --- a/xpcom/ds/nsWindowsRegKey.cpp +++ b/xpcom/ds/nsWindowsRegKey.cpp @@ -44,7 +44,7 @@ private: BOOL mWatchRecursive; }; -NS_IMPL_ISUPPORTS1(nsWindowsRegKey, nsIWindowsRegKey) +NS_IMPL_ISUPPORTS(nsWindowsRegKey, nsIWindowsRegKey) NS_IMETHODIMP nsWindowsRegKey::GetKey(HKEY *key) diff --git a/xpcom/glue/GenericFactory.cpp b/xpcom/glue/GenericFactory.cpp index 5e11218761f..96cad8f5ad0 100644 --- a/xpcom/glue/GenericFactory.cpp +++ b/xpcom/glue/GenericFactory.cpp @@ -7,7 +7,7 @@ namespace mozilla { -NS_IMPL_ISUPPORTS1(GenericFactory, nsIFactory) +NS_IMPL_ISUPPORTS(GenericFactory, nsIFactory) NS_IMETHODIMP GenericFactory::CreateInstance(nsISupports* aOuter, REFNSIID aIID, diff --git a/xpcom/glue/GenericModule.cpp b/xpcom/glue/GenericModule.cpp index 554012a037e..e33cb1d2e28 100644 --- a/xpcom/glue/GenericModule.cpp +++ b/xpcom/glue/GenericModule.cpp @@ -15,7 +15,7 @@ namespace mozilla { -NS_IMPL_ISUPPORTS1(GenericModule, nsIModule) +NS_IMPL_ISUPPORTS(GenericModule, nsIModule) NS_IMETHODIMP GenericModule::GetClassObject(nsIComponentManager* aCompMgr, diff --git a/xpcom/glue/nsArrayEnumerator.cpp b/xpcom/glue/nsArrayEnumerator.cpp index 5c2588f5974..60029eff9ae 100644 --- a/xpcom/glue/nsArrayEnumerator.cpp +++ b/xpcom/glue/nsArrayEnumerator.cpp @@ -35,7 +35,7 @@ protected: uint32_t mIndex; }; -NS_IMPL_ISUPPORTS1(nsSimpleArrayEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsSimpleArrayEnumerator, nsISimpleEnumerator) NS_IMETHODIMP nsSimpleArrayEnumerator::HasMoreElements(bool* aResult) @@ -125,7 +125,7 @@ protected: nsISupports* mValueArray[1]; }; -NS_IMPL_ISUPPORTS1(nsCOMArrayEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsCOMArrayEnumerator, nsISimpleEnumerator) nsCOMArrayEnumerator::~nsCOMArrayEnumerator() { diff --git a/xpcom/glue/nsCategoryCache.cpp b/xpcom/glue/nsCategoryCache.cpp index 853a5e4c063..13b52c5c441 100644 --- a/xpcom/glue/nsCategoryCache.cpp +++ b/xpcom/glue/nsCategoryCache.cpp @@ -62,7 +62,7 @@ nsCategoryObserver::nsCategoryObserver(const char* aCategory) nsCategoryObserver::~nsCategoryObserver() { } -NS_IMPL_ISUPPORTS1(nsCategoryObserver, nsIObserver) +NS_IMPL_ISUPPORTS(nsCategoryObserver, nsIObserver) void nsCategoryObserver::ListenerDied() { diff --git a/xpcom/glue/nsClassInfoImpl.cpp b/xpcom/glue/nsClassInfoImpl.cpp index 6e685f125e4..840435d6b84 100644 --- a/xpcom/glue/nsClassInfoImpl.cpp +++ b/xpcom/glue/nsClassInfoImpl.cpp @@ -17,7 +17,7 @@ GenericClassInfo::Release() return 1; } -NS_IMPL_QUERY_INTERFACE1(GenericClassInfo, nsIClassInfo) +NS_IMPL_QUERY_INTERFACE(GenericClassInfo, nsIClassInfo) NS_IMETHODIMP GenericClassInfo::GetInterfaces(uint32_t* countp, nsIID*** array) diff --git a/xpcom/glue/nsEnumeratorUtils.cpp b/xpcom/glue/nsEnumeratorUtils.cpp index 3d190287a29..5b96e1b409d 100644 --- a/xpcom/glue/nsEnumeratorUtils.cpp +++ b/xpcom/glue/nsEnumeratorUtils.cpp @@ -45,8 +45,8 @@ NS_IMETHODIMP_(MozExternalRefCountType) EmptyEnumeratorImpl::Release(void) return 1; } -NS_IMPL_QUERY_INTERFACE3(EmptyEnumeratorImpl, nsISimpleEnumerator, - nsIUTF8StringEnumerator, nsIStringEnumerator) +NS_IMPL_QUERY_INTERFACE(EmptyEnumeratorImpl, nsISimpleEnumerator, + nsIUTF8StringEnumerator, nsIStringEnumerator) // nsISimpleEnumerator interface NS_IMETHODIMP EmptyEnumeratorImpl::HasMoreElements(bool* aResult) @@ -116,7 +116,7 @@ nsSingletonEnumerator::~nsSingletonEnumerator() NS_IF_RELEASE(mValue); } -NS_IMPL_ISUPPORTS1(nsSingletonEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsSingletonEnumerator, nsISimpleEnumerator) NS_IMETHODIMP nsSingletonEnumerator::HasMoreElements(bool* aResult) @@ -194,7 +194,7 @@ nsUnionEnumerator::~nsUnionEnumerator() { } -NS_IMPL_ISUPPORTS1(nsUnionEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsUnionEnumerator, nsISimpleEnumerator) NS_IMETHODIMP nsUnionEnumerator::HasMoreElements(bool* aResult) diff --git a/xpcom/glue/nsIClassInfoImpl.h b/xpcom/glue/nsIClassInfoImpl.h index 7005dd60a47..2dc7535fb0d 100644 --- a/xpcom/glue/nsIClassInfoImpl.h +++ b/xpcom/glue/nsIClassInfoImpl.h @@ -30,12 +30,12 @@ * you should already have the following nsISupports implementation in its cpp * file: * - * NS_IMPL_ISUPPORTS2(nsFooBar, nsIFoo, nsIBar). + * NS_IMPL_ISUPPORTS(nsFooBar, nsIFoo, nsIBar). * * Change this to * * NS_IMPL_CLASSINFO(nsFooBar, nullptr, 0, NS_FOOBAR_CID) - * NS_IMPL_ISUPPORTS2_CI(nsFooBar, nsIFoo, nsIBar) + * NS_IMPL_ISUPPORTS_CI(nsFooBar, nsIFoo, nsIBar) * * If nsFooBar is threadsafe, change the 0 above to nsIClassInfo::THREADSAFE. * If it's a singleton, use nsIClassInfo::SINGLETON. The full list of flags is @@ -45,9 +45,9 @@ * from an XPCOM object to a scriptable helper. Unless you're doing * specialized JS work, you can probably leave this as nullptr. * - * This file also defines the NS_IMPL_QUERY_INTERFACE2_CI macro, which you can - * use to replace NS_IMPL_QUERY_INTERFACE2, if you use that instead of - * NS_IMPL_ISUPPORTS2. + * This file also defines the NS_IMPL_QUERY_INTERFACE_CI macro, which you can + * use to replace NS_IMPL_QUERY_INTERFACE, if you use that instead of + * NS_IMPL_ISUPPORTS. * * That's it! The rest is gory details. * @@ -56,7 +56,7 @@ * "implement" it. However, after adding these macros to nsFooBar, you you can * QueryInterface an instance of nsFooBar to nsIClassInfo. How can this be? * - * The answer lies in the NS_IMPL_ISUPPORTS2_CI macro. It modifies nsFooBar's + * The answer lies in the NS_IMPL_ISUPPORTS_CI macro. It modifies nsFooBar's * QueryInterface implementation such that, if we ask to QI to nsIClassInfo, it * returns a singleton object associated with the class. (That singleton is * defined by NS_IMPL_CLASSINFO.) So all nsFooBar instances will return the diff --git a/xpcom/glue/nsThreadUtils.cpp b/xpcom/glue/nsThreadUtils.cpp index c89faa4e774..930b53b773b 100644 --- a/xpcom/glue/nsThreadUtils.cpp +++ b/xpcom/glue/nsThreadUtils.cpp @@ -29,7 +29,7 @@ using mozilla::IsVistaOrLater; #ifndef XPCOM_GLUE_AVOID_NSPR -NS_IMPL_ISUPPORTS1(nsRunnable, nsIRunnable) +NS_IMPL_ISUPPORTS(nsRunnable, nsIRunnable) NS_IMETHODIMP nsRunnable::Run() @@ -38,8 +38,8 @@ nsRunnable::Run() return NS_OK; } -NS_IMPL_ISUPPORTS2(nsCancelableRunnable, nsICancelableRunnable, - nsIRunnable) +NS_IMPL_ISUPPORTS(nsCancelableRunnable, nsICancelableRunnable, + nsIRunnable) NS_IMETHODIMP nsCancelableRunnable::Run() @@ -279,7 +279,7 @@ protected: const nsCString mName; }; -NS_IMPL_ISUPPORTS1(nsNameThreadRunnable, nsIRunnable) +NS_IMPL_ISUPPORTS(nsNameThreadRunnable, nsIRunnable) NS_IMETHODIMP nsNameThreadRunnable::Run() diff --git a/xpcom/glue/nsWeakReference.cpp b/xpcom/glue/nsWeakReference.cpp index c6869e5a2ed..157929964f5 100644 --- a/xpcom/glue/nsWeakReference.cpp +++ b/xpcom/glue/nsWeakReference.cpp @@ -110,7 +110,7 @@ nsSupportsWeakReference::GetWeakReference( nsIWeakReference** aInstancePtr ) return status; } -NS_IMPL_ISUPPORTS1(nsWeakReference, nsIWeakReference) +NS_IMPL_ISUPPORTS(nsWeakReference, nsIWeakReference) NS_IMETHODIMP nsWeakReference::QueryReferent( const nsIID& aIID, void** aInstancePtr ) diff --git a/xpcom/idl-parser/header.py b/xpcom/idl-parser/header.py index 1d4283d384f..43c4176c091 100644 --- a/xpcom/idl-parser/header.py +++ b/xpcom/idl-parser/header.py @@ -267,7 +267,7 @@ protected: }; /* Implementation file */ -NS_IMPL_ISUPPORTS1(%(implclass)s, %(name)s) +NS_IMPL_ISUPPORTS(%(implclass)s, %(name)s) %(implclass)s::%(implclass)s() { diff --git a/xpcom/io/nsAnonymousTemporaryFile.cpp b/xpcom/io/nsAnonymousTemporaryFile.cpp index 27fc50a4898..b4a69242d4d 100644 --- a/xpcom/io/nsAnonymousTemporaryFile.cpp +++ b/xpcom/io/nsAnonymousTemporaryFile.cpp @@ -233,7 +233,7 @@ private: nsCOMPtr mTimer; }; -NS_IMPL_ISUPPORTS1(nsAnonTempFileRemover, nsIObserver) +NS_IMPL_ISUPPORTS(nsAnonTempFileRemover, nsIObserver) nsresult CreateAnonTempFileRemover() { // Create a temp file remover. If Init() succeeds, the temp file remover is kept diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp index 272e4767387..1a38589eac6 100644 --- a/xpcom/io/nsAppFileLocationProvider.cpp +++ b/xpcom/io/nsAppFileLocationProvider.cpp @@ -74,7 +74,7 @@ nsAppFileLocationProvider::nsAppFileLocationProvider() // nsAppFileLocationProvider::nsISupports //***************************************************************************** -NS_IMPL_ISUPPORTS2(nsAppFileLocationProvider, nsIDirectoryServiceProvider, nsIDirectoryServiceProvider2) +NS_IMPL_ISUPPORTS(nsAppFileLocationProvider, nsIDirectoryServiceProvider, nsIDirectoryServiceProvider2) //***************************************************************************** // nsAppFileLocationProvider::nsIDirectoryServiceProvider @@ -440,7 +440,7 @@ class nsAppDirectoryEnumerator : public nsISimpleEnumerator nsCOMPtr mNext; }; -NS_IMPL_ISUPPORTS1(nsAppDirectoryEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsAppDirectoryEnumerator, nsISimpleEnumerator) /* nsPathsDirectoryEnumerator and PATH_SEPARATOR * are not used on MacOS/X. */ diff --git a/xpcom/io/nsBinaryStream.cpp b/xpcom/io/nsBinaryStream.cpp index 7ae96a9464b..74bb6f400d7 100644 --- a/xpcom/io/nsBinaryStream.cpp +++ b/xpcom/io/nsBinaryStream.cpp @@ -29,7 +29,7 @@ #include "jsfriendapi.h" -NS_IMPL_ISUPPORTS3(nsBinaryOutputStream, nsIObjectOutputStream, nsIBinaryOutputStream, nsIOutputStream) +NS_IMPL_ISUPPORTS(nsBinaryOutputStream, nsIObjectOutputStream, nsIBinaryOutputStream, nsIOutputStream) NS_IMETHODIMP nsBinaryOutputStream::Flush() @@ -325,7 +325,7 @@ nsBinaryOutputStream::PutBuffer(char* aBuffer, uint32_t aLength) mBufferAccess->PutBuffer(aBuffer, aLength); } -NS_IMPL_ISUPPORTS3(nsBinaryInputStream, nsIObjectInputStream, nsIBinaryInputStream, nsIInputStream) +NS_IMPL_ISUPPORTS(nsBinaryInputStream, nsIObjectInputStream, nsIBinaryInputStream, nsIInputStream) NS_IMETHODIMP nsBinaryInputStream::Available(uint64_t* aResult) diff --git a/xpcom/io/nsDirectoryService.cpp b/xpcom/io/nsDirectoryService.cpp index e7bceb16312..58b7e7212b1 100644 --- a/xpcom/io/nsDirectoryService.cpp +++ b/xpcom/io/nsDirectoryService.cpp @@ -266,7 +266,7 @@ nsDirectoryService::~nsDirectoryService() { } -NS_IMPL_ISUPPORTS4(nsDirectoryService, nsIProperties, nsIDirectoryService, nsIDirectoryServiceProvider, nsIDirectoryServiceProvider2) +NS_IMPL_ISUPPORTS(nsDirectoryService, nsIProperties, nsIDirectoryService, nsIDirectoryServiceProvider, nsIDirectoryServiceProvider2) NS_IMETHODIMP diff --git a/xpcom/io/nsIOUtil.cpp b/xpcom/io/nsIOUtil.cpp index e4062793b0b..929ea694692 100644 --- a/xpcom/io/nsIOUtil.cpp +++ b/xpcom/io/nsIOUtil.cpp @@ -8,7 +8,7 @@ #include "nsIOutputStream.h" #include "nsStreamUtils.h" -NS_IMPL_ISUPPORTS1(nsIOUtil, nsIIOUtil) +NS_IMPL_ISUPPORTS(nsIOUtil, nsIIOUtil) NS_IMETHODIMP nsIOUtil::InputStreamIsBuffered(nsIInputStream* aStream, bool* _retval) diff --git a/xpcom/io/nsInputStreamTee.cpp b/xpcom/io/nsInputStreamTee.cpp index b1c4094120a..4c1db92a991 100644 --- a/xpcom/io/nsInputStreamTee.cpp +++ b/xpcom/io/nsInputStreamTee.cpp @@ -207,9 +207,9 @@ nsInputStreamTee::WriteSegmentFun(nsIInputStream *in, void *closure, const char return tee->TeeSegment(fromSegment, *writeCount); } -NS_IMPL_ISUPPORTS2(nsInputStreamTee, - nsIInputStreamTee, - nsIInputStream) +NS_IMPL_ISUPPORTS(nsInputStreamTee, + nsIInputStreamTee, + nsIInputStream) NS_IMETHODIMP nsInputStreamTee::Close() { diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp index a54f374ba18..9afa0986190 100644 --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp @@ -128,7 +128,7 @@ nsDirEnumeratorUnix::~nsDirEnumeratorUnix() Close(); } -NS_IMPL_ISUPPORTS2(nsDirEnumeratorUnix, nsISimpleEnumerator, nsIDirectoryEnumerator) +NS_IMPL_ISUPPORTS(nsDirEnumeratorUnix, nsISimpleEnumerator, nsIDirectoryEnumerator) NS_IMETHODIMP nsDirEnumeratorUnix::Init(nsLocalFile *parent, bool resolveSymlinks /*ignored*/) @@ -226,16 +226,16 @@ nsLocalFile::nsLocalFile(const nsLocalFile& other) } #ifdef MOZ_WIDGET_COCOA -NS_IMPL_ISUPPORTS4(nsLocalFile, - nsILocalFileMac, - nsILocalFile, - nsIFile, - nsIHashable) +NS_IMPL_ISUPPORTS(nsLocalFile, + nsILocalFileMac, + nsILocalFile, + nsIFile, + nsIHashable) #else -NS_IMPL_ISUPPORTS3(nsLocalFile, - nsILocalFile, - nsIFile, - nsIHashable) +NS_IMPL_ISUPPORTS(nsLocalFile, + nsILocalFile, + nsIFile, + nsIHashable) #endif nsresult diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp index 8a9db03c049..0d4117dae2e 100644 --- a/xpcom/io/nsLocalFileWin.cpp +++ b/xpcom/io/nsLocalFileWin.cpp @@ -949,7 +949,7 @@ class nsDirEnumerator MOZ_FINAL : public nsISimpleEnumerator, nsCOMPtr mNext; }; -NS_IMPL_ISUPPORTS2(nsDirEnumerator, nsISimpleEnumerator, nsIDirectoryEnumerator) +NS_IMPL_ISUPPORTS(nsDirEnumerator, nsISimpleEnumerator, nsIDirectoryEnumerator) //----------------------------------------------------------------------------- @@ -989,11 +989,11 @@ nsLocalFile::nsLocalFileConstructor(nsISupports* outer, const nsIID& aIID, void* // nsLocalFile::nsISupports //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS4(nsLocalFile, - nsILocalFile, - nsIFile, - nsILocalFileWin, - nsIHashable) +NS_IMPL_ISUPPORTS(nsLocalFile, + nsILocalFile, + nsIFile, + nsILocalFileWin, + nsIHashable) //----------------------------------------------------------------------------- @@ -3486,7 +3486,7 @@ nsLocalFile::GlobalShutdown() NS_DestroyShortcutResolver(); } -NS_IMPL_ISUPPORTS1(nsDriveEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsDriveEnumerator, nsISimpleEnumerator) nsDriveEnumerator::nsDriveEnumerator() { diff --git a/xpcom/io/nsMultiplexInputStream.cpp b/xpcom/io/nsMultiplexInputStream.cpp index 6d54e196007..48daa39ddf3 100644 --- a/xpcom/io/nsMultiplexInputStream.cpp +++ b/xpcom/io/nsMultiplexInputStream.cpp @@ -66,15 +66,15 @@ NS_IMPL_RELEASE(nsMultiplexInputStream) NS_IMPL_CLASSINFO(nsMultiplexInputStream, nullptr, nsIClassInfo::THREADSAFE, NS_MULTIPLEXINPUTSTREAM_CID) -NS_IMPL_QUERY_INTERFACE4_CI(nsMultiplexInputStream, +NS_IMPL_QUERY_INTERFACE_CI(nsMultiplexInputStream, + nsIMultiplexInputStream, + nsIInputStream, + nsISeekableStream, + nsIIPCSerializableInputStream) +NS_IMPL_CI_INTERFACE_GETTER(nsMultiplexInputStream, nsIMultiplexInputStream, nsIInputStream, - nsISeekableStream, - nsIIPCSerializableInputStream) -NS_IMPL_CI_INTERFACE_GETTER3(nsMultiplexInputStream, - nsIMultiplexInputStream, - nsIInputStream, - nsISeekableStream) + nsISeekableStream) nsMultiplexInputStream::nsMultiplexInputStream() : mCurrentStream(0), diff --git a/xpcom/io/nsPipe3.cpp b/xpcom/io/nsPipe3.cpp index b11dcf1647b..8e56ecb9313 100644 --- a/xpcom/io/nsPipe3.cpp +++ b/xpcom/io/nsPipe3.cpp @@ -316,7 +316,7 @@ nsPipe::~nsPipe() { } -NS_IMPL_ISUPPORTS1(nsPipe, nsIPipe) +NS_IMPL_ISUPPORTS(nsPipe, nsIPipe) NS_IMETHODIMP nsPipe::Init(bool nonBlockingIn, @@ -604,18 +604,18 @@ nsPipeEvents::~nsPipeEvents() // nsPipeInputStream methods: //----------------------------------------------------------------------------- -NS_IMPL_QUERY_INTERFACE5(nsPipeInputStream, - nsIInputStream, - nsIAsyncInputStream, - nsISeekableStream, - nsISearchableInputStream, - nsIClassInfo) +NS_IMPL_QUERY_INTERFACE(nsPipeInputStream, + nsIInputStream, + nsIAsyncInputStream, + nsISeekableStream, + nsISearchableInputStream, + nsIClassInfo) -NS_IMPL_CI_INTERFACE_GETTER4(nsPipeInputStream, - nsIInputStream, - nsIAsyncInputStream, - nsISeekableStream, - nsISearchableInputStream) +NS_IMPL_CI_INTERFACE_GETTER(nsPipeInputStream, + nsIInputStream, + nsIAsyncInputStream, + nsISeekableStream, + nsISearchableInputStream) NS_IMPL_THREADSAFE_CI(nsPipeInputStream) @@ -966,14 +966,14 @@ nsPipeInputStream::Search(const char *forString, // nsPipeOutputStream methods: //----------------------------------------------------------------------------- -NS_IMPL_QUERY_INTERFACE3(nsPipeOutputStream, - nsIOutputStream, - nsIAsyncOutputStream, - nsIClassInfo) +NS_IMPL_QUERY_INTERFACE(nsPipeOutputStream, + nsIOutputStream, + nsIAsyncOutputStream, + nsIClassInfo) -NS_IMPL_CI_INTERFACE_GETTER2(nsPipeOutputStream, - nsIOutputStream, - nsIAsyncOutputStream) +NS_IMPL_CI_INTERFACE_GETTER(nsPipeOutputStream, + nsIOutputStream, + nsIAsyncOutputStream) NS_IMPL_THREADSAFE_CI(nsPipeOutputStream) diff --git a/xpcom/io/nsScriptableBase64Encoder.cpp b/xpcom/io/nsScriptableBase64Encoder.cpp index 8f54d98e6e0..4392603714a 100644 --- a/xpcom/io/nsScriptableBase64Encoder.cpp +++ b/xpcom/io/nsScriptableBase64Encoder.cpp @@ -8,7 +8,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS1(nsScriptableBase64Encoder, nsIScriptableBase64Encoder) +NS_IMPL_ISUPPORTS(nsScriptableBase64Encoder, nsIScriptableBase64Encoder) /* ACString encodeToCString (in nsIInputStream stream, in unsigned long length); */ NS_IMETHODIMP diff --git a/xpcom/io/nsScriptableInputStream.cpp b/xpcom/io/nsScriptableInputStream.cpp index 13e891beede..dfbcc8927a8 100644 --- a/xpcom/io/nsScriptableInputStream.cpp +++ b/xpcom/io/nsScriptableInputStream.cpp @@ -7,7 +7,7 @@ #include "nsMemory.h" #include "nsString.h" -NS_IMPL_ISUPPORTS1(nsScriptableInputStream, nsIScriptableInputStream) +NS_IMPL_ISUPPORTS(nsScriptableInputStream, nsIScriptableInputStream) // nsIScriptableInputStream methods NS_IMETHODIMP diff --git a/xpcom/io/nsStorageStream.cpp b/xpcom/io/nsStorageStream.cpp index ba5e129f669..c6cc0f3472e 100644 --- a/xpcom/io/nsStorageStream.cpp +++ b/xpcom/io/nsStorageStream.cpp @@ -62,9 +62,9 @@ nsStorageStream::~nsStorageStream() delete mSegmentedBuffer; } -NS_IMPL_ISUPPORTS2(nsStorageStream, - nsIStorageStream, - nsIOutputStream) +NS_IMPL_ISUPPORTS(nsStorageStream, + nsIStorageStream, + nsIOutputStream) NS_IMETHODIMP nsStorageStream::Init(uint32_t segmentSize, uint32_t maxSize) @@ -352,9 +352,9 @@ private: uint32_t SegOffset(uint32_t aPosition) {return aPosition & (mSegmentSize - 1);} }; -NS_IMPL_ISUPPORTS2(nsStorageInputStream, - nsIInputStream, - nsISeekableStream) +NS_IMPL_ISUPPORTS(nsStorageInputStream, + nsIInputStream, + nsISeekableStream) NS_IMETHODIMP nsStorageStream::NewInputStream(int32_t aStartingOffset, nsIInputStream* *aInputStream) diff --git a/xpcom/io/nsStreamUtils.cpp b/xpcom/io/nsStreamUtils.cpp index c944c79f5ca..c750f204d7f 100644 --- a/xpcom/io/nsStreamUtils.cpp +++ b/xpcom/io/nsStreamUtils.cpp @@ -94,8 +94,8 @@ private: nsCOMPtr mTarget; }; -NS_IMPL_ISUPPORTS2(nsInputStreamReadyEvent, nsIRunnable, - nsIInputStreamCallback) +NS_IMPL_ISUPPORTS(nsInputStreamReadyEvent, nsIRunnable, + nsIInputStreamCallback) //----------------------------------------------------------------------------- @@ -172,8 +172,8 @@ private: nsCOMPtr mTarget; }; -NS_IMPL_ISUPPORTS2(nsOutputStreamReadyEvent, nsIRunnable, - nsIOutputStreamCallback) +NS_IMPL_ISUPPORTS(nsOutputStreamReadyEvent, nsIRunnable, + nsIOutputStreamCallback) //----------------------------------------------------------------------------- @@ -462,10 +462,10 @@ protected: nsresult mCancelStatus; }; -NS_IMPL_ISUPPORTS3(nsAStreamCopier, - nsIInputStreamCallback, - nsIOutputStreamCallback, - nsIRunnable) +NS_IMPL_ISUPPORTS(nsAStreamCopier, + nsIInputStreamCallback, + nsIOutputStreamCallback, + nsIRunnable) class nsStreamCopierIB MOZ_FINAL : public nsAStreamCopier { diff --git a/xpcom/io/nsStringStream.cpp b/xpcom/io/nsStringStream.cpp index 68ed9419a16..0846d7d8c76 100644 --- a/xpcom/io/nsStringStream.cpp +++ b/xpcom/io/nsStringStream.cpp @@ -83,17 +83,17 @@ NS_IMPL_RELEASE(nsStringInputStream) NS_IMPL_CLASSINFO(nsStringInputStream, nullptr, nsIClassInfo::THREADSAFE, NS_STRINGINPUTSTREAM_CID) -NS_IMPL_QUERY_INTERFACE5_CI(nsStringInputStream, +NS_IMPL_QUERY_INTERFACE_CI(nsStringInputStream, + nsIStringInputStream, + nsIInputStream, + nsISupportsCString, + nsISeekableStream, + nsIIPCSerializableInputStream) +NS_IMPL_CI_INTERFACE_GETTER(nsStringInputStream, nsIStringInputStream, nsIInputStream, nsISupportsCString, - nsISeekableStream, - nsIIPCSerializableInputStream) -NS_IMPL_CI_INTERFACE_GETTER4(nsStringInputStream, - nsIStringInputStream, - nsIInputStream, - nsISupportsCString, - nsISeekableStream) + nsISeekableStream) ///////// // nsISupportsCString implementation diff --git a/xpcom/io/nsUnicharInputStream.cpp b/xpcom/io/nsUnicharInputStream.cpp index b639d8d1146..de4d3da9af6 100644 --- a/xpcom/io/nsUnicharInputStream.cpp +++ b/xpcom/io/nsUnicharInputStream.cpp @@ -117,7 +117,7 @@ nsresult StringUnicharInputStream::Close() return NS_OK; } -NS_IMPL_ISUPPORTS1(StringUnicharInputStream, nsIUnicharInputStream) +NS_IMPL_ISUPPORTS(StringUnicharInputStream, nsIUnicharInputStream) //---------------------------------------------------------------------- @@ -165,7 +165,7 @@ UTF8InputStream::Init(nsIInputStream* aStream) return NS_OK; } -NS_IMPL_ISUPPORTS1(UTF8InputStream,nsIUnicharInputStream) +NS_IMPL_ISUPPORTS(UTF8InputStream,nsIUnicharInputStream) UTF8InputStream::~UTF8InputStream() { @@ -369,9 +369,9 @@ UTF8InputStream::CountValidUTF8Bytes(const char* aBuffer, uint32_t aMaxBytes, ui aValidUTF16CodeUnits = utf16length; } -NS_IMPL_QUERY_INTERFACE2(nsSimpleUnicharStreamFactory, - nsIFactory, - nsISimpleUnicharStreamFactory) +NS_IMPL_QUERY_INTERFACE(nsSimpleUnicharStreamFactory, + nsIFactory, + nsISimpleUnicharStreamFactory) NS_IMETHODIMP_(MozExternalRefCountType) nsSimpleUnicharStreamFactory::AddRef() { return 2; } NS_IMETHODIMP_(MozExternalRefCountType) nsSimpleUnicharStreamFactory::Release() { return 1; } diff --git a/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp b/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp index fd96d13dcc2..5135cc12738 100644 --- a/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp +++ b/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp @@ -134,7 +134,7 @@ public: NS_IMETHOD ShouldFail(int32_t p); }; -NS_IMPL_ISUPPORTS1(InvokeTestTarget, InvokeTestTargetInterface) +NS_IMPL_ISUPPORTS(InvokeTestTarget, InvokeTestTargetInterface) InvokeTestTarget::InvokeTestTarget() { diff --git a/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp b/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp index 96db6e258d3..d25a9552f40 100644 --- a/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp +++ b/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp @@ -576,7 +576,7 @@ xptiInterfaceInfo::BuildParent() /***************************************************************************/ -NS_IMPL_QUERY_INTERFACE1(xptiInterfaceInfo, nsIInterfaceInfo) +NS_IMPL_QUERY_INTERFACE(xptiInterfaceInfo, nsIInterfaceInfo) xptiInterfaceInfo::xptiInterfaceInfo(xptiInterfaceEntry* entry) : mEntry(entry), mParent(nullptr) diff --git a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp index 0002a866468..28c60962429 100644 --- a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp +++ b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp @@ -22,7 +22,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS2( +NS_IMPL_ISUPPORTS( XPTInterfaceInfoManager, nsIInterfaceInfoManager, nsIMemoryReporter) diff --git a/xpcom/sample/nsSample.cpp b/xpcom/sample/nsSample.cpp index 28013080453..1eb70b29ef5 100644 --- a/xpcom/sample/nsSample.cpp +++ b/xpcom/sample/nsSample.cpp @@ -31,7 +31,7 @@ nsSampleImpl::~nsSampleImpl() } /** - * NS_IMPL_ISUPPORTS1 expands to a simple implementation of the nsISupports + * NS_IMPL_ISUPPORTS expands to a simple implementation of the nsISupports * interface. This includes a proper implementation of AddRef, Release, * and QueryInterface. If this class supported more interfaces than just * nsISupports, @@ -45,7 +45,7 @@ nsSampleImpl::~nsSampleImpl() * and interface flattening. */ NS_IMPL_CLASSINFO(nsSampleImpl, nullptr, 0, NS_SAMPLE_CID) -NS_IMPL_ISUPPORTS1_CI(nsSampleImpl, nsISample) +NS_IMPL_ISUPPORTS_CI(nsSampleImpl, nsISample) /** * Notice that in the protoype for this function, the NS_IMETHOD macro was * used to declare the return type. For the implementation, the return diff --git a/xpcom/sample/xpconnect-sample.html b/xpcom/sample/xpconnect-sample.html index 21c7c8c8877..45f19ed2f2d 100644 --- a/xpcom/sample/xpconnect-sample.html +++ b/xpcom/sample/xpconnect-sample.html @@ -62,7 +62,7 @@ compiler. The attribute Value has been expanded into a get and set and the return values have been modified to NS_IMETHOD, a success status for the method. The macro NS_DECL_ISUPPORTS, defined in mozilla/xpcom/public/nsISupportsUtils.h defines the inherited methods from nsISupports.h. -
NS_IMPL_ISUPPORTS1(SampleImpl, nsISample) +
NS_IMPL_ISUPPORTS(SampleImpl, nsISample)
In the constructor, the macro NS_INIT_REFCNT is called which sets the reference count to 0.

Note that the methods in the C++ bindings use InterCaps style, while the IDL diff --git a/xpcom/tests/TestArray.cpp b/xpcom/tests/TestArray.cpp index 59222895773..92d165603af 100644 --- a/xpcom/tests/TestArray.cpp +++ b/xpcom/tests/TestArray.cpp @@ -64,7 +64,7 @@ Foo::~Foo() mID, static_cast(this), gCount); } -NS_IMPL_ISUPPORTS1(Foo, IFoo) +NS_IMPL_ISUPPORTS(Foo, IFoo) const char* AssertEqual(int32_t aValue1, int32_t aValue2) { diff --git a/xpcom/tests/TestBase64.cpp b/xpcom/tests/TestBase64.cpp index 38a0b612929..70b1d8f375d 100644 --- a/xpcom/tests/TestBase64.cpp +++ b/xpcom/tests/TestBase64.cpp @@ -168,7 +168,7 @@ private: bool mClosed; }; -NS_IMPL_ISUPPORTS1(FakeInputStream, nsIInputStream) +NS_IMPL_ISUPPORTS(FakeInputStream, nsIInputStream) NS_IMETHODIMP FakeInputStream::Close() diff --git a/xpcom/tests/TestCOMArray.cpp b/xpcom/tests/TestCOMArray.cpp index 12a13d88e56..358b26987a1 100644 --- a/xpcom/tests/TestCOMArray.cpp +++ b/xpcom/tests/TestCOMArray.cpp @@ -55,7 +55,7 @@ Foo::~Foo() --gCount; } -NS_IMPL_ISUPPORTS1(Foo, IFoo) +NS_IMPL_ISUPPORTS(Foo, IFoo) typedef nsCOMArray Array; @@ -106,7 +106,7 @@ Bar::~Bar() } NS_IMPL_ADDREF(Bar) -NS_IMPL_QUERY_INTERFACE1(Bar, IBar) +NS_IMPL_QUERY_INTERFACE(Bar, IBar) NS_IMETHODIMP_(MozExternalRefCountType) Bar::Release(void) diff --git a/xpcom/tests/TestCallTemplates.cpp b/xpcom/tests/TestCallTemplates.cpp index 6bbaf90bb03..78996bce8fa 100644 --- a/xpcom/tests/TestCallTemplates.cpp +++ b/xpcom/tests/TestCallTemplates.cpp @@ -40,7 +40,7 @@ class nsTestService MOZ_FINAL : public nsITestService, NS_DECL_ISUPPORTS }; -NS_IMPL_ISUPPORTS2(nsTestService, nsITestService, nsISupportsWeakReference) +NS_IMPL_ISUPPORTS(nsTestService, nsITestService, nsISupportsWeakReference) #define NS_TEST_SERVICE_CONTRACTID "@mozilla.org/test/testservice;1" #define NS_TEST_SERVICE_CID \ diff --git a/xpcom/tests/TestHarness.h b/xpcom/tests/TestHarness.h index 2d07a990755..b20b3d1e2e5 100644 --- a/xpcom/tests/TestHarness.h +++ b/xpcom/tests/TestHarness.h @@ -263,7 +263,7 @@ class ScopedXPCOM : public nsIDirectoryServiceProvider2 nsCOMPtr mGRED; }; -NS_IMPL_QUERY_INTERFACE2( +NS_IMPL_QUERY_INTERFACE( ScopedXPCOM, nsIDirectoryServiceProvider, nsIDirectoryServiceProvider2 diff --git a/xpcom/tests/TestObserverService.cpp b/xpcom/tests/TestObserverService.cpp index a79f69dcc25..ebe2b3f3499 100644 --- a/xpcom/tests/TestObserverService.cpp +++ b/xpcom/tests/TestObserverService.cpp @@ -46,7 +46,7 @@ private: ~TestObserver() {} }; -NS_IMPL_ISUPPORTS2( TestObserver, nsIObserver, nsISupportsWeakReference ) +NS_IMPL_ISUPPORTS( TestObserver, nsIObserver, nsISupportsWeakReference ) NS_IMETHODIMP TestObserver::Observe( nsISupports *aSubject, diff --git a/xpcom/tests/TestPipes.cpp b/xpcom/tests/TestPipes.cpp index 00f70d4b9ce..c630e930efe 100644 --- a/xpcom/tests/TestPipes.cpp +++ b/xpcom/tests/TestPipes.cpp @@ -146,7 +146,7 @@ protected: uint32_t mCount; }; -NS_IMPL_ISUPPORTS1(nsReceiver, nsIRunnable) +NS_IMPL_ISUPPORTS(nsReceiver, nsIRunnable) nsresult TestPipe(nsIInputStream* in, nsIOutputStream* out) @@ -261,7 +261,7 @@ protected: Monitor* mMon; }; -NS_IMPL_ISUPPORTS1(nsShortReader, nsIRunnable) +NS_IMPL_ISUPPORTS(nsShortReader, nsIRunnable) nsresult TestShortWrites(nsIInputStream* in, nsIOutputStream* out) @@ -352,7 +352,7 @@ protected: uint32_t mCount; }; -NS_IMPL_ISUPPORTS1(nsPump, nsIRunnable) +NS_IMPL_ISUPPORTS(nsPump, nsIRunnable) nsresult TestChainedPipes() diff --git a/xpcom/tests/TestRacingServiceManager.cpp b/xpcom/tests/TestRacingServiceManager.cpp index 0f3214fdf50..609322b8d41 100644 --- a/xpcom/tests/TestRacingServiceManager.cpp +++ b/xpcom/tests/TestRacingServiceManager.cpp @@ -103,7 +103,7 @@ public: bool mFirstComponentCreated; }; -NS_IMPL_ISUPPORTS1(Factory, nsIFactory) +NS_IMPL_ISUPPORTS(Factory, nsIFactory) class Component1 MOZ_FINAL : public nsISupports { diff --git a/xpcom/tests/TestThreadPool.cpp b/xpcom/tests/TestThreadPool.cpp index f0af86df069..e469588dd72 100644 --- a/xpcom/tests/TestThreadPool.cpp +++ b/xpcom/tests/TestThreadPool.cpp @@ -32,7 +32,7 @@ public: private: int mIndex; }; -NS_IMPL_ISUPPORTS1(Task, nsIRunnable) +NS_IMPL_ISUPPORTS(Task, nsIRunnable) static nsresult RunTests() diff --git a/xpcom/tests/TestThreadPoolListener.cpp b/xpcom/tests/TestThreadPoolListener.cpp index 6e914c824d3..3c45eb38d30 100644 --- a/xpcom/tests/TestThreadPoolListener.cpp +++ b/xpcom/tests/TestThreadPoolListener.cpp @@ -52,7 +52,7 @@ public: NS_DECL_NSITHREADPOOLLISTENER }; -NS_IMPL_ISUPPORTS1(Listener, nsIThreadPoolListener) +NS_IMPL_ISUPPORTS(Listener, nsIThreadPoolListener) NS_IMETHODIMP Listener::OnThreadCreated() diff --git a/xpcom/tests/TestThreads.cpp b/xpcom/tests/TestThreads.cpp index ea806e15cac..2ade6e7607e 100644 --- a/xpcom/tests/TestThreads.cpp +++ b/xpcom/tests/TestThreads.cpp @@ -38,7 +38,7 @@ protected: int mNum; }; -NS_IMPL_ISUPPORTS1(nsRunner, nsIRunnable) +NS_IMPL_ISUPPORTS(nsRunner, nsIRunnable) nsresult TestThreads() @@ -106,7 +106,7 @@ protected: int32_t nsStressRunner::gNum = 0; -NS_IMPL_ISUPPORTS1(nsStressRunner, nsIRunnable) +NS_IMPL_ISUPPORTS(nsStressRunner, nsIRunnable) static int Stress(int loops, int threads) { diff --git a/xpcom/tests/TestTimers.cpp b/xpcom/tests/TestTimers.cpp index b9ffd1ea79d..1d1802475dc 100644 --- a/xpcom/tests/TestTimers.cpp +++ b/xpcom/tests/TestTimers.cpp @@ -94,7 +94,7 @@ private: ReentrantMonitor* mReentrantMonitor; }; -NS_IMPL_ISUPPORTS1(TimerCallback, nsITimerCallback) +NS_IMPL_ISUPPORTS(TimerCallback, nsITimerCallback) nsresult TestTargetedTimers() diff --git a/xpcom/tests/windows/TestCOM.cpp b/xpcom/tests/windows/TestCOM.cpp index 51947a20dec..ed694888d7f 100644 --- a/xpcom/tests/windows/TestCOM.cpp +++ b/xpcom/tests/windows/TestCOM.cpp @@ -48,7 +48,7 @@ private: } }; -NS_IMPL_QUERY_INTERFACE1(nsTestCom, nsITestCom) +NS_IMPL_QUERY_INTERFACE(nsTestCom, nsITestCom) MozExternalRefCountType nsTestCom::AddRef() { @@ -87,7 +87,7 @@ public: } }; -NS_IMPL_ISUPPORTS1(nsTestComFactory, nsIFactory) +NS_IMPL_ISUPPORTS(nsTestComFactory, nsIFactory) nsresult nsTestComFactory::CreateInstance(nsISupports *aOuter, const nsIID &aIID, diff --git a/xpcom/threads/LazyIdleThread.cpp b/xpcom/threads/LazyIdleThread.cpp index ee27e632f06..a3c668f8cef 100644 --- a/xpcom/threads/LazyIdleThread.cpp +++ b/xpcom/threads/LazyIdleThread.cpp @@ -371,11 +371,11 @@ LazyIdleThread::Release() return count; } -NS_IMPL_QUERY_INTERFACE5(LazyIdleThread, nsIThread, - nsIEventTarget, - nsITimerCallback, - nsIThreadObserver, - nsIObserver) +NS_IMPL_QUERY_INTERFACE(LazyIdleThread, nsIThread, + nsIEventTarget, + nsITimerCallback, + nsIThreadObserver, + nsIObserver) NS_IMETHODIMP LazyIdleThread::Dispatch(nsIRunnable* aEvent, diff --git a/xpcom/threads/TimerThread.cpp b/xpcom/threads/TimerThread.cpp index 59dfb06a719..1c21016aaee 100644 --- a/xpcom/threads/TimerThread.cpp +++ b/xpcom/threads/TimerThread.cpp @@ -19,7 +19,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS2(TimerThread, nsIRunnable, nsIObserver) +NS_IMPL_ISUPPORTS(TimerThread, nsIRunnable, nsIObserver) TimerThread::TimerThread() : mInitInProgress(false), diff --git a/xpcom/threads/nsEnvironment.cpp b/xpcom/threads/nsEnvironment.cpp index 53b20755673..36c9d51d10e 100644 --- a/xpcom/threads/nsEnvironment.cpp +++ b/xpcom/threads/nsEnvironment.cpp @@ -14,7 +14,7 @@ using namespace mozilla; -NS_IMPL_ISUPPORTS1(nsEnvironment, nsIEnvironment) +NS_IMPL_ISUPPORTS(nsEnvironment, nsIEnvironment) nsresult nsEnvironment::Create(nsISupports *aOuter, REFNSIID aIID, diff --git a/xpcom/threads/nsProcessCommon.cpp b/xpcom/threads/nsProcessCommon.cpp index c4ed006a6fa..20795a9af48 100644 --- a/xpcom/threads/nsProcessCommon.cpp +++ b/xpcom/threads/nsProcessCommon.cpp @@ -58,8 +58,8 @@ cpu_type_t pref_cpu_types[2] = { //-------------------------------------------------------------------// // nsIProcess implementation //-------------------------------------------------------------------// -NS_IMPL_ISUPPORTS2(nsProcess, nsIProcess, - nsIObserver) +NS_IMPL_ISUPPORTS(nsProcess, nsIProcess, + nsIObserver) //Constructor nsProcess::nsProcess() diff --git a/xpcom/threads/nsThread.cpp b/xpcom/threads/nsThread.cpp index 5208fd18620..b577727a3d8 100644 --- a/xpcom/threads/nsThread.cpp +++ b/xpcom/threads/nsThread.cpp @@ -99,7 +99,7 @@ public: NS_IMETHODIMP_(MozExternalRefCountType) nsThreadClassInfo::AddRef() { return 2; } NS_IMETHODIMP_(MozExternalRefCountType) nsThreadClassInfo::Release() { return 1; } -NS_IMPL_QUERY_INTERFACE1(nsThreadClassInfo, nsIClassInfo) +NS_IMPL_QUERY_INTERFACE(nsThreadClassInfo, nsIClassInfo) NS_IMETHODIMP nsThreadClassInfo::GetInterfaces(uint32_t *count, nsIID ***array) @@ -170,8 +170,8 @@ NS_INTERFACE_MAP_BEGIN(nsThread) foundInterface = static_cast(&sThreadClassInfo); } else NS_INTERFACE_MAP_END -NS_IMPL_CI_INTERFACE_GETTER4(nsThread, nsIThread, nsIThreadInternal, - nsIEventTarget, nsISupportsPriority) +NS_IMPL_CI_INTERFACE_GETTER(nsThread, nsIThread, nsIThreadInternal, + nsIEventTarget, nsISupportsPriority) //----------------------------------------------------------------------------- @@ -934,7 +934,7 @@ nsThreadSyncDispatch::Run() //----------------------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsThread::nsNestedEventTarget, nsIEventTarget) +NS_IMPL_ISUPPORTS(nsThread::nsNestedEventTarget, nsIEventTarget) NS_IMETHODIMP nsThread::nsNestedEventTarget::Dispatch(nsIRunnable *event, uint32_t flags) diff --git a/xpcom/threads/nsThreadManager.cpp b/xpcom/threads/nsThreadManager.cpp index 21a37abc463..efe932109f7 100644 --- a/xpcom/threads/nsThreadManager.cpp +++ b/xpcom/threads/nsThreadManager.cpp @@ -48,8 +48,8 @@ NS_IMETHODIMP_(MozExternalRefCountType) nsThreadManager::Release() { return 1; } NS_IMPL_CLASSINFO(nsThreadManager, nullptr, nsIClassInfo::THREADSAFE | nsIClassInfo::SINGLETON, NS_THREADMANAGER_CID) -NS_IMPL_QUERY_INTERFACE1_CI(nsThreadManager, nsIThreadManager) -NS_IMPL_CI_INTERFACE_GETTER1(nsThreadManager, nsIThreadManager) +NS_IMPL_QUERY_INTERFACE_CI(nsThreadManager, nsIThreadManager) +NS_IMPL_CI_INTERFACE_GETTER(nsThreadManager, nsIThreadManager) //----------------------------------------------------------------------------- diff --git a/xpcom/threads/nsThreadPool.cpp b/xpcom/threads/nsThreadPool.cpp index 299d8f4319c..4e1b90fc692 100644 --- a/xpcom/threads/nsThreadPool.cpp +++ b/xpcom/threads/nsThreadPool.cpp @@ -44,9 +44,9 @@ NS_IMPL_ADDREF(nsThreadPool) NS_IMPL_RELEASE(nsThreadPool) NS_IMPL_CLASSINFO(nsThreadPool, nullptr, nsIClassInfo::THREADSAFE, NS_THREADPOOL_CID) -NS_IMPL_QUERY_INTERFACE3_CI(nsThreadPool, nsIThreadPool, nsIEventTarget, - nsIRunnable) -NS_IMPL_CI_INTERFACE_GETTER2(nsThreadPool, nsIThreadPool, nsIEventTarget) +NS_IMPL_QUERY_INTERFACE_CI(nsThreadPool, nsIThreadPool, nsIEventTarget, + nsIRunnable) +NS_IMPL_CI_INTERFACE_GETTER(nsThreadPool, nsIThreadPool, nsIEventTarget) nsThreadPool::nsThreadPool() : mThreadLimit(DEFAULT_THREAD_LIMIT) diff --git a/xpcom/threads/nsTimerImpl.cpp b/xpcom/threads/nsTimerImpl.cpp index f383647f17e..0982631a176 100644 --- a/xpcom/threads/nsTimerImpl.cpp +++ b/xpcom/threads/nsTimerImpl.cpp @@ -191,7 +191,7 @@ void TimerEventAllocator::Free(void* aPtr) } // anonymous namespace -NS_IMPL_QUERY_INTERFACE1(nsTimerImpl, nsITimer) +NS_IMPL_QUERY_INTERFACE(nsTimerImpl, nsITimer) NS_IMPL_ADDREF(nsTimerImpl) NS_IMETHODIMP_(MozExternalRefCountType) nsTimerImpl::Release(void) diff --git a/xpfe/appshell/src/nsAppShellService.cpp b/xpfe/appshell/src/nsAppShellService.cpp index b3eb5f6d675..666c2de3e26 100644 --- a/xpfe/appshell/src/nsAppShellService.cpp +++ b/xpfe/appshell/src/nsAppShellService.cpp @@ -80,9 +80,9 @@ nsAppShellService::~nsAppShellService() /* * Implement the nsISupports methods... */ -NS_IMPL_ISUPPORTS2(nsAppShellService, - nsIAppShellService, - nsIObserver) +NS_IMPL_ISUPPORTS(nsAppShellService, + nsIAppShellService, + nsIObserver) NS_IMETHODIMP nsAppShellService::CreateHiddenWindow() diff --git a/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp b/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp index 4361565c99b..81ab2c31ae0 100644 --- a/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp +++ b/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp @@ -148,7 +148,7 @@ void nsWindowInfo::ReferenceSelf(bool inAge, bool inZ) // nsAppShellWindowEnumerator // -NS_IMPL_ISUPPORTS1(nsAppShellWindowEnumerator, nsISimpleEnumerator) +NS_IMPL_ISUPPORTS(nsAppShellWindowEnumerator, nsISimpleEnumerator) nsAppShellWindowEnumerator::nsAppShellWindowEnumerator( const char16_t* aTypeString, diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp index 0ba1fb9cb14..72ffcacc1a7 100644 --- a/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/xpfe/appshell/src/nsWebShellWindow.cpp @@ -464,7 +464,7 @@ private: nsRefPtr mWindow; }; -NS_IMPL_ISUPPORTS1(WebShellWindowTimerCallback, nsITimerCallback) +NS_IMPL_ISUPPORTS(WebShellWindowTimerCallback, nsITimerCallback) } // namespace mozilla diff --git a/xpfe/appshell/src/nsWindowMediator.cpp b/xpfe/appshell/src/nsWindowMediator.cpp index 0729c4cebfb..eb28d1d8baf 100644 --- a/xpfe/appshell/src/nsWindowMediator.cpp +++ b/xpfe/appshell/src/nsWindowMediator.cpp @@ -743,7 +743,7 @@ nsWindowMediator::SortZOrderBackToFront() mSortingZOrder = false; } -NS_IMPL_ISUPPORTS3(nsWindowMediator, +NS_IMPL_ISUPPORTS(nsWindowMediator, nsIWindowMediator, nsIObserver, nsISupportsWeakReference) diff --git a/xpfe/components/directory/nsDirectoryViewer.cpp b/xpfe/components/directory/nsDirectoryViewer.cpp index ab9287d2d32..46a362b6bbd 100644 --- a/xpfe/components/directory/nsDirectoryViewer.cpp +++ b/xpfe/components/directory/nsDirectoryViewer.cpp @@ -1254,7 +1254,7 @@ nsDirectoryViewerFactory::~nsDirectoryViewerFactory() } -NS_IMPL_ISUPPORTS1(nsDirectoryViewerFactory, nsIDocumentLoaderFactory) +NS_IMPL_ISUPPORTS(nsDirectoryViewerFactory, nsIDocumentLoaderFactory) diff --git a/xulrunner/examples/simple/components/src/SimpleTest.cpp b/xulrunner/examples/simple/components/src/SimpleTest.cpp index 57bfd9f2c18..0f5239fd306 100644 --- a/xulrunner/examples/simple/components/src/SimpleTest.cpp +++ b/xulrunner/examples/simple/components/src/SimpleTest.cpp @@ -14,7 +14,7 @@ public: NS_DECL_NSISIMPLETEST }; -NS_IMPL_ISUPPORTS1(SimpleTest, nsISimpleTest) +NS_IMPL_ISUPPORTS(SimpleTest, nsISimpleTest) NS_IMETHODIMP SimpleTest::Add(int32_t a, int32_t b, int32_t *r)