diff options
| author | Adam Domurad <adomurad@redhat.com> | 2013-06-21 12:47:45 -0400 |
|---|---|---|
| committer | Adam Domurad <adomurad@redhat.com> | 2013-06-21 12:47:45 -0400 |
| commit | a14e2d60ae4b77609973d7e35959c1edb04280fc (patch) | |
| tree | cc6b11c2f9d09438fc55056f1031ec83c2d2e2ff /plugin/icedteanp/IcedTeaScriptablePluginObject.h | |
| parent | b30dceba4363f445d9febf52e1788d63cc440a08 (diff) | |
Move 'get_scriptable_java_package_object' and 'get_scriptable_java_object' into their correct respective classes.
Diffstat (limited to 'plugin/icedteanp/IcedTeaScriptablePluginObject.h')
| -rw-r--r-- | plugin/icedteanp/IcedTeaScriptablePluginObject.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plugin/icedteanp/IcedTeaScriptablePluginObject.h b/plugin/icedteanp/IcedTeaScriptablePluginObject.h index ad8a2eb..71fab4e 100644 --- a/plugin/icedteanp/IcedTeaScriptablePluginObject.h +++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.h @@ -87,7 +87,6 @@ class IcedTeaScriptablePluginObject: public NPObject static bool construct(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result); - static NPObject* get_scriptable_java_package_object(NPP instance, const NPUTF8* name); }; NPObject* allocate_scriptable_jp_object(NPP npp, NPClass *aClass); @@ -136,10 +135,7 @@ class IcedTeaScriptableJavaPackageObject: public NPObject static bool construct(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result); - static NPObject* get_scriptable_java_object(NPP instance, - std::string class_id, - std::string instance_id, - bool isArray); + static NPObject* get_scriptable_java_package_object(NPP instance, const NPUTF8* name); static bool is_valid_java_object(NPObject* object_ptr); }; @@ -199,6 +195,11 @@ class IcedTeaScriptableJavaObject: public NPObject static bool construct(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result); + + static NPObject* get_scriptable_java_object(NPP instance, + std::string class_id, + std::string instance_id, + bool isArray); }; /* Creates and retains a scriptable java object (intended to be called asynch.) */ |