From: <ag...@us...> - 2009-08-05 01:20:51
|
Revision: 907 http://zoolib.svn.sourceforge.net/zoolib/?rev=907&view=rev Author: agreen Date: 2009-08-05 01:20:42 +0000 (Wed, 05 Aug 2009) Log Message: ----------- Flesh-out the InvokeDefault suite. Modified Paths: -------------- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.cpp trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.h trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.cpp trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.h Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.cpp =================================================================== --- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.cpp 2009-08-05 00:55:20 UTC (rev 906) +++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.cpp 2009-08-05 01:20:42 UTC (rev 907) @@ -453,12 +453,29 @@ } NPVariantG NPObjectG::InvokeDefault() + { return this->InvokeDefault(nullptr, 0); } + +NPVariantG NPObjectG::InvokeDefault( + const NPVariantG& iP0) + { return this->InvokeDefault(&iP0, 1); } + +NPVariantG NPObjectG::InvokeDefault( + const NPVariantG& iP0, + const NPVariantG& iP1) { - NPVariantG result; - this->InvokeDefault(nullptr, 0, result); - return result; + NPVariantG arr[] = { iP0, iP1 }; + return this->InvokeDefault(arr, countof(arr)); } +NPVariantG NPObjectG::InvokeDefault( + const NPVariantG& iP0, + const NPVariantG& iP1, + const NPVariantG& iP2) + { + NPVariantG arr[] = { iP0, iP1, iP2 }; + return this->InvokeDefault(arr, countof(arr)); + } + NPVariantG NPObjectG::Get(const std::string& iName) { NPVariantG result; Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.h =================================================================== --- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.h 2009-08-05 00:55:20 UTC (rev 906) +++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.h 2009-08-05 01:20:42 UTC (rev 907) @@ -167,8 +167,21 @@ const NPVariantG& iP2); NPVariantG InvokeDefault(const NPVariantG* iArgs, size_t iCount); + NPVariantG InvokeDefault(); + NPVariantG InvokeDefault( + const NPVariantG& iP0); + + NPVariantG InvokeDefault( + const NPVariantG& iP0, + const NPVariantG& iP1); + + NPVariantG InvokeDefault( + const NPVariantG& iP0, + const NPVariantG& iP1, + const NPVariantG& iP2); + NPVariantG Get(const std::string& iName); NPVariantG Get(size_t iIndex); Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.cpp =================================================================== --- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.cpp 2009-08-05 00:55:20 UTC (rev 906) +++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.cpp 2009-08-05 01:20:42 UTC (rev 907) @@ -421,12 +421,28 @@ } NPVariantH NPObjectH::InvokeDefault() + { return this->InvokeDefault(nullptr, 0); } + +NPVariantH NPObjectH::InvokeDefault( + const NPVariantH& iP0) + { return this->InvokeDefault(&iP0, 1); } + +NPVariantH NPObjectH::InvokeDefault( + const NPVariantH& iP0, + const NPVariantH& iP1) { - NPVariantH result; - this->InvokeDefault(nullptr, 0, result); - return result; + NPVariantH arr[] = { iP0, iP1 }; + return this->InvokeDefault(arr, countof(arr)); } +NPVariantH NPObjectH::InvokeDefault( + const NPVariantH& iP0, + const NPVariantH& iP1, + const NPVariantH& iP2) + { + NPVariantH arr[] = { iP0, iP1, iP2 }; + return this->InvokeDefault(arr, countof(arr)); + } NPVariantH NPObjectH::Get(const string& iName) { NPVariantH result; Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.h =================================================================== --- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.h 2009-08-05 00:55:20 UTC (rev 906) +++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.h 2009-08-05 01:20:42 UTC (rev 907) @@ -154,8 +154,21 @@ const NPVariantH& iP2); NPVariantH InvokeDefault(const NPVariantH* iArgs, size_t iCount); + NPVariantH InvokeDefault(); + NPVariantH InvokeDefault( + const NPVariantH& iP0); + + NPVariantH InvokeDefault( + const NPVariantH& iP0, + const NPVariantH& iP1); + + NPVariantH InvokeDefault( + const NPVariantH& iP0, + const NPVariantH& iP1, + const NPVariantH& iP2); + NPVariantH Get(const string& iName); NPVariantH Get(size_t iIndex); @@ -191,7 +204,7 @@ // ValMap protocol bool QGet(const string& iName, ValH& oVal) const; - ValH DGet(const string& iName, const ValH& iDefault) const; + ValH DGet(const ValH& iDefault, const string& iName) const; ValH Get(const string& iName) const; void Set(const string& iName, const ValH& iVal); void Erase(const string& iName); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |