summaryrefslogtreecommitdiffstats
path: root/src/xml
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2011-07-05 18:30:35 +0200
committerQt by Nokia <qt-info@nokia.com>2011-07-06 12:03:30 +0200
commitf306d18fe6555a9a5c60560745773b0bf5685ec3 (patch)
tree9f9604b495a535ef256a96c0f33ea5c99033a032 /src/xml
parentceceb3796fbfdcd944fc7da7c8b2198fca69cb44 (diff)
Remove QT3_SUPPORT from qsql, qxml
Change-Id: Iab36ef60de2f0201efa4eb86d8ed5e514d6244fb Reviewed-on: http://codereview.qt.nokia.com/1188 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/xml')
-rw-r--r--src/xml/sax/qxml.cpp23
-rw-r--r--src/xml/sax/qxml.h5
2 files changed, 0 insertions, 28 deletions
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index 2f5384b902..671adafcbd 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -1324,29 +1324,6 @@ QXmlInputSource::QXmlInputSource(QIODevice *dev)
d->inputDevice->setTextModeEnabled(false);
}
-#ifdef QT3_SUPPORT
-/*!
- Use the QXmlInputSource(QIODevice *) constructor instead, with
- the device used by \a stream.
-
- \sa QTextStream::device()
-*/
-QXmlInputSource::QXmlInputSource(QTextStream& stream)
-{
- init();
- d->inputStream = &stream;
-}
-
-/*!
- Use QXmlInputSource(&\a file) instead.
-*/
-QXmlInputSource::QXmlInputSource(QFile& file)
-{
- init();
- d->inputDevice = &file;
-}
-#endif
-
/*!
Destructor.
*/
diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h
index 8b402dfedb..52eea6ce76 100644
--- a/src/xml/sax/qxml.h
+++ b/src/xml/sax/qxml.h
@@ -172,11 +172,6 @@ public:
static const ushort EndOfData;
static const ushort EndOfDocument;
-#ifdef QT3_SUPPORT
- QT3_SUPPORT_CONSTRUCTOR QXmlInputSource(QFile& file);
- QT3_SUPPORT_CONSTRUCTOR QXmlInputSource(QTextStream& stream);
-#endif
-
protected:
virtual QString fromRawData(const QByteArray &data, bool beginning = false);