From 66fbffa883ecadca18953ee0bc2719d2a911cdf5 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期三, 11 十二月 2024 15:56:11 +0800
Subject: [PATCH] update
---
jrj/xframe/kobject/kxml.hpp | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/jrj/xframe/kobject/kxml.hpp b/jrj/xframe/kobject/kxml.hpp
index 050b9e5..8606072 100644
--- a/jrj/xframe/kobject/kxml.hpp
+++ b/jrj/xframe/kobject/kxml.hpp
@@ -13,7 +13,7 @@
class KXMLDOMTextNode;
class KXMLDOMProcessingInstruction;
class KXMLDOMNodeList;
- class KXMLParseError;
+ class KXMLDOMParseError;
enum KDOMNodeType
{
@@ -141,15 +141,35 @@
this->AddRef();
return (LPARAM)this->getImpl();
}
- KXMLDOMNode(LPARAM p) :KXMLDOMNode((void*)p) {}
+ KXMLDOMNode(LPARAM p) :KXMLDOMNode((void*)p) {
+ AddRef();
+ }
public:
operator bool() { return impl ? true : false; }
+ bool operator !=(KXMLDOMNode& rhs) { return rhs.getImpl() != getImpl(); }
+ bool operator ==(KXMLDOMNode& rhs) { return rhs.getImpl() == getImpl(); }
public:
void* getImpl();
};
+
+ class KXMLDOMElement : public KXMLDOMNode
+ {
+ public:
+ KXMLDOMElement(KXMLDOMNode v);
+ KXMLDOMElement(void* impl) :KXMLDOMNode(impl) {}
+ KXMLDOMElement() :KXMLDOMNode() {}
+ public:
+ KXMLDOMElement(LPARAM p) :KXMLDOMNode(p) {}
+ };
+
class KXMLDOMDocument : public KXMLDOMNode
{
+ public:
+ bool operator !()
+ {
+ return !impl || !documentElement();
+ }
public:
const wchar_t* text();
const wchar_t* url();
@@ -192,7 +212,7 @@
wchar_t* transformNode(KXMLDOMNode);
KXMLDOMNode transformNodeToObject(KXMLDOMNode);
- KXMLParseError validate();
+ KXMLDOMParseError validate();
//bool validateNode();
public:
KXMLDOMDocument(void* impl);
@@ -201,17 +221,13 @@
public:
const KXMLDOMDocument& operator =(const KXMLDOMDocument& rhs);
KXMLDOMDocument(const KXMLDOMDocument& rhs);
+ public:
+ void Reset()
+ {
+ if (documentElement())removeChild(documentElement());
+ }
};
- class KXMLDOMElement : public KXMLDOMNode
- {
- public:
- KXMLDOMElement( KXMLDOMNode v);
- KXMLDOMElement(void* impl) :KXMLDOMNode(impl) {}
- KXMLDOMElement() :KXMLDOMNode() {}
- public:
- KXMLDOMElement(LPARAM p) :KXMLDOMNode((void*)p) {}
- };
class KXMLDOMAttribute : public KXMLDOMNode
{
public:
@@ -268,11 +284,19 @@
using KXMLDOMElement=Hxsoft::XFrame::KXMLDOMElement;
using KXMLDOMNodeList = Hxsoft::XFrame::KXMLDOMNodeList;
-class KXMLParseError : public KXMLDOMNode
+class KXMLDOMParseError : public KXMLDOMNode
{
public:
- KXMLParseError(KXMLDOMNode& v);
- KXMLParseError(void* impl) :KXMLDOMNode(impl) {}
+ KXMLDOMParseError(KXMLDOMNode& v);
+ KXMLDOMParseError(void* impl) :KXMLDOMNode(impl) {}
+public:
+ int errorCode();
+ int filepos();
+ int line();
+ int linepos();
+ BSTR reason();
+ BSTR srcText();
+ BSTR url();
};
class KXMLDOMElementPtr
--
Gitblit v1.9.3