diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-12 16:11:03 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-12 16:11:03 +0200 |
commit | 2770415f921d494e30e9a770c40b538d223351d6 (patch) | |
tree | 929f375ef83033efd5c463d181494b3ca37bfa3f /src/xml/sax/qxml.cpp | |
parent | 992ef929dff21e079f7d8a207c07dbfd0c3c8f78 (diff) | |
parent | 2371147354d4436bb54c588662ac315dd4c2f940 (diff) |
Merge "Merge remote branch 'gerrit/master' into refactor" into refactor
Diffstat (limited to 'src/xml/sax/qxml.cpp')
-rw-r--r-- | src/xml/sax/qxml.cpp | 23 |
1 files changed, 0 insertions, 23 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. */ |