bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename CefXmlReader::MoveToNextElement to CefXmlReader::MoveToNextNode to better represent its purpose.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@120 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2010-10-21 15:19:43 +00:00
parent 18bc093786
commit 92eb49f44f
9 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libcef_dll/cpptoc/xml_reader_cpptoc.cc
View File

@@ -32,13 +32,13 @@ CEF_EXPORT cef_xml_reader_t* cef_xml_reader_create(cef_stream_reader_t* stream,
// MEMBER FUNCTIONS - Body may be edited by hand.
int CEF_CALLBACK xml_reader_move_to_next_element(struct _cef_xml_reader_t* self)
int CEF_CALLBACK xml_reader_move_to_next_node(struct _cef_xml_reader_t* self)
{
DCHECK(self);
if(!self)
return 0;
return CefXmlReaderCppToC::Get(self)->MoveToNextElement();
return CefXmlReaderCppToC::Get(self)->MoveToNextNode();
}
int CEF_CALLBACK xml_reader_close(struct _cef_xml_reader_t* self)
@@ -367,7 +367,7 @@ int CEF_CALLBACK xml_reader_move_to_carrying_element(
CefXmlReaderCppToC::CefXmlReaderCppToC(CefXmlReader* cls)
: CefCppToC<CefXmlReaderCppToC, CefXmlReader, cef_xml_reader_t>(cls)
{
struct_.struct_.move_to_next_element = xml_reader_move_to_next_element;
struct_.struct_.move_to_next_node = xml_reader_move_to_next_node;
struct_.struct_.close = xml_reader_close;
struct_.struct_.has_error = xml_reader_has_error;
struct_.struct_.get_error = xml_reader_get_error;

6
libcef_dll/ctocpp/xml_reader_ctocpp.cc
View File

@@ -29,12 +29,12 @@ CefRefPtr<CefXmlReader> CefXmlReader::Create(CefRefPtr<CefStreamReader> stream,
// VIRTUAL METHODS - Body may be edited by hand.
bool CefXmlReaderCToCpp::MoveToNextElement()
bool CefXmlReaderCToCpp::MoveToNextNode()
{
if(CEF_MEMBER_MISSING(struct_, move_to_next_element))
if(CEF_MEMBER_MISSING(struct_, move_to_next_node))
return false;
return struct_->move_to_next_element(struct_) ? true : false;
return struct_->move_to_next_node(struct_) ? true : false;
}
bool CefXmlReaderCToCpp::Close()

2
libcef_dll/ctocpp/xml_reader_ctocpp.h
View File

@@ -31,7 +31,7 @@ public:
virtual ~CefXmlReaderCToCpp() {}
// CefXmlReader methods
virtual bool MoveToNextElement();
virtual bool MoveToNextNode();
virtual bool Close();
virtual bool HasError();
virtual std::wstring GetError();

4
libcef_dll/wrapper/cef_xml_object.cc
View File

@@ -24,7 +24,7 @@ public:
if (!reader.get())
return false;
bool ret = reader->MoveToNextElement();
bool ret = reader->MoveToNextNode();
if (ret) {
CefRefPtr<CefXmlObject> cur_object(root_object_), new_object;
CefXmlObject::ObjectVector queue;
@@ -133,7 +133,7 @@ public:
break;
}
}
} while(reader->MoveToNextElement());
} while(reader->MoveToNextNode());
}
if (reader->HasError()) {