Update to latest tqt3 automated conversion

7 files changed, 67 insertions, 67 deletions

diff --git a/src/xml/qdom.h b/src/xml/ntqdom.h
index 2cd1e3f5d..47d11b181 100644
--- a/src/xml/qdom.h
+++ b/src/xml/ntqdom.h
@@ -42,7 +42,7 @@
 #define TQDOM_H
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #if !defined(QT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
diff --git a/src/xml/qxml.h b/src/xml/ntqxml.h
index 4bdceeea1..f69147d29 100644
--- a/src/xml/qxml.h
+++ b/src/xml/ntqxml.h
@@ -42,11 +42,11 @@
 #define TQXML_H
 
 #ifndef QT_H
-#include "qtextstream.h"
-#include "qfile.h"
-#include "qstring.h"
-#include "qstringlist.h"
-#include "qvaluevector.h"
+#include "ntqtextstream.h"
+#include "ntqfile.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
+#include "ntqvaluevector.h"
 #endif // QT_H
 
 #if !defined(QT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
diff --git a/src/xml/qdom.cpp b/src/xml/qdom.cpp
index b4d891a97..954321c48 100644
--- a/src/xml/qdom.cpp
+++ b/src/xml/qdom.cpp
@@ -38,18 +38,18 @@
 **
 **********************************************************************/
 
-#include "qdom.h"
+#include "ntqdom.h"
 
 #ifndef QT_NO_DOM
 
-#include "qxml.h"
-#include "qptrlist.h"
-#include "qdict.h"
-#include "qtextstream.h"
-#include "qtextcodec.h"
-#include "qiodevice.h"
-#include "qregexp.h"
-#include "qbuffer.h"
+#include "ntqxml.h"
+#include "ntqptrlist.h"
+#include "ntqdict.h"
+#include "ntqtextstream.h"
+#include "ntqtextcodec.h"
+#include "ntqiodevice.h"
+#include "ntqregexp.h"
+#include "ntqbuffer.h"
 
 /*
   ### old todo comments -- I don't know if they still apply...
@@ -610,7 +610,7 @@ TQDomImplementationPrivate* TQDomImplementationPrivate::clone()
  **************************************************************/
 
 /*!
-    \class TQDomImplementation qdom.h
+    \class TQDomImplementation ntqdom.h
     \reentrant
     \brief The TQDomImplementation class provides information about the
     features of the DOM implementation.
@@ -914,7 +914,7 @@ uint TQDomNodeListPrivate::length() const
  **************************************************************/
 
 /*!
-    \class TQDomNodeList qdom.h
+    \class TQDomNodeList ntqdom.h
     \reentrant
     \brief The TQDomNodeList class is a list of TQDomNode objects.
 \if defined(commercial)
@@ -1529,7 +1529,7 @@ void TQDomNodePrivate::save( TQTextStream& s, int depth, int indent ) const
 #define IMPL ((TQDomNodePrivate*)impl)
 
 /*!
-    \class TQDomNode qdom.h
+    \class TQDomNode ntqdom.h
     \reentrant
     \brief The TQDomNode class is the base class for all the nodes in a DOM tree.
 \if defined(commercial)
@@ -2640,7 +2640,7 @@ bool TQDomNamedNodeMapPrivate::containsNS( const TQString& nsURI, const TQString
 #define IMPL ((TQDomNamedNodeMapPrivate*)impl)
 
 /*!
-    \class TQDomNamedNodeMap qdom.h
+    \class TQDomNamedNodeMap ntqdom.h
     \reentrant
     \brief The TQDomNamedNodeMap class contains a collection of nodes
     that can be accessed by name.
@@ -3056,7 +3056,7 @@ void TQDomDocumentTypePrivate::save( TQTextStream& s, int, int indent ) const
 #define IMPL ((TQDomDocumentTypePrivate*)impl)
 
 /*!
-    \class TQDomDocumentType qdom.h
+    \class TQDomDocumentType ntqdom.h
     \reentrant
     \brief The TQDomDocumentType class is the representation of the DTD
     in the document tree.
@@ -3253,7 +3253,7 @@ TQDomNodePrivate* TQDomDocumentFragmentPrivate::cloneNode( bool deep)
 #define IMPL ((TQDomDocumentFragmentPrivate*)impl)
 
 /*!
-    \class TQDomDocumentFragment qdom.h
+    \class TQDomDocumentFragment ntqdom.h
     \reentrant
     \brief The TQDomDocumentFragment class is a tree of TQDomNodes which is not usually a complete TQDomDocument.
 \if defined(commercial)
@@ -3416,7 +3416,7 @@ void TQDomCharacterDataPrivate::appendData( const TQString& arg )
 #define IMPL ((TQDomCharacterDataPrivate*)impl)
 
 /*!
-    \class TQDomCharacterData qdom.h
+    \class TQDomCharacterData ntqdom.h
     \reentrant
     \brief The TQDomCharacterData class represents a generic string in the DOM.
 \if defined(commercial)
@@ -3718,7 +3718,7 @@ void TQDomAttrPrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomAttrPrivate*)impl)
 
 /*!
-    \class TQDomAttr qdom.h
+    \class TQDomAttr ntqdom.h
     \reentrant
     \brief The TQDomAttr class represents one attribute of a TQDomElement.
 \if defined(commercial)
@@ -4119,7 +4119,7 @@ void TQDomElementPrivate::save( TQTextStream& s, int depth, int indent ) const
 #define IMPL ((TQDomElementPrivate*)impl)
 
 /*!
-    \class TQDomElement qdom.h
+    \class TQDomElement ntqdom.h
     \reentrant
     \brief The TQDomElement class represents one element in the DOM tree.
 \if defined(commercial)
@@ -4677,7 +4677,7 @@ void TQDomTextPrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomTextPrivate*)impl)
 
 /*!
-    \class TQDomText qdom.h
+    \class TQDomText ntqdom.h
     \reentrant
     \brief The TQDomText class represents text data in the parsed XML document.
 \if defined(commercial)
@@ -4821,7 +4821,7 @@ void TQDomCommentPrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomCommentPrivate*)impl)
 
 /*!
-    \class TQDomComment qdom.h
+    \class TQDomComment ntqdom.h
     \reentrant
     \brief The TQDomComment class represents an XML comment.
 \if defined(commercial)
@@ -4953,7 +4953,7 @@ void TQDomCDATASectionPrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomCDATASectionPrivate*)impl)
 
 /*!
-    \class TQDomCDATASection qdom.h
+    \class TQDomCDATASection ntqdom.h
     \reentrant
     \brief The TQDomCDATASection class represents an XML CDATA section.
 \if defined(commercial)
@@ -5100,7 +5100,7 @@ void TQDomNotationPrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomNotationPrivate*)impl)
 
 /*!
-    \class TQDomNotation qdom.h
+    \class TQDomNotation ntqdom.h
     \reentrant
     \brief The TQDomNotation class represents an XML notation.
 \if defined(commercial)
@@ -5313,7 +5313,7 @@ void TQDomEntityPrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomEntityPrivate*)impl)
 
 /*!
-    \class TQDomEntity qdom.h
+    \class TQDomEntity ntqdom.h
     \reentrant
     \brief The TQDomEntity class represents an XML entity.
 \if defined(commercial)
@@ -5487,7 +5487,7 @@ void TQDomEntityReferencePrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomEntityReferencePrivate*)impl)
 
 /*!
-    \class TQDomEntityReference qdom.h
+    \class TQDomEntityReference ntqdom.h
     \reentrant
     \brief The TQDomEntityReference class represents an XML entity reference.
 \if defined(commercial)
@@ -5633,7 +5633,7 @@ void TQDomProcessingInstructionPrivate::save( TQTextStream& s, int, int ) const
 #define IMPL ((TQDomProcessingInstructionPrivate*)impl)
 
 /*!
-    \class TQDomProcessingInstruction qdom.h
+    \class TQDomProcessingInstruction ntqdom.h
     \reentrant
     \brief The TQDomProcessingInstruction class represents an XML processing
     instruction.
@@ -6044,7 +6044,7 @@ void TQDomDocumentPrivate::save( TQTextStream& s, int, int indent ) const
 #define IMPL ((TQDomDocumentPrivate*)impl)
 
 /*!
-    \class TQDomDocument qdom.h
+    \class TQDomDocument ntqdom.h
     \reentrant
     \brief The TQDomDocument class represents an XML document.
 \if defined(commercial)
diff --git a/src/xml/qsvgdevice.cpp b/src/xml/qsvgdevice.cpp
index df9b55100..dac7ff80c 100644
--- a/src/xml/qsvgdevice.cpp
+++ b/src/xml/qsvgdevice.cpp
@@ -40,15 +40,15 @@
 
 #ifndef QT_NO_SVG
 
-#include "qpainter.h"
-#include "qpaintdevicemetrics.h"
-#include "qfile.h"
-#include "qmap.h"
-#include "qregexp.h"
-#include "qvaluelist.h"
-#include "qtextstream.h"
-#include "qimage.h"
-#include "qpixmap.h"
+#include "ntqpainter.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqfile.h"
+#include "ntqmap.h"
+#include "ntqregexp.h"
+#include "ntqvaluelist.h"
+#include "ntqtextstream.h"
+#include "ntqimage.h"
+#include "ntqpixmap.h"
 
 #include <math.h>
 
diff --git a/src/xml/qsvgdevice_p.h b/src/xml/qsvgdevice_p.h
index 1dd58f28a..bc717c5cc 100644
--- a/src/xml/qsvgdevice_p.h
+++ b/src/xml/qsvgdevice_p.h
@@ -54,9 +54,9 @@
 //
 
 #ifndef QT_H
-#include "qpaintdevice.h"
-#include "qrect.h"
-#include "qdom.h"
+#include "ntqpaintdevice.h"
+#include "ntqrect.h"
+#include "ntqdom.h"
 #endif // QT_H
 
 #if !defined(QT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
diff --git a/src/xml/qt_xml.pri b/src/xml/qt_xml.pri
index 4edd51e30..b8fe7099a 100644
--- a/src/xml/qt_xml.pri
+++ b/src/xml/qt_xml.pri
@@ -1,7 +1,7 @@
 # Qt xml module
 
 xml {
-	HEADERS += $$XML_H/qxml.h $$XML_H/qdom.h $$XML_CPP/qsvgdevice_p.h
+	HEADERS += $$XML_H/ntqxml.h $$XML_H/ntqdom.h $$XML_CPP/qsvgdevice_p.h
 	SOURCES += $$XML_CPP/qxml.cpp $$XML_CPP/qdom.cpp $$XML_CPP/qsvgdevice.cpp
 	win32-borland {
 		QMAKE_CFLAGS_WARN_ON	+= -w-use
diff --git a/src/xml/qxml.cpp b/src/xml/qxml.cpp
index 34dbeeb20..ccc3498d7 100644
--- a/src/xml/qxml.cpp
+++ b/src/xml/qxml.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qxml.h"
-#include "qtextcodec.h"
-#include "qbuffer.h"
-#include "qregexp.h"
-#include "qptrstack.h"
-#include "qmap.h"
-#include "qvaluestack.h"
+#include "ntqxml.h"
+#include "ntqtextcodec.h"
+#include "ntqbuffer.h"
+#include "ntqregexp.h"
+#include "ntqptrstack.h"
+#include "ntqmap.h"
+#include "ntqvaluestack.h"
 
 // needed for QT_TRANSLATE_NOOP:
-#include "qobject.h"
+#include "ntqobject.h"
 
 #ifndef QT_NO_XML
 
@@ -216,7 +216,7 @@ class TQXmlDefaultHandlerPrivate
 };
 
 /*!
-    \class TQXmlParseException qxml.h
+    \class TQXmlParseException ntqxml.h
     \reentrant
     \brief The TQXmlParseException class is used to report errors with
     the TQXmlErrorHandler interface.
@@ -281,7 +281,7 @@ TQString TQXmlParseException::systemId() const
 
 
 /*!
-    \class TQXmlLocator qxml.h
+    \class TQXmlLocator ntqxml.h
     \reentrant
     \brief The TQXmlLocator class provides the XML handler classes with
     information about the parsing position within a file.
@@ -378,7 +378,7 @@ public:
 };
 
 /*!
-    \class TQXmlNamespaceSupport qxml.h
+    \class TQXmlNamespaceSupport ntqxml.h
     \reentrant
     \brief The TQXmlNamespaceSupport class is a helper class for XML
     readers which want to include namespace support.
@@ -648,7 +648,7 @@ void TQXmlNamespaceSupport::reset()
  *********************************************/
 
 /*!
-    \class TQXmlAttributes qxml.h
+    \class TQXmlAttributes ntqxml.h
     \reentrant
     \brief The TQXmlAttributes class provides XML attributes.
 \if defined(commercial)
@@ -893,7 +893,7 @@ void TQXmlAttributes::append( const TQString &qName, const TQString &uri, const
  *********************************************/
 
 /*!
-    \class TQXmlInputSource qxml.h
+    \class TQXmlInputSource ntqxml.h
     \reentrant
     \brief The TQXmlInputSource class provides the input data for the
     TQXmlReader subclasses.
@@ -1208,7 +1208,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
  *********************************************/
 
 /*!
-    \class TQXmlContentHandler qxml.h
+    \class TQXmlContentHandler ntqxml.h
     \reentrant
     \brief The TQXmlContentHandler class provides an interface to
     report the logical content of XML data.
@@ -1457,7 +1457,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
 
 
 /*!
-    \class TQXmlErrorHandler qxml.h
+    \class TQXmlErrorHandler ntqxml.h
     \reentrant
     \brief The TQXmlErrorHandler class provides an interface to report
     errors in XML data.
@@ -1531,7 +1531,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
 
 
 /*!
-    \class TQXmlDTDHandler qxml.h
+    \class TQXmlDTDHandler ntqxml.h
     \reentrant
     \brief The TQXmlDTDHandler class provides an interface to report
     DTD content of XML data.
@@ -1597,7 +1597,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
 
 
 /*!
-    \class TQXmlEntityResolver qxml.h
+    \class TQXmlEntityResolver ntqxml.h
     \reentrant
     \brief The TQXmlEntityResolver class provides an interface to
     resolve external entities contained in XML data.
@@ -1652,7 +1652,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
 
 
 /*!
-    \class TQXmlLexicalHandler qxml.h
+    \class TQXmlLexicalHandler ntqxml.h
     \reentrant
     \brief The TQXmlLexicalHandler class provides an interface to
     report the lexical content of XML data.
@@ -1802,7 +1802,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
 
 
 /*!
-    \class TQXmlDeclHandler qxml.h
+    \class TQXmlDeclHandler ntqxml.h
     \reentrant
     \brief The TQXmlDeclHandler class provides an interface to report declaration
     content of XML data.
@@ -1888,7 +1888,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning
 
 
 /*!
-    \class TQXmlDefaultHandler qxml.h
+    \class TQXmlDefaultHandler ntqxml.h
     \reentrant
     \brief The TQXmlDefaultHandler class provides a default implementation of all
     the XML handler classes.
@@ -2349,7 +2349,7 @@ private:
  *********************************************/
 
 /*!
-    \class TQXmlReader qxml.h
+    \class TQXmlReader ntqxml.h
     \reentrant
     \brief The TQXmlReader class provides an interface for XML readers (i.e.
     parsers).
@@ -2569,7 +2569,7 @@ private:
 
 
 /*!
-    \class TQXmlSimpleReader qxml.h
+    \class TQXmlSimpleReader ntqxml.h
     \reentrant
     \brief The TQXmlSimpleReader class provides an implementation of a
     simple XML reader (parser).