Remove <qhash.h> where it's not used

To avoid source-incompatibilites, wrap in QT_DEPRECATED_SINCE(5, 5) in public headers. Change-Id: I6117e8a6b11200d2f1a0a94a0e87d5c27538218e Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
2015-04-04 21:28:59 +02:00 · 2015-04-04 21:28:59 +02:00 · 1b5f29e28a
commit 1b5f29e28a
parent 103086e379
41 changed files with 6 additions and 39 deletions
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
@ -93,7 +93,6 @@ QT_END_NAMESPACE
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qlist.h>
-#include <qhash.h>
 #include <qmutex.h>
 #include <qsemaphore.h>
 #include <qsocketnotifier.h>
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@ -35,7 +35,6 @@
 #include "qresource_p.h"
 #include "qresource_iterator_p.h"
 #include "qset.h"
-#include "qhash.h"
 #include "qmutex.h"
 #include "qdebug.h"
 #include "qlocale.h"
--- a/src/corelib/io/qstandardpaths.cpp
+++ b/src/corelib/io/qstandardpaths.cpp
@ -35,7 +35,6 @@

 #include <qdir.h>
 #include <qfileinfo.h>
-#include <qhash.h>

 #ifndef QT_BOOTSTRAPPED
 #include <qobject.h>
--- a/src/corelib/io/qtldurl.cpp
+++ b/src/corelib/io/qtldurl.cpp
@ -37,7 +37,6 @@
 #include "private/qtldurl_p.h"
 #include "QtCore/qstring.h"
 #include "QtCore/qvector.h"
-#include "QtCore/qhash.h"

 QT_BEGIN_NAMESPACE

--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@ -45,7 +45,6 @@
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
-#include <qhash.h>
 #include <qmutex.h>
 #include <private/qloggingregistry_p.h>
 #include <qstandardpaths.h>
--- a/src/corelib/kernel/qeventdispatcher_glib.cpp
+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
@ -39,7 +39,6 @@
 #include "qcoreapplication.h"
 #include "qsocketnotifier.h"

-#include <QtCore/qhash.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qpair.h>

--- a/src/corelib/kernel/qeventdispatcher_glib_p.h
+++ b/src/corelib/kernel/qeventdispatcher_glib_p.h
@ -48,8 +48,6 @@
 #include "qabstracteventdispatcher.h"
 #include "qabstracteventdispatcher_p.h"

-#include <QtCore/qhash.h>
-
 typedef struct _GMainContext GMainContext;

 QT_BEGIN_NAMESPACE
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@ -34,7 +34,6 @@
 #include "qeventdispatcher_win_p.h"

 #include "qcoreapplication.h"
-#include "qhash.h"
 #include <private/qsystemlibrary_p.h>
 #include "qpair.h"
 #include "qset.h"
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@ -43,7 +43,6 @@
 #include <qstringlist.h>
 #include <qthread.h>
 #include <qvariant.h>
-#include <qhash.h>
 #include <qdebug.h>
 #include <qsemaphore.h>

--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@ -47,7 +47,6 @@
 #include <qthread.h>
 #include <private/qthread_p.h>
 #include <qdebug.h>
-#include <qhash.h>
 #include <qpair.h>
 #include <qvarlengtharray.h>
 #include <qset.h>
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@ -46,7 +46,6 @@
 #include "qfile.h"
 #include "qmap.h"
 #include "qalgorithms.h"
-#include "qhash.h"
 #include "qtranslator_p.h"
 #include "qlocale.h"
 #include "qendian.h"
--- a/src/corelib/mimetypes/qmimedatabase_p.h
+++ b/src/corelib/mimetypes/qmimedatabase_p.h
@ -52,7 +52,6 @@
 #include "qmimetype_p.h"
 #include "qmimeglobpattern_p.h"

-#include <QtCore/qhash.h>
 #include <QtCore/qmutex.h>

 QT_BEGIN_NAMESPACE
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@ -38,7 +38,6 @@
 #include "qabstracteventdispatcher.h"

 #include <qeventloop.h>
-#include <qhash.h>

 #include "qthread_p.h"
 #include "private/qcoreapplication_p.h"
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@ -50,7 +50,6 @@
 #include "qstringmatcher.h"
 #include "qvarlengtharray.h"
 #include "qtools_p.h"
-#include "qhash.h"
 #include "qdebug.h"
 #include "qendian.h"
 #include "qcollator.h"
--- a/src/dbus/qdbusabstractadaptor_p.h
+++ b/src/dbus/qdbusabstractadaptor_p.h
@ -50,7 +50,6 @@

 #include <QtCore/qobject.h>
 #include <QtCore/qmap.h>
-#include <QtCore/qhash.h>
 #include <QtCore/qreadwritelock.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qvector.h>
--- a/src/dbus/qdbusintegrator_p.h
+++ b/src/dbus/qdbusintegrator_p.h
@ -50,7 +50,6 @@

 #include "qcoreevent.h"
 #include "qeventloop.h"
-#include "qhash.h"
 #include "qobject.h"
 #include "private/qobject_p.h"
 #include "qlist.h"
--- a/src/dbus/qdbusmacros.h
+++ b/src/dbus/qdbusmacros.h
@ -45,7 +45,9 @@
 #ifdef Q_CC_MSVC
 #include <QtCore/qlist.h>
 #include <QtCore/qset.h>
+#if QT_DEPRECATED_SINCE(5, 5)
 #include <QtCore/qhash.h>
+#endif
 #include <QtCore/qvector.h>
 #endif

--- a/src/gui/image/qiconloader.cpp
+++ b/src/gui/image/qiconloader.cpp
@ -42,7 +42,6 @@
 #include <QtGui/QIconEngine>
 #include <QtGui/QPalette>
 #include <QtCore/QList>
-#include <QtCore/QHash>
 #include <QtCore/QDir>
 #include <QtCore/QSettings>
 #include <QtGui/QPainter>
--- a/src/gui/kernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.h
@ -50,7 +50,6 @@
 #include <qlist.h>
 #include <qlocale.h>
 #include <qevent.h>
-#include <qhash.h>


 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qplatformdialoghelper.cpp
+++ b/src/gui/kernel/qplatformdialoghelper.cpp
@ -36,7 +36,6 @@
 #include <QtCore/QVariant>
 #include <QtCore/QSharedData>
 #include <QtCore/QSettings>
-#include <QtCore/QHash>
 #include <QtCore/QUrl>
 #include <QtGui/QColor>

--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@ -42,7 +42,6 @@

 #include <qpainterpath.h>
 #include <qdebug.h>
-#include <qhash.h>
 #include <qbitmap.h>
 #include <qmath.h>

--- a/src/gui/painting/qpainter_p.h
+++ b/src/gui/painting/qpainter_p.h
@ -53,7 +53,6 @@
 #include "QtGui/qpainter.h"
 #include "QtGui/qpainterpath.h"
 #include "QtGui/qpaintengine.h"
-#include <QtCore/qhash.h>

 #include <private/qpen_p.h>

--- a/src/gui/text/qplatformfontdatabase.h
+++ b/src/gui/text/qplatformfontdatabase.h
@ -47,7 +47,9 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QList>
+#if QT_DEPRECATED_SINCE(5, 5)
 #include <QtCore/QHash>
+#endif
 #include <QtGui/QFontDatabase>
 #include <QtGui/private/qfontengine_p.h>
 #include <QtGui/private/qfont_p.h>
--- a/src/gui/text/qtextformat_p.h
+++ b/src/gui/text/qtextformat_p.h
@ -47,7 +47,6 @@

 #include "QtGui/qtextformat.h"
 #include "QtCore/qvector.h"
-#include "QtCore/qhash.h"

 QT_BEGIN_NAMESPACE

--- a/src/network/access/qftp.cpp
+++ b/src/network/access/qftp.cpp
@ -46,7 +46,6 @@
 #include "qregexp.h"
 #include "qtimer.h"
 #include "qfileinfo.h"
-#include "qhash.h"
 #include "qtcpserver.h"
 #include "qlocale.h"

--- a/src/network/access/qnetworkaccessbackend.cpp
+++ b/src/network/access/qnetworkaccessbackend.cpp
@ -37,7 +37,6 @@
 #include "qnetworkrequest.h"
 #include "qnetworkreply.h"
 #include "qnetworkreply_p.h"
-#include "QtCore/qhash.h"
 #include "QtCore/qmutex.h"
 #include "QtCore/qstringlist.h"
 #include "QtNetwork/private/qnetworksession_p.h"
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@ -218,7 +218,6 @@
 #include "private/qhttpsocketengine_p.h"
 #include "qauthenticator.h"
 #include "qdebug.h"
-#include "qhash.h"
 #include "qmutex.h"
 #include "qstringlist.h"
 #include "qurl.h"
--- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.h
+++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.h
@ -80,7 +80,6 @@
 //

 #include <QtCore/qabstracteventdispatcher.h>
-#include <QtCore/qhash.h>
 #include <QtCore/qstack.h>
 #include <QtGui/qwindowdefs.h>
 #include <QtCore/private/qabstracteventdispatcher_p.h>
--- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
+++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
@ -72,7 +72,6 @@
 #include "qcocoahelpers.h"
 #include "qguiapplication.h"
 #include "qevent.h"
-#include "qhash.h"
 #include "qmutex.h"
 #include "qsocketnotifier.h"
 #include <qpa/qplatformwindow.h>
--- a/src/plugins/platforms/qnx/qqnxintegration.cpp
+++ b/src/plugins/platforms/qnx/qqnxintegration.cpp
@ -95,7 +95,6 @@
 #include <private/qsimpledrag_p.h>

 #include <QtCore/QDebug>
-#include <QtCore/QHash>

 #include <errno.h>

--- a/src/printsupport/dialogs/qprintdialog_mac.mm
+++ b/src/printsupport/dialogs/qprintdialog_mac.mm
@ -36,7 +36,6 @@
 #include "qprintdialog.h"
 #include "qabstractprintdialog_p.h"

-#include <QtCore/qhash.h>
 #include <QtCore/private/qcore_mac_p.h>
 #include <QtWidgets/private/qapplication_p.h>
 #include <QtPrintSupport/qprinter.h>
--- a/src/tools/qdoc/qmlparser/qqmljsengine_p.cpp
+++ b/src/tools/qdoc/qmlparser/qqmljsengine_p.cpp
@ -35,7 +35,6 @@
 #include "qqmljsglobal_p.h"

 #include <QtCore/qnumeric.h>
-#include <QtCore/qhash.h>
 #include <QtCore/qdebug.h>

 QT_QML_BEGIN_NAMESPACE
--- a/src/tools/uic/cpp/cppwriteincludes.h
+++ b/src/tools/uic/cpp/cppwriteincludes.h
@ -36,7 +36,6 @@

 #include "treewalker.h"

-#include <qhash.h>
 #include <qmap.h>
 #include <qset.h>
 #include <qstring.h>
--- a/src/tools/uic/uic.h
+++ b/src/tools/uic/uic.h
@ -38,7 +38,6 @@
 #include "customwidgetsinfo.h"
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qhash.h>
 #include <qstack.h>
 #include <qxmlstream.h>

--- a/src/widgets/graphicsview/qgraphicssceneevent.h
+++ b/src/widgets/graphicsview/qgraphicssceneevent.h
@ -40,7 +40,9 @@
 #include <QtCore/qrect.h>
 #include <QtGui/qpolygon.h>
 #include <QtCore/qset.h>
+#if QT_DEPRECATED_SINCE(5, 5)
 #include <QtCore/qhash.h>
+#endif

 QT_BEGIN_NAMESPACE

--- a/src/widgets/kernel/qtooltip.cpp
+++ b/src/widgets/kernel/qtooltip.cpp
@ -37,7 +37,6 @@
 #include <qapplication.h>
 #include <qdesktopwidget.h>
 #include <qevent.h>
-#include <qhash.h>
 #include <qlabel.h>
 #include <qpointer.h>
 #include <qstyle.h>
--- a/src/widgets/kernel/qwhatsthis.cpp
+++ b/src/widgets/kernel/qwhatsthis.cpp
@ -42,7 +42,6 @@
 #include "qscreen.h"
 #include "qpainter.h"
 #include "qtimer.h"
-#include "qhash.h"
 #include "qaction.h"
 #include "qcursor.h"
 #include "qbitmap.h"
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@ -37,7 +37,6 @@
 #include "qcursor.h"
 #include "qdesktopwidget_p.h"
 #include "qevent.h"
-#include "qhash.h"
 #include "qlayout.h"
 #include "qmenu.h"
 #include "qmetaobject.h"
--- a/src/widgets/styles/qfusionstyle.cpp
+++ b/src/widgets/styles/qfusionstyle.cpp
@ -40,7 +40,6 @@
 #include <qpushbutton.h>
 #include <qpainter.h>
 #include <qdir.h>
-#include <qhash.h>
 #include <qstyleoption.h>
 #include <qapplication.h>
 #include <qmainwindow.h>
--- a/src/widgets/styles/qwindowsstyle_p_p.h
+++ b/src/widgets/styles/qwindowsstyle_p_p.h
@ -50,7 +50,6 @@

 #ifndef QT_NO_STYLE_WINDOWS
 #include <qlist.h>
-#include <qhash.h>

 QT_BEGIN_NAMESPACE

--- a/src/widgets/widgets/qcombobox_p.h
+++ b/src/widgets/widgets/qcombobox_p.h
@ -57,7 +57,6 @@
 #include "QtGui/qpainter.h"
 #include "QtWidgets/qstyle.h"
 #include "QtWidgets/qstyleoption.h"
-#include "QtCore/qhash.h"
 #include "QtCore/qpair.h"
 #include "QtCore/qtimer.h"
 #include "private/qwidget_p.h"