From 1b5f29e28a7022f6cde5232eaad2e8f73bc7ffcc Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Sat, 4 Apr 2015 21:28:59 +0200
Subject: 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>
---
 src/corelib/io/qprocess_unix.cpp             | 1 -
 src/corelib/io/qresource.cpp                 | 1 -
 src/corelib/io/qstandardpaths.cpp            | 1 -
 src/corelib/io/qtldurl.cpp                   | 1 -
 src/corelib/kernel/qcoreapplication.cpp      | 1 -
 src/corelib/kernel/qeventdispatcher_glib.cpp | 1 -
 src/corelib/kernel/qeventdispatcher_glib_p.h | 2 --
 src/corelib/kernel/qeventdispatcher_win.cpp  | 1 -
 src/corelib/kernel/qmetaobject.cpp           | 1 -
 src/corelib/kernel/qobject.cpp               | 1 -
 src/corelib/kernel/qtranslator.cpp           | 1 -
 src/corelib/mimetypes/qmimedatabase_p.h      | 1 -
 src/corelib/thread/qthread.cpp               | 1 -
 src/corelib/tools/qstring.cpp                | 1 -
 14 files changed, 15 deletions(-)

(limited to 'src/corelib')

diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp
index 46b557d6e0..d9ed8d5d43 100644
--- 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>
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 4b85645a90..fbda081114 100644
--- 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"
diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp
index c5c596fd2e..5f764549e0 100644
--- 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>
diff --git a/src/corelib/io/qtldurl.cpp b/src/corelib/io/qtldurl.cpp
index 2e787a1bc5..d68d0ddf46 100644
--- 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
 
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index dbffa83cee..5057c0415a 100644
--- 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>
diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp
index 876825b5f0..d9bbd4d5f2 100644
--- 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>
 
diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h
index afdb6b9317..2cb919df07 100644
--- 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
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index b55679f3d5..f3d8e99e8b 100644
--- 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"
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index e89b914227..60cd3ab94a 100644
--- 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>
 
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 40279cf2b3..31c749dc13 100644
--- 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>
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index a405df567f..ef74b4bdd1 100644
--- 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"
diff --git a/src/corelib/mimetypes/qmimedatabase_p.h b/src/corelib/mimetypes/qmimedatabase_p.h
index e3cfe3443f..1308907b9b 100644
--- 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
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index dc231a00f8..0c009db930 100644
--- 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"
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 6315c15818..63139c97fd 100644
--- 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"
-- 
cgit v1.2.3