From babd03ec4817285e01a33ceeb2fffc15e2e7768f Mon Sep 17 00:00:00 2001
From: "rods%netscape.com"
 <rods%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 15 Jul 1999 14:54:02 +0000
Subject: [PATCH] changed all IIDs to use NS_DEFINE_STATIC_IID_ACCESSOR

git-svn-id: svn://10.0.0.236/trunk@39532 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/widget/public/nsIClipboard.h            | 2 +-
 mozilla/widget/public/nsIClipboardOwner.h       | 1 +
 mozilla/widget/public/nsIContentConnector.h     | 2 +-
 mozilla/widget/public/nsIContextMenu.h          | 2 +-
 mozilla/widget/public/nsIDragService.h          | 2 +-
 mozilla/widget/public/nsIDragSession.h          | 2 +-
 mozilla/widget/public/nsIDragSessionMac.h       | 2 +-
 mozilla/widget/public/nsIFileDialogsMgr.h       | 3 +--
 mozilla/widget/public/nsIFileListTransferable.h | 2 +-
 mozilla/widget/public/nsIFontNameIterator.h     | 2 +-
 mozilla/widget/public/nsIFontRetrieverService.h | 2 +-
 mozilla/widget/public/nsIFontSizeIterator.h     | 2 +-
 mozilla/widget/public/nsIFormatConverter.h      | 2 +-
 mozilla/widget/public/nsIKeyBindMgr.h           | 3 +--
 mozilla/widget/public/nsILookAndFeel.h          | 2 +-
 mozilla/widget/public/nsIMenu.h                 | 2 +-
 mozilla/widget/public/nsIMenuBar.h              | 2 +-
 mozilla/widget/public/nsIMenuItem.h             | 2 +-
 mozilla/widget/public/nsIMenuListener.h         | 2 +-
 mozilla/widget/public/nsIPopUpMenu.h            | 2 +-
 mozilla/widget/public/nsITransferable.h         | 2 +-
 mozilla/widget/public/nsIWidget.h               | 2 +-
 22 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/mozilla/widget/public/nsIClipboard.h b/mozilla/widget/public/nsIClipboard.h
index 236eaa510ab..0a168e8622a 100644
--- a/mozilla/widget/public/nsIClipboard.h
+++ b/mozilla/widget/public/nsIClipboard.h
@@ -33,7 +33,7 @@ class nsIClipboard : public nsISupports {
 
   public:
 
-    static const nsIID& GetIID() { static nsIID iid = NS_ICLIPBOARD_IID; return iid; }
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICLIPBOARD_IID)
 
    /**
     * Given a transferable, set the data on the native clipboard
diff --git a/mozilla/widget/public/nsIClipboardOwner.h b/mozilla/widget/public/nsIClipboardOwner.h
index a381db593f2..80c62185f79 100644
--- a/mozilla/widget/public/nsIClipboardOwner.h
+++ b/mozilla/widget/public/nsIClipboardOwner.h
@@ -30,6 +30,7 @@ class nsITransferable;
 class nsIClipboardOwner : public nsISupports {
 
   public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICLIPBOARDOWNER_IID)
 
    /**
     * Notifies the owner of the clipboard transferable that the
diff --git a/mozilla/widget/public/nsIContentConnector.h b/mozilla/widget/public/nsIContentConnector.h
index 24ce5111d7b..2d148431890 100644
--- a/mozilla/widget/public/nsIContentConnector.h
+++ b/mozilla/widget/public/nsIContentConnector.h
@@ -30,7 +30,7 @@ class nsIContent;
 class nsIContentConnector : public nsISupports
 {
 public:
-  static const nsIID& GetIID() { static nsIID iid = NS_ICONTENTCONNECTOR_IID; return iid; }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICONTENTCONNECTOR_IID)
 
   NS_IMETHOD SetContentRoot(nsIContent* pContent) = 0;
 
diff --git a/mozilla/widget/public/nsIContextMenu.h b/mozilla/widget/public/nsIContextMenu.h
index b508f1264d9..d1e74448db9 100644
--- a/mozilla/widget/public/nsIContextMenu.h
+++ b/mozilla/widget/public/nsIContextMenu.h
@@ -42,7 +42,7 @@ class nsIMenuListener;
 class nsIContextMenu : public nsISupports {
 
   public:
-    static const nsIID& GetIID() { static nsIID iid = NS_ICONTEXTMENU_IID; return iid; }
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICONTEXTMENU_IID)
 
   /**
     * Creates the context menu
diff --git a/mozilla/widget/public/nsIDragService.h b/mozilla/widget/public/nsIDragService.h
index cbd716ad1f2..cd3a6ed4b15 100644
--- a/mozilla/widget/public/nsIDragService.h
+++ b/mozilla/widget/public/nsIDragService.h
@@ -35,7 +35,7 @@ class nsIDragService : public nsISupports {
 
   public:
 
-    static const nsIID& GetIID() { static nsIID iid = NS_IDRAGSERVICE_IID; return iid; }
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDRAGSERVICE_IID)
 
     enum {
       DRAGDROP_ACTION_NONE = 0x0000,
diff --git a/mozilla/widget/public/nsIDragSession.h b/mozilla/widget/public/nsIDragSession.h
index c99be2bc6c4..dd70f3c1128 100644
--- a/mozilla/widget/public/nsIDragSession.h
+++ b/mozilla/widget/public/nsIDragSession.h
@@ -33,7 +33,7 @@ struct nsSize;
 class nsIDragSession : public nsISupports {
 
   public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IDRAGSESSION_IID; return iid; }
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDRAGSESSION_IID)
 
   /**
     * Set the current state of the drag whether it can be dropped or not.
diff --git a/mozilla/widget/public/nsIDragSessionMac.h b/mozilla/widget/public/nsIDragSessionMac.h
index 2d6841c3f62..1ef16822fec 100644
--- a/mozilla/widget/public/nsIDragSessionMac.h
+++ b/mozilla/widget/public/nsIDragSessionMac.h
@@ -30,7 +30,7 @@
 class nsIDragSessionMac : public nsISupports {
 
   public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IDRAGSESSIONMAC_IID; return iid; }
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDRAGSESSIONMAC_IID)
 
   /**
     * Since the drag may originate in an external application, we need some way of
diff --git a/mozilla/widget/public/nsIFileDialogsMgr.h b/mozilla/widget/public/nsIFileDialogsMgr.h
index ed6e5e2aeac..49be09dbb39 100644
--- a/mozilla/widget/public/nsIFileDialogsMgr.h
+++ b/mozilla/widget/public/nsIFileDialogsMgr.h
@@ -48,8 +48,7 @@ enum nsFileDlgResults {
 class nsIFileDialogsMgr : public nsISupports
 {
 public:
-  static const nsIID& GetIID()
-    { static nsIID iid = NS_IFILEDIALOGSMGR_IID; return iid; }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFILEDIALOGSMGR_IID)
     
   NS_IMETHOD GetFile(
     nsFileSpec       & theFileSpec,     // Populate with initial path for file dialog
diff --git a/mozilla/widget/public/nsIFileListTransferable.h b/mozilla/widget/public/nsIFileListTransferable.h
index 407331ca1cd..c9280bce475 100644
--- a/mozilla/widget/public/nsIFileListTransferable.h
+++ b/mozilla/widget/public/nsIFileListTransferable.h
@@ -34,7 +34,7 @@ class nsIFileListTransferable : public nsISupports {
 
   public:
 
-    static const nsIID& GetIID() { static nsIID iid = NS_IFILELISTTRANSFERABLE_IID; return iid; }
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFILELISTTRANSFERABLE_IID)
 
   /**
     * Copies the list of nsFileSpecs items from aFileList to the internal data member
diff --git a/mozilla/widget/public/nsIFontNameIterator.h b/mozilla/widget/public/nsIFontNameIterator.h
index a4a2516c0e1..3af58dfd83d 100644
--- a/mozilla/widget/public/nsIFontNameIterator.h
+++ b/mozilla/widget/public/nsIFontNameIterator.h
@@ -31,7 +31,7 @@ class nsIFontNameIterator : public nsISupports
 		//	with C++ objects as standard iterators.
 	{
 		public:
-      static const nsIID& GetIID() { static nsIID iid = NS_IFONTNAMEITERATOR_IID; return iid; }
+      NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFONTNAMEITERATOR_IID)
 
 			NS_IMETHOD Reset() = 0;
 				// does not need to be called initially, returns iterator to initial state
diff --git a/mozilla/widget/public/nsIFontRetrieverService.h b/mozilla/widget/public/nsIFontRetrieverService.h
index 6e76f08ceab..9d748354e60 100644
--- a/mozilla/widget/public/nsIFontRetrieverService.h
+++ b/mozilla/widget/public/nsIFontRetrieverService.h
@@ -33,7 +33,7 @@ class nsIFontRetrieverService : public nsISupports
 		// This (singleton) service exists soley as a factory to manufacture iterators
 {
 		public:
-      static const nsIID& GetIID() { static nsIID iid = NS_IFONTRETRIEVERSERVICE_IID; return iid; }
+      NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFONTRETRIEVERSERVICE_IID)
 
 			NS_IMETHOD CreateFontNameIterator( nsIFontNameIterator** aIterator ) = 0;
 
diff --git a/mozilla/widget/public/nsIFontSizeIterator.h b/mozilla/widget/public/nsIFontSizeIterator.h
index b69d249fcfe..3cf40ee07c7 100644
--- a/mozilla/widget/public/nsIFontSizeIterator.h
+++ b/mozilla/widget/public/nsIFontSizeIterator.h
@@ -31,7 +31,7 @@ class nsIFontSizeIterator : public nsISupports
 		//	|Get| and |Advance| are distinct to facility wrapping with C++ objects as standard iterators.
 	{
 		public:
-      static const nsIID& GetIID() { static nsIID iid = NS_IFONTSIZEITERATOR_IID; return iid; }
+      NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFONTSIZEITERATOR_IID)
 
 			NS_IMETHOD Reset() = 0;
 				// does not need to be called initially, returns iterator to initial state
diff --git a/mozilla/widget/public/nsIFormatConverter.h b/mozilla/widget/public/nsIFormatConverter.h
index 7ca4d8ee581..f5f3bb3c06d 100644
--- a/mozilla/widget/public/nsIFormatConverter.h
+++ b/mozilla/widget/public/nsIFormatConverter.h
@@ -32,7 +32,7 @@ class nsIFormatConverter : public nsISupports {
 
   public:
 
-    static const nsIID& GetIID() { static nsIID iid = NS_IFORMATCONVERTER_IID; return iid; }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFORMATCONVERTER_IID)
 
   /**
     * Get the list of the "input" data flavors, in otherwords, the flavors  
diff --git a/mozilla/widget/public/nsIKeyBindMgr.h b/mozilla/widget/public/nsIKeyBindMgr.h
index b6db79c5666..41ebbec285d 100644
--- a/mozilla/widget/public/nsIKeyBindMgr.h
+++ b/mozilla/widget/public/nsIKeyBindMgr.h
@@ -43,8 +43,7 @@
 class nsIKeyBindMgr : public nsISupports
 {
 public:
-  static const nsIID& GetIID()
-    { static nsIID iid = NS_IKEYBINDMGR_IID; return iid; }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IKEYBINDMGR_IID)
     
   NS_IMETHOD ProcessKeyEvent(
     nsIDOMDocument   * domDoc, 
diff --git a/mozilla/widget/public/nsILookAndFeel.h b/mozilla/widget/public/nsILookAndFeel.h
index c5abeb44687..43179e682ee 100644
--- a/mozilla/widget/public/nsILookAndFeel.h
+++ b/mozilla/widget/public/nsILookAndFeel.h
@@ -30,7 +30,7 @@
 
 class nsILookAndFeel: public nsISupports {
 public:
-  static const nsIID& GetIID() { static nsIID iid = NS_ILOOKANDFEEL_IID; return iid; }
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILOOKANDFEEL_IID)
 
   typedef enum {
     eColor_WindowBackground,
diff --git a/mozilla/widget/public/nsIMenu.h b/mozilla/widget/public/nsIMenu.h
index b576e999b85..d768b50e331 100644
--- a/mozilla/widget/public/nsIMenu.h
+++ b/mozilla/widget/public/nsIMenu.h
@@ -42,7 +42,7 @@ class nsIMenuListener;
 class nsIMenu : public nsISupports {
 
   public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IMENU_IID; return iid; }
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENU_IID)
 
   /**
     * Creates the Menu
diff --git a/mozilla/widget/public/nsIMenuBar.h b/mozilla/widget/public/nsIMenuBar.h
index 0b15b8d5b0c..9f016d8d898 100644
--- a/mozilla/widget/public/nsIMenuBar.h
+++ b/mozilla/widget/public/nsIMenuBar.h
@@ -37,7 +37,7 @@ class nsIWidget;
 class nsIMenuBar : public nsISupports {
 
   public:
-     static const nsIID& GetIID() { static nsIID iid = NS_IMENUBAR_IID; return iid; }
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENUBAR_IID)
 
    /**
     * Creates the MenuBar
diff --git a/mozilla/widget/public/nsIMenuItem.h b/mozilla/widget/public/nsIMenuItem.h
index 5b05bfe3dbf..a461000bd59 100644
--- a/mozilla/widget/public/nsIMenuItem.h
+++ b/mozilla/widget/public/nsIMenuItem.h
@@ -50,7 +50,7 @@ enum {
 class nsIMenuItem : public nsISupports {
 
   public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IMENUITEM_IID; return iid; }
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENUITEM_IID)
 
    /**
     * Creates the MenuItem
diff --git a/mozilla/widget/public/nsIMenuListener.h b/mozilla/widget/public/nsIMenuListener.h
index e03467eb598..507f2ffeb8e 100644
--- a/mozilla/widget/public/nsIMenuListener.h
+++ b/mozilla/widget/public/nsIMenuListener.h
@@ -40,7 +40,7 @@ static NS_DEFINE_IID(kIMenuListenerIID, NS_IMENULISTENER_IID);
 class nsIMenuListener : public nsISupports {
 
   public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IMENULISTENER_IID; return iid; }
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENULISTENER_IID)
 
 	 /**
      * Processes a menu item selected event
diff --git a/mozilla/widget/public/nsIPopUpMenu.h b/mozilla/widget/public/nsIPopUpMenu.h
index 12881758483..c6b00fab155 100644
--- a/mozilla/widget/public/nsIPopUpMenu.h
+++ b/mozilla/widget/public/nsIPopUpMenu.h
@@ -37,7 +37,7 @@ class nsIWidget;
 class nsIPopUpMenu : public nsISupports {
 
   public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IPOPUPMENU_IID; return iid; }
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPOPUPMENU_IID)
 
    /**
     * Creates the PopUpMenu
diff --git a/mozilla/widget/public/nsITransferable.h b/mozilla/widget/public/nsITransferable.h
index ea9cea9ec13..199dab7fe10 100644
--- a/mozilla/widget/public/nsITransferable.h
+++ b/mozilla/widget/public/nsITransferable.h
@@ -45,7 +45,7 @@ class nsITransferable : public nsISupports {
 
   public:
 
-    static const nsIID& GetIID() { static nsIID iid = NS_ITRANSFERABLE_IID; return iid; }
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITRANSFERABLE_IID)
 
   /**
     * Computes a list of flavors that the transferable can export, either through
diff --git a/mozilla/widget/public/nsIWidget.h b/mozilla/widget/public/nsIWidget.h
index 5859e7c6134..e1efda18ed3 100644
--- a/mozilla/widget/public/nsIWidget.h
+++ b/mozilla/widget/public/nsIWidget.h
@@ -150,7 +150,7 @@ class nsIWidget : public nsISupports {
 
   public:
 
-    static const nsIID& GetIID() { static nsIID iid = NS_IWIDGET_IID; return iid; }
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IWIDGET_IID)
 
     /**
      * Create and initialize a widget.