diff options
Diffstat (limited to 'src/modules/objects/class_xmlreader.cpp')
| -rw-r--r-- | src/modules/objects/class_xmlreader.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index a9e6b5985..4438df709 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -23,11 +23,12 @@ //============================================================================= #include "class_xmlreader.h" -//#include "class_memorybuffer.h" - +#include "class_memorybuffer.h" #include "kvi_locale.h" + #include "kvi_kvs_variantlist.h" #include "kvi_kvs_hash.h" + #include "kvi_qstring.h" @@ -310,10 +311,10 @@ KVSO_CLASS_FUNCTION(xmlreader,parse) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("string_or_memorybuffer_object",KVS_PT_VARIANT,0,pVariantData) KVSO_PARAMETERS_END(c) -#ifdef QT_NO_XML + #ifdef QT_NO_XML fatalError(__tr2qs("XML support not available in the Qt library")); c->returnValue()->setBoolean(false); -#else // QT_NO_XML + #else m_szLastError = ""; KviXmlHandler handler(this); QXmlInputSource source; @@ -329,8 +330,6 @@ KVSO_CLASS_FUNCTION(xmlreader,parse) c->warning(__tr2qs("Data parameter is not an object")); return true; } - /* - FIXME if (pObject->inherits("KviKvsObject_memorybuffer")) { source.setData(*((KviKvsObject_memorybuffer *)pObject)->pBuffer()); @@ -340,7 +339,6 @@ KVSO_CLASS_FUNCTION(xmlreader,parse) c->warning(__tr2qs("Data parameter is not a memorybuffer object")); return true; } - */ } else if(pVariantData->isString()) { @@ -364,7 +362,7 @@ KVSO_CLASS_FUNCTION(xmlreader,parse) reader.setContentHandler(&handler); reader.setErrorHandler(&handler); c->returnValue()->setBoolean(reader.parse(source)); -#endif // QT_NO_XML +#endif return true; } |