From f306d18fe6555a9a5c60560745773b0bf5685ec3 Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Date: Tue, 5 Jul 2011 18:30:35 +0200
Subject: 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>
---
 src/xml/sax/qxml.cpp | 23 -----------------------
 src/xml/sax/qxml.h   |  5 -----
 2 files changed, 28 deletions(-)

(limited to 'src/xml')

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);
 
-- 
cgit v1.2.3