libpyside: Clean up #include directives

Remove unused #include directives, group by libpyside, libshiboken,
Qt, C++ and sort alphabetically with the exception of sbkpython.h
which sanitizes the "slot" defines and needs to go to the top when
used). Add the module to the Qt classes.

Change-Id: I33d912135bad928d3073a1ddeb487de237d6a45e
Reviewed-by: Christian Tismer <tismer@stackless.com>

22 files changed, 84 insertions, 82 deletions

diff --git a/sources/pyside2/libpyside/destroylistener.cpp b/sources/pyside2/libpyside/destroylistener.cpp
index 95e53f709..c6dc54713 100644
--- a/sources/pyside2/libpyside/destroylistener.cpp
+++ b/sources/pyside2/libpyside/destroylistener.cpp
@@ -40,10 +40,7 @@
 #include <sbkpython.h>
 #include "destroylistener.h"
 
-#include <QObject>
 #include <shiboken.h>
-#include <QDebug>
-#include <QMutex>
 
 PySide::DestroyListener* PySide::DestroyListener::m_instance = 0;
 
diff --git a/sources/pyside2/libpyside/destroylistener.h b/sources/pyside2/libpyside/destroylistener.h
index d5643f98c..b1a0597c5 100644
--- a/sources/pyside2/libpyside/destroylistener.h
+++ b/sources/pyside2/libpyside/destroylistener.h
@@ -40,10 +40,10 @@
 #ifndef PYSIDE_DESTROY_LISTENER
 #define PYSIDE_DESTROY_LISTENER
 
-
-#include <QObject>
 #include "pysidemacros.h"
 
+#include <QtCore/QObject>
+
 namespace PySide
 {
 struct DestroyListenerPrivate;
diff --git a/sources/pyside2/libpyside/dynamicqmetaobject.cpp b/sources/pyside2/libpyside/dynamicqmetaobject.cpp
index 4abbebb12..ab464c7da 100644
--- a/sources/pyside2/libpyside/dynamicqmetaobject.cpp
+++ b/sources/pyside2/libpyside/dynamicqmetaobject.cpp
@@ -45,16 +45,14 @@
 #include "pysideproperty_p.h"
 #include "pysideslot_p.h"
 
-#include <QByteArray>
-#include <QString>
-#include <QStringList>
-#include <QList>
-#include <QObject>
-#include <cstring>
-#include <QDebug>
-#include <QMetaMethod>
 #include <shiboken.h>
 
+#include <QtCore/QByteArray>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
+#include <QtCore/QVector>
+
+#include <cstring>
 
 #define EMPTY_META_METHOD "0()"
 
diff --git a/sources/pyside2/libpyside/dynamicqmetaobject.h b/sources/pyside2/libpyside/dynamicqmetaobject.h
index 58fe84ffc..e68c7dd50 100644
--- a/sources/pyside2/libpyside/dynamicqmetaobject.h
+++ b/sources/pyside2/libpyside/dynamicqmetaobject.h
@@ -40,10 +40,10 @@
 #ifndef DYNAMICQMETAOBJECT_H
 #define DYNAMICQMETAOBJECT_H
 
-#include "pysidemacros.h"
 #include <sbkpython.h>
-#include <QMetaObject>
-#include <QMetaMethod>
+
+#include <QtCore/QMetaObject>
+#include <QtCore/QMetaMethod>
 
 namespace PySide
 {
diff --git a/sources/pyside2/libpyside/dynamicqmetaobject_p.h b/sources/pyside2/libpyside/dynamicqmetaobject_p.h
index 219ffc4e3..738b950ba 100644
--- a/sources/pyside2/libpyside/dynamicqmetaobject_p.h
+++ b/sources/pyside2/libpyside/dynamicqmetaobject_p.h
@@ -41,8 +41,9 @@
 #define DYNAMICMETAPROPERTY_P_H
 
 #include <sbkpython.h>
-#include <QByteArray>
-#include <QMetaMethod>
+
+#include <QtCore/QByteArray>
+#include <QtCore/QMetaMethod>
 
 #define GLOBAL_RECEIVER_CLASS_NAME "__GlobalReceiver__"
 
diff --git a/sources/pyside2/libpyside/globalreceiverv2.cpp b/sources/pyside2/libpyside/globalreceiverv2.cpp
index 0c30f2c5f..91ce59bfb 100644
--- a/sources/pyside2/libpyside/globalreceiverv2.cpp
+++ b/sources/pyside2/libpyside/globalreceiverv2.cpp
@@ -40,15 +40,13 @@
 #include "globalreceiverv2.h"
 #include "dynamicqmetaobject_p.h"
 #include "pysideweakref.h"
+#include "signalmanager.h"
 
-#include <QMetaMethod>
-#include <QDebug>
-#include <QEvent>
-#include <QLinkedList>
 #include <autodecref.h>
 #include <gilstate.h>
 
-#include "signalmanager.h"
+#include <QtCore/QMetaMethod>
+#include <QtCore/QSet>
 
 #define RECEIVER_DESTROYED_SLOT_NAME "__receiverDestroyed__(QObject*)"
 
diff --git a/sources/pyside2/libpyside/globalreceiverv2.h b/sources/pyside2/libpyside/globalreceiverv2.h
index 0ec83bc11..b12823a84 100644
--- a/sources/pyside2/libpyside/globalreceiverv2.h
+++ b/sources/pyside2/libpyside/globalreceiverv2.h
@@ -41,15 +41,14 @@
 #define GLOBALRECEIVER_V2_H
 
 #include <sbkpython.h>
-#include <QObject>
-#include <QHash>
-#include <QSet>
-#include <QSharedPointer>
-#include <QLinkedList>
-#include <QByteArray>
 
 #include "dynamicqmetaobject.h"
 
+#include <QtCore/QByteArray>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QSharedPointer>
+
 namespace PySide
 {
 
diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp
index fbfad4185..18bec1001 100644
--- a/sources/pyside2/libpyside/pyside.cpp
+++ b/sources/pyside2/libpyside/pyside.cpp
@@ -52,23 +52,24 @@
 #include "destroylistener.h"
 
 #include <autodecref.h>
-#include <qapp_macro.h>
 #include <basewrapper.h>
+#include <bindingmanager.h>
+#include <gilstate.h>
 #include <sbkconverter.h>
 #include <sbkstring.h>
-#include <gilstate.h>
-#include <bindingmanager.h>
+#include <qapp_macro.h>
+
+#include <QtCore/QByteArray>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QStack>
+
 #include <algorithm>
-#include <typeinfo>
 #include <cstring>
 #include <cctype>
-#include <QByteArray>
-#include <QCoreApplication>
-#include <QDebug>
-#include <QDir>
-#include <QFileInfo>
-#include <QSharedPointer>
-#include <QStack>
+#include <typeinfo>
 
 static QStack<PySide::CleanupFunction> cleanupFunctionList;
 static void* qobjectNextAddr;
diff --git a/sources/pyside2/libpyside/pyside.h b/sources/pyside2/libpyside/pyside.h
index d9ae9dcdf..b53048eba 100644
--- a/sources/pyside2/libpyside/pyside.h
+++ b/sources/pyside2/libpyside/pyside.h
@@ -41,16 +41,15 @@
 #define PYSIDE_H
 
 #include <sbkpython.h>
+
 #include <pysidemacros.h>
 
 #ifdef PYSIDE_QML_SUPPORT
-#  include <qqml.h>
+#  include <QtQml/qqml.h>
 #endif
 
-#include <QMetaType>
-#include <QHash>
-#include <QList>
-#include <QLoggingCategory>
+#include <QtCore/QMetaType>
+#include <QtCore/QHash>
 
 struct SbkObjectType;
 
diff --git a/sources/pyside2/libpyside/pysideclassinfo.cpp b/sources/pyside2/libpyside/pysideclassinfo.cpp
index 64b882673..e3a437438 100644
--- a/sources/pyside2/libpyside/pysideclassinfo.cpp
+++ b/sources/pyside2/libpyside/pysideclassinfo.cpp
@@ -38,13 +38,13 @@
 ****************************************************************************/
 
 #include <sbkpython.h>
+
 #include "pysideclassinfo.h"
 #include "pyside_p.h"
 #include "pysideclassinfo_p.h"
 #include "dynamicqmetaobject.h"
 
 #include <shiboken.h>
-#include <QDebug>
 
 #define CLASSINFO_CLASS_NAME    "ClassInfo"
 
diff --git a/sources/pyside2/libpyside/pysideclassinfo.h b/sources/pyside2/libpyside/pysideclassinfo.h
index 910dd9f82..ff60b91c3 100644
--- a/sources/pyside2/libpyside/pysideclassinfo.h
+++ b/sources/pyside2/libpyside/pysideclassinfo.h
@@ -41,9 +41,11 @@
 #define PYSIDE_CLASSINFO_H
 
 #include <pysidemacros.h>
+
 #include <sbkpython.h>
-#include <QMap>
-#include <QByteArray>
+
+#include <QtCore/QMap>
+#include <QtCore/QByteArray>
 
 extern "C"
 {
diff --git a/sources/pyside2/libpyside/pysidemetafunction.cpp b/sources/pyside2/libpyside/pysidemetafunction.cpp
index 9839a1098..80496764d 100644
--- a/sources/pyside2/libpyside/pysidemetafunction.cpp
+++ b/sources/pyside2/libpyside/pysidemetafunction.cpp
@@ -36,14 +36,13 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <sbkpython.h>
+
 #include "pysidemetafunction.h"
 #include "pysidemetafunction_p.h"
 
 #include <shiboken.h>
-#include <QObject>
-#include <QMetaMethod>
-#include <QDebug>
+
+#include <QtCore/QMetaMethod>
 
 extern "C"
 {
diff --git a/sources/pyside2/libpyside/pysidemetafunction.h b/sources/pyside2/libpyside/pysidemetafunction.h
index 020f02d49..1085ecb5e 100644
--- a/sources/pyside2/libpyside/pysidemetafunction.h
+++ b/sources/pyside2/libpyside/pysidemetafunction.h
@@ -40,13 +40,12 @@
 #ifndef PYSIDE_METAFUNCTION_H
 #define PYSIDE_METAFUNCTION_H
 
-#include <QObject>
-#include <QString>
-#include <QStringList>
-
 #include <pysidemacros.h>
+
 #include <sbkpython.h>
 
+#include <QtCore/QObject>
+
 extern "C"
 {
     extern PYSIDE_API PyTypeObject *PySideMetaFunctionTypeF(void);
diff --git a/sources/pyside2/libpyside/pysidemetafunction_p.h b/sources/pyside2/libpyside/pysidemetafunction_p.h
index c3b8fe0c7..442e05ea7 100644
--- a/sources/pyside2/libpyside/pysidemetafunction_p.h
+++ b/sources/pyside2/libpyside/pysidemetafunction_p.h
@@ -41,8 +41,8 @@
 #define PYSIDE_METAFUNCTION_P_H
 
 #include <sbkpython.h>
-#include <QList>
-#include <QByteArray>
+
+#include <QtCore/QtGlobal>
 
 QT_BEGIN_NAMESPACE
 class QObject;
diff --git a/sources/pyside2/libpyside/pysideproperty.cpp b/sources/pyside2/libpyside/pysideproperty.cpp
index 1929f999a..091b0c447 100644
--- a/sources/pyside2/libpyside/pysideproperty.cpp
+++ b/sources/pyside2/libpyside/pysideproperty.cpp
@@ -45,8 +45,6 @@
 #include "pysidesignal_p.h"
 
 #include <shiboken.h>
-#include <QDebug>
-
 
 #define QPROPERTY_CLASS_NAME "Property"
 
diff --git a/sources/pyside2/libpyside/pysideproperty.h b/sources/pyside2/libpyside/pysideproperty.h
index d77416abe..0ea5e84d6 100644
--- a/sources/pyside2/libpyside/pysideproperty.h
+++ b/sources/pyside2/libpyside/pysideproperty.h
@@ -41,8 +41,10 @@
 #define PYSIDE_PROPERTY_H
 
 #include <pysidemacros.h>
+
 #include <sbkpython.h>
-#include <QObject>
+
+#include <QtCore/QMetaObject>
 
 extern "C"
 {
diff --git a/sources/pyside2/libpyside/pysideqflags.cpp b/sources/pyside2/libpyside/pysideqflags.cpp
index c33758c5e..f948ecac7 100644
--- a/sources/pyside2/libpyside/pysideqflags.cpp
+++ b/sources/pyside2/libpyside/pysideqflags.cpp
@@ -38,8 +38,9 @@
 ****************************************************************************/
 
 #include "pysideqflags.h"
-#include <sbkenum.h>
+
 #include <autodecref.h>
+#include <sbkenum.h>
 
 extern "C" {
     struct SbkConverter;
diff --git a/sources/pyside2/libpyside/pysidesignal.cpp b/sources/pyside2/libpyside/pysidesignal.cpp
index 1052bbfb2..f31505330 100644
--- a/sources/pyside2/libpyside/pysidesignal.cpp
+++ b/sources/pyside2/libpyside/pysidesignal.cpp
@@ -1,5 +1,3 @@
-#include <utility>
-
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
@@ -45,7 +43,12 @@
 #include "signalmanager.h"
 
 #include <shiboken.h>
-#include <QDebug>
+
+#include <QtCore/QObject>
+#include <QtCore/QMetaMethod>
+#include <QtCore/QMetaObject>
+
+#include <utility>
 
 #define SIGNAL_CLASS_NAME "Signal"
 #define SIGNAL_INSTANCE_NAME "SignalInstance"
diff --git a/sources/pyside2/libpyside/pysidesignal.h b/sources/pyside2/libpyside/pysidesignal.h
index abbefbb1a..d74c26493 100644
--- a/sources/pyside2/libpyside/pysidesignal.h
+++ b/sources/pyside2/libpyside/pysidesignal.h
@@ -40,14 +40,17 @@
 #ifndef PYSIDE_SIGNAL_H
 #define PYSIDE_SIGNAL_H
 
-#include <QObject>
-#include <QString>
-#include <QStringList>
-
 #include <pysidemacros.h>
+
 #include <sbkpython.h>
 #include <basewrapper.h>
 
+#include <QtCore/QList>
+#include <QtCore/QMetaMethod>
+
+QT_FORWARD_DECLARE_CLASS(QMetaObject)
+QT_FORWARD_DECLARE_CLASS(QObject)
+
 extern "C"
 {
     extern PYSIDE_API PyTypeObject *PySideSignalTypeF(void);
diff --git a/sources/pyside2/libpyside/pysideslot.cpp b/sources/pyside2/libpyside/pysideslot.cpp
index 817857053..0dff3bafb 100644
--- a/sources/pyside2/libpyside/pysideslot.cpp
+++ b/sources/pyside2/libpyside/pysideslot.cpp
@@ -42,8 +42,9 @@
 #include "pysideslot_p.h"
 
 #include <shiboken.h>
-#include <QString>
-#include <QMetaObject>
+
+#include <QtCore/QMetaObject>
+#include <QtCore/QString>
 
 #define SLOT_DEC_NAME "Slot"
 
diff --git a/sources/pyside2/libpyside/signalmanager.cpp b/sources/pyside2/libpyside/signalmanager.cpp
index f624fe7a7..07160d989 100644
--- a/sources/pyside2/libpyside/signalmanager.cpp
+++ b/sources/pyside2/libpyside/signalmanager.cpp
@@ -47,20 +47,19 @@
 #include "dynamicqmetaobject.h"
 #include "pysidemetafunction_p.h"
 
-#include <QtCore>
-#include <QHash>
-#include <QStringList>
-#include <QMetaMethod>
 #include <autodecref.h>
-#include <gilstate.h>
-#include <QDebug>
-#include <limits>
-#include <algorithm>
 #include <basewrapper.h>
 #include <bindingmanager.h>
+#include <gilstate.h>
 #include <sbkconverter.h>
 #include <sbkstring.h>
 
+#include <QtCore/QDebug>
+#include <QtCore/QHash>
+
+#include <algorithm>
+#include <limits>
+
 // These private headers are needed to throw JavaScript exceptions
 #if PYSIDE_QML_PRIVATE_API_SUPPORT
     #include <private/qv4engine_p.h>
diff --git a/sources/pyside2/libpyside/signalmanager.h b/sources/pyside2/libpyside/signalmanager.h
index 904c2f11a..229ddb91d 100644
--- a/sources/pyside2/libpyside/signalmanager.h
+++ b/sources/pyside2/libpyside/signalmanager.h
@@ -41,10 +41,12 @@
 #define SIGNALMANAGER_H
 
 #include "pysidemacros.h"
+
 #include <sbkpython.h>
-#include <Qt>
-#include <QStringList>
-#include <QMetaMethod>
+
+#include <QtCore/QMetaMethod>
+
+QT_FORWARD_DECLARE_CLASS(QDataStream)
 
 namespace PySide
 {