From 4ecf82795de54fba530ac9c386f3afff2174edbd Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 9 Jan 2012 08:53:17 +0100 Subject: Remove use of QT_MODULE from library These defines were there to aid in the commercial licensing scheme we used long ago, and are no longer needed. Keep a QT_MODULE(x) define so other modules continue compiling. Change-Id: I8fd76cd5270df8f14aee746b6cf32ebf7c23fec7 Reviewed-by: Lars Knoll --- src/corelib/tools/qalgorithms.h | 1 - src/corelib/tools/qbitarray.h | 1 - src/corelib/tools/qbytearray.h | 1 - src/corelib/tools/qbytearraymatcher.h | 1 - src/corelib/tools/qcache.h | 1 - src/corelib/tools/qchar.h | 1 - src/corelib/tools/qcontainerfwd.h | 1 - src/corelib/tools/qcontiguouscache.h | 1 - src/corelib/tools/qcryptographichash.h | 1 - src/corelib/tools/qdatetime.h | 1 - src/corelib/tools/qeasingcurve.h | 1 - src/corelib/tools/qelapsedtimer.h | 1 - src/corelib/tools/qfreelist_p.h | 1 - src/corelib/tools/qhash.h | 1 - src/corelib/tools/qiterator.h | 1 - src/corelib/tools/qline.h | 1 - src/corelib/tools/qlinkedlist.h | 1 - src/corelib/tools/qlist.h | 1 - src/corelib/tools/qlocale.h | 1 - src/corelib/tools/qmap.h | 1 - src/corelib/tools/qmargins.h | 1 - src/corelib/tools/qpair.h | 1 - src/corelib/tools/qpodlist_p.h | 1 - src/corelib/tools/qpoint.h | 1 - src/corelib/tools/qqueue.h | 1 - src/corelib/tools/qrect.h | 1 - src/corelib/tools/qrefcount.h | 1 - src/corelib/tools/qregexp.h | 1 - src/corelib/tools/qscopedpointer.h | 1 - src/corelib/tools/qscopedpointer_p.h | 1 - src/corelib/tools/qscopedvaluerollback.h | 1 - src/corelib/tools/qset.h | 1 - src/corelib/tools/qshareddata.h | 1 - src/corelib/tools/qsharedpointer.h | 1 - src/corelib/tools/qsharedpointer_impl.h | 2 -- src/corelib/tools/qsimd_p.h | 1 - src/corelib/tools/qsize.h | 1 - src/corelib/tools/qstack.h | 1 - src/corelib/tools/qstring.h | 1 - src/corelib/tools/qstringbuilder.h | 1 - src/corelib/tools/qstringlist.h | 1 - src/corelib/tools/qstringmatcher.h | 1 - src/corelib/tools/qtextboundaryfinder.h | 1 - src/corelib/tools/qtimeline.h | 1 - src/corelib/tools/qvarlengtharray.h | 1 - src/corelib/tools/qvector.h | 1 - 46 files changed, 47 deletions(-) (limited to 'src/corelib/tools') diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h index 13b45d0c79..6d038955b9 100644 --- a/src/corelib/tools/qalgorithms.h +++ b/src/corelib/tools/qalgorithms.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) /* Warning: The contents of QAlgorithmsPrivate is not a part of the public Qt API diff --git a/src/corelib/tools/qbitarray.h b/src/corelib/tools/qbitarray.h index 3501ff466c..d946b6621f 100644 --- a/src/corelib/tools/qbitarray.h +++ b/src/corelib/tools/qbitarray.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QBitRef; class Q_CORE_EXPORT QBitArray diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index 74b894ddfa..46fc3685aa 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -68,7 +68,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) /***************************************************************************** Safe and portable C string functions; extensions to standard string.h diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h index 1d162745e4..29ddfc6641 100644 --- a/src/corelib/tools/qbytearraymatcher.h +++ b/src/corelib/tools/qbytearraymatcher.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QByteArrayMatcherPrivate; diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h index 7c9382f2a2..12b61cba81 100644 --- a/src/corelib/tools/qcache.h +++ b/src/corelib/tools/qcache.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template class QCache diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index 7f35fd4237..3a402dfdad 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QString; diff --git a/src/corelib/tools/qcontainerfwd.h b/src/corelib/tools/qcontainerfwd.h index c5d1c895a2..a80f3eaab0 100644 --- a/src/corelib/tools/qcontainerfwd.h +++ b/src/corelib/tools/qcontainerfwd.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template class QCache; template class QHash; diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h index 3a92985a2d..eecf4ebdae 100644 --- a/src/corelib/tools/qcontiguouscache.h +++ b/src/corelib/tools/qcontiguouscache.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #undef QT_QCONTIGUOUSCACHE_DEBUG -QT_MODULE(Core) struct Q_CORE_EXPORT QContiguousCacheData diff --git a/src/corelib/tools/qcryptographichash.h b/src/corelib/tools/qcryptographichash.h index 6781bcca53..951ece3cac 100644 --- a/src/corelib/tools/qcryptographichash.h +++ b/src/corelib/tools/qcryptographichash.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QCryptographicHashPrivate; class QIODevice; diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index 0735dd9232..e60da88748 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QDate { diff --git a/src/corelib/tools/qeasingcurve.h b/src/corelib/tools/qeasingcurve.h index 600a82a75f..8d20f97666 100644 --- a/src/corelib/tools/qeasingcurve.h +++ b/src/corelib/tools/qeasingcurve.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QEasingCurvePrivate; class QPointF; diff --git a/src/corelib/tools/qelapsedtimer.h b/src/corelib/tools/qelapsedtimer.h index 48499ca5f3..12385dc737 100644 --- a/src/corelib/tools/qelapsedtimer.h +++ b/src/corelib/tools/qelapsedtimer.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QElapsedTimer { diff --git a/src/corelib/tools/qfreelist_p.h b/src/corelib/tools/qfreelist_p.h index bf0776777a..d8a0ad695e 100644 --- a/src/corelib/tools/qfreelist_p.h +++ b/src/corelib/tools/qfreelist_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) /*! \internal diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 8c5d509f8c..5848afb7e4 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QBitArray; class QByteArray; diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h index 48935b3fa7..04d4abc402 100644 --- a/src/corelib/tools/qiterator.h +++ b/src/corelib/tools/qiterator.h @@ -53,7 +53,6 @@ namespace std { QT_BEGIN_NAMESPACE -QT_MODULE(Core) #define Q_DECLARE_SEQUENTIAL_ITERATOR(C) \ \ diff --git a/src/corelib/tools/qline.h b/src/corelib/tools/qline.h index 8887cbc70b..0588076f20 100644 --- a/src/corelib/tools/qline.h +++ b/src/corelib/tools/qline.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) /******************************************************************************* * class QLine diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h index cd5eb1356f..909ccac303 100644 --- a/src/corelib/tools/qlinkedlist.h +++ b/src/corelib/tools/qlinkedlist.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) struct Q_CORE_EXPORT QLinkedListData { diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index 7b3362a76d..c0a044279b 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -63,7 +63,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template class QVector; template class QSet; diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index 4201381993..2f8d3eb7ca 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QDataStream; class QDate; diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index f65260512b..cecce2ca9e 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -56,7 +56,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) struct Q_CORE_EXPORT QMapData { diff --git a/src/corelib/tools/qmargins.h b/src/corelib/tools/qmargins.h index 0b7bb6cc93..f1215be4da 100644 --- a/src/corelib/tools/qmargins.h +++ b/src/corelib/tools/qmargins.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QMargins { diff --git a/src/corelib/tools/qpair.h b/src/corelib/tools/qpair.h index 50c704660e..6596400f20 100644 --- a/src/corelib/tools/qpair.h +++ b/src/corelib/tools/qpair.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template struct QPair diff --git a/src/corelib/tools/qpodlist_p.h b/src/corelib/tools/qpodlist_p.h index 4aee4d6806..c218df0a19 100644 --- a/src/corelib/tools/qpodlist_p.h +++ b/src/corelib/tools/qpodlist_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template class QPodList : public QVarLengthArray diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h index 3ad97e4de2..054d5cb61a 100644 --- a/src/corelib/tools/qpoint.h +++ b/src/corelib/tools/qpoint.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QPoint { diff --git a/src/corelib/tools/qqueue.h b/src/corelib/tools/qqueue.h index 768bc22bcc..890b7eba60 100644 --- a/src/corelib/tools/qqueue.h +++ b/src/corelib/tools/qqueue.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template class QQueue : public QList diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h index 212ada89ff..6741a8082c 100644 --- a/src/corelib/tools/qrect.h +++ b/src/corelib/tools/qrect.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QRect { diff --git a/src/corelib/tools/qrefcount.h b/src/corelib/tools/qrefcount.h index adfecf37f5..fece463342 100644 --- a/src/corelib/tools/qrefcount.h +++ b/src/corelib/tools/qrefcount.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) namespace QtPrivate { diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h index 5516429a55..a0708af709 100644 --- a/src/corelib/tools/qregexp.h +++ b/src/corelib/tools/qregexp.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) struct QRegExpPrivate; class QStringList; diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h index 22758860e5..5d3912d164 100644 --- a/src/corelib/tools/qscopedpointer.h +++ b/src/corelib/tools/qscopedpointer.h @@ -46,7 +46,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template struct QScopedPointerDeleter diff --git a/src/corelib/tools/qscopedpointer_p.h b/src/corelib/tools/qscopedpointer_p.h index dd099d8c67..ee2e4ab46d 100644 --- a/src/corelib/tools/qscopedpointer_p.h +++ b/src/corelib/tools/qscopedpointer_p.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) /* Internal helper class - exposes the data through data_ptr (legacy from QShared). diff --git a/src/corelib/tools/qscopedvaluerollback.h b/src/corelib/tools/qscopedvaluerollback.h index 372af00f48..48abd21ec1 100644 --- a/src/corelib/tools/qscopedvaluerollback.h +++ b/src/corelib/tools/qscopedvaluerollback.h @@ -46,7 +46,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template class QScopedValueRollback diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h index 3639741d70..d43255dbdc 100644 --- a/src/corelib/tools/qset.h +++ b/src/corelib/tools/qset.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template class QSet diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h index 3efd0c4e68..90ca2cce5f 100644 --- a/src/corelib/tools/qshareddata.h +++ b/src/corelib/tools/qshareddata.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template class QSharedDataPointer; diff --git a/src/corelib/tools/qsharedpointer.h b/src/corelib/tools/qsharedpointer.h index dd540892c9..363a2c48a5 100644 --- a/src/corelib/tools/qsharedpointer.h +++ b/src/corelib/tools/qsharedpointer.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) // These classes are here to fool qdoc into generating a better documentation diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 78624498e9..4cc38d232d 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -52,7 +52,6 @@ // classes found in qsharedpointer.h QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) QT_END_NAMESPACE QT_END_HEADER #pragma qt_sync_stop_processing @@ -66,7 +65,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) // Macro QSHAREDPOINTER_VERIFY_AUTO_CAST // generates a compiler error if the following construct isn't valid: diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index 474b4e8d9b..94e3acba81 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -139,7 +139,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) enum CPUFeatures { None = 0, diff --git a/src/corelib/tools/qsize.h b/src/corelib/tools/qsize.h index 40977b059a..af33db68e3 100644 --- a/src/corelib/tools/qsize.h +++ b/src/corelib/tools/qsize.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QSize { diff --git a/src/corelib/tools/qstack.h b/src/corelib/tools/qstack.h index 1a525ed312..d6020b0c7f 100644 --- a/src/corelib/tools/qstack.h +++ b/src/corelib/tools/qstack.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template class QStack : public QVector diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index ee8ce45cb2..bc73a036ad 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -61,7 +61,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QCharRef; class QRegExp; diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h index 2dfd8b9a55..fa1f81bec4 100644 --- a/src/corelib/tools/qstringbuilder.h +++ b/src/corelib/tools/qstringbuilder.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) struct Q_CORE_EXPORT QAbstractConcatenable { diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h index 9715fb7e5b..93414d97e7 100644 --- a/src/corelib/tools/qstringlist.h +++ b/src/corelib/tools/qstringlist.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QRegExp; diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/tools/qstringmatcher.h index a8448d0323..143dacb958 100644 --- a/src/corelib/tools/qstringmatcher.h +++ b/src/corelib/tools/qstringmatcher.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QStringMatcherPrivate; diff --git a/src/corelib/tools/qtextboundaryfinder.h b/src/corelib/tools/qtextboundaryfinder.h index 497775d983..201df8b2a4 100644 --- a/src/corelib/tools/qtextboundaryfinder.h +++ b/src/corelib/tools/qtextboundaryfinder.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QTextBoundaryFinderPrivate; diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h index 8e62ca845c..ae3fde1c24 100644 --- a/src/corelib/tools/qtimeline.h +++ b/src/corelib/tools/qtimeline.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QTimeLinePrivate; class Q_CORE_EXPORT QTimeLine : public QObject diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h index ada680fdb7..7994bb282c 100644 --- a/src/corelib/tools/qvarlengtharray.h +++ b/src/corelib/tools/qvarlengtharray.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template class QPodList; diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index ffe3047013..25f4700180 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -61,7 +61,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) struct Q_CORE_EXPORT QVectorData { -- cgit v1.2.3