[Development] Header diff for QtXml
Thiago Macieira
thiago.macieira at intel.com
Wed Jun 26 22:50:18 CEST 2013
diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h
index 7eeda6e..f1c04a4 100644
--- a/src/xml/dom/qdom.h
+++ b/src/xml/dom/qdom.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtXml module of the Qt Toolkit.
@@ -45,8 +45,6 @@
#include <QtXml/qtxmlglobal.h>
#include <QtCore/qstring.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -675,6 +673,4 @@ Q_XML_EXPORT QTextStream& operator<<(QTextStream&, const QDomNode&);
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QDOM_H
diff --git a/src/xml/qtxmlglobal.h b/src/xml/qtxmlglobal.h
index fb86e57..c7209ad 100644
--- a/src/xml/qtxmlglobal.h
+++ b/src/xml/qtxmlglobal.h
@@ -44,8 +44,6 @@
#include <QtCore/qglobal.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
#ifndef QT_STATIC
@@ -60,6 +58,4 @@ QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QTXMLGLOBAL_H
diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h
index 8a76a49..743f870 100644
--- a/src/xml/sax/qxml.h
+++ b/src/xml/sax/qxml.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtXml module of the Qt Toolkit.
@@ -50,8 +50,6 @@
#include <QtCore/qlist.h>
#include <QtCore/qscopedpointer.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
@@ -119,8 +117,8 @@ private:
class Q_XML_EXPORT QXmlAttributes
{
public:
- QXmlAttributes() {}
- virtual ~QXmlAttributes() {}
+ QXmlAttributes();
+ virtual ~QXmlAttributes();
int index(const QString& qName) const;
int index(QLatin1String qName) const;
@@ -367,8 +365,8 @@ public:
class Q_XML_EXPORT QXmlDefaultHandler : public QXmlContentHandler, public QXmlErrorHandler, public QXmlDTDHandler, public QXmlEntityResolver, public QXmlLexicalHandler, public QXmlDeclHandler
{
public:
- QXmlDefaultHandler() { }
- virtual ~QXmlDefaultHandler() { }
+ QXmlDefaultHandler();
+ virtual ~QXmlDefaultHandler();
void setDocumentLocator(QXmlLocator* locator);
bool startDocument();
@@ -417,6 +415,4 @@ inline int QXmlAttributes::count() const
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QXML_H
More information about the Development
mailing list