Bug 13004: nsDOMEventsIIDs.cpp/.h should go.

Patch by jst, r=jag, sr=brendan.

content/base/src/nsGenericElement.cpp

@@ -46,7 +46,6 @@
 #include "nsIView.h"
 #include "nsIViewManager.h"
 #include "nsString.h"
-#include "nsDOMEventsIIDs.h"
 #include "nsIEventStateManager.h"
 #include "nsIDOMEvent.h"
 #include "nsIPrivateDOMEvent.h"

content/build/Makefile.in

@@ -44,10 +44,6 @@ CPPSRCS		= \
 		nsContentHTTPStartup.cpp \
 		$(NULL)
 
-ifndef MKSHLIB_FORCE_ALL
-CPPSRCS		+= dlldeps.cpp
-endif
-
 EXPORTS		= nsContentCID.h
 
 SHARED_LIBRARY_LIBS = \

content/build/makefile.win

@@ -25,7 +25,6 @@ include <$(DEPTH)/config/config.mak>
 DEFINES=-D_IMPL_NS_HTML 
 
 CPP_OBJS=				\
-	.\$(OBJDIR)\dlldeps.obj		\
 	.\$(OBJDIR)\nsContentDLF.obj	\
 	.\$(OBJDIR)\nsContentFactory.obj	\
 	.\$(OBJDIR)\nsContentModule.obj	\

content/events/src/MANIFEST

@@ -1,4 +1,3 @@
 #
 # This is a list of local files which get copied to the mozilla:dist:layout directory
 #
-nsDOMEventsIIDs.h

content/events/src/Makefile.in

@@ -34,15 +34,10 @@ CPPSRCS		= \
 		nsEventListenerManager.cpp \
 		nsEventStateManager.cpp \
 		nsDOMEvent.cpp \
-    nsDOMMutationEvent.cpp \
-		nsDOMEventsIIDs.cpp \
+		nsDOMMutationEvent.cpp \
 		nsPrivateTextRange.cpp \
 		$(NULL)
 
-EXPORTS		= \
-		nsDOMEventsIIDs.h \
-		$(NULL)
-
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 # we don't want the shared lib, but we want to force the creation of a static lib.

content/events/src/makefile.win

@@ -33,7 +33,6 @@ CPPSRCS=    nsEventListenerManager.cpp  \
 	    nsEventStateManager.cpp  \
 	    nsDOMEvent.cpp		\
 	    nsDOMMutationEvent.cpp \
-	    nsDOMEventsIIDs.cpp		\
 	    nsPrivateTextRange.cpp		\
 	    $(NULL)
 
@@ -41,13 +40,10 @@ CPP_OBJS=   .\$(OBJDIR)\nsEventListenerManager.obj  \
 	    .\$(OBJDIR)\nsEventStateManager.obj  \
 	    .\$(OBJDIR)\nsDOMEvent.obj	    \
 	    .\$(OBJDIR)\nsDOMMutationEvent.obj \
-	    .\$(OBJDIR)\nsDOMEventsIIDs.obj	    \
 	    .\$(OBJDIR)\nsPrivateTextRange.obj	    \
 	    $(NULL)
 
 
-EXPORTS= nsDOMEventsIIDs.h
-
 LINCS= -I..\..\html\base\src -I..\..\xul\content\src -I..\..\base\src
 
 LCFLAGS = \

content/events/src/nsDOMEventsIIDs.cpp

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#include "nsDOMEventsIIDs.h"
-#include "nsIDOMMouseListener.h"
-#include "nsIDOMKeyListener.h"
-#include "nsIDOMMouseMotionListener.h"
-#include "nsIDOMContextMenuListener.h"
-#include "nsIDOMFocusListener.h"
-#include "nsIDOMFormListener.h"
-#include "nsIDOMLoadListener.h"
-#include "nsIDOMDragListener.h"
-#include "nsIDOMPaintListener.h"
-#include "nsIDOMTextListener.h"
-#include "nsIDOMCompositionListener.h"
-#include "nsIDOMMenuListener.h"
-#include "nsIDOMScrollListener.h"
-#include "nsIDOMMutationListener.h"
-
-NS_DEFINE_IID(kIDOMMouseListenerIID, NS_IDOMMOUSELISTENER_IID);
-NS_DEFINE_IID(kIDOMKeyListenerIID, NS_IDOMKEYLISTENER_IID);
-NS_DEFINE_IID(kIDOMMouseMotionListenerIID, NS_IDOMMOUSEMOTIONLISTENER_IID);
-NS_DEFINE_IID(kIDOMContextMenuListenerIID, NS_IDOMCONTEXTMENULISTENER_IID);
-NS_DEFINE_IID(kIDOMFocusListenerIID, NS_IDOMFOCUSLISTENER_IID);
-NS_DEFINE_IID(kIDOMFormListenerIID, NS_IDOMFORMLISTENER_IID);
-NS_DEFINE_IID(kIDOMLoadListenerIID, NS_IDOMLOADLISTENER_IID);
-NS_DEFINE_IID(kIDOMDragListenerIID, NS_IDOMDRAGLISTENER_IID);
-NS_DEFINE_IID(kIDOMPaintListenerIID, NS_IDOMPAINTLISTENER_IID);
-NS_DEFINE_IID(kIDOMTextListenerIID,NS_IDOMTEXTLISTENER_IID);
-NS_DEFINE_IID(kIDOMCompositionListenerIID,NS_IDOMCOMPOSITIONLISTENER_IID);
-NS_DEFINE_IID(kIDOMMenuListenerIID, NS_IDOMMENULISTENER_IID);
-NS_DEFINE_IID(kIDOMScrollListenerIID, NS_IDOMSCROLLLISTENER_IID);
-NS_DEFINE_IID(kIDOMMutationListenerIID, NS_IDOMMUTATIONLISTENER_IID);

content/events/src/nsDOMEventsIIDs.h

@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsDOMEVENTSIIDs_h___
-#define nsDOMEVENTSIIDs_h___
-
-#include "nsISupports.h"
-
-extern const nsIID kIDOMMouseListenerIID;
-extern const nsIID kIDOMKeyListenerIID;
-extern const nsIID kIDOMMouseMotionListenerIID;
-extern const nsIID kIDOMContextMenuListenerIID;
-extern const nsIID kIDOMFocusListenerIID;
-extern const nsIID kIDOMFormListenerIID;
-extern const nsIID kIDOMLoadListenerIID;
-extern const nsIID kIDOMDragListenerIID;
-extern const nsIID kIDOMPaintListenerIID;
-extern const nsIID kIDOMTextListenerIID;
-extern const nsIID kIDOMCompositionListenerIID;
-extern const nsIID kIDOMMenuListenerIID;
-extern const nsIID kIDOMScrollListenerIID;
-extern const nsIID kIDOMMutationListenerIID;
-
-#endif /* nsDOMEVENTSIIDs_h___ */

content/events/src/nsEventListenerManager.cpp

@@ -44,7 +44,6 @@
 #include "nsIPrivateDOMEvent.h"
 #include "nsIScriptEventListener.h"
 #include "nsIJSEventListener.h"
-#include "nsDOMEventsIIDs.h"
 #include "prmem.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsLayoutAtoms.h"
@@ -279,20 +278,48 @@ nsVoidArray* nsEventListenerManager::GetListenersByType(EventArrayType aType,
 
 EventArrayType nsEventListenerManager::GetTypeForIID(const nsIID& aIID)
 { 
-  if (aIID.Equals(kIDOMMouseListenerIID)) return eEventArrayType_Mouse;
-  if (aIID.Equals(kIDOMMouseMotionListenerIID)) return eEventArrayType_MouseMotion;
-  if (aIID.Equals(kIDOMContextMenuListenerIID)) return eEventArrayType_ContextMenu;
-  if (aIID.Equals(kIDOMKeyListenerIID)) return eEventArrayType_Key;
-  if (aIID.Equals(kIDOMLoadListenerIID)) return eEventArrayType_Load;
-  if (aIID.Equals(kIDOMFocusListenerIID)) return eEventArrayType_Focus;
-  if (aIID.Equals(kIDOMFormListenerIID)) return eEventArrayType_Form;
-  if (aIID.Equals(kIDOMDragListenerIID)) return eEventArrayType_Drag;
-  if (aIID.Equals(kIDOMPaintListenerIID)) return eEventArrayType_Paint;
-  if (aIID.Equals(kIDOMTextListenerIID)) return eEventArrayType_Text;
-  if (aIID.Equals(kIDOMCompositionListenerIID)) return eEventArrayType_Composition;
-  if (aIID.Equals(kIDOMMenuListenerIID)) return eEventArrayType_Menu;
-  if (aIID.Equals(kIDOMScrollListenerIID)) return eEventArrayType_Scroll;
-  if (aIID.Equals(kIDOMMutationListenerIID)) return eEventArrayType_Mutation;
+  if (aIID.Equals(NS_GET_IID(nsIDOMMouseListener)))
+      return eEventArrayType_Mouse;
+
+  if (aIID.Equals(NS_GET_IID(nsIDOMMouseMotionListener)))
+    return eEventArrayType_MouseMotion;
+
+  if (aIID.Equals(NS_GET_IID(nsIDOMContextMenuListener)))
+    return eEventArrayType_ContextMenu;
+
+  if (aIID.Equals(NS_GET_IID(nsIDOMKeyListener)))
+    return eEventArrayType_Key;
+
+  if (aIID.Equals(NS_GET_IID(nsIDOMLoadListener)))
+    return eEventArrayType_Load;
+
+  if (aIID.Equals(NS_GET_IID(nsIDOMFocusListener)))
+    return eEventArrayType_Focus;
+
+  if (aIID.Equals(NS_GET_IID(nsIDOMFormListener)))
+    return eEventArrayType_Form;
+
+  if (aIID.Equals(NS_GET_IID(nsIDOMDragListener)))
+    return eEventArrayType_Drag;
+
+  if (aIID.Equals(NS_GET_IID(nsIDOMPaintListener)))
+    return eEventArrayType_Paint;
+
+  if (aIID.Equals(NS_GET_IID(nsIDOMTextListener)))
+    return eEventArrayType_Text;
+
+  if (aIID.Equals(NS_GET_IID(nsIDOMCompositionListener)))
+    return eEventArrayType_Composition;
+
+  if (aIID.Equals(NS_GET_IID(nsIDOMMenuListener)))
+    return eEventArrayType_Menu;
+
+  if (aIID.Equals(NS_GET_IID(nsIDOMScrollListener)))
+    return eEventArrayType_Scroll;
+
+  if (aIID.Equals(NS_GET_IID(nsIDOMMutationListener)))
+    return eEventArrayType_Mutation;
+
   return eEventArrayType_None;
 }
 

content/html/content/src/nsGenericHTMLElement.cpp

@@ -70,7 +70,6 @@
 #include "nsString.h"
 #include "nsLayoutAtoms.h"
 #include "nsHTMLAtoms.h"
-#include "nsDOMEventsIIDs.h"
 #include "nsIEventStateManager.h"
 #include "nsIDOMEvent.h"
 #include "nsIPrivateDOMEvent.h"

content/html/content/src/nsHTMLUnknownElement.cpp

@@ -31,7 +31,6 @@
 #include "nsHTMLAtoms.h"
 #include "nsIEventListenerManager.h"
 #include "nsIDOMEventReceiver.h"
-#include "nsDOMEventsIIDs.h"
 #include "nsIDocument.h"
 #include "nsIHTMLStyleSheet.h"
 #include "nsIHTMLContentContainer.h"