From 31c80c539a7d732a36875e7c32ed312a79039373 Mon Sep 17 00:00:00 2001 From: "beard%netscape.com" Date: Sun, 28 Feb 1999 22:14:30 +0000 Subject: [PATCH] added IID() accessor. --- .../plugin/base/public/nsIPluginInstance.h | 19 +++++----- .../base/public/nsIPluginInstancePeer.h | 19 +++++----- modules/plugin/base/public/nsIPluginManager.h | 37 ++++++++++--------- modules/plugin/base/public/nsIPluginTagInfo.h | 19 +++++----- modules/plugin/public/nsIPluginInstance.h | 19 +++++----- modules/plugin/public/nsIPluginInstancePeer.h | 19 +++++----- modules/plugin/public/nsIPluginManager.h | 37 ++++++++++--------- modules/plugin/public/nsIPluginTagInfo.h | 19 +++++----- 8 files changed, 98 insertions(+), 90 deletions(-) diff --git a/modules/plugin/base/public/nsIPluginInstance.h b/modules/plugin/base/public/nsIPluginInstance.h index 03418c95a35c..e7822176edc9 100644 --- a/modules/plugin/base/public/nsIPluginInstance.h +++ b/modules/plugin/base/public/nsIPluginInstance.h @@ -41,6 +41,14 @@ #include "nsIPluginStreamListener.h" #endif +#define NS_IPLUGININSTANCE_IID \ +{ /* ebe00f40-0199-11d2-815b-006008119d7a */ \ + 0xebe00f40, \ + 0x0199, \ + 0x11d2, \ + {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ +} + //////////////////////////////////////////////////////////////////////////////// // Plugin Instance Interface @@ -63,7 +71,8 @@ */ class nsIPluginInstance : public nsISupports { public: - + NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLUGININSTANCE_IID) + /** * Initializes a newly created plugin instance, passing to it the plugin * instance peer which it should use for all communication back to the browser. @@ -219,14 +228,6 @@ public: HandleEvent(nsPluginEvent* event, PRBool* handled) = 0; }; -#define NS_IPLUGININSTANCE_IID \ -{ /* ebe00f40-0199-11d2-815b-006008119d7a */ \ - 0xebe00f40, \ - 0x0199, \ - 0x11d2, \ - {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ -} - //////////////////////////////////////////////////////////////////////////////// #endif /* nsIPluginInstance_h___ */ diff --git a/modules/plugin/base/public/nsIPluginInstancePeer.h b/modules/plugin/base/public/nsIPluginInstancePeer.h index ff29b2fa4a02..c977455c5a63 100644 --- a/modules/plugin/base/public/nsIPluginInstancePeer.h +++ b/modules/plugin/base/public/nsIPluginInstancePeer.h @@ -39,6 +39,14 @@ class nsIOutputStream; +#define NS_IPLUGININSTANCEPEER_IID \ +{ /* 4b7cea20-019b-11d2-815b-006008119d7a */ \ + 0x4b7cea20, \ + 0x019b, \ + 0x11d2, \ + {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ +} + //////////////////////////////////////////////////////////////////////////////// // Plugin Instance Peer Interface @@ -53,7 +61,8 @@ class nsIOutputStream; */ class nsIPluginInstancePeer : public nsISupports { public: - + NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLUGININSTANCEPEER_IID) + /** * Returns the value of a variable associated with the plugin manager. * @@ -129,14 +138,6 @@ public: }; -#define NS_IPLUGININSTANCEPEER_IID \ -{ /* 4b7cea20-019b-11d2-815b-006008119d7a */ \ - 0x4b7cea20, \ - 0x019b, \ - 0x11d2, \ - {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ -} - //////////////////////////////////////////////////////////////////////////////// #endif /* nsIPluginInstancePeer_h___ */ diff --git a/modules/plugin/base/public/nsIPluginManager.h b/modules/plugin/base/public/nsIPluginManager.h index e79560c8832a..36951cc17936 100644 --- a/modules/plugin/base/public/nsIPluginManager.h +++ b/modules/plugin/base/public/nsIPluginManager.h @@ -39,6 +39,23 @@ class nsIPluginStreamListener; +#define NS_IPLUGINMANAGER_IID \ +{ /* da58ad80-4eb6-11d2-8164-006008119d7a */ \ + 0xda58ad80, \ + 0x4eb6, \ + 0x11d2, \ + {0x81, 0x64, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ +} + +// CLSID for the browser's global plugin manager object. +#define NS_PLUGINMANAGER_CID \ +{ /* ce768990-5a4e-11d2-8164-006008119d7a */ \ + 0xce768990, \ + 0x5a4e, \ + 0x11d2, \ + {0x81, 0x64, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ +} + /** * The nsIPluginManager interface defines the minimum set of functionality that * the browser will support if it allows plugins. Plugins can call QueryInterface @@ -47,7 +64,8 @@ class nsIPluginStreamListener; */ class nsIPluginManager : public nsISupports { public: - + NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLUGINMANAGER_IID) + /** * Returns the value of a variable associated with the plugin manager. * @@ -176,23 +194,6 @@ public: }; -#define NS_IPLUGINMANAGER_IID \ -{ /* da58ad80-4eb6-11d2-8164-006008119d7a */ \ - 0xda58ad80, \ - 0x4eb6, \ - 0x11d2, \ - {0x81, 0x64, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ -} - -// CLSID for the browser's global plugin manager object. -#define NS_PLUGINMANAGER_CID \ -{ /* ce768990-5a4e-11d2-8164-006008119d7a */ \ - 0xce768990, \ - 0x5a4e, \ - 0x11d2, \ - {0x81, 0x64, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ -} - //////////////////////////////////////////////////////////////////////////////// #endif /* nsIPluginManager_h___ */ diff --git a/modules/plugin/base/public/nsIPluginTagInfo.h b/modules/plugin/base/public/nsIPluginTagInfo.h index 0191481a45b9..06ce323a80e3 100644 --- a/modules/plugin/base/public/nsIPluginTagInfo.h +++ b/modules/plugin/base/public/nsIPluginTagInfo.h @@ -37,6 +37,14 @@ #include "nsplugindefs.h" #include "nsISupports.h" +#define NS_IPLUGINTAGINFO_IID \ +{ /* 5f1ec1d0-019b-11d2-815b-006008119d7a */ \ + 0x5f1ec1d0, \ + 0x019b, \ + 0x11d2, \ + {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ +} + //////////////////////////////////////////////////////////////////////////////// // Plugin Tag Info Interface // This interface provides information about the HTML tag on the page. @@ -44,7 +52,8 @@ class nsIPluginTagInfo : public nsISupports { public: - + NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLUGINTAGINFO_IID) + // QueryInterface on nsIPluginInstancePeer to get this. // (Corresponds to NPP_New's argc, argn, and argv arguments.) @@ -69,14 +78,6 @@ public: }; -#define NS_IPLUGINTAGINFO_IID \ -{ /* 5f1ec1d0-019b-11d2-815b-006008119d7a */ \ - 0x5f1ec1d0, \ - 0x019b, \ - 0x11d2, \ - {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ -} - //////////////////////////////////////////////////////////////////////////////// #endif /* nsIPluginTagInfo_h___ */ diff --git a/modules/plugin/public/nsIPluginInstance.h b/modules/plugin/public/nsIPluginInstance.h index 03418c95a35c..e7822176edc9 100644 --- a/modules/plugin/public/nsIPluginInstance.h +++ b/modules/plugin/public/nsIPluginInstance.h @@ -41,6 +41,14 @@ #include "nsIPluginStreamListener.h" #endif +#define NS_IPLUGININSTANCE_IID \ +{ /* ebe00f40-0199-11d2-815b-006008119d7a */ \ + 0xebe00f40, \ + 0x0199, \ + 0x11d2, \ + {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ +} + //////////////////////////////////////////////////////////////////////////////// // Plugin Instance Interface @@ -63,7 +71,8 @@ */ class nsIPluginInstance : public nsISupports { public: - + NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLUGININSTANCE_IID) + /** * Initializes a newly created plugin instance, passing to it the plugin * instance peer which it should use for all communication back to the browser. @@ -219,14 +228,6 @@ public: HandleEvent(nsPluginEvent* event, PRBool* handled) = 0; }; -#define NS_IPLUGININSTANCE_IID \ -{ /* ebe00f40-0199-11d2-815b-006008119d7a */ \ - 0xebe00f40, \ - 0x0199, \ - 0x11d2, \ - {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ -} - //////////////////////////////////////////////////////////////////////////////// #endif /* nsIPluginInstance_h___ */ diff --git a/modules/plugin/public/nsIPluginInstancePeer.h b/modules/plugin/public/nsIPluginInstancePeer.h index ff29b2fa4a02..c977455c5a63 100644 --- a/modules/plugin/public/nsIPluginInstancePeer.h +++ b/modules/plugin/public/nsIPluginInstancePeer.h @@ -39,6 +39,14 @@ class nsIOutputStream; +#define NS_IPLUGININSTANCEPEER_IID \ +{ /* 4b7cea20-019b-11d2-815b-006008119d7a */ \ + 0x4b7cea20, \ + 0x019b, \ + 0x11d2, \ + {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ +} + //////////////////////////////////////////////////////////////////////////////// // Plugin Instance Peer Interface @@ -53,7 +61,8 @@ class nsIOutputStream; */ class nsIPluginInstancePeer : public nsISupports { public: - + NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLUGININSTANCEPEER_IID) + /** * Returns the value of a variable associated with the plugin manager. * @@ -129,14 +138,6 @@ public: }; -#define NS_IPLUGININSTANCEPEER_IID \ -{ /* 4b7cea20-019b-11d2-815b-006008119d7a */ \ - 0x4b7cea20, \ - 0x019b, \ - 0x11d2, \ - {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ -} - //////////////////////////////////////////////////////////////////////////////// #endif /* nsIPluginInstancePeer_h___ */ diff --git a/modules/plugin/public/nsIPluginManager.h b/modules/plugin/public/nsIPluginManager.h index e79560c8832a..36951cc17936 100644 --- a/modules/plugin/public/nsIPluginManager.h +++ b/modules/plugin/public/nsIPluginManager.h @@ -39,6 +39,23 @@ class nsIPluginStreamListener; +#define NS_IPLUGINMANAGER_IID \ +{ /* da58ad80-4eb6-11d2-8164-006008119d7a */ \ + 0xda58ad80, \ + 0x4eb6, \ + 0x11d2, \ + {0x81, 0x64, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ +} + +// CLSID for the browser's global plugin manager object. +#define NS_PLUGINMANAGER_CID \ +{ /* ce768990-5a4e-11d2-8164-006008119d7a */ \ + 0xce768990, \ + 0x5a4e, \ + 0x11d2, \ + {0x81, 0x64, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ +} + /** * The nsIPluginManager interface defines the minimum set of functionality that * the browser will support if it allows plugins. Plugins can call QueryInterface @@ -47,7 +64,8 @@ class nsIPluginStreamListener; */ class nsIPluginManager : public nsISupports { public: - + NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLUGINMANAGER_IID) + /** * Returns the value of a variable associated with the plugin manager. * @@ -176,23 +194,6 @@ public: }; -#define NS_IPLUGINMANAGER_IID \ -{ /* da58ad80-4eb6-11d2-8164-006008119d7a */ \ - 0xda58ad80, \ - 0x4eb6, \ - 0x11d2, \ - {0x81, 0x64, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ -} - -// CLSID for the browser's global plugin manager object. -#define NS_PLUGINMANAGER_CID \ -{ /* ce768990-5a4e-11d2-8164-006008119d7a */ \ - 0xce768990, \ - 0x5a4e, \ - 0x11d2, \ - {0x81, 0x64, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ -} - //////////////////////////////////////////////////////////////////////////////// #endif /* nsIPluginManager_h___ */ diff --git a/modules/plugin/public/nsIPluginTagInfo.h b/modules/plugin/public/nsIPluginTagInfo.h index 0191481a45b9..06ce323a80e3 100644 --- a/modules/plugin/public/nsIPluginTagInfo.h +++ b/modules/plugin/public/nsIPluginTagInfo.h @@ -37,6 +37,14 @@ #include "nsplugindefs.h" #include "nsISupports.h" +#define NS_IPLUGINTAGINFO_IID \ +{ /* 5f1ec1d0-019b-11d2-815b-006008119d7a */ \ + 0x5f1ec1d0, \ + 0x019b, \ + 0x11d2, \ + {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ +} + //////////////////////////////////////////////////////////////////////////////// // Plugin Tag Info Interface // This interface provides information about the HTML tag on the page. @@ -44,7 +52,8 @@ class nsIPluginTagInfo : public nsISupports { public: - + NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLUGINTAGINFO_IID) + // QueryInterface on nsIPluginInstancePeer to get this. // (Corresponds to NPP_New's argc, argn, and argv arguments.) @@ -69,14 +78,6 @@ public: }; -#define NS_IPLUGINTAGINFO_IID \ -{ /* 5f1ec1d0-019b-11d2-815b-006008119d7a */ \ - 0x5f1ec1d0, \ - 0x019b, \ - 0x11d2, \ - {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \ -} - //////////////////////////////////////////////////////////////////////////////// #endif /* nsIPluginTagInfo_h___ */