From a6e0d47c5a7c412ca533c9bd1410ab008b837674 Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Thu, 4 Jan 2001 20:44:42 +0000 Subject: [PATCH] removing most all NS_DEFINE_IID and replacing them with NS_GET_IID macros Bug 61274, r=buster sr=waterson git-svn-id: svn://10.0.0.236/trunk@84377 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsDocument.cpp | 1 - mozilla/content/base/src/nsDocumentViewer.cpp | 3 +- .../content/base/src/nsNameSpaceManager.cpp | 14 +++--- mozilla/content/base/src/nsRange.cpp | 8 ++-- mozilla/content/base/src/nsStyleContext.cpp | 3 +- mozilla/content/base/src/nsStyleSet.cpp | 7 ++- mozilla/content/events/src/nsDOMEvent.cpp | 1 - .../events/src/nsEventListenerManager.cpp | 6 +-- .../html/content/src/nsAttributeContent.cpp | 8 +--- .../html/content/src/nsHTMLInputElement.cpp | 3 +- .../content/src/nsHTMLOptGroupElement.cpp | 3 +- .../html/content/src/nsHTMLSelectElement.cpp | 3 +- .../content/src/nsHTMLTextAreaElement.cpp | 3 +- .../html/document/src/nsHTMLContentSink.cpp | 44 ++++++------------ .../html/document/src/nsHTMLDocument.cpp | 6 +-- .../src/nsHTMLFragmentContentSink.cpp | 20 +++----- .../html/document/src/nsImageDocument.cpp | 8 ++-- .../html/style/src/nsCSSDeclaration.cpp | 7 ++- .../content/html/style/src/nsCSSLoader.cpp | 16 ++----- .../content/html/style/src/nsCSSParser.cpp | 7 +-- mozilla/content/html/style/src/nsCSSRules.cpp | 46 ++++++++----------- .../content/html/style/src/nsCSSStruct.cpp | 7 ++- .../content/html/style/src/nsCSSStyleRule.cpp | 37 ++++++--------- .../html/style/src/nsCSSStyleSheet.cpp | 27 ++++------- .../html/style/src/nsDOMCSSDeclaration.cpp | 9 ++-- .../html/style/src/nsHTMLAttributes.cpp | 3 +- .../html/style/src/nsHTMLCSSStyleSheet.cpp | 12 ++--- .../html/style/src/nsHTMLStyleSheet.cpp | 11 ++--- .../xml/document/src/nsXMLDocument.cpp | 3 +- mozilla/layout/base/nsCSSFrameConstructor.cpp | 36 +++++---------- mozilla/layout/base/nsCSSRendering.cpp | 1 - mozilla/layout/base/nsDocumentViewer.cpp | 3 +- mozilla/layout/base/nsFrameManager.cpp | 7 ++- mozilla/layout/base/nsFrameTraversal.cpp | 1 - mozilla/layout/base/nsILayoutDebugger.h | 2 + mozilla/layout/base/nsLayoutDebugger.cpp | 5 +- mozilla/layout/base/nsPresContext.cpp | 2 - mozilla/layout/base/public/nsIFrame.h | 1 + mozilla/layout/base/public/nsIFrameUtil.h | 1 + .../layout/base/public/nsILayoutDebugger.h | 2 + mozilla/layout/base/src/nsDocument.cpp | 1 - mozilla/layout/base/src/nsDocumentViewer.cpp | 3 +- .../layout/base/src/nsFrameImageLoader.cpp | 8 ++-- mozilla/layout/base/src/nsFrameTraversal.cpp | 1 - mozilla/layout/base/src/nsFrameUtil.cpp | 5 +- mozilla/layout/base/src/nsGalleyContext.cpp | 3 +- mozilla/layout/base/src/nsLayoutDebugger.cpp | 5 +- .../layout/base/src/nsNameSpaceManager.cpp | 14 +++--- mozilla/layout/base/src/nsPresContext.cpp | 2 - mozilla/layout/base/src/nsPrintContext.cpp | 3 +- .../layout/base/src/nsPrintPreviewContext.cpp | 3 +- mozilla/layout/base/src/nsRange.cpp | 8 ++-- mozilla/layout/base/src/nsSpaceManager.cpp | 3 +- mozilla/layout/base/src/nsStyleContext.cpp | 3 +- mozilla/layout/base/src/nsStyleSet.cpp | 7 ++- mozilla/layout/build/nsLayoutDLF.cpp | 13 ++---- mozilla/layout/build/nsLayoutModule.cpp | 15 ++---- mozilla/layout/events/src/nsDOMEvent.cpp | 1 - .../events/src/nsEventListenerManager.cpp | 6 +-- .../layout/forms/nsComboboxControlFrame.cpp | 39 ++++++---------- mozilla/layout/forms/nsFieldSetFrame.cpp | 2 - mozilla/layout/forms/nsFileControlFrame.cpp | 14 ++---- mozilla/layout/forms/nsFormControlFrame.cpp | 20 +++----- mozilla/layout/forms/nsFormControlHelper.cpp | 10 +--- .../layout/forms/nsGfxButtonControlFrame.cpp | 3 +- .../layout/forms/nsHTMLButtonControlFrame.cpp | 9 ++-- mozilla/layout/forms/nsImageControlFrame.cpp | 6 +-- mozilla/layout/forms/nsLegendFrame.cpp | 1 - mozilla/layout/forms/nsListControlFrame.cpp | 12 ++--- mozilla/layout/generic/nsFrame.cpp | 10 ++-- mozilla/layout/generic/nsFrameSetFrame.cpp | 6 +-- mozilla/layout/generic/nsFrameUtil.cpp | 5 +- mozilla/layout/generic/nsGfxScrollFrame.cpp | 6 +-- .../layout/generic/nsHTMLContainerFrame.cpp | 6 +-- mozilla/layout/generic/nsHTMLFrame.cpp | 2 - .../layout/generic/nsHTMLReflowCommand.cpp | 5 +- mozilla/layout/generic/nsHTMLReflowState.cpp | 3 +- mozilla/layout/generic/nsIFrame.h | 1 + mozilla/layout/generic/nsIFrameUtil.h | 1 + mozilla/layout/generic/nsImageFrame.cpp | 3 +- mozilla/layout/generic/nsImageMap.cpp | 13 ++---- mozilla/layout/generic/nsLineBox.cpp | 1 - mozilla/layout/generic/nsObjectFrame.cpp | 18 +++----- mozilla/layout/generic/nsSpaceManager.cpp | 3 +- mozilla/layout/generic/nsTextFrame.cpp | 4 +- mozilla/layout/generic/nsTextTransformer.cpp | 3 +- mozilla/layout/generic/nsViewportFrame.cpp | 4 +- .../layout/html/base/src/nsCanvasFrame.cpp | 2 - mozilla/layout/html/base/src/nsFrame.cpp | 10 ++-- .../layout/html/base/src/nsFrameManager.cpp | 7 ++- .../layout/html/base/src/nsGfxScrollFrame.cpp | 6 +-- mozilla/layout/html/base/src/nsHRFrame.cpp | 3 +- .../html/base/src/nsHTMLContainerFrame.cpp | 6 +-- mozilla/layout/html/base/src/nsHTMLFrame.cpp | 2 - .../html/base/src/nsHTMLReflowCommand.cpp | 5 +- .../html/base/src/nsHTMLReflowState.cpp | 3 +- mozilla/layout/html/base/src/nsImageFrame.cpp | 3 +- mozilla/layout/html/base/src/nsImageMap.cpp | 13 ++---- mozilla/layout/html/base/src/nsLineBox.cpp | 1 - .../layout/html/base/src/nsObjectFrame.cpp | 18 +++----- .../layout/html/base/src/nsScrollFrame.cpp | 28 +++++------ .../html/base/src/nsScrollPortFrame.cpp | 3 +- mozilla/layout/html/base/src/nsTextFrame.cpp | 4 +- .../html/base/src/nsTextTransformer.cpp | 3 +- .../layout/html/base/src/nsViewportFrame.cpp | 4 +- .../html/content/src/nsAttributeContent.cpp | 8 +--- .../html/content/src/nsHTMLInputElement.cpp | 3 +- .../content/src/nsHTMLOptGroupElement.cpp | 3 +- .../html/content/src/nsHTMLSelectElement.cpp | 3 +- .../content/src/nsHTMLTextAreaElement.cpp | 3 +- .../html/document/src/nsFrameSetFrame.cpp | 6 +-- .../html/document/src/nsHTMLContentSink.cpp | 44 ++++++------------ .../html/document/src/nsHTMLDocument.cpp | 6 +-- .../src/nsHTMLFragmentContentSink.cpp | 20 +++----- .../html/document/src/nsImageDocument.cpp | 8 ++-- .../html/forms/src/nsComboboxControlFrame.cpp | 39 ++++++---------- .../layout/html/forms/src/nsFieldSetFrame.cpp | 2 - .../html/forms/src/nsFileControlFrame.cpp | 14 ++---- .../html/forms/src/nsFormControlFrame.cpp | 20 +++----- .../html/forms/src/nsFormControlHelper.cpp | 10 +--- mozilla/layout/html/forms/src/nsFormFrame.cpp | 7 ++- .../forms/src/nsGfxButtonControlFrame.cpp | 3 +- .../html/forms/src/nsGfxListControlFrame.cpp | 6 --- .../html/forms/src/nsGfxTextControlFrame.cpp | 24 +++------- .../forms/src/nsHTMLButtonControlFrame.cpp | 9 ++-- .../html/forms/src/nsImageControlFrame.cpp | 6 +-- .../layout/html/forms/src/nsLabelFrame.cpp | 14 ++---- .../layout/html/forms/src/nsLegendFrame.cpp | 1 - .../html/forms/src/nsListControlFrame.cpp | 12 ++--- .../html/style/src/nsCSSDeclaration.cpp | 7 ++- .../html/style/src/nsCSSFrameConstructor.cpp | 36 +++++---------- mozilla/layout/html/style/src/nsCSSLoader.cpp | 16 ++----- mozilla/layout/html/style/src/nsCSSParser.cpp | 7 +-- .../layout/html/style/src/nsCSSRendering.cpp | 1 - mozilla/layout/html/style/src/nsCSSRules.cpp | 46 ++++++++----------- .../layout/html/style/src/nsCSSStyleRule.cpp | 37 ++++++--------- .../layout/html/style/src/nsCSSStyleSheet.cpp | 27 ++++------- .../html/style/src/nsDOMCSSDeclaration.cpp | 9 ++-- .../html/style/src/nsHTMLAttributes.cpp | 3 +- .../html/style/src/nsHTMLCSSStyleSheet.cpp | 12 ++--- .../html/style/src/nsHTMLStyleSheet.cpp | 11 ++--- .../html/table/src/nsTableCellFrame.cpp | 6 +-- .../layout/html/table/src/nsTableColFrame.cpp | 1 - .../html/table/src/nsTableColGroupFrame.cpp | 4 +- .../layout/html/table/src/nsTableFrame.cpp | 5 +- .../layout/html/table/src/nsTableRowFrame.cpp | 1 - mozilla/layout/html/tests/TestAttributes.cpp | 6 +-- mozilla/layout/html/tests/TestCSSParser.cpp | 6 +-- mozilla/layout/html/tests/TestInlineFrame.cpp | 4 +- .../TableContentTest/TableContentTest.cpp | 12 ++--- mozilla/layout/style/nsCSSDeclaration.cpp | 7 ++- mozilla/layout/style/nsCSSLoader.cpp | 16 ++----- mozilla/layout/style/nsCSSParser.cpp | 7 +-- mozilla/layout/style/nsCSSRules.cpp | 46 ++++++++----------- mozilla/layout/style/nsCSSStruct.cpp | 7 ++- mozilla/layout/style/nsCSSStyleRule.cpp | 37 ++++++--------- mozilla/layout/style/nsCSSStyleSheet.cpp | 27 ++++------- mozilla/layout/style/nsDOMCSSDeclaration.cpp | 9 ++-- mozilla/layout/style/nsHTMLCSSStyleSheet.cpp | 12 ++--- mozilla/layout/style/nsHTMLStyleSheet.cpp | 11 ++--- mozilla/layout/style/nsStyleContext.cpp | 3 +- mozilla/layout/style/nsStyleSet.cpp | 7 ++- mozilla/layout/tables/nsTableCellFrame.cpp | 6 +-- mozilla/layout/tables/nsTableColFrame.cpp | 1 - .../layout/tables/nsTableColGroupFrame.cpp | 4 +- mozilla/layout/tables/nsTableFrame.cpp | 5 +- mozilla/layout/tables/nsTableRowFrame.cpp | 1 - .../layout/xml/document/src/nsXMLDocument.cpp | 3 +- mozilla/layout/xul/base/src/nsBoxFrame.cpp | 6 +-- .../layout/xul/base/src/nsMenuBarFrame.cpp | 5 +- .../xul/base/src/nsMenuDismissalListener.cpp | 3 +- mozilla/layout/xul/base/src/nsMenuFrame.cpp | 6 +-- .../layout/xul/base/src/nsMenuPopupFrame.cpp | 17 +++---- .../layout/xul/base/src/nsPopupSetFrame.cpp | 3 +- .../layout/xul/base/src/nsRootBoxFrame.cpp | 2 - .../layout/xul/base/src/nsScrollBoxFrame.cpp | 12 ++--- .../layout/xul/base/src/nsScrollBoxObject.cpp | 3 +- .../xul/base/src/nsXULTreeCellFrame.cpp | 3 +- .../xul/base/src/nsXULTreeOuterGroupFrame.cpp | 3 +- 179 files changed, 557 insertions(+), 1065 deletions(-) diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index e01b3a55697..63e02e20f95 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -114,7 +114,6 @@ static NS_DEFINE_CID(kCRangeCID, NS_RANGE_CID); static NS_DEFINE_CID(kDOMScriptObjectFactoryCID, NS_DOM_SCRIPT_OBJECT_FACTORY_CID); -static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); #include "nsILineBreakerFactory.h" diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp index f017202e9ae..7e494afb511 100644 --- a/mozilla/content/base/src/nsDocumentViewer.cpp +++ b/mozilla/content/base/src/nsDocumentViewer.cpp @@ -1527,7 +1527,6 @@ DocumentViewerImpl::GetSaveable(PRBool *aSaveable) return NS_ERROR_NOT_IMPLEMENTED; } -static NS_DEFINE_IID(kIDeviceContextSpecFactoryIID, NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID); static NS_DEFINE_IID(kDeviceContextSpecFactoryCID, NS_DEVICE_CONTEXT_SPEC_FACTORY_CID); @@ -1544,7 +1543,7 @@ PRInt32 width,height; nsComponentManager::CreateInstance(kDeviceContextSpecFactoryCID, nsnull, - kIDeviceContextSpecFactoryIID, + NS_GET_IID(nsIDeviceContextSpecFactory), (void **)getter_AddRefs(factory)); if (factory) { diff --git a/mozilla/content/base/src/nsNameSpaceManager.cpp b/mozilla/content/base/src/nsNameSpaceManager.cpp index 81e345bede8..9f183861532 100644 --- a/mozilla/content/base/src/nsNameSpaceManager.cpp +++ b/mozilla/content/base/src/nsNameSpaceManager.cpp @@ -27,8 +27,6 @@ #include "nsString.h" #include "nsCRT.h" -static NS_DEFINE_IID(kINameSpaceManagerIID, NS_INAMESPACEMANAGER_IID); -static NS_DEFINE_IID(kINameSpaceIID, NS_INAMESPACE_IID); static const char kXMLNSNameSpaceURI[] = "http://www.w3.org/2000/xmlns"; @@ -196,7 +194,7 @@ NameSpaceImpl::~NameSpaceImpl() NS_IF_RELEASE(mPrefix); } -NS_IMPL_ISUPPORTS(NameSpaceImpl, kINameSpaceIID) +NS_IMPL_ISUPPORTS(NameSpaceImpl, NS_GET_IID(nsINameSpace)) NS_IMETHODIMP NameSpaceImpl::GetNameSpaceManager(nsINameSpaceManager*& aManager) const @@ -299,7 +297,7 @@ NameSpaceImpl::CreateChildNameSpace(nsIAtom* aPrefix, const nsAReadableString& a NameSpaceImpl* child = new NameSpaceImpl(mManager, this, aPrefix, aURI); if (child) { - return child->QueryInterface(kINameSpaceIID, (void**)&aChildNameSpace); + return child->QueryInterface(NS_GET_IID(nsINameSpace), (void**)&aChildNameSpace); } aChildNameSpace = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -313,7 +311,7 @@ NameSpaceImpl::CreateChildNameSpace(nsIAtom* aPrefix, PRInt32 aNameSpaceID, NameSpaceImpl* child = new NameSpaceImpl(mManager, this, aPrefix, aNameSpaceID); if (child) { - return child->QueryInterface(kINameSpaceIID, (void**)&aChildNameSpace); + return child->QueryInterface(NS_GET_IID(nsINameSpace), (void**)&aChildNameSpace); } aChildNameSpace = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -360,7 +358,7 @@ NameSpaceManagerImpl::~NameSpaceManagerImpl() ReleaseTable(); } -NS_IMPL_ISUPPORTS(NameSpaceManagerImpl, kINameSpaceManagerIID) +NS_IMPL_ISUPPORTS(NameSpaceManagerImpl, NS_GET_IID(nsINameSpaceManager)) NS_IMETHODIMP NameSpaceManagerImpl::CreateRootNameSpace(nsINameSpace*& aRootNameSpace) @@ -372,7 +370,7 @@ NameSpaceManagerImpl::CreateRootNameSpace(nsINameSpace*& aRootNameSpace) if (nsnull != xmlns) { NameSpaceImpl* xml = new NameSpaceImpl(this, xmlns, nsLayoutAtoms::xmlNameSpace, kNameSpaceID_XML); if (nsnull != xml) { - rv = xml->QueryInterface(kINameSpaceIID, (void**)&aRootNameSpace); + rv = xml->QueryInterface(NS_GET_IID(nsINameSpace), (void**)&aRootNameSpace); } else { delete xmlns; @@ -430,5 +428,5 @@ NS_NewNameSpaceManager(nsINameSpaceManager** aInstancePtrResult) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kINameSpaceManagerIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsINameSpaceManager), (void **) aInstancePtrResult); } diff --git a/mozilla/content/base/src/nsRange.cpp b/mozilla/content/base/src/nsRange.cpp index baee68c5ad8..5c6a891f7f0 100644 --- a/mozilla/content/base/src/nsRange.cpp +++ b/mozilla/content/base/src/nsRange.cpp @@ -47,8 +47,6 @@ #include "nsHTMLParts.h" static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); -static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); PRMonitor* nsRange::mMonitor = nsnull; @@ -347,7 +345,7 @@ nsresult nsRange::QueryInterface(const nsIID& aIID, NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIScriptObjectOwnerIID)) { + if (aIID.Equals(NS_GET_IID(nsIScriptObjectOwner))) { nsIScriptObjectOwner* tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); @@ -1895,7 +1893,7 @@ nsRange::CreateContextualFragment(const nsAReadableString& aFragment, // Create a new parser for this entire operation result = nsComponentManager::CreateInstance(kCParserCID, nsnull, - kCParserIID, + NS_GET_IID(nsIParser), (void **)getter_AddRefs(parser)); if (NS_SUCCEEDED(result)) { result = parser->CreateTagStack(&tagStack); @@ -2000,7 +1998,7 @@ nsRange::IsValidFragment(const nsAReadableString& aFragment, PRBool* aReturn) // Create a new parser for this entire operation result = nsComponentManager::CreateInstance(kCParserCID, nsnull, - kCParserIID, + NS_GET_IID(nsIParser), (void **)getter_AddRefs(parser)); if (NS_SUCCEEDED(result)) { result = parser->CreateTagStack(&tagStack); diff --git a/mozilla/content/base/src/nsStyleContext.cpp b/mozilla/content/base/src/nsStyleContext.cpp index d940a2231b4..d32265c92a3 100644 --- a/mozilla/content/base/src/nsStyleContext.cpp +++ b/mozilla/content/base/src/nsStyleContext.cpp @@ -52,7 +52,6 @@ #include "nsLayoutAtoms.h" #include "prenv.h" -static NS_DEFINE_IID(kIStyleContextIID, NS_ISTYLECONTEXT_IID); #define DELETE_ARRAY_IF(array) if (array) { delete[] array; array = nsnull; } @@ -3587,7 +3586,7 @@ NS_NewStyleContext(nsIStyleContext** aInstancePtrResult, if (nsnull == context) { return NS_ERROR_OUT_OF_MEMORY; } - nsresult result = context->QueryInterface(kIStyleContextIID, (void **) aInstancePtrResult); + nsresult result = context->QueryInterface(NS_GET_IID(nsIStyleContext), (void **) aInstancePtrResult); context->RemapStyle(aPresContext); // remap after initial ref-count is set #ifdef SHARE_STYLECONTEXTS diff --git a/mozilla/content/base/src/nsStyleSet.cpp b/mozilla/content/base/src/nsStyleSet.cpp index 45bcf220288..35636836a3d 100644 --- a/mozilla/content/base/src/nsStyleSet.cpp +++ b/mozilla/content/base/src/nsStyleSet.cpp @@ -51,7 +51,6 @@ #include "nsISizeOfHandler.h" -static NS_DEFINE_IID(kIStyleSetIID, NS_ISTYLE_SET_IID); static NS_DEFINE_IID(kIStyleFrameConstructionIID, NS_ISTYLE_FRAME_CONSTRUCTION_IID); // - fast cache uses a CRC32 on the style context to quickly find sharing candidates. @@ -394,7 +393,7 @@ StyleSetImpl::~StyleSetImpl() } #ifndef MOZ_PERF_METRICS -NS_IMPL_ISUPPORTS(StyleSetImpl, kIStyleSetIID) +NS_IMPL_ISUPPORTS(StyleSetImpl, NS_GET_IID(nsIStyleSet)) #else NS_IMPL_ISUPPORTS2(StyleSetImpl, nsIStyleSet, nsITimeRecorder) #endif @@ -729,7 +728,7 @@ NS_IMETHODIMP StyleSetImpl::EnableQuirkStyleSheet(PRBool aEnable) sheet = getter_AddRefs(GetBackstopStyleSheetAt(i)); if (sheet) { nsCOMPtr cssSheet; - sheet->QueryInterface(nsICSSStyleSheet::GetIID(), getter_AddRefs(cssSheet)); + sheet->QueryInterface(NS_GET_IID(nsICSSStyleSheet), getter_AddRefs(cssSheet)); if (cssSheet) { nsCOMPtr quirkSheet; PRBool bHasSheet = PR_FALSE; @@ -1388,7 +1387,7 @@ NS_NewStyleSet(nsIStyleSet** aInstancePtrResult) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kIStyleSetIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsIStyleSet), (void **) aInstancePtrResult); } // nsITimeRecorder implementation diff --git a/mozilla/content/events/src/nsDOMEvent.cpp b/mozilla/content/events/src/nsDOMEvent.cpp index a798c0e2b79..47a5445e98b 100644 --- a/mozilla/content/events/src/nsDOMEvent.cpp +++ b/mozilla/content/events/src/nsDOMEvent.cpp @@ -42,7 +42,6 @@ #include "nsLayoutAtoms.h" #include "nsMutationEvent.h" -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); static char* mEventNames[] = { "mousedown", "mouseup", "click", "dblclick", "mouseover", diff --git a/mozilla/content/events/src/nsEventListenerManager.cpp b/mozilla/content/events/src/nsEventListenerManager.cpp index a1fd9bbf963..9cca3ff0fb0 100644 --- a/mozilla/content/events/src/nsEventListenerManager.cpp +++ b/mozilla/content/events/src/nsEventListenerManager.cpp @@ -60,10 +60,6 @@ #include "nsIPresShell.h" #include "nsMutationEvent.h" -static NS_DEFINE_IID(kIEventListenerManagerIID, NS_IEVENTLISTENERMANAGER_IID); -static NS_DEFINE_IID(kIDOMEventListenerIID, NS_IDOMEVENTLISTENER_IID); -static NS_DEFINE_IID(kIDOMEventIID, NS_IDOMEVENT_IID); -static NS_DEFINE_IID(kIScriptEventListenerIID, NS_ISCRIPTEVENTLISTENER_IID); nsEventListenerManager::nsEventListenerManager() { @@ -2236,7 +2232,7 @@ NS_HTML nsresult NS_NewEventListenerManager(nsIEventListenerManager** aInstanceP return NS_ERROR_OUT_OF_MEMORY; } - if (NS_OK == l->QueryInterface(kIEventListenerManagerIID, (void**) aInstancePtrResult)) { + if (NS_OK == l->QueryInterface(NS_GET_IID(nsIEventListenerManager), (void**) aInstancePtrResult)) { return NS_OK; } diff --git a/mozilla/content/html/content/src/nsAttributeContent.cpp b/mozilla/content/html/content/src/nsAttributeContent.cpp index 7e0494566b8..7b696ee5e9e 100644 --- a/mozilla/content/html/content/src/nsAttributeContent.cpp +++ b/mozilla/content/html/content/src/nsAttributeContent.cpp @@ -64,13 +64,7 @@ class nsIDOMText; // XXX share all id's in this dir -NS_DEFINE_IID(kIDOMCharacterDataIID, NS_IDOMCHARACTERDATA_IID); -static NS_DEFINE_IID(kIPrivateDOMEventIID, NS_IPRIVATEDOMEVENT_IID); -static NS_DEFINE_IID(kIEnumeratorIID, NS_IENUMERATOR_IID); -static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID); -static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID); -static NS_DEFINE_IID(kITextContentIID, NS_ITEXT_CONTENT_IID); class nsAttributeContent : public nsITextContent, public nsIAttributeContent { @@ -544,7 +538,7 @@ nsAttributeContent::CloneContent(PRBool aCloneText, nsITextContent** aReturn) if (nsnull == it) { return NS_ERROR_OUT_OF_MEMORY; } - result = it->QueryInterface(kITextContentIID, (void**) aReturn); + result = it->QueryInterface(NS_GET_IID(nsITextContent), (void**) aReturn); if (NS_FAILED(result)) { return result; } diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp index 96d7ce58c7c..e5741abf8a0 100644 --- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp @@ -64,7 +64,6 @@ // XXX align=left, hspace, vspace, border? other nav4 attrs -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID); #ifdef ENDER_LITE @@ -896,7 +895,7 @@ nsHTMLInputElement::HandleDOMEvent(nsIPresContext* aPresContext, nsIFrame* formFrame = nsnull; if (formControlFrame && - NS_SUCCEEDED(formControlFrame->QueryInterface(kIFrameIID, + NS_SUCCEEDED(formControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void **)&formFrame)) && formFrame) { const nsStyleUserInterface* uiStyle; diff --git a/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp b/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp index 34abce09670..954ad3bc576 100644 --- a/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp @@ -34,7 +34,6 @@ #include "nsIFormControlFrame.h" -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); class nsHTMLOptGroupElement : public nsGenericHTMLContainerElement, public nsIDOMHTMLOptGroupElement @@ -159,7 +158,7 @@ nsHTMLOptGroupElement::HandleDOMEvent(nsIPresContext* aPresContext, nsIFrame* formFrame = nsnull; if (formControlFrame && - NS_SUCCEEDED(formControlFrame->QueryInterface(kIFrameIID, + NS_SUCCEEDED(formControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void **)&formFrame)) && formFrame) { diff --git a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp index 1e57e9095e3..e658170cf87 100644 --- a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp @@ -58,7 +58,6 @@ #include "nsIFormControlFrame.h" #include "nsIFrame.h" -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); class nsHTMLSelectElement; @@ -1432,7 +1431,7 @@ nsHTMLSelectElement::HandleDOMEvent(nsIPresContext* aPresContext, nsIFrame* formFrame = nsnull; if (formControlFrame && - NS_SUCCEEDED(formControlFrame->QueryInterface(kIFrameIID, + NS_SUCCEEDED(formControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void **)&formFrame)) && formFrame) { diff --git a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp index fd507fc5cc2..93852683c70 100644 --- a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp @@ -52,7 +52,6 @@ #include "nsIPrivateDOMEvent.h" static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); class nsHTMLTextAreaElement : public nsGenericHTMLContainerFormElement, @@ -552,7 +551,7 @@ nsHTMLTextAreaElement::HandleDOMEvent(nsIPresContext* aPresContext, nsIFrame* formFrame = nsnull; if (formControlFrame && - NS_SUCCEEDED(formControlFrame->QueryInterface(kIFrameIID, + NS_SUCCEEDED(formControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void **)&formFrame)) && formFrame) { const nsStyleUserInterface* uiStyle; diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index a41d8a68513..b4ac938982c 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -119,23 +119,7 @@ const PRBool kBlockByDefault=PR_FALSE; const PRBool kBlockByDefault=PR_TRUE; #endif -static NS_DEFINE_IID(kIDOMHTMLTitleElementIID, NS_IDOMHTMLTITLEELEMENT_IID); -static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID); -static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); -static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID); -static NS_DEFINE_IID(kIDOMCommentIID, NS_IDOMCOMMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLFormElementIID, NS_IDOMHTMLFORMELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLMapElementIID, NS_IDOMHTMLMAPELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLTextAreaElementIID, NS_IDOMHTMLTEXTAREAELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLOptionElementIID, NS_IDOMHTMLOPTIONELEMENT_IID); -static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); -static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID); -static NS_DEFINE_IID(kIScrollableViewIID, NS_ISCROLLABLEVIEW_IID); -static NS_DEFINE_IID(kIHTMLDocumentIID, NS_IHTMLDOCUMENT_IID); -static NS_DEFINE_IID(kIHTMLContentContainerIID, NS_IHTMLCONTENTCONTAINER_IID); -static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID); -static NS_DEFINE_IID(kIStyleSheetLinkingElementIID, NS_ISTYLESHEETLINKINGELEMENT_IID); static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); @@ -725,7 +709,7 @@ static void SetForm(nsIHTMLContent* aContent, nsIDOMHTMLFormElement* aForm) { nsIFormControl* formControl = nsnull; - nsresult result = aContent->QueryInterface(kIFormControlIID, (void**)&formControl); + nsresult result = aContent->QueryInterface(NS_GET_IID(nsIFormControl), (void**)&formControl); if ((NS_OK == result) && formControl) { formControl->SetForm(aForm); NS_RELEASE(formControl); @@ -1168,7 +1152,7 @@ MakeContentObject(nsHTMLTag aNodeType, // If the text area has some content, set it if (aContent && (aContent->Length() > 0)) { nsIDOMHTMLTextAreaElement* taElem; - rv = (*aResult)->QueryInterface(kIDOMHTMLTextAreaElementIID, (void **)&taElem); + rv = (*aResult)->QueryInterface(NS_GET_IID(nsIDOMHTMLTextAreaElement), (void **)&taElem); if ((NS_OK == rv) && taElem) { taElem->SetDefaultValue(*aContent); NS_RELEASE(taElem); @@ -1675,7 +1659,7 @@ SinkContext::DemoteContainer(const nsIParserNode& aNode) // After the form control is removed from it's container, restore // it's form. nsIFormControl* childFormControl = nsnull; - result = child->QueryInterface(kIFormControlIID, (void**)&childFormControl); + result = child->QueryInterface(NS_GET_IID(nsIFormControl), (void**)&childFormControl); if (NS_SUCCEEDED(result)) { // It is a form control, so get it's form and cache it. nsIDOMHTMLFormElement* formElem = nsnull; @@ -1848,7 +1832,7 @@ SinkContext::AddComment(const nsIParserNode& aNode) result = NS_NewCommentNode(&comment); if (NS_OK == result) { - result = comment->QueryInterface(kIDOMCommentIID, + result = comment->QueryInterface(NS_GET_IID(nsIDOMComment), (void **)&domComment); if (NS_OK == result) { domComment->AppendData(aNode.GetText()); @@ -2187,7 +2171,7 @@ NS_NewHTMLContentSink(nsIHTMLContentSink** aResult, delete it; return rv; } - return it->QueryInterface(kIHTMLContentSinkIID, (void **)aResult); + return it->QueryInterface(NS_GET_IID(nsIHTMLContentSink), (void **)aResult); } // Note: operator new zeros our memory @@ -2296,7 +2280,7 @@ HTMLContentSink::Init(nsIDocument* aDoc, mDocument = aDoc; NS_ADDREF(aDoc); aDoc->AddObserver(this); - aDoc->QueryInterface(kIHTMLDocumentIID, (void**)&mHTMLDocument); + aDoc->QueryInterface(NS_GET_IID(nsIHTMLDocument), (void**)&mHTMLDocument); rv = mDocument->GetNodeInfoManager(mNodeInfoManager); NS_ENSURE_SUCCESS(rv, rv); mDocumentURI = aURL; @@ -2327,7 +2311,7 @@ HTMLContentSink::Init(nsIDocument* aDoc, prefs->GetIntPref("content.maxtextrun", &mMaxTextRun); nsIHTMLContentContainer* htmlContainer = nsnull; - if (NS_SUCCEEDED(aDoc->QueryInterface(kIHTMLContentContainerIID, (void**)&htmlContainer))) { + if (NS_SUCCEEDED(aDoc->QueryInterface(NS_GET_IID(nsIHTMLContentContainer), (void**)&htmlContainer))) { htmlContainer->GetCSSLoader(mCSSLoader); NS_RELEASE(htmlContainer); } @@ -2699,7 +2683,7 @@ HTMLContentSink::SetTitle(const nsString& aValue) rv = NS_NewTextNode(&text); if (NS_OK == rv) { nsIDOMText* tc; - rv = text->QueryInterface(kIDOMTextIID, (void**)&tc); + rv = text->QueryInterface(NS_GET_IID(nsIDOMText), (void**)&tc); if (NS_OK == rv) { tc->SetData(*mTitle); NS_RELEASE(tc); @@ -2908,7 +2892,7 @@ HTMLContentSink::OpenForm(const nsIParserNode& aNode) result = NS_NewHTMLFormElement(&content, nodeInfo); if (NS_SUCCEEDED(result) && content) { - content->QueryInterface(kIDOMHTMLFormElementIID, (void**)&mCurrentForm); + content->QueryInterface(NS_GET_IID(nsIDOMHTMLFormElement), (void**)&mCurrentForm); NS_RELEASE(content); } @@ -2921,7 +2905,7 @@ HTMLContentSink::OpenForm(const nsIParserNode& aNode) content = mCurrentContext->GetCurrentContainer(); if (nsnull != content) { - result = content->QueryInterface(kIDOMHTMLFormElementIID, + result = content->QueryInterface(NS_GET_IID(nsIDOMHTMLFormElement), (void**)&mCurrentForm); NS_RELEASE(content); } @@ -3576,7 +3560,7 @@ HTMLContentSink::StartLayout() vm->GetRootView(rootView); if (nsnull != rootView) { nsIScrollableView* sview = nsnull; - rootView->QueryInterface(kIScrollableViewIID, (void**) &sview); + rootView->QueryInterface(NS_GET_IID(nsIScrollableView), (void**) &sview); if (nsnull != sview) { if (mFrameset) mOriginalScrollPreference = nsScrollPreference_kNeverScroll; @@ -4221,7 +4205,7 @@ HTMLContentSink::ProcessMAPTag(const nsIParserNode& aNode, NS_IF_RELEASE(mCurrentMap); nsIDOMHTMLMapElement* domMap; - rv = aContent->QueryInterface(kIDOMHTMLMapElementIID, (void**)&domMap); + rv = aContent->QueryInterface(NS_GET_IID(nsIDOMHTMLMapElement), (void**)&domMap); if (NS_FAILED(rv)) { return rv; } @@ -4945,7 +4929,7 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode) rv = NS_NewTextNode(&text); if (NS_OK == rv) { nsIDOMText* tc; - rv = text->QueryInterface(kIDOMTextIID, (void**)&tc); + rv = text->QueryInterface(NS_GET_IID(nsIDOMText), (void**)&tc); if (NS_OK == rv) { tc->SetData(script); NS_RELEASE(tc); @@ -5153,7 +5137,7 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode) rv = NS_NewTextNode(&text); if (NS_OK == rv) { nsIDOMText* tc; - rv = text->QueryInterface(kIDOMTextIID, (void**)&tc); + rv = text->QueryInterface(NS_GET_IID(nsIDOMText), (void**)&tc); if (NS_OK == rv) { tc->SetData(content); NS_RELEASE(tc); diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 835c82bdba9..19aa39e549f 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -614,13 +614,12 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand, } } - static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); if (needsParser) { rv = nsComponentManager::CreateInstance(kCParserCID, nsnull, - kCParserIID, + NS_GET_IID(nsIParser), (void **)&mParser); if (NS_FAILED(rv)) { return rv; } } @@ -2098,12 +2097,11 @@ nsHTMLDocument::OpenCommon(nsIURI* aSourceURL) result = Reset(channel, group); if (NS_FAILED(result)) return result; if (NS_OK == result) { - static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); result = nsComponentManager::CreateInstance(kCParserCID, nsnull, - kCParserIID, + NS_GET_IID(nsIParser), (void **)&mParser); mIsWriting = 1; diff --git a/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp b/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp index 040d3e05e43..058e82b5da6 100644 --- a/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp @@ -51,11 +51,6 @@ // at some pointe really soon! // -static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); -static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID); -static NS_DEFINE_IID(kIHTMLFragmentContentSinkIID, NS_IHTML_FRAGMENT_CONTENT_SINK_IID); -static NS_DEFINE_IID(kIDOMCommentIID, NS_IDOMCOMMENT_IID); -static NS_DEFINE_IID(kIDOMDocumentFragmentIID, NS_IDOMDOCUMENTFRAGMENT_IID); static NS_DEFINE_CID(kParserServiceCID, NS_PARSERSERVICE_CID); class nsHTMLFragmentContentSink : public nsIHTMLFragmentContentSink { @@ -163,7 +158,7 @@ NS_NewHTMLFragmentContentSink(nsIHTMLFragmentContentSink** aResult) return rv; } - return it->QueryInterface(kIHTMLFragmentContentSinkIID, (void **)aResult); + return it->QueryInterface(NS_GET_IID(nsIHTMLFragmentContentSink), (void **)aResult); } nsHTMLFragmentContentSink::nsHTMLFragmentContentSink() @@ -217,13 +212,13 @@ nsHTMLFragmentContentSink::QueryInterface(REFNSIID aIID, void** aInstancePtr) *aInstancePtr = NULL; static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kIHTMLFragmentContentSinkIID)) { + if (aIID.Equals(NS_GET_IID(nsIHTMLFragmentContentSink))) { nsIHTMLFragmentContentSink* tmp = this; *aInstancePtr = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIHTMLContentSinkIID)) { + if (aIID.Equals(NS_GET_IID(nsIHTMLContentSink))) { nsIHTMLContentSink* tmp = this; *aInstancePtr = (void*) tmp; NS_ADDREF_THIS(); @@ -261,7 +256,7 @@ nsHTMLFragmentContentSink::WillBuildModel(void) result = NS_NewDocumentFragment(&frag, nsnull); if (NS_SUCCEEDED(result)) { - result = frag->QueryInterface(kIContentIID, (void**)&mRoot); + result = frag->QueryInterface(NS_GET_IID(nsIContent), (void**)&mRoot); NS_RELEASE(frag); } } @@ -651,7 +646,7 @@ nsHTMLFragmentContentSink::AddComment(const nsIParserNode& aNode) result = NS_NewCommentNode(&comment); if (NS_OK == result) { - result = comment->QueryInterface(kIDOMCommentIID, + result = comment->QueryInterface(NS_GET_IID(nsIDOMComment), (void **)&domComment); if (NS_OK == result) { domComment->AppendData(aNode.GetText()); @@ -698,7 +693,7 @@ NS_IMETHODIMP nsHTMLFragmentContentSink::GetFragment(nsIDOMDocumentFragment** aFragment) { if (nsnull != mRoot) { - return mRoot->QueryInterface(kIDOMDocumentFragmentIID, (void**)aFragment); + return mRoot->QueryInterface(NS_GET_IID(nsIDOMDocumentFragment), (void**)aFragment); } else { *aFragment = nsnull; @@ -812,9 +807,8 @@ nsHTMLFragmentContentSink::FlushText() if (NS_OK == rv) { // Set the text in the text node - static NS_DEFINE_IID(kITextContentIID, NS_ITEXT_CONTENT_IID); nsITextContent* text = nsnull; - content->QueryInterface(kITextContentIID, (void**) &text); + content->QueryInterface(NS_GET_IID(nsITextContent), (void**) &text); text->SetText(mText, mTextLength, PR_FALSE); NS_RELEASE(text); diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp index 8b54e5654d2..49a9f9d4449 100644 --- a/mozilla/content/html/document/src/nsImageDocument.cpp +++ b/mozilla/content/html/document/src/nsImageDocument.cpp @@ -52,8 +52,6 @@ // 3. override the save-as methods so that we don't write out our synthetic // html -static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID); -static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID); class nsImageDocument : public nsHTMLDocument { public: @@ -112,7 +110,7 @@ ImageListener::~ImageListener() NS_IF_RELEASE(mNextStream); } -NS_IMPL_THREADSAFE_ISUPPORTS(ImageListener, kIStreamListenerIID) +NS_IMPL_THREADSAFE_ISUPPORTS(ImageListener, NS_GET_IID(nsIStreamListener)) NS_IMETHODIMP ImageListener::OnStartRequest(nsIChannel* channel, nsISupports *ctxt) @@ -161,7 +159,7 @@ NS_NewImageDocument(nsIDocument** aInstancePtrResult) { nsImageDocument* doc = new nsImageDocument(); if(doc) - return doc->QueryInterface(kIDocumentIID, (void**) aInstancePtrResult); + return doc->QueryInterface(NS_GET_IID(nsIDocument), (void**) aInstancePtrResult); return NS_ERROR_OUT_OF_MEMORY; } @@ -382,7 +380,7 @@ nsresult nsImageDocument::UpdateTitle( void ) // - get the URL interface, get the extension, convert to upper-case // Unless the Imagerequest or Image can tell us the type this is the best we can do. nsIURL *pURL=nsnull; - if(NS_SUCCEEDED(mDocumentURL->QueryInterface(nsIURL::GetIID(),(void **)&pURL))){ + if(NS_SUCCEEDED(mDocumentURL->QueryInterface(NS_GET_IID(nsIURL),(void **)&pURL))){ char *pExtension=nsnull; pURL->GetFileExtension(&pExtension); if(pExtension){ diff --git a/mozilla/content/html/style/src/nsCSSDeclaration.cpp b/mozilla/content/html/style/src/nsCSSDeclaration.cpp index 395e9339987..36cdf24ddf7 100644 --- a/mozilla/content/html/style/src/nsCSSDeclaration.cpp +++ b/mozilla/content/html/style/src/nsCSSDeclaration.cpp @@ -48,7 +48,6 @@ static NS_DEFINE_IID(kCSSPageSID, NS_CSS_PAGE_SID); static NS_DEFINE_IID(kCSSContentSID, NS_CSS_CONTENT_SID); static NS_DEFINE_IID(kCSSUserInterfaceSID, NS_CSS_USER_INTERFACE_SID); static NS_DEFINE_IID(kCSSAuralSID, NS_CSS_AURAL_SID); -static NS_DEFINE_IID(kICSSDeclarationIID, NS_ICSS_DECLARATION_IID); #define CSS_IF_DELETE(ptr) if (nsnull != ptr) { delete ptr; ptr = nsnull; } @@ -1138,7 +1137,7 @@ CSSDeclarationImpl::~CSSDeclarationImpl(void) #endif } -NS_IMPL_ISUPPORTS(CSSDeclarationImpl, kICSSDeclarationIID); +NS_IMPL_ISUPPORTS(CSSDeclarationImpl, NS_GET_IID(nsICSSDeclaration)); #define CSS_IF_GET_ELSE(sid,ptr,result) \ if (sid.Equals(kCSS##ptr##SID)) { *result = m##ptr; } else @@ -4678,7 +4677,7 @@ CSSDeclarationImpl::Clone(nsICSSDeclaration*& aClone) const { CSSDeclarationImpl* clone = new CSSDeclarationImpl(*this); if (clone) { - return clone->QueryInterface(kICSSDeclarationIID, (void**)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSDeclaration), (void**)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -4699,7 +4698,7 @@ NS_HTML nsresult return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSDeclarationIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSDeclaration), (void **) aInstancePtrResult); } diff --git a/mozilla/content/html/style/src/nsCSSLoader.cpp b/mozilla/content/html/style/src/nsCSSLoader.cpp index 6d414b39e37..088a8e9e383 100644 --- a/mozilla/content/html/style/src/nsCSSLoader.cpp +++ b/mozilla/content/html/style/src/nsCSSLoader.cpp @@ -59,12 +59,6 @@ #include -static NS_DEFINE_IID(kICSSLoaderIID, NS_ICSS_LOADER_IID); -//static NS_DEFINE_IID(kICSSParserIID, NS_ICSS_PARSER_IID); -//static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID); -//static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); -static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID); -static NS_DEFINE_IID(kIStyleSheetLinkingElementIID, NS_ISTYLESHEETLINKINGELEMENT_IID); static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); class CSSLoaderImpl; @@ -486,7 +480,7 @@ CSSLoaderImpl::~CSSLoaderImpl(void) mSheetMapTable.Enumerate(DeleteSheetMap); } -NS_IMPL_ISUPPORTS(CSSLoaderImpl, kICSSLoaderIID) +NS_IMPL_ISUPPORTS(CSSLoaderImpl, NS_GET_IID(nsICSSLoader)) NS_IMETHODIMP CSSLoaderImpl::Init(nsIDocument* aDocument) @@ -1073,13 +1067,13 @@ CSSLoaderImpl::InsertSheetInDoc(nsICSSStyleSheet* aSheet, PRInt32 aDocIndex, if (nsnull != aElement) { nsIDOMNode* domNode = nsnull; - if (NS_SUCCEEDED(aElement->QueryInterface(kIDOMNodeIID, (void**)&domNode))) { + if (NS_SUCCEEDED(aElement->QueryInterface(NS_GET_IID(nsIDOMNode), (void**)&domNode))) { aSheet->SetOwningNode(domNode); NS_RELEASE(domNode); } nsIStyleSheetLinkingElement* element; - if (NS_SUCCEEDED(aElement->QueryInterface(kIStyleSheetLinkingElementIID, + if (NS_SUCCEEDED(aElement->QueryInterface(NS_GET_IID(nsIStyleSheetLinkingElement), (void**)&element))) { element->SetStyleSheet(aSheet); NS_RELEASE(element); @@ -1557,7 +1551,7 @@ nsresult NS_NewCSSLoader(nsIDocument* aDocument, nsICSSLoader** aLoader) } it->Init(aDocument); - return it->QueryInterface(kICSSLoaderIID, (void **)aLoader); + return it->QueryInterface(NS_GET_IID(nsICSSLoader), (void **)aLoader); } nsresult NS_NewCSSLoader(nsICSSLoader** aLoader) @@ -1568,7 +1562,7 @@ nsresult NS_NewCSSLoader(nsICSSLoader** aLoader) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSLoaderIID, (void **)aLoader); + return it->QueryInterface(NS_GET_IID(nsICSSLoader), (void **)aLoader); } diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp index 1a648874ad6..eb06faba4a0 100644 --- a/mozilla/content/html/style/src/nsCSSParser.cpp +++ b/mozilla/content/html/style/src/nsCSSParser.cpp @@ -52,9 +52,6 @@ // - rework aErrorCode stuff: switch over to nsresult // verify ! is followed by important and nothing else -static NS_DEFINE_IID(kICSSParserIID, NS_ICSS_PARSER_IID); -static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); #define ENABLE_OUTLINE // un-comment this to enable the outline properties (bug 9816) // XXX un-commenting for temporary fix for nsbeta3+ Bug 48973 @@ -315,7 +312,7 @@ NS_NewCSSParser(nsICSSParser** aInstancePtrResult) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSParserIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSParser), (void **) aInstancePtrResult); } #ifdef CSS_REPORT_PARSE_ERRORS @@ -386,7 +383,7 @@ CSSParserImpl::Init(nsICSSStyleSheet* aSheet) return NS_OK; } -NS_IMPL_ISUPPORTS(CSSParserImpl,kICSSParserIID) +NS_IMPL_ISUPPORTS(CSSParserImpl,NS_GET_IID(nsICSSParser)) CSSParserImpl::~CSSParserImpl() { diff --git a/mozilla/content/html/style/src/nsCSSRules.cpp b/mozilla/content/html/style/src/nsCSSRules.cpp index 32e544aa3e7..abb6e732b27 100644 --- a/mozilla/content/html/style/src/nsCSSRules.cpp +++ b/mozilla/content/html/style/src/nsCSSRules.cpp @@ -38,12 +38,6 @@ #include "nsISizeOfHandler.h" static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); -static NS_DEFINE_IID(kICSSRuleIID, NS_ICSS_RULE_IID); -static NS_DEFINE_IID(kICSSCharsetRuleIID, NS_ICSS_CHARSET_RULE_IID); -static NS_DEFINE_IID(kICSSImportRuleIID, NS_ICSS_IMPORT_RULE_IID); -static NS_DEFINE_IID(kICSSMediaRuleIID, NS_ICSS_MEDIA_RULE_IID); -static NS_DEFINE_IID(kICSSNameSpaceRuleIID, NS_ICSS_NAMESPACE_RULE_IID); #define DECL_STYLE_RULE_INHERIT \ NS_IMETHOD GetStyleSheet(nsIStyleSheet*& aSheet) const; \ @@ -125,17 +119,17 @@ CSSCharsetRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSCharsetRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSCharsetRule))) { *aInstancePtrResult = (void*) ((nsICSSCharsetRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; @@ -221,7 +215,7 @@ CSSCharsetRuleImpl::Clone(nsICSSRule*& aClone) const { CSSCharsetRuleImpl* clone = new CSSCharsetRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -249,7 +243,7 @@ NS_NewCSSCharsetRule(nsICSSCharsetRule** aInstancePtrResult, const nsString& aEn } it->Init(aEncoding); - return it->QueryInterface(kICSSCharsetRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSCharsetRule), (void **) aInstancePtrResult); } @@ -318,17 +312,17 @@ CSSImportRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSImportRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSImportRule))) { *aInstancePtrResult = (void*) ((nsICSSImportRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; @@ -416,7 +410,7 @@ CSSImportRuleImpl::Clone(nsICSSRule*& aClone) const { CSSImportRuleImpl* clone = new CSSImportRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -467,7 +461,7 @@ NS_NewCSSImportRule(nsICSSImportRule** aInstancePtrResult, it->SetURLSpec(aURLSpec); it->SetMedia(aMedia); - return it->QueryInterface(kICSSImportRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSImportRule), (void **) aInstancePtrResult); } // ------------------------------------------- @@ -568,17 +562,17 @@ CSSMediaRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSMediaRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSMediaRule))) { *aInstancePtrResult = (void*) ((nsICSSMediaRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; @@ -725,7 +719,7 @@ CSSMediaRuleImpl::Clone(nsICSSRule*& aClone) const { CSSMediaRuleImpl* clone = new CSSMediaRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -821,7 +815,7 @@ NS_NewCSSMediaRule(nsICSSMediaRule** aInstancePtrResult) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSMediaRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSMediaRule), (void **) aInstancePtrResult); } @@ -892,17 +886,17 @@ CSSNameSpaceRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSNameSpaceRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSNameSpaceRule))) { *aInstancePtrResult = (void*) ((nsICSSNameSpaceRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; @@ -996,7 +990,7 @@ CSSNameSpaceRuleImpl::Clone(nsICSSRule*& aClone) const { CSSNameSpaceRuleImpl* clone = new CSSNameSpaceRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -1049,6 +1043,6 @@ NS_NewCSSNameSpaceRule(nsICSSNameSpaceRule** aInstancePtrResult, it->SetPrefix(aPrefix); it->SetURLSpec(aURLSpec); - return it->QueryInterface(kICSSNameSpaceRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSNameSpaceRule), (void **) aInstancePtrResult); } diff --git a/mozilla/content/html/style/src/nsCSSStruct.cpp b/mozilla/content/html/style/src/nsCSSStruct.cpp index 395e9339987..36cdf24ddf7 100644 --- a/mozilla/content/html/style/src/nsCSSStruct.cpp +++ b/mozilla/content/html/style/src/nsCSSStruct.cpp @@ -48,7 +48,6 @@ static NS_DEFINE_IID(kCSSPageSID, NS_CSS_PAGE_SID); static NS_DEFINE_IID(kCSSContentSID, NS_CSS_CONTENT_SID); static NS_DEFINE_IID(kCSSUserInterfaceSID, NS_CSS_USER_INTERFACE_SID); static NS_DEFINE_IID(kCSSAuralSID, NS_CSS_AURAL_SID); -static NS_DEFINE_IID(kICSSDeclarationIID, NS_ICSS_DECLARATION_IID); #define CSS_IF_DELETE(ptr) if (nsnull != ptr) { delete ptr; ptr = nsnull; } @@ -1138,7 +1137,7 @@ CSSDeclarationImpl::~CSSDeclarationImpl(void) #endif } -NS_IMPL_ISUPPORTS(CSSDeclarationImpl, kICSSDeclarationIID); +NS_IMPL_ISUPPORTS(CSSDeclarationImpl, NS_GET_IID(nsICSSDeclaration)); #define CSS_IF_GET_ELSE(sid,ptr,result) \ if (sid.Equals(kCSS##ptr##SID)) { *result = m##ptr; } else @@ -4678,7 +4677,7 @@ CSSDeclarationImpl::Clone(nsICSSDeclaration*& aClone) const { CSSDeclarationImpl* clone = new CSSDeclarationImpl(*this); if (clone) { - return clone->QueryInterface(kICSSDeclarationIID, (void**)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSDeclaration), (void**)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -4699,7 +4698,7 @@ NS_HTML nsresult return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSDeclarationIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSDeclaration), (void **) aInstancePtrResult); } diff --git a/mozilla/content/html/style/src/nsCSSStyleRule.cpp b/mozilla/content/html/style/src/nsCSSStyleRule.cpp index 0fd73f6c51e..080ad738b15 100644 --- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp @@ -63,17 +63,6 @@ // #define DEBUG_REFS static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); -static NS_DEFINE_IID(kICSSDeclarationIID, NS_ICSS_DECLARATION_IID); -static NS_DEFINE_IID(kICSSRuleIID, NS_ICSS_RULE_IID); -static NS_DEFINE_IID(kICSSStyleRuleIID, NS_ICSS_STYLE_RULE_IID); -static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIHTMLContentContainerIID, NS_IHTMLCONTENTCONTAINER_IID); -static NS_DEFINE_IID(kIDOMCSSStyleSheetIID, NS_IDOMCSSSTYLESHEET_IID); -static NS_DEFINE_IID(kIDOMCSSRuleIID, NS_IDOMCSSRULE_IID); -static NS_DEFINE_IID(kIDOMCSSStyleRuleIID, NS_IDOMCSSSTYLERULE_IID); -static NS_DEFINE_IID(kIDOMCSSStyleDeclarationIID, NS_IDOMCSSSTYLEDECLARATION_IID); -static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); static NS_DEFINE_IID(kCSSFontSID, NS_CSS_FONT_SID); static NS_DEFINE_IID(kCSSColorSID, NS_CSS_COLOR_SID); @@ -681,7 +670,7 @@ CSSImportantRule::~CSSImportantRule(void) NS_IF_RELEASE(mDeclaration); } -NS_IMPL_ISUPPORTS(CSSImportantRule, kIStyleRuleIID); +NS_IMPL_ISUPPORTS(CSSImportantRule, NS_GET_IID(nsIStyleRule)); #if 0 NS_IMETHODIMP @@ -909,10 +898,10 @@ DOMCSSDeclarationImpl::ParseDeclaration(const nsAReadableString& aDecl, if (sheet) { sheet->GetURL(baseURI); sheet->GetOwningDocument(owningDoc); - sheet->QueryInterface(kICSSStyleSheetIID, (void**)&cssSheet); + sheet->QueryInterface(NS_GET_IID(nsICSSStyleSheet), (void**)&cssSheet); if (owningDoc) { nsIHTMLContentContainer* htmlContainer; - result = owningDoc->QueryInterface(kIHTMLContentContainerIID, (void**)&htmlContainer); + result = owningDoc->QueryInterface(NS_GET_IID(nsIHTMLContentContainer), (void**)&htmlContainer); if (NS_SUCCEEDED(result)) { result = htmlContainer->GetCSSLoader(cssLoader); NS_RELEASE(htmlContainer); @@ -1148,34 +1137,34 @@ nsresult CSSStyleRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSStyleRule))) { *aInstancePtrResult = (void*) ((nsICSSStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIDOMCSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSSRule))) { nsIDOMCSSRule *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIDOMCSSStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSSStyleRule))) { nsIDOMCSSStyleRule *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIScriptObjectOwnerIID)) { + if (aIID.Equals(NS_GET_IID(nsIScriptObjectOwner))) { nsIScriptObjectOwner *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); @@ -1202,7 +1191,7 @@ NS_IMETHODIMP CSSStyleRuleImpl::Equals(const nsIStyleRule* aRule, PRBool& aResul else { aResult = PR_FALSE; if ((nsnull != aRule) && - (NS_OK == ((nsIStyleRule*)aRule)->QueryInterface(kICSSStyleRuleIID, (void**) &iCSSRule))) { + (NS_OK == ((nsIStyleRule*)aRule)->QueryInterface(NS_GET_IID(nsICSSStyleRule), (void**) &iCSSRule))) { CSSStyleRuleImpl* rule = (CSSStyleRuleImpl*)iCSSRule; const nsCSSSelector* local = &mSelector; @@ -1539,7 +1528,7 @@ CSSStyleRuleImpl::Clone(nsICSSRule*& aClone) const { CSSStyleRuleImpl* clone = new CSSStyleRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -3373,7 +3362,7 @@ NS_IMETHODIMP CSSStyleRuleImpl::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet) { if (nsnull != mSheet) { - return mSheet->QueryInterface(kIDOMCSSStyleSheetIID, (void**)aSheet); + return mSheet->QueryInterface(NS_GET_IID(nsIDOMCSSStyleSheet), (void**)aSheet); } *aSheet = nsnull; return NS_OK; @@ -3458,5 +3447,5 @@ NS_HTML nsresult if (nsnull == it) { return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSStyleRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSStyleRule), (void **) aInstancePtrResult); } diff --git a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp index 2f0d70b0b1c..05cfca69712 100644 --- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp @@ -70,13 +70,6 @@ //#define DEBUG_RULES //#define EVENT_DEBUG -static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); -static NS_DEFINE_IID(kIDOMStyleSheetIID, NS_IDOMSTYLESHEET_IID); -static NS_DEFINE_IID(kIDOMCSSStyleSheetIID, NS_IDOMCSSSTYLESHEET_IID); -static NS_DEFINE_IID(kIDOMCSSStyleRuleIID, NS_IDOMCSSSTYLERULE_IID); -static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); // ---------------------- // Rule hash key @@ -986,7 +979,7 @@ CSSImportsCollectionImpl::QueryInterface(REFNSIID aIID, void** aInstancePtrResul AddRef(); return NS_OK; } - if (aIID.Equals(kIScriptObjectOwnerIID)) { + if (aIID.Equals(NS_GET_IID(nsIScriptObjectOwner))) { nsIScriptObjectOwner *tmp = this; *aInstancePtrResult = (void*) tmp; AddRef(); @@ -1028,7 +1021,7 @@ CSSImportsCollectionImpl::Item(PRUint32 aIndex, nsIDOMStyleSheet** aReturn) result = mStyleSheet->GetStyleSheetAt(aIndex, sheet); if (NS_OK == result) { - result = sheet->QueryInterface(kIDOMStyleSheetIID, (void **)aReturn); + result = sheet->QueryInterface(NS_GET_IID(nsIDOMStyleSheet), (void **)aReturn); } NS_RELEASE(sheet); } @@ -1476,29 +1469,29 @@ nsresult CSSStyleSheetImpl::QueryInterface(const nsIID& aIID, return NS_ERROR_NULL_POINTER; } static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kICSSStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSStyleSheet))) { *aInstancePtrResult = (void*) ((nsICSSStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleSheet))) { *aInstancePtrResult = (void*) ((nsIStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIDOMStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMStyleSheet))) { nsIDOMStyleSheet *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIDOMCSSStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSSStyleSheet))) { nsIDOMCSSStyleSheet *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIScriptObjectOwnerIID)) { + if (aIID.Equals(NS_GET_IID(nsIScriptObjectOwner))) { nsIScriptObjectOwner *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); @@ -1764,7 +1757,7 @@ CSSStyleSheetImpl::ContainsStyleSheet(nsIURI* aURL, PRBool& aContains, nsIStyleS if (aContains) { // if we found it and the out-param is there, set it and addref if (aTheChild) { - rv = QueryInterface( nsIStyleSheet::GetIID(), (void **)aTheChild); + rv = QueryInterface( NS_GET_IID(nsIStyleSheet), (void **)aTheChild); } } else { CSSStyleSheetImpl* child = mFirstChild; @@ -3163,7 +3156,7 @@ static void ContentEnumFunc(nsICSSStyleRule* aRule, void* aData) selector = selector->mNext; if (SelectorMatchesTree(data->mPresContext, data->mContent, selector)) { nsIStyleRule* iRule; - if (NS_OK == aRule->QueryInterface(kIStyleRuleIID, (void**)&iRule)) { + if (NS_OK == aRule->QueryInterface(NS_GET_IID(nsIStyleRule), (void**)&iRule)) { data->mResults->AppendElement(iRule); NS_RELEASE(iRule); iRule = aRule->GetImportantRule(); @@ -3281,7 +3274,7 @@ static void PseudoEnumFunc(nsICSSStyleRule* aRule, void* aData) } nsIStyleRule* iRule; - if (NS_OK == aRule->QueryInterface(kIStyleRuleIID, (void**)&iRule)) { + if (NS_OK == aRule->QueryInterface(NS_GET_IID(nsIStyleRule), (void**)&iRule)) { data->mResults->AppendElement(iRule); NS_RELEASE(iRule); iRule = aRule->GetImportantRule(); diff --git a/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp b/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp index 7d8f41e5ec1..9f2b79b89db 100644 --- a/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp +++ b/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp @@ -42,9 +42,6 @@ nsDOMCSSDeclaration::~nsDOMCSSDeclaration() NS_IMPL_ADDREF(nsDOMCSSDeclaration); NS_IMPL_RELEASE(nsDOMCSSDeclaration); -static NS_DEFINE_IID(kIDOMCSS2PropertiesIID, NS_IDOMCSS2PROPERTIES_IID); -static NS_DEFINE_IID(kIDOMCSSStyleDeclarationIID, NS_IDOMCSSSTYLEDECLARATION_IID); -static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); NS_IMETHODIMP @@ -55,19 +52,19 @@ nsDOMCSSDeclaration::QueryInterface(REFNSIID aIID, if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kIDOMCSS2PropertiesIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSS2Properties))) { nsIDOMCSS2Properties *tmp = this; AddRef(); *aInstancePtr = (void*) tmp; return NS_OK; } - if (aIID.Equals(kIDOMCSSStyleDeclarationIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSSStyleDeclaration))) { nsIDOMCSSStyleDeclaration *tmp = this; AddRef(); *aInstancePtr = (void*) tmp; return NS_OK; } - if (aIID.Equals(kIScriptObjectOwnerIID)) { + if (aIID.Equals(NS_GET_IID(nsIScriptObjectOwner))) { nsIScriptObjectOwner *tmp = this; AddRef(); *aInstancePtr = (void*) tmp; diff --git a/mozilla/content/html/style/src/nsHTMLAttributes.cpp b/mozilla/content/html/style/src/nsHTMLAttributes.cpp index d7692271d5e..7b4d50e6261 100644 --- a/mozilla/content/html/style/src/nsHTMLAttributes.cpp +++ b/mozilla/content/html/style/src/nsHTMLAttributes.cpp @@ -37,7 +37,6 @@ #include "nsIStyleSet.h" -static NS_DEFINE_IID(kIHTMLAttributesIID, NS_IHTML_ATTRIBUTES_IID); MOZ_DECL_CTOR_COUNTER(HTMLAttribute); @@ -983,7 +982,7 @@ HTMLAttributesImpl::~HTMLAttributesImpl(void) NS_IMPL_ADDREF(HTMLAttributesImpl) NS_IMPL_RELEASE(HTMLAttributesImpl) -NS_IMPL_QUERY_INTERFACE(HTMLAttributesImpl, kIHTMLAttributesIID); +NS_IMPL_QUERY_INTERFACE(HTMLAttributesImpl, NS_GET_IID(nsIHTMLAttributes)); const PRUnichar kNullCh = PRUnichar('\0'); diff --git a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp index f7799d0e0c4..d4aba054254 100644 --- a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp @@ -43,10 +43,6 @@ #include "nsIStyleSet.h" #include "nsISizeOfHandler.h" -static NS_DEFINE_IID(kIHTMLCSSStyleSheetIID, NS_IHTML_CSS_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); -static NS_DEFINE_IID(kICSSStyleRuleIID, NS_ICSS_STYLE_RULE_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); class CSSFirstLineRule : public nsIStyleRule { public: @@ -80,7 +76,7 @@ CSSFirstLineRule::~CSSFirstLineRule() { } -NS_IMPL_ISUPPORTS(CSSFirstLineRule, kIStyleRuleIID); +NS_IMPL_ISUPPORTS(CSSFirstLineRule, NS_GET_IID(nsIStyleRule)); NS_IMETHODIMP CSSFirstLineRule::Equals(const nsIStyleRule* aRule, PRBool& aResult) const @@ -460,12 +456,12 @@ nsresult HTMLCSSStyleSheetImpl::QueryInterface(const nsIID& aIID, return NS_ERROR_NULL_POINTER; } static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kIHTMLCSSStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIHTMLCSSStyleSheet))) { *aInstancePtrResult = (void*) ((nsIHTMLCSSStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleSheet))) { *aInstancePtrResult = (void*) ((nsIStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; @@ -515,7 +511,7 @@ HTMLCSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext, while (index < postCount) { nsIStyleRule* rule = (nsIStyleRule*)aResults->ElementAt(index++); nsICSSStyleRule* cssRule; - if (NS_SUCCEEDED(rule->QueryInterface(kICSSStyleRuleIID, (void**)&cssRule))) { + if (NS_SUCCEEDED(rule->QueryInterface(NS_GET_IID(nsICSSStyleRule), (void**)&cssRule))) { nsIStyleRule* important = cssRule->GetImportantRule(); if (nsnull != important) { aResults->AppendElement(important); diff --git a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp index 63c67eea455..2d94634e5e1 100644 --- a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp @@ -61,9 +61,6 @@ #include "nsIStyleSet.h" #include "nsISizeOfHandler.h" -static NS_DEFINE_IID(kIHTMLStyleSheetIID, NS_IHTML_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); static NS_DEFINE_IID(kIStyleFrameConstructionIID, NS_ISTYLE_FRAME_CONSTRUCTION_IID); class HTMLColorRule : public nsIStyleRule { @@ -114,7 +111,7 @@ HTMLColorRule::~HTMLColorRule() { } -NS_IMPL_ISUPPORTS(HTMLColorRule, kIStyleRuleIID); +NS_IMPL_ISUPPORTS(HTMLColorRule, NS_GET_IID(nsIStyleRule)); NS_IMETHODIMP HTMLColorRule::Equals(const nsIStyleRule* aRule, PRBool& aResult) const @@ -309,7 +306,7 @@ GenericTableRule::~GenericTableRule() { } -NS_IMPL_ISUPPORTS(GenericTableRule, kIStyleRuleIID); +NS_IMPL_ISUPPORTS(GenericTableRule, NS_GET_IID(nsIStyleRule)); NS_IMETHODIMP GenericTableRule::Equals(const nsIStyleRule* aRule, PRBool& aResult) const @@ -782,12 +779,12 @@ nsresult HTMLStyleSheetImpl::QueryInterface(const nsIID& aIID, return NS_ERROR_NULL_POINTER; } static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kIHTMLStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIHTMLStyleSheet))) { *aInstancePtrResult = (void*) ((nsIHTMLStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleSheet))) { *aInstancePtrResult = (void*) ((nsIStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp index aa64caebb00..bc731c1578b 100644 --- a/mozilla/content/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp @@ -433,12 +433,11 @@ nsXMLDocument::StartDocumentLoad(const char* aCommand, } } - static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); rv = nsComponentManager::CreateInstance(kCParserCID, nsnull, - kCParserIID, + NS_GET_IID(nsIParser), (void **)&mParser); if (NS_OK == rv) { nsIXMLContentSink* sink; diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 234edda4d0a..52bf771ac11 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -273,22 +273,8 @@ NS_NewResizerFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame); #endif -//static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); static NS_DEFINE_IID(kIStyleFrameConstructionIID, NS_ISTYLE_FRAME_CONSTRUCTION_IID); -static NS_DEFINE_IID(kIHTMLTableCellElementIID, NS_IHTMLTABLECELLELEMENT_IID); -static NS_DEFINE_IID(kIXMLDocumentIID, NS_IXMLDOCUMENT_IID); -static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID); -static NS_DEFINE_IID(kIDOMHTMLSelectElementIID, NS_IDOMHTMLSELECTELEMENT_IID); -static NS_DEFINE_IID(kIComboboxControlFrameIID, NS_ICOMBOBOXCONTROLFRAME_IID); -static NS_DEFINE_IID(kIRadioControlFrameIID, NS_IRADIOCONTROLFRAME_IID); -static NS_DEFINE_IID(kIListControlFrameIID, NS_ILISTCONTROLFRAME_IID); -static NS_DEFINE_IID(kIDOMHTMLImageElementIID, NS_IDOMHTMLIMAGEELEMENT_IID); -static NS_DEFINE_IID(kIDOMCharacterDataIID, NS_IDOMCHARACTERDATA_IID); -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); -static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); -static NS_DEFINE_IID(kIScrollableFrameIID, NS_ISCROLLABLE_FRAME_IID); //---------------------------------------------------------------------- // @@ -1358,7 +1344,7 @@ nsCSSFrameConstructor::CreateGeneratedFrameFor(nsIPresContext* aPresContex NS_NewTextNode(&textContent); if (textContent) { // Set the text - textContent->QueryInterface(kIDOMCharacterDataIID, (void**)&domData); + textContent->QueryInterface(NS_GET_IID(nsIDOMCharacterData), (void**)&domData); domData->SetData(contentString); NS_RELEASE(domData); @@ -1719,7 +1705,7 @@ GetNonScrollFrame(nsIFrame& aFrameIn, if (nsLayoutAtoms::scrollFrame == frameType) { // get the scrolled frame if there is a scroll frame nsIScrollableFrame* scrollable = nsnull; - nsresult rv = aFrameIn.QueryInterface(kIScrollableFrameIID, (void **)&scrollable); + nsresult rv = aFrameIn.QueryInterface(NS_GET_IID(nsIScrollableFrame), (void **)&scrollable); if (NS_SUCCEEDED(rv) && (scrollable)) { scrollable->GetScrolledFrame(nsnull, aNonScrollFrame); } @@ -3765,7 +3751,7 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell* aPresShell, nsIView* view = nsnull; newScrollableFrame->GetView(aPresContext, &view); nsIScrollableView* scrollableView; - view->QueryInterface(kScrollViewIID, (void**)&scrollableView); + view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollableView); viewManager->SetRootScrollableView(scrollableView); parentFrame = newScrollableFrame; @@ -3942,7 +3928,7 @@ nsCSSFrameConstructor::ConstructRadioControlFrame(nsIPresShell* aPresShel aPresContext->ResolvePseudoStyleContextFor(aContent, nsHTMLAtoms::radioPseudo, aStyleContext, PR_FALSE, getter_AddRefs(radioStyle)); nsIRadioControlFrame* radio = nsnull; - if (aNewFrame != nsnull && NS_SUCCEEDED(aNewFrame->QueryInterface(kIRadioControlFrameIID, (void**)&radio))) { + if (aNewFrame != nsnull && NS_SUCCEEDED(aNewFrame->QueryInterface(NS_GET_IID(nsIRadioControlFrame), (void**)&radio))) { radio->SetRadioButtonFaceStyleContext(radioStyle); NS_RELEASE(radio); } @@ -4113,7 +4099,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsIPresShell* aPresShell, /////////////////////////////////////////////////////////////////// // Construct a frame-based list box nsIComboboxControlFrame* comboBox = nsnull; - if (NS_SUCCEEDED(comboboxFrame->QueryInterface(kIComboboxControlFrameIID, (void**)&comboBox))) { + if (NS_SUCCEEDED(comboboxFrame->QueryInterface(NS_GET_IID(nsIComboboxControlFrame), (void**)&comboBox))) { comboBox->SetFrameConstructor(this); nsIFrame * listFrame; @@ -4121,7 +4107,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsIPresShell* aPresShell, // Notify the listbox that it is being used as a dropdown list. nsIListControlFrame * listControlFrame; - if (NS_SUCCEEDED(listFrame->QueryInterface(kIListControlFrameIID, (void**)&listControlFrame))) { + if (NS_SUCCEEDED(listFrame->QueryInterface(NS_GET_IID(nsIListControlFrame), (void**)&listControlFrame))) { listControlFrame->SetComboboxFrame(comboboxFrame); } // Notify combobox that it should use the listbox as it's popup @@ -4287,7 +4273,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsIPresShell* aPresShell, // Combobox - Old Native Implementation /////////////////////////////////////////////////////////////////// nsIComboboxControlFrame* comboBox = nsnull; - if (NS_SUCCEEDED(comboboxFrame->QueryInterface(kIComboboxControlFrameIID, (void**)&comboBox))) { + if (NS_SUCCEEDED(comboboxFrame->QueryInterface(NS_GET_IID(nsIComboboxControlFrame), (void**)&comboBox))) { comboBox->SetFrameConstructor(this); // Create a listbox @@ -4296,7 +4282,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsIPresShell* aPresShell, // Notify the listbox that it is being used as a dropdown list. nsIListControlFrame * listControlFrame; - if (NS_SUCCEEDED(listFrame->QueryInterface(kIListControlFrameIID, (void**)&listControlFrame))) { + if (NS_SUCCEEDED(listFrame->QueryInterface(NS_GET_IID(nsIListControlFrame), (void**)&listControlFrame))) { listControlFrame->SetComboboxFrame(comboboxFrame); } // Notify combobox that it should use the listbox as it's popup @@ -4342,7 +4328,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsIPresShell* aPresShell, //listView->SetViewFlags(NS_VIEW_PUBLIC_FLAG_DONT_CHECK_CHILDREN); nsIFrame* frame = nsnull; - if (NS_SUCCEEDED(comboboxFrame->QueryInterface(kIFrameIID, (void**)&frame))) { + if (NS_SUCCEEDED(comboboxFrame->QueryInterface(NS_GET_IID(nsIFrame), (void**)&frame))) { nsFrameItems childItems; // Create display and button frames from the combobox'es anonymous content @@ -7769,7 +7755,7 @@ nsCSSFrameConstructor::GetFrameFor(nsIPresShell* aPresShell, // If the primary frame supports IScrollableFrame, then get the scrolled frame. // That's the frame that gets the reflow command nsIScrollableFrame *pScrollableFrame = nsnull; - if (NS_SUCCEEDED( frame->QueryInterface(nsIScrollableFrame::GetIID(), + if (NS_SUCCEEDED( frame->QueryInterface(NS_GET_IID(nsIScrollableFrame), (void **)&pScrollableFrame) )) { pScrollableFrame->GetScrolledFrame( aPresContext, frame ); @@ -10434,7 +10420,7 @@ nsCSSFrameConstructor::ConstructAlternateFrame(nsIPresShell* aPresShell, // Set the content's text nsIDOMCharacterData* domData; - altTextContent->QueryInterface(kIDOMCharacterDataIID, (void**)&domData); + altTextContent->QueryInterface(NS_GET_IID(nsIDOMCharacterData), (void**)&domData); domData->SetData(altText); NS_RELEASE(domData); diff --git a/mozilla/layout/base/nsCSSRendering.cpp b/mozilla/layout/base/nsCSSRendering.cpp index 4d53761bb34..88af1ae670c 100644 --- a/mozilla/layout/base/nsCSSRendering.cpp +++ b/mozilla/layout/base/nsCSSRendering.cpp @@ -41,7 +41,6 @@ #include "nsIDocument.h" #include "nsIScrollableFrame.h" -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); #define BORDER_FULL 0 //entire side #define BORDER_INSIDE 1 //inside half diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index f017202e9ae..7e494afb511 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -1527,7 +1527,6 @@ DocumentViewerImpl::GetSaveable(PRBool *aSaveable) return NS_ERROR_NOT_IMPLEMENTED; } -static NS_DEFINE_IID(kIDeviceContextSpecFactoryIID, NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID); static NS_DEFINE_IID(kDeviceContextSpecFactoryCID, NS_DEVICE_CONTEXT_SPEC_FACTORY_CID); @@ -1544,7 +1543,7 @@ PRInt32 width,height; nsComponentManager::CreateInstance(kDeviceContextSpecFactoryCID, nsnull, - kIDeviceContextSpecFactoryIID, + NS_GET_IID(nsIDeviceContextSpecFactory), (void **)getter_AddRefs(factory)); if (factory) { diff --git a/mozilla/layout/base/nsFrameManager.cpp b/mozilla/layout/base/nsFrameManager.cpp index 1a8a516d5ee..bfe13d81164 100644 --- a/mozilla/layout/base/nsFrameManager.cpp +++ b/mozilla/layout/base/nsFrameManager.cpp @@ -83,7 +83,6 @@ static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); // IID's -static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); //---------------------------------------------------------------------- @@ -816,7 +815,7 @@ FrameManager::RevokePostedEvents() nsresult rv; rv = nsServiceManager::GetService(kEventQueueServiceCID, - kIEventQueueServiceIID, + NS_GET_IID(nsIEventQueueService), (nsISupports **)&eventService); if (NS_SUCCEEDED(rv)) { nsCOMPtr eventQueue; @@ -865,7 +864,7 @@ FrameManager::DequeuePostedEventFor(nsIFrame* aFrame) nsresult rv; rv = nsServiceManager::GetService(kEventQueueServiceCID, - kIEventQueueServiceIID, + NS_GET_IID(nsIEventQueueService), (nsISupports **)&eventService); if (NS_SUCCEEDED(rv)) { nsCOMPtr eventQueue; @@ -949,7 +948,7 @@ FrameManager::CantRenderReplacedElement(nsIPresContext* aPresContext, // We need to notify the style stystem, but post the notification so it // doesn't happen now rv = nsServiceManager::GetService(kEventQueueServiceCID, - kIEventQueueServiceIID, + NS_GET_IID(nsIEventQueueService), (nsISupports **)&eventService); if (NS_SUCCEEDED(rv)) { nsCOMPtr eventQueue; diff --git a/mozilla/layout/base/nsFrameTraversal.cpp b/mozilla/layout/base/nsFrameTraversal.cpp index 27fcc27f7c2..4b4c4d5f67f 100644 --- a/mozilla/layout/base/nsFrameTraversal.cpp +++ b/mozilla/layout/base/nsFrameTraversal.cpp @@ -26,7 +26,6 @@ #include "nsFrameList.h" -static NS_DEFINE_IID(kIEnumeratorIID, NS_IENUMERATOR_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); diff --git a/mozilla/layout/base/nsILayoutDebugger.h b/mozilla/layout/base/nsILayoutDebugger.h index 75b4ba5b89c..8f870c208d2 100644 --- a/mozilla/layout/base/nsILayoutDebugger.h +++ b/mozilla/layout/base/nsILayoutDebugger.h @@ -37,6 +37,8 @@ class nsIPresShell; */ class nsILayoutDebugger : public nsISupports { public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILAYOUT_DEBUGGER_IID) + NS_IMETHOD SetShowFrameBorders(PRBool aEnable) = 0; NS_IMETHOD GetShowFrameBorders(PRBool* aResult) = 0; diff --git a/mozilla/layout/base/nsLayoutDebugger.cpp b/mozilla/layout/base/nsLayoutDebugger.cpp index bb2991f202e..e01ac45118c 100644 --- a/mozilla/layout/base/nsLayoutDebugger.cpp +++ b/mozilla/layout/base/nsLayoutDebugger.cpp @@ -23,7 +23,6 @@ #include "nsIFrame.h" #include "nsIFrameDebug.h" -static NS_DEFINE_IID(kILayoutDebuggerIID, NS_ILAYOUT_DEBUGGER_IID); #ifdef NS_DEBUG class nsLayoutDebugger : public nsILayoutDebugger { @@ -63,7 +62,7 @@ NS_NewLayoutDebugger(nsILayoutDebugger** aResult) if (!it) { return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kILayoutDebuggerIID, (void**)aResult); + return it->QueryInterface(NS_GET_IID(nsILayoutDebugger), (void**)aResult); } nsLayoutDebugger::nsLayoutDebugger() @@ -75,7 +74,7 @@ nsLayoutDebugger::~nsLayoutDebugger() { } -NS_IMPL_ISUPPORTS(nsLayoutDebugger, kILayoutDebuggerIID); +NS_IMPL_ISUPPORTS(nsLayoutDebugger, NS_GET_IID(nsILayoutDebugger)); NS_IMETHODIMP nsLayoutDebugger::SetShowFrameBorders(PRBool aEnable) diff --git a/mozilla/layout/base/nsPresContext.cpp b/mozilla/layout/base/nsPresContext.cpp index bc3390c5014..b21cc693e55 100644 --- a/mozilla/layout/base/nsPresContext.cpp +++ b/mozilla/layout/base/nsPresContext.cpp @@ -76,9 +76,7 @@ PrefChangedCallback(const char* aPrefName, void* instance_data) return 0; // PREF_OK } -static NS_DEFINE_IID(kIPresContextIID, NS_IPRESCONTEXT_IID); static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); nsPresContext::nsPresContext() : mDefaultFont("serif", NS_FONT_STYLE_NORMAL, diff --git a/mozilla/layout/base/public/nsIFrame.h b/mozilla/layout/base/public/nsIFrame.h index 416daa13bdb..868fe6df333 100644 --- a/mozilla/layout/base/public/nsIFrame.h +++ b/mozilla/layout/base/public/nsIFrame.h @@ -455,6 +455,7 @@ typedef PRBool nsDidReflowStatus; class nsIFrame : public nsISupports { public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFRAME_IID) /** * Called to initialize the frame. This is called immediately after creating * the frame. diff --git a/mozilla/layout/base/public/nsIFrameUtil.h b/mozilla/layout/base/public/nsIFrameUtil.h index d577e4d419a..567fa5a5940 100644 --- a/mozilla/layout/base/public/nsIFrameUtil.h +++ b/mozilla/layout/base/public/nsIFrameUtil.h @@ -34,6 +34,7 @@ class nsIURI; */ class nsIFrameUtil : public nsISupports { public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFRAME_UTIL_IID) /** * Compare two regression data dumps. The return status will be NS_OK * if the trees compare favoribly, otherwise the return will indicate diff --git a/mozilla/layout/base/public/nsILayoutDebugger.h b/mozilla/layout/base/public/nsILayoutDebugger.h index 75b4ba5b89c..8f870c208d2 100644 --- a/mozilla/layout/base/public/nsILayoutDebugger.h +++ b/mozilla/layout/base/public/nsILayoutDebugger.h @@ -37,6 +37,8 @@ class nsIPresShell; */ class nsILayoutDebugger : public nsISupports { public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILAYOUT_DEBUGGER_IID) + NS_IMETHOD SetShowFrameBorders(PRBool aEnable) = 0; NS_IMETHOD GetShowFrameBorders(PRBool* aResult) = 0; diff --git a/mozilla/layout/base/src/nsDocument.cpp b/mozilla/layout/base/src/nsDocument.cpp index e01b3a55697..63e02e20f95 100644 --- a/mozilla/layout/base/src/nsDocument.cpp +++ b/mozilla/layout/base/src/nsDocument.cpp @@ -114,7 +114,6 @@ static NS_DEFINE_CID(kCRangeCID, NS_RANGE_CID); static NS_DEFINE_CID(kDOMScriptObjectFactoryCID, NS_DOM_SCRIPT_OBJECT_FACTORY_CID); -static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); #include "nsILineBreakerFactory.h" diff --git a/mozilla/layout/base/src/nsDocumentViewer.cpp b/mozilla/layout/base/src/nsDocumentViewer.cpp index f017202e9ae..7e494afb511 100644 --- a/mozilla/layout/base/src/nsDocumentViewer.cpp +++ b/mozilla/layout/base/src/nsDocumentViewer.cpp @@ -1527,7 +1527,6 @@ DocumentViewerImpl::GetSaveable(PRBool *aSaveable) return NS_ERROR_NOT_IMPLEMENTED; } -static NS_DEFINE_IID(kIDeviceContextSpecFactoryIID, NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID); static NS_DEFINE_IID(kDeviceContextSpecFactoryCID, NS_DEVICE_CONTEXT_SPEC_FACTORY_CID); @@ -1544,7 +1543,7 @@ PRInt32 width,height; nsComponentManager::CreateInstance(kDeviceContextSpecFactoryCID, nsnull, - kIDeviceContextSpecFactoryIID, + NS_GET_IID(nsIDeviceContextSpecFactory), (void **)getter_AddRefs(factory)); if (factory) { diff --git a/mozilla/layout/base/src/nsFrameImageLoader.cpp b/mozilla/layout/base/src/nsFrameImageLoader.cpp index 84d0f14ab7f..e670d7250ac 100644 --- a/mozilla/layout/base/src/nsFrameImageLoader.cpp +++ b/mozilla/layout/base/src/nsFrameImageLoader.cpp @@ -38,8 +38,6 @@ #undef NOISY_IMAGE_LOADING #endif -static NS_DEFINE_IID(kIFrameImageLoaderIID, NS_IFRAME_IMAGE_LOADER_IID); -static NS_DEFINE_IID(kIImageRequestObserverIID, NS_IIMAGEREQUESTOBSERVER_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); NS_LAYOUT nsresult @@ -53,7 +51,7 @@ NS_NewFrameImageLoader(nsIFrameImageLoader** aResult) if (!it) { return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kIFrameImageLoaderIID, (void**) aResult); + return it->QueryInterface(NS_GET_IID(nsIFrameImageLoader), (void**) aResult); } nsFrameImageLoader::nsFrameImageLoader() @@ -93,13 +91,13 @@ nsFrameImageLoader::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (!aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kIFrameImageLoaderIID)) { + if (aIID.Equals(NS_GET_IID(nsIFrameImageLoader))) { nsIFrameImageLoader* tmp = this; *aInstancePtr = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIImageRequestObserverIID)) { + if (aIID.Equals(NS_GET_IID(nsIImageRequestObserver))) { nsIImageRequestObserver* tmp = this; *aInstancePtr = (void*) tmp; NS_ADDREF_THIS(); diff --git a/mozilla/layout/base/src/nsFrameTraversal.cpp b/mozilla/layout/base/src/nsFrameTraversal.cpp index 27fcc27f7c2..4b4c4d5f67f 100644 --- a/mozilla/layout/base/src/nsFrameTraversal.cpp +++ b/mozilla/layout/base/src/nsFrameTraversal.cpp @@ -26,7 +26,6 @@ #include "nsFrameList.h" -static NS_DEFINE_IID(kIEnumeratorIID, NS_IENUMERATOR_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); diff --git a/mozilla/layout/base/src/nsFrameUtil.cpp b/mozilla/layout/base/src/nsFrameUtil.cpp index 7063bbbfc0c..d393c61a17f 100644 --- a/mozilla/layout/base/src/nsFrameUtil.cpp +++ b/mozilla/layout/base/src/nsFrameUtil.cpp @@ -27,7 +27,6 @@ #include #include "plstr.h" -static NS_DEFINE_IID(kIFrameUtilIID, NS_IFRAME_UTIL_IID); #ifdef NS_DEBUG class nsFrameUtil : public nsIFrameUtil { @@ -492,7 +491,7 @@ NS_NewFrameUtil(nsIFrameUtil** aResult) if (nsnull == it) { return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kIFrameUtilIID, (void**) aResult); + return it->QueryInterface(NS_GET_IID(nsIFrameUtil), (void**) aResult); } nsFrameUtil::nsFrameUtil() @@ -504,7 +503,7 @@ nsFrameUtil::~nsFrameUtil() { } -NS_IMPL_ISUPPORTS(nsFrameUtil, kIFrameUtilIID); +NS_IMPL_ISUPPORTS(nsFrameUtil, NS_GET_IID(nsIFrameUtil)); void nsFrameUtil::DumpNode(Node* aNode, FILE* aOutputFile, PRInt32 aIndent) diff --git a/mozilla/layout/base/src/nsGalleyContext.cpp b/mozilla/layout/base/src/nsGalleyContext.cpp index 971e5392fdb..cbe4e163b8d 100644 --- a/mozilla/layout/base/src/nsGalleyContext.cpp +++ b/mozilla/layout/base/src/nsGalleyContext.cpp @@ -23,7 +23,6 @@ #include "nsGfxCIID.h" #include "nsLayoutAtoms.h" -static NS_DEFINE_IID(kIPresContextIID, NS_IPRESCONTEXT_IID); class GalleyContext : public nsPresContext { public: @@ -102,5 +101,5 @@ NS_NewGalleyContext(nsIPresContext** aInstancePtrResult) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kIPresContextIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsIPresContext), (void **) aInstancePtrResult); } diff --git a/mozilla/layout/base/src/nsLayoutDebugger.cpp b/mozilla/layout/base/src/nsLayoutDebugger.cpp index bb2991f202e..e01ac45118c 100644 --- a/mozilla/layout/base/src/nsLayoutDebugger.cpp +++ b/mozilla/layout/base/src/nsLayoutDebugger.cpp @@ -23,7 +23,6 @@ #include "nsIFrame.h" #include "nsIFrameDebug.h" -static NS_DEFINE_IID(kILayoutDebuggerIID, NS_ILAYOUT_DEBUGGER_IID); #ifdef NS_DEBUG class nsLayoutDebugger : public nsILayoutDebugger { @@ -63,7 +62,7 @@ NS_NewLayoutDebugger(nsILayoutDebugger** aResult) if (!it) { return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kILayoutDebuggerIID, (void**)aResult); + return it->QueryInterface(NS_GET_IID(nsILayoutDebugger), (void**)aResult); } nsLayoutDebugger::nsLayoutDebugger() @@ -75,7 +74,7 @@ nsLayoutDebugger::~nsLayoutDebugger() { } -NS_IMPL_ISUPPORTS(nsLayoutDebugger, kILayoutDebuggerIID); +NS_IMPL_ISUPPORTS(nsLayoutDebugger, NS_GET_IID(nsILayoutDebugger)); NS_IMETHODIMP nsLayoutDebugger::SetShowFrameBorders(PRBool aEnable) diff --git a/mozilla/layout/base/src/nsNameSpaceManager.cpp b/mozilla/layout/base/src/nsNameSpaceManager.cpp index 81e345bede8..9f183861532 100644 --- a/mozilla/layout/base/src/nsNameSpaceManager.cpp +++ b/mozilla/layout/base/src/nsNameSpaceManager.cpp @@ -27,8 +27,6 @@ #include "nsString.h" #include "nsCRT.h" -static NS_DEFINE_IID(kINameSpaceManagerIID, NS_INAMESPACEMANAGER_IID); -static NS_DEFINE_IID(kINameSpaceIID, NS_INAMESPACE_IID); static const char kXMLNSNameSpaceURI[] = "http://www.w3.org/2000/xmlns"; @@ -196,7 +194,7 @@ NameSpaceImpl::~NameSpaceImpl() NS_IF_RELEASE(mPrefix); } -NS_IMPL_ISUPPORTS(NameSpaceImpl, kINameSpaceIID) +NS_IMPL_ISUPPORTS(NameSpaceImpl, NS_GET_IID(nsINameSpace)) NS_IMETHODIMP NameSpaceImpl::GetNameSpaceManager(nsINameSpaceManager*& aManager) const @@ -299,7 +297,7 @@ NameSpaceImpl::CreateChildNameSpace(nsIAtom* aPrefix, const nsAReadableString& a NameSpaceImpl* child = new NameSpaceImpl(mManager, this, aPrefix, aURI); if (child) { - return child->QueryInterface(kINameSpaceIID, (void**)&aChildNameSpace); + return child->QueryInterface(NS_GET_IID(nsINameSpace), (void**)&aChildNameSpace); } aChildNameSpace = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -313,7 +311,7 @@ NameSpaceImpl::CreateChildNameSpace(nsIAtom* aPrefix, PRInt32 aNameSpaceID, NameSpaceImpl* child = new NameSpaceImpl(mManager, this, aPrefix, aNameSpaceID); if (child) { - return child->QueryInterface(kINameSpaceIID, (void**)&aChildNameSpace); + return child->QueryInterface(NS_GET_IID(nsINameSpace), (void**)&aChildNameSpace); } aChildNameSpace = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -360,7 +358,7 @@ NameSpaceManagerImpl::~NameSpaceManagerImpl() ReleaseTable(); } -NS_IMPL_ISUPPORTS(NameSpaceManagerImpl, kINameSpaceManagerIID) +NS_IMPL_ISUPPORTS(NameSpaceManagerImpl, NS_GET_IID(nsINameSpaceManager)) NS_IMETHODIMP NameSpaceManagerImpl::CreateRootNameSpace(nsINameSpace*& aRootNameSpace) @@ -372,7 +370,7 @@ NameSpaceManagerImpl::CreateRootNameSpace(nsINameSpace*& aRootNameSpace) if (nsnull != xmlns) { NameSpaceImpl* xml = new NameSpaceImpl(this, xmlns, nsLayoutAtoms::xmlNameSpace, kNameSpaceID_XML); if (nsnull != xml) { - rv = xml->QueryInterface(kINameSpaceIID, (void**)&aRootNameSpace); + rv = xml->QueryInterface(NS_GET_IID(nsINameSpace), (void**)&aRootNameSpace); } else { delete xmlns; @@ -430,5 +428,5 @@ NS_NewNameSpaceManager(nsINameSpaceManager** aInstancePtrResult) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kINameSpaceManagerIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsINameSpaceManager), (void **) aInstancePtrResult); } diff --git a/mozilla/layout/base/src/nsPresContext.cpp b/mozilla/layout/base/src/nsPresContext.cpp index bc3390c5014..b21cc693e55 100644 --- a/mozilla/layout/base/src/nsPresContext.cpp +++ b/mozilla/layout/base/src/nsPresContext.cpp @@ -76,9 +76,7 @@ PrefChangedCallback(const char* aPrefName, void* instance_data) return 0; // PREF_OK } -static NS_DEFINE_IID(kIPresContextIID, NS_IPRESCONTEXT_IID); static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); nsPresContext::nsPresContext() : mDefaultFont("serif", NS_FONT_STYLE_NORMAL, diff --git a/mozilla/layout/base/src/nsPrintContext.cpp b/mozilla/layout/base/src/nsPrintContext.cpp index 61e7439f32f..9e7bdb544a9 100644 --- a/mozilla/layout/base/src/nsPrintContext.cpp +++ b/mozilla/layout/base/src/nsPrintContext.cpp @@ -27,7 +27,6 @@ #include "nsGfxCIID.h" #include "nsLayoutAtoms.h" -static NS_DEFINE_IID(kIPresContextIID, NS_IPRESCONTEXT_IID); class PrintContext : public nsPresContext { public: @@ -118,5 +117,5 @@ NS_NewPrintContext(nsIPresContext** aInstancePtrResult) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kIPresContextIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsIPresContext), (void **) aInstancePtrResult); } diff --git a/mozilla/layout/base/src/nsPrintPreviewContext.cpp b/mozilla/layout/base/src/nsPrintPreviewContext.cpp index 257be28270f..c74ccbb22c4 100644 --- a/mozilla/layout/base/src/nsPrintPreviewContext.cpp +++ b/mozilla/layout/base/src/nsPrintPreviewContext.cpp @@ -28,7 +28,6 @@ #include "nsLayoutAtoms.h" #include "prlog.h" -static NS_DEFINE_IID(kIPresContextIID, NS_IPRESCONTEXT_IID); class PrintPreviewContext : public nsPresContext { public: @@ -151,5 +150,5 @@ NS_NewPrintPreviewContext(nsIPresContext** aInstancePtrResult) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kIPresContextIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsIPresContext), (void **) aInstancePtrResult); } diff --git a/mozilla/layout/base/src/nsRange.cpp b/mozilla/layout/base/src/nsRange.cpp index baee68c5ad8..5c6a891f7f0 100644 --- a/mozilla/layout/base/src/nsRange.cpp +++ b/mozilla/layout/base/src/nsRange.cpp @@ -47,8 +47,6 @@ #include "nsHTMLParts.h" static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); -static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); PRMonitor* nsRange::mMonitor = nsnull; @@ -347,7 +345,7 @@ nsresult nsRange::QueryInterface(const nsIID& aIID, NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIScriptObjectOwnerIID)) { + if (aIID.Equals(NS_GET_IID(nsIScriptObjectOwner))) { nsIScriptObjectOwner* tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); @@ -1895,7 +1893,7 @@ nsRange::CreateContextualFragment(const nsAReadableString& aFragment, // Create a new parser for this entire operation result = nsComponentManager::CreateInstance(kCParserCID, nsnull, - kCParserIID, + NS_GET_IID(nsIParser), (void **)getter_AddRefs(parser)); if (NS_SUCCEEDED(result)) { result = parser->CreateTagStack(&tagStack); @@ -2000,7 +1998,7 @@ nsRange::IsValidFragment(const nsAReadableString& aFragment, PRBool* aReturn) // Create a new parser for this entire operation result = nsComponentManager::CreateInstance(kCParserCID, nsnull, - kCParserIID, + NS_GET_IID(nsIParser), (void **)getter_AddRefs(parser)); if (NS_SUCCEEDED(result)) { result = parser->CreateTagStack(&tagStack); diff --git a/mozilla/layout/base/src/nsSpaceManager.cpp b/mozilla/layout/base/src/nsSpaceManager.cpp index 7e106f6e9d4..5fe221b1235 100644 --- a/mozilla/layout/base/src/nsSpaceManager.cpp +++ b/mozilla/layout/base/src/nsSpaceManager.cpp @@ -31,7 +31,6 @@ #ifdef DEBUG #include "nsIFrameDebug.h" #endif -static NS_DEFINE_IID(kISpaceManagerIID, NS_ISPACEMANAGER_IID); ///////////////////////////////////////////////////////////////////////////// // BandList @@ -89,7 +88,7 @@ nsSpaceManager::~nsSpaceManager() ClearFrameInfo(); } -NS_IMPL_ISUPPORTS(nsSpaceManager, kISpaceManagerIID); +NS_IMPL_ISUPPORTS(nsSpaceManager, NS_GET_IID(nsISpaceManager)); NS_IMETHODIMP nsSpaceManager::GetFrame(nsIFrame*& aFrame) const diff --git a/mozilla/layout/base/src/nsStyleContext.cpp b/mozilla/layout/base/src/nsStyleContext.cpp index d940a2231b4..d32265c92a3 100644 --- a/mozilla/layout/base/src/nsStyleContext.cpp +++ b/mozilla/layout/base/src/nsStyleContext.cpp @@ -52,7 +52,6 @@ #include "nsLayoutAtoms.h" #include "prenv.h" -static NS_DEFINE_IID(kIStyleContextIID, NS_ISTYLECONTEXT_IID); #define DELETE_ARRAY_IF(array) if (array) { delete[] array; array = nsnull; } @@ -3587,7 +3586,7 @@ NS_NewStyleContext(nsIStyleContext** aInstancePtrResult, if (nsnull == context) { return NS_ERROR_OUT_OF_MEMORY; } - nsresult result = context->QueryInterface(kIStyleContextIID, (void **) aInstancePtrResult); + nsresult result = context->QueryInterface(NS_GET_IID(nsIStyleContext), (void **) aInstancePtrResult); context->RemapStyle(aPresContext); // remap after initial ref-count is set #ifdef SHARE_STYLECONTEXTS diff --git a/mozilla/layout/base/src/nsStyleSet.cpp b/mozilla/layout/base/src/nsStyleSet.cpp index 45bcf220288..35636836a3d 100644 --- a/mozilla/layout/base/src/nsStyleSet.cpp +++ b/mozilla/layout/base/src/nsStyleSet.cpp @@ -51,7 +51,6 @@ #include "nsISizeOfHandler.h" -static NS_DEFINE_IID(kIStyleSetIID, NS_ISTYLE_SET_IID); static NS_DEFINE_IID(kIStyleFrameConstructionIID, NS_ISTYLE_FRAME_CONSTRUCTION_IID); // - fast cache uses a CRC32 on the style context to quickly find sharing candidates. @@ -394,7 +393,7 @@ StyleSetImpl::~StyleSetImpl() } #ifndef MOZ_PERF_METRICS -NS_IMPL_ISUPPORTS(StyleSetImpl, kIStyleSetIID) +NS_IMPL_ISUPPORTS(StyleSetImpl, NS_GET_IID(nsIStyleSet)) #else NS_IMPL_ISUPPORTS2(StyleSetImpl, nsIStyleSet, nsITimeRecorder) #endif @@ -729,7 +728,7 @@ NS_IMETHODIMP StyleSetImpl::EnableQuirkStyleSheet(PRBool aEnable) sheet = getter_AddRefs(GetBackstopStyleSheetAt(i)); if (sheet) { nsCOMPtr cssSheet; - sheet->QueryInterface(nsICSSStyleSheet::GetIID(), getter_AddRefs(cssSheet)); + sheet->QueryInterface(NS_GET_IID(nsICSSStyleSheet), getter_AddRefs(cssSheet)); if (cssSheet) { nsCOMPtr quirkSheet; PRBool bHasSheet = PR_FALSE; @@ -1388,7 +1387,7 @@ NS_NewStyleSet(nsIStyleSet** aInstancePtrResult) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kIStyleSetIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsIStyleSet), (void **) aInstancePtrResult); } // nsITimeRecorder implementation diff --git a/mozilla/layout/build/nsLayoutDLF.cpp b/mozilla/layout/build/nsLayoutDLF.cpp index 9fc88251670..9418a9ca649 100644 --- a/mozilla/layout/build/nsLayoutDLF.cpp +++ b/mozilla/layout/build/nsLayoutDLF.cpp @@ -49,9 +49,6 @@ #undef NOISY_REGISTRY -static NS_DEFINE_IID(kIDocumentLoaderFactoryIID, NS_IDOCUMENTLOADERFACTORY_IID); -static NS_DEFINE_IID(kIDocStreamLoaderFactoryIID, NS_IDOCSTREAMLOADERFACTORY_IID); -static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID); static NS_DEFINE_IID(kHTMLDocumentCID, NS_HTMLDOCUMENT_CID); static NS_DEFINE_IID(kXMLDocumentCID, NS_XMLDOCUMENT_CID); static NS_DEFINE_IID(kImageDocumentCID, NS_IMAGEDOCUMENT_CID); @@ -169,7 +166,7 @@ NS_NewLayoutDocumentLoaderFactory(nsIDocumentLoaderFactory** aResult) if (!it) { return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kIDocumentLoaderFactoryIID, (void**)aResult); + return it->QueryInterface(NS_GET_IID(nsIDocumentLoaderFactory), (void**)aResult); } nsLayoutDLF::nsLayoutDLF() @@ -192,13 +189,13 @@ nsLayoutDLF::QueryInterface(REFNSIID aIID, void** aInstancePtrResult) } static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kIDocumentLoaderFactoryIID)) { + if (aIID.Equals(NS_GET_IID(nsIDocumentLoaderFactory))) { nsIDocumentLoaderFactory *tmp = this; *aInstancePtrResult = (void*) tmp; AddRef(); return NS_OK; } - if (aIID.Equals(kIDocStreamLoaderFactoryIID)) { + if (aIID.Equals(NS_GET_IID(nsIDocStreamLoaderFactory))) { nsIDocStreamLoaderFactory *tmp = this; *aInstancePtrResult = (void*) tmp; AddRef(); @@ -364,7 +361,7 @@ nsLayoutDLF::CreateDocument(const char* aCommand, do { // Create the document rv = nsComponentManager::CreateInstance(aDocumentCID, nsnull, - kIDocumentIID, + NS_GET_IID(nsIDocument), getter_AddRefs(doc)); if (NS_FAILED(rv)) break; @@ -427,7 +424,7 @@ nsLayoutDLF::CreateRDFDocument(nsISupports* aExtraInfo, // Create the XUL document rv = nsComponentManager::CreateInstance(kXULDocumentCID, nsnull, - kIDocumentIID, + NS_GET_IID(nsIDocument), getter_AddRefs(*doc)); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/layout/build/nsLayoutModule.cpp b/mozilla/layout/build/nsLayoutModule.cpp index 7f2439f7864..177268f3e34 100644 --- a/mozilla/layout/build/nsLayoutModule.cpp +++ b/mozilla/layout/build/nsLayoutModule.cpp @@ -112,10 +112,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, //---------------------------------------------------------------------- -static NS_DEFINE_IID(kIScriptNameSetRegistryIID, NS_ISCRIPTNAMESETREGISTRY_IID); static NS_DEFINE_IID(kCScriptNameSetRegistryCID, NS_SCRIPT_NAMESET_REGISTRY_CID); -static NS_DEFINE_IID(kIScriptNameSpaceManagerIID, NS_ISCRIPTNAMESPACEMANAGER_IID); -static NS_DEFINE_IID(kIScriptExternalNameSetIID, NS_ISCRIPTEXTERNALNAMESET_IID); class LayoutScriptNameSet : public nsIScriptExternalNameSet { public: @@ -137,7 +134,7 @@ LayoutScriptNameSet::~LayoutScriptNameSet() { } -NS_IMPL_ISUPPORTS(LayoutScriptNameSet, kIScriptExternalNameSetIID); +NS_IMPL_ISUPPORTS(LayoutScriptNameSet, NS_GET_IID(nsIScriptExternalNameSet)); NS_IMETHODIMP LayoutScriptNameSet::InitializeClasses(nsIScriptContext* aScriptContext) @@ -152,12 +149,11 @@ LayoutScriptNameSet::AddNameSet(nsIScriptContext* aScriptContext) nsIScriptNameSpaceManager* manager; static NS_DEFINE_IID(kHTMLImageElementCID, NS_HTMLIMAGEELEMENT_CID); static NS_DEFINE_IID(kHTMLOptionElementCID, NS_HTMLOPTIONELEMENT_CID); - static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); result = aScriptContext->GetNameSpaceManager(&manager); if (NS_OK == result) { result = manager->RegisterGlobalName(NS_ConvertToString("HTMLImageElement"), - kIScriptObjectOwnerIID, + NS_GET_IID(nsIScriptObjectOwner), kHTMLImageElementCID, PR_TRUE); if (NS_FAILED(result)) { @@ -166,7 +162,7 @@ LayoutScriptNameSet::AddNameSet(nsIScriptContext* aScriptContext) } result = manager->RegisterGlobalName(NS_ConvertToString("HTMLOptionElement"), - kIScriptObjectOwnerIID, + NS_GET_IID(nsIScriptObjectOwner), kHTMLOptionElementCID, PR_TRUE); if (NS_FAILED(result)) { @@ -182,7 +178,6 @@ LayoutScriptNameSet::AddNameSet(nsIScriptContext* aScriptContext) //---------------------------------------------------------------------- -static NS_DEFINE_IID(kIModuleIID, NS_IMODULE_IID); nsIScriptNameSetRegistry* nsLayoutModule::gRegistry; nsICSSStyleSheet* nsLayoutModule::gUAStyleSheet = nsnull; @@ -198,7 +193,7 @@ nsLayoutModule::~nsLayoutModule() Shutdown(); } -NS_IMPL_ISUPPORTS(nsLayoutModule, kIModuleIID) +NS_IMPL_ISUPPORTS(nsLayoutModule, NS_GET_IID(nsIModule)) // Perform our one-time intialization for this module nsresult @@ -236,7 +231,7 @@ nsLayoutModule::Initialize() // XXX Initialize the script name set thingy-ma-jigger if (!gRegistry) { rv = nsServiceManager::GetService(kCScriptNameSetRegistryCID, - kIScriptNameSetRegistryIID, + NS_GET_IID(nsIScriptNameSetRegistry), (nsISupports**) &gRegistry); if (NS_SUCCEEDED(rv)) { LayoutScriptNameSet* nameSet = new LayoutScriptNameSet(); diff --git a/mozilla/layout/events/src/nsDOMEvent.cpp b/mozilla/layout/events/src/nsDOMEvent.cpp index a798c0e2b79..47a5445e98b 100644 --- a/mozilla/layout/events/src/nsDOMEvent.cpp +++ b/mozilla/layout/events/src/nsDOMEvent.cpp @@ -42,7 +42,6 @@ #include "nsLayoutAtoms.h" #include "nsMutationEvent.h" -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); static char* mEventNames[] = { "mousedown", "mouseup", "click", "dblclick", "mouseover", diff --git a/mozilla/layout/events/src/nsEventListenerManager.cpp b/mozilla/layout/events/src/nsEventListenerManager.cpp index a1fd9bbf963..9cca3ff0fb0 100644 --- a/mozilla/layout/events/src/nsEventListenerManager.cpp +++ b/mozilla/layout/events/src/nsEventListenerManager.cpp @@ -60,10 +60,6 @@ #include "nsIPresShell.h" #include "nsMutationEvent.h" -static NS_DEFINE_IID(kIEventListenerManagerIID, NS_IEVENTLISTENERMANAGER_IID); -static NS_DEFINE_IID(kIDOMEventListenerIID, NS_IDOMEVENTLISTENER_IID); -static NS_DEFINE_IID(kIDOMEventIID, NS_IDOMEVENT_IID); -static NS_DEFINE_IID(kIScriptEventListenerIID, NS_ISCRIPTEVENTLISTENER_IID); nsEventListenerManager::nsEventListenerManager() { @@ -2236,7 +2232,7 @@ NS_HTML nsresult NS_NewEventListenerManager(nsIEventListenerManager** aInstanceP return NS_ERROR_OUT_OF_MEMORY; } - if (NS_OK == l->QueryInterface(kIEventListenerManagerIID, (void**) aInstancePtrResult)) { + if (NS_OK == l->QueryInterface(NS_GET_IID(nsIEventListenerManager), (void**) aInstancePtrResult)) { return NS_OK; } diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index 90acd8de6ec..4d2f99a8475 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -61,7 +61,6 @@ #include "nsIScrollableFrame.h" #include "nsIScrollableView.h" -static NS_DEFINE_IID(kScrollableViewIID, NS_ISCROLLABLEVIEW_IID); #include "nsIXULDocument.h" // Temporary fix for Bug 36558 @@ -69,14 +68,6 @@ static NS_DEFINE_IID(kScrollableViewIID, NS_ISCROLLABLEVIEW_IID); #include "nsIFontMetrics.h" #endif -static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); -static NS_DEFINE_IID(kIComboboxControlFrameIID, NS_ICOMBOBOXCONTROLFRAME_IID); -static NS_DEFINE_IID(kIListControlFrameIID, NS_ILISTCONTROLFRAME_IID); -static NS_DEFINE_IID(kIDOMMouseListenerIID, NS_IDOMMOUSELISTENER_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); -static NS_DEFINE_IID(kIAnonymousContentCreatorIID, NS_IANONYMOUS_CONTENT_CREATOR_IID); -static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID); -static NS_DEFINE_IID(kIPrivateDOMEventIID, NS_IPRIVATEDOMEVENT_IID); #define FIX_FOR_BUG_53259 @@ -283,13 +274,13 @@ nsComboboxControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kIComboboxControlFrameIID)) { + if (aIID.Equals(NS_GET_IID(nsIComboboxControlFrame))) { *aInstancePtr = (void*) ((nsIComboboxControlFrame*) this); return NS_OK; - } else if (aIID.Equals(kIFormControlFrameIID)) { + } else if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { *aInstancePtr = (void*) ((nsIFormControlFrame*) this); return NS_OK; - } else if (aIID.Equals(kIAnonymousContentCreatorIID)) { + } else if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) { *aInstancePtr = (void*)(nsIAnonymousContentCreator*) this; return NS_OK; } else if (aIID.Equals(NS_GET_IID(nsISelectControlFrame))) { @@ -357,7 +348,7 @@ nsComboboxControlFrame::MakeSureSomethingIsSelected(nsIPresContext* aPresContext REFLOW_DEBUG_MSG("CBX::MakeSureSomethingIsSelected\n"); nsIFormControlFrame* fcFrame = nsnull; - nsresult rv = mDropdownFrame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + nsresult rv = mDropdownFrame->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if (NS_SUCCEEDED(rv) && fcFrame) { // If nothing selected, and there are options, default selection to item 0 rv = mListControlFrame->GetSelectedIndex(&mSelectedIndex); @@ -413,7 +404,7 @@ nsComboboxControlFrame::Reset(nsIPresContext* aPresContext) // Reset the dropdown list to its original state nsIFormControlFrame* fcFrame = nsnull; - nsresult result = mDropdownFrame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + nsresult result = mDropdownFrame->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if ((NS_OK == result) && (nsnull != fcFrame)) { fcFrame->Reset(aPresContext); } @@ -538,7 +529,7 @@ nsComboboxControlFrame::ShowPopup(PRBool aShowPopup) mDropdownFrame->GetRect(rect); viewManager->ResizeView(view, rect.width, rect.height); nsIScrollableView* scrollingView; - if (NS_SUCCEEDED(view->QueryInterface(kScrollableViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { scrollingView->ComputeScrollOffsets(PR_TRUE); } viewManager->SetViewVisibility(view, nsViewVisibility_kShow); @@ -557,7 +548,7 @@ nsComboboxControlFrame::ShowList(nsIPresContext* aPresContext, PRBool aShowList) // Get parent view nsIFrame * listFrame; - if (NS_OK == mListControlFrame->QueryInterface(kIFrameIID, (void **)&listFrame)) { + if (NS_OK == mListControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void **)&listFrame)) { nsIView * view = nsnull; listFrame->GetView(aPresContext, &view); NS_ASSERTION(view != nsnull, "nsComboboxControlFrame view is null"); @@ -645,7 +636,7 @@ void nsComboboxControlFrame::SetChildFrameSize(nsIFrame* aFrame, nscoord aWidth, nscoord aHeight) { nsIFormControlFrame* fcFrame = nsnull; - nsresult result = aFrame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + nsresult result = aFrame->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if (NS_SUCCEEDED(result) && (nsnull != fcFrame)) { fcFrame->SetSuggestedSize(aWidth, aHeight); } @@ -1341,7 +1332,7 @@ nsComboboxControlFrame::Reflow(nsIPresContext* aPresContext, return rv; } else { nsIFrame * plainLstFrame; - if (NS_SUCCEEDED(mListControlFrame->QueryInterface(kIFrameIID, (void**)&plainLstFrame))) { + if (NS_SUCCEEDED(mListControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void**)&plainLstFrame))) { nsIFrame * frame; plainLstFrame->FirstChild(aPresContext, nsnull, &frame); nsIScrollableFrame * scrollFrame; @@ -1703,7 +1694,7 @@ nsComboboxControlFrame::GetNamesValues(PRInt32 aMaxNumValues, PRInt32& aNumValue nsString* aValues, nsString* aNames) { nsIFormControlFrame* fcFrame = nsnull; - nsresult result = mDropdownFrame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + nsresult result = mDropdownFrame->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if ((NS_SUCCEEDED(result)) && (nsnull != fcFrame)) { return fcFrame->GetNamesValues(aMaxNumValues, aNumValues, aValues, aNames); } @@ -1795,7 +1786,7 @@ nsComboboxControlFrame::SetDropDown(nsIFrame* aDropDownFrame) { mDropdownFrame = aDropDownFrame; - if (NS_OK != mDropdownFrame->QueryInterface(kIListControlFrameIID, (void**)&mListControlFrame)) { + if (NS_OK != mDropdownFrame->QueryInterface(NS_GET_IID(nsIListControlFrame), (void**)&mListControlFrame)) { return NS_ERROR_FAILURE; } @@ -2089,7 +2080,7 @@ NS_IMETHODIMP nsComboboxControlFrame::SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsAReadableString& aValue) { nsIFormControlFrame* fcFrame = nsnull; - nsresult result = mDropdownFrame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + nsresult result = mDropdownFrame->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if ((NS_SUCCEEDED(result)) && (nsnull != fcFrame)) { return fcFrame->SetProperty(aPresContext, aName, aValue); } @@ -2100,7 +2091,7 @@ NS_IMETHODIMP nsComboboxControlFrame::GetProperty(nsIAtom* aName, nsAWritableString& aValue) { nsIFormControlFrame* fcFrame = nsnull; - nsresult result = mDropdownFrame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + nsresult result = mDropdownFrame->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if ((NS_SUCCEEDED(result)) && (nsnull != fcFrame)) { return fcFrame->GetProperty(aName, aValue); } @@ -2320,7 +2311,7 @@ nsComboboxControlFrame::Destroy(nsIPresContext* aPresContext) nsCOMPtr widget; // Get parent view nsIFrame * listFrame; - if (NS_OK == mListControlFrame->QueryInterface(kIFrameIID, (void **)&listFrame)) { + if (NS_OK == mListControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void **)&listFrame)) { nsIView * view = nsnull; listFrame->GetView(aPresContext, &view); NS_ASSERTION(view != nsnull, "nsComboboxControlFrame view is null"); @@ -2375,7 +2366,7 @@ nsComboboxControlFrame::SetInitialChildList(nsIPresContext* aPresContext, nsIFrame * child = aChildList; while (child != nsnull) { nsIFormControlFrame* fcFrame = nsnull; - rv = child->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + rv = child->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if (NS_FAILED(rv) && fcFrame == nsnull) { mDisplayFrame = child; } else if (fcFrame != nsnull) { diff --git a/mozilla/layout/forms/nsFieldSetFrame.cpp b/mozilla/layout/forms/nsFieldSetFrame.cpp index aa54c03bc0a..e60fb79664d 100644 --- a/mozilla/layout/forms/nsFieldSetFrame.cpp +++ b/mozilla/layout/forms/nsFieldSetFrame.cpp @@ -46,8 +46,6 @@ #include "nsCOMPtr.h" static NS_DEFINE_IID(kLegendFrameCID, NS_LEGEND_FRAME_CID); -static NS_DEFINE_IID(kIDOMHTMLFieldSetElementIID, NS_IDOMHTMLFIELDSETELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLLegendElementIID, NS_IDOMHTMLLEGENDELEMENT_IID); class nsLegendFrame; diff --git a/mozilla/layout/forms/nsFileControlFrame.cpp b/mozilla/layout/forms/nsFileControlFrame.cpp index 64f47def9c1..ad7cd74c4e2 100644 --- a/mozilla/layout/forms/nsFileControlFrame.cpp +++ b/mozilla/layout/forms/nsFileControlFrame.cpp @@ -59,10 +59,6 @@ #include "nsIScriptGlobalObject.h" -static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); -static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID); -static NS_DEFINE_IID(kIDOMMouseListenerIID, NS_IDOMMOUSELISTENER_IID); -static NS_DEFINE_IID(kIAnonymousContentCreatorIID, NS_IANONYMOUS_CONTENT_CREATOR_IID); nsresult NS_NewFileControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) @@ -96,7 +92,7 @@ nsFileControlFrame::~nsFileControlFrame() // remove ourself as a listener of the button (bug 40533) if (mBrowse) { nsCOMPtr reciever(do_QueryInterface(mBrowse)); - reciever->RemoveEventListenerByIID(this, kIDOMMouseListenerIID); + reciever->RemoveEventListenerByIID(this, NS_GET_IID(nsIDOMMouseListener)); } if (mCachedState) { @@ -146,7 +142,7 @@ nsFileControlFrame::CreateAnonymousContent(nsIPresContext* aPresContext, // register as an event listener of the button to open file dialog on mouse click nsCOMPtr reciever(do_QueryInterface(mBrowse)); - reciever->AddEventListenerByIID(this, kIDOMMouseListenerIID); + reciever->AddEventListenerByIID(this, NS_GET_IID(nsIDOMMouseListener)); } nsString value; @@ -164,13 +160,13 @@ nsFileControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(0 != aInstancePtr, "null ptr"); if (NULL == aInstancePtr) { return NS_ERROR_NULL_POINTER; - } else if (aIID.Equals(kIAnonymousContentCreatorIID)) { + } else if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) { *aInstancePtr = (void*)(nsIAnonymousContentCreator*) this; return NS_OK; - } else if (aIID.Equals(kIFormControlFrameIID)) { + } else if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { *aInstancePtr = (void*) ((nsIFormControlFrame*) this); return NS_OK; - } else if (aIID.Equals(kIDOMMouseListenerIID)) { + } else if (aIID.Equals(NS_GET_IID(nsIDOMMouseListener))) { *aInstancePtr = (void*)(nsIDOMMouseListener*) this; return NS_OK; } else if (aIID.Equals(NS_GET_IID(nsIStatefulFrame))) { diff --git a/mozilla/layout/forms/nsFormControlFrame.cpp b/mozilla/layout/forms/nsFormControlFrame.cpp index 2a0badaeb36..00dd715ab88 100644 --- a/mozilla/layout/forms/nsFormControlFrame.cpp +++ b/mozilla/layout/forms/nsFormControlFrame.cpp @@ -93,13 +93,8 @@ const PRInt32 kSizeNotSet = -1; -static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); -static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); -static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); -static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID); nsFormControlFrame::nsFormControlFrame() : nsLeafFrame() @@ -142,7 +137,7 @@ nsFormControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) if (NULL == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kIFormControlFrameIID)) { + if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { *aInstancePtr = (void*) ((nsIFormControlFrame*) this); return NS_OK; } @@ -623,8 +618,7 @@ nsFormControlFrame::ScrollIntoView(nsIPresContext* aPresContext) const nsIID& nsFormControlFrame::GetIID() { - static NS_DEFINE_IID(kButtonIID, NS_IBUTTON_IID); - return kButtonIID; + return NS_GET_IID(nsIButton); } const nsIID& @@ -676,7 +670,7 @@ nsFormControlFrame::GetType(PRInt32* aType) const nsresult result = NS_FORM_NOTOK; if (mContent) { nsIFormControl* formControl = nsnull; - result = mContent->QueryInterface(kIFormControlIID, (void**)&formControl); + result = mContent->QueryInterface(NS_GET_IID(nsIFormControl), (void**)&formControl); if ((NS_OK == result) && formControl) { result = formControl->GetType(aType); NS_RELEASE(formControl); @@ -830,7 +824,7 @@ nsresult nsFormControlFrame::GetDefaultCheckState(PRBool *aState) { nsresult res = NS_OK; nsIDOMHTMLInputElement* inputElement; - if (NS_OK == mContent->QueryInterface(kIDOMHTMLInputElementIID, (void**)&inputElement)) { + if (NS_OK == mContent->QueryInterface(NS_GET_IID(nsIDOMHTMLInputElement), (void**)&inputElement)) { res = inputElement->GetDefaultChecked(aState); NS_RELEASE(inputElement); } @@ -842,7 +836,7 @@ nsFormControlFrame::SetDefaultCheckState(PRBool aState) { nsresult res = NS_OK; nsIDOMHTMLInputElement* inputElement; - if (NS_OK == mContent->QueryInterface(kIDOMHTMLInputElementIID, (void**)&inputElement)) { + if (NS_OK == mContent->QueryInterface(NS_GET_IID(nsIDOMHTMLInputElement), (void**)&inputElement)) { res = inputElement->SetDefaultChecked(aState); NS_RELEASE(inputElement); } @@ -854,7 +848,7 @@ nsFormControlFrame::GetCurrentCheckState(PRBool *aState) { nsresult res = NS_OK; nsIDOMHTMLInputElement* inputElement; - if (NS_OK == mContent->QueryInterface(kIDOMHTMLInputElementIID, (void**)&inputElement)) { + if (NS_OK == mContent->QueryInterface(NS_GET_IID(nsIDOMHTMLInputElement), (void**)&inputElement)) { res = inputElement->GetChecked(aState); NS_RELEASE(inputElement); } @@ -866,7 +860,7 @@ nsFormControlFrame::SetCurrentCheckState(PRBool aState) { nsresult res = NS_OK; nsIDOMHTMLInputElement* inputElement; - if (NS_OK == mContent->QueryInterface(kIDOMHTMLInputElementIID, (void**)&inputElement)) { + if (NS_OK == mContent->QueryInterface(NS_GET_IID(nsIDOMHTMLInputElement), (void**)&inputElement)) { inputElement->SetChecked(aState); NS_RELEASE(inputElement); } diff --git a/mozilla/layout/forms/nsFormControlHelper.cpp b/mozilla/layout/forms/nsFormControlHelper.cpp index 46c558ab644..d0bd9d6eb3e 100644 --- a/mozilla/layout/forms/nsFormControlHelper.cpp +++ b/mozilla/layout/forms/nsFormControlHelper.cpp @@ -68,14 +68,8 @@ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); // done I10N -static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); -static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); -static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); -static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID); // For figuring out the "WRAP" property #define kTextControl_Wrap_Soft "SOFT" @@ -454,7 +448,7 @@ nsFormControlHelper::CalculateSize (nsIPresContext* aPresContext, const nsStylePosition* pos; nsIFrame* iFrame = nsnull; - nsresult rv = aFrame->QueryInterface(kIFrameIID, (void**)&iFrame); + nsresult rv = aFrame->QueryInterface(NS_GET_IID(nsIFrame), (void**)&iFrame); if ((NS_OK == rv) && (nsnull != iFrame)) { iFrame->GetStyleData(eStyleStruct_Position, (const nsStyleStruct*&)pos); if (eStyleUnit_Percent == pos->mWidth.GetUnit()) { @@ -863,7 +857,7 @@ nsFormControlHelper::GetInputElementValue(nsIContent* aContent, nsString* aText, { nsresult result = NS_OK; nsIDOMHTMLInputElement* inputElem = nsnull; - result = aContent->QueryInterface(kIDOMHTMLInputElementIID, (void**)&inputElem); + result = aContent->QueryInterface(NS_GET_IID(nsIDOMHTMLInputElement), (void**)&inputElem); if ((NS_OK == result) && inputElem) { if (PR_TRUE == aInitialValue) { result = inputElem->GetDefaultValue(*aText); diff --git a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp index a7ba72dabc9..93d4d73b070 100644 --- a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp @@ -178,8 +178,7 @@ nsGfxButtonControlFrame::IsBrowse(PRInt32 type) const nsIID& nsGfxButtonControlFrame::GetIID() { - static NS_DEFINE_IID(kButtonIID, NS_IBUTTON_IID); - return kButtonIID; + return NS_GET_IID(nsIButton); } const nsIID& diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp index cfd6f7f615b..5fadcbc33b1 100644 --- a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp @@ -55,10 +55,7 @@ #include "nsIFrameManager.h" #include "nsINameSpaceManager.h" -static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); -static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); nsresult NS_NewHTMLButtonControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) @@ -161,7 +158,7 @@ nsHTMLButtonControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) if (NULL == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kIFormControlFrameIID)) { + if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { *aInstancePtr = (void*) ((nsIFormControlFrame*) this); return NS_OK; } @@ -226,7 +223,7 @@ nsHTMLButtonControlFrame::GetType(PRInt32* aType) const nsresult result = NS_FORM_NOTOK; if (mContent) { nsIFormControl* formControl = nsnull; - result = mContent->QueryInterface(kIFormControlIID, (void**)&formControl); + result = mContent->QueryInterface(NS_GET_IID(nsIFormControl), (void**)&formControl); if ((NS_OK == result) && formControl) { result = formControl->GetType(aType); NS_RELEASE(formControl); @@ -595,7 +592,7 @@ nsHTMLButtonControlFrame::Reflow(nsIPresContext* aPresContext, nsIView* view; GetView(&view); if (!view) { - nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, kIViewIID, (void **)&view); + nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, NS_GET_IID(nsIView), (void **)&view); nsCOMPtr presShell; aPresContext->GetShell(getter_AddRefs(presShell)); nsCOMPtr viewMan; diff --git a/mozilla/layout/forms/nsImageControlFrame.cpp b/mozilla/layout/forms/nsImageControlFrame.cpp index 83da4c09cd2..93822596e3d 100644 --- a/mozilla/layout/forms/nsImageControlFrame.cpp +++ b/mozilla/layout/forms/nsImageControlFrame.cpp @@ -54,9 +54,7 @@ eMouseUp }; */ -static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); #define nsImageControlFrameSuper nsImageFrame class nsImageControlFrame : public nsImageControlFrameSuper, @@ -197,7 +195,7 @@ nsImageControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) if (NULL == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kIFormControlFrameIID)) { + if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { *aInstancePtr = (void*) ((nsIFormControlFrame*) this); return NS_OK; } @@ -231,7 +229,7 @@ nsImageControlFrame::Init(nsIPresContext* aPresContext, nsIView* view; GetView(aPresContext, &view); if (!view) { - nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, kIViewIID, (void **)&view); + nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, NS_GET_IID(nsIView), (void **)&view); nsCOMPtr presShell; aPresContext->GetShell(getter_AddRefs(presShell)); nsCOMPtr viewMan; diff --git a/mozilla/layout/forms/nsLegendFrame.cpp b/mozilla/layout/forms/nsLegendFrame.cpp index 115192eb0c7..4c287c63516 100644 --- a/mozilla/layout/forms/nsLegendFrame.cpp +++ b/mozilla/layout/forms/nsLegendFrame.cpp @@ -41,7 +41,6 @@ #include "nsFormControlFrame.h" static NS_DEFINE_IID(kLegendFrameCID, NS_LEGEND_FRAME_CID); -static NS_DEFINE_IID(kIDOMHTMLLegendElementIID, NS_IDOMHTMLLEGENDELEMENT_IID); nsresult NS_NewLegendFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp index 0f9b93694a5..c3d52fa1e26 100644 --- a/mozilla/layout/forms/nsListControlFrame.cpp +++ b/mozilla/layout/forms/nsListControlFrame.cpp @@ -62,12 +62,6 @@ #include "nsISelectElement.h" #include "nsIPrivateDOMEvent.h" -static NS_DEFINE_IID(kIDOMMouseListenerIID, NS_IDOMMOUSELISTENER_IID); -static NS_DEFINE_IID(kIDOMMouseMotionListenerIID, NS_IDOMMOUSEMOTIONLISTENER_IID); -static NS_DEFINE_IID(kIDOMKeyListenerIID, NS_IDOMKEYLISTENER_IID); -static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); -static NS_DEFINE_IID(kIPrivateDOMEventIID, NS_IPRIVATEDOMEVENT_IID); //static NS_DEFINE_IID(kBlockFrameCID, NS_BLOCK_FRAME_CID); // Constants @@ -317,15 +311,15 @@ nsListControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) *aInstancePtr = (void *)((nsISelectControlFrame*)this); return NS_OK; } - if (aIID.Equals(kIDOMMouseListenerIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMMouseListener))) { *aInstancePtr = (void*)(nsIDOMMouseListener*) this; return NS_OK; } - if (aIID.Equals(kIDOMMouseMotionListenerIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMMouseMotionListener))) { *aInstancePtr = (void*)(nsIDOMMouseMotionListener*) this; return NS_OK; } - if (aIID.Equals(kIDOMKeyListenerIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMKeyListener))) { *aInstancePtr = (void*)(nsIDOMKeyListener*) this; return NS_OK; } diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 2fc2555bb00..96a79aba6ba 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -182,8 +182,6 @@ nsIFrameDebug::GetLogModuleInfo() //---------------------------------------------------------------------- -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); -static NS_DEFINE_IID(kIFrameSelection, NS_IFRAMESELECTION_IID); nsresult NS_NewEmptyFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) { @@ -258,7 +256,7 @@ nsresult nsFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; } static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - static NS_DEFINE_IID(kClassIID, kIFrameIID); + static NS_DEFINE_IID(kClassIID, NS_GET_IID(nsIFrame)); #ifdef DEBUG if (aIID.Equals(NS_GET_IID(nsIFrameDebug))) { @@ -833,7 +831,7 @@ nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEve { // Check for a table cell by querying to a known CellFrame interface nsITableCellLayout *cellElement; - result = (frame)->QueryInterface(nsITableCellLayout::GetIID(), (void **)&cellElement); + result = (frame)->QueryInterface(NS_GET_IID(nsITableCellLayout), (void **)&cellElement); if (NS_SUCCEEDED(result) && cellElement) { foundCell = PR_TRUE; @@ -847,7 +845,7 @@ nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEve // This will happen when starting frame is the table or child of a table, // such as a row (we were inbetween cells or in table border) nsITableLayout *tableElement; - result = (frame)->QueryInterface(nsITableLayout::GetIID(), (void **)&tableElement); + result = (frame)->QueryInterface(NS_GET_IID(nsITableLayout), (void **)&tableElement); if (NS_SUCCEEDED(result) && tableElement) { foundTable = PR_TRUE; @@ -2325,7 +2323,7 @@ nsFrame::GetSelectionController(nsIPresContext *aPresContext, nsISelectionContro while (tmp) { nsIGfxTextControlFrame2 *tcf; - if (NS_SUCCEEDED(tmp->QueryInterface(nsIGfxTextControlFrame2::GetIID(),(void**)&tcf))) + if (NS_SUCCEEDED(tmp->QueryInterface(NS_GET_IID(nsIGfxTextControlFrame2),(void**)&tcf))) { return tcf->GetSelectionContr(aSelCon); } diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp index 3de33d3c6c4..c7fd9b1bb03 100644 --- a/mozilla/layout/generic/nsFrameSetFrame.cpp +++ b/mozilla/layout/generic/nsFrameSetFrame.cpp @@ -56,7 +56,6 @@ static NS_DEFINE_IID(kIFramesetFrameIID, NS_IFRAMESETFRAME_IID); static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); /******************************************************************************* * nsFramesetDrag @@ -233,7 +232,6 @@ nsresult nsHTMLFramesetFrame::QueryInterface(const nsIID& aIID, } static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); NS_IMETHODIMP nsHTMLFramesetFrame::Init(nsIPresContext* aPresContext, @@ -262,7 +260,7 @@ nsHTMLFramesetFrame::Init(nsIPresContext* aPresContext, // create the view. a view is needed since it needs to be a mouse grabber nsIView* view; - nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, kIViewIID, + nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, NS_GET_IID(nsIView), (void **)&view); nsCOMPtr presShell; aPresContext->GetShell(getter_AddRefs(presShell)); @@ -1619,7 +1617,7 @@ nsHTMLFramesetBorderFrame::Paint(nsIPresContext* aPresContext, nscolor sdwColor = NS_RGB(128,128,128); nsILookAndFeel * lookAndFeel; - if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, (void**)&lookAndFeel)) { + if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, NS_GET_IID(nsILookAndFeel), (void**)&lookAndFeel)) { lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); diff --git a/mozilla/layout/generic/nsFrameUtil.cpp b/mozilla/layout/generic/nsFrameUtil.cpp index 7063bbbfc0c..d393c61a17f 100644 --- a/mozilla/layout/generic/nsFrameUtil.cpp +++ b/mozilla/layout/generic/nsFrameUtil.cpp @@ -27,7 +27,6 @@ #include #include "plstr.h" -static NS_DEFINE_IID(kIFrameUtilIID, NS_IFRAME_UTIL_IID); #ifdef NS_DEBUG class nsFrameUtil : public nsIFrameUtil { @@ -492,7 +491,7 @@ NS_NewFrameUtil(nsIFrameUtil** aResult) if (nsnull == it) { return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kIFrameUtilIID, (void**) aResult); + return it->QueryInterface(NS_GET_IID(nsIFrameUtil), (void**) aResult); } nsFrameUtil::nsFrameUtil() @@ -504,7 +503,7 @@ nsFrameUtil::~nsFrameUtil() { } -NS_IMPL_ISUPPORTS(nsFrameUtil, kIFrameUtilIID); +NS_IMPL_ISUPPORTS(nsFrameUtil, NS_GET_IID(nsIFrameUtil)); void nsFrameUtil::DumpNode(Node* aNode, FILE* aOutputFile, PRInt32 aIndent) diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp index 34e76d5670a..8ccf87c61fa 100644 --- a/mozilla/layout/generic/nsGfxScrollFrame.cpp +++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp @@ -60,11 +60,7 @@ static NS_DEFINE_IID(kWidgetCID, NS_CHILD_CID); static NS_DEFINE_IID(kScrollingViewCID, NS_SCROLLING_VIEW_CID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); -static NS_DEFINE_IID(kIAnonymousContentCreatorIID, NS_IANONYMOUS_CONTENT_CREATOR_IID); -static NS_DEFINE_IID(kIScrollableFrameIID, NS_ISCROLLABLE_FRAME_IID); //---------------------------------------------------------------------- @@ -923,7 +919,7 @@ nsGfxScrollFrameInner::GetScrollableView(nsIPresContext* aPresContext) nsIFrame* frame = nsnull; mScrollAreaBox->GetFrame(&frame); frame->GetView(aPresContext, &view); - nsresult result = view->QueryInterface(kScrollViewIID, (void**)&scrollingView); + nsresult result = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView); NS_ASSERTION(NS_SUCCEEDED(result), "assertion gfx scrollframe does not contain a scrollframe"); return scrollingView; } diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp index b45cb5508fb..1d7c6a12590 100644 --- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp @@ -49,7 +49,6 @@ #include "nsIStyleSet.h" #include "nsCOMPtr.h" -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID); NS_IMETHODIMP @@ -519,11 +518,10 @@ nsHTMLContainerFrame::CreateViewForFrame(nsIPresContext* aPresContext, // Create a view static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); - static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, - kIViewIID, + NS_GET_IID(nsIView), (void **)&view); if (NS_OK == result) { nsIViewManager* viewManager; @@ -546,7 +544,7 @@ nsHTMLContainerFrame::CreateViewForFrame(nsIPresContext* aPresContext, // Insert the view into the view hierarchy. If the parent view is a // scrolling view we need to do this differently nsIScrollableView* scrollingView; - if (NS_SUCCEEDED(parentView->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(parentView->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { scrollingView->SetScrolledView(view); } else { PRInt32 zIndex = 0; diff --git a/mozilla/layout/generic/nsHTMLFrame.cpp b/mozilla/layout/generic/nsHTMLFrame.cpp index 460ba4e9639..5332867867f 100644 --- a/mozilla/layout/generic/nsHTMLFrame.cpp +++ b/mozilla/layout/generic/nsHTMLFrame.cpp @@ -45,8 +45,6 @@ #include "nsIPresShell.h" // Interface IDs -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); /** * Root frame class. diff --git a/mozilla/layout/generic/nsHTMLReflowCommand.cpp b/mozilla/layout/generic/nsHTMLReflowCommand.cpp index 7ec3a5454a3..74f301f8fc7 100644 --- a/mozilla/layout/generic/nsHTMLReflowCommand.cpp +++ b/mozilla/layout/generic/nsHTMLReflowCommand.cpp @@ -32,7 +32,6 @@ #include "nsFrame.h" #include "nsContainerFrame.h" -static NS_DEFINE_IID(kIReflowCommandIID, NS_IREFLOWCOMMAND_IID); nsresult NS_NewHTMLReflowCommand(nsIReflowCommand** aInstancePtrResult, @@ -50,7 +49,7 @@ NS_NewHTMLReflowCommand(nsIReflowCommand** aInstancePtrResult, return NS_ERROR_OUT_OF_MEMORY; } - return cmd->QueryInterface(kIReflowCommandIID, (void**)aInstancePtrResult); + return cmd->QueryInterface(NS_GET_IID(nsIReflowCommand), (void**)aInstancePtrResult); } // Construct a reflow command given a target frame, reflow command type, @@ -77,7 +76,7 @@ nsHTMLReflowCommand::~nsHTMLReflowCommand() NS_IF_RELEASE(mListName); } -NS_IMPL_ISUPPORTS(nsHTMLReflowCommand, kIReflowCommandIID); +NS_IMPL_ISUPPORTS(nsHTMLReflowCommand, NS_GET_IID(nsIReflowCommand)); nsIFrame* nsHTMLReflowCommand::GetContainingBlock(nsIFrame* aFloater) const { diff --git a/mozilla/layout/generic/nsHTMLReflowState.cpp b/mozilla/layout/generic/nsHTMLReflowState.cpp index 65d04d7648c..cd61f6ae513 100644 --- a/mozilla/layout/generic/nsHTMLReflowState.cpp +++ b/mozilla/layout/generic/nsHTMLReflowState.cpp @@ -43,7 +43,6 @@ // hack for bug 50695 #include "nsIFormManager.h" -static NS_DEFINE_IID(kIFormManagerIID, NS_IFORMMANAGER_IID); // Initialize a root reflow state with a rendering context to // use for measuring things. @@ -1315,7 +1314,7 @@ CalcQuirkContainingBlockHeight(const nsHTMLReflowState& aReflowState) if (nsLayoutAtoms::blockFrame == frameType.get()) { // special hack for bug 50695, skip form frames nsIFrame* formFrame; - if (NS_OK == rs->frame->QueryInterface(kIFormManagerIID, (void **)&formFrame)) { + if (NS_OK == rs->frame->QueryInterface(NS_GET_IID(nsIFormManager), (void **)&formFrame)) { continue; } if (!firstBlockRS) { diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h index 416daa13bdb..868fe6df333 100644 --- a/mozilla/layout/generic/nsIFrame.h +++ b/mozilla/layout/generic/nsIFrame.h @@ -455,6 +455,7 @@ typedef PRBool nsDidReflowStatus; class nsIFrame : public nsISupports { public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFRAME_IID) /** * Called to initialize the frame. This is called immediately after creating * the frame. diff --git a/mozilla/layout/generic/nsIFrameUtil.h b/mozilla/layout/generic/nsIFrameUtil.h index d577e4d419a..567fa5a5940 100644 --- a/mozilla/layout/generic/nsIFrameUtil.h +++ b/mozilla/layout/generic/nsIFrameUtil.h @@ -34,6 +34,7 @@ class nsIURI; */ class nsIFrameUtil : public nsISupports { public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFRAME_UTIL_IID) /** * Compare two regression data dumps. The return status will be NS_OK * if the trees compare favoribly, otherwise the return will indicate diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 99c5b7b431e..aa58537a089 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -70,7 +70,6 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #undef NOISY_IMAGE_LOADING #endif -static NS_DEFINE_IID(kIHTMLDocumentIID, NS_IHTMLDOCUMENT_IID); // Value's for mSuppress #define SUPPRESS_UNSET 0 @@ -713,7 +712,7 @@ nsImageFrame::GetImageMap(nsIPresContext* aPresContext) usemap.Cut(0, 1); } nsIHTMLDocument* hdoc; - nsresult rv = doc->QueryInterface(kIHTMLDocumentIID, (void**)&hdoc); + nsresult rv = doc->QueryInterface(NS_GET_IID(nsIHTMLDocument), (void**)&hdoc); NS_RELEASE(doc); if (NS_SUCCEEDED(rv)) { nsIDOMHTMLMapElement* map; diff --git a/mozilla/layout/generic/nsImageMap.cpp b/mozilla/layout/generic/nsImageMap.cpp index d228434367a..ebff9d18cbe 100644 --- a/mozilla/layout/generic/nsImageMap.cpp +++ b/mozilla/layout/generic/nsImageMap.cpp @@ -710,11 +710,6 @@ void CircleArea::GetShapeName(nsString& aResult) const //---------------------------------------------------------------------- -static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); -static NS_DEFINE_IID(kIDOMHTMLElementIID, NS_IDOMHTMLELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLAreaElementIID, NS_IDOMHTMLAREAELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLAnchorElementIID, NS_IDOMHTMLANCHORELEMENT_IID); -static NS_DEFINE_IID(kIDocumentObserverIID, NS_IDOCUMENT_OBSERVER_IID); nsImageMap::nsImageMap() { @@ -800,7 +795,7 @@ nsImageMap::Init(nsIPresShell* aPresShell, nsIFrame* aImageFrame, nsIDOMHTMLMapE mImageFrame = aImageFrame; mDomMap = aMap; - nsresult rv = aMap->QueryInterface(kIContentIID, (void**) &mMap); + nsresult rv = aMap->QueryInterface(NS_GET_IID(nsIContent), (void**) &mMap); if (NS_SUCCEEDED(rv)) { rv = mMap->GetDocument(mDocument); if (NS_SUCCEEDED(rv) && (nsnull != mDocument)) { @@ -828,7 +823,7 @@ nsImageMap::UpdateAreasForBlock(nsIContent* aParent) rv = aParent->ChildAt(i, child); if (NS_SUCCEEDED(rv)) { nsIDOMHTMLAnchorElement* area; - rv = child->QueryInterface(kIDOMHTMLAnchorElementIID, (void**) &area); + rv = child->QueryInterface(NS_GET_IID(nsIDOMHTMLAnchorElement), (void**) &area); if (NS_SUCCEEDED(rv)) { rv = AddArea(child); NS_RELEASE(area); @@ -860,7 +855,7 @@ nsImageMap::UpdateAreas() if (NS_SUCCEEDED(rv)) { // Only look at elements and not text, comments, etc. nsIDOMHTMLElement* element; - rv = child->QueryInterface(kIDOMHTMLElementIID, (void**)&element); + rv = child->QueryInterface(NS_GET_IID(nsIDOMHTMLElement), (void**)&element); if (NS_FAILED(rv)) { rv = NS_OK; continue; @@ -871,7 +866,7 @@ nsImageMap::UpdateAreas() // If so, we only look for AREA elements if (!containsBlock) { nsIDOMHTMLAreaElement* area; - rv = child->QueryInterface(kIDOMHTMLAreaElementIID, (void**) &area); + rv = child->QueryInterface(NS_GET_IID(nsIDOMHTMLAreaElement), (void**) &area); if (NS_SUCCEEDED(rv)) { containsArea = PR_TRUE; rv = AddArea(child); diff --git a/mozilla/layout/generic/nsLineBox.cpp b/mozilla/layout/generic/nsLineBox.cpp index 811c3e0b3ce..1d67abe4e5d 100644 --- a/mozilla/layout/generic/nsLineBox.cpp +++ b/mozilla/layout/generic/nsLineBox.cpp @@ -496,7 +496,6 @@ nsLineBox::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const //---------------------------------------------------------------------- -static NS_DEFINE_IID(kILineIteratorIID, NS_ILINE_ITERATOR_IID); static nsLineBox* gDummyLines[1]; diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index afa2d22c988..e78f9042a45 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -69,7 +69,6 @@ #include "nsObjectFrame.h" -static NS_DEFINE_IID(kIDOMMouseListenerIID, NS_IDOMMOUSELISTENER_IID); class nsPluginInstanceOwner : public nsIPluginInstanceOwner, public nsIPluginTagInfo2, @@ -230,12 +229,8 @@ nsObjectFrame::~nsObjectFrame() static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); static NS_DEFINE_IID(kWidgetCID, NS_CHILD_CID); -static NS_DEFINE_IID(kIHTMLContentIID, NS_IHTMLCONTENT_IID); -static NS_DEFINE_IID(kILinkHandlerIID, NS_ILINKHANDLER_IID); static NS_DEFINE_IID(kCAppShellCID, NS_APPSHELL_CID); -static NS_DEFINE_IID(kIPluginHostIID, NS_IPLUGINHOST_IID); static NS_DEFINE_IID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); PRIntn @@ -432,7 +427,7 @@ nsObjectFrame::CreateWidget(nsIPresContext* aPresContext, // Create our view and widget nsresult result = - nsComponentManager::CreateInstance(kViewCID, nsnull, kIViewIID, + nsComponentManager::CreateInstance(kViewCID, nsnull, NS_GET_IID(nsIView), (void **)&view); if (NS_OK != result) { return result; @@ -900,8 +895,7 @@ nsObjectFrame::InstantiateWidget(nsIPresContext* aPresContext, PRInt32 height = NSTwipsToIntPixels(aMetrics.height, t2p); nsRect r = nsRect(x, y, width, height); - static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); - if((rv = nsComponentManager::CreateInstance(aWidgetCID, nsnull, kIWidgetIID, (void**)&mWidget)) != NS_OK) + if((rv = nsComponentManager::CreateInstance(aWidgetCID, nsnull, NS_GET_IID(nsIWidget), (void**)&mWidget)) != NS_OK) return rv; nsIWidget *parent; @@ -1052,7 +1046,7 @@ nsObjectFrame::HandleImage(nsIPresContext* aPresContext, // adjust kidReflowState nsIHTMLContent* hc = nsnull; - mContent->QueryInterface(kIHTMLContentIID, (void**) &hc); + mContent->QueryInterface(NS_GET_IID(nsIHTMLContent), (void**) &hc); if(hc != nsnull) { @@ -1095,7 +1089,7 @@ nsresult nsObjectFrame::GetBaseURL(nsIURI* &aURL) { nsIHTMLContent* htmlContent; - if (NS_SUCCEEDED(mContent->QueryInterface(kIHTMLContentIID, (void**)&htmlContent))) + if (NS_SUCCEEDED(mContent->QueryInterface(NS_GET_IID(nsIHTMLContent), (void**)&htmlContent))) { htmlContent->GetBaseURL(aURL); NS_RELEASE(htmlContent); @@ -1574,7 +1568,7 @@ nsresult nsPluginInstanceOwner::QueryInterface(const nsIID& aIID, return NS_OK; } - if (aIID.Equals(kIDOMMouseListenerIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMMouseListener))) { *aInstancePtrResult = (void*)(nsIDOMMouseListener*) this; AddRef(); return NS_OK; @@ -1777,7 +1771,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetURL(const char *aURL, const char *aTarge if (NS_OK == rv) { - rv = container->QueryInterface(kILinkHandlerIID, (void **)&lh); + rv = container->QueryInterface(NS_GET_IID(nsILinkHandler), (void **)&lh); if (NS_OK == rv) { diff --git a/mozilla/layout/generic/nsSpaceManager.cpp b/mozilla/layout/generic/nsSpaceManager.cpp index 7e106f6e9d4..5fe221b1235 100644 --- a/mozilla/layout/generic/nsSpaceManager.cpp +++ b/mozilla/layout/generic/nsSpaceManager.cpp @@ -31,7 +31,6 @@ #ifdef DEBUG #include "nsIFrameDebug.h" #endif -static NS_DEFINE_IID(kISpaceManagerIID, NS_ISPACEMANAGER_IID); ///////////////////////////////////////////////////////////////////////////// // BandList @@ -89,7 +88,7 @@ nsSpaceManager::~nsSpaceManager() ClearFrameInfo(); } -NS_IMPL_ISUPPORTS(nsSpaceManager, kISpaceManagerIID); +NS_IMPL_ISUPPORTS(nsSpaceManager, NS_GET_IID(nsISpaceManager)); NS_IMETHODIMP nsSpaceManager::GetFrame(nsIFrame*& aFrame) const diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 12ba77ea71f..ecf2f632c07 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -70,7 +70,6 @@ #define PR_ABS(x) ((x) < 0 ? -(x) : (x)) #endif -static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); #ifdef NS_DEBUG @@ -229,8 +228,7 @@ void nsBlinkTimer::Stop() } } -static NS_DEFINE_IID(kITimerCallbackIID, NS_ITIMERCALLBACK_IID); -NS_IMPL_ISUPPORTS(nsBlinkTimer, kITimerCallbackIID); +NS_IMPL_ISUPPORTS(nsBlinkTimer, NS_GET_IID(nsITimerCallback)); void nsBlinkTimer::AddFrame(nsIPresContext* aPresContext, nsIFrame* aFrame) { FrameData* frameData = new FrameData(aPresContext, aFrame); diff --git a/mozilla/layout/generic/nsTextTransformer.cpp b/mozilla/layout/generic/nsTextTransformer.cpp index 84eac702719..b568b5d83a2 100644 --- a/mozilla/layout/generic/nsTextTransformer.cpp +++ b/mozilla/layout/generic/nsTextTransformer.cpp @@ -80,7 +80,6 @@ nsAutoTextBuffer::GrowTo(PRInt32 aNewSize, PRBool aCopyToHead) //---------------------------------------------------------------------- static NS_DEFINE_IID(kUnicharUtilCID, NS_UNICHARUTIL_CID); -static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID); static nsICaseConversion* gCaseConv = nsnull; @@ -89,7 +88,7 @@ nsTextTransformer::Initialize() { nsresult res = NS_OK; if (!gCaseConv) { - res = nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID, + res = nsServiceManager::GetService(kUnicharUtilCID, NS_GET_IID(nsICaseConversion), (nsISupports**)&gCaseConv); NS_ASSERTION( NS_SUCCEEDED(res), "cannot get UnicharUtil"); NS_ASSERTION( gCaseConv != NULL, "cannot get UnicharUtil"); diff --git a/mozilla/layout/generic/nsViewportFrame.cpp b/mozilla/layout/generic/nsViewportFrame.cpp index 9ba9aa28396..81bfa0e0eb5 100644 --- a/mozilla/layout/generic/nsViewportFrame.cpp +++ b/mozilla/layout/generic/nsViewportFrame.cpp @@ -31,8 +31,6 @@ #include "nsIReflowCommand.h" #include "nsIPresShell.h" -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); /** * Viewport frame class. @@ -318,7 +316,7 @@ ViewportFrame::CalculateFixedContainingBlockSize(nsIPresContext* aPresC if (nsnull != kidView) { nsIScrollableView* scrollingView; - if (NS_SUCCEEDED(kidView->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(kidView->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { // Get the scrollbar dimensions float sbWidth, sbHeight; nsCOMPtr dc; diff --git a/mozilla/layout/html/base/src/nsCanvasFrame.cpp b/mozilla/layout/html/base/src/nsCanvasFrame.cpp index 21b687402d8..75554d57199 100644 --- a/mozilla/layout/html/base/src/nsCanvasFrame.cpp +++ b/mozilla/layout/html/base/src/nsCanvasFrame.cpp @@ -45,8 +45,6 @@ #include "nsIPresShell.h" // Interface IDs -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); /** * Root frame class. diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index 2fc2555bb00..96a79aba6ba 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -182,8 +182,6 @@ nsIFrameDebug::GetLogModuleInfo() //---------------------------------------------------------------------- -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); -static NS_DEFINE_IID(kIFrameSelection, NS_IFRAMESELECTION_IID); nsresult NS_NewEmptyFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) { @@ -258,7 +256,7 @@ nsresult nsFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; } static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - static NS_DEFINE_IID(kClassIID, kIFrameIID); + static NS_DEFINE_IID(kClassIID, NS_GET_IID(nsIFrame)); #ifdef DEBUG if (aIID.Equals(NS_GET_IID(nsIFrameDebug))) { @@ -833,7 +831,7 @@ nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEve { // Check for a table cell by querying to a known CellFrame interface nsITableCellLayout *cellElement; - result = (frame)->QueryInterface(nsITableCellLayout::GetIID(), (void **)&cellElement); + result = (frame)->QueryInterface(NS_GET_IID(nsITableCellLayout), (void **)&cellElement); if (NS_SUCCEEDED(result) && cellElement) { foundCell = PR_TRUE; @@ -847,7 +845,7 @@ nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEve // This will happen when starting frame is the table or child of a table, // such as a row (we were inbetween cells or in table border) nsITableLayout *tableElement; - result = (frame)->QueryInterface(nsITableLayout::GetIID(), (void **)&tableElement); + result = (frame)->QueryInterface(NS_GET_IID(nsITableLayout), (void **)&tableElement); if (NS_SUCCEEDED(result) && tableElement) { foundTable = PR_TRUE; @@ -2325,7 +2323,7 @@ nsFrame::GetSelectionController(nsIPresContext *aPresContext, nsISelectionContro while (tmp) { nsIGfxTextControlFrame2 *tcf; - if (NS_SUCCEEDED(tmp->QueryInterface(nsIGfxTextControlFrame2::GetIID(),(void**)&tcf))) + if (NS_SUCCEEDED(tmp->QueryInterface(NS_GET_IID(nsIGfxTextControlFrame2),(void**)&tcf))) { return tcf->GetSelectionContr(aSelCon); } diff --git a/mozilla/layout/html/base/src/nsFrameManager.cpp b/mozilla/layout/html/base/src/nsFrameManager.cpp index 1a8a516d5ee..bfe13d81164 100644 --- a/mozilla/layout/html/base/src/nsFrameManager.cpp +++ b/mozilla/layout/html/base/src/nsFrameManager.cpp @@ -83,7 +83,6 @@ static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); // IID's -static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); //---------------------------------------------------------------------- @@ -816,7 +815,7 @@ FrameManager::RevokePostedEvents() nsresult rv; rv = nsServiceManager::GetService(kEventQueueServiceCID, - kIEventQueueServiceIID, + NS_GET_IID(nsIEventQueueService), (nsISupports **)&eventService); if (NS_SUCCEEDED(rv)) { nsCOMPtr eventQueue; @@ -865,7 +864,7 @@ FrameManager::DequeuePostedEventFor(nsIFrame* aFrame) nsresult rv; rv = nsServiceManager::GetService(kEventQueueServiceCID, - kIEventQueueServiceIID, + NS_GET_IID(nsIEventQueueService), (nsISupports **)&eventService); if (NS_SUCCEEDED(rv)) { nsCOMPtr eventQueue; @@ -949,7 +948,7 @@ FrameManager::CantRenderReplacedElement(nsIPresContext* aPresContext, // We need to notify the style stystem, but post the notification so it // doesn't happen now rv = nsServiceManager::GetService(kEventQueueServiceCID, - kIEventQueueServiceIID, + NS_GET_IID(nsIEventQueueService), (nsISupports **)&eventService); if (NS_SUCCEEDED(rv)) { nsCOMPtr eventQueue; diff --git a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp index 34e76d5670a..8ccf87c61fa 100644 --- a/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp +++ b/mozilla/layout/html/base/src/nsGfxScrollFrame.cpp @@ -60,11 +60,7 @@ static NS_DEFINE_IID(kWidgetCID, NS_CHILD_CID); static NS_DEFINE_IID(kScrollingViewCID, NS_SCROLLING_VIEW_CID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); -static NS_DEFINE_IID(kIAnonymousContentCreatorIID, NS_IANONYMOUS_CONTENT_CREATOR_IID); -static NS_DEFINE_IID(kIScrollableFrameIID, NS_ISCROLLABLE_FRAME_IID); //---------------------------------------------------------------------- @@ -923,7 +919,7 @@ nsGfxScrollFrameInner::GetScrollableView(nsIPresContext* aPresContext) nsIFrame* frame = nsnull; mScrollAreaBox->GetFrame(&frame); frame->GetView(aPresContext, &view); - nsresult result = view->QueryInterface(kScrollViewIID, (void**)&scrollingView); + nsresult result = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView); NS_ASSERTION(NS_SUCCEEDED(result), "assertion gfx scrollframe does not contain a scrollframe"); return scrollingView; } diff --git a/mozilla/layout/html/base/src/nsHRFrame.cpp b/mozilla/layout/html/base/src/nsHRFrame.cpp index 82b2ff45ced..5e33d9c5c7c 100644 --- a/mozilla/layout/html/base/src/nsHRFrame.cpp +++ b/mozilla/layout/html/base/src/nsHRFrame.cpp @@ -38,7 +38,6 @@ #include "nsStyleUtil.h" #include "nsLayoutAtoms.h" -static NS_DEFINE_IID(kIDOMHTMLHRElementIID, NS_IDOMHTMLHRELEMENT_IID); // default hr thickness in pixels #define DEFAULT_THICKNESS 3 @@ -282,7 +281,7 @@ HRuleFrame::GetNoShade() { PRBool result = PR_FALSE; nsIDOMHTMLHRElement* hr = nsnull; - mContent->QueryInterface(kIDOMHTMLHRElementIID, (void**) &hr); + mContent->QueryInterface(NS_GET_IID(nsIDOMHTMLHRElement), (void**) &hr); if (nsnull != hr) { hr->GetNoShade(&result); NS_RELEASE(hr); diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp index b45cb5508fb..1d7c6a12590 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp @@ -49,7 +49,6 @@ #include "nsIStyleSet.h" #include "nsCOMPtr.h" -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID); NS_IMETHODIMP @@ -519,11 +518,10 @@ nsHTMLContainerFrame::CreateViewForFrame(nsIPresContext* aPresContext, // Create a view static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); - static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, - kIViewIID, + NS_GET_IID(nsIView), (void **)&view); if (NS_OK == result) { nsIViewManager* viewManager; @@ -546,7 +544,7 @@ nsHTMLContainerFrame::CreateViewForFrame(nsIPresContext* aPresContext, // Insert the view into the view hierarchy. If the parent view is a // scrolling view we need to do this differently nsIScrollableView* scrollingView; - if (NS_SUCCEEDED(parentView->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(parentView->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { scrollingView->SetScrolledView(view); } else { PRInt32 zIndex = 0; diff --git a/mozilla/layout/html/base/src/nsHTMLFrame.cpp b/mozilla/layout/html/base/src/nsHTMLFrame.cpp index 460ba4e9639..5332867867f 100644 --- a/mozilla/layout/html/base/src/nsHTMLFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLFrame.cpp @@ -45,8 +45,6 @@ #include "nsIPresShell.h" // Interface IDs -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); /** * Root frame class. diff --git a/mozilla/layout/html/base/src/nsHTMLReflowCommand.cpp b/mozilla/layout/html/base/src/nsHTMLReflowCommand.cpp index 7ec3a5454a3..74f301f8fc7 100644 --- a/mozilla/layout/html/base/src/nsHTMLReflowCommand.cpp +++ b/mozilla/layout/html/base/src/nsHTMLReflowCommand.cpp @@ -32,7 +32,6 @@ #include "nsFrame.h" #include "nsContainerFrame.h" -static NS_DEFINE_IID(kIReflowCommandIID, NS_IREFLOWCOMMAND_IID); nsresult NS_NewHTMLReflowCommand(nsIReflowCommand** aInstancePtrResult, @@ -50,7 +49,7 @@ NS_NewHTMLReflowCommand(nsIReflowCommand** aInstancePtrResult, return NS_ERROR_OUT_OF_MEMORY; } - return cmd->QueryInterface(kIReflowCommandIID, (void**)aInstancePtrResult); + return cmd->QueryInterface(NS_GET_IID(nsIReflowCommand), (void**)aInstancePtrResult); } // Construct a reflow command given a target frame, reflow command type, @@ -77,7 +76,7 @@ nsHTMLReflowCommand::~nsHTMLReflowCommand() NS_IF_RELEASE(mListName); } -NS_IMPL_ISUPPORTS(nsHTMLReflowCommand, kIReflowCommandIID); +NS_IMPL_ISUPPORTS(nsHTMLReflowCommand, NS_GET_IID(nsIReflowCommand)); nsIFrame* nsHTMLReflowCommand::GetContainingBlock(nsIFrame* aFloater) const { diff --git a/mozilla/layout/html/base/src/nsHTMLReflowState.cpp b/mozilla/layout/html/base/src/nsHTMLReflowState.cpp index 65d04d7648c..cd61f6ae513 100644 --- a/mozilla/layout/html/base/src/nsHTMLReflowState.cpp +++ b/mozilla/layout/html/base/src/nsHTMLReflowState.cpp @@ -43,7 +43,6 @@ // hack for bug 50695 #include "nsIFormManager.h" -static NS_DEFINE_IID(kIFormManagerIID, NS_IFORMMANAGER_IID); // Initialize a root reflow state with a rendering context to // use for measuring things. @@ -1315,7 +1314,7 @@ CalcQuirkContainingBlockHeight(const nsHTMLReflowState& aReflowState) if (nsLayoutAtoms::blockFrame == frameType.get()) { // special hack for bug 50695, skip form frames nsIFrame* formFrame; - if (NS_OK == rs->frame->QueryInterface(kIFormManagerIID, (void **)&formFrame)) { + if (NS_OK == rs->frame->QueryInterface(NS_GET_IID(nsIFormManager), (void **)&formFrame)) { continue; } if (!firstBlockRS) { diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index 99c5b7b431e..aa58537a089 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -70,7 +70,6 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #undef NOISY_IMAGE_LOADING #endif -static NS_DEFINE_IID(kIHTMLDocumentIID, NS_IHTMLDOCUMENT_IID); // Value's for mSuppress #define SUPPRESS_UNSET 0 @@ -713,7 +712,7 @@ nsImageFrame::GetImageMap(nsIPresContext* aPresContext) usemap.Cut(0, 1); } nsIHTMLDocument* hdoc; - nsresult rv = doc->QueryInterface(kIHTMLDocumentIID, (void**)&hdoc); + nsresult rv = doc->QueryInterface(NS_GET_IID(nsIHTMLDocument), (void**)&hdoc); NS_RELEASE(doc); if (NS_SUCCEEDED(rv)) { nsIDOMHTMLMapElement* map; diff --git a/mozilla/layout/html/base/src/nsImageMap.cpp b/mozilla/layout/html/base/src/nsImageMap.cpp index d228434367a..ebff9d18cbe 100644 --- a/mozilla/layout/html/base/src/nsImageMap.cpp +++ b/mozilla/layout/html/base/src/nsImageMap.cpp @@ -710,11 +710,6 @@ void CircleArea::GetShapeName(nsString& aResult) const //---------------------------------------------------------------------- -static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); -static NS_DEFINE_IID(kIDOMHTMLElementIID, NS_IDOMHTMLELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLAreaElementIID, NS_IDOMHTMLAREAELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLAnchorElementIID, NS_IDOMHTMLANCHORELEMENT_IID); -static NS_DEFINE_IID(kIDocumentObserverIID, NS_IDOCUMENT_OBSERVER_IID); nsImageMap::nsImageMap() { @@ -800,7 +795,7 @@ nsImageMap::Init(nsIPresShell* aPresShell, nsIFrame* aImageFrame, nsIDOMHTMLMapE mImageFrame = aImageFrame; mDomMap = aMap; - nsresult rv = aMap->QueryInterface(kIContentIID, (void**) &mMap); + nsresult rv = aMap->QueryInterface(NS_GET_IID(nsIContent), (void**) &mMap); if (NS_SUCCEEDED(rv)) { rv = mMap->GetDocument(mDocument); if (NS_SUCCEEDED(rv) && (nsnull != mDocument)) { @@ -828,7 +823,7 @@ nsImageMap::UpdateAreasForBlock(nsIContent* aParent) rv = aParent->ChildAt(i, child); if (NS_SUCCEEDED(rv)) { nsIDOMHTMLAnchorElement* area; - rv = child->QueryInterface(kIDOMHTMLAnchorElementIID, (void**) &area); + rv = child->QueryInterface(NS_GET_IID(nsIDOMHTMLAnchorElement), (void**) &area); if (NS_SUCCEEDED(rv)) { rv = AddArea(child); NS_RELEASE(area); @@ -860,7 +855,7 @@ nsImageMap::UpdateAreas() if (NS_SUCCEEDED(rv)) { // Only look at elements and not text, comments, etc. nsIDOMHTMLElement* element; - rv = child->QueryInterface(kIDOMHTMLElementIID, (void**)&element); + rv = child->QueryInterface(NS_GET_IID(nsIDOMHTMLElement), (void**)&element); if (NS_FAILED(rv)) { rv = NS_OK; continue; @@ -871,7 +866,7 @@ nsImageMap::UpdateAreas() // If so, we only look for AREA elements if (!containsBlock) { nsIDOMHTMLAreaElement* area; - rv = child->QueryInterface(kIDOMHTMLAreaElementIID, (void**) &area); + rv = child->QueryInterface(NS_GET_IID(nsIDOMHTMLAreaElement), (void**) &area); if (NS_SUCCEEDED(rv)) { containsArea = PR_TRUE; rv = AddArea(child); diff --git a/mozilla/layout/html/base/src/nsLineBox.cpp b/mozilla/layout/html/base/src/nsLineBox.cpp index 811c3e0b3ce..1d67abe4e5d 100644 --- a/mozilla/layout/html/base/src/nsLineBox.cpp +++ b/mozilla/layout/html/base/src/nsLineBox.cpp @@ -496,7 +496,6 @@ nsLineBox::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const //---------------------------------------------------------------------- -static NS_DEFINE_IID(kILineIteratorIID, NS_ILINE_ITERATOR_IID); static nsLineBox* gDummyLines[1]; diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index afa2d22c988..e78f9042a45 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -69,7 +69,6 @@ #include "nsObjectFrame.h" -static NS_DEFINE_IID(kIDOMMouseListenerIID, NS_IDOMMOUSELISTENER_IID); class nsPluginInstanceOwner : public nsIPluginInstanceOwner, public nsIPluginTagInfo2, @@ -230,12 +229,8 @@ nsObjectFrame::~nsObjectFrame() static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); static NS_DEFINE_IID(kWidgetCID, NS_CHILD_CID); -static NS_DEFINE_IID(kIHTMLContentIID, NS_IHTMLCONTENT_IID); -static NS_DEFINE_IID(kILinkHandlerIID, NS_ILINKHANDLER_IID); static NS_DEFINE_IID(kCAppShellCID, NS_APPSHELL_CID); -static NS_DEFINE_IID(kIPluginHostIID, NS_IPLUGINHOST_IID); static NS_DEFINE_IID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); PRIntn @@ -432,7 +427,7 @@ nsObjectFrame::CreateWidget(nsIPresContext* aPresContext, // Create our view and widget nsresult result = - nsComponentManager::CreateInstance(kViewCID, nsnull, kIViewIID, + nsComponentManager::CreateInstance(kViewCID, nsnull, NS_GET_IID(nsIView), (void **)&view); if (NS_OK != result) { return result; @@ -900,8 +895,7 @@ nsObjectFrame::InstantiateWidget(nsIPresContext* aPresContext, PRInt32 height = NSTwipsToIntPixels(aMetrics.height, t2p); nsRect r = nsRect(x, y, width, height); - static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); - if((rv = nsComponentManager::CreateInstance(aWidgetCID, nsnull, kIWidgetIID, (void**)&mWidget)) != NS_OK) + if((rv = nsComponentManager::CreateInstance(aWidgetCID, nsnull, NS_GET_IID(nsIWidget), (void**)&mWidget)) != NS_OK) return rv; nsIWidget *parent; @@ -1052,7 +1046,7 @@ nsObjectFrame::HandleImage(nsIPresContext* aPresContext, // adjust kidReflowState nsIHTMLContent* hc = nsnull; - mContent->QueryInterface(kIHTMLContentIID, (void**) &hc); + mContent->QueryInterface(NS_GET_IID(nsIHTMLContent), (void**) &hc); if(hc != nsnull) { @@ -1095,7 +1089,7 @@ nsresult nsObjectFrame::GetBaseURL(nsIURI* &aURL) { nsIHTMLContent* htmlContent; - if (NS_SUCCEEDED(mContent->QueryInterface(kIHTMLContentIID, (void**)&htmlContent))) + if (NS_SUCCEEDED(mContent->QueryInterface(NS_GET_IID(nsIHTMLContent), (void**)&htmlContent))) { htmlContent->GetBaseURL(aURL); NS_RELEASE(htmlContent); @@ -1574,7 +1568,7 @@ nsresult nsPluginInstanceOwner::QueryInterface(const nsIID& aIID, return NS_OK; } - if (aIID.Equals(kIDOMMouseListenerIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMMouseListener))) { *aInstancePtrResult = (void*)(nsIDOMMouseListener*) this; AddRef(); return NS_OK; @@ -1777,7 +1771,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetURL(const char *aURL, const char *aTarge if (NS_OK == rv) { - rv = container->QueryInterface(kILinkHandlerIID, (void **)&lh); + rv = container->QueryInterface(NS_GET_IID(nsILinkHandler), (void **)&lh); if (NS_OK == rv) { diff --git a/mozilla/layout/html/base/src/nsScrollFrame.cpp b/mozilla/layout/html/base/src/nsScrollFrame.cpp index 7a2891f3961..5510e934685 100644 --- a/mozilla/layout/html/base/src/nsScrollFrame.cpp +++ b/mozilla/layout/html/base/src/nsScrollFrame.cpp @@ -48,15 +48,11 @@ #undef NOISY_SECOND_REFLOW -static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID); static NS_DEFINE_IID(kWidgetCID, NS_CHILD_CID); static NS_DEFINE_IID(kScrollingViewCID, NS_SCROLLING_VIEW_CID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); -static NS_DEFINE_IID(kIScrollableFrameIID, NS_ISCROLLABLE_FRAME_IID); //---------------------------------------------------------------------- @@ -129,7 +125,7 @@ nsScrollFrame::GetClipSize( nsIPresContext* aPresContext, nsIScrollableView* scrollingView; nsIView* view; GetView(aPresContext, &view); - if (NS_SUCCEEDED(view->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { const nsIView* clip = nsnull; scrollingView->GetClipView(&clip); clip->GetDimensions(aWidth, aHeight); @@ -152,7 +148,7 @@ nsScrollFrame::GetScrollPreference(nsIPresContext* aPresContext, nsScrollPref* a nsIScrollableView* scrollingView; nsIView* view; GetView(aPresContext, &view); - if (NS_SUCCEEDED(view->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { nsScrollPreference pref; scrollingView->GetScrollPreference(pref); switch(pref) @@ -207,7 +203,7 @@ nsScrollFrame::GetScrollPosition(nsIPresContext* aPresContext, nscoord &aX, nsco nsIScrollableView* scrollingView; nsIView* view; GetView(aPresContext, &view); - nsresult rv = view->QueryInterface(kScrollViewIID, (void**)&scrollingView); + nsresult rv = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView); NS_ASSERTION(NS_SUCCEEDED(rv), "No scrolling view"); return scrollingView->GetScrollPosition(aX, aY); } @@ -219,7 +215,7 @@ nsScrollFrame::ScrollTo(nsIPresContext* aPresContext, nscoord aX, nscoord aY, PR nsIView* view; GetView(aPresContext, &view); - nsresult rv = view->QueryInterface(kScrollViewIID, (void**)&scrollingView); + nsresult rv = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView); NS_ASSERTION(NS_SUCCEEDED(rv), "No scrolling view"); return scrollingView->ScrollTo(aX, aY, aFlags); @@ -238,7 +234,7 @@ nsScrollFrame::GetScrollbarVisibility(nsIPresContext* aPresContext, nsIScrollableView* scrollingView; nsIView* view; GetView(aPresContext, &view); - if (NS_SUCCEEDED(view->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { scrollingView->GetScrollbarVisibility(aVerticalVisible, aHorizontalVisible); } else { aVerticalVisible = PR_FALSE; @@ -266,7 +262,7 @@ nsScrollFrame::QueryInterface(REFNSIID aIID, void** aInstancePtr) *aInstancePtr = NULL; - if (aIID.Equals(kIScrollableFrameIID)) { + if (aIID.Equals(NS_GET_IID(nsIScrollableFrame))) { *aInstancePtr = (void*)(nsIScrollableFrame*) this; return NS_OK; } @@ -358,7 +354,7 @@ nsScrollFrame::DidReflow(nsIPresContext* aPresContext, nsIScrollableView* scrollingView; nsIView* view; GetView(aPresContext, &view); - if (NS_SUCCEEDED(view->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { scrollingView->ComputeScrollOffsets(PR_TRUE); } } @@ -409,7 +405,7 @@ nsScrollFrame::CreateScrollingView(nsIPresContext* aPresContext) // Create the scrolling view nsresult rv = nsComponentManager::CreateInstance(kScrollingViewCID, nsnull, - kIViewIID, + NS_GET_IID(nsIView), (void **)&view); if (NS_OK == rv) { @@ -448,7 +444,7 @@ nsScrollFrame::CreateScrollingView(nsIPresContext* aPresContext) // Get the nsIScrollableView interface nsIScrollableView* scrollingView; - view->QueryInterface(kScrollViewIID, (void**)&scrollingView); + view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView); // Have the scrolling view create its internal widgets scrollingView->CreateScrollControls(); @@ -592,7 +588,7 @@ nsScrollFrame::CalculateScrollAreaSize(nsIPresContext* aPresContext, nsIScrollableView* scrollingView; nsIView* view; GetView(aPresContext, &view); - if (NS_SUCCEEDED(view->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { PRBool unused; scrollingView->GetScrollbarVisibility(aRoomForVerticalScrollbar, &unused); } @@ -1007,7 +1003,7 @@ nsScrollFrame::SaveState(nsIPresContext* aPresContext, nsIScrollableView* scrollingView; nsIView* view; GetView(aPresContext, &view); - if (NS_SUCCEEDED(view->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { scrollingView->GetScrollPosition(x,y); } nsIView* child = nsnull; @@ -1094,7 +1090,7 @@ nsScrollFrame::RestoreState(nsIPresContext* aPresContext, nsIScrollableView* scrollingView; nsIView* view; GetView(aPresContext, &view); - if (NS_SUCCEEDED(view->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { nsIView* child = nsnull; nsRect childRect(0,0,0,0); diff --git a/mozilla/layout/html/base/src/nsScrollPortFrame.cpp b/mozilla/layout/html/base/src/nsScrollPortFrame.cpp index 2cca4f46a97..5a5f0f61534 100644 --- a/mozilla/layout/html/base/src/nsScrollPortFrame.cpp +++ b/mozilla/layout/html/base/src/nsScrollPortFrame.cpp @@ -26,7 +26,6 @@ #include "nsScrollPortFrame.h" #include "nsIFormControlFrame.h" -static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); nsresult NS_NewScrollPortFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) @@ -53,7 +52,7 @@ nsScrollPortFrame::NeedsClipWidget() nsIFormControlFrame* fcFrame; while (parentFrame) { - if ((NS_SUCCEEDED(parentFrame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame)))) { + if ((NS_SUCCEEDED(parentFrame->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame)))) { return(PR_FALSE); } parentFrame->GetParent(&parentFrame); diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 12ba77ea71f..ecf2f632c07 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -70,7 +70,6 @@ #define PR_ABS(x) ((x) < 0 ? -(x) : (x)) #endif -static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); #ifdef NS_DEBUG @@ -229,8 +228,7 @@ void nsBlinkTimer::Stop() } } -static NS_DEFINE_IID(kITimerCallbackIID, NS_ITIMERCALLBACK_IID); -NS_IMPL_ISUPPORTS(nsBlinkTimer, kITimerCallbackIID); +NS_IMPL_ISUPPORTS(nsBlinkTimer, NS_GET_IID(nsITimerCallback)); void nsBlinkTimer::AddFrame(nsIPresContext* aPresContext, nsIFrame* aFrame) { FrameData* frameData = new FrameData(aPresContext, aFrame); diff --git a/mozilla/layout/html/base/src/nsTextTransformer.cpp b/mozilla/layout/html/base/src/nsTextTransformer.cpp index 84eac702719..b568b5d83a2 100644 --- a/mozilla/layout/html/base/src/nsTextTransformer.cpp +++ b/mozilla/layout/html/base/src/nsTextTransformer.cpp @@ -80,7 +80,6 @@ nsAutoTextBuffer::GrowTo(PRInt32 aNewSize, PRBool aCopyToHead) //---------------------------------------------------------------------- static NS_DEFINE_IID(kUnicharUtilCID, NS_UNICHARUTIL_CID); -static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID); static nsICaseConversion* gCaseConv = nsnull; @@ -89,7 +88,7 @@ nsTextTransformer::Initialize() { nsresult res = NS_OK; if (!gCaseConv) { - res = nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID, + res = nsServiceManager::GetService(kUnicharUtilCID, NS_GET_IID(nsICaseConversion), (nsISupports**)&gCaseConv); NS_ASSERTION( NS_SUCCEEDED(res), "cannot get UnicharUtil"); NS_ASSERTION( gCaseConv != NULL, "cannot get UnicharUtil"); diff --git a/mozilla/layout/html/base/src/nsViewportFrame.cpp b/mozilla/layout/html/base/src/nsViewportFrame.cpp index 9ba9aa28396..81bfa0e0eb5 100644 --- a/mozilla/layout/html/base/src/nsViewportFrame.cpp +++ b/mozilla/layout/html/base/src/nsViewportFrame.cpp @@ -31,8 +31,6 @@ #include "nsIReflowCommand.h" #include "nsIPresShell.h" -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); /** * Viewport frame class. @@ -318,7 +316,7 @@ ViewportFrame::CalculateFixedContainingBlockSize(nsIPresContext* aPresC if (nsnull != kidView) { nsIScrollableView* scrollingView; - if (NS_SUCCEEDED(kidView->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(kidView->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { // Get the scrollbar dimensions float sbWidth, sbHeight; nsCOMPtr dc; diff --git a/mozilla/layout/html/content/src/nsAttributeContent.cpp b/mozilla/layout/html/content/src/nsAttributeContent.cpp index 7e0494566b8..7b696ee5e9e 100644 --- a/mozilla/layout/html/content/src/nsAttributeContent.cpp +++ b/mozilla/layout/html/content/src/nsAttributeContent.cpp @@ -64,13 +64,7 @@ class nsIDOMText; // XXX share all id's in this dir -NS_DEFINE_IID(kIDOMCharacterDataIID, NS_IDOMCHARACTERDATA_IID); -static NS_DEFINE_IID(kIPrivateDOMEventIID, NS_IPRIVATEDOMEVENT_IID); -static NS_DEFINE_IID(kIEnumeratorIID, NS_IENUMERATOR_IID); -static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID); -static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID); -static NS_DEFINE_IID(kITextContentIID, NS_ITEXT_CONTENT_IID); class nsAttributeContent : public nsITextContent, public nsIAttributeContent { @@ -544,7 +538,7 @@ nsAttributeContent::CloneContent(PRBool aCloneText, nsITextContent** aReturn) if (nsnull == it) { return NS_ERROR_OUT_OF_MEMORY; } - result = it->QueryInterface(kITextContentIID, (void**) aReturn); + result = it->QueryInterface(NS_GET_IID(nsITextContent), (void**) aReturn); if (NS_FAILED(result)) { return result; } diff --git a/mozilla/layout/html/content/src/nsHTMLInputElement.cpp b/mozilla/layout/html/content/src/nsHTMLInputElement.cpp index 96d7ce58c7c..e5741abf8a0 100644 --- a/mozilla/layout/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLInputElement.cpp @@ -64,7 +64,6 @@ // XXX align=left, hspace, vspace, border? other nav4 attrs -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID); #ifdef ENDER_LITE @@ -896,7 +895,7 @@ nsHTMLInputElement::HandleDOMEvent(nsIPresContext* aPresContext, nsIFrame* formFrame = nsnull; if (formControlFrame && - NS_SUCCEEDED(formControlFrame->QueryInterface(kIFrameIID, + NS_SUCCEEDED(formControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void **)&formFrame)) && formFrame) { const nsStyleUserInterface* uiStyle; diff --git a/mozilla/layout/html/content/src/nsHTMLOptGroupElement.cpp b/mozilla/layout/html/content/src/nsHTMLOptGroupElement.cpp index 34abce09670..954ad3bc576 100644 --- a/mozilla/layout/html/content/src/nsHTMLOptGroupElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLOptGroupElement.cpp @@ -34,7 +34,6 @@ #include "nsIFormControlFrame.h" -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); class nsHTMLOptGroupElement : public nsGenericHTMLContainerElement, public nsIDOMHTMLOptGroupElement @@ -159,7 +158,7 @@ nsHTMLOptGroupElement::HandleDOMEvent(nsIPresContext* aPresContext, nsIFrame* formFrame = nsnull; if (formControlFrame && - NS_SUCCEEDED(formControlFrame->QueryInterface(kIFrameIID, + NS_SUCCEEDED(formControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void **)&formFrame)) && formFrame) { diff --git a/mozilla/layout/html/content/src/nsHTMLSelectElement.cpp b/mozilla/layout/html/content/src/nsHTMLSelectElement.cpp index 1e57e9095e3..e658170cf87 100644 --- a/mozilla/layout/html/content/src/nsHTMLSelectElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLSelectElement.cpp @@ -58,7 +58,6 @@ #include "nsIFormControlFrame.h" #include "nsIFrame.h" -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); class nsHTMLSelectElement; @@ -1432,7 +1431,7 @@ nsHTMLSelectElement::HandleDOMEvent(nsIPresContext* aPresContext, nsIFrame* formFrame = nsnull; if (formControlFrame && - NS_SUCCEEDED(formControlFrame->QueryInterface(kIFrameIID, + NS_SUCCEEDED(formControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void **)&formFrame)) && formFrame) { diff --git a/mozilla/layout/html/content/src/nsHTMLTextAreaElement.cpp b/mozilla/layout/html/content/src/nsHTMLTextAreaElement.cpp index fd507fc5cc2..93852683c70 100644 --- a/mozilla/layout/html/content/src/nsHTMLTextAreaElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLTextAreaElement.cpp @@ -52,7 +52,6 @@ #include "nsIPrivateDOMEvent.h" static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); class nsHTMLTextAreaElement : public nsGenericHTMLContainerFormElement, @@ -552,7 +551,7 @@ nsHTMLTextAreaElement::HandleDOMEvent(nsIPresContext* aPresContext, nsIFrame* formFrame = nsnull; if (formControlFrame && - NS_SUCCEEDED(formControlFrame->QueryInterface(kIFrameIID, + NS_SUCCEEDED(formControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void **)&formFrame)) && formFrame) { const nsStyleUserInterface* uiStyle; diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp index 3de33d3c6c4..c7fd9b1bb03 100644 --- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp @@ -56,7 +56,6 @@ static NS_DEFINE_IID(kIFramesetFrameIID, NS_IFRAMESETFRAME_IID); static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); /******************************************************************************* * nsFramesetDrag @@ -233,7 +232,6 @@ nsresult nsHTMLFramesetFrame::QueryInterface(const nsIID& aIID, } static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); NS_IMETHODIMP nsHTMLFramesetFrame::Init(nsIPresContext* aPresContext, @@ -262,7 +260,7 @@ nsHTMLFramesetFrame::Init(nsIPresContext* aPresContext, // create the view. a view is needed since it needs to be a mouse grabber nsIView* view; - nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, kIViewIID, + nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, NS_GET_IID(nsIView), (void **)&view); nsCOMPtr presShell; aPresContext->GetShell(getter_AddRefs(presShell)); @@ -1619,7 +1617,7 @@ nsHTMLFramesetBorderFrame::Paint(nsIPresContext* aPresContext, nscolor sdwColor = NS_RGB(128,128,128); nsILookAndFeel * lookAndFeel; - if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, (void**)&lookAndFeel)) { + if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, NS_GET_IID(nsILookAndFeel), (void**)&lookAndFeel)) { lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp index a41d8a68513..b4ac938982c 100644 --- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp @@ -119,23 +119,7 @@ const PRBool kBlockByDefault=PR_FALSE; const PRBool kBlockByDefault=PR_TRUE; #endif -static NS_DEFINE_IID(kIDOMHTMLTitleElementIID, NS_IDOMHTMLTITLEELEMENT_IID); -static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID); -static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); -static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID); -static NS_DEFINE_IID(kIDOMCommentIID, NS_IDOMCOMMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLFormElementIID, NS_IDOMHTMLFORMELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLMapElementIID, NS_IDOMHTMLMAPELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLTextAreaElementIID, NS_IDOMHTMLTEXTAREAELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLOptionElementIID, NS_IDOMHTMLOPTIONELEMENT_IID); -static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); -static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID); -static NS_DEFINE_IID(kIScrollableViewIID, NS_ISCROLLABLEVIEW_IID); -static NS_DEFINE_IID(kIHTMLDocumentIID, NS_IHTMLDOCUMENT_IID); -static NS_DEFINE_IID(kIHTMLContentContainerIID, NS_IHTMLCONTENTCONTAINER_IID); -static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID); -static NS_DEFINE_IID(kIStyleSheetLinkingElementIID, NS_ISTYLESHEETLINKINGELEMENT_IID); static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); @@ -725,7 +709,7 @@ static void SetForm(nsIHTMLContent* aContent, nsIDOMHTMLFormElement* aForm) { nsIFormControl* formControl = nsnull; - nsresult result = aContent->QueryInterface(kIFormControlIID, (void**)&formControl); + nsresult result = aContent->QueryInterface(NS_GET_IID(nsIFormControl), (void**)&formControl); if ((NS_OK == result) && formControl) { formControl->SetForm(aForm); NS_RELEASE(formControl); @@ -1168,7 +1152,7 @@ MakeContentObject(nsHTMLTag aNodeType, // If the text area has some content, set it if (aContent && (aContent->Length() > 0)) { nsIDOMHTMLTextAreaElement* taElem; - rv = (*aResult)->QueryInterface(kIDOMHTMLTextAreaElementIID, (void **)&taElem); + rv = (*aResult)->QueryInterface(NS_GET_IID(nsIDOMHTMLTextAreaElement), (void **)&taElem); if ((NS_OK == rv) && taElem) { taElem->SetDefaultValue(*aContent); NS_RELEASE(taElem); @@ -1675,7 +1659,7 @@ SinkContext::DemoteContainer(const nsIParserNode& aNode) // After the form control is removed from it's container, restore // it's form. nsIFormControl* childFormControl = nsnull; - result = child->QueryInterface(kIFormControlIID, (void**)&childFormControl); + result = child->QueryInterface(NS_GET_IID(nsIFormControl), (void**)&childFormControl); if (NS_SUCCEEDED(result)) { // It is a form control, so get it's form and cache it. nsIDOMHTMLFormElement* formElem = nsnull; @@ -1848,7 +1832,7 @@ SinkContext::AddComment(const nsIParserNode& aNode) result = NS_NewCommentNode(&comment); if (NS_OK == result) { - result = comment->QueryInterface(kIDOMCommentIID, + result = comment->QueryInterface(NS_GET_IID(nsIDOMComment), (void **)&domComment); if (NS_OK == result) { domComment->AppendData(aNode.GetText()); @@ -2187,7 +2171,7 @@ NS_NewHTMLContentSink(nsIHTMLContentSink** aResult, delete it; return rv; } - return it->QueryInterface(kIHTMLContentSinkIID, (void **)aResult); + return it->QueryInterface(NS_GET_IID(nsIHTMLContentSink), (void **)aResult); } // Note: operator new zeros our memory @@ -2296,7 +2280,7 @@ HTMLContentSink::Init(nsIDocument* aDoc, mDocument = aDoc; NS_ADDREF(aDoc); aDoc->AddObserver(this); - aDoc->QueryInterface(kIHTMLDocumentIID, (void**)&mHTMLDocument); + aDoc->QueryInterface(NS_GET_IID(nsIHTMLDocument), (void**)&mHTMLDocument); rv = mDocument->GetNodeInfoManager(mNodeInfoManager); NS_ENSURE_SUCCESS(rv, rv); mDocumentURI = aURL; @@ -2327,7 +2311,7 @@ HTMLContentSink::Init(nsIDocument* aDoc, prefs->GetIntPref("content.maxtextrun", &mMaxTextRun); nsIHTMLContentContainer* htmlContainer = nsnull; - if (NS_SUCCEEDED(aDoc->QueryInterface(kIHTMLContentContainerIID, (void**)&htmlContainer))) { + if (NS_SUCCEEDED(aDoc->QueryInterface(NS_GET_IID(nsIHTMLContentContainer), (void**)&htmlContainer))) { htmlContainer->GetCSSLoader(mCSSLoader); NS_RELEASE(htmlContainer); } @@ -2699,7 +2683,7 @@ HTMLContentSink::SetTitle(const nsString& aValue) rv = NS_NewTextNode(&text); if (NS_OK == rv) { nsIDOMText* tc; - rv = text->QueryInterface(kIDOMTextIID, (void**)&tc); + rv = text->QueryInterface(NS_GET_IID(nsIDOMText), (void**)&tc); if (NS_OK == rv) { tc->SetData(*mTitle); NS_RELEASE(tc); @@ -2908,7 +2892,7 @@ HTMLContentSink::OpenForm(const nsIParserNode& aNode) result = NS_NewHTMLFormElement(&content, nodeInfo); if (NS_SUCCEEDED(result) && content) { - content->QueryInterface(kIDOMHTMLFormElementIID, (void**)&mCurrentForm); + content->QueryInterface(NS_GET_IID(nsIDOMHTMLFormElement), (void**)&mCurrentForm); NS_RELEASE(content); } @@ -2921,7 +2905,7 @@ HTMLContentSink::OpenForm(const nsIParserNode& aNode) content = mCurrentContext->GetCurrentContainer(); if (nsnull != content) { - result = content->QueryInterface(kIDOMHTMLFormElementIID, + result = content->QueryInterface(NS_GET_IID(nsIDOMHTMLFormElement), (void**)&mCurrentForm); NS_RELEASE(content); } @@ -3576,7 +3560,7 @@ HTMLContentSink::StartLayout() vm->GetRootView(rootView); if (nsnull != rootView) { nsIScrollableView* sview = nsnull; - rootView->QueryInterface(kIScrollableViewIID, (void**) &sview); + rootView->QueryInterface(NS_GET_IID(nsIScrollableView), (void**) &sview); if (nsnull != sview) { if (mFrameset) mOriginalScrollPreference = nsScrollPreference_kNeverScroll; @@ -4221,7 +4205,7 @@ HTMLContentSink::ProcessMAPTag(const nsIParserNode& aNode, NS_IF_RELEASE(mCurrentMap); nsIDOMHTMLMapElement* domMap; - rv = aContent->QueryInterface(kIDOMHTMLMapElementIID, (void**)&domMap); + rv = aContent->QueryInterface(NS_GET_IID(nsIDOMHTMLMapElement), (void**)&domMap); if (NS_FAILED(rv)) { return rv; } @@ -4945,7 +4929,7 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode) rv = NS_NewTextNode(&text); if (NS_OK == rv) { nsIDOMText* tc; - rv = text->QueryInterface(kIDOMTextIID, (void**)&tc); + rv = text->QueryInterface(NS_GET_IID(nsIDOMText), (void**)&tc); if (NS_OK == rv) { tc->SetData(script); NS_RELEASE(tc); @@ -5153,7 +5137,7 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode) rv = NS_NewTextNode(&text); if (NS_OK == rv) { nsIDOMText* tc; - rv = text->QueryInterface(kIDOMTextIID, (void**)&tc); + rv = text->QueryInterface(NS_GET_IID(nsIDOMText), (void**)&tc); if (NS_OK == rv) { tc->SetData(content); NS_RELEASE(tc); diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp index 835c82bdba9..19aa39e549f 100644 --- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp @@ -614,13 +614,12 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand, } } - static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); if (needsParser) { rv = nsComponentManager::CreateInstance(kCParserCID, nsnull, - kCParserIID, + NS_GET_IID(nsIParser), (void **)&mParser); if (NS_FAILED(rv)) { return rv; } } @@ -2098,12 +2097,11 @@ nsHTMLDocument::OpenCommon(nsIURI* aSourceURL) result = Reset(channel, group); if (NS_FAILED(result)) return result; if (NS_OK == result) { - static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); result = nsComponentManager::CreateInstance(kCParserCID, nsnull, - kCParserIID, + NS_GET_IID(nsIParser), (void **)&mParser); mIsWriting = 1; diff --git a/mozilla/layout/html/document/src/nsHTMLFragmentContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLFragmentContentSink.cpp index 040d3e05e43..058e82b5da6 100644 --- a/mozilla/layout/html/document/src/nsHTMLFragmentContentSink.cpp +++ b/mozilla/layout/html/document/src/nsHTMLFragmentContentSink.cpp @@ -51,11 +51,6 @@ // at some pointe really soon! // -static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID); -static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID); -static NS_DEFINE_IID(kIHTMLFragmentContentSinkIID, NS_IHTML_FRAGMENT_CONTENT_SINK_IID); -static NS_DEFINE_IID(kIDOMCommentIID, NS_IDOMCOMMENT_IID); -static NS_DEFINE_IID(kIDOMDocumentFragmentIID, NS_IDOMDOCUMENTFRAGMENT_IID); static NS_DEFINE_CID(kParserServiceCID, NS_PARSERSERVICE_CID); class nsHTMLFragmentContentSink : public nsIHTMLFragmentContentSink { @@ -163,7 +158,7 @@ NS_NewHTMLFragmentContentSink(nsIHTMLFragmentContentSink** aResult) return rv; } - return it->QueryInterface(kIHTMLFragmentContentSinkIID, (void **)aResult); + return it->QueryInterface(NS_GET_IID(nsIHTMLFragmentContentSink), (void **)aResult); } nsHTMLFragmentContentSink::nsHTMLFragmentContentSink() @@ -217,13 +212,13 @@ nsHTMLFragmentContentSink::QueryInterface(REFNSIID aIID, void** aInstancePtr) *aInstancePtr = NULL; static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kIHTMLFragmentContentSinkIID)) { + if (aIID.Equals(NS_GET_IID(nsIHTMLFragmentContentSink))) { nsIHTMLFragmentContentSink* tmp = this; *aInstancePtr = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIHTMLContentSinkIID)) { + if (aIID.Equals(NS_GET_IID(nsIHTMLContentSink))) { nsIHTMLContentSink* tmp = this; *aInstancePtr = (void*) tmp; NS_ADDREF_THIS(); @@ -261,7 +256,7 @@ nsHTMLFragmentContentSink::WillBuildModel(void) result = NS_NewDocumentFragment(&frag, nsnull); if (NS_SUCCEEDED(result)) { - result = frag->QueryInterface(kIContentIID, (void**)&mRoot); + result = frag->QueryInterface(NS_GET_IID(nsIContent), (void**)&mRoot); NS_RELEASE(frag); } } @@ -651,7 +646,7 @@ nsHTMLFragmentContentSink::AddComment(const nsIParserNode& aNode) result = NS_NewCommentNode(&comment); if (NS_OK == result) { - result = comment->QueryInterface(kIDOMCommentIID, + result = comment->QueryInterface(NS_GET_IID(nsIDOMComment), (void **)&domComment); if (NS_OK == result) { domComment->AppendData(aNode.GetText()); @@ -698,7 +693,7 @@ NS_IMETHODIMP nsHTMLFragmentContentSink::GetFragment(nsIDOMDocumentFragment** aFragment) { if (nsnull != mRoot) { - return mRoot->QueryInterface(kIDOMDocumentFragmentIID, (void**)aFragment); + return mRoot->QueryInterface(NS_GET_IID(nsIDOMDocumentFragment), (void**)aFragment); } else { *aFragment = nsnull; @@ -812,9 +807,8 @@ nsHTMLFragmentContentSink::FlushText() if (NS_OK == rv) { // Set the text in the text node - static NS_DEFINE_IID(kITextContentIID, NS_ITEXT_CONTENT_IID); nsITextContent* text = nsnull; - content->QueryInterface(kITextContentIID, (void**) &text); + content->QueryInterface(NS_GET_IID(nsITextContent), (void**) &text); text->SetText(mText, mTextLength, PR_FALSE); NS_RELEASE(text); diff --git a/mozilla/layout/html/document/src/nsImageDocument.cpp b/mozilla/layout/html/document/src/nsImageDocument.cpp index 8b54e5654d2..49a9f9d4449 100644 --- a/mozilla/layout/html/document/src/nsImageDocument.cpp +++ b/mozilla/layout/html/document/src/nsImageDocument.cpp @@ -52,8 +52,6 @@ // 3. override the save-as methods so that we don't write out our synthetic // html -static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID); -static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID); class nsImageDocument : public nsHTMLDocument { public: @@ -112,7 +110,7 @@ ImageListener::~ImageListener() NS_IF_RELEASE(mNextStream); } -NS_IMPL_THREADSAFE_ISUPPORTS(ImageListener, kIStreamListenerIID) +NS_IMPL_THREADSAFE_ISUPPORTS(ImageListener, NS_GET_IID(nsIStreamListener)) NS_IMETHODIMP ImageListener::OnStartRequest(nsIChannel* channel, nsISupports *ctxt) @@ -161,7 +159,7 @@ NS_NewImageDocument(nsIDocument** aInstancePtrResult) { nsImageDocument* doc = new nsImageDocument(); if(doc) - return doc->QueryInterface(kIDocumentIID, (void**) aInstancePtrResult); + return doc->QueryInterface(NS_GET_IID(nsIDocument), (void**) aInstancePtrResult); return NS_ERROR_OUT_OF_MEMORY; } @@ -382,7 +380,7 @@ nsresult nsImageDocument::UpdateTitle( void ) // - get the URL interface, get the extension, convert to upper-case // Unless the Imagerequest or Image can tell us the type this is the best we can do. nsIURL *pURL=nsnull; - if(NS_SUCCEEDED(mDocumentURL->QueryInterface(nsIURL::GetIID(),(void **)&pURL))){ + if(NS_SUCCEEDED(mDocumentURL->QueryInterface(NS_GET_IID(nsIURL),(void **)&pURL))){ char *pExtension=nsnull; pURL->GetFileExtension(&pExtension); if(pExtension){ diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp index 90acd8de6ec..4d2f99a8475 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp @@ -61,7 +61,6 @@ #include "nsIScrollableFrame.h" #include "nsIScrollableView.h" -static NS_DEFINE_IID(kScrollableViewIID, NS_ISCROLLABLEVIEW_IID); #include "nsIXULDocument.h" // Temporary fix for Bug 36558 @@ -69,14 +68,6 @@ static NS_DEFINE_IID(kScrollableViewIID, NS_ISCROLLABLEVIEW_IID); #include "nsIFontMetrics.h" #endif -static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); -static NS_DEFINE_IID(kIComboboxControlFrameIID, NS_ICOMBOBOXCONTROLFRAME_IID); -static NS_DEFINE_IID(kIListControlFrameIID, NS_ILISTCONTROLFRAME_IID); -static NS_DEFINE_IID(kIDOMMouseListenerIID, NS_IDOMMOUSELISTENER_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); -static NS_DEFINE_IID(kIAnonymousContentCreatorIID, NS_IANONYMOUS_CONTENT_CREATOR_IID); -static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID); -static NS_DEFINE_IID(kIPrivateDOMEventIID, NS_IPRIVATEDOMEVENT_IID); #define FIX_FOR_BUG_53259 @@ -283,13 +274,13 @@ nsComboboxControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kIComboboxControlFrameIID)) { + if (aIID.Equals(NS_GET_IID(nsIComboboxControlFrame))) { *aInstancePtr = (void*) ((nsIComboboxControlFrame*) this); return NS_OK; - } else if (aIID.Equals(kIFormControlFrameIID)) { + } else if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { *aInstancePtr = (void*) ((nsIFormControlFrame*) this); return NS_OK; - } else if (aIID.Equals(kIAnonymousContentCreatorIID)) { + } else if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) { *aInstancePtr = (void*)(nsIAnonymousContentCreator*) this; return NS_OK; } else if (aIID.Equals(NS_GET_IID(nsISelectControlFrame))) { @@ -357,7 +348,7 @@ nsComboboxControlFrame::MakeSureSomethingIsSelected(nsIPresContext* aPresContext REFLOW_DEBUG_MSG("CBX::MakeSureSomethingIsSelected\n"); nsIFormControlFrame* fcFrame = nsnull; - nsresult rv = mDropdownFrame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + nsresult rv = mDropdownFrame->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if (NS_SUCCEEDED(rv) && fcFrame) { // If nothing selected, and there are options, default selection to item 0 rv = mListControlFrame->GetSelectedIndex(&mSelectedIndex); @@ -413,7 +404,7 @@ nsComboboxControlFrame::Reset(nsIPresContext* aPresContext) // Reset the dropdown list to its original state nsIFormControlFrame* fcFrame = nsnull; - nsresult result = mDropdownFrame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + nsresult result = mDropdownFrame->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if ((NS_OK == result) && (nsnull != fcFrame)) { fcFrame->Reset(aPresContext); } @@ -538,7 +529,7 @@ nsComboboxControlFrame::ShowPopup(PRBool aShowPopup) mDropdownFrame->GetRect(rect); viewManager->ResizeView(view, rect.width, rect.height); nsIScrollableView* scrollingView; - if (NS_SUCCEEDED(view->QueryInterface(kScrollableViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { scrollingView->ComputeScrollOffsets(PR_TRUE); } viewManager->SetViewVisibility(view, nsViewVisibility_kShow); @@ -557,7 +548,7 @@ nsComboboxControlFrame::ShowList(nsIPresContext* aPresContext, PRBool aShowList) // Get parent view nsIFrame * listFrame; - if (NS_OK == mListControlFrame->QueryInterface(kIFrameIID, (void **)&listFrame)) { + if (NS_OK == mListControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void **)&listFrame)) { nsIView * view = nsnull; listFrame->GetView(aPresContext, &view); NS_ASSERTION(view != nsnull, "nsComboboxControlFrame view is null"); @@ -645,7 +636,7 @@ void nsComboboxControlFrame::SetChildFrameSize(nsIFrame* aFrame, nscoord aWidth, nscoord aHeight) { nsIFormControlFrame* fcFrame = nsnull; - nsresult result = aFrame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + nsresult result = aFrame->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if (NS_SUCCEEDED(result) && (nsnull != fcFrame)) { fcFrame->SetSuggestedSize(aWidth, aHeight); } @@ -1341,7 +1332,7 @@ nsComboboxControlFrame::Reflow(nsIPresContext* aPresContext, return rv; } else { nsIFrame * plainLstFrame; - if (NS_SUCCEEDED(mListControlFrame->QueryInterface(kIFrameIID, (void**)&plainLstFrame))) { + if (NS_SUCCEEDED(mListControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void**)&plainLstFrame))) { nsIFrame * frame; plainLstFrame->FirstChild(aPresContext, nsnull, &frame); nsIScrollableFrame * scrollFrame; @@ -1703,7 +1694,7 @@ nsComboboxControlFrame::GetNamesValues(PRInt32 aMaxNumValues, PRInt32& aNumValue nsString* aValues, nsString* aNames) { nsIFormControlFrame* fcFrame = nsnull; - nsresult result = mDropdownFrame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + nsresult result = mDropdownFrame->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if ((NS_SUCCEEDED(result)) && (nsnull != fcFrame)) { return fcFrame->GetNamesValues(aMaxNumValues, aNumValues, aValues, aNames); } @@ -1795,7 +1786,7 @@ nsComboboxControlFrame::SetDropDown(nsIFrame* aDropDownFrame) { mDropdownFrame = aDropDownFrame; - if (NS_OK != mDropdownFrame->QueryInterface(kIListControlFrameIID, (void**)&mListControlFrame)) { + if (NS_OK != mDropdownFrame->QueryInterface(NS_GET_IID(nsIListControlFrame), (void**)&mListControlFrame)) { return NS_ERROR_FAILURE; } @@ -2089,7 +2080,7 @@ NS_IMETHODIMP nsComboboxControlFrame::SetProperty(nsIPresContext* aPresContext, nsIAtom* aName, const nsAReadableString& aValue) { nsIFormControlFrame* fcFrame = nsnull; - nsresult result = mDropdownFrame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + nsresult result = mDropdownFrame->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if ((NS_SUCCEEDED(result)) && (nsnull != fcFrame)) { return fcFrame->SetProperty(aPresContext, aName, aValue); } @@ -2100,7 +2091,7 @@ NS_IMETHODIMP nsComboboxControlFrame::GetProperty(nsIAtom* aName, nsAWritableString& aValue) { nsIFormControlFrame* fcFrame = nsnull; - nsresult result = mDropdownFrame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + nsresult result = mDropdownFrame->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if ((NS_SUCCEEDED(result)) && (nsnull != fcFrame)) { return fcFrame->GetProperty(aName, aValue); } @@ -2320,7 +2311,7 @@ nsComboboxControlFrame::Destroy(nsIPresContext* aPresContext) nsCOMPtr widget; // Get parent view nsIFrame * listFrame; - if (NS_OK == mListControlFrame->QueryInterface(kIFrameIID, (void **)&listFrame)) { + if (NS_OK == mListControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void **)&listFrame)) { nsIView * view = nsnull; listFrame->GetView(aPresContext, &view); NS_ASSERTION(view != nsnull, "nsComboboxControlFrame view is null"); @@ -2375,7 +2366,7 @@ nsComboboxControlFrame::SetInitialChildList(nsIPresContext* aPresContext, nsIFrame * child = aChildList; while (child != nsnull) { nsIFormControlFrame* fcFrame = nsnull; - rv = child->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + rv = child->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if (NS_FAILED(rv) && fcFrame == nsnull) { mDisplayFrame = child; } else if (fcFrame != nsnull) { diff --git a/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp b/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp index aa54c03bc0a..e60fb79664d 100644 --- a/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp @@ -46,8 +46,6 @@ #include "nsCOMPtr.h" static NS_DEFINE_IID(kLegendFrameCID, NS_LEGEND_FRAME_CID); -static NS_DEFINE_IID(kIDOMHTMLFieldSetElementIID, NS_IDOMHTMLFIELDSETELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLLegendElementIID, NS_IDOMHTMLLEGENDELEMENT_IID); class nsLegendFrame; diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp index 64f47def9c1..ad7cd74c4e2 100644 --- a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp @@ -59,10 +59,6 @@ #include "nsIScriptGlobalObject.h" -static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); -static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID); -static NS_DEFINE_IID(kIDOMMouseListenerIID, NS_IDOMMOUSELISTENER_IID); -static NS_DEFINE_IID(kIAnonymousContentCreatorIID, NS_IANONYMOUS_CONTENT_CREATOR_IID); nsresult NS_NewFileControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) @@ -96,7 +92,7 @@ nsFileControlFrame::~nsFileControlFrame() // remove ourself as a listener of the button (bug 40533) if (mBrowse) { nsCOMPtr reciever(do_QueryInterface(mBrowse)); - reciever->RemoveEventListenerByIID(this, kIDOMMouseListenerIID); + reciever->RemoveEventListenerByIID(this, NS_GET_IID(nsIDOMMouseListener)); } if (mCachedState) { @@ -146,7 +142,7 @@ nsFileControlFrame::CreateAnonymousContent(nsIPresContext* aPresContext, // register as an event listener of the button to open file dialog on mouse click nsCOMPtr reciever(do_QueryInterface(mBrowse)); - reciever->AddEventListenerByIID(this, kIDOMMouseListenerIID); + reciever->AddEventListenerByIID(this, NS_GET_IID(nsIDOMMouseListener)); } nsString value; @@ -164,13 +160,13 @@ nsFileControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) NS_PRECONDITION(0 != aInstancePtr, "null ptr"); if (NULL == aInstancePtr) { return NS_ERROR_NULL_POINTER; - } else if (aIID.Equals(kIAnonymousContentCreatorIID)) { + } else if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) { *aInstancePtr = (void*)(nsIAnonymousContentCreator*) this; return NS_OK; - } else if (aIID.Equals(kIFormControlFrameIID)) { + } else if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { *aInstancePtr = (void*) ((nsIFormControlFrame*) this); return NS_OK; - } else if (aIID.Equals(kIDOMMouseListenerIID)) { + } else if (aIID.Equals(NS_GET_IID(nsIDOMMouseListener))) { *aInstancePtr = (void*)(nsIDOMMouseListener*) this; return NS_OK; } else if (aIID.Equals(NS_GET_IID(nsIStatefulFrame))) { diff --git a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp index 2a0badaeb36..00dd715ab88 100644 --- a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp @@ -93,13 +93,8 @@ const PRInt32 kSizeNotSet = -1; -static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); -static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); -static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); -static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID); nsFormControlFrame::nsFormControlFrame() : nsLeafFrame() @@ -142,7 +137,7 @@ nsFormControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) if (NULL == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kIFormControlFrameIID)) { + if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { *aInstancePtr = (void*) ((nsIFormControlFrame*) this); return NS_OK; } @@ -623,8 +618,7 @@ nsFormControlFrame::ScrollIntoView(nsIPresContext* aPresContext) const nsIID& nsFormControlFrame::GetIID() { - static NS_DEFINE_IID(kButtonIID, NS_IBUTTON_IID); - return kButtonIID; + return NS_GET_IID(nsIButton); } const nsIID& @@ -676,7 +670,7 @@ nsFormControlFrame::GetType(PRInt32* aType) const nsresult result = NS_FORM_NOTOK; if (mContent) { nsIFormControl* formControl = nsnull; - result = mContent->QueryInterface(kIFormControlIID, (void**)&formControl); + result = mContent->QueryInterface(NS_GET_IID(nsIFormControl), (void**)&formControl); if ((NS_OK == result) && formControl) { result = formControl->GetType(aType); NS_RELEASE(formControl); @@ -830,7 +824,7 @@ nsresult nsFormControlFrame::GetDefaultCheckState(PRBool *aState) { nsresult res = NS_OK; nsIDOMHTMLInputElement* inputElement; - if (NS_OK == mContent->QueryInterface(kIDOMHTMLInputElementIID, (void**)&inputElement)) { + if (NS_OK == mContent->QueryInterface(NS_GET_IID(nsIDOMHTMLInputElement), (void**)&inputElement)) { res = inputElement->GetDefaultChecked(aState); NS_RELEASE(inputElement); } @@ -842,7 +836,7 @@ nsFormControlFrame::SetDefaultCheckState(PRBool aState) { nsresult res = NS_OK; nsIDOMHTMLInputElement* inputElement; - if (NS_OK == mContent->QueryInterface(kIDOMHTMLInputElementIID, (void**)&inputElement)) { + if (NS_OK == mContent->QueryInterface(NS_GET_IID(nsIDOMHTMLInputElement), (void**)&inputElement)) { res = inputElement->SetDefaultChecked(aState); NS_RELEASE(inputElement); } @@ -854,7 +848,7 @@ nsFormControlFrame::GetCurrentCheckState(PRBool *aState) { nsresult res = NS_OK; nsIDOMHTMLInputElement* inputElement; - if (NS_OK == mContent->QueryInterface(kIDOMHTMLInputElementIID, (void**)&inputElement)) { + if (NS_OK == mContent->QueryInterface(NS_GET_IID(nsIDOMHTMLInputElement), (void**)&inputElement)) { res = inputElement->GetChecked(aState); NS_RELEASE(inputElement); } @@ -866,7 +860,7 @@ nsFormControlFrame::SetCurrentCheckState(PRBool aState) { nsresult res = NS_OK; nsIDOMHTMLInputElement* inputElement; - if (NS_OK == mContent->QueryInterface(kIDOMHTMLInputElementIID, (void**)&inputElement)) { + if (NS_OK == mContent->QueryInterface(NS_GET_IID(nsIDOMHTMLInputElement), (void**)&inputElement)) { inputElement->SetChecked(aState); NS_RELEASE(inputElement); } diff --git a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp index 46c558ab644..d0bd9d6eb3e 100644 --- a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp @@ -68,14 +68,8 @@ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); // done I10N -static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); -static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); -static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); -static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID); // For figuring out the "WRAP" property #define kTextControl_Wrap_Soft "SOFT" @@ -454,7 +448,7 @@ nsFormControlHelper::CalculateSize (nsIPresContext* aPresContext, const nsStylePosition* pos; nsIFrame* iFrame = nsnull; - nsresult rv = aFrame->QueryInterface(kIFrameIID, (void**)&iFrame); + nsresult rv = aFrame->QueryInterface(NS_GET_IID(nsIFrame), (void**)&iFrame); if ((NS_OK == rv) && (nsnull != iFrame)) { iFrame->GetStyleData(eStyleStruct_Position, (const nsStyleStruct*&)pos); if (eStyleUnit_Percent == pos->mWidth.GetUnit()) { @@ -863,7 +857,7 @@ nsFormControlHelper::GetInputElementValue(nsIContent* aContent, nsString* aText, { nsresult result = NS_OK; nsIDOMHTMLInputElement* inputElem = nsnull; - result = aContent->QueryInterface(kIDOMHTMLInputElementIID, (void**)&inputElem); + result = aContent->QueryInterface(NS_GET_IID(nsIDOMHTMLInputElement), (void**)&inputElem); if ((NS_OK == result) && inputElem) { if (PR_TRUE == aInitialValue) { result = inputElem->GetDefaultValue(*aText); diff --git a/mozilla/layout/html/forms/src/nsFormFrame.cpp b/mozilla/layout/html/forms/src/nsFormFrame.cpp index fb8ab7f45e1..fb49f5da3c2 100644 --- a/mozilla/layout/html/forms/src/nsFormFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFormFrame.cpp @@ -117,7 +117,6 @@ static NS_DEFINE_CID(kPlatformCharsetCID, NS_PLATFORMCHARSET_CID); //---------------------------------------------------------------------- -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); static NS_DEFINE_CID(kFormProcessorCID, NS_FORMPROCESSOR_CID); NS_IMETHODIMP @@ -475,7 +474,7 @@ void nsFormFrame::AddFormControlFrame(nsIPresContext* aPresContext, nsIFormContr nsCOMPtr newContent; nsIFrame* newFrame = nsnull; - nsresult rv = aFrame.QueryInterface(kIFrameIID, (void **)&newFrame); + nsresult rv = aFrame.QueryInterface(NS_GET_IID(nsIFrame), (void **)&newFrame); if (NS_SUCCEEDED(rv) && newFrame) { rv = newFrame->GetContent(getter_AddRefs(newContent)); if (NS_SUCCEEDED(rv) && newContent) { @@ -486,7 +485,7 @@ void nsFormFrame::AddFormControlFrame(nsIPresContext* aPresContext, nsIFormContr if (thisControl) { nsCOMPtr thisContent; nsIFrame* thisFrame = nsnull; - rv = thisControl->QueryInterface(kIFrameIID, (void **)&thisFrame); + rv = thisControl->QueryInterface(NS_GET_IID(nsIFrame), (void **)&thisFrame); if (NS_SUCCEEDED(rv) && thisFrame) { rv = thisFrame->GetContent(getter_AddRefs(thisContent)); if (NS_SUCCEEDED(rv) && thisContent) { @@ -680,7 +679,7 @@ nsFormFrame::ProcessValue(nsIFormProcessor& aFormProcessor, nsIFormControlFrame* nsresult res = NS_OK; nsIFrame *frame = nsnull; - res = aFrameControl->QueryInterface(kIFrameIID, (void **)&frame); + res = aFrameControl->QueryInterface(NS_GET_IID(nsIFrame), (void **)&frame); if (NS_SUCCEEDED(res) && (frame)) { nsCOMPtr content; nsresult rv = frame->GetContent(getter_AddRefs(content)); diff --git a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp index a7ba72dabc9..93d4d73b070 100644 --- a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp @@ -178,8 +178,7 @@ nsGfxButtonControlFrame::IsBrowse(PRInt32 type) const nsIID& nsGfxButtonControlFrame::GetIID() { - static NS_DEFINE_IID(kButtonIID, NS_IBUTTON_IID); - return kButtonIID; + return NS_GET_IID(nsIButton); } const nsIID& diff --git a/mozilla/layout/html/forms/src/nsGfxListControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxListControlFrame.cpp index 24ec9e6b6d5..bd9b14f8f7a 100644 --- a/mozilla/layout/html/forms/src/nsGfxListControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxListControlFrame.cpp @@ -73,12 +73,6 @@ #define STATUS_CHECK_RETURN_MACRO() {if (!mTracker) return NS_ERROR_FAILURE;} -static NS_DEFINE_IID(kIDOMMouseListenerIID, NS_IDOMMOUSELISTENER_IID); -static NS_DEFINE_IID(kIDOMMouseMotionListenerIID, NS_IDOMMOUSEMOTIONLISTENER_IID); -static NS_DEFINE_IID(kIDOMKeyListenerIID, NS_IDOMKEYLISTENER_IID); -static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); -static NS_DEFINE_IID(kIPrivateDOMEventIID, NS_IPRIVATEDOMEVENT_IID); //static NS_DEFINE_IID(kBlockFrameCID, NS_BLOCK_FRAME_CID); // Constants diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp index 60d93404111..a8b5591a685 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp @@ -107,23 +107,14 @@ #include "nsLayoutAtoms.h" -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); -static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); static NS_DEFINE_IID(kTextCID, NS_TEXTFIELD_CID); -static NS_DEFINE_IID(kITextWidgetIID, NS_ITEXTWIDGET_IID); -static NS_DEFINE_IID(kIDOMHTMLTextAreaElementIID, NS_IDOMHTMLTEXTAREAELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kWebShellCID, NS_WEB_SHELL_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); static NS_DEFINE_IID(kCViewCID, NS_VIEW_CID); static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID); -static NS_DEFINE_IID(kIDocumentLoaderObserverIID, NS_IDOCUMENTLOADEROBSERVER_IID); -static NS_DEFINE_IID(kIDocumentObserverIID, NS_IDOCUMENT_OBSERVER_IID); static NS_DEFINE_CID(kHTMLEditorCID, NS_HTMLEDITOR_CID); -static NS_DEFINE_IID(kIDocumentViewerIID, NS_IDOCUMENT_VIEWER_IID); #define EMPTY_DOCUMENT "about:blank" #define PASSWORD_REPLACEMENT_CHAR '*' @@ -990,7 +981,7 @@ nsGfxTextControlFrame::RedispatchMouseEventToSubDoc(nsIPresContext* aPresContext if (viewer) { nsCOMPtr docv; - viewer->QueryInterface(kIDocumentViewerIID, getter_AddRefs(docv)); + viewer->QueryInterface(NS_GET_IID(nsIDocumentViewer), getter_AddRefs(docv)); if (docv) { nsCOMPtr cx; @@ -1150,7 +1141,7 @@ nsGfxTextControlFrame::GetText(nsString* aText, PRBool aInitialValue) else { nsIDOMHTMLTextAreaElement* textArea = nsnull; - result = mContent->QueryInterface(kIDOMHTMLTextAreaElementIID, (void**)&textArea); + result = mContent->QueryInterface(NS_GET_IID(nsIDOMHTMLTextAreaElement), (void**)&textArea); if ((NS_OK == result) && textArea) { if (PR_TRUE == aInitialValue) { result = textArea->GetDefaultValue(*aText); @@ -1941,7 +1932,7 @@ nsGfxTextControlFrame::CreateDocShell(nsIPresContext* aPresContext, // create, init, set the parent of the view nsIView* view; - rv = nsComponentManager::CreateInstance(kCViewCID, nsnull, kIViewIID, + rv = nsComponentManager::CreateInstance(kCViewCID, nsnull, NS_GET_IID(nsIView), (void **)&view); if (NS_FAILED(rv)) { return rv; } @@ -3310,7 +3301,7 @@ nsGfxTextControlFrame::InitializeTextControl(nsIPresShell *aPresShell, nsIDOMDoc { nsIFrame *sFrame = nsnull; - result = scrollFrame->QueryInterface(kIFrameIID, (void **)&sFrame); + result = scrollFrame->QueryInterface(NS_GET_IID(nsIFrame), (void **)&sFrame); if (NS_FAILED(result) && result != NS_NOINTERFACE) return result; @@ -3759,7 +3750,7 @@ nsEnderDocumentObserver::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kIDocumentObserverIID)) { + if (aIID.Equals(NS_GET_IID(nsIDocumentObserver))) { *aInstancePtr = (void*) ((nsIStreamObserver*)this); AddRef(); return NS_OK; @@ -3971,8 +3962,7 @@ nsEnderEventListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) return NS_OK; } - static NS_DEFINE_IID(kIDOMEventListenerIID, NS_IDOMEVENTLISTENER_IID); - if (aIID.Equals(kIDOMEventListenerIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMEventListener))) { nsIDOMKeyListener *kl = (nsIDOMKeyListener*)this; nsIDOMEventListener *temp = kl; *aInstancePtr = (void*)temp; @@ -4834,7 +4824,7 @@ EnderTempObserver::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kIDocumentLoaderObserverIID)) { + if (aIID.Equals(NS_GET_IID(nsIDocumentLoaderObserver))) { *aInstancePtr = (void*) ((nsIDocumentLoaderObserver*)this); AddRef(); return NS_OK; diff --git a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp index cfd6f7f615b..5fadcbc33b1 100644 --- a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp @@ -55,10 +55,7 @@ #include "nsIFrameManager.h" #include "nsINameSpaceManager.h" -static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); -static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); nsresult NS_NewHTMLButtonControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) @@ -161,7 +158,7 @@ nsHTMLButtonControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) if (NULL == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kIFormControlFrameIID)) { + if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { *aInstancePtr = (void*) ((nsIFormControlFrame*) this); return NS_OK; } @@ -226,7 +223,7 @@ nsHTMLButtonControlFrame::GetType(PRInt32* aType) const nsresult result = NS_FORM_NOTOK; if (mContent) { nsIFormControl* formControl = nsnull; - result = mContent->QueryInterface(kIFormControlIID, (void**)&formControl); + result = mContent->QueryInterface(NS_GET_IID(nsIFormControl), (void**)&formControl); if ((NS_OK == result) && formControl) { result = formControl->GetType(aType); NS_RELEASE(formControl); @@ -595,7 +592,7 @@ nsHTMLButtonControlFrame::Reflow(nsIPresContext* aPresContext, nsIView* view; GetView(&view); if (!view) { - nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, kIViewIID, (void **)&view); + nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, NS_GET_IID(nsIView), (void **)&view); nsCOMPtr presShell; aPresContext->GetShell(getter_AddRefs(presShell)); nsCOMPtr viewMan; diff --git a/mozilla/layout/html/forms/src/nsImageControlFrame.cpp b/mozilla/layout/html/forms/src/nsImageControlFrame.cpp index 83da4c09cd2..93822596e3d 100644 --- a/mozilla/layout/html/forms/src/nsImageControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsImageControlFrame.cpp @@ -54,9 +54,7 @@ eMouseUp }; */ -static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); #define nsImageControlFrameSuper nsImageFrame class nsImageControlFrame : public nsImageControlFrameSuper, @@ -197,7 +195,7 @@ nsImageControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) if (NULL == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kIFormControlFrameIID)) { + if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) { *aInstancePtr = (void*) ((nsIFormControlFrame*) this); return NS_OK; } @@ -231,7 +229,7 @@ nsImageControlFrame::Init(nsIPresContext* aPresContext, nsIView* view; GetView(aPresContext, &view); if (!view) { - nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, kIViewIID, (void **)&view); + nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, NS_GET_IID(nsIView), (void **)&view); nsCOMPtr presShell; aPresContext->GetShell(getter_AddRefs(presShell)); nsCOMPtr viewMan; diff --git a/mozilla/layout/html/forms/src/nsLabelFrame.cpp b/mozilla/layout/html/forms/src/nsLabelFrame.cpp index 8d0c4a98ddf..97be07115c5 100644 --- a/mozilla/layout/html/forms/src/nsLabelFrame.cpp +++ b/mozilla/layout/html/forms/src/nsLabelFrame.cpp @@ -54,13 +54,7 @@ #include "nsIDOMHTMLAnchorElement.h" #include "nsFormControlFrame.h" -static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); -static NS_DEFINE_IID(kIFormControlFrameIID, NS_IFORMCONTROLFRAME_IID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); -static NS_DEFINE_IID(kIHTMLDocumentIID, NS_IHTMLDOCUMENT_IID); -static NS_DEFINE_IID(kIFormIID, NS_IFORM_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); class nsLabelFrame : public nsHTMLContainerFrame { @@ -202,7 +196,7 @@ nsLabelFrame::HandleEvent(nsIPresContext* aPresContext, return NS_OK; } else { nsIFrame * frame; - if (NS_OK == mControlFrame->QueryInterface(kIFrameIID, (void**)&frame)) { + if (NS_OK == mControlFrame->QueryInterface(NS_GET_IID(nsIFrame), (void**)&frame)) { if ( nsFormFrame::GetDisabled(frame)) { return NS_OK; } @@ -377,7 +371,7 @@ nsLabelFrame::FindForControl(nsIFormControlFrame*& aResultFrame) shell->GetPrimaryFrameFor(controlContent, &frame); if (nsnull != frame) { nsIFormControlFrame* fcFrame = nsnull; - nsresult result = frame->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + nsresult result = frame->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if ((NS_OK == result) && (nsnull != fcFrame)) { aResultFrame = fcFrame; NS_RELEASE(fcFrame); @@ -398,7 +392,7 @@ nsLabelFrame::FindFirstControl(nsIPresContext* aPresContext, aParentFrame->FirstChild(aPresContext, nsnull, &child); while (nsnull != child) { nsIFormControlFrame* fcFrame = nsnull; - nsresult result = child->QueryInterface(kIFormControlFrameIID, (void**)&fcFrame); + nsresult result = child->QueryInterface(NS_GET_IID(nsIFormControlFrame), (void**)&fcFrame); if ((NS_OK == result) && fcFrame) { PRInt32 type; fcFrame->GetType(&type); @@ -512,7 +506,7 @@ nsLabelFrame::Init(nsIPresContext* aPresContext, nsIView* view; GetView(aPresContext, &view); if (!view) { - nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, kIViewIID, + nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, NS_GET_IID(nsIView), (void **)&view); nsCOMPtr presShell; aPresContext->GetShell(getter_AddRefs(presShell)); diff --git a/mozilla/layout/html/forms/src/nsLegendFrame.cpp b/mozilla/layout/html/forms/src/nsLegendFrame.cpp index 115192eb0c7..4c287c63516 100644 --- a/mozilla/layout/html/forms/src/nsLegendFrame.cpp +++ b/mozilla/layout/html/forms/src/nsLegendFrame.cpp @@ -41,7 +41,6 @@ #include "nsFormControlFrame.h" static NS_DEFINE_IID(kLegendFrameCID, NS_LEGEND_FRAME_CID); -static NS_DEFINE_IID(kIDOMHTMLLegendElementIID, NS_IDOMHTMLLEGENDELEMENT_IID); nsresult NS_NewLegendFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.cpp b/mozilla/layout/html/forms/src/nsListControlFrame.cpp index 0f9b93694a5..c3d52fa1e26 100644 --- a/mozilla/layout/html/forms/src/nsListControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsListControlFrame.cpp @@ -62,12 +62,6 @@ #include "nsISelectElement.h" #include "nsIPrivateDOMEvent.h" -static NS_DEFINE_IID(kIDOMMouseListenerIID, NS_IDOMMOUSELISTENER_IID); -static NS_DEFINE_IID(kIDOMMouseMotionListenerIID, NS_IDOMMOUSEMOTIONLISTENER_IID); -static NS_DEFINE_IID(kIDOMKeyListenerIID, NS_IDOMKEYLISTENER_IID); -static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); -static NS_DEFINE_IID(kIPrivateDOMEventIID, NS_IPRIVATEDOMEVENT_IID); //static NS_DEFINE_IID(kBlockFrameCID, NS_BLOCK_FRAME_CID); // Constants @@ -317,15 +311,15 @@ nsListControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) *aInstancePtr = (void *)((nsISelectControlFrame*)this); return NS_OK; } - if (aIID.Equals(kIDOMMouseListenerIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMMouseListener))) { *aInstancePtr = (void*)(nsIDOMMouseListener*) this; return NS_OK; } - if (aIID.Equals(kIDOMMouseMotionListenerIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMMouseMotionListener))) { *aInstancePtr = (void*)(nsIDOMMouseMotionListener*) this; return NS_OK; } - if (aIID.Equals(kIDOMKeyListenerIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMKeyListener))) { *aInstancePtr = (void*)(nsIDOMKeyListener*) this; return NS_OK; } diff --git a/mozilla/layout/html/style/src/nsCSSDeclaration.cpp b/mozilla/layout/html/style/src/nsCSSDeclaration.cpp index 395e9339987..36cdf24ddf7 100644 --- a/mozilla/layout/html/style/src/nsCSSDeclaration.cpp +++ b/mozilla/layout/html/style/src/nsCSSDeclaration.cpp @@ -48,7 +48,6 @@ static NS_DEFINE_IID(kCSSPageSID, NS_CSS_PAGE_SID); static NS_DEFINE_IID(kCSSContentSID, NS_CSS_CONTENT_SID); static NS_DEFINE_IID(kCSSUserInterfaceSID, NS_CSS_USER_INTERFACE_SID); static NS_DEFINE_IID(kCSSAuralSID, NS_CSS_AURAL_SID); -static NS_DEFINE_IID(kICSSDeclarationIID, NS_ICSS_DECLARATION_IID); #define CSS_IF_DELETE(ptr) if (nsnull != ptr) { delete ptr; ptr = nsnull; } @@ -1138,7 +1137,7 @@ CSSDeclarationImpl::~CSSDeclarationImpl(void) #endif } -NS_IMPL_ISUPPORTS(CSSDeclarationImpl, kICSSDeclarationIID); +NS_IMPL_ISUPPORTS(CSSDeclarationImpl, NS_GET_IID(nsICSSDeclaration)); #define CSS_IF_GET_ELSE(sid,ptr,result) \ if (sid.Equals(kCSS##ptr##SID)) { *result = m##ptr; } else @@ -4678,7 +4677,7 @@ CSSDeclarationImpl::Clone(nsICSSDeclaration*& aClone) const { CSSDeclarationImpl* clone = new CSSDeclarationImpl(*this); if (clone) { - return clone->QueryInterface(kICSSDeclarationIID, (void**)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSDeclaration), (void**)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -4699,7 +4698,7 @@ NS_HTML nsresult return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSDeclarationIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSDeclaration), (void **) aInstancePtrResult); } diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index 234edda4d0a..52bf771ac11 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -273,22 +273,8 @@ NS_NewResizerFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame); #endif -//static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); static NS_DEFINE_IID(kIStyleFrameConstructionIID, NS_ISTYLE_FRAME_CONSTRUCTION_IID); -static NS_DEFINE_IID(kIHTMLTableCellElementIID, NS_IHTMLTABLECELLELEMENT_IID); -static NS_DEFINE_IID(kIXMLDocumentIID, NS_IXMLDOCUMENT_IID); -static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID); -static NS_DEFINE_IID(kIDOMHTMLSelectElementIID, NS_IDOMHTMLSELECTELEMENT_IID); -static NS_DEFINE_IID(kIComboboxControlFrameIID, NS_ICOMBOBOXCONTROLFRAME_IID); -static NS_DEFINE_IID(kIRadioControlFrameIID, NS_IRADIOCONTROLFRAME_IID); -static NS_DEFINE_IID(kIListControlFrameIID, NS_ILISTCONTROLFRAME_IID); -static NS_DEFINE_IID(kIDOMHTMLImageElementIID, NS_IDOMHTMLIMAGEELEMENT_IID); -static NS_DEFINE_IID(kIDOMCharacterDataIID, NS_IDOMCHARACTERDATA_IID); -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); -static NS_DEFINE_IID(kIFormControlIID, NS_IFORMCONTROL_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); -static NS_DEFINE_IID(kIScrollableFrameIID, NS_ISCROLLABLE_FRAME_IID); //---------------------------------------------------------------------- // @@ -1358,7 +1344,7 @@ nsCSSFrameConstructor::CreateGeneratedFrameFor(nsIPresContext* aPresContex NS_NewTextNode(&textContent); if (textContent) { // Set the text - textContent->QueryInterface(kIDOMCharacterDataIID, (void**)&domData); + textContent->QueryInterface(NS_GET_IID(nsIDOMCharacterData), (void**)&domData); domData->SetData(contentString); NS_RELEASE(domData); @@ -1719,7 +1705,7 @@ GetNonScrollFrame(nsIFrame& aFrameIn, if (nsLayoutAtoms::scrollFrame == frameType) { // get the scrolled frame if there is a scroll frame nsIScrollableFrame* scrollable = nsnull; - nsresult rv = aFrameIn.QueryInterface(kIScrollableFrameIID, (void **)&scrollable); + nsresult rv = aFrameIn.QueryInterface(NS_GET_IID(nsIScrollableFrame), (void **)&scrollable); if (NS_SUCCEEDED(rv) && (scrollable)) { scrollable->GetScrolledFrame(nsnull, aNonScrollFrame); } @@ -3765,7 +3751,7 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell* aPresShell, nsIView* view = nsnull; newScrollableFrame->GetView(aPresContext, &view); nsIScrollableView* scrollableView; - view->QueryInterface(kScrollViewIID, (void**)&scrollableView); + view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollableView); viewManager->SetRootScrollableView(scrollableView); parentFrame = newScrollableFrame; @@ -3942,7 +3928,7 @@ nsCSSFrameConstructor::ConstructRadioControlFrame(nsIPresShell* aPresShel aPresContext->ResolvePseudoStyleContextFor(aContent, nsHTMLAtoms::radioPseudo, aStyleContext, PR_FALSE, getter_AddRefs(radioStyle)); nsIRadioControlFrame* radio = nsnull; - if (aNewFrame != nsnull && NS_SUCCEEDED(aNewFrame->QueryInterface(kIRadioControlFrameIID, (void**)&radio))) { + if (aNewFrame != nsnull && NS_SUCCEEDED(aNewFrame->QueryInterface(NS_GET_IID(nsIRadioControlFrame), (void**)&radio))) { radio->SetRadioButtonFaceStyleContext(radioStyle); NS_RELEASE(radio); } @@ -4113,7 +4099,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsIPresShell* aPresShell, /////////////////////////////////////////////////////////////////// // Construct a frame-based list box nsIComboboxControlFrame* comboBox = nsnull; - if (NS_SUCCEEDED(comboboxFrame->QueryInterface(kIComboboxControlFrameIID, (void**)&comboBox))) { + if (NS_SUCCEEDED(comboboxFrame->QueryInterface(NS_GET_IID(nsIComboboxControlFrame), (void**)&comboBox))) { comboBox->SetFrameConstructor(this); nsIFrame * listFrame; @@ -4121,7 +4107,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsIPresShell* aPresShell, // Notify the listbox that it is being used as a dropdown list. nsIListControlFrame * listControlFrame; - if (NS_SUCCEEDED(listFrame->QueryInterface(kIListControlFrameIID, (void**)&listControlFrame))) { + if (NS_SUCCEEDED(listFrame->QueryInterface(NS_GET_IID(nsIListControlFrame), (void**)&listControlFrame))) { listControlFrame->SetComboboxFrame(comboboxFrame); } // Notify combobox that it should use the listbox as it's popup @@ -4287,7 +4273,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsIPresShell* aPresShell, // Combobox - Old Native Implementation /////////////////////////////////////////////////////////////////// nsIComboboxControlFrame* comboBox = nsnull; - if (NS_SUCCEEDED(comboboxFrame->QueryInterface(kIComboboxControlFrameIID, (void**)&comboBox))) { + if (NS_SUCCEEDED(comboboxFrame->QueryInterface(NS_GET_IID(nsIComboboxControlFrame), (void**)&comboBox))) { comboBox->SetFrameConstructor(this); // Create a listbox @@ -4296,7 +4282,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsIPresShell* aPresShell, // Notify the listbox that it is being used as a dropdown list. nsIListControlFrame * listControlFrame; - if (NS_SUCCEEDED(listFrame->QueryInterface(kIListControlFrameIID, (void**)&listControlFrame))) { + if (NS_SUCCEEDED(listFrame->QueryInterface(NS_GET_IID(nsIListControlFrame), (void**)&listControlFrame))) { listControlFrame->SetComboboxFrame(comboboxFrame); } // Notify combobox that it should use the listbox as it's popup @@ -4342,7 +4328,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsIPresShell* aPresShell, //listView->SetViewFlags(NS_VIEW_PUBLIC_FLAG_DONT_CHECK_CHILDREN); nsIFrame* frame = nsnull; - if (NS_SUCCEEDED(comboboxFrame->QueryInterface(kIFrameIID, (void**)&frame))) { + if (NS_SUCCEEDED(comboboxFrame->QueryInterface(NS_GET_IID(nsIFrame), (void**)&frame))) { nsFrameItems childItems; // Create display and button frames from the combobox'es anonymous content @@ -7769,7 +7755,7 @@ nsCSSFrameConstructor::GetFrameFor(nsIPresShell* aPresShell, // If the primary frame supports IScrollableFrame, then get the scrolled frame. // That's the frame that gets the reflow command nsIScrollableFrame *pScrollableFrame = nsnull; - if (NS_SUCCEEDED( frame->QueryInterface(nsIScrollableFrame::GetIID(), + if (NS_SUCCEEDED( frame->QueryInterface(NS_GET_IID(nsIScrollableFrame), (void **)&pScrollableFrame) )) { pScrollableFrame->GetScrolledFrame( aPresContext, frame ); @@ -10434,7 +10420,7 @@ nsCSSFrameConstructor::ConstructAlternateFrame(nsIPresShell* aPresShell, // Set the content's text nsIDOMCharacterData* domData; - altTextContent->QueryInterface(kIDOMCharacterDataIID, (void**)&domData); + altTextContent->QueryInterface(NS_GET_IID(nsIDOMCharacterData), (void**)&domData); domData->SetData(altText); NS_RELEASE(domData); diff --git a/mozilla/layout/html/style/src/nsCSSLoader.cpp b/mozilla/layout/html/style/src/nsCSSLoader.cpp index 6d414b39e37..088a8e9e383 100644 --- a/mozilla/layout/html/style/src/nsCSSLoader.cpp +++ b/mozilla/layout/html/style/src/nsCSSLoader.cpp @@ -59,12 +59,6 @@ #include -static NS_DEFINE_IID(kICSSLoaderIID, NS_ICSS_LOADER_IID); -//static NS_DEFINE_IID(kICSSParserIID, NS_ICSS_PARSER_IID); -//static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID); -//static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); -static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID); -static NS_DEFINE_IID(kIStyleSheetLinkingElementIID, NS_ISTYLESHEETLINKINGELEMENT_IID); static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); class CSSLoaderImpl; @@ -486,7 +480,7 @@ CSSLoaderImpl::~CSSLoaderImpl(void) mSheetMapTable.Enumerate(DeleteSheetMap); } -NS_IMPL_ISUPPORTS(CSSLoaderImpl, kICSSLoaderIID) +NS_IMPL_ISUPPORTS(CSSLoaderImpl, NS_GET_IID(nsICSSLoader)) NS_IMETHODIMP CSSLoaderImpl::Init(nsIDocument* aDocument) @@ -1073,13 +1067,13 @@ CSSLoaderImpl::InsertSheetInDoc(nsICSSStyleSheet* aSheet, PRInt32 aDocIndex, if (nsnull != aElement) { nsIDOMNode* domNode = nsnull; - if (NS_SUCCEEDED(aElement->QueryInterface(kIDOMNodeIID, (void**)&domNode))) { + if (NS_SUCCEEDED(aElement->QueryInterface(NS_GET_IID(nsIDOMNode), (void**)&domNode))) { aSheet->SetOwningNode(domNode); NS_RELEASE(domNode); } nsIStyleSheetLinkingElement* element; - if (NS_SUCCEEDED(aElement->QueryInterface(kIStyleSheetLinkingElementIID, + if (NS_SUCCEEDED(aElement->QueryInterface(NS_GET_IID(nsIStyleSheetLinkingElement), (void**)&element))) { element->SetStyleSheet(aSheet); NS_RELEASE(element); @@ -1557,7 +1551,7 @@ nsresult NS_NewCSSLoader(nsIDocument* aDocument, nsICSSLoader** aLoader) } it->Init(aDocument); - return it->QueryInterface(kICSSLoaderIID, (void **)aLoader); + return it->QueryInterface(NS_GET_IID(nsICSSLoader), (void **)aLoader); } nsresult NS_NewCSSLoader(nsICSSLoader** aLoader) @@ -1568,7 +1562,7 @@ nsresult NS_NewCSSLoader(nsICSSLoader** aLoader) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSLoaderIID, (void **)aLoader); + return it->QueryInterface(NS_GET_IID(nsICSSLoader), (void **)aLoader); } diff --git a/mozilla/layout/html/style/src/nsCSSParser.cpp b/mozilla/layout/html/style/src/nsCSSParser.cpp index 1a648874ad6..eb06faba4a0 100644 --- a/mozilla/layout/html/style/src/nsCSSParser.cpp +++ b/mozilla/layout/html/style/src/nsCSSParser.cpp @@ -52,9 +52,6 @@ // - rework aErrorCode stuff: switch over to nsresult // verify ! is followed by important and nothing else -static NS_DEFINE_IID(kICSSParserIID, NS_ICSS_PARSER_IID); -static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); #define ENABLE_OUTLINE // un-comment this to enable the outline properties (bug 9816) // XXX un-commenting for temporary fix for nsbeta3+ Bug 48973 @@ -315,7 +312,7 @@ NS_NewCSSParser(nsICSSParser** aInstancePtrResult) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSParserIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSParser), (void **) aInstancePtrResult); } #ifdef CSS_REPORT_PARSE_ERRORS @@ -386,7 +383,7 @@ CSSParserImpl::Init(nsICSSStyleSheet* aSheet) return NS_OK; } -NS_IMPL_ISUPPORTS(CSSParserImpl,kICSSParserIID) +NS_IMPL_ISUPPORTS(CSSParserImpl,NS_GET_IID(nsICSSParser)) CSSParserImpl::~CSSParserImpl() { diff --git a/mozilla/layout/html/style/src/nsCSSRendering.cpp b/mozilla/layout/html/style/src/nsCSSRendering.cpp index 4d53761bb34..88af1ae670c 100644 --- a/mozilla/layout/html/style/src/nsCSSRendering.cpp +++ b/mozilla/layout/html/style/src/nsCSSRendering.cpp @@ -41,7 +41,6 @@ #include "nsIDocument.h" #include "nsIScrollableFrame.h" -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); #define BORDER_FULL 0 //entire side #define BORDER_INSIDE 1 //inside half diff --git a/mozilla/layout/html/style/src/nsCSSRules.cpp b/mozilla/layout/html/style/src/nsCSSRules.cpp index 32e544aa3e7..abb6e732b27 100644 --- a/mozilla/layout/html/style/src/nsCSSRules.cpp +++ b/mozilla/layout/html/style/src/nsCSSRules.cpp @@ -38,12 +38,6 @@ #include "nsISizeOfHandler.h" static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); -static NS_DEFINE_IID(kICSSRuleIID, NS_ICSS_RULE_IID); -static NS_DEFINE_IID(kICSSCharsetRuleIID, NS_ICSS_CHARSET_RULE_IID); -static NS_DEFINE_IID(kICSSImportRuleIID, NS_ICSS_IMPORT_RULE_IID); -static NS_DEFINE_IID(kICSSMediaRuleIID, NS_ICSS_MEDIA_RULE_IID); -static NS_DEFINE_IID(kICSSNameSpaceRuleIID, NS_ICSS_NAMESPACE_RULE_IID); #define DECL_STYLE_RULE_INHERIT \ NS_IMETHOD GetStyleSheet(nsIStyleSheet*& aSheet) const; \ @@ -125,17 +119,17 @@ CSSCharsetRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSCharsetRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSCharsetRule))) { *aInstancePtrResult = (void*) ((nsICSSCharsetRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; @@ -221,7 +215,7 @@ CSSCharsetRuleImpl::Clone(nsICSSRule*& aClone) const { CSSCharsetRuleImpl* clone = new CSSCharsetRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -249,7 +243,7 @@ NS_NewCSSCharsetRule(nsICSSCharsetRule** aInstancePtrResult, const nsString& aEn } it->Init(aEncoding); - return it->QueryInterface(kICSSCharsetRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSCharsetRule), (void **) aInstancePtrResult); } @@ -318,17 +312,17 @@ CSSImportRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSImportRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSImportRule))) { *aInstancePtrResult = (void*) ((nsICSSImportRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; @@ -416,7 +410,7 @@ CSSImportRuleImpl::Clone(nsICSSRule*& aClone) const { CSSImportRuleImpl* clone = new CSSImportRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -467,7 +461,7 @@ NS_NewCSSImportRule(nsICSSImportRule** aInstancePtrResult, it->SetURLSpec(aURLSpec); it->SetMedia(aMedia); - return it->QueryInterface(kICSSImportRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSImportRule), (void **) aInstancePtrResult); } // ------------------------------------------- @@ -568,17 +562,17 @@ CSSMediaRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSMediaRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSMediaRule))) { *aInstancePtrResult = (void*) ((nsICSSMediaRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; @@ -725,7 +719,7 @@ CSSMediaRuleImpl::Clone(nsICSSRule*& aClone) const { CSSMediaRuleImpl* clone = new CSSMediaRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -821,7 +815,7 @@ NS_NewCSSMediaRule(nsICSSMediaRule** aInstancePtrResult) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSMediaRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSMediaRule), (void **) aInstancePtrResult); } @@ -892,17 +886,17 @@ CSSNameSpaceRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSNameSpaceRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSNameSpaceRule))) { *aInstancePtrResult = (void*) ((nsICSSNameSpaceRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; @@ -996,7 +990,7 @@ CSSNameSpaceRuleImpl::Clone(nsICSSRule*& aClone) const { CSSNameSpaceRuleImpl* clone = new CSSNameSpaceRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -1049,6 +1043,6 @@ NS_NewCSSNameSpaceRule(nsICSSNameSpaceRule** aInstancePtrResult, it->SetPrefix(aPrefix); it->SetURLSpec(aURLSpec); - return it->QueryInterface(kICSSNameSpaceRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSNameSpaceRule), (void **) aInstancePtrResult); } diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp index 0fd73f6c51e..080ad738b15 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp @@ -63,17 +63,6 @@ // #define DEBUG_REFS static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); -static NS_DEFINE_IID(kICSSDeclarationIID, NS_ICSS_DECLARATION_IID); -static NS_DEFINE_IID(kICSSRuleIID, NS_ICSS_RULE_IID); -static NS_DEFINE_IID(kICSSStyleRuleIID, NS_ICSS_STYLE_RULE_IID); -static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIHTMLContentContainerIID, NS_IHTMLCONTENTCONTAINER_IID); -static NS_DEFINE_IID(kIDOMCSSStyleSheetIID, NS_IDOMCSSSTYLESHEET_IID); -static NS_DEFINE_IID(kIDOMCSSRuleIID, NS_IDOMCSSRULE_IID); -static NS_DEFINE_IID(kIDOMCSSStyleRuleIID, NS_IDOMCSSSTYLERULE_IID); -static NS_DEFINE_IID(kIDOMCSSStyleDeclarationIID, NS_IDOMCSSSTYLEDECLARATION_IID); -static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); static NS_DEFINE_IID(kCSSFontSID, NS_CSS_FONT_SID); static NS_DEFINE_IID(kCSSColorSID, NS_CSS_COLOR_SID); @@ -681,7 +670,7 @@ CSSImportantRule::~CSSImportantRule(void) NS_IF_RELEASE(mDeclaration); } -NS_IMPL_ISUPPORTS(CSSImportantRule, kIStyleRuleIID); +NS_IMPL_ISUPPORTS(CSSImportantRule, NS_GET_IID(nsIStyleRule)); #if 0 NS_IMETHODIMP @@ -909,10 +898,10 @@ DOMCSSDeclarationImpl::ParseDeclaration(const nsAReadableString& aDecl, if (sheet) { sheet->GetURL(baseURI); sheet->GetOwningDocument(owningDoc); - sheet->QueryInterface(kICSSStyleSheetIID, (void**)&cssSheet); + sheet->QueryInterface(NS_GET_IID(nsICSSStyleSheet), (void**)&cssSheet); if (owningDoc) { nsIHTMLContentContainer* htmlContainer; - result = owningDoc->QueryInterface(kIHTMLContentContainerIID, (void**)&htmlContainer); + result = owningDoc->QueryInterface(NS_GET_IID(nsIHTMLContentContainer), (void**)&htmlContainer); if (NS_SUCCEEDED(result)) { result = htmlContainer->GetCSSLoader(cssLoader); NS_RELEASE(htmlContainer); @@ -1148,34 +1137,34 @@ nsresult CSSStyleRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSStyleRule))) { *aInstancePtrResult = (void*) ((nsICSSStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIDOMCSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSSRule))) { nsIDOMCSSRule *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIDOMCSSStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSSStyleRule))) { nsIDOMCSSStyleRule *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIScriptObjectOwnerIID)) { + if (aIID.Equals(NS_GET_IID(nsIScriptObjectOwner))) { nsIScriptObjectOwner *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); @@ -1202,7 +1191,7 @@ NS_IMETHODIMP CSSStyleRuleImpl::Equals(const nsIStyleRule* aRule, PRBool& aResul else { aResult = PR_FALSE; if ((nsnull != aRule) && - (NS_OK == ((nsIStyleRule*)aRule)->QueryInterface(kICSSStyleRuleIID, (void**) &iCSSRule))) { + (NS_OK == ((nsIStyleRule*)aRule)->QueryInterface(NS_GET_IID(nsICSSStyleRule), (void**) &iCSSRule))) { CSSStyleRuleImpl* rule = (CSSStyleRuleImpl*)iCSSRule; const nsCSSSelector* local = &mSelector; @@ -1539,7 +1528,7 @@ CSSStyleRuleImpl::Clone(nsICSSRule*& aClone) const { CSSStyleRuleImpl* clone = new CSSStyleRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -3373,7 +3362,7 @@ NS_IMETHODIMP CSSStyleRuleImpl::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet) { if (nsnull != mSheet) { - return mSheet->QueryInterface(kIDOMCSSStyleSheetIID, (void**)aSheet); + return mSheet->QueryInterface(NS_GET_IID(nsIDOMCSSStyleSheet), (void**)aSheet); } *aSheet = nsnull; return NS_OK; @@ -3458,5 +3447,5 @@ NS_HTML nsresult if (nsnull == it) { return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSStyleRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSStyleRule), (void **) aInstancePtrResult); } diff --git a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp index 2f0d70b0b1c..05cfca69712 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp @@ -70,13 +70,6 @@ //#define DEBUG_RULES //#define EVENT_DEBUG -static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); -static NS_DEFINE_IID(kIDOMStyleSheetIID, NS_IDOMSTYLESHEET_IID); -static NS_DEFINE_IID(kIDOMCSSStyleSheetIID, NS_IDOMCSSSTYLESHEET_IID); -static NS_DEFINE_IID(kIDOMCSSStyleRuleIID, NS_IDOMCSSSTYLERULE_IID); -static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); // ---------------------- // Rule hash key @@ -986,7 +979,7 @@ CSSImportsCollectionImpl::QueryInterface(REFNSIID aIID, void** aInstancePtrResul AddRef(); return NS_OK; } - if (aIID.Equals(kIScriptObjectOwnerIID)) { + if (aIID.Equals(NS_GET_IID(nsIScriptObjectOwner))) { nsIScriptObjectOwner *tmp = this; *aInstancePtrResult = (void*) tmp; AddRef(); @@ -1028,7 +1021,7 @@ CSSImportsCollectionImpl::Item(PRUint32 aIndex, nsIDOMStyleSheet** aReturn) result = mStyleSheet->GetStyleSheetAt(aIndex, sheet); if (NS_OK == result) { - result = sheet->QueryInterface(kIDOMStyleSheetIID, (void **)aReturn); + result = sheet->QueryInterface(NS_GET_IID(nsIDOMStyleSheet), (void **)aReturn); } NS_RELEASE(sheet); } @@ -1476,29 +1469,29 @@ nsresult CSSStyleSheetImpl::QueryInterface(const nsIID& aIID, return NS_ERROR_NULL_POINTER; } static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kICSSStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSStyleSheet))) { *aInstancePtrResult = (void*) ((nsICSSStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleSheet))) { *aInstancePtrResult = (void*) ((nsIStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIDOMStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMStyleSheet))) { nsIDOMStyleSheet *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIDOMCSSStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSSStyleSheet))) { nsIDOMCSSStyleSheet *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIScriptObjectOwnerIID)) { + if (aIID.Equals(NS_GET_IID(nsIScriptObjectOwner))) { nsIScriptObjectOwner *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); @@ -1764,7 +1757,7 @@ CSSStyleSheetImpl::ContainsStyleSheet(nsIURI* aURL, PRBool& aContains, nsIStyleS if (aContains) { // if we found it and the out-param is there, set it and addref if (aTheChild) { - rv = QueryInterface( nsIStyleSheet::GetIID(), (void **)aTheChild); + rv = QueryInterface( NS_GET_IID(nsIStyleSheet), (void **)aTheChild); } } else { CSSStyleSheetImpl* child = mFirstChild; @@ -3163,7 +3156,7 @@ static void ContentEnumFunc(nsICSSStyleRule* aRule, void* aData) selector = selector->mNext; if (SelectorMatchesTree(data->mPresContext, data->mContent, selector)) { nsIStyleRule* iRule; - if (NS_OK == aRule->QueryInterface(kIStyleRuleIID, (void**)&iRule)) { + if (NS_OK == aRule->QueryInterface(NS_GET_IID(nsIStyleRule), (void**)&iRule)) { data->mResults->AppendElement(iRule); NS_RELEASE(iRule); iRule = aRule->GetImportantRule(); @@ -3281,7 +3274,7 @@ static void PseudoEnumFunc(nsICSSStyleRule* aRule, void* aData) } nsIStyleRule* iRule; - if (NS_OK == aRule->QueryInterface(kIStyleRuleIID, (void**)&iRule)) { + if (NS_OK == aRule->QueryInterface(NS_GET_IID(nsIStyleRule), (void**)&iRule)) { data->mResults->AppendElement(iRule); NS_RELEASE(iRule); iRule = aRule->GetImportantRule(); diff --git a/mozilla/layout/html/style/src/nsDOMCSSDeclaration.cpp b/mozilla/layout/html/style/src/nsDOMCSSDeclaration.cpp index 7d8f41e5ec1..9f2b79b89db 100644 --- a/mozilla/layout/html/style/src/nsDOMCSSDeclaration.cpp +++ b/mozilla/layout/html/style/src/nsDOMCSSDeclaration.cpp @@ -42,9 +42,6 @@ nsDOMCSSDeclaration::~nsDOMCSSDeclaration() NS_IMPL_ADDREF(nsDOMCSSDeclaration); NS_IMPL_RELEASE(nsDOMCSSDeclaration); -static NS_DEFINE_IID(kIDOMCSS2PropertiesIID, NS_IDOMCSS2PROPERTIES_IID); -static NS_DEFINE_IID(kIDOMCSSStyleDeclarationIID, NS_IDOMCSSSTYLEDECLARATION_IID); -static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); NS_IMETHODIMP @@ -55,19 +52,19 @@ nsDOMCSSDeclaration::QueryInterface(REFNSIID aIID, if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kIDOMCSS2PropertiesIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSS2Properties))) { nsIDOMCSS2Properties *tmp = this; AddRef(); *aInstancePtr = (void*) tmp; return NS_OK; } - if (aIID.Equals(kIDOMCSSStyleDeclarationIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSSStyleDeclaration))) { nsIDOMCSSStyleDeclaration *tmp = this; AddRef(); *aInstancePtr = (void*) tmp; return NS_OK; } - if (aIID.Equals(kIScriptObjectOwnerIID)) { + if (aIID.Equals(NS_GET_IID(nsIScriptObjectOwner))) { nsIScriptObjectOwner *tmp = this; AddRef(); *aInstancePtr = (void*) tmp; diff --git a/mozilla/layout/html/style/src/nsHTMLAttributes.cpp b/mozilla/layout/html/style/src/nsHTMLAttributes.cpp index d7692271d5e..7b4d50e6261 100644 --- a/mozilla/layout/html/style/src/nsHTMLAttributes.cpp +++ b/mozilla/layout/html/style/src/nsHTMLAttributes.cpp @@ -37,7 +37,6 @@ #include "nsIStyleSet.h" -static NS_DEFINE_IID(kIHTMLAttributesIID, NS_IHTML_ATTRIBUTES_IID); MOZ_DECL_CTOR_COUNTER(HTMLAttribute); @@ -983,7 +982,7 @@ HTMLAttributesImpl::~HTMLAttributesImpl(void) NS_IMPL_ADDREF(HTMLAttributesImpl) NS_IMPL_RELEASE(HTMLAttributesImpl) -NS_IMPL_QUERY_INTERFACE(HTMLAttributesImpl, kIHTMLAttributesIID); +NS_IMPL_QUERY_INTERFACE(HTMLAttributesImpl, NS_GET_IID(nsIHTMLAttributes)); const PRUnichar kNullCh = PRUnichar('\0'); diff --git a/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp index f7799d0e0c4..d4aba054254 100644 --- a/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp +++ b/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp @@ -43,10 +43,6 @@ #include "nsIStyleSet.h" #include "nsISizeOfHandler.h" -static NS_DEFINE_IID(kIHTMLCSSStyleSheetIID, NS_IHTML_CSS_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); -static NS_DEFINE_IID(kICSSStyleRuleIID, NS_ICSS_STYLE_RULE_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); class CSSFirstLineRule : public nsIStyleRule { public: @@ -80,7 +76,7 @@ CSSFirstLineRule::~CSSFirstLineRule() { } -NS_IMPL_ISUPPORTS(CSSFirstLineRule, kIStyleRuleIID); +NS_IMPL_ISUPPORTS(CSSFirstLineRule, NS_GET_IID(nsIStyleRule)); NS_IMETHODIMP CSSFirstLineRule::Equals(const nsIStyleRule* aRule, PRBool& aResult) const @@ -460,12 +456,12 @@ nsresult HTMLCSSStyleSheetImpl::QueryInterface(const nsIID& aIID, return NS_ERROR_NULL_POINTER; } static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kIHTMLCSSStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIHTMLCSSStyleSheet))) { *aInstancePtrResult = (void*) ((nsIHTMLCSSStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleSheet))) { *aInstancePtrResult = (void*) ((nsIStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; @@ -515,7 +511,7 @@ HTMLCSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext, while (index < postCount) { nsIStyleRule* rule = (nsIStyleRule*)aResults->ElementAt(index++); nsICSSStyleRule* cssRule; - if (NS_SUCCEEDED(rule->QueryInterface(kICSSStyleRuleIID, (void**)&cssRule))) { + if (NS_SUCCEEDED(rule->QueryInterface(NS_GET_IID(nsICSSStyleRule), (void**)&cssRule))) { nsIStyleRule* important = cssRule->GetImportantRule(); if (nsnull != important) { aResults->AppendElement(important); diff --git a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp index 63c67eea455..2d94634e5e1 100644 --- a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp +++ b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp @@ -61,9 +61,6 @@ #include "nsIStyleSet.h" #include "nsISizeOfHandler.h" -static NS_DEFINE_IID(kIHTMLStyleSheetIID, NS_IHTML_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); static NS_DEFINE_IID(kIStyleFrameConstructionIID, NS_ISTYLE_FRAME_CONSTRUCTION_IID); class HTMLColorRule : public nsIStyleRule { @@ -114,7 +111,7 @@ HTMLColorRule::~HTMLColorRule() { } -NS_IMPL_ISUPPORTS(HTMLColorRule, kIStyleRuleIID); +NS_IMPL_ISUPPORTS(HTMLColorRule, NS_GET_IID(nsIStyleRule)); NS_IMETHODIMP HTMLColorRule::Equals(const nsIStyleRule* aRule, PRBool& aResult) const @@ -309,7 +306,7 @@ GenericTableRule::~GenericTableRule() { } -NS_IMPL_ISUPPORTS(GenericTableRule, kIStyleRuleIID); +NS_IMPL_ISUPPORTS(GenericTableRule, NS_GET_IID(nsIStyleRule)); NS_IMETHODIMP GenericTableRule::Equals(const nsIStyleRule* aRule, PRBool& aResult) const @@ -782,12 +779,12 @@ nsresult HTMLStyleSheetImpl::QueryInterface(const nsIID& aIID, return NS_ERROR_NULL_POINTER; } static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kIHTMLStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIHTMLStyleSheet))) { *aInstancePtrResult = (void*) ((nsIHTMLStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleSheet))) { *aInstancePtrResult = (void*) ((nsIStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp index e4796ec43d4..6f90182e4fa 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableCellFrame.cpp @@ -51,8 +51,6 @@ #include "nsIFrameSelection.h" #include "nsILookAndFeel.h" -static NS_DEFINE_IID(kIHTMLTableCellElementIID, NS_IHTMLTABLECELLELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLTableCellElementIID, NS_IDOMHTMLTABLECELLELEMENT_IID); nsTableCellFrame::nsTableCellFrame() { @@ -118,7 +116,7 @@ void nsTableCellFrame::SetPass1MaxElementSize(const nsSize& aMaxElementSize) nscoord styleWidth = stylePosition->mWidth.GetCoordValue(); if (styleWidth > 0) { nsIDOMHTMLTableCellElement* cellContent = nsnull; - nsresult rv = mContent->QueryInterface(kIDOMHTMLTableCellElementIID, (void **)&cellContent); + nsresult rv = mContent->QueryInterface(NS_GET_IID(nsIDOMHTMLTableCellElement), (void **)&cellContent); if (cellContent && NS_SUCCEEDED(rv)) { PRBool nowrap = PR_FALSE; cellContent->GetNoWrap(&nowrap); @@ -209,7 +207,7 @@ nsresult nsTableCellFrame::SetColIndex(PRInt32 aColIndex) return rv; nsIHTMLTableCellElement* cellContent = nsnull; - rv = cell->QueryInterface(kIHTMLTableCellElementIID, + rv = cell->QueryInterface(NS_GET_IID(nsIHTMLTableCellElement), (void **)&cellContent); // cellContent: REFCNT++ if (cellContent && NS_SUCCEEDED(rv)) { // it's a table cell cellContent->SetColIndex(aColIndex); diff --git a/mozilla/layout/html/table/src/nsTableColFrame.cpp b/mozilla/layout/html/table/src/nsTableColFrame.cpp index a724a4d49c0..2b0905e7698 100644 --- a/mozilla/layout/html/table/src/nsTableColFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableColFrame.cpp @@ -38,7 +38,6 @@ #define COL_TYPE_ANONYMOUS_COLGROUP 0x2 #define COL_TYPE_ANONYMOUS_CELL 0x3 -static NS_DEFINE_IID(kIDOMHTMLTableColElementIID, NS_IDOMHTMLTABLECOLELEMENT_IID); nsTableColFrame::nsTableColFrame() : nsFrame(), diff --git a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp index c06c317230b..2d4e048e81d 100644 --- a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp @@ -37,8 +37,6 @@ #include "nsIPresShell.h" #include "nsLayoutAtoms.h" -static NS_DEFINE_IID(kIHTMLTableColElementIID, NS_IHTMLTABLECOLELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLTableColElementIID, NS_IDOMHTMLTABLECOLELEMENT_IID); #define COLGROUP_TYPE_CONTENT 0x0 #define COLGROUP_TYPE_ANONYMOUS_COL 0x1 @@ -684,7 +682,7 @@ PRInt32 nsTableColGroupFrame::GetSpan() // col group element derives from col element nsIDOMHTMLTableColElement* cgContent = nsnull; - rv = iContent->QueryInterface(kIDOMHTMLTableColElementIID, + rv = iContent->QueryInterface(NS_GET_IID(nsIDOMHTMLTableColElement), (void **)&cgContent); if (cgContent && NS_SUCCEEDED(rv)) { cgContent->GetSpan(&span); diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp index ef6b26b15a0..890de106e53 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableFrame.cpp @@ -61,10 +61,7 @@ #include "nsHTMLReflowCommand.h" #include "nsIFrameManager.h" -static NS_DEFINE_IID(kIHTMLElementIID, NS_IDOMHTMLELEMENT_IID); -static NS_DEFINE_IID(kIBodyElementIID, NS_IDOMHTMLBODYELEMENT_IID); static NS_DEFINE_IID(kITableRowGroupFrameIID, NS_ITABLEROWGROUPFRAME_IID); -static NS_DEFINE_IID(kIScrollableFrameIID, NS_ISCROLLABLE_FRAME_IID); // helper function for dealing with placeholder for positioned/floated table static void GetPlaceholderFor(nsIPresContext& aPresContext, nsIFrame& aFrame, nsIFrame** aPlaceholder); @@ -1152,7 +1149,7 @@ nsTableFrame::GetRowGroupFrame(nsIFrame* aFrame, } else if (nsLayoutAtoms::scrollFrame == frameType) { nsIScrollableFrame* scrollable = nsnull; - nsresult rv = aFrame->QueryInterface(kIScrollableFrameIID, (void **)&scrollable); + nsresult rv = aFrame->QueryInterface(NS_GET_IID(nsIScrollableFrame), (void **)&scrollable); if (NS_SUCCEEDED(rv) && (scrollable)) { nsIFrame* scrolledFrame; scrollable->GetScrolledFrame(nsnull, scrolledFrame); diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp index 8d1792cc12e..70625fe777f 100644 --- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp @@ -41,7 +41,6 @@ #include "nsCOMPtr.h" // the following header files are required for style optimizations that work only when the child content is really a cell #include "nsIHTMLTableCellElement.h" -static NS_DEFINE_IID(kIHTMLTableCellElementIID, NS_IHTMLTABLECELLELEMENT_IID); // end includes for style optimizations that require real content knowledge diff --git a/mozilla/layout/html/tests/TestAttributes.cpp b/mozilla/layout/html/tests/TestAttributes.cpp index f3b41d5e405..9afec5ec26b 100644 --- a/mozilla/layout/html/tests/TestAttributes.cpp +++ b/mozilla/layout/html/tests/TestAttributes.cpp @@ -255,8 +255,7 @@ int main(int argc, char** argv) } nsIDOMText* txt = nsnull; - static NS_DEFINE_IID(kIDOMTextIID, NS_IDOMTEXT_IID); - text->QueryInterface(kIDOMTextIID, (void**) &txt); + text->QueryInterface(NS_GET_IID(nsIDOMText), (void**) &txt); nsAutoString tmp(destStr); txt->AppendData(tmp); NS_RELEASE(txt); @@ -268,9 +267,8 @@ int main(int argc, char** argv) #if 0 // Query ITextContent interface - static NS_DEFINE_IID(kITextContentIID, NS_ITEXTCONTENT_IID); nsITextContent* textContent; - rv = text->QueryInterface(kITextContentIID,(void **)&textContent); + rv = text->QueryInterface(NS_GET_IID(nsITextContent),(void **)&textContent); if (NS_OK != rv) { printf("Created text content does not have the ITextContent interface.\n"); return -1; diff --git a/mozilla/layout/html/tests/TestCSSParser.cpp b/mozilla/layout/html/tests/TestCSSParser.cpp index 34fdc8e8e8e..642d7664f7d 100644 --- a/mozilla/layout/html/tests/TestCSSParser.cpp +++ b/mozilla/layout/html/tests/TestCSSParser.cpp @@ -59,9 +59,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); static NS_DEFINE_CID(kCSSParserCID, NS_CSSPARSER_CID); -static NS_DEFINE_IID(kICSSParserIID, NS_ICSS_PARSER_IID); // XXX end bad code static void Usage(void) @@ -106,7 +104,7 @@ int main(int argc, char** argv) // Create the Event Queue for this thread... nsIEventQueueService* pEventQService = nsnull; rv = nsServiceManager::GetService(kEventQueueServiceCID, - kIEventQueueServiceIID, + NS_GET_IID(nsIEventQueueService), (nsISupports **)&pEventQService); if (NS_SUCCEEDED(rv)) { // XXX: What if this fails? @@ -117,7 +115,7 @@ int main(int argc, char** argv) nsCOMPtr css; rv = nsComponentManager::CreateInstance(kCSSParserCID, nsnull, - kICSSParserIID, + NS_GET_IID(nsICSSParser), getter_AddRefs(css)); if (NS_FAILED(rv)) { diff --git a/mozilla/layout/html/tests/TestInlineFrame.cpp b/mozilla/layout/html/tests/TestInlineFrame.cpp index 731655faead..1aa2b23b47b 100644 --- a/mozilla/layout/html/tests/TestInlineFrame.cpp +++ b/mozilla/layout/html/tests/TestInlineFrame.cpp @@ -35,7 +35,6 @@ #include "nsInlineFrame.h" #include "nsIAtom.h" -static NS_DEFINE_IID(kIContentDelegateIID, NS_ICONTENTDELEGATE_IID); /////////////////////////////////////////////////////////////////////////////// // @@ -1582,9 +1581,8 @@ int main(int argc, char** argv) nsIDeviceContext *dx; static NS_DEFINE_IID(kDeviceContextCID, NS_DEVICE_CONTEXT_CID); - static NS_DEFINE_IID(kDeviceContextIID, NS_IDEVICE_CONTEXT_IID); - nsresult rv = nsComponentManager::CreateInstance(kDeviceContextCID, nsnull, kDeviceContextIID, (void **)&dx); + nsresult rv = nsComponentManager::CreateInstance(kDeviceContextCID, nsnull, NS_GET_IID(nsIDeviceContext), (void **)&dx); if (NS_OK == rv) { dx->Init(nsull); diff --git a/mozilla/layout/html/tests/table/TableContentTest/TableContentTest.cpp b/mozilla/layout/html/tests/table/TableContentTest/TableContentTest.cpp index e9e3d0f6337..52898be09bb 100644 --- a/mozilla/layout/html/tests/table/TableContentTest/TableContentTest.cpp +++ b/mozilla/layout/html/tests/table/TableContentTest/TableContentTest.cpp @@ -419,17 +419,15 @@ GeometryTest::GeometryTest(BasicTest *aDoc) NS_InitToolkit(PR_GetCurrentThread()); //NS_NewDeviceContext(&scribbleData.mContext); - static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); - NS_NewWindow(NULL, kIWidgetIID, nsnull); + NS_NewWindow(NULL, NS_GET_IID(nsIWidget), nsnull); #endif nsIDeviceContext *dx; static NS_DEFINE_IID(kDeviceContextCID, NS_DEVICE_CONTEXT_CID); - static NS_DEFINE_IID(kDeviceContextIID, NS_IDEVICE_CONTEXT_IID); - nsresult rv = nsComponentManager::CreateInstance(kDeviceContextCID, nsnull, kDeviceContextIID, (void **)&dx); + nsresult rv = nsComponentManager::CreateInstance(kDeviceContextCID, nsnull, NS_GET_IID(nsIDeviceContext), (void **)&dx); if (NS_OK == rv) { dx->Init(nsnull); @@ -451,11 +449,10 @@ GeometryTest::GeometryTest(BasicTest *aDoc) nsIViewManager * vm = nsnull; static NS_DEFINE_IID(kViewManagerCID, NS_VIEW_MANAGER_CID); - static NS_DEFINE_IID(kIViewManagerIID, NS_IVIEWMANAGER_IID); status = nsComponentManager::CreateInstance(kViewManagerCID, nsnull, - kIViewManagerIID, + NS_GET_IID(nsIViewManager), (void **)&vm); if ((NS_FAILED(status)) || nsnull==vm) @@ -469,11 +466,10 @@ GeometryTest::GeometryTest(BasicTest *aDoc) // Create a view static NS_DEFINE_IID(kScrollingViewCID, NS_SCROLLING_VIEW_CID); - static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); status = nsComponentManager::CreateInstance(kScrollingViewCID, nsnull, - kIViewIID, + NS_GET_IID(nsIView), (void **)&rootView); if ((NS_FAILED(status)) || nsnull==rootView) diff --git a/mozilla/layout/style/nsCSSDeclaration.cpp b/mozilla/layout/style/nsCSSDeclaration.cpp index 395e9339987..36cdf24ddf7 100644 --- a/mozilla/layout/style/nsCSSDeclaration.cpp +++ b/mozilla/layout/style/nsCSSDeclaration.cpp @@ -48,7 +48,6 @@ static NS_DEFINE_IID(kCSSPageSID, NS_CSS_PAGE_SID); static NS_DEFINE_IID(kCSSContentSID, NS_CSS_CONTENT_SID); static NS_DEFINE_IID(kCSSUserInterfaceSID, NS_CSS_USER_INTERFACE_SID); static NS_DEFINE_IID(kCSSAuralSID, NS_CSS_AURAL_SID); -static NS_DEFINE_IID(kICSSDeclarationIID, NS_ICSS_DECLARATION_IID); #define CSS_IF_DELETE(ptr) if (nsnull != ptr) { delete ptr; ptr = nsnull; } @@ -1138,7 +1137,7 @@ CSSDeclarationImpl::~CSSDeclarationImpl(void) #endif } -NS_IMPL_ISUPPORTS(CSSDeclarationImpl, kICSSDeclarationIID); +NS_IMPL_ISUPPORTS(CSSDeclarationImpl, NS_GET_IID(nsICSSDeclaration)); #define CSS_IF_GET_ELSE(sid,ptr,result) \ if (sid.Equals(kCSS##ptr##SID)) { *result = m##ptr; } else @@ -4678,7 +4677,7 @@ CSSDeclarationImpl::Clone(nsICSSDeclaration*& aClone) const { CSSDeclarationImpl* clone = new CSSDeclarationImpl(*this); if (clone) { - return clone->QueryInterface(kICSSDeclarationIID, (void**)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSDeclaration), (void**)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -4699,7 +4698,7 @@ NS_HTML nsresult return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSDeclarationIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSDeclaration), (void **) aInstancePtrResult); } diff --git a/mozilla/layout/style/nsCSSLoader.cpp b/mozilla/layout/style/nsCSSLoader.cpp index 6d414b39e37..088a8e9e383 100644 --- a/mozilla/layout/style/nsCSSLoader.cpp +++ b/mozilla/layout/style/nsCSSLoader.cpp @@ -59,12 +59,6 @@ #include -static NS_DEFINE_IID(kICSSLoaderIID, NS_ICSS_LOADER_IID); -//static NS_DEFINE_IID(kICSSParserIID, NS_ICSS_PARSER_IID); -//static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID); -//static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); -static NS_DEFINE_IID(kIDOMNodeIID, NS_IDOMNODE_IID); -static NS_DEFINE_IID(kIStyleSheetLinkingElementIID, NS_ISTYLESHEETLINKINGELEMENT_IID); static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); class CSSLoaderImpl; @@ -486,7 +480,7 @@ CSSLoaderImpl::~CSSLoaderImpl(void) mSheetMapTable.Enumerate(DeleteSheetMap); } -NS_IMPL_ISUPPORTS(CSSLoaderImpl, kICSSLoaderIID) +NS_IMPL_ISUPPORTS(CSSLoaderImpl, NS_GET_IID(nsICSSLoader)) NS_IMETHODIMP CSSLoaderImpl::Init(nsIDocument* aDocument) @@ -1073,13 +1067,13 @@ CSSLoaderImpl::InsertSheetInDoc(nsICSSStyleSheet* aSheet, PRInt32 aDocIndex, if (nsnull != aElement) { nsIDOMNode* domNode = nsnull; - if (NS_SUCCEEDED(aElement->QueryInterface(kIDOMNodeIID, (void**)&domNode))) { + if (NS_SUCCEEDED(aElement->QueryInterface(NS_GET_IID(nsIDOMNode), (void**)&domNode))) { aSheet->SetOwningNode(domNode); NS_RELEASE(domNode); } nsIStyleSheetLinkingElement* element; - if (NS_SUCCEEDED(aElement->QueryInterface(kIStyleSheetLinkingElementIID, + if (NS_SUCCEEDED(aElement->QueryInterface(NS_GET_IID(nsIStyleSheetLinkingElement), (void**)&element))) { element->SetStyleSheet(aSheet); NS_RELEASE(element); @@ -1557,7 +1551,7 @@ nsresult NS_NewCSSLoader(nsIDocument* aDocument, nsICSSLoader** aLoader) } it->Init(aDocument); - return it->QueryInterface(kICSSLoaderIID, (void **)aLoader); + return it->QueryInterface(NS_GET_IID(nsICSSLoader), (void **)aLoader); } nsresult NS_NewCSSLoader(nsICSSLoader** aLoader) @@ -1568,7 +1562,7 @@ nsresult NS_NewCSSLoader(nsICSSLoader** aLoader) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSLoaderIID, (void **)aLoader); + return it->QueryInterface(NS_GET_IID(nsICSSLoader), (void **)aLoader); } diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp index 1a648874ad6..eb06faba4a0 100644 --- a/mozilla/layout/style/nsCSSParser.cpp +++ b/mozilla/layout/style/nsCSSParser.cpp @@ -52,9 +52,6 @@ // - rework aErrorCode stuff: switch over to nsresult // verify ! is followed by important and nothing else -static NS_DEFINE_IID(kICSSParserIID, NS_ICSS_PARSER_IID); -static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); #define ENABLE_OUTLINE // un-comment this to enable the outline properties (bug 9816) // XXX un-commenting for temporary fix for nsbeta3+ Bug 48973 @@ -315,7 +312,7 @@ NS_NewCSSParser(nsICSSParser** aInstancePtrResult) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSParserIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSParser), (void **) aInstancePtrResult); } #ifdef CSS_REPORT_PARSE_ERRORS @@ -386,7 +383,7 @@ CSSParserImpl::Init(nsICSSStyleSheet* aSheet) return NS_OK; } -NS_IMPL_ISUPPORTS(CSSParserImpl,kICSSParserIID) +NS_IMPL_ISUPPORTS(CSSParserImpl,NS_GET_IID(nsICSSParser)) CSSParserImpl::~CSSParserImpl() { diff --git a/mozilla/layout/style/nsCSSRules.cpp b/mozilla/layout/style/nsCSSRules.cpp index 32e544aa3e7..abb6e732b27 100644 --- a/mozilla/layout/style/nsCSSRules.cpp +++ b/mozilla/layout/style/nsCSSRules.cpp @@ -38,12 +38,6 @@ #include "nsISizeOfHandler.h" static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); -static NS_DEFINE_IID(kICSSRuleIID, NS_ICSS_RULE_IID); -static NS_DEFINE_IID(kICSSCharsetRuleIID, NS_ICSS_CHARSET_RULE_IID); -static NS_DEFINE_IID(kICSSImportRuleIID, NS_ICSS_IMPORT_RULE_IID); -static NS_DEFINE_IID(kICSSMediaRuleIID, NS_ICSS_MEDIA_RULE_IID); -static NS_DEFINE_IID(kICSSNameSpaceRuleIID, NS_ICSS_NAMESPACE_RULE_IID); #define DECL_STYLE_RULE_INHERIT \ NS_IMETHOD GetStyleSheet(nsIStyleSheet*& aSheet) const; \ @@ -125,17 +119,17 @@ CSSCharsetRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSCharsetRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSCharsetRule))) { *aInstancePtrResult = (void*) ((nsICSSCharsetRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; @@ -221,7 +215,7 @@ CSSCharsetRuleImpl::Clone(nsICSSRule*& aClone) const { CSSCharsetRuleImpl* clone = new CSSCharsetRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -249,7 +243,7 @@ NS_NewCSSCharsetRule(nsICSSCharsetRule** aInstancePtrResult, const nsString& aEn } it->Init(aEncoding); - return it->QueryInterface(kICSSCharsetRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSCharsetRule), (void **) aInstancePtrResult); } @@ -318,17 +312,17 @@ CSSImportRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSImportRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSImportRule))) { *aInstancePtrResult = (void*) ((nsICSSImportRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; @@ -416,7 +410,7 @@ CSSImportRuleImpl::Clone(nsICSSRule*& aClone) const { CSSImportRuleImpl* clone = new CSSImportRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -467,7 +461,7 @@ NS_NewCSSImportRule(nsICSSImportRule** aInstancePtrResult, it->SetURLSpec(aURLSpec); it->SetMedia(aMedia); - return it->QueryInterface(kICSSImportRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSImportRule), (void **) aInstancePtrResult); } // ------------------------------------------- @@ -568,17 +562,17 @@ CSSMediaRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSMediaRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSMediaRule))) { *aInstancePtrResult = (void*) ((nsICSSMediaRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; @@ -725,7 +719,7 @@ CSSMediaRuleImpl::Clone(nsICSSRule*& aClone) const { CSSMediaRuleImpl* clone = new CSSMediaRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -821,7 +815,7 @@ NS_NewCSSMediaRule(nsICSSMediaRule** aInstancePtrResult) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSMediaRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSMediaRule), (void **) aInstancePtrResult); } @@ -892,17 +886,17 @@ CSSNameSpaceRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSNameSpaceRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSNameSpaceRule))) { *aInstancePtrResult = (void*) ((nsICSSNameSpaceRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; @@ -996,7 +990,7 @@ CSSNameSpaceRuleImpl::Clone(nsICSSRule*& aClone) const { CSSNameSpaceRuleImpl* clone = new CSSNameSpaceRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -1049,6 +1043,6 @@ NS_NewCSSNameSpaceRule(nsICSSNameSpaceRule** aInstancePtrResult, it->SetPrefix(aPrefix); it->SetURLSpec(aURLSpec); - return it->QueryInterface(kICSSNameSpaceRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSNameSpaceRule), (void **) aInstancePtrResult); } diff --git a/mozilla/layout/style/nsCSSStruct.cpp b/mozilla/layout/style/nsCSSStruct.cpp index 395e9339987..36cdf24ddf7 100644 --- a/mozilla/layout/style/nsCSSStruct.cpp +++ b/mozilla/layout/style/nsCSSStruct.cpp @@ -48,7 +48,6 @@ static NS_DEFINE_IID(kCSSPageSID, NS_CSS_PAGE_SID); static NS_DEFINE_IID(kCSSContentSID, NS_CSS_CONTENT_SID); static NS_DEFINE_IID(kCSSUserInterfaceSID, NS_CSS_USER_INTERFACE_SID); static NS_DEFINE_IID(kCSSAuralSID, NS_CSS_AURAL_SID); -static NS_DEFINE_IID(kICSSDeclarationIID, NS_ICSS_DECLARATION_IID); #define CSS_IF_DELETE(ptr) if (nsnull != ptr) { delete ptr; ptr = nsnull; } @@ -1138,7 +1137,7 @@ CSSDeclarationImpl::~CSSDeclarationImpl(void) #endif } -NS_IMPL_ISUPPORTS(CSSDeclarationImpl, kICSSDeclarationIID); +NS_IMPL_ISUPPORTS(CSSDeclarationImpl, NS_GET_IID(nsICSSDeclaration)); #define CSS_IF_GET_ELSE(sid,ptr,result) \ if (sid.Equals(kCSS##ptr##SID)) { *result = m##ptr; } else @@ -4678,7 +4677,7 @@ CSSDeclarationImpl::Clone(nsICSSDeclaration*& aClone) const { CSSDeclarationImpl* clone = new CSSDeclarationImpl(*this); if (clone) { - return clone->QueryInterface(kICSSDeclarationIID, (void**)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSDeclaration), (void**)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -4699,7 +4698,7 @@ NS_HTML nsresult return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSDeclarationIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSDeclaration), (void **) aInstancePtrResult); } diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp index 0fd73f6c51e..080ad738b15 100644 --- a/mozilla/layout/style/nsCSSStyleRule.cpp +++ b/mozilla/layout/style/nsCSSStyleRule.cpp @@ -63,17 +63,6 @@ // #define DEBUG_REFS static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); -static NS_DEFINE_IID(kICSSDeclarationIID, NS_ICSS_DECLARATION_IID); -static NS_DEFINE_IID(kICSSRuleIID, NS_ICSS_RULE_IID); -static NS_DEFINE_IID(kICSSStyleRuleIID, NS_ICSS_STYLE_RULE_IID); -static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIHTMLContentContainerIID, NS_IHTMLCONTENTCONTAINER_IID); -static NS_DEFINE_IID(kIDOMCSSStyleSheetIID, NS_IDOMCSSSTYLESHEET_IID); -static NS_DEFINE_IID(kIDOMCSSRuleIID, NS_IDOMCSSRULE_IID); -static NS_DEFINE_IID(kIDOMCSSStyleRuleIID, NS_IDOMCSSSTYLERULE_IID); -static NS_DEFINE_IID(kIDOMCSSStyleDeclarationIID, NS_IDOMCSSSTYLEDECLARATION_IID); -static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); static NS_DEFINE_IID(kCSSFontSID, NS_CSS_FONT_SID); static NS_DEFINE_IID(kCSSColorSID, NS_CSS_COLOR_SID); @@ -681,7 +670,7 @@ CSSImportantRule::~CSSImportantRule(void) NS_IF_RELEASE(mDeclaration); } -NS_IMPL_ISUPPORTS(CSSImportantRule, kIStyleRuleIID); +NS_IMPL_ISUPPORTS(CSSImportantRule, NS_GET_IID(nsIStyleRule)); #if 0 NS_IMETHODIMP @@ -909,10 +898,10 @@ DOMCSSDeclarationImpl::ParseDeclaration(const nsAReadableString& aDecl, if (sheet) { sheet->GetURL(baseURI); sheet->GetOwningDocument(owningDoc); - sheet->QueryInterface(kICSSStyleSheetIID, (void**)&cssSheet); + sheet->QueryInterface(NS_GET_IID(nsICSSStyleSheet), (void**)&cssSheet); if (owningDoc) { nsIHTMLContentContainer* htmlContainer; - result = owningDoc->QueryInterface(kIHTMLContentContainerIID, (void**)&htmlContainer); + result = owningDoc->QueryInterface(NS_GET_IID(nsIHTMLContentContainer), (void**)&htmlContainer); if (NS_SUCCEEDED(result)) { result = htmlContainer->GetCSSLoader(cssLoader); NS_RELEASE(htmlContainer); @@ -1148,34 +1137,34 @@ nsresult CSSStyleRuleImpl::QueryInterface(const nsIID& aIID, if (nsnull == aInstancePtrResult) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kICSSStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSStyleRule))) { *aInstancePtrResult = (void*) ((nsICSSStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kICSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSRule))) { *aInstancePtrResult = (void*) ((nsICSSRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleRule))) { *aInstancePtrResult = (void*) ((nsIStyleRule*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIDOMCSSRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSSRule))) { nsIDOMCSSRule *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIDOMCSSStyleRuleIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSSStyleRule))) { nsIDOMCSSStyleRule *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIScriptObjectOwnerIID)) { + if (aIID.Equals(NS_GET_IID(nsIScriptObjectOwner))) { nsIScriptObjectOwner *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); @@ -1202,7 +1191,7 @@ NS_IMETHODIMP CSSStyleRuleImpl::Equals(const nsIStyleRule* aRule, PRBool& aResul else { aResult = PR_FALSE; if ((nsnull != aRule) && - (NS_OK == ((nsIStyleRule*)aRule)->QueryInterface(kICSSStyleRuleIID, (void**) &iCSSRule))) { + (NS_OK == ((nsIStyleRule*)aRule)->QueryInterface(NS_GET_IID(nsICSSStyleRule), (void**) &iCSSRule))) { CSSStyleRuleImpl* rule = (CSSStyleRuleImpl*)iCSSRule; const nsCSSSelector* local = &mSelector; @@ -1539,7 +1528,7 @@ CSSStyleRuleImpl::Clone(nsICSSRule*& aClone) const { CSSStyleRuleImpl* clone = new CSSStyleRuleImpl(*this); if (clone) { - return clone->QueryInterface(kICSSRuleIID, (void **)&aClone); + return clone->QueryInterface(NS_GET_IID(nsICSSRule), (void **)&aClone); } aClone = nsnull; return NS_ERROR_OUT_OF_MEMORY; @@ -3373,7 +3362,7 @@ NS_IMETHODIMP CSSStyleRuleImpl::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet) { if (nsnull != mSheet) { - return mSheet->QueryInterface(kIDOMCSSStyleSheetIID, (void**)aSheet); + return mSheet->QueryInterface(NS_GET_IID(nsIDOMCSSStyleSheet), (void**)aSheet); } *aSheet = nsnull; return NS_OK; @@ -3458,5 +3447,5 @@ NS_HTML nsresult if (nsnull == it) { return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kICSSStyleRuleIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsICSSStyleRule), (void **) aInstancePtrResult); } diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp index 2f0d70b0b1c..05cfca69712 100644 --- a/mozilla/layout/style/nsCSSStyleSheet.cpp +++ b/mozilla/layout/style/nsCSSStyleSheet.cpp @@ -70,13 +70,6 @@ //#define DEBUG_RULES //#define EVENT_DEBUG -static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); -static NS_DEFINE_IID(kIDOMStyleSheetIID, NS_IDOMSTYLESHEET_IID); -static NS_DEFINE_IID(kIDOMCSSStyleSheetIID, NS_IDOMCSSSTYLESHEET_IID); -static NS_DEFINE_IID(kIDOMCSSStyleRuleIID, NS_IDOMCSSSTYLERULE_IID); -static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); // ---------------------- // Rule hash key @@ -986,7 +979,7 @@ CSSImportsCollectionImpl::QueryInterface(REFNSIID aIID, void** aInstancePtrResul AddRef(); return NS_OK; } - if (aIID.Equals(kIScriptObjectOwnerIID)) { + if (aIID.Equals(NS_GET_IID(nsIScriptObjectOwner))) { nsIScriptObjectOwner *tmp = this; *aInstancePtrResult = (void*) tmp; AddRef(); @@ -1028,7 +1021,7 @@ CSSImportsCollectionImpl::Item(PRUint32 aIndex, nsIDOMStyleSheet** aReturn) result = mStyleSheet->GetStyleSheetAt(aIndex, sheet); if (NS_OK == result) { - result = sheet->QueryInterface(kIDOMStyleSheetIID, (void **)aReturn); + result = sheet->QueryInterface(NS_GET_IID(nsIDOMStyleSheet), (void **)aReturn); } NS_RELEASE(sheet); } @@ -1476,29 +1469,29 @@ nsresult CSSStyleSheetImpl::QueryInterface(const nsIID& aIID, return NS_ERROR_NULL_POINTER; } static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kICSSStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsICSSStyleSheet))) { *aInstancePtrResult = (void*) ((nsICSSStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleSheet))) { *aInstancePtrResult = (void*) ((nsIStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIDOMStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMStyleSheet))) { nsIDOMStyleSheet *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIDOMCSSStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSSStyleSheet))) { nsIDOMCSSStyleSheet *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIScriptObjectOwnerIID)) { + if (aIID.Equals(NS_GET_IID(nsIScriptObjectOwner))) { nsIScriptObjectOwner *tmp = this; *aInstancePtrResult = (void*) tmp; NS_ADDREF_THIS(); @@ -1764,7 +1757,7 @@ CSSStyleSheetImpl::ContainsStyleSheet(nsIURI* aURL, PRBool& aContains, nsIStyleS if (aContains) { // if we found it and the out-param is there, set it and addref if (aTheChild) { - rv = QueryInterface( nsIStyleSheet::GetIID(), (void **)aTheChild); + rv = QueryInterface( NS_GET_IID(nsIStyleSheet), (void **)aTheChild); } } else { CSSStyleSheetImpl* child = mFirstChild; @@ -3163,7 +3156,7 @@ static void ContentEnumFunc(nsICSSStyleRule* aRule, void* aData) selector = selector->mNext; if (SelectorMatchesTree(data->mPresContext, data->mContent, selector)) { nsIStyleRule* iRule; - if (NS_OK == aRule->QueryInterface(kIStyleRuleIID, (void**)&iRule)) { + if (NS_OK == aRule->QueryInterface(NS_GET_IID(nsIStyleRule), (void**)&iRule)) { data->mResults->AppendElement(iRule); NS_RELEASE(iRule); iRule = aRule->GetImportantRule(); @@ -3281,7 +3274,7 @@ static void PseudoEnumFunc(nsICSSStyleRule* aRule, void* aData) } nsIStyleRule* iRule; - if (NS_OK == aRule->QueryInterface(kIStyleRuleIID, (void**)&iRule)) { + if (NS_OK == aRule->QueryInterface(NS_GET_IID(nsIStyleRule), (void**)&iRule)) { data->mResults->AppendElement(iRule); NS_RELEASE(iRule); iRule = aRule->GetImportantRule(); diff --git a/mozilla/layout/style/nsDOMCSSDeclaration.cpp b/mozilla/layout/style/nsDOMCSSDeclaration.cpp index 7d8f41e5ec1..9f2b79b89db 100644 --- a/mozilla/layout/style/nsDOMCSSDeclaration.cpp +++ b/mozilla/layout/style/nsDOMCSSDeclaration.cpp @@ -42,9 +42,6 @@ nsDOMCSSDeclaration::~nsDOMCSSDeclaration() NS_IMPL_ADDREF(nsDOMCSSDeclaration); NS_IMPL_RELEASE(nsDOMCSSDeclaration); -static NS_DEFINE_IID(kIDOMCSS2PropertiesIID, NS_IDOMCSS2PROPERTIES_IID); -static NS_DEFINE_IID(kIDOMCSSStyleDeclarationIID, NS_IDOMCSSSTYLEDECLARATION_IID); -static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); NS_IMETHODIMP @@ -55,19 +52,19 @@ nsDOMCSSDeclaration::QueryInterface(REFNSIID aIID, if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(kIDOMCSS2PropertiesIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSS2Properties))) { nsIDOMCSS2Properties *tmp = this; AddRef(); *aInstancePtr = (void*) tmp; return NS_OK; } - if (aIID.Equals(kIDOMCSSStyleDeclarationIID)) { + if (aIID.Equals(NS_GET_IID(nsIDOMCSSStyleDeclaration))) { nsIDOMCSSStyleDeclaration *tmp = this; AddRef(); *aInstancePtr = (void*) tmp; return NS_OK; } - if (aIID.Equals(kIScriptObjectOwnerIID)) { + if (aIID.Equals(NS_GET_IID(nsIScriptObjectOwner))) { nsIScriptObjectOwner *tmp = this; AddRef(); *aInstancePtr = (void*) tmp; diff --git a/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp b/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp index f7799d0e0c4..d4aba054254 100644 --- a/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp +++ b/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp @@ -43,10 +43,6 @@ #include "nsIStyleSet.h" #include "nsISizeOfHandler.h" -static NS_DEFINE_IID(kIHTMLCSSStyleSheetIID, NS_IHTML_CSS_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); -static NS_DEFINE_IID(kICSSStyleRuleIID, NS_ICSS_STYLE_RULE_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); class CSSFirstLineRule : public nsIStyleRule { public: @@ -80,7 +76,7 @@ CSSFirstLineRule::~CSSFirstLineRule() { } -NS_IMPL_ISUPPORTS(CSSFirstLineRule, kIStyleRuleIID); +NS_IMPL_ISUPPORTS(CSSFirstLineRule, NS_GET_IID(nsIStyleRule)); NS_IMETHODIMP CSSFirstLineRule::Equals(const nsIStyleRule* aRule, PRBool& aResult) const @@ -460,12 +456,12 @@ nsresult HTMLCSSStyleSheetImpl::QueryInterface(const nsIID& aIID, return NS_ERROR_NULL_POINTER; } static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kIHTMLCSSStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIHTMLCSSStyleSheet))) { *aInstancePtrResult = (void*) ((nsIHTMLCSSStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleSheet))) { *aInstancePtrResult = (void*) ((nsIStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; @@ -515,7 +511,7 @@ HTMLCSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext, while (index < postCount) { nsIStyleRule* rule = (nsIStyleRule*)aResults->ElementAt(index++); nsICSSStyleRule* cssRule; - if (NS_SUCCEEDED(rule->QueryInterface(kICSSStyleRuleIID, (void**)&cssRule))) { + if (NS_SUCCEEDED(rule->QueryInterface(NS_GET_IID(nsICSSStyleRule), (void**)&cssRule))) { nsIStyleRule* important = cssRule->GetImportantRule(); if (nsnull != important) { aResults->AppendElement(important); diff --git a/mozilla/layout/style/nsHTMLStyleSheet.cpp b/mozilla/layout/style/nsHTMLStyleSheet.cpp index 63c67eea455..2d94634e5e1 100644 --- a/mozilla/layout/style/nsHTMLStyleSheet.cpp +++ b/mozilla/layout/style/nsHTMLStyleSheet.cpp @@ -61,9 +61,6 @@ #include "nsIStyleSet.h" #include "nsISizeOfHandler.h" -static NS_DEFINE_IID(kIHTMLStyleSheetIID, NS_IHTML_STYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID); -static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID); static NS_DEFINE_IID(kIStyleFrameConstructionIID, NS_ISTYLE_FRAME_CONSTRUCTION_IID); class HTMLColorRule : public nsIStyleRule { @@ -114,7 +111,7 @@ HTMLColorRule::~HTMLColorRule() { } -NS_IMPL_ISUPPORTS(HTMLColorRule, kIStyleRuleIID); +NS_IMPL_ISUPPORTS(HTMLColorRule, NS_GET_IID(nsIStyleRule)); NS_IMETHODIMP HTMLColorRule::Equals(const nsIStyleRule* aRule, PRBool& aResult) const @@ -309,7 +306,7 @@ GenericTableRule::~GenericTableRule() { } -NS_IMPL_ISUPPORTS(GenericTableRule, kIStyleRuleIID); +NS_IMPL_ISUPPORTS(GenericTableRule, NS_GET_IID(nsIStyleRule)); NS_IMETHODIMP GenericTableRule::Equals(const nsIStyleRule* aRule, PRBool& aResult) const @@ -782,12 +779,12 @@ nsresult HTMLStyleSheetImpl::QueryInterface(const nsIID& aIID, return NS_ERROR_NULL_POINTER; } static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kIHTMLStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIHTMLStyleSheet))) { *aInstancePtrResult = (void*) ((nsIHTMLStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIStyleSheetIID)) { + if (aIID.Equals(NS_GET_IID(nsIStyleSheet))) { *aInstancePtrResult = (void*) ((nsIStyleSheet*)this); NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp index d940a2231b4..d32265c92a3 100644 --- a/mozilla/layout/style/nsStyleContext.cpp +++ b/mozilla/layout/style/nsStyleContext.cpp @@ -52,7 +52,6 @@ #include "nsLayoutAtoms.h" #include "prenv.h" -static NS_DEFINE_IID(kIStyleContextIID, NS_ISTYLECONTEXT_IID); #define DELETE_ARRAY_IF(array) if (array) { delete[] array; array = nsnull; } @@ -3587,7 +3586,7 @@ NS_NewStyleContext(nsIStyleContext** aInstancePtrResult, if (nsnull == context) { return NS_ERROR_OUT_OF_MEMORY; } - nsresult result = context->QueryInterface(kIStyleContextIID, (void **) aInstancePtrResult); + nsresult result = context->QueryInterface(NS_GET_IID(nsIStyleContext), (void **) aInstancePtrResult); context->RemapStyle(aPresContext); // remap after initial ref-count is set #ifdef SHARE_STYLECONTEXTS diff --git a/mozilla/layout/style/nsStyleSet.cpp b/mozilla/layout/style/nsStyleSet.cpp index 45bcf220288..35636836a3d 100644 --- a/mozilla/layout/style/nsStyleSet.cpp +++ b/mozilla/layout/style/nsStyleSet.cpp @@ -51,7 +51,6 @@ #include "nsISizeOfHandler.h" -static NS_DEFINE_IID(kIStyleSetIID, NS_ISTYLE_SET_IID); static NS_DEFINE_IID(kIStyleFrameConstructionIID, NS_ISTYLE_FRAME_CONSTRUCTION_IID); // - fast cache uses a CRC32 on the style context to quickly find sharing candidates. @@ -394,7 +393,7 @@ StyleSetImpl::~StyleSetImpl() } #ifndef MOZ_PERF_METRICS -NS_IMPL_ISUPPORTS(StyleSetImpl, kIStyleSetIID) +NS_IMPL_ISUPPORTS(StyleSetImpl, NS_GET_IID(nsIStyleSet)) #else NS_IMPL_ISUPPORTS2(StyleSetImpl, nsIStyleSet, nsITimeRecorder) #endif @@ -729,7 +728,7 @@ NS_IMETHODIMP StyleSetImpl::EnableQuirkStyleSheet(PRBool aEnable) sheet = getter_AddRefs(GetBackstopStyleSheetAt(i)); if (sheet) { nsCOMPtr cssSheet; - sheet->QueryInterface(nsICSSStyleSheet::GetIID(), getter_AddRefs(cssSheet)); + sheet->QueryInterface(NS_GET_IID(nsICSSStyleSheet), getter_AddRefs(cssSheet)); if (cssSheet) { nsCOMPtr quirkSheet; PRBool bHasSheet = PR_FALSE; @@ -1388,7 +1387,7 @@ NS_NewStyleSet(nsIStyleSet** aInstancePtrResult) return NS_ERROR_OUT_OF_MEMORY; } - return it->QueryInterface(kIStyleSetIID, (void **) aInstancePtrResult); + return it->QueryInterface(NS_GET_IID(nsIStyleSet), (void **) aInstancePtrResult); } // nsITimeRecorder implementation diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index e4796ec43d4..6f90182e4fa 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/layout/tables/nsTableCellFrame.cpp @@ -51,8 +51,6 @@ #include "nsIFrameSelection.h" #include "nsILookAndFeel.h" -static NS_DEFINE_IID(kIHTMLTableCellElementIID, NS_IHTMLTABLECELLELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLTableCellElementIID, NS_IDOMHTMLTABLECELLELEMENT_IID); nsTableCellFrame::nsTableCellFrame() { @@ -118,7 +116,7 @@ void nsTableCellFrame::SetPass1MaxElementSize(const nsSize& aMaxElementSize) nscoord styleWidth = stylePosition->mWidth.GetCoordValue(); if (styleWidth > 0) { nsIDOMHTMLTableCellElement* cellContent = nsnull; - nsresult rv = mContent->QueryInterface(kIDOMHTMLTableCellElementIID, (void **)&cellContent); + nsresult rv = mContent->QueryInterface(NS_GET_IID(nsIDOMHTMLTableCellElement), (void **)&cellContent); if (cellContent && NS_SUCCEEDED(rv)) { PRBool nowrap = PR_FALSE; cellContent->GetNoWrap(&nowrap); @@ -209,7 +207,7 @@ nsresult nsTableCellFrame::SetColIndex(PRInt32 aColIndex) return rv; nsIHTMLTableCellElement* cellContent = nsnull; - rv = cell->QueryInterface(kIHTMLTableCellElementIID, + rv = cell->QueryInterface(NS_GET_IID(nsIHTMLTableCellElement), (void **)&cellContent); // cellContent: REFCNT++ if (cellContent && NS_SUCCEEDED(rv)) { // it's a table cell cellContent->SetColIndex(aColIndex); diff --git a/mozilla/layout/tables/nsTableColFrame.cpp b/mozilla/layout/tables/nsTableColFrame.cpp index a724a4d49c0..2b0905e7698 100644 --- a/mozilla/layout/tables/nsTableColFrame.cpp +++ b/mozilla/layout/tables/nsTableColFrame.cpp @@ -38,7 +38,6 @@ #define COL_TYPE_ANONYMOUS_COLGROUP 0x2 #define COL_TYPE_ANONYMOUS_CELL 0x3 -static NS_DEFINE_IID(kIDOMHTMLTableColElementIID, NS_IDOMHTMLTABLECOLELEMENT_IID); nsTableColFrame::nsTableColFrame() : nsFrame(), diff --git a/mozilla/layout/tables/nsTableColGroupFrame.cpp b/mozilla/layout/tables/nsTableColGroupFrame.cpp index c06c317230b..2d4e048e81d 100644 --- a/mozilla/layout/tables/nsTableColGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableColGroupFrame.cpp @@ -37,8 +37,6 @@ #include "nsIPresShell.h" #include "nsLayoutAtoms.h" -static NS_DEFINE_IID(kIHTMLTableColElementIID, NS_IHTMLTABLECOLELEMENT_IID); -static NS_DEFINE_IID(kIDOMHTMLTableColElementIID, NS_IDOMHTMLTABLECOLELEMENT_IID); #define COLGROUP_TYPE_CONTENT 0x0 #define COLGROUP_TYPE_ANONYMOUS_COL 0x1 @@ -684,7 +682,7 @@ PRInt32 nsTableColGroupFrame::GetSpan() // col group element derives from col element nsIDOMHTMLTableColElement* cgContent = nsnull; - rv = iContent->QueryInterface(kIDOMHTMLTableColElementIID, + rv = iContent->QueryInterface(NS_GET_IID(nsIDOMHTMLTableColElement), (void **)&cgContent); if (cgContent && NS_SUCCEEDED(rv)) { cgContent->GetSpan(&span); diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index ef6b26b15a0..890de106e53 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/layout/tables/nsTableFrame.cpp @@ -61,10 +61,7 @@ #include "nsHTMLReflowCommand.h" #include "nsIFrameManager.h" -static NS_DEFINE_IID(kIHTMLElementIID, NS_IDOMHTMLELEMENT_IID); -static NS_DEFINE_IID(kIBodyElementIID, NS_IDOMHTMLBODYELEMENT_IID); static NS_DEFINE_IID(kITableRowGroupFrameIID, NS_ITABLEROWGROUPFRAME_IID); -static NS_DEFINE_IID(kIScrollableFrameIID, NS_ISCROLLABLE_FRAME_IID); // helper function for dealing with placeholder for positioned/floated table static void GetPlaceholderFor(nsIPresContext& aPresContext, nsIFrame& aFrame, nsIFrame** aPlaceholder); @@ -1152,7 +1149,7 @@ nsTableFrame::GetRowGroupFrame(nsIFrame* aFrame, } else if (nsLayoutAtoms::scrollFrame == frameType) { nsIScrollableFrame* scrollable = nsnull; - nsresult rv = aFrame->QueryInterface(kIScrollableFrameIID, (void **)&scrollable); + nsresult rv = aFrame->QueryInterface(NS_GET_IID(nsIScrollableFrame), (void **)&scrollable); if (NS_SUCCEEDED(rv) && (scrollable)) { nsIFrame* scrolledFrame; scrollable->GetScrolledFrame(nsnull, scrolledFrame); diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp index 8d1792cc12e..70625fe777f 100644 --- a/mozilla/layout/tables/nsTableRowFrame.cpp +++ b/mozilla/layout/tables/nsTableRowFrame.cpp @@ -41,7 +41,6 @@ #include "nsCOMPtr.h" // the following header files are required for style optimizations that work only when the child content is really a cell #include "nsIHTMLTableCellElement.h" -static NS_DEFINE_IID(kIHTMLTableCellElementIID, NS_IHTMLTABLECELLELEMENT_IID); // end includes for style optimizations that require real content knowledge diff --git a/mozilla/layout/xml/document/src/nsXMLDocument.cpp b/mozilla/layout/xml/document/src/nsXMLDocument.cpp index aa64caebb00..bc731c1578b 100644 --- a/mozilla/layout/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/layout/xml/document/src/nsXMLDocument.cpp @@ -433,12 +433,11 @@ nsXMLDocument::StartDocumentLoad(const char* aCommand, } } - static NS_DEFINE_IID(kCParserIID, NS_IPARSER_IID); static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); rv = nsComponentManager::CreateInstance(kCParserCID, nsnull, - kCParserIID, + NS_GET_IID(nsIParser), (void **)&mParser); if (NS_OK == rv) { nsIXMLContentSink* sink; diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp index 310937ae578..1d571df447a 100644 --- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp @@ -83,7 +83,6 @@ #include "nsHTMLContainerFrame.h" static NS_DEFINE_IID(kWidgetCID, NS_CHILD_CID); -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID); //define DEBUG_REDRAW @@ -2370,11 +2369,10 @@ nsBoxFrame::CreateViewForFrame(nsIPresContext* aPresContext, // Create a view static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); - static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); nsresult result = nsComponentManager::CreateInstance(kViewCID, nsnull, - kIViewIID, + NS_GET_IID(nsIView), (void **)&view); if (NS_OK == result) { nsIViewManager* viewManager; @@ -2397,7 +2395,7 @@ nsBoxFrame::CreateViewForFrame(nsIPresContext* aPresContext, // Insert the view into the view hierarchy. If the parent view is a // scrolling view we need to do this differently nsIScrollableView* scrollingView; - if (NS_SUCCEEDED(parentView->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(parentView->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { scrollingView->SetScrolledView(view); } else { viewManager->InsertChild(parentView, view, zIndex); diff --git a/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp b/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp index 98750ceb724..9dca4b09124 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp @@ -42,7 +42,6 @@ #include "nsIFrameManager.h" #include "nsMenuPopupFrame.h" -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); // // NS_NewMenuBarFrame @@ -355,7 +354,7 @@ nsMenuBarFrame::GetNextMenuItem(nsIMenuFrame* aStart, nsIMenuFrame** aResult) nsIFrame* currFrame = nsnull; nsIFrame* startFrame = nsnull; if (aStart) { - aStart->QueryInterface(kIFrameIID, (void**)&currFrame); + aStart->QueryInterface(NS_GET_IID(nsIFrame), (void**)&currFrame); if (currFrame) { startFrame = currFrame; currFrame->GetNextSibling(&currFrame); @@ -423,7 +422,7 @@ nsMenuBarFrame::GetPreviousMenuItem(nsIMenuFrame* aStart, nsIMenuFrame** aResult nsIFrame* currFrame = nsnull; nsIFrame* startFrame = nsnull; if (aStart) { - aStart->QueryInterface(kIFrameIID, (void**)&currFrame); + aStart->QueryInterface(NS_GET_IID(nsIFrame), (void**)&currFrame); if (currFrame) { startFrame = currFrame; currFrame = frames.GetPrevSiblingFor(currFrame); diff --git a/mozilla/layout/xul/base/src/nsMenuDismissalListener.cpp b/mozilla/layout/xul/base/src/nsMenuDismissalListener.cpp index 7cc58f81486..3fc6643a861 100644 --- a/mozilla/layout/xul/base/src/nsMenuDismissalListener.cpp +++ b/mozilla/layout/xul/base/src/nsMenuDismissalListener.cpp @@ -105,7 +105,6 @@ NS_IMETHODIMP nsMenuDismissalListener::ShouldRollupOnMouseWheelEvent(PRBool *aSh // uggggh. -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); NS_IMETHODIMP @@ -121,7 +120,7 @@ nsMenuDismissalListener::GetSubmenuWidgetChain(nsISupportsArray **_retval) // move up the chain nsIFrame* currAsFrame = nsnull; - if ( NS_SUCCEEDED(curr->QueryInterface(kIFrameIID, NS_REINTERPRET_CAST(void**,&currAsFrame))) ) { + if ( NS_SUCCEEDED(curr->QueryInterface(NS_GET_IID(nsIFrame), NS_REINTERPRET_CAST(void**,&currAsFrame))) ) { nsIFrame* parentFrame = nsnull; currAsFrame->GetParent(&parentFrame); nsIMenuParent* next; diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp index 523a7533a79..3da92f63b28 100644 --- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp @@ -73,8 +73,6 @@ static PRInt32 gEatMouseMove = PR_FALSE; nsMenuDismissalListener* nsMenuFrame::mDismissalListener = nsnull; static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); // @@ -424,7 +422,7 @@ nsMenuFrame::HandleEvent(nsIPresContext* aPresContext, nsILookAndFeel * lookAndFeel; if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, - kILookAndFeelIID, (void**)&lookAndFeel)) { + NS_GET_IID(nsILookAndFeel), (void**)&lookAndFeel)) { lookAndFeel->GetMetric(nsILookAndFeel::eMetric_SubmenuDelay, menuDelay); NS_RELEASE(lookAndFeel); } @@ -1600,7 +1598,7 @@ nsMenuFrame::GetActiveChild(nsIDOMElement** aResult) } else { nsIFrame* f; - menuFrame->QueryInterface(kIFrameIID, (void**)&f); + menuFrame->QueryInterface(NS_GET_IID(nsIFrame), (void**)&f); nsCOMPtr c; f->GetContent(getter_AddRefs(c)); nsCOMPtr elt(do_QueryInterface(c)); diff --git a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp index 6d44d831dcc..ad16025694d 100644 --- a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp @@ -55,12 +55,9 @@ #include "nsIFrameManager.h" static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); -static NS_DEFINE_IID(kFrameIID, NS_IFRAME_IID); const PRInt32 kMaxZ = 0x7fffffff; //XXX: Shouldn't there be a define somewhere for MaxInt for PRInt32 -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); // NS_NewMenuPopupFrame // @@ -126,7 +123,7 @@ nsMenuPopupFrame::Init(nsIPresContext* aPresContext, // lookup if we're allowed to overlap the OS bar (menubar/taskbar) from the // look&feel object nsCOMPtr lookAndFeel; - nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, + nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, NS_GET_IID(nsILookAndFeel), getter_AddRefs(lookAndFeel)); if ( lookAndFeel ) lookAndFeel->GetMetric(nsILookAndFeel::eMetric_MenusCanOverlapOSBar, mMenuCanOverlapOSBar); @@ -774,7 +771,7 @@ nsMenuPopupFrame::GetNextMenuItem(nsIMenuFrame* aStart, nsIMenuFrame** aResult) nsIFrame* currFrame = nsnull; nsIFrame* startFrame = nsnull; if (aStart) { - aStart->QueryInterface(kIFrameIID, (void**)&currFrame); + aStart->QueryInterface(NS_GET_IID(nsIFrame), (void**)&currFrame); if (currFrame) { startFrame = currFrame; currFrame->GetNextSibling(&currFrame); @@ -844,7 +841,7 @@ nsMenuPopupFrame::GetPreviousMenuItem(nsIMenuFrame* aStart, nsIMenuFrame** aResu nsIFrame* currFrame = nsnull; nsIFrame* startFrame = nsnull; if (aStart) { - aStart->QueryInterface(kIFrameIID, (void**)&currFrame); + aStart->QueryInterface(NS_GET_IID(nsIFrame), (void**)&currFrame); if (currFrame) { startFrame = currFrame; currFrame = frames.GetPrevSiblingFor(currFrame); @@ -910,7 +907,7 @@ nsIScrollableView* nsMenuPopupFrame::GetScrollableView(nsIFrame* aStart) do { currFrame->GetView(mPresContext, &view); if ( view ) - view->QueryInterface(nsIScrollableView::GetIID(), (void**)&scrollableView); + view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollableView); if ( scrollableView ) return scrollableView; currFrame->GetNextSibling(&currFrame); @@ -933,7 +930,7 @@ nsIScrollableView* nsMenuPopupFrame::GetScrollableView(nsIFrame* aStart) void nsMenuPopupFrame::EnsureMenuItemIsVisible(nsIMenuFrame* aMenuItem) { nsIFrame* frame=nsnull; - aMenuItem->QueryInterface(kFrameIID, (void**)&frame); + aMenuItem->QueryInterface(NS_GET_IID(nsIFrame), (void**)&frame); if ( frame ) { nsIFrame* childFrame=nsnull; FirstChild(mPresContext, nsnull, &childFrame); @@ -941,7 +938,7 @@ void nsMenuPopupFrame::EnsureMenuItemIsVisible(nsIMenuFrame* aMenuItem) scrollableView=GetScrollableView(childFrame); if ( scrollableView ) { nsIView* view=nsnull; - scrollableView->QueryInterface(nsIView::GetIID(), (void**)&view); + scrollableView->QueryInterface(NS_GET_IID(nsIView), (void**)&view); if ( view ) { nsRect viewRect, itemRect; nscoord scrollX, scrollY; @@ -980,7 +977,7 @@ NS_IMETHODIMP nsMenuPopupFrame::SetCurrentMenuItem(nsIMenuFrame* aMenuItem) nsILookAndFeel * lookAndFeel; if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, - kILookAndFeelIID, (void**)&lookAndFeel)) { + NS_GET_IID(nsILookAndFeel), (void**)&lookAndFeel)) { lookAndFeel->GetMetric(nsILookAndFeel::eMetric_SubmenuDelay, menuDelay); NS_RELEASE(lookAndFeel); } diff --git a/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp b/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp index e71b31422c8..59e0e95f2b6 100644 --- a/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp +++ b/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp @@ -56,7 +56,6 @@ #define NS_MENU_POPUP_LIST_INDEX 0 -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); // // NS_NewPopupSetFrame @@ -712,7 +711,7 @@ nsPopupSetFrame::GetActiveChild(nsIDOMElement** aResult) } else { nsIFrame* f; - menuFrame->QueryInterface(kIFrameIID, (void**)&f); + menuFrame->QueryInterface(NS_GET_IID(nsIFrame), (void**)&f); nsCOMPtr c; f->GetContent(getter_AddRefs(c)); nsCOMPtr elt(do_QueryInterface(c)); diff --git a/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp b/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp index 28ee2d61818..f7e0848623c 100644 --- a/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp @@ -47,8 +47,6 @@ #include "nsStackLayout.h" // Interface IDs -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); //#define DEBUG_REFLOW diff --git a/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp b/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp index 69399081615..ce6ccc28582 100644 --- a/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp @@ -54,8 +54,6 @@ static NS_DEFINE_IID(kWidgetCID, NS_CHILD_CID); static NS_DEFINE_IID(kScrollBoxViewCID, NS_SCROLL_PORT_VIEW_CID); static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); -static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID); -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); //---------------------------------------------------------------------- @@ -239,7 +237,7 @@ nsScrollBoxFrame::CreateScrollingView(nsIPresContext* aPresContext) // Create the scrolling view nsresult rv = nsComponentManager::CreateInstance(kScrollBoxViewCID, nsnull, - kIViewIID, + NS_GET_IID(nsIView), (void **)&view); @@ -283,7 +281,7 @@ nsScrollBoxFrame::CreateScrollingView(nsIPresContext* aPresContext) // Get the nsIScrollableView interface nsIScrollableView* scrollingView; - view->QueryInterface(kScrollViewIID, (void**)&scrollingView); + view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView); scrollingView->SetScrollPreference(nsScrollPreference_kNeverScroll); @@ -418,7 +416,7 @@ nsScrollBoxFrame::DoLayout(nsBoxLayoutState& aState) nsIScrollableView* scrollingView; nsIView* view; GetView(presContext, &view); - if (NS_SUCCEEDED(view->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { scrollingView->ComputeScrollOffsets(PR_TRUE); } @@ -482,7 +480,7 @@ nsScrollBoxFrame::DoLayout(nsBoxLayoutState& aState) nsIScrollableView* scrollingView; nsIView* view; GetView(presContext, &view); - if (NS_SUCCEEDED(view->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { nsIView* child = nsnull; nsRect childRect(0,0,0,0); @@ -682,7 +680,7 @@ nsScrollBoxFrame::SaveState(nsIPresContext* aPresContext, nsIScrollableView* scrollingView; nsIView* view; GetView(aPresContext, &view); - if (NS_SUCCEEDED(view->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { scrollingView->GetScrollPosition(x,y); } nsIView* child = nsnull; diff --git a/mozilla/layout/xul/base/src/nsScrollBoxObject.cpp b/mozilla/layout/xul/base/src/nsScrollBoxObject.cpp index 425b403c544..0de2e0ad13f 100644 --- a/mozilla/layout/xul/base/src/nsScrollBoxObject.cpp +++ b/mozilla/layout/xul/base/src/nsScrollBoxObject.cpp @@ -34,7 +34,6 @@ #include "nsIScrollableView.h" #include "nsIBox.h" -static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID); class nsScrollBoxObject : public nsIScrollBoxObject, public nsBoxObject { @@ -249,7 +248,7 @@ nsScrollBoxObject::GetScrollableView() nsIView* view; frame->GetView(context, &view); nsIScrollableView* scrollingView = nsnull; - if (NS_SUCCEEDED(view->QueryInterface(kScrollViewIID, (void**)&scrollingView))) { + if (NS_SUCCEEDED(view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) { return scrollingView; } diff --git a/mozilla/layout/xul/base/src/nsXULTreeCellFrame.cpp b/mozilla/layout/xul/base/src/nsXULTreeCellFrame.cpp index 217e02b6330..4534a238efd 100644 --- a/mozilla/layout/xul/base/src/nsXULTreeCellFrame.cpp +++ b/mozilla/layout/xul/base/src/nsXULTreeCellFrame.cpp @@ -34,7 +34,6 @@ #include "nsMonumentLayout.h" #include "nsTempleLayout.h" -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); // // NS_NewXULTreeCellFrame @@ -145,7 +144,7 @@ nsXULTreeCellFrame::GetFrameForPoint(nsIPresContext* aPresContext, child->GetNextBox(&splitBox); nsIFrame* splitter = nsnull; if (splitBox) - splitBox->QueryInterface(kIFrameIID, (void**)&splitter); + splitBox->QueryInterface(NS_GET_IID(nsIFrame), (void**)&splitter); nsCOMPtr tag; nsCOMPtr content; if (splitter) { diff --git a/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.cpp b/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.cpp index c6fd7f5370d..1a49337345a 100644 --- a/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.cpp +++ b/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.cpp @@ -66,7 +66,6 @@ // do we wait before checking again? #define SMOOTH_INTERVAL 100 -static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID); nsresult NS_NewAutoScrollTimer(nsXULTreeOuterGroupFrame* aTree, nsDragAutoScrollTimer **aResult) ; @@ -751,7 +750,7 @@ nsXULTreeOuterGroupFrame::InternalPositionChanged(PRBool aUp, PRInt32 aDelta, PR nsIBox* nextBox; currBox->GetNextBox(&nextBox); nsIFrame* frame; - currBox->QueryInterface(kIFrameIID, (void**)&frame); + currBox->QueryInterface(NS_GET_IID(nsIFrame), (void**)&frame); mFrameConstructor->RemoveMappingsForFrameSubtree(mPresContext, frame, nsnull); currBox = nextBox; }