Skip to content

Commit

Permalink
Fix conversion problem
Browse files Browse the repository at this point in the history
  • Loading branch information
puritys committed Sep 28, 2015
1 parent 731fa80 commit 50b20ea
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/nodeExt/includes/phplikeXml.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ class phpXMLDocument : public node::ObjectWrap {
static NAN_METHOD(New);//Handle<Value> New(const Arguments &args);
static NAN_METHOD(load);//Handle<Value> load(const Arguments &args);
static NAN_METHOD(loadXML);//Handle<Value> loadXML(const Arguments &args);
static void loadChild(Handle<Object> object, XMLNode* node);
static Handle<Object> getNodeInfo(XMLNode* node, XMLNode* firstChild);
static void loadChild(Local<Object> object, XMLNode* node);
static Local<Object> getNodeInfo(XMLNode* node, XMLNode* firstChild);
static Handle<Object> getTextNodeInfo(XMLNode* node);
static void setAttributesIntoJs(Handle<Object> obj, XMLNode* node);
static Local<Object> parseXML(phpXMLDocument *doc);
Expand Down
8 changes: 4 additions & 4 deletions src/nodeExt/phplikeXml.cc
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Local<Object> phpXMLDocument::parseXML(phpXMLDocument *d) {
return object;
}

void phpXMLDocument::loadChild(Handle<Object> object, XMLNode* parentNode) {/*{{{*/
void phpXMLDocument::loadChild(Local<Object> object, XMLNode* parentNode) {/*{{{*/
Handle<Array> arr = Nan::New<Array>();//Array::New();
int index = 0;
for (XMLNode* node=parentNode; node; node=node->NextSibling() ) {
Expand All @@ -80,7 +80,7 @@ void phpXMLDocument::loadChild(Handle<Object> object, XMLNode* parentNode) {/*{{


XMLElement* isElement = node->ToElement();
Handle<Object> obj;
Local<Object> obj;

if (isElement) {
obj = getNodeInfo(node, firstChildElement);
Expand Down Expand Up @@ -121,9 +121,9 @@ void phpXMLDocument::setAttributesIntoJs(Handle<Object> obj, XMLNode* node) {/*{
}/*}}}*/


Handle<Object> phpXMLDocument::getNodeInfo(XMLNode* node, XMLNode* firstChildElement) {/*{{{*/
Local<Object> phpXMLDocument::getNodeInfo(XMLNode* node, XMLNode* firstChildElement) {/*{{{*/

Handle<Object> obj = Nan::New<Object>();
Local<Object> obj = Nan::New<Object>();
XMLElement* element = node->ToElement();
Handle<String> name = Nan::New<String>(element->Name()).ToLocalChecked();
//obj->Set(Nan::New<String>("name"), name);
Expand Down

0 comments on commit 50b20ea

Please sign in to comment.