corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolving interface name conflict in plugin sample code, not part of the build

Browse Source
This commit is contained in:
av@netscape.com
2002-09-06 21:05:53 +00:00
parent da3ff96e43
commit 0a418b7002
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/plugin/tools/sdk/samples/scriptable/mac/nsIScriptablePlugin.idl → modules/plugin/tools/sdk/samples/scriptable/mac/nsIScriptablePluginSample.idl
View File

@@ -23,7 +23,7 @@
#include "nsISupports.idl"
[scriptable, uuid(d2d536a0-b6fc-11d5-9d10-0060b0fbd8ac)]
interface nsIScriptablePlugin : nsISupports {
interface nsIScriptablePluginSample : nsISupports {
void showVersion();
void clear();
};

6
modules/plugin/tools/sdk/samples/scriptable/mac/nsScriptablePeer.cpp
View File

@@ -47,7 +47,7 @@
//
#include "plugin.h"
static NS_DEFINE_IID(kIScriptableIID, NS_ISCRIPTABLEPLUGIN_IID);
static NS_DEFINE_IID(kIScriptableIID, NS_ISCRIPTABLEPLUGINSAMPLE_IID);
static NS_DEFINE_IID(kIClassInfoIID, NS_ICLASSINFO_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
@@ -87,7 +87,7 @@ NS_IMETHODIMP nsScriptablePeer::QueryInterface(const nsIID& aIID, void** aInstan
return NS_ERROR_NULL_POINTER;
if(aIID.Equals(kIScriptableIID)) {
*aInstancePtr = static_cast<nsIScriptablePlugin*>(this);
*aInstancePtr = static_cast<nsIScriptablePluginSample*>(this);
AddRef();
return NS_OK;
}
@@ -99,7 +99,7 @@ NS_IMETHODIMP nsScriptablePeer::QueryInterface(const nsIID& aIID, void** aInstan
}
if(aIID.Equals(kISupportsIID)) {
*aInstancePtr = static_cast<nsISupports*>(static_cast<nsIScriptablePlugin*>(this));
*aInstancePtr = static_cast<nsISupports*>(static_cast<nsIScriptablePluginSample*>(this));
AddRef();
return NS_OK;
}

6
modules/plugin/tools/sdk/samples/scriptable/mac/nsScriptablePeer.h
View File

@@ -45,7 +45,7 @@
#ifndef __nsScriptablePeer_h__
#define __nsScriptablePeer_h__
#include "nsIScriptablePlugin.h"
#include "nsIScriptablePluginSample.h"
#include "nsIClassInfo.h"
class nsPluginInstance;
@@ -78,7 +78,7 @@ class nsClassInfoMixin : public nsIClassInfo
{return NS_ERROR_NOT_IMPLEMENTED;}
};
class nsScriptablePeer : public nsIScriptablePlugin,
class nsScriptablePeer : public nsIScriptablePluginSample,
public nsClassInfoMixin
{
public:
@@ -96,7 +96,7 @@ protected:
public:
// native methods callable from JavaScript
NS_DECL_NSISCRIPTABLEPLUGIN
NS_DECL_NSISCRIPTABLEPLUGINSAMPLE
void SetInstance(nsPluginInstance* plugin);

4
modules/plugin/tools/sdk/samples/scriptable/mac/plugin.cpp
View File

@@ -330,7 +330,7 @@ NPError nsPluginInstance::GetValue(NPPVariable aVariable, void *aValue)
switch (aVariable) {
case NPPVpluginScriptableInstance: {
// addref happens in getter, so we don't addref here
nsIScriptablePlugin * scriptablePeer = getScriptablePeer();
nsIScriptablePluginSample * scriptablePeer = getScriptablePeer();
if (scriptablePeer) {
*(nsISupports **)aValue = scriptablePeer;
} else
@@ -339,7 +339,7 @@ NPError nsPluginInstance::GetValue(NPPVariable aVariable, void *aValue)
break;
case NPPVpluginScriptableIID: {
static nsIID scriptableIID = NS_ISCRIPTABLEPLUGIN_IID;
static nsIID scriptableIID = NS_ISCRIPTABLEPLUGINSAMPLE_IID;
nsIID* ptr = (nsIID *)NPN_MemAlloc(sizeof(nsIID));
if (ptr) {
*ptr = scriptableIID;

2
modules/plugin/tools/sdk/samples/scriptable/unix/nsIScriptablePlugin.idl → modules/plugin/tools/sdk/samples/scriptable/unix/nsIScriptablePluginSample.idl
View File

@@ -23,7 +23,7 @@
#include "nsISupports.idl"
[scriptable, uuid(d2d536a0-b6fc-11d5-9d10-0060b0fbd8ac)]
interface nsIScriptablePlugin : nsISupports {
interface nsIScriptablePluginSample : nsISupports {
void showVersion();
void clear();
};

2
modules/plugin/tools/sdk/samples/scriptable/windows/nsIScriptablePlugin.idl → modules/plugin/tools/sdk/samples/scriptable/windows/nsIScriptablePluginSample.idl
View File

@@ -23,7 +23,7 @@
#include "nsISupports.idl"
[scriptable, uuid(d2d536a0-b6fc-11d5-9d10-0060b0fbd8ac)]
interface nsIScriptablePlugin : nsISupports {
interface nsIScriptablePluginSample : nsISupports {
void showVersion();
void clear();
};

6
modules/plugin/tools/sdk/samples/scriptable/windows/nsScriptablePeer.cpp
View File

@@ -47,7 +47,7 @@
//
#include "plugin.h"
static NS_DEFINE_IID(kIScriptableIID, NS_ISCRIPTABLEPLUGIN_IID);
static NS_DEFINE_IID(kIScriptableIID, NS_ISCRIPTABLEPLUGINSAMPLE_IID);
static NS_DEFINE_IID(kIClassInfoIID, NS_ICLASSINFO_IID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
@@ -87,7 +87,7 @@ NS_IMETHODIMP nsScriptablePeer::QueryInterface(const nsIID& aIID, void** aInstan
return NS_ERROR_NULL_POINTER;
if(aIID.Equals(kIScriptableIID)) {
*aInstancePtr = static_cast<nsIScriptablePlugin*>(this);
*aInstancePtr = static_cast<nsIScriptablePluginSample*>(this);
AddRef();
return NS_OK;
}
@@ -99,7 +99,7 @@ NS_IMETHODIMP nsScriptablePeer::QueryInterface(const nsIID& aIID, void** aInstan
}
if(aIID.Equals(kISupportsIID)) {
*aInstancePtr = static_cast<nsISupports*>(static_cast<nsIScriptablePlugin*>(this));
*aInstancePtr = static_cast<nsISupports*>(static_cast<nsIScriptablePluginSample*>(this));
AddRef();
return NS_OK;
}

6
modules/plugin/tools/sdk/samples/scriptable/windows/nsScriptablePeer.h
View File

@@ -45,7 +45,7 @@
#ifndef __nsScriptablePeer_h__
#define __nsScriptablePeer_h__
#include "nsIScriptablePlugin.h"
#include "nsIScriptablePluginSample.h"
#include "nsIClassInfo.h"
class nsPluginInstance;
@@ -78,7 +78,7 @@ class nsClassInfoMixin : public nsIClassInfo
{return NS_ERROR_NOT_IMPLEMENTED;}
};
class nsScriptablePeer : public nsIScriptablePlugin,
class nsScriptablePeer : public nsIScriptablePluginSample,
public nsClassInfoMixin
{
public:
@@ -96,7 +96,7 @@ protected:
public:
// native methods callable from JavaScript
NS_DECL_NSISCRIPTABLEPLUGIN
NS_DECL_NSISCRIPTABLEPLUGINSAMPLE
void SetInstance(nsPluginInstance* plugin);

4
modules/plugin/tools/sdk/samples/scriptable/windows/plugin.cpp
View File

@@ -165,14 +165,14 @@ NPError nsPluginInstance::GetValue(NPPVariable aVariable, void *aValue)
if (aVariable == NPPVpluginScriptableInstance) {
// addref happens in getter, so we don't addref here
nsIScriptablePlugin * scriptablePeer = getScriptablePeer();
nsIScriptablePluginSample * scriptablePeer = getScriptablePeer();
if (scriptablePeer) {
*(nsISupports **)aValue = scriptablePeer;
} else
rv = NPERR_OUT_OF_MEMORY_ERROR;
}
else if (aVariable == NPPVpluginScriptableIID) {
static nsIID scriptableIID = NS_ISCRIPTABLEPLUGIN_IID;
static nsIID scriptableIID = NS_ISCRIPTABLEPLUGINSAMPLE_IID;
nsIID* ptr = (nsIID *)NPN_MemAlloc(sizeof(nsIID));
if (ptr) {
*ptr = scriptableIID;