generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-17 19:25:53 +02:00
Code Issues Projects Releases Wiki Activity

submitted 1.2.0

Browse Source
This commit is contained in:
Guenter Obiltschnig
2006-08-29 07:10:35 +00:00
parent f476bd6b32
commit 2d4078f392
1428 changed files with 25715 additions and 12456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
XML/include/DOM/AbstractContainerNode.h → XML/include/Poco/DOM/AbstractContainerNode.h
View File

@@ -1,7 +1,7 @@
//
// AbstractContainerNode.h
//
// $Id: //poco/1.1.0/XML/include/DOM/AbstractContainerNode.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/AbstractContainerNode.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_AbstractContainerNode_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_AbstractNode_INCLUDED
#include "DOM/AbstractNode.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/AbstractNode.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API AbstractContainerNode: public AbstractNode
@@ -83,7 +80,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_AbstractContainerNode_INCLUDED

23
XML/include/DOM/AbstractNode.h → XML/include/Poco/DOM/AbstractNode.h
View File

@@ -1,7 +1,7 @@
//
// AbstractNode.h
//
// $Id: //poco/1.1.0/XML/include/DOM/AbstractNode.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/AbstractNode.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,21 +40,14 @@
#define DOM_AbstractNode_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_Node_INCLUDED
#include "DOM/Node.h"
#endif
#ifndef DOM_MutationEvent_INCLUDED
#include "DOM/MutationEvent.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/Node.h"
#include "Poco/DOM/MutationEvent.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class AbstractContainerNode;
@@ -145,7 +138,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_AbstractNode_INCLUDED

26
XML/include/DOM/Attr.h → XML/include/Poco/DOM/Attr.h
View File

@@ -1,7 +1,7 @@
//
// Attr.h
//
// $Id: //poco/1.1.0/XML/include/DOM/Attr.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/Attr.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,21 +40,14 @@
#define DOM_Attr_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_AbstractNode_INCLUDED
#include "DOM/AbstractNode.h"
#endif
#ifndef DOM_Element_INCLUDED
#include "DOM/Element.h"
#endif
#ifndef XML_Name_INCLUDED
#include "XML/Name.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/AbstractNode.h"
#include "Poco/DOM/Element.h"
#include "Poco/XML/Name.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API Attr: public AbstractNode
@@ -149,6 +142,9 @@ public:
XMLString prefix() const;
const XMLString& localName() const;
// Non-standard extensions
XMLString innerText() const;
protected:
Attr(Document* pOwnerDocument, Element* pOwnerElement, const XMLString& namespaceURI, const XMLString& localName, const XMLString& qname, const XMLString& value, bool specified = true);
Attr(Document* pOwnerDocument, const Attr& attr);
@@ -200,7 +196,7 @@ inline Element* Attr::ownerElement() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_Attr_INCLUDED

15
XML/include/DOM/AttrMap.h → XML/include/Poco/DOM/AttrMap.h
View File

@@ -1,7 +1,7 @@
//
// AttrMap.h
//
// $Id: //poco/1.1.0/XML/include/DOM/AttrMap.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/AttrMap.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_AttrMap_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_NamedNodeMap_INCLUDED
#include "DOM/NamedNodeMap.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/NamedNodeMap.h"
XML_BEGIN
namespace Poco {
namespace XML {
class Element;
@@ -84,7 +81,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_AttrMap_INCLUDED

19
XML/include/DOM/AutoPtr.h → XML/include/Poco/DOM/AutoPtr.h
View File

@@ -1,13 +1,13 @@
//
// AutoPtr.h
//
// $Id: //poco/1.1.0/XML/include/DOM/AutoPtr.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/AutoPtr.h#1 $
//
// Library: XML
// Package: DOM
// Module: DOM
//
// Import Foundation::AutoPtr into the XML namespace.
// Import Poco::AutoPtr into the XML namespace.
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
@@ -40,21 +40,18 @@
#define DOM_DOMAutoPtr_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef Foundation_AutoPtr_INCLUDED
#include "Foundation/AutoPtr.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/AutoPtr.h"
XML_BEGIN
namespace Poco {
namespace XML {
using Foundation::AutoPtr;
using Poco::AutoPtr;
XML_END
} } // namespace Poco::XML
#endif // DOM_DOMAutoPtr_INCLUDED

15
XML/include/DOM/CDATASection.h → XML/include/Poco/DOM/CDATASection.h
View File

@@ -1,7 +1,7 @@
//
// CDATASection.h
//
// $Id: //poco/1.1.0/XML/include/DOM/CDATASection.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/CDATASection.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_CDATASection_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_Text_INCLUDED
#include "DOM/Text.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/Text.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API CDATASection: public Text
@@ -103,7 +100,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_CDATASection_INCLUDED

19
XML/include/DOM/CharacterData.h → XML/include/Poco/DOM/CharacterData.h
View File

@@ -1,7 +1,7 @@
//
// CharacterData.h
//
// $Id: //poco/1.1.0/XML/include/DOM/CharacterData.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/CharacterData.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,18 +40,13 @@
#define DOM_CharacterData_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_AbstractNode_INCLUDED
#include "DOM/AbstractNode.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/AbstractNode.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API CharacterData: public AbstractNode
@@ -144,7 +139,7 @@ inline unsigned long CharacterData::length() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_CharacterData_INCLUDED

15
XML/include/DOM/ChildNodesList.h → XML/include/Poco/DOM/ChildNodesList.h
View File

@@ -1,7 +1,7 @@
//
// ChildNodesList.h
//
// $Id: //poco/1.1.0/XML/include/DOM/ChildNodesList.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/ChildNodesList.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_ChildNodesList_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_NodeList_INCLUDED
#include "DOM/NodeList.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/NodeList.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API ChildNodesList: public NodeList
@@ -74,7 +71,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_ChildNodesList_INCLUDED

19
XML/include/DOM/Comment.h → XML/include/Poco/DOM/Comment.h
View File

@@ -1,7 +1,7 @@
//
// Comment.h
//
// $Id: //poco/1.1.0/XML/include/DOM/Comment.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/Comment.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,18 +40,13 @@
#define DOM_Comment_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_CharacterData_INCLUDED
#include "DOM/CharacterData.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/CharacterData.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API Comment: public CharacterData
@@ -79,7 +74,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_Comment_INCLUDED

27
XML/include/DOM/DOMBuilder.h → XML/include/Poco/DOM/DOMBuilder.h
View File

@@ -1,7 +1,7 @@
//
// DOMBuilder.h
//
// $Id: //poco/1.1.0/XML/include/DOM/DOMBuilder.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/DOMBuilder.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,24 +40,15 @@
#define DOM_DOMBuilder_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef SAX_ContentHandler_INCLUDED
#include "SAX/ContentHandler.h"
#endif
#ifndef SAX_LexicalHandler_INCLUDED
#include "SAX/LexicalHandler.h"
#endif
#ifndef SAX_DTDHandler_INCLUDED
#include "SAX/DTDHandler.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/SAX/ContentHandler.h"
#include "Poco/SAX/LexicalHandler.h"
#include "Poco/SAX/DTDHandler.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XMLReader;
@@ -134,7 +125,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_DOMBuilder_INCLUDED

22
XML/include/DOM/DOMException.h → XML/include/Poco/DOM/DOMException.h
View File

@@ -1,7 +1,7 @@
//
// DOMException.h
//
// $Id: //poco/1.1.0/XML/include/DOM/DOMException.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/DOMException.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_DOMException_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLException_INCLUDED
#include "XML/XMLException.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLException.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API DOMException: public XMLException
@@ -101,11 +98,16 @@ public:
const char* className() const throw();
/// Returns the name of the exception class.
Poco::Exception* clone() const;
/// Creates an exact copy of the exception.
void rethrow() const;
/// (Re)Throws the exception.
unsigned short code() const;
/// Returns the DOM exception code.
protected:
Foundation::Exception* clone() const;
static const std::string& message(unsigned short code);
private:
@@ -126,7 +128,7 @@ inline unsigned short DOMException::code() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_DOMException_INCLUDED

15
XML/include/DOM/DOMImplementation.h → XML/include/Poco/DOM/DOMImplementation.h
View File

@@ -1,7 +1,7 @@
//
// DOMImplementation.h
//
// $Id: //poco/1.1.0/XML/include/DOM/DOMImplementation.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/DOMImplementation.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_DOMImplementation_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class DocumentType;
@@ -99,7 +96,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_DOMImplementation_INCLUDED

11
XML/include/DOM/DOMObject.h → XML/include/Poco/DOM/DOMObject.h
View File

@@ -1,7 +1,7 @@
//
// DOMObject.h
//
// $Id: //poco/1.1.0/XML/include/DOM/DOMObject.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/DOMObject.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,12 +40,11 @@
#define DOM_DOMObject_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#include "Poco/XML/XML.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API DOMObject
@@ -120,7 +119,7 @@ inline void DOMObject::release() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_DOMObject_INCLUDED

17
XML/include/DOM/DOMParser.h → XML/include/Poco/DOM/DOMParser.h
View File

@@ -1,7 +1,7 @@
//
// DOMParser.h
//
// $Id: //poco/1.1.0/XML/include/DOM/DOMParser.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/DOMParser.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_DOMParser_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef SAX_SAXParser_INCLUDED
#include "SAX/SAXParser.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/SAX/SAXParser.h"
XML_BEGIN
namespace Poco {
namespace XML {
class NamePool;
@@ -79,7 +76,7 @@ public:
/// the parser if no encoding is specified in
/// the XML document.
void addEncoding(const XMLString& name, Foundation::TextEncoding* pEncoding);
void addEncoding(const XMLString& name, Poco::TextEncoding* pEncoding);
/// Adds an encoding to the parser.
void setFeature(const XMLString& name, bool state);
@@ -123,7 +120,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_DOMParser_INCLUDED

15
XML/include/DOM/DOMSerializer.h → XML/include/Poco/DOM/DOMSerializer.h
View File

@@ -1,7 +1,7 @@
//
// DOMSerializer.h
//
// $Id: //poco/1.1.0/XML/include/DOM/DOMSerializer.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/DOMSerializer.h#1 $
//
// Library: XML
// Package: DOM
@@ -38,15 +38,12 @@
#define DOM_DOMSerializer_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef SAX_XMLReader_INCLUDED
#include "SAX/XMLReader.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/SAX/XMLReader.h"
XML_BEGIN
namespace Poco {
namespace XML {
class Node;
@@ -137,7 +134,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_DOMSerializer_INCLUDED

33
XML/include/DOM/DOMWriter.h → XML/include/Poco/DOM/DOMWriter.h
View File

@@ -1,7 +1,7 @@
//
// DOMWriter.h
//
// $Id: //poco/1.1.0/XML/include/DOM/DOMWriter.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/DOMWriter.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,21 +40,14 @@
#define DOM_DOMWriter_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#ifndef XML_XMLStream_INCLUDED
#include "XML/XMLStream.h"
#endif
#ifndef Foundation_TextEncoding_INCLUDED
#include "Foundation/TextEncoding.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
#include "Poco/XML/XMLStream.h"
#include "Poco/TextEncoding.h"
XML_BEGIN
namespace Poco {
namespace XML {
class Node;
@@ -73,7 +66,7 @@ public:
~DOMWriter();
/// Destroys a DOMWriter.
void setEncoding(const std::string& encodingName, Foundation::TextEncoding& textEncoding);
void setEncoding(const std::string& encodingName, Poco::TextEncoding& textEncoding);
/// Sets the encoding, which will be reflected in the written XML declaration.
const XMLString& getEncoding() const;
@@ -104,10 +97,10 @@ public:
/// using a standard file output stream (std::ofstream).
private:
XMLString _encodingName;
Foundation::TextEncoding* _pTextEncoding;
int _options;
std::string _newLine;
XMLString _encodingName;
Poco::TextEncoding* _pTextEncoding;
int _options;
std::string _newLine;
};
@@ -132,7 +125,7 @@ inline const std::string& DOMWriter::getNewLine() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_DOMWriter_INCLUDED

15
XML/include/DOM/DTDMap.h → XML/include/Poco/DOM/DTDMap.h
View File

@@ -1,7 +1,7 @@
//
// DTDMap.h
//
// $Id: //poco/1.1.0/XML/include/DOM/DTDMap.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/DTDMap.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_DTDMap_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_NamedNodeMap_INCLUDED
#include "DOM/NamedNodeMap.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/NamedNodeMap.h"
XML_BEGIN
namespace Poco {
namespace XML {
class DocumentType;
@@ -86,7 +83,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_DTDMap_INCLUDED

33
XML/include/DOM/Document.h → XML/include/Poco/DOM/Document.h
View File

@@ -1,7 +1,7 @@
//
// Document.h
//
// $Id: //poco/1.1.0/XML/include/DOM/Document.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/Document.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,27 +40,16 @@
#define DOM_Document_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_AbstractContainerNode_INCLUDED
#include "DOM/AbstractContainerNode.h"
#endif
#ifndef DOM_DocumentEvent_INCLUDED
#include "DOM/DocumentEvent.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#ifndef XML_NamePool_INCLUDED
#include "XML/NamePool.h"
#endif
#ifndef Foundation_AutoReleasePool_INCLUDED
#include "Foundation/AutoReleasePool.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/AbstractContainerNode.h"
#include "Poco/DOM/DocumentEvent.h"
#include "Poco/XML/XMLString.h"
#include "Poco/XML/NamePool.h"
#include "Poco/AutoReleasePool.h"
XML_BEGIN
namespace Poco {
namespace XML {
class NamePool;
@@ -91,7 +80,7 @@ class XML_API Document: public AbstractContainerNode, public DocumentEvent
/// context they were created.
{
public:
typedef Foundation::AutoReleasePool<DOMObject> AutoReleasePool;
typedef Poco::AutoReleasePool<DOMObject> AutoReleasePool;
Document(NamePool* pNamePool = 0);
/// Creates a new document. If pNamePool == 0, the document
@@ -289,7 +278,7 @@ inline DocumentType* Document::getDoctype()
}
XML_END
} } // namespace Poco::XML
#endif // DOM_Document_INCLUDED

15
XML/include/DOM/DocumentEvent.h → XML/include/Poco/DOM/DocumentEvent.h
View File

@@ -1,7 +1,7 @@
//
// DocumentEvent.h
//
// $Id: //poco/1.1.0/XML/include/DOM/DocumentEvent.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/DocumentEvent.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_DocumentEvent_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class Event;
@@ -84,7 +81,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_DocumentEvent_INCLUDED

19
XML/include/DOM/DocumentFragment.h → XML/include/Poco/DOM/DocumentFragment.h
View File

@@ -1,7 +1,7 @@
//
// DocumentFragment.h
//
// $Id: //poco/1.1.0/XML/include/DOM/DocumentFragment.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/DocumentFragment.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,18 +40,13 @@
#define DOM_DocumentFragment_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_AbstractContainerNode_INCLUDED
#include "DOM/AbstractContainerNode.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/AbstractContainerNode.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API DocumentFragment: public AbstractContainerNode
@@ -105,7 +100,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_DocumentFragment_INCLUDED

15
XML/include/DOM/DocumentType.h → XML/include/Poco/DOM/DocumentType.h
View File

@@ -1,7 +1,7 @@
//
// DocumentType.h
//
// $Id: //poco/1.1.0/XML/include/DOM/DocumentType.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/DocumentType.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_DocumentType_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_AbstractContainerNode_INCLUDED
#include "DOM/AbstractContainerNode.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/AbstractContainerNode.h"
XML_BEGIN
namespace Poco {
namespace XML {
class NamedNodeMap;
@@ -144,7 +141,7 @@ inline const XMLString& DocumentType::systemId() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_DocumentType_INCLUDED

21
XML/include/DOM/Element.h → XML/include/Poco/DOM/Element.h
View File

@@ -1,7 +1,7 @@
//
// Element.h
//
// $Id: //poco/1.1.0/XML/include/DOM/Element.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/Element.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,18 +40,13 @@
#define DOM_Element_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_AbstractContainerNode_INCLUDED
#include "DOM/AbstractContainerNode.h"
#endif
#ifndef XML_Name_INCLUDED
#include "XML/Name.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/AbstractContainerNode.h"
#include "Poco/XML/Name.h"
XML_BEGIN
namespace Poco {
namespace XML {
class Attr;
@@ -169,6 +164,8 @@ public:
bool hasAttributes() const;
// Non-standard extensions
XMLString innerText() const;
Element* getChildElement(const XMLString& name) const;
/// Returns the first child element with the given name, or null
/// if such an element does not exist.
@@ -215,7 +212,7 @@ inline const XMLString& Element::tagName() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_Element_INCLUDED

19
XML/include/DOM/ElementsByTagNameList.h → XML/include/Poco/DOM/ElementsByTagNameList.h
View File

@@ -1,7 +1,7 @@
//
// ElementsByTagNameList.h
//
// $Id: //poco/1.1.0/XML/include/DOM/ElementsByTagNameList.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/ElementsByTagNameList.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,18 +40,13 @@
#define DOM_ElementsByTagNameList_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_NodeList_INCLUDED
#include "DOM/NodeList.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/NodeList.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API ElementsByTagNameList: public NodeList
@@ -105,7 +100,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_ElementsByTagNameList_INCLUDED

19
XML/include/DOM/Entity.h → XML/include/Poco/DOM/Entity.h
View File

@@ -1,7 +1,7 @@
//
// Entity.h
//
// $Id: //poco/1.1.0/XML/include/DOM/Entity.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/Entity.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,18 +40,13 @@
#define DOM_Entity_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_AbstractContainerNode_INCLUDED
#include "DOM/AbstractContainerNode.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/AbstractContainerNode.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API Entity: public AbstractContainerNode
@@ -147,7 +142,7 @@ inline const XMLString& Entity::notationName() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_Entity_INCLUDED

19
XML/include/DOM/EntityReference.h → XML/include/Poco/DOM/EntityReference.h
View File

@@ -1,7 +1,7 @@
//
// EntityReference.h
//
// $Id: //poco/1.1.0/XML/include/DOM/EntityReference.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/EntityReference.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,18 +40,13 @@
#define DOM_EntityReference_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_AbstractNode_INCLUDED
#include "DOM/AbstractNode.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/AbstractNode.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API EntityReference: public AbstractNode
@@ -94,7 +89,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_EntityReference_INCLUDED

23
XML/include/DOM/Event.h → XML/include/Poco/DOM/Event.h
View File

@@ -1,7 +1,7 @@
//
// Event.h
//
// $Id: //poco/1.1.0/XML/include/DOM/Event.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/Event.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,18 +40,13 @@
#define DOM_Event_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#ifndef DOM_DOMObject_INCLUDED
#include "DOM/DOMObject.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
#include "Poco/DOM/DOMObject.h"
XML_BEGIN
namespace Poco {
namespace XML {
class EventTarget;
@@ -97,7 +92,7 @@ public:
/// prevented. If the default action can be prevented the value is
/// true, else the value is false.
Foundation::UInt64 timeStamp() const;
Poco::UInt64 timeStamp() const;
/// Used to specify the time (in milliseconds relative to the epoch) at
/// which the event was created. Due to the fact that some
/// systems may not provide this information the value of timeStamp may
@@ -212,7 +207,7 @@ inline bool Event::cancelable() const
}
inline Foundation::UInt64 Event::timeStamp() const
inline Poco::UInt64 Event::timeStamp() const
{
return 0;
}
@@ -230,7 +225,7 @@ inline bool Event::isStopped() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_Event_INCLUDED

18
XML/include/DOM/EventDispatcher.h → XML/include/Poco/DOM/EventDispatcher.h
View File

@@ -1,7 +1,7 @@
//
// EventDispatcher.h
//
// $Id: //poco/1.1.0/XML/include/DOM/EventDispatcher.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/EventDispatcher.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,19 +40,13 @@
#define DOM_EventDispatcher_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#ifndef STD_LIST_INCLUDED
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
#include <list>
#define STD_LIST_INCLUDED
#endif
XML_BEGIN
namespace Poco {
namespace XML {
class Event;
@@ -119,7 +113,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_EventDispatcher_INCLUDED

17
XML/include/DOM/EventException.h → XML/include/Poco/DOM/EventException.h
View File

@@ -1,7 +1,7 @@
//
// EventException.h
//
// $Id: //poco/1.1.0/XML/include/DOM/EventException.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/EventException.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_EventException_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLException_INCLUDED
#include "XML/XMLException.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLException.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API EventException: public XMLException
@@ -84,7 +81,7 @@ public:
/// Returns the Event exception code.
protected:
Foundation::Exception* clone() const;
Poco::Exception* clone() const;
private:
EventException();
@@ -100,7 +97,7 @@ inline unsigned short EventException::code() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_EventException_INCLUDED

15
XML/include/DOM/EventListener.h → XML/include/Poco/DOM/EventListener.h
View File

@@ -1,7 +1,7 @@
//
// EventListener.h
//
// $Id: //poco/1.1.0/XML/include/DOM/EventListener.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/EventListener.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_EventListener_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class Event;
@@ -76,7 +73,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_EventListener_INCLUDED

19
XML/include/DOM/EventTarget.h → XML/include/Poco/DOM/EventTarget.h
View File

@@ -1,7 +1,7 @@
//
// EventTarget.h
//
// $Id: //poco/1.1.0/XML/include/DOM/EventTarget.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/EventTarget.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,18 +40,13 @@
#define DOM_EventTarget_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_DOMObject_INCLUDED
#include "DOM/DOMObject.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/DOMObject.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class EventListener;
@@ -97,7 +92,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_EventTarget_INCLUDED

15
XML/include/DOM/MutationEvent.h → XML/include/Poco/DOM/MutationEvent.h
View File

@@ -1,7 +1,7 @@
//
// MutationEvent.h
//
// $Id: //poco/1.1.0/XML/include/DOM/MutationEvent.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/MutationEvent.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_MutationEvent_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_Event_INCLUDED
#include "DOM/Event.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/Event.h"
XML_BEGIN
namespace Poco {
namespace XML {
class Node;
@@ -162,7 +159,7 @@ inline MutationEvent::AttrChangeType MutationEvent::attrChange() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_MutationEvent_INCLUDED

19
XML/include/DOM/NamedNodeMap.h → XML/include/Poco/DOM/NamedNodeMap.h
View File

@@ -1,7 +1,7 @@
//
// NamedNodeMap.h
//
// $Id: //poco/1.1.0/XML/include/DOM/NamedNodeMap.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/NamedNodeMap.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,18 +40,13 @@
#define DOM_NamedNodeMap_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_DOMObject_INCLUDED
#include "DOM/DOMObject.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/DOMObject.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class Node;
@@ -114,7 +109,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_NamedNodeMap_INCLUDED

19
XML/include/DOM/Node.h → XML/include/Poco/DOM/Node.h
View File

@@ -1,7 +1,7 @@
//
// Node.h
//
// $Id: //poco/1.1.0/XML/include/DOM/Node.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/Node.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,18 +40,13 @@
#define DOM_Node_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_EventTarget_INCLUDED
#include "DOM/EventTarget.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/EventTarget.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class NamedNodeMap;
@@ -254,7 +249,7 @@ inline const XMLString& Node::nodeValue() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_Node_INCLUDED

15
XML/include/DOM/NodeFilter.h → XML/include/Poco/DOM/NodeFilter.h
View File

@@ -1,7 +1,7 @@
//
// NodeFilter.h
//
// $Id: //poco/1.1.0/XML/include/DOM/NodeFilter.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/NodeFilter.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_NodeFilter_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class Node;
@@ -165,7 +162,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_NodeFilter_INCLUDED

11
XML/include/DOM/NodeIterator.h → XML/include/Poco/DOM/NodeIterator.h
View File

@@ -1,7 +1,7 @@
//
// NodeIterator.h
//
// $Id: //poco/1.1.0/XML/include/DOM/NodeIterator.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/NodeIterator.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,12 +40,11 @@
#define DOM_NodeIterator_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#include "Poco/XML/XML.h"
XML_BEGIN
namespace Poco {
namespace XML {
class Node;
@@ -184,7 +183,7 @@ inline bool NodeIterator::expandEntityReferences() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_NodeIterator_INCLUDED

15
XML/include/DOM/NodeList.h → XML/include/Poco/DOM/NodeList.h
View File

@@ -1,7 +1,7 @@
//
// NodeList.h
//
// $Id: //poco/1.1.0/XML/include/DOM/NodeList.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/NodeList.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_NodeList_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_DOMObject_INCLUDED
#include "DOM/DOMObject.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/DOMObject.h"
XML_BEGIN
namespace Poco {
namespace XML {
class Node;
@@ -80,7 +77,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_NodeList_INCLUDED

19
XML/include/DOM/Notation.h → XML/include/Poco/DOM/Notation.h
View File

@@ -1,7 +1,7 @@
//
// Notation.h
//
// $Id: //poco/1.1.0/XML/include/DOM/Notation.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/Notation.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,18 +40,13 @@
#define DOM_Notation_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_AbstractNode_INCLUDED
#include "DOM/AbstractNode.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/AbstractNode.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API Notation: public AbstractNode
@@ -114,7 +109,7 @@ inline const XMLString& Notation::systemId() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_Notation_INCLUDED

19
XML/include/DOM/ProcessingInstruction.h → XML/include/Poco/DOM/ProcessingInstruction.h
View File

@@ -1,7 +1,7 @@
//
// ProcessingInstruction.h
//
// $Id: //poco/1.1.0/XML/include/DOM/ProcessingInstruction.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/ProcessingInstruction.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,18 +40,13 @@
#define DOM_ProcessingInstruction_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_AbstractNode_INCLUDED
#include "DOM/AbstractNode.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/AbstractNode.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API ProcessingInstruction: public AbstractNode
@@ -120,7 +115,7 @@ inline const XMLString& ProcessingInstruction::getData() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_ProcessingInstruction_INCLUDED

22
XML/include/DOM/Text.h → XML/include/Poco/DOM/Text.h
View File

@@ -1,7 +1,7 @@
//
// Text.h
//
// $Id: //poco/1.1.0/XML/include/DOM/Text.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/Text.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,18 +40,13 @@
#define DOM_Text_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef DOM_CharacterData_INCLUDED
#include "DOM/CharacterData.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/DOM/CharacterData.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API Text: public CharacterData
@@ -83,6 +78,9 @@ public:
const XMLString& nodeName() const;
unsigned short nodeType() const;
// Non-standard extensions
XMLString innerText() const;
protected:
Text(Document* pOwnerDocument, const XMLString& data);
Text(Document* pOwnerDocument, const Text& text);
@@ -97,7 +95,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // DOM_Text_INCLUDED

15
XML/include/DOM/TreeWalker.h → XML/include/Poco/DOM/TreeWalker.h
View File

@@ -1,7 +1,7 @@
//
// TreeWalker.h
//
// $Id: //poco/1.1.0/XML/include/DOM/TreeWalker.h#2 $
// $Id: //poco/1.2/XML/include/Poco/DOM/TreeWalker.h#1 $
//
// Library: XML
// Package: DOM
@@ -40,15 +40,12 @@
#define DOM_TreeWalker_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class Node;
@@ -230,7 +227,7 @@ inline Node* TreeWalker::getCurrentNode() const
}
XML_END
} } // namespace Poco::XML
#endif // DOM_TreeWalker_INCLUDED

15
XML/include/SAX/Attributes.h → XML/include/Poco/SAX/Attributes.h
View File

@@ -1,7 +1,7 @@
//
// Attributes.h
//
// $Id: //poco/1.1.0/XML/include/SAX/Attributes.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/Attributes.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,15 +40,12 @@
#define SAX_Attributes_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API Attributes
@@ -139,7 +136,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_Attributes_INCLUDED

18
XML/include/SAX/AttributesImpl.h → XML/include/Poco/SAX/AttributesImpl.h
View File

@@ -1,7 +1,7 @@
//
// AttributesImpl.h
//
// $Id: //poco/1.1.0/XML/include/SAX/AttributesImpl.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/AttributesImpl.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,19 +40,13 @@
#define SAX_AttributesImpl_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef SAX_Attributes_INCLUDED
#include "SAX/Attributes.h"
#endif
#ifndef STD_VECTOR_INCLUDED
#include "Poco/XML/XML.h"
#include "Poco/SAX/Attributes.h"
#include <vector>
#define STD_VECTOR_INCLUDED
#endif
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API AttributesImpl: public Attributes
@@ -194,7 +188,7 @@ inline AttributesImpl::iterator AttributesImpl::end() const
}
XML_END
} } // namespace Poco::XML
#endif // SAX_AttributesImpl_INCLUDED

15
XML/include/SAX/ContentHandler.h → XML/include/Poco/SAX/ContentHandler.h
View File

@@ -1,7 +1,7 @@
//
// ContentHandler.h
//
// $Id: //poco/1.1.0/XML/include/SAX/ContentHandler.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/ContentHandler.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,15 +40,12 @@
#define SAX_ContentHandler_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class Locator;
@@ -258,7 +255,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_ContentHandler_INCLUDED

15
XML/include/SAX/DTDHandler.h → XML/include/Poco/SAX/DTDHandler.h
View File

@@ -1,7 +1,7 @@
//
// DTDHandler.h
//
// $Id: //poco/1.1.0/XML/include/SAX/DTDHandler.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/DTDHandler.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,15 +40,12 @@
#define SAX_DTDHandler_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API DTDHandler
@@ -105,7 +102,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_DTDHandler_INCLUDED

15
XML/include/SAX/DeclHandler.h → XML/include/Poco/SAX/DeclHandler.h
View File

@@ -1,7 +1,7 @@
//
// DeclHandler.h
//
// $Id: //poco/1.1.0/XML/include/SAX/DeclHandler.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/DeclHandler.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,15 +40,12 @@
#define SAX_DeclHandler_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API DeclHandler
@@ -110,7 +107,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_DeclHandler_INCLUDED

27
XML/include/SAX/DefaultHandler.h → XML/include/Poco/SAX/DefaultHandler.h
View File

@@ -1,7 +1,7 @@
//
// DefaultHandler.h
//
// $Id: //poco/1.1.0/XML/include/SAX/DefaultHandler.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/DefaultHandler.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,24 +40,15 @@
#define SAX_DefaultHandler_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef SAX_EntityResolver_INCLUDED
#include "SAX/EntityResolver.h"
#endif
#ifndef SAX_DTDHandler_INCLUDED
#include "SAX/DTDHandler.h"
#endif
#ifndef SAX_ContentHandler_INCLUDED
#include "SAX/ContentHandler.h"
#endif
#ifndef SAX_ErrorHandler_INCLUDED
#include "SAX/ErrorHandler.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/SAX/EntityResolver.h"
#include "Poco/SAX/DTDHandler.h"
#include "Poco/SAX/ContentHandler.h"
#include "Poco/SAX/ErrorHandler.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API DefaultHandler: public EntityResolver, public DTDHandler, public ContentHandler, public ErrorHandler
@@ -108,7 +99,7 @@ public:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_DefaultHandler_INCLUDED

15
XML/include/SAX/EntityResolver.h → XML/include/Poco/SAX/EntityResolver.h
View File

@@ -1,7 +1,7 @@
//
// EntityResolver.h
//
// $Id: //poco/1.1.0/XML/include/SAX/EntityResolver.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/EntityResolver.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,15 +40,12 @@
#define SAX_EntityResolver_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class InputSource;
@@ -105,7 +102,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_EntityResolver_INCLUDED

27
XML/include/SAX/EntityResolverImpl.h → XML/include/Poco/SAX/EntityResolverImpl.h
View File

@@ -1,7 +1,7 @@
//
// EntityResolverImpl.h
//
// $Id: //poco/1.1.0/XML/include/SAX/EntityResolverImpl.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/EntityResolverImpl.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,21 +40,14 @@
#define SAX_EntityResolverImpl_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#ifndef SAX_EntityResolver_INCLUDED
#include "SAX/EntityResolver.h"
#endif
#ifndef Foundation_URIStreamOpener_INCLUDED
#include "Foundation/URIStreamOpener.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
#include "Poco/SAX/EntityResolver.h"
#include "Poco/URIStreamOpener.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API EntityResolverImpl: public EntityResolver
@@ -73,7 +66,7 @@ public:
/// Creates an EntityResolverImpl that uses the default
/// URIStreamOpener.
EntityResolverImpl(const Foundation::URIStreamOpener& opener);
EntityResolverImpl(const Poco::URIStreamOpener& opener);
/// Creates an EntityResolverImpl that uses the given
/// URIStreamOpener.
@@ -97,11 +90,11 @@ private:
EntityResolverImpl(const EntityResolverImpl&);
EntityResolverImpl& operator = (const EntityResolverImpl&);
const Foundation::URIStreamOpener& _opener;
const Poco::URIStreamOpener& _opener;
};
XML_END
} } // namespace Poco::XML
#endif // SAX_EntityResolverImpl_INCLUDED

11
XML/include/SAX/ErrorHandler.h → XML/include/Poco/SAX/ErrorHandler.h
View File

@@ -1,7 +1,7 @@
//
// ErrorHandler.h
//
// $Id: //poco/1.1.0/XML/include/SAX/ErrorHandler.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/ErrorHandler.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,12 +40,11 @@
#define SAX_ErrorHandler_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#include "Poco/XML/XML.h"
XML_BEGIN
namespace Poco {
namespace XML {
class SAXException;
@@ -109,7 +108,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_ErrorHandler_INCLUDED

19
XML/include/SAX/InputSource.h → XML/include/Poco/SAX/InputSource.h
View File

@@ -1,7 +1,7 @@
//
// InputSource.h
//
// $Id: //poco/1.1.0/XML/include/SAX/InputSource.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/InputSource.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,18 +40,13 @@
#define SAX_InputSource_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#ifndef XML_XMLStream_INCLUDED
#include "XML/XMLStream.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
#include "Poco/XML/XMLStream.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API InputSource
@@ -190,7 +185,7 @@ inline XMLCharInputStream* InputSource::getCharacterStream() const
}
XML_END
} } // namespace Poco::XML
#endif // SAX_InputSource_INCLUDED

15
XML/include/SAX/LexicalHandler.h → XML/include/Poco/SAX/LexicalHandler.h
View File

@@ -1,7 +1,7 @@
//
// LexicalHandler.h
//
// $Id: //poco/1.1.0/XML/include/SAX/LexicalHandler.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/LexicalHandler.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,15 +40,12 @@
#define SAX_LexicalHandler_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API LexicalHandler
@@ -144,7 +141,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_LexicalHandler_INCLUDED

15
XML/include/SAX/Locator.h → XML/include/Poco/SAX/Locator.h
View File

@@ -1,7 +1,7 @@
//
// Locator.h
//
// $Id: //poco/1.1.0/XML/include/SAX/Locator.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/Locator.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,15 +40,12 @@
#define SAX_Locator_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API Locator
@@ -122,7 +119,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_Locator_INCLUDED

19
XML/include/SAX/LocatorImpl.h → XML/include/Poco/SAX/LocatorImpl.h
View File

@@ -1,7 +1,7 @@
//
// LocatorImpl.h
//
// $Id: //poco/1.1.0/XML/include/SAX/LocatorImpl.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/LocatorImpl.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,18 +40,13 @@
#define SAX_LocatorImpl_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef SAX_Locator_INCLUDED
#include "SAX/Locator.h"
#endif
#ifndef XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/SAX/Locator.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API LocatorImpl: public Locator
@@ -109,7 +104,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_LocatorImpl_INCLUDED

24
XML/include/SAX/NamespaceSupport.h → XML/include/Poco/SAX/NamespaceSupport.h
View File

@@ -1,7 +1,7 @@
//
// NamespaceSupport.h
//
// $Id: //poco/1.1.0/XML/include/SAX/NamespaceSupport.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/NamespaceSupport.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,27 +40,15 @@
#define SAX_NamespaceSupport_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#ifndef STD_SET_INCLUDED
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
#include <set>
#define STD_SET_INCLUDED
#endif
#ifndef STD_MAP_INCLUDED
#include <map>
#define STD_MAP_INCLUDED
#endif
#ifndef STD_VECTOR_INCLUDED
#include <vector>
#define STD_VECTOR_INCLUDED
#endif
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API NamespaceSupport
@@ -223,7 +211,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_NamespaceSupport_INCLUDED

32
XML/include/SAX/SAXException.h → XML/include/Poco/SAX/SAXException.h
View File

@@ -1,7 +1,7 @@
//
// SAXException.h
//
// $Id: //poco/1.1.0/XML/include/SAX/SAXException.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/SAXException.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,18 +40,13 @@
#define SAX_SAXException_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLException_INCLUDED
#include "XML/XMLException.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLException.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
POCO_DECLARE_EXCEPTION(XML_API, SAXException, XMLException)
@@ -103,7 +98,7 @@ public:
SAXParseException(const std::string& msg, const Locator& loc);
/// Create a new SAXParseException from a message and a Locator.
SAXParseException(const std::string& msg, const Locator& loc, const Foundation::Exception& exc);
SAXParseException(const std::string& msg, const Locator& loc, const Poco::Exception& exc);
/// Wrap an existing exception in a SAXParseException.
SAXParseException(const std::string& msg, const XMLString& publicId, const XMLString& systemId, int lineNumber, int columnNumber);
@@ -114,7 +109,7 @@ public:
/// For example, if the system identifier is a URL (including relative filename),
/// the caller must resolve it fully before creating the exception.
SAXParseException(const std::string& msg, const XMLString& publicId, const XMLString& systemId, int lineNumber, int columnNumber, const Foundation::Exception& exc);
SAXParseException(const std::string& msg, const XMLString& publicId, const XMLString& systemId, int lineNumber, int columnNumber, const Poco::Exception& exc);
/// Create a new SAXParseException.
///
/// This constructor is most useful for parser writers.
@@ -136,7 +131,13 @@ public:
const char* className() const throw();
/// Returns the name of the exception class.
Poco::Exception* clone() const;
/// Creates an exact copy of the exception.
void rethrow() const;
/// (Re)Throws the exception.
const XMLString& getPublicId() const;
/// Get the public identifier of the entity where the exception occurred.
@@ -152,7 +153,6 @@ public:
/// The first column in a line is position 1.
protected:
Foundation::Exception* clone() const;
static std::string buildMessage(const std::string& msg, const XMLString& publicId, const XMLString& systemId, int lineNumber, int columnNumber);
private:
@@ -192,7 +192,7 @@ inline int SAXParseException::getColumnNumber() const
}
XML_END
} } // namespace Poco::XML
#endif // SAX_SAXException_INCLUDED

21
XML/include/SAX/SAXParser.h → XML/include/Poco/SAX/SAXParser.h
View File

@@ -1,7 +1,7 @@
//
// SAXParser.h
//
// $Id: //poco/1.1.0/XML/include/SAX/SAXParser.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/SAXParser.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,18 +40,13 @@
#define SAX_SAXParser_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef SAX_XMLReader_INCLUDED
#include "SAX/XMLReader.h"
#endif
#ifndef XML_ParserEngine_INCLUDED
#include "XML/ParserEngine.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/SAX/XMLReader.h"
#include "Poco/XML/ParserEngine.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API SAXParser: public XMLReader
@@ -84,7 +79,7 @@ public:
/// the parser if no encoding is specified in
/// the XML document.
void addEncoding(const XMLString& name, Foundation::TextEncoding* pEncoding);
void addEncoding(const XMLString& name, Poco::TextEncoding* pEncoding);
/// Adds an encoding to the parser.
/// XMLReader
@@ -117,7 +112,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_SAXParser_INCLUDED

19
XML/include/SAX/WhitespaceFilter.h → XML/include/Poco/SAX/WhitespaceFilter.h
View File

@@ -1,7 +1,7 @@
//
// WhitespaceFilter.h
//
// $Id: //poco/1.1.0/XML/include/SAX/WhitespaceFilter.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/WhitespaceFilter.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,18 +40,13 @@
#define SAX_WhitespaceFilter_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef SAX_XMLFilterImpl_INCLUDED
#include "SAX/XMLFilterImpl.h"
#endif
#ifndef SAX_LexicalHandler_INCLUDED
#include "SAX/LexicalHandler.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/SAX/XMLFilterImpl.h"
#include "Poco/SAX/LexicalHandler.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API WhitespaceFilter: public XMLFilterImpl, public LexicalHandler
@@ -102,7 +97,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_WhitespaceFilter_INCLUDED

15
XML/include/SAX/XMLFilter.h → XML/include/Poco/SAX/XMLFilter.h
View File

@@ -1,7 +1,7 @@
//
// XMLFilter.h
//
// $Id: //poco/1.1.0/XML/include/SAX/XMLFilter.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/XMLFilter.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,15 +40,12 @@
#define SAX_XMLFilter_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef SAX_XMLReader_INCLUDED
#include "SAX/XMLReader.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/SAX/XMLReader.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API XMLFilter: public XMLReader
@@ -80,7 +77,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_XMLFilter_INCLUDED

31
XML/include/SAX/XMLFilterImpl.h → XML/include/Poco/SAX/XMLFilterImpl.h
View File

@@ -1,7 +1,7 @@
//
// XMLFilterImpl.h
//
// $Id: //poco/1.1.0/XML/include/SAX/XMLFilterImpl.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/XMLFilterImpl.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,27 +40,16 @@
#define SAX_XMLFilterImpl_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef SAX_XMLFilter_INCLUDED
#include "SAX/XMLFilter.h"
#endif
#ifndef SAX_EntityResolver_INCLUDED
#include "SAX/EntityResolver.h"
#endif
#ifndef SAX_DTDHandler_INCLUDED
#include "SAX/DTDHandler.h"
#endif
#ifndef SAX_ContentHandler_INCLUDED
#include "SAX/ContentHandler.h"
#endif
#ifndef SAX_ErrorHandler_INCLUDED
#include "SAX/ErrorHandler.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/SAX/XMLFilter.h"
#include "Poco/SAX/EntityResolver.h"
#include "Poco/SAX/DTDHandler.h"
#include "Poco/SAX/ContentHandler.h"
#include "Poco/SAX/ErrorHandler.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API XMLFilterImpl: public XMLFilter, public EntityResolver, public DTDHandler, public ContentHandler, public ErrorHandler
@@ -158,7 +147,7 @@ inline XMLReader* XMLFilterImpl::parent() const
}
XML_END
} } // namespace Poco::XML
#endif // SAX_XMLFilterImpl_INCLUDED

15
XML/include/SAX/XMLReader.h → XML/include/Poco/SAX/XMLReader.h
View File

@@ -1,7 +1,7 @@
//
// XMLReader.h
//
// $Id: //poco/1.1.0/XML/include/SAX/XMLReader.h#2 $
// $Id: //poco/1.2/XML/include/Poco/SAX/XMLReader.h#1 $
//
// Library: XML
// Package: SAX
@@ -40,15 +40,12 @@
#define SAX_XMLReader_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class EntityResolver;
@@ -220,7 +217,7 @@ protected:
};
XML_END
} } // namespace Poco::XML
#endif // SAX_XMLReader_INCLUDED

15
XML/include/XML/Name.h → XML/include/Poco/XML/Name.h
View File

@@ -1,7 +1,7 @@
//
// Name.h
//
// $Id: //poco/1.1.0/XML/include/XML/Name.h#2 $
// $Id: //poco/1.2/XML/include/Poco/XML/Name.h#1 $
//
// Library: XML
// Package: XML
@@ -40,15 +40,12 @@
#define XML_Name_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
XML_BEGIN
namespace Poco {
namespace XML {
class XML_API Name
@@ -157,7 +154,7 @@ inline void swap(Name& n1, Name& n2)
}
XML_END
} } // namespace Poco::XML
#endif // XML_Name_INCLUDED

19
XML/include/XML/NamePool.h → XML/include/Poco/XML/NamePool.h
View File

@@ -1,7 +1,7 @@
//
// NamePool.h
//
// $Id: //poco/1.1.0/XML/include/XML/NamePool.h#2 $
// $Id: //poco/1.2/XML/include/Poco/XML/NamePool.h#1 $
//
// Library: XML
// Package: XML
@@ -40,18 +40,13 @@
#define XML_NamePool_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#ifndef XML_Name_INCLUDED
#include "XML/Name.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
#include "Poco/XML/Name.h"
XML_BEGIN
namespace Poco {
namespace XML {
class NamePoolItem;
@@ -95,7 +90,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // XML_NamePool_INCLUDED

19
XML/include/XML/NamespaceStrategy.h → XML/include/Poco/XML/NamespaceStrategy.h
View File

@@ -1,7 +1,7 @@
//
// NamespaceStrategy.h
//
// $Id: //poco/1.1.0/XML/include/XML/NamespaceStrategy.h#2 $
// $Id: //poco/1.2/XML/include/Poco/XML/NamespaceStrategy.h#1 $
//
// Library: XML
// Package: XML
@@ -40,18 +40,13 @@
#define XML_NamespaceStrategy_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#ifndef SAX_NamespaceSupport_INCLUDED
#include "SAX/NamespaceSupport.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/XML/XMLString.h"
#include "Poco/SAX/NamespaceSupport.h"
XML_BEGIN
namespace Poco {
namespace XML {
class ContentHandler;
@@ -122,7 +117,7 @@ public:
};
XML_END
} } // namespace Poco::XML
#endif // XML_NamespaceStrategy_INCLUDED

41
XML/include/XML/ParserEngine.h → XML/include/Poco/XML/ParserEngine.h
View File

@@ -1,7 +1,7 @@
//
// ParserEngine.h
//
// $Id: //poco/1.1.0/XML/include/XML/ParserEngine.h#2 $
// $Id: //poco/1.2/XML/include/Poco/XML/ParserEngine.h#1 $
//
// Library: XML
// Package: XML
@@ -39,35 +39,18 @@
#define XML_ParserEngine_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef Expat_INCLUDED
#include "XML/expat.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#ifndef XML_XMLStream_INCLUDED
#include "XML/XMLStream.h"
#endif
#ifndef SAX_Locator_INCLUDED
#include "SAX/Locator.h"
#endif
#ifndef Foundation_TextEncoding_INCLUDED
#include "Foundation/TextEncoding.h"
#endif
#ifndef STD_MAP_INCLUDED
#include "Poco/XML/XML.h"
#include "Poco/XML/expat.h"
#include "Poco/XML/XMLString.h"
#include "Poco/XML/XMLStream.h"
#include "Poco/SAX/Locator.h"
#include "Poco/TextEncoding.h"
#include <map>
#define STD_MAP_INCLUDED
#endif
#ifndef STD_VECTOR_INCLUDED
#include <vector>
#define STD_VECTOR_INCLUDED
#endif
XML_BEGIN
namespace Poco {
namespace XML {
class InputSource;
@@ -107,7 +90,7 @@ public:
const XMLString& getEncoding() const;
/// Returns the encoding used by expat.
void addEncoding(const XMLString& name, Foundation::TextEncoding* pEncoding);
void addEncoding(const XMLString& name, Poco::TextEncoding* pEncoding);
/// Adds an encoding to the parser.
void setNamespaceStrategy(NamespaceStrategy* pStrategy);
@@ -256,7 +239,7 @@ protected:
static int convert(void *data, const char *s);
private:
typedef std::map<XMLString, Foundation::TextEncoding*> EncodingMap;
typedef std::map<XMLString, Poco::TextEncoding*> EncodingMap;
typedef std::vector<ContextLocator*> ContextStack;
XML_Parser _parser;
@@ -351,7 +334,7 @@ inline ErrorHandler* ParserEngine::getErrorHandler() const
}
XML_END
} } // namespace Poco::XML
#endif // XML_ParserEngine_INCLUDED

15
XML/include/XML/XML.h → XML/include/Poco/XML/XML.h
View File

@@ -1,7 +1,7 @@
//
// XML.h
//
// $Id: //poco/1.1.0/XML/include/XML/XML.h#2 $
// $Id: //poco/1.2/XML/include/Poco/XML/XML.h#1 $
//
// Library: XML
// Package: XML
@@ -42,16 +42,7 @@
#define XML_XML_INCLUDED
#ifndef Foundation_Foundation_INCLUDED
#include "Foundation/Foundation.h"
#endif
//
// Macros to declare the namespace
//
#define XML_BEGIN namespace XML {
#define XML_END }
#include "Poco/Foundation.h"
//
@@ -62,7 +53,7 @@
// XML_API functions as being imported from a DLL, wheras this DLL sees symbols
// defined with this macro as being exported.
//
#if (defined(_WIN32) || defined(__CYGWIN__)) && defined(POCO_DLL)
#if defined(_WIN32) && defined(POCO_DLL)
#if defined(XML_EXPORTS)
#define XML_API __declspec(dllexport)
#else

17
XML/include/XML/XMLException.h → XML/include/Poco/XML/XMLException.h
View File

@@ -1,7 +1,7 @@
//
// XMLException.h
//
// $Id: //poco/1.1.0/XML/include/XML/XMLException.h#2 $
// $Id: //poco/1.2/XML/include/Poco/XML/XMLException.h#1 $
//
// Library: XML
// Package: XML
@@ -40,23 +40,20 @@
#define XML_XMLException_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef Foundation_Exception_INCLUDED
#include "Foundation/Exception.h"
#endif
#include "Poco/XML/XML.h"
#include "Poco/Exception.h"
XML_BEGIN
namespace Poco {
namespace XML {
POCO_DECLARE_EXCEPTION(XML_API, XMLException, Foundation::RuntimeException)
POCO_DECLARE_EXCEPTION(XML_API, XMLException, Poco::RuntimeException)
/// The base class for all XML-related exceptions like SAXException
/// and DOMException.
XML_END
} } // namespace Poco::XML
#endif // XML_XMLException_INCLUDED

17
XML/include/XML/XMLStream.h → XML/include/Poco/XML/XMLStream.h
View File

@@ -1,7 +1,7 @@
//
// XMLStream.h
//
// $Id: //poco/1.1.0/XML/include/XML/XMLStream.h#2 $
// $Id: //poco/1.2/XML/include/Poco/XML/XMLStream.h#1 $
//
// Library: XML
// Package: XML
@@ -40,20 +40,13 @@
#define XML_XMLStream_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef STD_ISTREAM_INCLUDED
#include "Poco/XML/XML.h"
#include <istream>
#define STD_ISTREAM_INCLUDED
#endif
#ifndef STD_OSTREAM_INCLUDED
#include <ostream>
#define STD_OSTREAM_INCLUDED
#endif
XML_BEGIN
namespace Poco {
namespace XML {
// The byte input stream is always a narrow stream.
@@ -94,7 +87,7 @@ typedef std::ostream XMLByteOutputStream;
#endif
XML_END
} } // namespace Poco::XML
#endif // XML_XMLStream_INCLUDED

11
XML/include/XML/XMLString.h → XML/include/Poco/XML/XMLString.h
View File

@@ -1,7 +1,7 @@
//
// XMLString.h
//
// $Id: //poco/1.1.0/XML/include/XML/XMLString.h#2 $
// $Id: //poco/1.2/XML/include/Poco/XML/XMLString.h#1 $
//
// Library: XML
// Package: XML
@@ -40,12 +40,11 @@
#define XML_XMLString_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#include "Poco/XML/XML.h"
XML_BEGIN
namespace Poco {
namespace XML {
//
@@ -100,7 +99,7 @@ XML_BEGIN
#endif
XML_END
} } // namespace Poco::XML
#endif // XML_XMLString_INCLUDED

63
XML/include/XML/XMLWriter.h → XML/include/Poco/XML/XMLWriter.h
View File

@@ -1,7 +1,7 @@
//
// XMLWriter.h
//
// $Id: //poco/1.1.0/XML/include/XML/XMLWriter.h#2 $
// $Id: //poco/1.2/XML/include/Poco/XML/XMLWriter.h#1 $
//
// Library: XML
// Package: XML
@@ -40,47 +40,22 @@
#define XML_XMLWriter_INCLUDED
#ifndef XML_XML_INCLUDED
#include "XML/XML.h"
#endif
#ifndef SAX_ContentHandler_INCLUDED
#include "SAX/ContentHandler.h"
#endif
#ifndef SAX_LexicalHandler_INCLUDED
#include "SAX/LexicalHandler.h"
#endif
#ifndef SAX_DTDHandler_INCLUDED
#include "SAX/DTDHandler.h"
#endif
#ifndef SAX_NamespaceSupport_INCLUDED
#include "SAX/NamespaceSupport.h"
#endif
#ifndef XML_XMLString_INCLUDED
#include "XML/XMLString.h"
#endif
#ifndef XML_XMLStream_INCLUDED
#include "XML/XMLStream.h"
#endif
#ifndef XML_Name_INCLUDED
#include "XML/Name.h"
#endif
#ifndef Foundation_TextEncoding_INCLUDED
#include "Foundation/TextEncoding.h"
#endif
#ifndef Foundation_StreamConverter_INCLUDED
#include "Foundation/StreamConverter.h"
#endif
#ifndef STD_VECTOR_INCLUDED
#include "Poco/XML/XML.h"
#include "Poco/SAX/ContentHandler.h"
#include "Poco/SAX/LexicalHandler.h"
#include "Poco/SAX/DTDHandler.h"
#include "Poco/SAX/NamespaceSupport.h"
#include "Poco/XML/XMLString.h"
#include "Poco/XML/XMLStream.h"
#include "Poco/XML/Name.h"
#include "Poco/TextEncoding.h"
#include "Poco/StreamConverter.h"
#include <vector>
#define STD_VECTOR_INCLUDED
#endif
#ifndef STD_MAP_INCLUDED
#include <map>
#define STD_MAP_INCLUDED
#endif
XML_BEGIN
namespace Poco {
namespace XML {
class Locator;
@@ -120,14 +95,14 @@ public:
///
/// The resulting stream will be UTF-8 encoded.
XMLWriter(XMLByteOutputStream& str, int options, const std::string& encodingName, Foundation::TextEncoding& textEncoding);
XMLWriter(XMLByteOutputStream& str, int options, const std::string& encodingName, Poco::TextEncoding& textEncoding);
/// Creates the XMLWriter and sets the specified options.
///
/// The encoding is reflected in the XML declaration.
/// The caller is responsible for that the given encodingName matches with
/// the given textEncoding.
XMLWriter(XMLByteOutputStream& str, int options, const std::string& encodingName, Foundation::TextEncoding* pTextEncoding);
XMLWriter(XMLByteOutputStream& str, int options, const std::string& encodingName, Poco::TextEncoding* pTextEncoding);
/// Creates the XMLWriter and sets the specified options.
///
/// The encoding is reflected in the XML declaration.
@@ -313,9 +288,9 @@ private:
};
typedef std::vector<Name> ElementStack;
Foundation::OutputStreamConverter* _pTextConverter;
Foundation::TextEncoding* _pInEncoding;
Foundation::TextEncoding* _pOutEncoding;
Poco::OutputStreamConverter* _pTextConverter;
Poco::TextEncoding* _pInEncoding;
Poco::TextEncoding* _pOutEncoding;
int _options;
std::string _encoding;
std::string _newLine;
@@ -350,7 +325,7 @@ private:
};
XML_END
} } // namespace Poco::XML
#endif // XML_XMLWriter_INCLUDED

0
XML/include/XML/expat.h → XML/include/Poco/XML/expat.h
View File

0
XML/include/XML/expat_external.h → XML/include/Poco/XML/expat_external.h
View File