First cut at removing manual declaration of interface methods in implementation classes and replacing with xpidl-generated NS_DECL_NSIFOO macro.

Hopefully this'll help turn the copy-n-paste tide towards using this macro.

editor/base/nsEditorShell.h

@@ -75,165 +75,12 @@ class nsEditorShell :   public nsIEditorShell,
     virtual ~nsEditorShell();
 
     NS_DECL_ISUPPORTS
-    
-  //  NS_IMETHOD    GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
-    NS_IMETHOD    Init();
-  //  NS_IMETHOD    GetId(nsString& aId);	// { return nsBaseAppCore::GetId(aId); } 
-  //  NS_IMETHOD    SetDocumentCharset(const nsString& aCharset);	//  { return nsBaseAppCore::SetDocumentCharset(aCharset); } 
 
+    /* Declare all methods in the nsIEditorShell interface */
+    NS_DECL_NSIEDITORSHELL
 
-    /* nsIEditorShell interface */
+    /* Declare all methods in the nsIEditorSpellCheck interface */
-
+    NS_DECL_NSIEDITORSPELLCHECK
-	  NS_IMETHOD GetEditorDocument(nsIDOMDocument * *aEditorDocument);
-	  NS_IMETHOD GetEditorSelection(nsIDOMSelection * *aEditorSelection);
-
-    NS_IMETHOD GetDocumentModified(PRBool *aDocumentModified);
-
-	  NS_IMETHOD GetWrapColumn(PRInt32 *aWrapColumn);
-	  NS_IMETHOD SetWrapColumn(PRInt32 aWrapColumn);
-
-	  NS_IMETHOD SetEditorType(const PRUnichar *editorType);
-
-	  NS_IMETHOD SetToolbarWindow(nsIDOMWindow *win);
-	  NS_IMETHOD SetContentWindow(nsIDOMWindow *win);
-	  NS_IMETHOD SetWebShellWindow(nsIDOMWindow *win);
-	  NS_IMETHOD LoadUrl(const PRUnichar *url);
-    NS_IMETHOD RegisterDocumentStateListener(nsIDocumentStateListener *docListener);
-    NS_IMETHOD UnregisterDocumentStateListener(nsIDocumentStateListener *docListener);
-
-	  /* void NewWindow (); */
-	  NS_IMETHOD NewWindow();
-	  NS_IMETHOD Open();
-	  NS_IMETHOD Save();
-	  NS_IMETHOD SaveAs();
-	  NS_IMETHOD CloseWindow();
-	  NS_IMETHOD Print();
-	  NS_IMETHOD Exit();
-
-	  NS_IMETHOD Undo();
-	  NS_IMETHOD Redo();
-	  NS_IMETHOD Cut();
-	  NS_IMETHOD Copy();
-	  NS_IMETHOD Paste();
-
-	  NS_IMETHOD PasteAsQuotation();
-	  NS_IMETHOD PasteAsCitedQuotation(const PRUnichar *cite);
-	  NS_IMETHOD InsertAsQuotation(const PRUnichar *quotedText);
-	  NS_IMETHOD InsertAsCitedQuotation(const PRUnichar *quotedText, const PRUnichar *cite);
-
-	  NS_IMETHOD SelectAll();
-	  NS_IMETHOD DeleteSelection(PRInt32 direction);
-
-	  /* void Find (); */
-	  NS_IMETHOD Find();
-	  NS_IMETHOD FindNext();
-
-	  /* Charset Menu */
-	  NS_IMETHOD GetDocumentCharacterSet(PRUnichar **characterSet);
-	  NS_IMETHOD SetDocumentCharacterSet(const PRUnichar *characterSet);
-
-	  /* void InsertText (in wstring textToInsert); */
-	  NS_IMETHOD InsertText(const PRUnichar *textToInsert);
-	  NS_IMETHOD InsertSource(const PRUnichar *sourceToInsert);
-    NS_IMETHOD InsertBreak();
-	  NS_IMETHOD InsertList(const PRUnichar *listType);
-
-	  /* void Indent (in string indent); */
-	  NS_IMETHOD Indent(const PRUnichar *indent);
-	  NS_IMETHOD Align(const PRUnichar *align);
-
-    /* nsIDOMElement GetSelectedElement (in wstring tagName); */
-	  NS_IMETHOD GetSelectedElement(const PRUnichar *tagName, nsIDOMElement **_retval);
-    NS_IMETHOD GetElementOrParentByTagName(const PRUnichar *tagName, nsIDOMNode *aNode, nsIDOMElement **_retval);
-	  NS_IMETHOD CreateElementWithDefaults(const PRUnichar *tagName, nsIDOMElement **_retval);
-	  NS_IMETHOD InsertElement(nsIDOMElement *element, PRBool deleteSelection);
-    NS_IMETHOD SaveHLineSettings(nsIDOMElement* aElement);
-	  NS_IMETHOD InsertLinkAroundSelection(nsIDOMElement *anchorElement);
-	  NS_IMETHOD SelectElement(nsIDOMElement *element);
-	  NS_IMETHOD SetSelectionAfterElement(nsIDOMElement *element);
-
-    /* Table insert and delete methods. Done relative to selected cell or
-       cell containing the selection anchor */
-    NS_IMETHOD InsertTableCell(PRInt32 aNumber, PRBool bAfter);
-    NS_IMETHOD InsertTableRow(PRInt32 aNumber, PRBool bAfter);
-    NS_IMETHOD InsertTableColumn(PRInt32 aNumber, PRBool bAfter);
-    NS_IMETHOD DeleteTable();
-    NS_IMETHOD DeleteTableCell(PRInt32 aNumber);
-    NS_IMETHOD DeleteTableRow(PRInt32 aNumber);
-    NS_IMETHOD DeleteTableColumn(PRInt32 aNumber);
-    NS_IMETHOD JoinTableCells();
-   /** Make table "rectangular" -- fill in all missing cellmap locations
-     * If aTable is null, it uses table enclosing the selection anchor
-     */
-   NS_IMETHOD NormalizeTable(nsIDOMElement *aTable);
-
-    /* Get the row and col indexes in layout's cellmap */
-    NS_IMETHOD GetRowIndex(nsIDOMElement *aCell, PRInt32 *_retval);
-    NS_IMETHOD GetColumnIndex(nsIDOMElement *aCell, PRInt32 *_retval);
-    /** Get the number of rows in a table from the layout's cellmap */
-    NS_IMETHOD GetTableRowCount(nsIDOMElement *aTable, PRInt32 *_retval);
-    /** Get the number of columns in a table from the layout's cellmap */
-    NS_IMETHOD GetTableColumnCount(nsIDOMElement *aTable, PRInt32 *_retval);
-
-    /* Get a cell and associated data from the layout frame  based on cell map coordinates (0 index) */
-    NS_IMETHOD GetCellAt(nsIDOMElement* aTable, PRInt32 aRowIndex, PRInt32 aColIndex, nsIDOMElement **_retval);
-    /* Note that the return param in the IDL must be the LAST out param here (_retval) */
-    NS_IMETHOD GetCellDataAt(nsIDOMElement* aTable, PRInt32 aRowIndex, PRInt32 aColIndex,
-                             PRInt32 *aStartRowIndex, PRInt32 *aStartColIndex,
-                             PRInt32 *aRowSpan, PRInt32 *aColSpan, PRBool *aIsSelected, nsIDOMElement **_retval);
-
-    /* Get list of embedded objects, e.g. for mail compose */
-    NS_IMETHOD GetEmbeddedObjects(nsISupportsArray **aObjectArray);
-
-    /* void SetParagraphFormat (in string value); */
-	  NS_IMETHOD SetParagraphFormat(PRUnichar *value);
-	  NS_IMETHOD GetParagraphFormat(PRUnichar * *aParagraphFormat);
-
-	  /* void SetTextProperty (in string prop, in string attr, in string value); */
-	  NS_IMETHOD SetTextProperty(const PRUnichar *prop, const PRUnichar *attr, const PRUnichar *value);
-	  NS_IMETHOD GetTextProperty(const PRUnichar *prop, const PRUnichar *attr, const PRUnichar *value, PRBool *firstHas, PRBool *anyHas, PRBool *allHas);
-    NS_IMETHOD RemoveTextProperty(const PRUnichar *prop, const PRUnichar *attr);
-
-	  /* void SetBodyAttribute (in string attr, in string value); */
-	  NS_IMETHOD SetBodyAttribute(const PRUnichar *attr, const PRUnichar *value);
-	  NS_IMETHOD SetBackgroundColor(const PRUnichar *color);
-
-	  NS_IMETHOD ApplyStyleSheet(const PRUnichar *url);
-
-    /* Get the contents, for output or other uses */
-    NS_IMETHOD GetContentsAs(const PRUnichar *format, PRUint32 flags, PRUnichar **contentsAs);
-
-    /* Debugging: dump content tree to stdout */
-    NS_IMETHOD DumpContentTree();
-
-	  /* string GetLocalFileURL (in nsIDOMWindow parent, in string filterType); */
-	  NS_IMETHOD GetLocalFileURL(nsIDOMWindow *parent, const PRUnichar *filterType, PRUnichar **_retval);
-
-	  /* void BeginBatchChanges (); */
-	  NS_IMETHOD BeginBatchChanges();
-	  NS_IMETHOD EndBatchChanges();
-
-	  /* void RunUnitTests (); */
-	  NS_IMETHOD RunUnitTests();
-
-    /* void BeginLogging (); */
-	  NS_IMETHOD StartLogging(nsIFileSpec *logFile);
-	  NS_IMETHOD StopLogging();
-
-
-    /* Spell check interface */
-    NS_IMETHOD StartSpellChecking(PRUnichar **_retval);
-    NS_IMETHOD GetNextMisspelledWord(PRUnichar **_retval);
-    NS_IMETHOD GetSuggestedWord(PRUnichar **_retval);
-    NS_IMETHOD CheckCurrentWord(const PRUnichar *suggestedWord, PRBool *_retval);
-    NS_IMETHOD ReplaceWord(const PRUnichar *misspelledWord, const PRUnichar *replaceWord, PRBool allOccurrences);
-    NS_IMETHOD IgnoreWordAllOccurrences(const PRUnichar *word);
-    NS_IMETHOD GetPersonalDictionary();
-    NS_IMETHOD GetPersonalDictionaryWord(PRUnichar **_retval);
-    NS_IMETHOD AddWordToDictionary(const PRUnichar *word);
-    NS_IMETHOD RemoveWordFromDictionary(const PRUnichar *word);
-    NS_IMETHOD CloseSpellChecking();
-
 
     // nsIDocumentLoaderObserver
     NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader, nsIURI* aURL, const char* aCommand);

editor/base/nsInterfaceState.h

@@ -45,10 +45,7 @@ public:
   // nsIDOMSelectionListener interface
   NS_IMETHOD    NotifySelectionChanged();
   
-  // nsIDocumentStateListener interface
+  NS_DECL_NSIDOCUMENTSTATELISTENER
-  NS_IMETHOD  	NotifyDocumentCreated();
-  NS_IMETHOD  	NotifyDocumentWillBeDestroyed();
-  NS_IMETHOD    NotifyDocumentStateChanged(PRBool aNowDirty);
   
 protected:
 

editor/composer/src/nsEditorShell.h

@@ -75,165 +75,12 @@ class nsEditorShell :   public nsIEditorShell,
     virtual ~nsEditorShell();
 
     NS_DECL_ISUPPORTS
-    
-  //  NS_IMETHOD    GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
-    NS_IMETHOD    Init();
-  //  NS_IMETHOD    GetId(nsString& aId);	// { return nsBaseAppCore::GetId(aId); } 
-  //  NS_IMETHOD    SetDocumentCharset(const nsString& aCharset);	//  { return nsBaseAppCore::SetDocumentCharset(aCharset); } 
 
+    /* Declare all methods in the nsIEditorShell interface */
+    NS_DECL_NSIEDITORSHELL
 
-    /* nsIEditorShell interface */
+    /* Declare all methods in the nsIEditorSpellCheck interface */
-
+    NS_DECL_NSIEDITORSPELLCHECK
-	  NS_IMETHOD GetEditorDocument(nsIDOMDocument * *aEditorDocument);
-	  NS_IMETHOD GetEditorSelection(nsIDOMSelection * *aEditorSelection);
-
-    NS_IMETHOD GetDocumentModified(PRBool *aDocumentModified);
-
-	  NS_IMETHOD GetWrapColumn(PRInt32 *aWrapColumn);
-	  NS_IMETHOD SetWrapColumn(PRInt32 aWrapColumn);
-
-	  NS_IMETHOD SetEditorType(const PRUnichar *editorType);
-
-	  NS_IMETHOD SetToolbarWindow(nsIDOMWindow *win);
-	  NS_IMETHOD SetContentWindow(nsIDOMWindow *win);
-	  NS_IMETHOD SetWebShellWindow(nsIDOMWindow *win);
-	  NS_IMETHOD LoadUrl(const PRUnichar *url);
-    NS_IMETHOD RegisterDocumentStateListener(nsIDocumentStateListener *docListener);
-    NS_IMETHOD UnregisterDocumentStateListener(nsIDocumentStateListener *docListener);
-
-	  /* void NewWindow (); */
-	  NS_IMETHOD NewWindow();
-	  NS_IMETHOD Open();
-	  NS_IMETHOD Save();
-	  NS_IMETHOD SaveAs();
-	  NS_IMETHOD CloseWindow();
-	  NS_IMETHOD Print();
-	  NS_IMETHOD Exit();
-
-	  NS_IMETHOD Undo();
-	  NS_IMETHOD Redo();
-	  NS_IMETHOD Cut();
-	  NS_IMETHOD Copy();
-	  NS_IMETHOD Paste();
-
-	  NS_IMETHOD PasteAsQuotation();
-	  NS_IMETHOD PasteAsCitedQuotation(const PRUnichar *cite);
-	  NS_IMETHOD InsertAsQuotation(const PRUnichar *quotedText);
-	  NS_IMETHOD InsertAsCitedQuotation(const PRUnichar *quotedText, const PRUnichar *cite);
-
-	  NS_IMETHOD SelectAll();
-	  NS_IMETHOD DeleteSelection(PRInt32 direction);
-
-	  /* void Find (); */
-	  NS_IMETHOD Find();
-	  NS_IMETHOD FindNext();
-
-	  /* Charset Menu */
-	  NS_IMETHOD GetDocumentCharacterSet(PRUnichar **characterSet);
-	  NS_IMETHOD SetDocumentCharacterSet(const PRUnichar *characterSet);
-
-	  /* void InsertText (in wstring textToInsert); */
-	  NS_IMETHOD InsertText(const PRUnichar *textToInsert);
-	  NS_IMETHOD InsertSource(const PRUnichar *sourceToInsert);
-    NS_IMETHOD InsertBreak();
-	  NS_IMETHOD InsertList(const PRUnichar *listType);
-
-	  /* void Indent (in string indent); */
-	  NS_IMETHOD Indent(const PRUnichar *indent);
-	  NS_IMETHOD Align(const PRUnichar *align);
-
-    /* nsIDOMElement GetSelectedElement (in wstring tagName); */
-	  NS_IMETHOD GetSelectedElement(const PRUnichar *tagName, nsIDOMElement **_retval);
-    NS_IMETHOD GetElementOrParentByTagName(const PRUnichar *tagName, nsIDOMNode *aNode, nsIDOMElement **_retval);
-	  NS_IMETHOD CreateElementWithDefaults(const PRUnichar *tagName, nsIDOMElement **_retval);
-	  NS_IMETHOD InsertElement(nsIDOMElement *element, PRBool deleteSelection);
-    NS_IMETHOD SaveHLineSettings(nsIDOMElement* aElement);
-	  NS_IMETHOD InsertLinkAroundSelection(nsIDOMElement *anchorElement);
-	  NS_IMETHOD SelectElement(nsIDOMElement *element);
-	  NS_IMETHOD SetSelectionAfterElement(nsIDOMElement *element);
-
-    /* Table insert and delete methods. Done relative to selected cell or
-       cell containing the selection anchor */
-    NS_IMETHOD InsertTableCell(PRInt32 aNumber, PRBool bAfter);
-    NS_IMETHOD InsertTableRow(PRInt32 aNumber, PRBool bAfter);
-    NS_IMETHOD InsertTableColumn(PRInt32 aNumber, PRBool bAfter);
-    NS_IMETHOD DeleteTable();
-    NS_IMETHOD DeleteTableCell(PRInt32 aNumber);
-    NS_IMETHOD DeleteTableRow(PRInt32 aNumber);
-    NS_IMETHOD DeleteTableColumn(PRInt32 aNumber);
-    NS_IMETHOD JoinTableCells();
-   /** Make table "rectangular" -- fill in all missing cellmap locations
-     * If aTable is null, it uses table enclosing the selection anchor
-     */
-   NS_IMETHOD NormalizeTable(nsIDOMElement *aTable);
-
-    /* Get the row and col indexes in layout's cellmap */
-    NS_IMETHOD GetRowIndex(nsIDOMElement *aCell, PRInt32 *_retval);
-    NS_IMETHOD GetColumnIndex(nsIDOMElement *aCell, PRInt32 *_retval);
-    /** Get the number of rows in a table from the layout's cellmap */
-    NS_IMETHOD GetTableRowCount(nsIDOMElement *aTable, PRInt32 *_retval);
-    /** Get the number of columns in a table from the layout's cellmap */
-    NS_IMETHOD GetTableColumnCount(nsIDOMElement *aTable, PRInt32 *_retval);
-
-    /* Get a cell and associated data from the layout frame  based on cell map coordinates (0 index) */
-    NS_IMETHOD GetCellAt(nsIDOMElement* aTable, PRInt32 aRowIndex, PRInt32 aColIndex, nsIDOMElement **_retval);
-    /* Note that the return param in the IDL must be the LAST out param here (_retval) */
-    NS_IMETHOD GetCellDataAt(nsIDOMElement* aTable, PRInt32 aRowIndex, PRInt32 aColIndex,
-                             PRInt32 *aStartRowIndex, PRInt32 *aStartColIndex,
-                             PRInt32 *aRowSpan, PRInt32 *aColSpan, PRBool *aIsSelected, nsIDOMElement **_retval);
-
-    /* Get list of embedded objects, e.g. for mail compose */
-    NS_IMETHOD GetEmbeddedObjects(nsISupportsArray **aObjectArray);
-
-    /* void SetParagraphFormat (in string value); */
-	  NS_IMETHOD SetParagraphFormat(PRUnichar *value);
-	  NS_IMETHOD GetParagraphFormat(PRUnichar * *aParagraphFormat);
-
-	  /* void SetTextProperty (in string prop, in string attr, in string value); */
-	  NS_IMETHOD SetTextProperty(const PRUnichar *prop, const PRUnichar *attr, const PRUnichar *value);
-	  NS_IMETHOD GetTextProperty(const PRUnichar *prop, const PRUnichar *attr, const PRUnichar *value, PRBool *firstHas, PRBool *anyHas, PRBool *allHas);
-    NS_IMETHOD RemoveTextProperty(const PRUnichar *prop, const PRUnichar *attr);
-
-	  /* void SetBodyAttribute (in string attr, in string value); */
-	  NS_IMETHOD SetBodyAttribute(const PRUnichar *attr, const PRUnichar *value);
-	  NS_IMETHOD SetBackgroundColor(const PRUnichar *color);
-
-	  NS_IMETHOD ApplyStyleSheet(const PRUnichar *url);
-
-    /* Get the contents, for output or other uses */
-    NS_IMETHOD GetContentsAs(const PRUnichar *format, PRUint32 flags, PRUnichar **contentsAs);
-
-    /* Debugging: dump content tree to stdout */
-    NS_IMETHOD DumpContentTree();
-
-	  /* string GetLocalFileURL (in nsIDOMWindow parent, in string filterType); */
-	  NS_IMETHOD GetLocalFileURL(nsIDOMWindow *parent, const PRUnichar *filterType, PRUnichar **_retval);
-
-	  /* void BeginBatchChanges (); */
-	  NS_IMETHOD BeginBatchChanges();
-	  NS_IMETHOD EndBatchChanges();
-
-	  /* void RunUnitTests (); */
-	  NS_IMETHOD RunUnitTests();
-
-    /* void BeginLogging (); */
-	  NS_IMETHOD StartLogging(nsIFileSpec *logFile);
-	  NS_IMETHOD StopLogging();
-
-
-    /* Spell check interface */
-    NS_IMETHOD StartSpellChecking(PRUnichar **_retval);
-    NS_IMETHOD GetNextMisspelledWord(PRUnichar **_retval);
-    NS_IMETHOD GetSuggestedWord(PRUnichar **_retval);
-    NS_IMETHOD CheckCurrentWord(const PRUnichar *suggestedWord, PRBool *_retval);
-    NS_IMETHOD ReplaceWord(const PRUnichar *misspelledWord, const PRUnichar *replaceWord, PRBool allOccurrences);
-    NS_IMETHOD IgnoreWordAllOccurrences(const PRUnichar *word);
-    NS_IMETHOD GetPersonalDictionary();
-    NS_IMETHOD GetPersonalDictionaryWord(PRUnichar **_retval);
-    NS_IMETHOD AddWordToDictionary(const PRUnichar *word);
-    NS_IMETHOD RemoveWordFromDictionary(const PRUnichar *word);
-    NS_IMETHOD CloseSpellChecking();
-
 
     // nsIDocumentLoaderObserver
     NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader, nsIURI* aURL, const char* aCommand);

editor/composer/src/nsInterfaceState.h

@@ -45,10 +45,7 @@ public:
   // nsIDOMSelectionListener interface
   NS_IMETHOD    NotifySelectionChanged();
   
-  // nsIDocumentStateListener interface
+  NS_DECL_NSIDOCUMENTSTATELISTENER
-  NS_IMETHOD  	NotifyDocumentCreated();
-  NS_IMETHOD  	NotifyDocumentWillBeDestroyed();
-  NS_IMETHOD    NotifyDocumentStateChanged(PRBool aNowDirty);
   
 protected:
 

editor/idl/nsIEditorShell.idl

@@ -59,14 +59,14 @@ interface nsIEditorShell : nsISupports
   void SetWebShellWindow(in nsIDOMWindow win);
   void LoadUrl(in wstring url);
   
-  /* Register a doc state listener. This gets added to a list of listeners
+  /** Register a doc state listener. This gets added to a list of listeners
      which are registered with the editor when that gets instantiated.
      If the LoadUrl fails, this listener will not receive any notifcations.
      If you call this after the editor has been instantiated, it calls through
      to editor::AddDocumentStateListener().
   */
   void RegisterDocumentStateListener(in nsIDocumentStateListener docListener);
-  /* Unregister a listener.
+  /** Unregister a listener.
      If you call this after the editor has been instantiated, it calls through
      to editor::RemoveDocumentStateListener().
   */
@@ -114,9 +114,9 @@ interface nsIEditorShell : nsISupports
   void Indent(in wstring indent);
   void Align(in wstring align);
   
-  /* Element insert and property editing */
+  /** Element insert and property editing */
   nsIDOMElement GetSelectedElement(in wstring tagName);
-  /* returns the element conversion of supplied node or a parent of required type */
+  /** returns the element conversion of supplied node or a parent of required type */
   nsIDOMElement GetElementOrParentByTagName(in wstring tagName, in nsIDOMNode node);
   nsIDOMElement CreateElementWithDefaults(in wstring tagName);
   void InsertElement(in nsIDOMElement element, in boolean deleteSelection);
@@ -125,9 +125,9 @@ interface nsIEditorShell : nsISupports
   void SelectElement(in nsIDOMElement element);
   void SetSelectionAfterElement(in nsIDOMElement element);
 
-  /***** Table editing *****/
+  /** Table insert and delete methods.  Done relative to selected cell or
-  /* These are done relative to selected cell
+   * cell containing the selection anchor.
-     or cell contain the selection anchor */
+   */
   void InsertTableCell(in PRInt32 number, in PRBool after);
   void InsertTableRow(in PRInt32 number, in PRBool after);
   void InsertTableColumn(in PRInt32 number, in PRBool after);
@@ -146,7 +146,7 @@ interface nsIEditorShell : nsISupports
     */
   void NormalizeTable(in nsIDOMElement tableElement);
 
-  /* Get the indexes from layout's cellmap */
+  /** Get the indexes from layout's cellmap */
   PRInt32 GetRowIndex(in nsIDOMElement cellElement);
   PRInt32 GetColumnIndex(in nsIDOMElement cellElement);
 
@@ -162,6 +162,7 @@ interface nsIEditorShell : nsISupports
 
   /* Get cell at a location in the layout's cellmap
      returns null when past last cell in a row or column */
+  /* Get a cell and associated data from the layout frame  based on cell map coordinates (0 index) */
   nsIDOMElement GetCellAt(in nsIDOMElement tableElement, in PRInt32 rowIndex, in PRInt32 colIndex);
   /* Get cell at a location in the layout's cellmap with associated data 
      returns null when past last cell in a row or column */
@@ -187,8 +188,10 @@ interface nsIEditorShell : nsISupports
    * format is mime type, e.g. text/html;
    * See nsIEditor.h for legal flag values.
    */
+  /* Get the contents, for output or other uses */
   wstring GetContentsAs(in wstring format, in PRUint32 flags);
-  /* For debugging, dump the content tree: */
+
+  /* Debugging: dump content tree to stdout */
   void DumpContentTree();
 
   /* Utility */

extensions/wallet/cookieviewer/nsCookieViewer.cpp

@@ -51,9 +51,7 @@ public:
   NS_DECL_ISUPPORTS
 
   // nsICookieViewer interface
-  NS_IMETHOD GetCookieValue(char * *aValue);
+  NS_DECL_NSICOOKIEVIEWER
-  NS_IMETHOD GetPermissionValue(char * *aValue);
-  NS_IMETHOD SetValue(const char *aValue, nsIDOMWindow *win);
 };
 
 ////////////////////////////////////////////////////////////////////////

extensions/wallet/editor/nsWalletEditor.cpp

@@ -42,8 +42,7 @@ public:
   NS_DECL_ISUPPORTS
 
   // nsIWalletEditor interface
-  NS_IMETHOD GetValue(char * *aValue);
+  NS_DECL_NSIWALLETEDITOR
-  NS_IMETHOD SetValue(const char *aValue, nsIDOMWindow *win);
 };
 
 ////////////////////////////////////////////////////////////////////////

extensions/wallet/signonviewer/nsSignonViewer.cpp

@@ -42,11 +42,7 @@ public:
   NS_DECL_ISUPPORTS
 
   // nsISignonViewer interface
-  NS_IMETHOD GetSignonValue(char * *aValue);
+  NS_DECL_NSISIGNONVIEWER
-  NS_IMETHOD GetRejectValue(char * *aValue);
-  NS_IMETHOD GetNopreviewValue(char * *aValue);
-  NS_IMETHOD GetNocaptureValue(char * *aValue);
-  NS_IMETHOD SetValue(const char *aValue, nsIDOMWindow *win);
 };
 
 ////////////////////////////////////////////////////////////////////////

extensions/wallet/walletpreview/nsWalletPreview.cpp

@@ -42,8 +42,7 @@ public:
   NS_DECL_ISUPPORTS
 
   // nsIWalletPreview interface
-  NS_IMETHOD GetPrefillValue(char * *aValue);
+  NS_DECL_NSIWALLETPREVIEW
-  NS_IMETHOD SetValue(const char *aValue, nsIDOMWindow *win);
 };
 
 ////////////////////////////////////////////////////////////////////////

intl/locale/src/nsLocale.h

@@ -34,7 +34,9 @@ public:
 	virtual ~nsLocale(void);
 	
 	NS_IMETHOD GetCategory(const nsString* category, nsString* result);
-	NS_IMETHOD GetCategory(const PRUnichar *category, PRUnichar **result);
+
+  /* Declare methods from nsILocale */
+  NS_DECL_NSILOCALE
 
 protected:
 	

intl/locale/src/nsLocaleService.cpp

@@ -116,12 +116,8 @@ public:
 	//
 	// nsILocaleService
 	//
-	NS_IMETHOD NewLocale(const PRUnichar *aLocale, nsILocale **_retval);
+    NS_DECL_NSILOCALESERVICE
-	NS_IMETHOD NewLocaleObject(nsILocaleDefinition *localeDefinition, nsILocale **_retval);
+
-	NS_IMETHOD GetSystemLocale(nsILocale **_retval);
-	NS_IMETHOD GetApplicationLocale(nsILocale **_retval);
-	NS_IMETHOD GetLocaleFromAcceptLanguage(const char *acceptLanguage, nsILocale **_retval);
-	NS_IMETHOD GetLocaleComponentForUserAgent(PRUnichar **_retval);
 	//
 	// implementation methods
 	//

intl/strres/src/nsStringBundle.cpp

@@ -65,15 +65,7 @@ public:
   virtual ~nsStringBundle();
 
   NS_DECL_ISUPPORTS
-
+  NS_DECL_NSISTRINGBUNDLE
-  /* void GetStringFromID (in long aID, out wstring aResult); */
-  NS_IMETHOD GetStringFromID(PRInt32 aID, PRUnichar **aResult);
-
-  /* void GetStringFromName ([const] in wstring aName, out wstring aResult); */
-  NS_IMETHOD GetStringFromName(const PRUnichar *aName, PRUnichar **aResult);
-
-  /* void GetEnumeration (out nsIBidirectionalEnumerator elements); */
-  NS_IMETHOD GetEnumeration(nsIBidirectionalEnumerator **elements);
 
   nsIPersistentProperties* mProps;
 
@@ -361,12 +353,7 @@ public:
   virtual ~nsStringBundleService();
 
   NS_DECL_ISUPPORTS
-
+  NS_DECL_NSISTRINGBUNDLESERVICE
-  /* void CreateBundle ([const] in string aURLSpec, in nsILocale aLocale, out nsIStringBundle aResult); */
-  NS_IMETHOD CreateBundle(const char *aURLSpec, nsILocale * aLocale, 
-                          nsIStringBundle **aResult);
-  /* void CreateXPCBundle ([const] in string aURLSpec, [const] in wstring aLocaleName, out nsIStringBundle aResult); */
-  NS_IMETHOD CreateXPCBundle(const char *aURLSpec, const PRUnichar *aLocaleName, nsIStringBundle **aResult);  
 };
 
 nsStringBundleService::nsStringBundleService()

js/src/xpconnect/src/xpcprivate.h

@@ -765,27 +765,7 @@ public:
     NS_DECL_ISUPPORTS
 
     // we manually delagate these to nsJSID
-
+    NS_DECL_NSIJSID
-    /* readonly attribute string name; */
-    NS_IMETHOD GetName(char * *aName);
-
-    /* readonly attribute string number; */
-    NS_IMETHOD GetNumber(char * *aNumber);
-
-    /* readonly attribute nsID id; */
-    NS_IMETHOD GetId(nsID* *aId);
-
-    /* readonly attribute boolean valid; */
-    NS_IMETHOD GetValid(PRBool *aValid);
-
-    /* boolean equals (in nsIJSID other); */
-    NS_IMETHOD equals(nsIJSID *other, PRBool *_retval);
-
-    /* void initialize (in string idString); */
-    NS_IMETHOD initialize(const char *idString);
-
-    /* string toString (); */
-    NS_IMETHOD toString(char **_retval);
 
     // we implement the rest...
 
@@ -809,35 +789,10 @@ public:
     NS_DECL_ISUPPORTS
 
     // we manually delagate these to nsJSID
-
+    NS_DECL_NSIJSID
-    /* readonly attribute string name; */
-    NS_IMETHOD GetName(char * *aName);
-
-    /* readonly attribute string number; */
-    NS_IMETHOD GetNumber(char * *aNumber);
-
-    /* readonly attribute nsID id; */
-    NS_IMETHOD GetId(nsID* *aId);
-
-    /* readonly attribute boolean valid; */
-    NS_IMETHOD GetValid(PRBool *aValid);
-
-    /* boolean equals (in nsIJSID other); */
-    NS_IMETHOD equals(nsIJSID *other, PRBool *_retval);
-
-    /* void initialize (in string idString); */
-    NS_IMETHOD initialize(const char *idString);
-
-    /* string toString (); */
-    NS_IMETHOD toString(char **_retval);
 
     // we implement the rest...
-
+    NS_DECL_NSIJSCID
-    /* readonly attribute nsISupports createInstance; */
-    NS_IMETHOD GetCreateInstance(nsISupports * *aCreateInstance);
-
-    /* readonly attribute nsISupports getService; */
-    NS_IMETHOD GetGetService(nsISupports * *aGetService);
 
     static nsJSCID* NewID(const char* str);
 
@@ -869,18 +824,7 @@ class nsXPCComponents : public nsIXPCComponents, public nsIXPCScriptable
 {
 public:
     NS_DECL_ISUPPORTS
-
+    NS_DECL_NSIXPCCOMPONENTS
-    /* readonly attribute nsIXPCInterfaces interfaces; */
-    NS_IMETHOD GetInterfaces(nsIXPCInterfaces * *aInterfaces);
-
-    /* readonly attribute nsIXPCClasses classes; */
-    NS_IMETHOD GetClasses(nsIXPCClasses * *aClasses);
-
-    /* readonly attribute nsIXPCClassesByID classes; */
-    NS_IMETHOD GetClassesByID(nsIXPCClassesByID * *aClassesByID);
-
-    /* readonly attribute nsIJSStackFrameLocation stack; */
-    NS_IMETHOD GetStack(nsIJSStackFrameLocation * *aStack);
 
     XPC_DECLARE_IXPCSCRIPTABLE
 
@@ -914,18 +858,7 @@ class nsXPCThreadJSContextStackImpl : public nsIJSContextStack
 {
 public:
     NS_DECL_ISUPPORTS
-
+    NS_DECL_NSIJSCONTEXTSTACK
-    /* readonly attribute PRInt32 Count; */
-    NS_IMETHOD GetCount(PRInt32 *aCount);
-
-    /* JSContext Peek (); */
-    NS_IMETHOD Peek(JSContext * *_retval);
-
-    /* JSContext Pop (); */
-    NS_IMETHOD Pop(JSContext * *_retval);
-
-    /* void Push (in JSContext cx); */
-    NS_IMETHOD Push(JSContext * cx);
 
 public:
     static nsXPCThreadJSContextStackImpl* GetSingleton();

js/src/xpconnect/tests/TestXPC.cpp

@@ -109,12 +109,7 @@ MyScriptable::DefaultValue(JSContext *cx, JSObject *obj,
 class nsTestXPCFoo : public nsITestXPCFoo2
 {
     NS_DECL_ISUPPORTS
-    NS_IMETHOD Test(int p1, int p2, int* retval);
+    NS_DECL_NSITESTXPCFOO
-    NS_IMETHOD Test2();
-
-    /* attribute string Foo; */
-    NS_IMETHOD GetFoo(char * *aFoo);
-    NS_IMETHOD SetFoo(char * aFoo);
 
     nsTestXPCFoo();
     virtual ~nsTestXPCFoo();
@@ -204,80 +199,7 @@ class MyEcho : public nsIEcho
 {
 public:
     NS_DECL_ISUPPORTS
-    NS_IMETHOD SetReceiver(nsIEcho* aReceiver);
+    NS_DECL_NSIECHO
-    NS_IMETHOD SendOneString(const char* str);
-    NS_IMETHOD In2OutOneInt(int input, int* output);
-    NS_IMETHOD In2OutAddTwoInts(int input1,
-                                int input2,
-                                int* output1,
-                                int* output2,
-                                int* result);
-    NS_IMETHOD In2OutOneString(const char* input, char** output);
-    NS_IMETHOD SimpleCallNoEcho();
-    NS_IMETHOD SendManyTypes(PRUint8              p1,
-                             PRInt16             p2,
-                             PRInt32             p3,
-                             PRInt64             p4,
-                             PRUint8              p5,
-                             PRUint16            p6,
-                             PRUint32            p7,
-                             PRUint64            p8,
-                             float             p9,
-                             double            p10,
-                             PRBool            p11,
-                             char              p12,
-                             PRUnichar         p13,
-                             const nsID*       p14,
-                             const char*       p15,
-                             const PRUnichar*  p16);
-    NS_IMETHOD SendInOutManyTypes(PRUint8*    p1,
-                                  PRInt16*   p2,
-                                  PRInt32*   p3,
-                                  PRInt64*   p4,
-                                  PRUint8*    p5,
-                                  PRUint16*  p6,
-                                  PRUint32*  p7,
-                                  PRUint64*  p8,
-                                  float*   p9,
-                                  double*  p10,
-                                  PRBool*  p11,
-                                  char*    p12,
-                                  PRUnichar*  p13,
-                                  nsID**   p14,
-                                  char**   p15,
-                                  PRUnichar** p16);
-    NS_IMETHOD MethodWithNative(int p1, void* p2);
-
-    NS_IMETHOD ReturnCode(int code);
-
-    NS_IMETHOD FailInJSTest(int fail);
-
-    /* void SharedTest ([shared, retval] out string str); */
-    NS_IMETHOD SharedString(const char **str);
-
-    /* void ReturnCode_NS_OK (); */
-    NS_IMETHOD ReturnCode_NS_OK();
-
-    /* void ReturnCode_NS_ERROR_NULL_POINTER (); */
-    NS_IMETHOD ReturnCode_NS_ERROR_NULL_POINTER();
-
-    /* void ReturnCode_NS_ERROR_UNEXPECTED (); */
-    NS_IMETHOD ReturnCode_NS_ERROR_UNEXPECTED();
-
-    /* void ReturnCode_NS_ERROR_OUT_OF_MEMORY (); */
-    NS_IMETHOD ReturnCode_NS_ERROR_OUT_OF_MEMORY();
-
-    /* nsISupports ReturnInterface (in nsISupports obj); */
-    NS_IMETHOD ReturnInterface(nsISupports *obj, nsISupports **_retval);
-
-    /* nsIJSStackFrameLocation GetStack (); */
-    NS_IMETHOD GetStack(nsIJSStackFrameLocation **_retval);
-
-    /* void SetReceiverReturnOldReceiver (inout nsIEcho aReceiver); */
-    NS_IMETHOD SetReceiverReturnOldReceiver(nsIEcho **aReceiver);
-
-    /* void MethodWithForwardDeclaredParam (in nsITestXPCSomeUselessThing sut); */
-    NS_IMETHOD MethodWithForwardDeclaredParam(nsITestXPCSomeUselessThing *sut);
 
     MyEcho();
 private:
@@ -532,23 +454,7 @@ public:
               VETO_ALL
             };
 
-  /* void CanCreateWrapper (in JSContext aJSContext, in nsIIDRef aIID, in nsISupports aObj); */
+  NS_DECL_NSIXPCSECURITYMANAGER
-  NS_IMETHOD CanCreateWrapper(JSContext * aJSContext, const nsIID & aIID, nsISupports *aObj);
-
-  /* void CanCreateInstance (in JSContext aJSContext, in nsCIDRef aCID); */
-  NS_IMETHOD CanCreateInstance(JSContext * aJSContext, const nsCID & aCID);
-
-  /* void CanGetService (in JSContext aJSContext, in nsCIDRef aCID); */
-  NS_IMETHOD CanGetService(JSContext * aJSContext, const nsCID & aCID);
-
-  /* void CanCallMethod (in JSContext aJSContext, in nsIIDRef aIID, in nsISupports aObj, in nsIInterfaceInfo aInterfaceInfo, in PRUint16 aMethodIndex, [const] in jsid aName); */
-  NS_IMETHOD CanCallMethod(JSContext * aJSContext, const nsIID & aIID, nsISupports *aObj, nsIInterfaceInfo *aInterfaceInfo, PRUint16 aMethodIndex, const jsid aName);
-
-  /* void CanGetProperty (in JSContext aJSContext, in nsIIDRef aIID, in nsISupports aObj, in nsIInterfaceInfo aInterfaceInfo, in PRUint16 aMethodIndex, [const] in jsid aName); */
-  NS_IMETHOD CanGetProperty(JSContext * aJSContext, const nsIID & aIID, nsISupports *aObj, nsIInterfaceInfo *aInterfaceInfo, PRUint16 aMethodIndex, const jsid aName);
-
-  /* void CanSetProperty (in JSContext aJSContext, in nsIIDRef aIID, in nsISupports aObj, in nsIInterfaceInfo aInterfaceInfo, in PRUint16 aMethodIndex, [const] in jsid aName); */
-  NS_IMETHOD CanSetProperty(JSContext * aJSContext, const nsIID & aIID, nsISupports *aObj, nsIInterfaceInfo *aInterfaceInfo, PRUint16 aMethodIndex, const jsid aName);
 
   void SetMode(Mode mode) {mMode = mode;}
 

js/src/xpconnect/tests/components/xpctest_child.cpp

@@ -29,8 +29,7 @@ class xpctestOther : public nsIXPCTestOther
 {
 public:
     NS_DECL_ISUPPORTS
-
+    NS_DECL_NSIXPCTESTOTHER
-    NS_IMETHOD method3(PRInt16 i, PRInt16 j, PRInt16 k);
 
     xpctestOther();
 };
@@ -39,10 +38,8 @@ class xpctestChild : public nsIXPCTestChild, public xpctestOther
 {
 public:
     NS_DECL_ISUPPORTS_INHERITED
-
+    NS_DECL_NSIXPCTESTPARENT
-    NS_IMETHOD method1(PRInt16 i);
+    NS_DECL_NSIXPCTESTCHILD
-    NS_IMETHOD method1a(nsIXPCTestParent *foo);
-    NS_IMETHOD method2(PRInt16 i, PRInt16 j);
 
     xpctestChild();
 };
@@ -92,9 +89,8 @@ class xpctestParent : public nsIXPCTestParent
 {
 public:
     NS_DECL_ISUPPORTS
+    NS_DECL_NSIXPCTESTPARENT
 
-    NS_IMETHOD method1(PRInt16 i);
-    NS_IMETHOD method1a(nsIXPCTestParent *foo);
     xpctestParent();
 };
 
@@ -103,8 +99,7 @@ class xpctestChild : public xpctestParent, public nsIXPCTestChild
 {
 public:
     NS_DECL_ISUPPORTS
-
+    NS_DECL_NSIXPCTESTCHILD
-    NS_IMETHOD method2(PRInt16 i, PRInt16 j);
 
     xpctestChild();
 };
@@ -129,10 +124,8 @@ class xpctestChild : public nsIXPCTestChild
 {
 public:
     NS_DECL_ISUPPORTS
-
+    NS_DECL_NSIXPCTESTPARENT
-    NS_IMETHOD method1(PRInt16 i);
+    NS_DECL_NSIXPCTESTCHILD
-    NS_IMETHOD method1a(nsIXPCTestParent *foo);
-    NS_IMETHOD method2(PRInt16 i, PRInt16 j);
 
     xpctestChild();
 };

modules/libjar/nsJAR.h

@@ -51,10 +51,8 @@ class nsJAR : public nsIJAR
     NS_DEFINE_STATIC_CID_ACCESSOR( NS_JAR_CID );
   
     NS_DECL_ISUPPORTS
-    
+
-    NS_IMETHOD Open(const char *aZipFileName, PRInt32 *_retval);
+    NS_DECL_NSIZIP
-    NS_IMETHOD Extract(const char *aFilename, const char *aOutname, PRInt32 *_retval);
-    NS_IMETHOD Find(const char *aPattern, nsISimpleEnumerator **_retval);
   
   private:
 
@@ -77,12 +75,7 @@ public:
 
     //NS_DEFINE_STATIC_CID_ACCESSOR( NS_JARITEM_CID );
 
-    // nsIJARItem methods
+    NS_DECL_NSIJARITEM
-    NS_IMETHOD GetName(char * *aName);
-    NS_IMETHOD GetCompression(PRUint16 *aCompression);
-    NS_IMETHOD GetSize(PRUint32 *aSize);
-    NS_IMETHOD GetRealsize(PRUint32 *aRealsize);
-    NS_IMETHOD GetCrc32(PRUint32 *aCrc32);
 
     nsJARItem(nsZipItem* aOther);
     nsJARItem();

modules/libpref/public/nsIPref.idl

@@ -42,12 +42,13 @@ interface nsIFileSpec;
 
 [scriptable, uuid(a22ad7b0-ca86-11d1-a9a4-00805f8a7ac4)]
 interface nsIPref : nsISupports {
-
+  // Initialize/shutdown
   void StartUp();
   void ReadUserPrefs();
   void ReadUserPrefsFrom(in nsIFileSpec spec);
   void ShutDown();
 
+  // Config file input
   void ReadUserJSFile(in nsIFileSpec filename);
   void ReadLIJSFile(in nsIFileSpec filename);
 
@@ -129,8 +130,10 @@ interface nsIPref : nsISupports {
   /* pref attributes */
   boolean PrefIsLocked(in string pref);
 
+  /* save pref values */
   void SavePrefFile();
 
+  /* callbacks */
   [noscript] void RegisterCallback(in string domain,
                         in PrefChangedFunc callback,
                         in voidStar closure);

modules/libpref/src/nsPref.cpp

@@ -88,113 +88,9 @@ public:
     NS_IMETHOD SetPathPref(const char *pref, 
              const char *path, PRBool set_default);
 #endif
-    // Initialize/shutdown
-    NS_IMETHOD StartUp();
-    NS_IMETHOD ReadUserPrefs();
-    NS_IMETHOD ReadUserPrefsFrom(nsIFileSpec* inSpec);
-    NS_IMETHOD ShutDown();
 
-    // Config file input
+    /* Use xpidl-generated macro to declare everything required by nsIPref */
-    NS_IMETHOD ReadUserJSFile(nsIFileSpec* inSpec);
+    NS_DECL_NSIPREF
-    NS_IMETHOD ReadLIJSFile(nsIFileSpec* inSpec);
-
-    NS_IMETHOD EvaluateConfigScript(const char * js_buffer, PRUint32 length,
-                    PRBool bGlobalContext, 
-                    PRBool bCallbacks);
-    NS_IMETHOD EvaluateConfigScriptFile(const char * js_buffer, PRUint32 length,
-                    nsIFileSpec* inSpec, 
-                    PRBool bGlobalContext, 
-                    PRBool bCallbacks);
-
-    NS_IMETHOD SavePrefFileAs(nsIFileSpec* inSpec);
-    NS_IMETHOD SaveLIPrefFile(nsIFileSpec* inSpec);
-
-    // JS stuff
-    NS_IMETHOD GetConfigContext(JSContext **js_context);
-    NS_IMETHOD GetGlobalConfigObject(JSObject **js_object);
-    NS_IMETHOD GetPrefConfigObject(JSObject **js_object);
-
-    // Getters
-    NS_IMETHOD GetIntPref(const char *pref, PRInt32 * return_int);    
-    NS_IMETHOD GetBoolPref(const char *pref, PRBool * return_val);    
-    NS_IMETHOD GetBinaryPref(const char *pref, 
-                 void * return_val, PRInt32 * buf_length);    
-    NS_IMETHOD GetColorPref(const char *pref,
-                uint8 *red, uint8 *green, uint8 *blue);
-    NS_IMETHOD GetColorPrefDWord(const char *pref, PRUint32 *colorref);
-    NS_IMETHOD GetRectPref(const char *pref, 
-             PRInt16 *left, PRInt16 *top, 
-             PRInt16 *right, PRInt16 *bottom);
-
-    // Setters
-    NS_IMETHOD SetCharPref(const char *pref,const char* value);
-    NS_IMETHOD SetIntPref(const char *pref,PRInt32 value);
-    NS_IMETHOD SetBoolPref(const char *pref,PRBool value);
-    NS_IMETHOD SetBinaryPref(const char *pref,void * value, PRUint32 size);
-    NS_IMETHOD SetColorPref(const char *pref, 
-                uint8 red, uint8 green, uint8 blue);
-    NS_IMETHOD SetColorPrefDWord(const char *pref, PRUint32 colorref);
-    NS_IMETHOD SetRectPref(const char *pref, 
-             PRInt16 left, PRInt16 top, PRInt16 right, PRInt16 bottom);
-    
-    NS_IMETHOD ClearUserPref(const char *pref);
-
-    // Get Defaults
-    NS_IMETHOD GetDefaultIntPref(const char *pref, PRInt32 * return_int);
-    NS_IMETHOD GetDefaultBoolPref(const char *pref, PRBool * return_val);
-    NS_IMETHOD GetDefaultBinaryPref(const char *pref, 
-                    void * return_val, int * buf_length);
-    NS_IMETHOD GetDefaultColorPref(const char *pref, 
-                 PRUint8 *red, PRUint8 *green, PRUint8 *blue);
-    NS_IMETHOD GetDefaultColorPrefDWord(const char *pref, 
-                            PRUint32 *colorref);
-    NS_IMETHOD GetDefaultRectPref(const char *pref, 
-                PRInt16 *left, PRInt16 *top, 
-                PRInt16 *right, PRInt16 *bottom);
-
-    // Set defaults
-    NS_IMETHOD SetDefaultCharPref(const char *pref,const char* value);
-    NS_IMETHOD SetDefaultIntPref(const char *pref,PRInt32 value);
-    NS_IMETHOD SetDefaultBoolPref(const char *pref,PRBool value);
-    NS_IMETHOD SetDefaultBinaryPref(const char *pref,
-                    void * value, PRUint32 size);
-    NS_IMETHOD SetDefaultColorPref(const char *pref, 
-                 PRUint8 red, PRUint8 green, PRUint8 blue);
-    NS_IMETHOD SetDefaultRectPref(const char *pref, 
-                PRInt16 left, PRInt16 top, 
-                PRInt16 right, PRInt16 bottom);
-    
-    // Copy prefs
-    NS_IMETHOD CopyCharPref(const char *pref, char ** return_buf);
-    NS_IMETHOD CopyBinaryPref(const char *pref,
-                    int *size, void ** return_value);
-
-    NS_IMETHOD CopyDefaultCharPref( const char 
-                    *pref,    char ** return_buffer );
-    NS_IMETHOD CopyDefaultBinaryPref(const char *pref, 
-                     int * size, void ** return_val);
-
-    NS_IMETHOD GetFilePref(const char* pref, nsIFileSpec** value);
-    NS_IMETHOD SetFilePref(const char* pref, nsIFileSpec* value, PRBool setDefault);
-     
-    // Pref info
-    NS_IMETHOD PrefIsLocked(const char *pref, PRBool *res);
-
-    // Save pref files
-    NS_IMETHOD SavePrefFile();
-
-    // Callbacks
-    NS_IMETHOD RegisterCallback( const char* domain,
-                         PrefChangedFunc callback, 
-                         void* instance_data );
-    NS_IMETHOD UnregisterCallback( const char* domain,
-                 PrefChangedFunc callback, 
-                 void* instance_data );
-    NS_IMETHOD CopyPrefsTree(const char *srcRoot, const char *destRoot);
-    NS_IMETHOD DeleteBranch(const char *branchName);
-
-	NS_IMETHOD CreateChildList(const char* parent_node, char **child_list);
-	NS_IMETHOD NextChild(const char *child_list, PRInt16 *indx, char **listchild);
 
 protected:
 

modules/oji/src/nsJVMManager.h

@@ -47,34 +47,8 @@ struct nsJVMManager : public nsIJVMManager, public nsIThreadManager, public nsIL
 public:
 
     NS_DECL_AGGREGATED
-    
-    /* from nsIJVMManager: */
-    
-    /**
-     * Creates a proxy JNI with an optional secure environment (which can be NULL).
-     * There is a one-to-one correspondence between proxy JNIs and threads, so
-     * calling this method multiple times from the same thread will return
-     * the same proxy JNI.
-     */
-	NS_IMETHOD
-	CreateProxyJNI(nsISecureEnv* inSecureEnv, JNIEnv** outProxyEnv);
-	
-	/**
-	 * Returns the proxy JNI associated with the current thread, or NULL if no
-	 * such association exists.
-	 */
-	NS_IMETHOD
-	GetProxyJNI(JNIEnv** outProxyEnv);
-
-	/**
-	 * Returns whether or not Java is enabled.
-	 */
-	NS_IMETHOD
-	IsJavaEnabled(PRBool* outEnabled);
-
-    NS_METHOD
-    ShowJavaConsole(void);
 
+    NS_DECL_NSIJVMMANAGER    
     
     /* from nsIThreadManager: */
     

profile/Acctidl/nsAccountServices.cpp

@@ -46,13 +46,7 @@ public:
     NS_DECL_ISUPPORTS
 
     // nsIAccount interface
-	NS_IMETHOD SetDialerConfig(const char* aValue);
+    NS_DECL_NSIACCOUNTSERVICES
-	NS_IMETHOD GetAcctConfig(char **_retval);
-	NS_IMETHOD GetModemConfig(char **_retval);
-	NS_IMETHOD GetSiteName(char **_retval);
-	NS_IMETHOD GetPhone(char **_retval);
-	NS_IMETHOD LoadValues(void);
-	NS_IMETHOD CheckForDun(char **_retval);
 
 private:
 	nsIAccount *mAccount;
@@ -164,4 +158,4 @@ AccountServicesImpl::CheckForDun(char** dunlist)
 	mAccount->CheckForDun(localVar);
 	*dunlist =PL_strdup(localVar.ToNewCString());
 	return NS_OK;
-}
+}

profile/idlservices/nsProfileServices.cpp

@@ -45,16 +45,7 @@ public:
     NS_DECL_ISUPPORTS
 
     // nsIProfile interface
-	NS_IMETHOD CreateNewProfile(const char* aValue);
+    NS_DECL_NSIPROFILESERVICES
-	NS_IMETHOD RenameProfile(const char *oldName, const char *newName);
-	NS_IMETHOD DeleteProfile(const char *profileName, const char *canDeleteFiles);
-	NS_IMETHOD GetProfileList(char **_retval);
-	NS_IMETHOD StartCommunicator(const char *profileName);
-	NS_IMETHOD GetCurrentProfile(char **_retval);
-	NS_IMETHOD MigrateProfile(const char *profileName);
-	NS_IMETHOD ProcessPREGInfo(const char *data);
-	NS_IMETHOD CloneProfile(const char *aProfileName);
-
 
 private:
 	nsIProfile *mProfile;

profile/pref-migrator/src/nsPMProgressDlg.h

@@ -46,12 +46,14 @@ class nsPrefMigrationProgressDialog : public nsIPrefMigrationProgress, public ns
         virtual ~nsPrefMigrationProgressDialog();
         
         NS_DECL_ISUPPORTS
+        NS_DECL_NSIPREFMIGRATIONPROGRESS
 
-        
         NS_IMETHOD CreateProfileProgressDialog();
-        NS_IMETHOD KillProfileProgressDialog();
         NS_IMETHOD MigrationStarted(const char *UIPackageName);
         NS_IMETHOD IncrementProgressBar();
+
+        NS_IMETHOD KillProfileProgressDialog();
+
         //NS_IMETHOD InstallFinalization(const char *message, PRInt32 itemNum, PRInt32 totNum);
         //NS_IMETHOD InstallAborted();
 
@@ -64,4 +66,4 @@ class nsPrefMigrationProgressDialog : public nsIPrefMigrationProgress, public ns
         nsCOMPtr<nsIDOMXULDocument>  mDocument;		// is this really owned?
         nsCOMPtr<nsIWebShellWindow>  mWindow;			// is this really owned?
 };
-#endif
+#endif

widget/src/beos/nsSound.h

@@ -30,12 +30,7 @@ class nsSound : public nsISound {
   virtual ~nsSound();
 
   NS_DECL_ISUPPORTS
-
+  NS_DECL_NSISOUND
-  NS_IMETHOD Init(void);
-
-  NS_IMETHOD Play(nsIFileSpec *filespec);
-
-  NS_IMETHOD Beep(void);
 
   BSimpleGameSound *mSound;
 

widget/src/gtk/nsSound.h

@@ -30,12 +30,7 @@ class nsSound : public nsISound {
   virtual ~nsSound();
 
   NS_DECL_ISUPPORTS
-
+  NS_DECL_NSISOUND
-  NS_IMETHOD Init(void);
-
-  NS_IMETHOD Play(nsIFileSpec *filespec);
-
-  NS_IMETHOD Beep(void);
 
 };
 

widget/src/mac/nsSound.h

@@ -30,13 +30,7 @@ class nsSound : public nsISound {
   virtual ~nsSound();
 
   NS_DECL_ISUPPORTS
-
+  NS_DECL_NSISOUND
-  NS_IMETHOD Init(void);
-
-  NS_IMETHOD Play(nsIFileSpec *filespec);
-
-  NS_IMETHOD Beep(void);
-
 };
 
 #endif /* __nsSound_h__ */

widget/src/photon/nsSound.h

@@ -28,13 +28,7 @@ class nsSound : public nsISound {
   virtual ~nsSound();
 
   NS_DECL_ISUPPORTS
-
+  NS_DECL_NSISOUND
-  NS_IMETHOD Init(void);
-
-  NS_IMETHOD Play(nsIFileSpec *filespec);
-
-  NS_IMETHOD Beep(void);
-
 };
 
 #endif /* __nsSound_h__ */

widget/src/windows/nsSound.h

@@ -28,13 +28,7 @@ class nsSound : public nsISound {
   virtual ~nsSound();
 
   NS_DECL_ISUPPORTS
-
+  NS_DECL_NSISOUND
-  NS_IMETHOD Init(void);
-
-  NS_IMETHOD Play(nsIFileSpec *filespec);
-
-  NS_IMETHOD Beep(void);
-
 };
 
 #endif /* __nsSound_h__ */

widget/src/xpwidgets/nsFileSpecWithUIImpl.h

@@ -35,16 +35,7 @@ class nsFileSpecWithUIImpl
 	nsFileSpecWithUIImpl();
 	virtual ~nsFileSpecWithUIImpl();
 
-	NS_IMETHOD chooseOutputFile(const char *windowTitle, const char *suggestedLeafName);
+  NS_DECL_NSIFILESPECWITHUI
-
-	NS_IMETHOD chooseFile(const char *title, char **_retval);
-
-	NS_IMETHOD chooseInputFile(
-		const char *title,
-		nsIFileSpecWithUI::StandardFilterMask standardFilterMask,
-		const char *extraFilterTitle, const char *extraFilter);
-
-	NS_IMETHOD chooseDirectory(const char *title);
 	
 	//------------------
 	// INHERITED/FORWARDED METHODS

xpcom/sample/nsSample.cpp

@@ -51,6 +51,18 @@ public:
     // nsISupports interface
     NS_DECL_ISUPPORTS
 
+    /**
+     * This macro is defined in the nsISample.h file, and is generated
+     * automatically by the xpidl compiler.  It expands to
+     * declarations of all of the methods required to implement the
+     * interface.  xpidl will generate a NS_DECL_[INTERFACENAME] macro
+     * for each interface that it processes.
+     *
+     * The methods of nsISample are discussed individually below, but
+     * commented out (because this macro already defines them.)
+     */
+    NS_DECL_NSISAMPLE
+
     /**
      * NS_IMETHOD expands to the standard XPCOM return type.  XPCOM methods
      * should never return any other type.  The return value is used
@@ -62,15 +74,15 @@ public:
      * as "sample.Value='foo';" and "var val = sample.Value"
      */
     // nsISample interface
-    NS_IMETHOD GetValue(char * *aValue);
+    /* NS_IMETHOD GetValue(char * *aValue); */
-    NS_IMETHOD SetValue(char * aValue);
+    /* NS_IMETHOD SetValue(char * aValue); */
 
     /**
      * The const came from the "in" specifier in nsISample.idl.  "in"
      * specifies that the value of this parameter is used only for input,
      * this method is not allowed to modify the contents of the buffer.
      */
-    NS_IMETHOD WriteValue(const char *aPrefix);
+    /* NS_IMETHOD WriteValue(const char *aPrefix); */
 
     /**
      * nsISample.idl specifies all of it's string types as string, instead
@@ -79,7 +91,7 @@ public:
      * If this type had been specified as wstring, it would appear as
      * PRUnichar * in C++, which is the NSPR type for unicode characters.
      */
-    NS_IMETHOD Poke(const char* aValue);
+    /* NS_IMETHOD Poke(const char* aValue); */
 
 private:
     char* mValue;

xpinstall/src/nsInstallProgressDialog.h

@@ -51,23 +51,11 @@ class nsInstallProgressDialog : public nsIXPINotifier,
         
         NS_DECL_ISUPPORTS
 
-        // implement nsIXPINotifier  
+        // implement nsIXPINotifier
-        NS_IMETHOD BeforeJavascriptEvaluation(const PRUnichar *URL);
+        NS_DECL_NSIXPINOTIFIER
-        NS_IMETHOD AfterJavascriptEvaluation(const PRUnichar *URL);
-        NS_IMETHOD InstallStarted(const PRUnichar *URL, const PRUnichar* UIPackageName);
-        NS_IMETHOD ItemScheduled(const PRUnichar *message);
-        NS_IMETHOD FinalizeProgress(const PRUnichar *message, PRInt32 itemNum, PRInt32 totNum);
-        NS_IMETHOD FinalStatus(const PRUnichar* URL, PRInt32 status);
-        NS_IMETHOD LogComment(const PRUnichar* comment);
 
         // implement nsIXPIProgressDlg
-        NS_IMETHOD Open();
+        NS_DECL_NSIXPIPROGRESSDLG
-        NS_IMETHOD Close();
-        NS_IMETHOD SetTitle(const PRUnichar * aTitle);
-        NS_IMETHOD SetHeading(const PRUnichar * aHeading);
-        NS_IMETHOD SetActionText(const PRUnichar * aActionText);
-        NS_IMETHOD SetProgress(PRInt32 aValue, PRInt32 aMax);
-        NS_IMETHOD GetCancelStatus(PRBool *_retval);
 
         // Declare implementations of nsIXULWindowCallbacks interface functions.
         NS_IMETHOD ConstructBeforeJavaScript(nsIWebShell *aWebShell);

xpinstall/src/nsLoggingProgressNotifier.h

@@ -41,13 +41,7 @@ class nsLoggingProgressNotifier : public nsIXPINotifier
         NS_DECL_ISUPPORTS
 
         // nsIXPINotifier interfaces
-        NS_IMETHOD BeforeJavascriptEvaluation(const PRUnichar *URL);
+        NS_DECL_NSIXPINOTIFIER
-        NS_IMETHOD AfterJavascriptEvaluation(const PRUnichar *URL);
-        NS_IMETHOD InstallStarted(const PRUnichar *URL, const PRUnichar* UIPackageName);
-        NS_IMETHOD ItemScheduled(const PRUnichar* message );
-        NS_IMETHOD FinalizeProgress(const PRUnichar* message, PRInt32 itemNum, PRInt32 totNum );
-        NS_IMETHOD FinalStatus(const PRUnichar* URL, PRInt32 status);
-        NS_IMETHOD LogComment(const PRUnichar* comment);
    
      private:
         void GetTime(char** aString);

xpinstall/src/nsTopProgressNotifier.h

@@ -45,13 +45,7 @@ class nsTopProgressNotifier : public nsIXPINotifier
         NS_DECL_ISUPPORTS
 
         // implements nsIXPINotifier
-        NS_IMETHOD BeforeJavascriptEvaluation(const PRUnichar *URL);
+        NS_DECL_NSIXPINOTIFIER
-        NS_IMETHOD AfterJavascriptEvaluation(const PRUnichar *URL);
-        NS_IMETHOD InstallStarted(const PRUnichar* URL, const PRUnichar* UIPackageName);
-        NS_IMETHOD ItemScheduled(const  PRUnichar* message );
-        NS_IMETHOD FinalizeProgress(const PRUnichar* message, PRInt32 itemNum, PRInt32 totNum );
-        NS_IMETHOD FinalStatus(const PRUnichar* URL, PRInt32 status);
-        NS_IMETHOD LogComment(const PRUnichar* comment);
    
    private:
         nsVector        *mNotifiers;

xpinstall/src/nsXPInstallManager.h

@@ -85,13 +85,7 @@ class nsXPInstallManager : public nsIXPINotifier,
 #endif
         
         // IXPINotifier methods
-        NS_IMETHOD BeforeJavascriptEvaluation(const PRUnichar *URL);
+        NS_DECL_NSIXPINOTIFIER
-        NS_IMETHOD AfterJavascriptEvaluation(const PRUnichar *URL);
-        NS_IMETHOD InstallStarted(const PRUnichar *URL, const PRUnichar *UIPackageName);
-        NS_IMETHOD ItemScheduled(const PRUnichar *message);
-        NS_IMETHOD FinalizeProgress(const PRUnichar *message, PRInt32 itemNum, PRInt32 totNum);
-        NS_IMETHOD FinalStatus(const PRUnichar* URL, PRInt32 status);
-        NS_IMETHOD LogComment(const PRUnichar *comment);
 
         // IXULWindowCallbacks methods
         NS_IMETHOD ConstructBeforeJavaScript(nsIWebShell *aWebShell);

xpinstall/standalone/nsSimpleNotifier.h

@@ -35,14 +35,8 @@ class nsSimpleNotifier : public nsIXPINotifier
 
         nsSimpleNotifier();
         virtual ~nsSimpleNotifier();
-       
+
-        NS_IMETHOD            BeforeJavascriptEvaluation(const PRUnichar *URL);
+        NS_DECL_NSIXPINOTIFIER
-        NS_IMETHOD            AfterJavascriptEvaluation(const PRUnichar *URL);
-        NS_IMETHOD            InstallStarted(const PRUnichar *URL, const PRUnichar *UIPackageName);
-        NS_IMETHOD            ItemScheduled(const PRUnichar *message);
-        NS_IMETHOD            FinalizeProgress(const PRUnichar *message, PRInt32 itemNum, PRInt32 totNum);
-        NS_IMETHOD            FinalStatus(const PRUnichar* URL, PRInt32 status);
-        NS_IMETHOD            LogComment(const PRUnichar* message);
         NS_IMETHOD            QueryInterface(REFNSIID aIID, void** aInstancePtr);
         NS_IMETHOD_(nsrefcnt) AddRef(void);
         NS_IMETHOD_(nsrefcnt) Release(void);

xpinstall/stub/nsStubNotifier.h

@@ -38,14 +38,7 @@ class nsStubNotifier : public nsIXPINotifier
         virtual ~nsStubNotifier();
 
         NS_DECL_ISUPPORTS
-       
+        NS_DECL_NSIXPINOTIFIER
-        NS_IMETHOD            BeforeJavascriptEvaluation(const PRUnichar *URL);
-        NS_IMETHOD            AfterJavascriptEvaluation(const PRUnichar *URL);
-        NS_IMETHOD            InstallStarted(const PRUnichar *URL, const PRUnichar *UIPackageName);
-        NS_IMETHOD            ItemScheduled(const PRUnichar *message);
-        NS_IMETHOD            FinalizeProgress(const PRUnichar *message, PRInt32 itemNum, PRInt32 totNum);
-        NS_IMETHOD            FinalStatus(const PRUnichar* URL, PRInt32 status);
-        NS_IMETHOD            LogComment(const PRUnichar *comment);
 
     private:
         pfnXPIStart     m_start;