diff options
author | David Faure <faure@kde.org> | 2012-01-11 11:15:03 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-11 22:17:46 +0100 |
commit | f65a10b733800f83dae47ce1694fbeaf29ce5b5c (patch) | |
tree | 032fbaad2e3d5f72bc98c9b0d045c9085969e9ee | |
parent | aa4c2bbce9459911e6876b4cbeaa66c3ed49b141 (diff) |
Remove unused QT_NO_TEXTSTREAM.
It was checked in a few places, but it didn't actually remove QTextStream,
so it was pretty useless.
Change-Id: I8eaf28893cd6c7acbe1c0b69d58de90742aee755
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
-rw-r--r-- | src/corelib/global/qconfig-minimal.h | 3 | ||||
-rw-r--r-- | src/corelib/global/qconfig-small.h | 3 | ||||
-rw-r--r-- | src/corelib/global/qfeatures.h | 15 | ||||
-rw-r--r-- | src/corelib/global/qfeatures.txt | 7 | ||||
-rw-r--r-- | src/corelib/io/qdebug.h | 2 | ||||
-rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 2 | ||||
-rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 1 | ||||
-rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 1 | ||||
-rw-r--r-- | src/widgets/widgets/qsplitter.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qsplitter.h | 2 | ||||
-rw-r--r-- | tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp | 2 |
11 files changed, 2 insertions, 38 deletions
diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h index 05a595ed55..30440243de 100644 --- a/src/corelib/global/qconfig-minimal.h +++ b/src/corelib/global/qconfig-minimal.h @@ -104,9 +104,6 @@ #ifndef QT_NO_TEMPORARYFILE # define QT_NO_TEMPORARYFILE #endif -#ifndef QT_NO_TEXTSTREAM -# define QT_NO_TEXTSTREAM -#endif #ifndef QT_NO_SETTINGS # define QT_NO_SETTINGS #endif diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h index fefbfb6f02..84a5ec59d9 100644 --- a/src/corelib/global/qconfig-small.h +++ b/src/corelib/global/qconfig-small.h @@ -77,9 +77,6 @@ #endif /* File I/O */ -#ifndef QT_NO_TEXTSTREAM -# define QT_NO_TEXTSTREAM -#endif #ifndef QT_NO_SETTINGS # define QT_NO_SETTINGS #endif diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index 027068b61c..5055414834 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -289,9 +289,6 @@ // HtmlParser //#define QT_NO_TEXTHTMLPARSER -// QTextStream -//#define QT_NO_TEXTSTREAM - // QToolTip //#define QT_NO_TOOLTIP @@ -351,16 +348,6 @@ #define QT_NO_FILESYSTEMMODEL #endif -// QHostInfo -#if !defined(QT_NO_HOSTINFO) && (defined(QT_NO_TEXTSTREAM)) -#define QT_NO_HOSTINFO -#endif - -// XPM Image Format -#if !defined(QT_NO_IMAGEFORMAT_XPM) && (defined(QT_NO_TEXTSTREAM)) -#define QT_NO_IMAGEFORMAT_XPM -#endif - // QLibrary #if !defined(QT_NO_LIBRARY) && (defined(QT_NO_SETTINGS)) #define QT_NO_LIBRARY @@ -597,7 +584,7 @@ #endif // QPrinter -#if !defined(QT_NO_PRINTER) && (defined(QT_NO_TEXTSTREAM) || defined(QT_NO_PICTURE) || defined(QT_NO_TEMPORARYFILE)) +#if !defined(QT_NO_PRINTER) && (defined(QT_NO_PICTURE) || defined(QT_NO_TEMPORARYFILE)) #define QT_NO_PRINTER #endif diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index 6b861d4d17..4eae2f50ec 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -192,13 +192,6 @@ Requires: Name: QProcess SeeAlso: ??? -Feature: TEXTSTREAM -Description: Supports reading and writing of text. -Section: File I/O -Requires: -Name: QTextStream -SeeAlso: ??? - Feature: TEMPORARYFILE Description: Provides an I/O device that operates on temporary files. Section: File I/O diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 0654bf6f25..54663d5d65 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -129,10 +129,8 @@ public: inline QNoDebug(){} inline QNoDebug(const QDebug &){} inline ~QNoDebug(){} -#if !defined( QT_NO_TEXTSTREAM ) inline QNoDebug &operator<<(QTextStreamFunction) { return *this; } inline QNoDebug &operator<<(QTextStreamManipulator) { return *this; } -#endif inline QNoDebug &space() { return *this; } inline QNoDebug &nospace() { return *this; } inline QNoDebug &maybeSpace() { return *this; } diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 94cf99c6ed..5a4702d992 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -1177,7 +1177,7 @@ QDebug operator<<(QDebug debug, const QSslCertificate &certificate) << ',' << certificate.issuerInfo(QSslCertificate::Organization) << ',' << certificate.subjectInfo(QSslCertificate::Organization) << ',' << certificate.subjectAlternativeNames() -#ifndef QT_NO_TEXTSTREAM +#ifndef QT_NO_DATESTRING << ',' << certificate.effectiveDate() << ',' << certificate.expiryDate() #endif diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index 50c1af1775..83fcee18d6 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -19,7 +19,6 @@ DEFINES += \ QT_NO_QOBJECT \ QT_NO_STL \ QT_NO_SYSTEMLOCALE \ - QT_NO_TEXTSTREAM \ QT_NO_THREAD \ QT_NO_UNICODETABLES \ QT_NO_USING_NAMESPACE \ diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index fdebd9be24..b5869d826c 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -22,7 +22,6 @@ DEFINES += \ QT_NO_QOBJECT \ QT_NO_STL \ QT_NO_SYSTEMLOCALE \ - QT_NO_TEXTSTREAM \ QT_NO_THREAD \ QT_NO_UNICODETABLES \ QT_NO_USING_NAMESPACE \ diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp index 415ff6e97f..ca22e0718a 100644 --- a/src/widgets/widgets/qsplitter.cpp +++ b/src/widgets/widgets/qsplitter.cpp @@ -1675,7 +1675,6 @@ void QSplitter::setStretchFactor(int index, int stretch) } -#ifndef QT_NO_TEXTSTREAM /*! \relates QSplitter \obsolete @@ -1706,7 +1705,6 @@ QTextStream& operator>>(QTextStream& ts, QSplitter& splitter) splitter.restoreState(line.toAscii()); return ts; } -#endif // QT_NO_TEXTSTREAM QT_END_NAMESPACE diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h index c93af70401..ee62ab76f2 100644 --- a/src/widgets/widgets/qsplitter.h +++ b/src/widgets/widgets/qsplitter.h @@ -133,10 +133,8 @@ private: friend class QSplitterHandle; }; -#ifndef QT_NO_TEXTSTREAM Q_WIDGETS_EXPORT QTextStream& operator<<(QTextStream&, const QSplitter&); Q_WIDGETS_EXPORT QTextStream& operator>>(QTextStream&, QSplitter&); -#endif class QSplitterHandlePrivate; class Q_WIDGETS_EXPORT QSplitterHandle : public QWidget diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp index c5c89482e7..a2fab2b479 100644 --- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp @@ -200,10 +200,8 @@ void tst_QSslCertificate::emptyConstructor() QCOMPARE(certificate.issuerInfo(QSslCertificate::Organization), QStringList()); QCOMPARE(certificate.subjectInfo(QSslCertificate::Organization), QStringList()); QCOMPARE(certificate.subjectAlternativeNames(),(QMultiMap<QSsl::AlternativeNameEntryType, QString>())); -#ifndef QT_NO_TEXTSTREAM QCOMPARE(certificate.effectiveDate(), QDateTime()); QCOMPARE(certificate.expiryDate(), QDateTime()); -#endif } Q_DECLARE_METATYPE(QSsl::EncodingFormat); |