Remove definition of NS_DECL_IOBSERVER and SERVICE and replace uses with xpidl-generated NS_DECL_NSIOBSERVER macro.

extensions/pics/public/nsPICSElementObserver.h

@@ -57,7 +57,7 @@ public:
                     PRUint32 numOfAttributes, const PRUnichar* nameArray[], 
                     const PRUnichar* valueArray[]);
 
-  NS_DECL_IOBSERVER
+  NS_DECL_NSIOBSERVER
 
   NS_DECL_ISUPPORTS
 

extensions/wallet/src/nsWalletService.h

@@ -57,7 +57,7 @@ public:
   NS_IMETHOD SI_SignonViewerReturn(nsAutoString results);
 
   // nsIObserver
-  NS_DECL_IOBSERVER
+  NS_DECL_NSIOBSERVER
   NS_IMETHOD Notify(nsIContent* formNode);
 
   // nsIDocumentLoaderObserver

intl/chardet/src/nsMetaCharsetObserver.cpp

@@ -68,7 +68,7 @@ public:
                     const PRUnichar* nameArray[], const PRUnichar* valueArray[]);
 
   /* methode for nsIObserver */
-  NS_DECL_IOBSERVER
+  NS_DECL_NSIOBSERVER
 
   /* methode for nsIMetaCharsetService */
   NS_IMETHOD Start();

intl/chardet/src/nsXMLEncodingObserver.cpp

@@ -68,7 +68,7 @@ public:
                     const PRUnichar* nameArray[], const PRUnichar* valueArray[]);
 
   /* methode for nsIObserver */
-  NS_DECL_IOBSERVER
+  NS_DECL_NSIOBSERVER
 
   /* methode for nsIXMLEncodingService */
   NS_IMETHOD Start();

xpcom/ds/nsIObserver.idl

@@ -41,7 +41,4 @@ interface nsIObserver : nsISupports {
 
 #define NS_OBSERVER_CLASSNAME "Observer"
 
-#define NS_DECL_IOBSERVER \
-    NS_IMETHOD Observe( nsISupports*, const PRUnichar*, const PRUnichar* );
-
 %}

xpcom/ds/nsIObserverService.idl

@@ -38,10 +38,4 @@ interface nsIObserverService : nsISupports {
 
 #define NS_OBSERVERSERVICE_CLASSNAME "Observer Service"
 
-#define NS_DECL_IOBSERVERSERVICE \
-  NS_IMETHOD AddObserver(nsIObserver*, const PRUnichar*);              \
-  NS_IMETHOD RemoveObserver(nsIObserver*, const PRUnichar*);           \
-  NS_IMETHOD EnumerateObserverList(const PRUnichar*, nsIEnumerator**); \
-  NS_IMETHOD Notify(nsISupports*, const PRUnichar*, const PRUnichar*); \
-
 %}

xpcom/ds/nsObserver.h

@@ -31,7 +31,7 @@ public:
 
     NS_DEFINE_STATIC_CID_ACCESSOR( NS_OBSERVER_CID )
  
-    NS_DECL_IOBSERVER
+    NS_DECL_NSIOBSERVER
  
     nsObserver(nsISupports* outer);
     virtual ~nsObserver(void);

xpcom/ds/nsObserverService.h

@@ -35,7 +35,7 @@ public:
 
 	static nsresult GetObserverService(nsIObserverService** anObserverService);
     
-    NS_DECL_IOBSERVERSERVICE
+    NS_DECL_NSIOBSERVERSERVICE
    
   nsObserverService();
   virtual ~nsObserverService(void);

xpcom/tests/TestObserverService.cpp

@@ -51,7 +51,7 @@ public:
     }
     virtual ~TestObserver() {}
     NS_DECL_ISUPPORTS
-    NS_DECL_IOBSERVER
+    NS_DECL_NSIOBSERVER
     nsString mName;
 };
 

xpfe/AppCores/src/nsBrowserAppCore.h

@@ -128,7 +128,7 @@ class nsBrowserAppCore : public nsBaseAppCore,
 
 
     // nsIObserver
-    NS_DECL_IOBSERVER
+    NS_DECL_NSIOBSERVER
 
 
 	// nsISessionHistory methods