From 9c190b7a9a845bcb35d3d09d255f12d9c879e403 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 23 十月 2024 18:07:50 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/vindexform.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/jrj/project/vindexform.cpp b/jrj/project/vindexform.cpp
index 0d9f49d..05a22a6 100644
--- a/jrj/project/vindexform.cpp
+++ b/jrj/project/vindexform.cpp
@@ -48,7 +48,7 @@
xml x ;
x.load(L"cache\\config.xml");
//alert(x.GetXml());
- if (x.xml() == L"") return L"";
+ if ((xstring)x.xml() == L"") return L"";
KXMLDOMElement e = x.documentElement();
if (e.selectSingleNode(L"home"))
{
@@ -63,7 +63,7 @@
{
xml x ;
x.load(L"cache\\config.xml");
- if (x.xml() == L"")
+ if ((xstring)x.xml() == L"")
{
//alert(L"<config><home "+att+L"="+value+L"/></config>");
x.loadXML(L"<config><home " + att + L"='" + value + L"'/></config>");
@@ -312,7 +312,7 @@
//trace(x.GetXml());
return -1;
}
- if (x.xml() == L"") return -1;
+ if ((xstring)x.xml() == L"") return -1;
KXMLDOMElement e = x.documentElement();
if (/*m_Assignment == L"" &&*/ e.selectSingleNode(L"AssignmentID"))
{
@@ -354,7 +354,7 @@
trace(x.xml());
return -1;
}
- if (x.xml() == L"") return -1;
+ if ((xstring)x.xml() == L"") return -1;
KXMLDOMElement e = x.documentElement();
KXMLDOMNodeList li = e.selectNodes(L"item");
int i;
--
Gitblit v1.9.3