diff --git a/src/core/concurrent/qfuturewatcher_p.h b/src/core/concurrent/qfuturewatcher_p.h index 12a0f269f..6bb3183f3 100644 --- a/src/core/concurrent/qfuturewatcher_p.h +++ b/src/core/concurrent/qfuturewatcher_p.h @@ -50,7 +50,7 @@ #ifndef QT_NO_QFUTURE -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/global/qglobal.cpp b/src/core/global/qglobal.cpp index e3106d070..8e051c17f 100644 --- a/src/core/global/qglobal.cpp +++ b/src/core/global/qglobal.cpp @@ -41,7 +41,7 @@ #include "qcorecommon_p.h" #ifndef QT_NO_QOBJECT -#include +#include "qthread_p.h" #endif #include diff --git a/src/core/io/qabstractfileengine.cpp b/src/core/io/qabstractfileengine.cpp index 511e78e6b..9248c41ee 100644 --- a/src/core/io/qabstractfileengine.cpp +++ b/src/core/io/qabstractfileengine.cpp @@ -40,9 +40,9 @@ #include "qfsfileengine.h" #include "qdiriterator.h" -#include -#include -#include +#include "qfilesystementry_p.h" +#include "qfilesystemmetadata_p.h" +#include "qfilesystemengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/io/qdiriterator.cpp b/src/core/io/qdiriterator.cpp index a2331958a..f10e15377 100644 --- a/src/core/io/qdiriterator.cpp +++ b/src/core/io/qdiriterator.cpp @@ -83,19 +83,16 @@ #include "qdiriterator.h" #include "qdir_p.h" - #include "qabstractfileengine.h" - -#include -#include -#include - -#include -#include -#include -#include -#include -#include +#include "qset.h" +#include "qstack.h" +#include "qvariant.h" +#include "qfilesystemiterator_p.h" +#include "qfilesystementry_p.h" +#include "qfilesystemmetadata_p.h" +#include "qfilesystemengine_p.h" +#include "qfsfileengine.h" +#include "qfileinfo_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/io/qfileinfo_p.h b/src/core/io/qfileinfo_p.h index 1637bf976..3ebbd683e 100644 --- a/src/core/io/qfileinfo_p.h +++ b/src/core/io/qfileinfo_p.h @@ -48,8 +48,8 @@ #include "qshareddata.h" #include "qfilesystemengine_p.h" -#include -#include +#include "qfilesystementry_p.h" +#include "qfilesystemmetadata_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/io/qfilesystemengine.cpp b/src/core/io/qfilesystemengine.cpp index 525add20a..82c154c94 100644 --- a/src/core/io/qfilesystemengine.cpp +++ b/src/core/io/qfilesystemengine.cpp @@ -32,11 +32,11 @@ ****************************************************************************/ #include "qfilesystemengine_p.h" -#include -#include -#include +#include "qdir.h" +#include "qset.h" +#include "qabstractfileengine_p.h" #ifdef QT_BUILD_CORE_LIB -#include +#include "qresource_p.h" #endif QT_BEGIN_NAMESPACE diff --git a/src/core/io/qfilesystemengine_p.h b/src/core/io/qfilesystemengine_p.h index 87e20a3e5..b6fa61f0d 100644 --- a/src/core/io/qfilesystemengine_p.h +++ b/src/core/io/qfilesystemengine_p.h @@ -48,7 +48,7 @@ #include "qfile.h" #include "qfilesystementry_p.h" #include "qfilesystemmetadata_p.h" -#include +#include "qsystemerror_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/io/qfilesystementry.cpp b/src/core/io/qfilesystementry.cpp index 822044f56..c7d6568e5 100644 --- a/src/core/io/qfilesystementry.cpp +++ b/src/core/io/qfilesystementry.cpp @@ -32,10 +32,9 @@ ****************************************************************************/ #include "qfilesystementry_p.h" - -#include -#include -#include +#include "qdir.h" +#include "qfile.h" +#include "qfsfileengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/io/qfilesystementry_p.h b/src/core/io/qfilesystementry_p.h index 85f4a954d..cee406da8 100644 --- a/src/core/io/qfilesystementry_p.h +++ b/src/core/io/qfilesystementry_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qstring.h" QT_BEGIN_NAMESPACE diff --git a/src/core/io/qfilesystemiterator_p.h b/src/core/io/qfilesystemiterator_p.h index 38fa1868d..afc009ee4 100644 --- a/src/core/io/qfilesystemiterator_p.h +++ b/src/core/io/qfilesystemiterator_p.h @@ -45,16 +45,15 @@ // We mean it. // -#include +#include "qglobal.h" #ifndef QT_NO_FILESYSTEMITERATOR -#include -#include -#include - -#include -#include +#include "qdiriterator.h" +#include "qstringlist.h" +#include "qscopedpointer.h" +#include "qfilesystementry_p.h" +#include "qfilesystemmetadata_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/io/qfilesystemwatcher_p.h b/src/core/io/qfilesystemwatcher_p.h index 97c8a51b3..9e6f9a951 100644 --- a/src/core/io/qfilesystemwatcher_p.h +++ b/src/core/io/qfilesystemwatcher_p.h @@ -49,7 +49,7 @@ #ifndef QT_NO_FILESYSTEMWATCHER -#include +#include "qobject_p.h" #include diff --git a/src/core/io/qprocess.cpp b/src/core/io/qprocess.cpp index 04e5f4735..7cbf9d47b 100644 --- a/src/core/io/qprocess.cpp +++ b/src/core/io/qprocess.cpp @@ -41,7 +41,7 @@ #include "qcoreapplication.h" #include "qsocketnotifier.h" #include "qtimer.h" -#include +#include "qcore_unix_p.h" //#define QPROCESS_DEBUG diff --git a/src/core/io/qprocess_unix.cpp b/src/core/io/qprocess_unix.cpp index d54a1717a..618a96cf9 100644 --- a/src/core/io/qprocess_unix.cpp +++ b/src/core/io/qprocess_unix.cpp @@ -39,8 +39,8 @@ #include "qprocess.h" #include "qprocess_p.h" #include "qcore_unix_p.h" -#include -#include +#include "qcoreapplication_p.h" +#include "qthread_p.h" #include "qfile.h" #include "qfileinfo.h" #include "qlist.h" diff --git a/src/core/io/qstandardpaths_unix.cpp b/src/core/io/qstandardpaths_unix.cpp index 8fd36b371..81e57f71b 100644 --- a/src/core/io/qstandardpaths_unix.cpp +++ b/src/core/io/qstandardpaths_unix.cpp @@ -29,10 +29,11 @@ #include "qfile.h" #include "qhash.h" #include "qtextstream.h" -#include +#include "qfilesystemengine_p.h" +#include "qcoreapplication.h" + #include #include -#include "qcoreapplication.h" #ifndef QT_NO_STANDARDPATHS diff --git a/src/core/json/qjson.cpp b/src/core/json/qjson.cpp index d296620b6..e94ba1e2e 100644 --- a/src/core/json/qjson.cpp +++ b/src/core/json/qjson.cpp @@ -23,7 +23,7 @@ * ***********************************************************************/ -#include +#include "qjson_p.h" #include "qalgorithms.h" QT_BEGIN_NAMESPACE diff --git a/src/core/json/qjsonarray.cpp b/src/core/json/qjsonarray.cpp index 5032764ff..46aa18c4f 100644 --- a/src/core/json/qjsonarray.cpp +++ b/src/core/json/qjsonarray.cpp @@ -30,9 +30,8 @@ #include "qstringlist.h" #include "qvariant.h" #include "qdebug.h" - -#include -#include +#include "qjsonwriter_p.h" +#include "qjson_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/json/qjsondocument.cpp b/src/core/json/qjsondocument.cpp index 8e6657145..6c64149e3 100644 --- a/src/core/json/qjsondocument.cpp +++ b/src/core/json/qjsondocument.cpp @@ -30,9 +30,9 @@ #include "qstringlist.h" #include "qvariant.h" #include "qdebug.h" -#include -#include -#include +#include "qjsonwriter_p.h" +#include "qjsonparser_p.h" +#include "qjson_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/json/qjsonobject.cpp b/src/core/json/qjsonobject.cpp index 173964177..a34974449 100644 --- a/src/core/json/qjsonobject.cpp +++ b/src/core/json/qjsonobject.cpp @@ -29,8 +29,8 @@ #include "qstringlist.h" #include "qdebug.h" #include "qvariant.h" -#include -#include +#include "qjson_p.h" +#include "qjsonwriter_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/json/qjsonparser.cpp b/src/core/json/qjsonparser.cpp index 3a4b687e5..5a26fe89e 100644 --- a/src/core/json/qjsonparser.cpp +++ b/src/core/json/qjsonparser.cpp @@ -25,8 +25,8 @@ #include "qcoreapplication.h" #include "qdebug.h" -#include -#include +#include "qjsonparser_p.h" +#include "qjson_p.h" //#define PARSER_DEBUG #ifdef PARSER_DEBUG diff --git a/src/core/json/qjsonvalue.cpp b/src/core/json/qjsonvalue.cpp index a706a0923..ebeb92f4b 100644 --- a/src/core/json/qjsonvalue.cpp +++ b/src/core/json/qjsonvalue.cpp @@ -31,8 +31,7 @@ #include "qvariant.h" #include "qstringlist.h" #include "qdebug.h" - -#include +#include "qjson_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/json/qjsonwriter.cpp b/src/core/json/qjsonwriter.cpp index b1bb190a5..51ee0d5df 100644 --- a/src/core/json/qjsonwriter.cpp +++ b/src/core/json/qjsonwriter.cpp @@ -23,8 +23,8 @@ * ***********************************************************************/ -#include -#include +#include "qjsonwriter_p.h" +#include "qjson_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/kernel/qabstracteventdispatcher.cpp b/src/core/kernel/qabstracteventdispatcher.cpp index aaf56a12f..3fcd5d37d 100644 --- a/src/core/kernel/qabstracteventdispatcher.cpp +++ b/src/core/kernel/qabstracteventdispatcher.cpp @@ -35,8 +35,8 @@ #include "qabstracteventdispatcher_p.h" #include "qthread.h" -#include -#include +#include "qthread_p.h" +#include "qcoreapplication_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/kernel/qabstractitemmodel.cpp b/src/core/kernel/qabstractitemmodel.cpp index 821b7c746..f4998f568 100644 --- a/src/core/kernel/qabstractitemmodel.cpp +++ b/src/core/kernel/qabstractitemmodel.cpp @@ -32,7 +32,7 @@ ****************************************************************************/ #include "qabstractitemmodel.h" -#include +#include "qabstractitemmodel_p.h" #include "qdatastream.h" #include "qstringlist.h" #include "qsize.h" diff --git a/src/core/kernel/qcoreapplication.cpp b/src/core/kernel/qcoreapplication.cpp index 0ff9634bd..a7057d4e0 100644 --- a/src/core/kernel/qcoreapplication.cpp +++ b/src/core/kernel/qcoreapplication.cpp @@ -44,17 +44,17 @@ #include "qfile.h" #include "qfileinfo.h" #include "qhash.h" -#include +#include "qprocess_p.h" #include "qtextcodec.h" #include "qthread.h" #include "qthreadpool.h" -#include +#include "qthread_p.h" #include "qelapsedtimer.h" #include "qlibraryinfo.h" #include "qvarlengtharray.h" -#include -#include -#include +#include "qfactoryloader_p.h" +#include "qlocale_p.h" +#include "qmutexpool_p.h" #include "qscopedpointer.h" #if !defined(QT_NO_GLIB) diff --git a/src/core/kernel/qeventdispatcher_glib.cpp b/src/core/kernel/qeventdispatcher_glib.cpp index 10cd03000..4b292c72c 100644 --- a/src/core/kernel/qeventdispatcher_glib.cpp +++ b/src/core/kernel/qeventdispatcher_glib.cpp @@ -34,8 +34,8 @@ #include "qeventdispatcher_glib_p.h" #include "qeventdispatcher_unix_p.h" -#include -#include +#include "qmutexpool_p.h" +#include "qthread_p.h" #include "qcoreapplication.h" #include "qsocketnotifier.h" diff --git a/src/core/kernel/qeventdispatcher_unix.cpp b/src/core/kernel/qeventdispatcher_unix.cpp index 5d7056ea8..5d3233dff 100644 --- a/src/core/kernel/qeventdispatcher_unix.cpp +++ b/src/core/kernel/qeventdispatcher_unix.cpp @@ -38,9 +38,9 @@ #include "qthread.h" #include "qelapsedtimer.h" #include "qeventdispatcher_unix_p.h" -#include -#include -#include +#include "qthread_p.h" +#include "qcoreapplication_p.h" +#include "qcore_unix_p.h" #include #include diff --git a/src/core/kernel/qeventloop.cpp b/src/core/kernel/qeventloop.cpp index eb4863267..a2b372224 100644 --- a/src/core/kernel/qeventloop.cpp +++ b/src/core/kernel/qeventloop.cpp @@ -32,13 +32,11 @@ ****************************************************************************/ #include "qeventloop.h" - #include "qabstracteventdispatcher.h" #include "qcoreapplication.h" #include "qelapsedtimer.h" - #include "qobject_p.h" -#include +#include "qthread_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/kernel/qeventloop.h b/src/core/kernel/qeventloop.h index 41c709fb1..344d3de06 100644 --- a/src/core/kernel/qeventloop.h +++ b/src/core/kernel/qeventloop.h @@ -34,7 +34,7 @@ #ifndef QEVENTLOOP_H #define QEVENTLOOP_H -#include +#include "qobject.h" QT_BEGIN_HEADER diff --git a/src/core/kernel/qmetaobject_p.h b/src/core/kernel/qmetaobject_p.h index 8263121ec..7008326cc 100644 --- a/src/core/kernel/qmetaobject_p.h +++ b/src/core/kernel/qmetaobject_p.h @@ -46,10 +46,10 @@ // #include "qobjectdefs.h" -#include +#include "qcorecommon_p.h" #ifndef QT_NO_QOBJECT -# include +# include "qobject_p.h" #endif #ifndef QT_NO_COMPRESS diff --git a/src/core/kernel/qobject.cpp b/src/core/kernel/qobject.cpp index d6c180960..99153b171 100644 --- a/src/core/kernel/qobject.cpp +++ b/src/core/kernel/qobject.cpp @@ -34,7 +34,6 @@ #include "qobject.h" #include "qobject_p.h" #include "qmetaobject_p.h" - #include "qabstracteventdispatcher.h" #include "qcoreapplication.h" #include "qcoreapplication_p.h" @@ -42,19 +41,17 @@ #include "qmetaobject.h" #include "qregexp.h" #include "qthread.h" -#include +#include "qthread_p.h" #include "qdebug.h" #include "qhash.h" #include "qpair.h" #include "qset.h" #include "qsemaphore.h" #include "qsharedpointer.h" - -#include -#include +#include "qorderedmutexlocker_p.h" +#include "qmutexpool_p.h" #include - #include #include diff --git a/src/core/kernel/qsocketnotifier.cpp b/src/core/kernel/qsocketnotifier.cpp index 02c6f878a..5580d26c4 100644 --- a/src/core/kernel/qsocketnotifier.cpp +++ b/src/core/kernel/qsocketnotifier.cpp @@ -37,7 +37,7 @@ #include "qcoreapplication.h" #include "qobject_p.h" -#include +#include "qthread_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/thread/qthread_unix.cpp b/src/core/thread/qthread_unix.cpp index 73fa28cf1..9bde0d448 100644 --- a/src/core/thread/qthread_unix.cpp +++ b/src/core/thread/qthread_unix.cpp @@ -41,7 +41,7 @@ #if !defined(QT_NO_GLIB) # include "../kernel/qeventdispatcher_glib_p.h" #endif -#include +#include "qeventdispatcher_unix_p.h" #include #include diff --git a/src/core/tools/qstring.cpp b/src/core/tools/qstring.cpp index 307b40a4e..bd74b83c3 100644 --- a/src/core/tools/qstring.cpp +++ b/src/core/tools/qstring.cpp @@ -37,7 +37,7 @@ #ifndef QT_NO_TEXTCODEC #include "qtextcodec.h" #endif -#include +#include "qutfcodec_p.h" #include "qdatastream.h" #include "qlist.h" #include "qlocale.h" diff --git a/src/core/tools/qtimeline.cpp b/src/core/tools/qtimeline.cpp index 126b0a72d..2853fff14 100644 --- a/src/core/tools/qtimeline.cpp +++ b/src/core/tools/qtimeline.cpp @@ -33,7 +33,7 @@ #include "qtimeline.h" -#include +#include "qobject_p.h" #include #include #include diff --git a/src/dbus/qdbuspendingcall.cpp b/src/dbus/qdbuspendingcall.cpp index 6b5ca2932..499cf87f5 100644 --- a/src/dbus/qdbuspendingcall.cpp +++ b/src/dbus/qdbuspendingcall.cpp @@ -46,7 +46,7 @@ #include "qdbusmetatype_p.h" #include "qcoreapplication.h" #include "qcoreevent.h" -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/dbus/qdbusservicewatcher.cpp b/src/dbus/qdbusservicewatcher.cpp index a823ad4ae..86d136b5a 100644 --- a/src/dbus/qdbusservicewatcher.cpp +++ b/src/dbus/qdbusservicewatcher.cpp @@ -44,7 +44,7 @@ #include -#include +#include "qobject_p.h" #include diff --git a/src/dbus/qdbusunixfiledescriptor.cpp b/src/dbus/qdbusunixfiledescriptor.cpp index 924e968a7..f06aa1d0e 100644 --- a/src/dbus/qdbusunixfiledescriptor.cpp +++ b/src/dbus/qdbusunixfiledescriptor.cpp @@ -44,7 +44,7 @@ #include #ifdef Q_OS_UNIX -# include +# include "qcore_unix_p.h" #endif diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p.h index 8793dde5f..08c556ea8 100644 --- a/src/declarative/graphicsitems/qdeclarativeanchors_p.h +++ b/src/declarative/graphicsitems/qdeclarativeanchors_p.h @@ -40,7 +40,7 @@ #include -#include +#include "qdeclarativeglobal_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h index a73dd43c3..66ec029f2 100644 --- a/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h @@ -47,7 +47,7 @@ #include "qdeclarativeanchors_p.h" #include "qdeclarativeitemchangelistener_p.h" -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp index 64c8f72fb..0bfa184db 100644 --- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp @@ -45,7 +45,7 @@ #ifndef QT_NO_MOVIE #include "qdeclarativeinfo.h" -#include +#include "qdeclarativeengine_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp index 642949821..eb2a1e046 100644 --- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp @@ -43,7 +43,7 @@ #include "qdeclarativeborderimage_p_p.h" #include "qdeclarativeinfo.h" -#include +#include "qdeclarativeengine_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h index 6f330256c..df7a24069 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h @@ -51,8 +51,8 @@ #include "qdeclarativeitemchangelistener_p.h" #include "qdeclarative.h" -#include -#include +#include "qdeclarativetimeline_p_p.h" +#include "qdeclarativeanimation_p_p.h" #include "qdatetime.h" #include "qplatformdefs.h" diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp index 4f3d800f7..b6d04b779 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp @@ -45,9 +45,9 @@ #include "qdeclarativeflickable_p_p.h" #include "qdeclarativesmoothedanimation_p_p.h" -#include +#include "qdeclarativeguard_p.h" -#include +#include "qlistmodelinterface_p.h" #include #include "qmath.h" diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp index c73500ae4..9ddde7962 100644 --- a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp +++ b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp @@ -44,7 +44,7 @@ #include "qdeclarativeengine.h" #include "qdeclarativeinfo.h" -#include +#include "qdeclarativepixmapcache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 062828960..a015c82c8 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -42,15 +42,15 @@ #include "qdeclarativeitem.h" #include "qdeclarativeevents_p_p.h" -#include -#include -#include +#include "qdeclarativeengine_p.h" +#include "qgraphicsitem_p.h" +#include "qdeclarativeitem_p.h" #include "qdeclarativeengine.h" -#include -#include +#include "qdeclarativeopenmetaobject_p.h" +#include "qdeclarativestate_p.h" #include "qdeclarativeview.h" -#include +#include "qdeclarativestategroup_p.h" #include "qdeclarativecomponent.h" #include "qdeclarativeinfo.h" @@ -61,7 +61,7 @@ #include #include #include -#include +#include "qlistmodelinterface_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativeitem_p.h b/src/declarative/graphicsitems/qdeclarativeitem_p.h index caa7ba46e..c4dd572a1 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem_p.h +++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h @@ -50,12 +50,12 @@ #include "qdeclarativeanchors_p.h" #include "qdeclarativeanchors_p_p.h" #include "qdeclarativeitemchangelistener_p.h" -#include +#include "qpodvector_p.h" -#include -#include -#include -#include +#include "qdeclarativestate_p.h" +#include "qdeclarativenullablevalue_p_p.h" +#include "qdeclarativenotifier_p.h" +#include "qdeclarativeglobal_p.h" #include "qdeclarative.h" #include "qdeclarativecontext.h" @@ -63,7 +63,7 @@ #include #include -#include +#include "qgraphicsitem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp index c526859b6..26ca6c61b 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp @@ -47,10 +47,10 @@ #include "qdeclarativesmoothedanimation_p_p.h" #include "qdeclarativeexpression.h" #include "qdeclarativeengine.h" -#include +#include "qdeclarativeguard_p.h" #include "qdeclarativeinfo.h" -#include +#include "qlistmodelinterface_p.h" #include "qmath.h" #include #include "qplatformdefs.h" diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp index ff4d93ed2..abce7b24e 100644 --- a/src/declarative/graphicsitems/qdeclarativeloader.cpp +++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp @@ -42,8 +42,8 @@ #include "qdeclarativeloader_p_p.h" #include "qdeclarativeinfo.h" -#include -#include +#include "qdeclarativeengine_p.h" +#include "qdeclarativeglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp index 98e0ffb79..5bb93c8f7 100644 --- a/src/declarative/graphicsitems/qdeclarativepath.cpp +++ b/src/declarative/graphicsitems/qdeclarativepath.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include "qbezier_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativepath_p_p.h b/src/declarative/graphicsitems/qdeclarativepath_p_p.h index f1d95eac5..f3b17678a 100644 --- a/src/declarative/graphicsitems/qdeclarativepath_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativepath_p_p.h @@ -49,7 +49,7 @@ #include "qdeclarative.h" -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE class QDeclarativePathPrivate : public QObjectPrivate diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index 18dbc0d6a..d39678f76 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -42,11 +42,11 @@ #include "qdeclarativepathview_p.h" #include "qdeclarativepathview_p_p.h" -#include -#include +#include "qdeclarativestate_p.h" +#include "qdeclarativeopenmetaobject_p.h" #include #include -#include +#include "qlistmodelinterface_p.h" #include #include "qmath.h" diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h index 62eeee617..cf5358a03 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h @@ -51,8 +51,8 @@ #include "qdeclarativevisualitemmodel_p.h" #include "qdeclarative.h" -#include -#include +#include "qdeclarativeanimation_p_p.h" +#include "qdeclarativeguard_p.h" #include "qdatetime.h" diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp index bb912c334..7798189e8 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp +++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp @@ -43,9 +43,9 @@ #include "qdeclarativepositioners_p_p.h" #include "qdeclarative.h" -#include -#include -#include +#include "qdeclarativestate_p.h" +#include "qdeclarativestategroup_p.h" +#include "qdeclarativestateoperations_p.h" #include "qdeclarativeinfo.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p.h index 802c24dde..68cff1d92 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners_p.h +++ b/src/declarative/graphicsitems/qdeclarativepositioners_p.h @@ -36,8 +36,8 @@ #include "qdeclarativeimplicitsizeitem_p.h" -#include -#include +#include "qdeclarativestate_p.h" +#include "qpodvector_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h index 44d8e817d..b84a81c2f 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h @@ -49,9 +49,9 @@ #include "qdeclarativeimplicitsizeitem_p_p.h" -#include -#include -#include +#include "qdeclarativestate_p.h" +#include "qdeclarativetransitionmanager_p_p.h" +#include "qdeclarativestateoperations_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativerectangle_p.h b/src/declarative/graphicsitems/qdeclarativerectangle_p.h index 585a5c522..7adaa04ed 100644 --- a/src/declarative/graphicsitems/qdeclarativerectangle_p.h +++ b/src/declarative/graphicsitems/qdeclarativerectangle_p.h @@ -38,7 +38,7 @@ #include -#include +#include "qdeclarativeglobal_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp index 6ce2868c2..ee568ec72 100644 --- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp +++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp @@ -43,10 +43,10 @@ #include "qdeclarativerepeater_p_p.h" #include "qdeclarativevisualitemmodel_p.h" -#include -#include +#include "qdeclarativeglobal_p.h" +#include "qdeclarativelistaccessor_p.h" -#include +#include "qlistmodelinterface_p.h" QT_BEGIN_NAMESPACE QDeclarativeRepeaterPrivate::QDeclarativeRepeaterPrivate() diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h index 64bb9c2ff..43e078f84 100644 --- a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h @@ -39,9 +39,9 @@ #include #include -#include -#include -#include +#include "qdeclarativeborderimage_p.h" +#include "qdeclarativepixmapcache_p.h" +#include "qdeclarativeglobal_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index e64058fd1..243dc8549 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -41,9 +41,9 @@ #include "qdeclarativetext_p.h" #include "qdeclarativetext_p_p.h" -#include +#include "qdeclarativestyledtext_p.h" #include "qdeclarativeinfo.h" -#include +#include "qdeclarativepixmapcache_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativetext_p.h b/src/declarative/graphicsitems/qdeclarativetext_p.h index 5b590eb77..f0bc1e0ed 100644 --- a/src/declarative/graphicsitems/qdeclarativetext_p.h +++ b/src/declarative/graphicsitems/qdeclarativetext_p.h @@ -37,7 +37,7 @@ #include #include "qdeclarativeimplicitsizeitem_p.h" -#include +#include "qdeclarativeglobal_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index e718dc76d..0b25537aa 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -43,12 +43,12 @@ #include "qdeclarativetextedit_p_p.h" #include "qdeclarativeevents_p_p.h" -#include +#include "qdeclarativeglobal_p.h" #include "qdeclarativeinfo.h" #include -#include +#include "qtextengine_p.h" #include #include #include @@ -56,7 +56,7 @@ #include #include -#include +#include "qtextcontrol_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 54aa187c0..98d9ce6e1 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -42,7 +42,7 @@ #include "qdeclarativetextinput_p.h" #include "qdeclarativetextinput_p_p.h" -#include +#include "qdeclarativeglobal_p.h" #include "qdeclarativeinfo.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativetranslate.cpp b/src/declarative/graphicsitems/qdeclarativetranslate.cpp index f4dfc8a9b..b618cdbc0 100644 --- a/src/declarative/graphicsitems/qdeclarativetranslate.cpp +++ b/src/declarative/graphicsitems/qdeclarativetranslate.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qdeclarativetranslate_p.h" -#include +#include "qgraphicstransform_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp index 55775208d..eef50c359 100644 --- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp @@ -45,26 +45,26 @@ #include "qdeclarativecommon_p.h" #include "qdeclarativecontext.h" -#include +#include "qdeclarativecontext_p.h" #include "qdeclarativeengine.h" #include "qdeclarativeexpression.h" -#include -#include -#include +#include "qdeclarativepackage_p.h" +#include "qdeclarativeopenmetaobject_p.h" +#include "qdeclarativelistaccessor_p.h" #include "qdeclarativeinfo.h" -#include -#include -#include -#include +#include "qdeclarativedata_p.h" +#include "qdeclarativepropertycache_p.h" +#include "qdeclarativeguard_p.h" +#include "qdeclarativeglobal_p.h" #include "qgraphicsscene.h" -#include +#include "qlistmodelinterface_p.h" #include "qhash.h" #include "qlist.h" -#include +#include "qmetaobjectbuilder_p.h" #include -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeboundsignal_p.h b/src/declarative/qml/qdeclarativeboundsignal_p.h index 722e128c1..481317a1c 100644 --- a/src/declarative/qml/qdeclarativeboundsignal_p.h +++ b/src/declarative/qml/qdeclarativeboundsignal_p.h @@ -50,7 +50,7 @@ #include -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp index 7873ea05c..a4e843aaf 100644 --- a/src/declarative/qml/qdeclarativecompiledbindings.cpp +++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp @@ -45,16 +45,16 @@ #include "qdeclarativecompiledbindings_p.h" #include -#include -#include -#include -#include +#include "qdeclarativecontext_p.h" +#include "qdeclarativejsast_p.h" +#include "qdeclarativejsengine_p.h" +#include "qdeclarativeexpression_p.h" #include #include #include -#include -#include -#include +#include "qdeclarativeanchors_p_p.h" +#include "qdeclarativeglobal_p.h" +#include "qdeclarativefastproperties_p.h" #include "qdeclarativecommon_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativecompileddata.cpp b/src/declarative/qml/qdeclarativecompileddata.cpp index b72692d8a..55dac87bd 100644 --- a/src/declarative/qml/qdeclarativecompileddata.cpp +++ b/src/declarative/qml/qdeclarativecompileddata.cpp @@ -48,7 +48,7 @@ #include -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index eb35f0722..d4051921b 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -2678,7 +2678,7 @@ bool QDeclarativeCompiler::checkValidId(QDeclarativeParser::Value *v, const QStr return true; } -#include +#include "qdeclarativejsparser_p.h" static QStringList astNodeToStringList(QDeclarativeJS::AST::Node *node) { diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h index 5e2e76efa..ff4e8b3d3 100644 --- a/src/declarative/qml/qdeclarativecomponent_p.h +++ b/src/declarative/qml/qdeclarativecomponent_p.h @@ -56,7 +56,7 @@ #include #include -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp index 403630bd3..8dd3ecf91 100644 --- a/src/declarative/qml/qdeclarativecontext.cpp +++ b/src/declarative/qml/qdeclarativecontext.cpp @@ -52,7 +52,7 @@ #include "qscriptengine.h" #include "qdebug.h" -#include +#include "qscriptdeclarativeclass_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h index dae21ea23..6a1d5237a 100644 --- a/src/declarative/qml/qdeclarativecontext_p.h +++ b/src/declarative/qml/qdeclarativecontext_p.h @@ -58,7 +58,7 @@ #include #include -#include +#include "qobject_p.h" #include "qdeclarativeguard_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativecontextscriptclass_p.h b/src/declarative/qml/qdeclarativecontextscriptclass_p.h index dd200b184..0a51907a5 100644 --- a/src/declarative/qml/qdeclarativecontextscriptclass_p.h +++ b/src/declarative/qml/qdeclarativecontextscriptclass_p.h @@ -46,7 +46,7 @@ // #include "qdeclarativetypenamecache_p.h" -#include +#include "qscriptdeclarativeclass_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativedata_p.h b/src/declarative/qml/qdeclarativedata_p.h index 41c7c8a78..d85eeac47 100644 --- a/src/declarative/qml/qdeclarativedata_p.h +++ b/src/declarative/qml/qdeclarativedata_p.h @@ -46,7 +46,7 @@ // #include -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativedirparser.cpp b/src/declarative/qml/qdeclarativedirparser.cpp index 95a5bc423..07aed81fe 100644 --- a/src/declarative/qml/qdeclarativedirparser.cpp +++ b/src/declarative/qml/qdeclarativedirparser.cpp @@ -41,7 +41,7 @@ #include "qdeclarativedirparser_p.h" #include "qdeclarativeerror.h" -#include +#include "qdeclarativeglobal_p.h" #include #include diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index b6d39c7f1..88db71c89 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -92,10 +92,10 @@ #include #include -#include -#include -#include -#include +#include "qobject_p.h" +#include "qscriptdeclarativeclass_p.h" +#include "qdeclarativeitemsmodule_p.h" +#include "qdeclarativeutilmodule_p.h" Q_DECLARE_METATYPE(QDeclarativeProperty) diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 10586f87d..0b2ba3df8 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -74,7 +74,7 @@ #include #include -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp index b26757e29..e8d318a70 100644 --- a/src/declarative/qml/qdeclarativeexpression.cpp +++ b/src/declarative/qml/qdeclarativeexpression.cpp @@ -51,7 +51,7 @@ #include #include -#include +#include "qscriptdeclarativeclass_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativefastproperties.cpp b/src/declarative/qml/qdeclarativefastproperties.cpp index fe58c3cb5..9f99bd9f9 100644 --- a/src/declarative/qml/qdeclarativefastproperties.cpp +++ b/src/declarative/qml/qdeclarativefastproperties.cpp @@ -41,7 +41,7 @@ #include "qdeclarativefastproperties_p.h" -#include +#include "qdeclarativeitem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass.cpp b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp index b290ce2e0..d55540795 100644 --- a/src/declarative/qml/qdeclarativeglobalscriptclass.cpp +++ b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include "qscriptdeclarativeclass_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeguard_p.h b/src/declarative/qml/qdeclarativeguard_p.h index 2eedf8769..09be4be0e 100644 --- a/src/declarative/qml/qdeclarativeguard_p.h +++ b/src/declarative/qml/qdeclarativeguard_p.h @@ -45,9 +45,8 @@ // We mean it. // -#include -#include -#include +#include "qvariant.h" +#include "qdeclarativedata_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 595d439e1..90a42b153 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -48,9 +48,9 @@ #include #include #include -#include -#include -#include +#include "qdeclarativeglobal_p.h" +#include "qdeclarativetypenamecache_p.h" +#include "qdeclarativeengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeimport_p.h b/src/declarative/qml/qdeclarativeimport_p.h index 162ad0772..819bb1f65 100644 --- a/src/declarative/qml/qdeclarativeimport_p.h +++ b/src/declarative/qml/qdeclarativeimport_p.h @@ -37,9 +37,9 @@ #include #include #include -#include -#include -#include +#include "qdeclarativedirparser_p.h" +#include "qdeclarativescriptparser_p.h" +#include "qdeclarativemetatype_p.h" // // W A R N I N G diff --git a/src/declarative/qml/qdeclarativeinclude.cpp b/src/declarative/qml/qdeclarativeinclude.cpp index 21693bb9c..c816bf108 100644 --- a/src/declarative/qml/qdeclarativeinclude.cpp +++ b/src/declarative/qml/qdeclarativeinclude.cpp @@ -46,8 +46,8 @@ #include #include -#include -#include +#include "qdeclarativeengine_p.h" +#include "qdeclarativeglobalscriptclass_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeinclude_p.h b/src/declarative/qml/qdeclarativeinclude_p.h index 980fecf71..530f26e94 100644 --- a/src/declarative/qml/qdeclarativeinclude_p.h +++ b/src/declarative/qml/qdeclarativeinclude_p.h @@ -49,8 +49,8 @@ #include #include -#include -#include +#include "qdeclarativecontext_p.h" +#include "qdeclarativeguard_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeintegercache_p.h b/src/declarative/qml/qdeclarativeintegercache_p.h index 90d1afe68..6f0ea85dc 100644 --- a/src/declarative/qml/qdeclarativeintegercache_p.h +++ b/src/declarative/qml/qdeclarativeintegercache_p.h @@ -50,7 +50,7 @@ #include -#include +#include "qscriptdeclarativeclass_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativelistscriptclass_p.h b/src/declarative/qml/qdeclarativelistscriptclass_p.h index 8c510cbd2..d899c0237 100644 --- a/src/declarative/qml/qdeclarativelistscriptclass_p.h +++ b/src/declarative/qml/qdeclarativelistscriptclass_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qscriptdeclarativeclass_p.h" #include "qdeclarativelist.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativemetatype_p.h b/src/declarative/qml/qdeclarativemetatype_p.h index f26366489..2854e4ace 100644 --- a/src/declarative/qml/qdeclarativemetatype_p.h +++ b/src/declarative/qml/qdeclarativemetatype_p.h @@ -50,8 +50,8 @@ #include #include #include -#include -#include +#include "qdeclarativeglobal_p.h" +#include "qdeclarativedirparser_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass_p.h b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h index 73dbc3891..d72c3b524 100644 --- a/src/declarative/qml/qdeclarativeobjectscriptclass_p.h +++ b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h @@ -48,7 +48,7 @@ #include "qdeclarativepropertycache_p.h" #include "qdeclarativetypenamecache_p.h" -#include +#include "qscriptdeclarativeclass_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeparser_p.h b/src/declarative/qml/qdeclarativeparser_p.h index 42b858d2c..1ef69f515 100644 --- a/src/declarative/qml/qdeclarativeparser_p.h +++ b/src/declarative/qml/qdeclarativeparser_p.h @@ -53,9 +53,9 @@ #include #include -#include -#include -#include +#include "qobject_p.h" +#include "qdeclarativerefcount_p.h" +#include "qdeclarativeglobal_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h index c0be6adce..1ddd40955 100644 --- a/src/declarative/qml/qdeclarativeproperty_p.h +++ b/src/declarative/qml/qdeclarativeproperty_p.h @@ -47,10 +47,10 @@ #include "qdeclarativeproperty.h" -#include -#include -#include -#include +#include "qobject_p.h" +#include "qdeclarativeglobal_p.h" +#include "qdeclarativepropertycache_p.h" +#include "qdeclarativeguard_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeproxymetaobject_p.h b/src/declarative/qml/qdeclarativeproxymetaobject_p.h index bacbea18b..1e1e29fbd 100644 --- a/src/declarative/qml/qdeclarativeproxymetaobject_p.h +++ b/src/declarative/qml/qdeclarativeproxymetaobject_p.h @@ -51,7 +51,7 @@ #include #include -#include +#include "qobject_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/qml/qdeclarativestringconverters_p.h b/src/declarative/qml/qdeclarativestringconverters_p.h index 7661d3aec..ce1bfce42 100644 --- a/src/declarative/qml/qdeclarativestringconverters_p.h +++ b/src/declarative/qml/qdeclarativestringconverters_p.h @@ -48,7 +48,7 @@ #include #include -#include +#include "qdeclarativeglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp index cca0dba85..9971a419e 100644 --- a/src/declarative/qml/qdeclarativetypeloader.cpp +++ b/src/declarative/qml/qdeclarativetypeloader.cpp @@ -41,10 +41,10 @@ #include "qdeclarativetypeloader_p.h" -#include -#include -#include -#include +#include "qdeclarativeengine_p.h" +#include "qdeclarativecompiler_p.h" +#include "qdeclarativecomponent_p.h" +#include "qdeclarativeglobal_p.h" #include #include diff --git a/src/declarative/qml/qdeclarativetypeloader_p.h b/src/declarative/qml/qdeclarativetypeloader_p.h index a2d456f53..a76705543 100644 --- a/src/declarative/qml/qdeclarativetypeloader_p.h +++ b/src/declarative/qml/qdeclarativetypeloader_p.h @@ -49,9 +49,9 @@ #include #include #include -#include -#include -#include +#include "qdeclarativescriptparser_p.h" +#include "qdeclarativedirparser_p.h" +#include "qdeclarativeimport_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativetypenamecache_p.h b/src/declarative/qml/qdeclarativetypenamecache_p.h index 292522994..b418e8bab 100644 --- a/src/declarative/qml/qdeclarativetypenamecache_p.h +++ b/src/declarative/qml/qdeclarativetypenamecache_p.h @@ -48,7 +48,7 @@ #include "qdeclarativerefcount_p.h" #include "qdeclarativecleanup_p.h" -#include +#include "qscriptdeclarativeclass_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass_p.h b/src/declarative/qml/qdeclarativetypenamescriptclass_p.h index eaeab9c04..2b619d5cd 100644 --- a/src/declarative/qml/qdeclarativetypenamescriptclass_p.h +++ b/src/declarative/qml/qdeclarativetypenamescriptclass_p.h @@ -46,7 +46,7 @@ // #include "qdeclarativeengine_p.h" -#include +#include "qscriptdeclarativeclass_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativevaluetypescriptclass_p.h b/src/declarative/qml/qdeclarativevaluetypescriptclass_p.h index 803b863f6..6a116a505 100644 --- a/src/declarative/qml/qdeclarativevaluetypescriptclass_p.h +++ b/src/declarative/qml/qdeclarativevaluetypescriptclass_p.h @@ -46,7 +46,7 @@ // -#include +#include "qscriptdeclarativeclass_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativevmemetaobject_p.h b/src/declarative/qml/qdeclarativevmemetaobject_p.h index 1bc939373..801c21615 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject_p.h +++ b/src/declarative/qml/qdeclarativevmemetaobject_p.h @@ -55,7 +55,7 @@ #include #include -#include +#include "qobject_p.h" #include "qdeclarativeguard_p.h" #include "qdeclarativecompiler_p.h" diff --git a/src/declarative/qml/qmetaobjectbuilder_p.h b/src/declarative/qml/qmetaobjectbuilder_p.h index 070c016fb..3e4fa5142 100644 --- a/src/declarative/qml/qmetaobjectbuilder_p.h +++ b/src/declarative/qml/qmetaobjectbuilder_p.h @@ -50,7 +50,7 @@ #include #include -#include +#include "qdeclarativeglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index d259c2ab9..f3fdd6bed 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -50,12 +50,12 @@ #include "qdeclarative.h" #include "qdeclarativeinfo.h" #include "qdeclarativeexpression.h" -#include -#include -#include -#include -#include -#include +#include "qdeclarativestringconverters_p.h" +#include "qdeclarativeglobal_p.h" +#include "qdeclarativemetatype_p.h" +#include "qdeclarativevaluetype_p.h" +#include "qdeclarativeproperty_p.h" +#include "qdeclarativeengine_p.h" #include "qvariant.h" #include "qcolor.h" @@ -68,7 +68,7 @@ #include #include -#include +#include "qvariantanimation_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h index e24419131..8a4292300 100644 --- a/src/declarative/util/qdeclarativeanimation_p_p.h +++ b/src/declarative/util/qdeclarativeanimation_p_p.h @@ -60,8 +60,8 @@ #include #include -#include -#include +#include "qobject_p.h" +#include "qvariantanimation_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativeapplication.cpp b/src/declarative/util/qdeclarativeapplication.cpp index 464fdaaaa..9592ed642 100644 --- a/src/declarative/util/qdeclarativeapplication.cpp +++ b/src/declarative/util/qdeclarativeapplication.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qdeclarativeapplication_p.h" -#include +#include "qobject_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativeapplication_p.h b/src/declarative/util/qdeclarativeapplication_p.h index fdb98120b..001fd679f 100644 --- a/src/declarative/util/qdeclarativeapplication_p.h +++ b/src/declarative/util/qdeclarativeapplication_p.h @@ -36,7 +36,7 @@ #include #include "qdeclarative.h" -#include +#include "qdeclarativeglobal_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp index 8430fe353..40b67f803 100644 --- a/src/declarative/util/qdeclarativebehavior.cpp +++ b/src/declarative/util/qdeclarativebehavior.cpp @@ -46,11 +46,11 @@ #include "qdeclarativecontext.h" #include "qdeclarativeinfo.h" -#include -#include -#include +#include "qdeclarativeproperty_p.h" +#include "qdeclarativeguard_p.h" +#include "qdeclarativeengine_p.h" -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp index 6799c85e2..e052d024b 100644 --- a/src/declarative/util/qdeclarativebind.cpp +++ b/src/declarative/util/qdeclarativebind.cpp @@ -54,7 +54,7 @@ #include #include -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp index 872890423..89c7b13c1 100644 --- a/src/declarative/util/qdeclarativeconnections.cpp +++ b/src/declarative/util/qdeclarativeconnections.cpp @@ -42,16 +42,16 @@ #include "qdeclarativeconnections_p.h" #include "qdeclarativeexpression.h" -#include -#include +#include "qdeclarativeproperty_p.h" +#include "qdeclarativeboundsignal_p.h" #include "qdeclarativecontext.h" -#include +#include "qdeclarativecontext_p.h" #include "qdeclarativeinfo.h" #include #include -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativeconnections_p.h b/src/declarative/util/qdeclarativeconnections_p.h index 9e1c971ef..d319c6a03 100644 --- a/src/declarative/util/qdeclarativeconnections_p.h +++ b/src/declarative/util/qdeclarativeconnections_p.h @@ -36,7 +36,7 @@ #include "qdeclarative.h" #include "qdeclarativescriptstring.h" -#include +#include "qdeclarativecustomparser_p.h" #include #include diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp index c5b71aa8c..3f921cdb4 100644 --- a/src/declarative/util/qdeclarativefontloader.cpp +++ b/src/declarative/util/qdeclarativefontloader.cpp @@ -51,8 +51,8 @@ #include #include -#include -#include +#include "qobject_p.h" +#include "qdeclarativeengine_p.h" #include "qdeclarativeinfo.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativelistaccessor.cpp b/src/declarative/util/qdeclarativelistaccessor.cpp index 3b9adffca..b88035ee6 100644 --- a/src/declarative/util/qdeclarativelistaccessor.cpp +++ b/src/declarative/util/qdeclarativelistaccessor.cpp @@ -40,14 +40,10 @@ ****************************************************************************/ #include "qdeclarativelistaccessor_p.h" - -#include - -#include -#include - -// ### Remove me -#include +#include "qdeclarativemetatype_p.h" +#include "qstringlist.h" +#include "qdebug.h" +#include "qdeclarativeengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index 221fa8fc3..1f07e150f 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -44,9 +44,9 @@ #include "qdeclarativeopenmetaobject_p.h" #include "qdeclarativecommon_p.h" -#include -#include -#include +#include "qdeclarativecustomparser_p.h" +#include "qdeclarativeparser_p.h" +#include "qdeclarativeengine_p.h" #include "qdeclarativecontext.h" #include "qdeclarativeinfo.h" diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/util/qdeclarativelistmodel_p.h index 1b6c44ba5..58a29a600 100644 --- a/src/declarative/util/qdeclarativelistmodel_p.h +++ b/src/declarative/util/qdeclarativelistmodel_p.h @@ -35,14 +35,14 @@ #define QDECLARATIVELISTMODEL_H #include "qdeclarative.h" -#include +#include "qdeclarativecustomparser_p.h" #include #include #include #include #include -#include +#include "qlistmodelinterface_p.h" #include QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h index 7908c6e43..2d14589da 100644 --- a/src/declarative/util/qdeclarativelistmodel_p_p.h +++ b/src/declarative/util/qdeclarativelistmodel_p_p.h @@ -50,7 +50,7 @@ #include "qdeclarativeopenmetaobject_p.h" #include "qdeclarative.h" -#include +#include "qscriptdeclarativeclass_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/util/qdeclarativeopenmetaobject.cpp index e29380f59..efa2d8603 100644 --- a/src/declarative/util/qdeclarativeopenmetaobject.cpp +++ b/src/declarative/util/qdeclarativeopenmetaobject.cpp @@ -42,7 +42,7 @@ #include "qdeclarativeopenmetaobject_p.h" #include "qdeclarativepropertycache_p.h" #include "qdeclarativedata_p.h" -#include +#include "qmetaobjectbuilder_p.h" #include "qdebug.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativeopenmetaobject_p.h b/src/declarative/util/qdeclarativeopenmetaobject_p.h index e08673bee..986ba3132 100644 --- a/src/declarative/util/qdeclarativeopenmetaobject_p.h +++ b/src/declarative/util/qdeclarativeopenmetaobject_p.h @@ -37,9 +37,9 @@ #include #include -#include -#include -#include +#include "qdeclarativerefcount_p.h" +#include "qdeclarativeglobal_p.h" +#include "qobject_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp index 26b7fb33a..fd73eebf3 100644 --- a/src/declarative/util/qdeclarativepackage.cpp +++ b/src/declarative/util/qdeclarativepackage.cpp @@ -41,8 +41,8 @@ #include "qdeclarativepackage_p.h" -#include -#include +#include "qobject_p.h" +#include "qdeclarativeguard_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp index 785114289..89e80dcdf 100644 --- a/src/declarative/util/qdeclarativepixmapcache.cpp +++ b/src/declarative/util/qdeclarativepixmapcache.cpp @@ -44,8 +44,8 @@ #include "qdeclarativeimageprovider.h" #include "qdeclarativeengine.h" -#include -#include +#include "qdeclarativeglobal_p.h" +#include "qdeclarativeengine_p.h" #include #include @@ -58,7 +58,7 @@ #include #include #include -#include +#include "qobject_p.h" #include #define IMAGEREQUEST_MAX_REQUEST_COUNT 8 diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp index 894076b33..1aa1bdd13 100644 --- a/src/declarative/util/qdeclarativepropertychanges.cpp +++ b/src/declarative/util/qdeclarativepropertychanges.cpp @@ -47,19 +47,19 @@ #include "qdeclarativecompiler_p.h" #include "qdeclarativeinfo.h" -#include -#include +#include "qdeclarativecustomparser_p.h" +#include "qdeclarativeparser_p.h" #include "qdeclarativeexpression.h" -#include +#include "qdeclarativebinding_p.h" #include "qdeclarativecontext.h" -#include -#include -#include -#include +#include "qdeclarativeguard_p.h" +#include "qdeclarativeproperty_p.h" +#include "qdeclarativecontext_p.h" +#include "qdeclarativestate_p_p.h" #include -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/declarative/util/qdeclarativepropertychanges_p.h index cc8937f74..7d0c98c19 100644 --- a/src/declarative/util/qdeclarativepropertychanges_p.h +++ b/src/declarative/util/qdeclarativepropertychanges_p.h @@ -35,7 +35,7 @@ #define QDECLARATIVEPROPERTYCHANGES_H #include "qdeclarativestateoperations_p.h" -#include +#include "qdeclarativecustomparser_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativepropertymap.cpp b/src/declarative/util/qdeclarativepropertymap.cpp index 78ddfded7..0b7e85294 100644 --- a/src/declarative/util/qdeclarativepropertymap.cpp +++ b/src/declarative/util/qdeclarativepropertymap.cpp @@ -41,7 +41,7 @@ #include "qdeclarativepropertymap.h" -#include +#include "qmetaobjectbuilder_p.h" #include "qdeclarativeopenmetaobject_p.h" #include diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p_p.h index 5ad6f1b45..a253ddd7a 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h +++ b/src/declarative/util/qdeclarativesmoothedanimation_p_p.h @@ -52,7 +52,7 @@ #include "qparallelanimationgroup.h" -#include +#include "qobject_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/declarative/util/qdeclarativespringanimation.cpp index 6bc743ec5..f297301aa 100644 --- a/src/declarative/util/qdeclarativespringanimation.cpp +++ b/src/declarative/util/qdeclarativespringanimation.cpp @@ -42,11 +42,11 @@ #include "qdeclarativespringanimation_p.h" #include "qdeclarativeanimation_p_p.h" -#include +#include "qdeclarativeproperty_p.h" #include -#include +#include "qobject_p.h" #include #include diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index adba0ddd7..09a232444 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -49,8 +49,8 @@ #include "qdeclarativeanimation_p_p.h" #include "qdeclarativecommon_p.h" -#include -#include +#include "qdeclarativebinding_p.h" +#include "qdeclarativeglobal_p.h" #include diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h index fa330ae93..a8f1c5a1d 100644 --- a/src/declarative/util/qdeclarativestate_p.h +++ b/src/declarative/util/qdeclarativestate_p.h @@ -38,7 +38,7 @@ #include "qdeclarativeproperty.h" #include #include -#include +#include "qdeclarativeglobal_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h index 883edc44d..05a9cd697 100644 --- a/src/declarative/util/qdeclarativestate_p_p.h +++ b/src/declarative/util/qdeclarativestate_p_p.h @@ -50,12 +50,12 @@ #include "qdeclarativeanimation_p_p.h" #include "qdeclarativetransitionmanager_p_p.h" -#include -#include +#include "qdeclarativeproperty_p.h" +#include "qdeclarativeguard_p.h" -#include +#include "qdeclarativebinding_p.h" -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 641ed0567..674793a93 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -45,10 +45,10 @@ #include "qdeclarativecontext.h" #include "qdeclarativeexpression.h" #include "qdeclarativeinfo.h" -#include -#include -#include -#include +#include "qdeclarativeanchors_p_p.h" +#include "qdeclarativeitem_p.h" +#include "qdeclarativeguard_p.h" +#include "qdeclarativenullablevalue_p_p.h" #include "qdeclarativecontext_p.h" #include "qdeclarativeproperty_p.h" #include "qdeclarativebinding_p.h" @@ -65,7 +65,7 @@ #endif #include -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h index 08297ed53..45b300292 100644 --- a/src/declarative/util/qdeclarativestateoperations_p.h +++ b/src/declarative/util/qdeclarativestateoperations_p.h @@ -37,7 +37,7 @@ #include "qdeclarativestate_p.h" #include "qdeclarativeitem.h" -#include +#include "qdeclarativeanchors_p.h" #include "qdeclarativescriptstring.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/declarative/util/qdeclarativesystempalette.cpp index 80d5d33d0..f8f5b69eb 100644 --- a/src/declarative/util/qdeclarativesystempalette.cpp +++ b/src/declarative/util/qdeclarativesystempalette.cpp @@ -43,7 +43,7 @@ #include -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp index e7f45a74d..0d29cd451 100644 --- a/src/declarative/util/qdeclarativetimer.cpp +++ b/src/declarative/util/qdeclarativetimer.cpp @@ -45,7 +45,7 @@ #include #include "qdebug.h" -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativetimer_p.h b/src/declarative/util/qdeclarativetimer_p.h index f173c37c8..18ae1a02a 100644 --- a/src/declarative/util/qdeclarativetimer_p.h +++ b/src/declarative/util/qdeclarativetimer_p.h @@ -39,7 +39,7 @@ #include #include -#include +#include "qdeclarativeglobal_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp index c68eaf9a8..9798a69ff 100644 --- a/src/declarative/util/qdeclarativeview.cpp +++ b/src/declarative/util/qdeclarativeview.cpp @@ -45,8 +45,8 @@ #include "qdeclarativeitem.h" #include "qdeclarativeengine.h" #include "qdeclarativecontext.h" -#include -#include +#include "qdeclarativeglobal_p.h" +#include "qdeclarativeguard_p.h" #include "qscriptvalueiterator.h" #include "qdebug.h" @@ -62,10 +62,10 @@ #include "qgraphicswidget.h" #include "qbasictimer.h" #include "qabstractanimation.h" -#include -#include -#include -#include +#include "qgraphicsview_p.h" +#include "qdeclarativeitem_p.h" +#include "qabstractanimation_p.h" +#include "qdeclarativeitemchangelistener_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qlistmodelinterface_p.h b/src/declarative/util/qlistmodelinterface_p.h index c39120fb1..f4b19ee3d 100644 --- a/src/declarative/util/qlistmodelinterface_p.h +++ b/src/declarative/util/qlistmodelinterface_p.h @@ -37,7 +37,7 @@ #include #include -#include +#include "qdeclarativeglobal_p.h" QT_BEGIN_HEADER diff --git a/src/designer/components/buddyeditor/buddyeditor.cpp b/src/designer/components/buddyeditor/buddyeditor.cpp index eac23d3f7..5f1a61f47 100644 --- a/src/designer/components/buddyeditor/buddyeditor.cpp +++ b/src/designer/components/buddyeditor/buddyeditor.cpp @@ -46,10 +46,10 @@ #include #include -#include -#include -#include -#include +#include "qdesigner_command_p.h" +#include "qdesigner_propertycommand_p.h" +#include "qdesigner_utils_p.h" +#include "qlayout_widget_p.h" #include #include diff --git a/src/designer/components/formeditor/formeditor.cpp b/src/designer/components/formeditor/formeditor.cpp index 129662cd2..5b8918a47 100644 --- a/src/designer/components/formeditor/formeditor.cpp +++ b/src/designer/components/formeditor/formeditor.cpp @@ -73,12 +73,12 @@ // shared #include -#include -#include -#include +#include "qdesigner_taskmenu_p.h" +#include "qdesigner_membersheet_p.h" +#include "qdesigner_promotion_p.h" #include -#include -#include +#include "qdesigner_introspection_p.h" +#include "qdesigner_qsettings_p.h" QT_BEGIN_NAMESPACE diff --git a/src/designer/components/formeditor/formwindow.cpp b/src/designer/components/formeditor/formwindow.cpp index a9fbad5e8..e0ee09677 100644 --- a/src/designer/components/formeditor/formwindow.cpp +++ b/src/designer/components/formeditor/formwindow.cpp @@ -52,21 +52,21 @@ // shared #include -#include -#include -#include +#include "qdesigner_tabwidget_p.h" +#include "qdesigner_toolbox_p.h" +#include "qdesigner_stackedbox_p.h" #include "qdesigner_resource.h" -#include -#include -#include -#include -#include -#include -#include +#include "qdesigner_command_p.h" +#include "qdesigner_command2_p.h" +#include "qdesigner_propertycommand_p.h" +#include "qdesigner_taskmenu_p.h" +#include "qdesigner_widget_p.h" +#include "qdesigner_utils_p.h" +#include "qlayout_widget_p.h" #include #include #include -#include +#include "qdesigner_objectinspector_p.h" #include #include #include diff --git a/src/designer/components/formeditor/formwindow_dnditem.cpp b/src/designer/components/formeditor/formwindow_dnditem.cpp index f8eeff354..b38124eac 100644 --- a/src/designer/components/formeditor/formwindow_dnditem.cpp +++ b/src/designer/components/formeditor/formwindow_dnditem.cpp @@ -44,7 +44,7 @@ #include #include "qdesigner_resource.h" -#include +#include "qtresourcemodel_p.h" #include diff --git a/src/designer/components/formeditor/formwindow_dnditem.h b/src/designer/components/formeditor/formwindow_dnditem.h index 3e7a7505a..5cea75b0b 100644 --- a/src/designer/components/formeditor/formwindow_dnditem.h +++ b/src/designer/components/formeditor/formwindow_dnditem.h @@ -34,7 +34,7 @@ #ifndef FORMWINDOW_DNDITEM_H #define FORMWINDOW_DNDITEM_H -#include +#include "qdesigner_dnditem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/designer/components/formeditor/formwindowcursor.cpp b/src/designer/components/formeditor/formwindowcursor.cpp index 233d69717..817241e2b 100644 --- a/src/designer/components/formeditor/formwindowcursor.cpp +++ b/src/designer/components/formeditor/formwindowcursor.cpp @@ -45,7 +45,7 @@ // sdk #include #include -#include +#include "qdesigner_propertycommand_p.h" #include diff --git a/src/designer/components/formeditor/formwindowmanager.cpp b/src/designer/components/formeditor/formwindowmanager.cpp index 9c8059132..b28fb504e 100644 --- a/src/designer/components/formeditor/formwindowmanager.cpp +++ b/src/designer/components/formeditor/formwindowmanager.cpp @@ -52,13 +52,13 @@ #include #include #include -#include -#include -#include -#include +#include "qtresourcemodel_p.h" +#include "qdesigner_dnditem_p.h" +#include "qdesigner_command_p.h" +#include "qdesigner_command2_p.h" #include -#include -#include +#include "qlayout_widget_p.h" +#include "qdesigner_objectinspector_p.h" #include #include #include diff --git a/src/designer/components/formeditor/itemview_propertysheet.h b/src/designer/components/formeditor/itemview_propertysheet.h index 9ff2ded9b..ad629a1ce 100644 --- a/src/designer/components/formeditor/itemview_propertysheet.h +++ b/src/designer/components/formeditor/itemview_propertysheet.h @@ -34,7 +34,7 @@ #ifndef ITEMVIEW_PROPERTYSHEET_H #define ITEMVIEW_PROPERTYSHEET_H -#include +#include "qdesigner_propertysheet_p.h" #include #include diff --git a/src/designer/components/formeditor/layout_propertysheet.cpp b/src/designer/components/formeditor/layout_propertysheet.cpp index d29a9d794..45201bdc5 100644 --- a/src/designer/components/formeditor/layout_propertysheet.cpp +++ b/src/designer/components/formeditor/layout_propertysheet.cpp @@ -47,7 +47,7 @@ // shared #include -#include +#include "qlayout_widget_p.h" #include #include diff --git a/src/designer/components/formeditor/layout_propertysheet.h b/src/designer/components/formeditor/layout_propertysheet.h index 42060e420..8d240c47b 100644 --- a/src/designer/components/formeditor/layout_propertysheet.h +++ b/src/designer/components/formeditor/layout_propertysheet.h @@ -34,7 +34,7 @@ #ifndef LAYOUT_PROPERTYSHEET_H #define LAYOUT_PROPERTYSHEET_H -#include +#include "qdesigner_propertysheet_p.h" #include #include diff --git a/src/designer/components/formeditor/line_propertysheet.h b/src/designer/components/formeditor/line_propertysheet.h index 90a337ea6..d5ecb1684 100644 --- a/src/designer/components/formeditor/line_propertysheet.h +++ b/src/designer/components/formeditor/line_propertysheet.h @@ -34,8 +34,8 @@ #ifndef LINE_PROPERTYSHEET_H #define LINE_PROPERTYSHEET_H -#include -#include +#include "qdesigner_propertysheet_p.h" +#include "qdesigner_widget_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/designer/components/formeditor/qdesigner_resource.cpp b/src/designer/components/formeditor/qdesigner_resource.cpp index 8e9ddc97b..d674835d9 100644 --- a/src/designer/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/components/formeditor/qdesigner_resource.cpp @@ -60,7 +60,7 @@ #include #include #include -#include +#include "qdesigner_widgetitem_p.h" // shared #include @@ -73,8 +73,8 @@ #include #include -#include -#include +#include "qlayout_widget_p.h" +#include "qdesigner_utils_p.h" #include // sdk @@ -107,7 +107,7 @@ #include #include #include -#include +#include "qlayoutengine_p.h" #include #include diff --git a/src/designer/components/formeditor/qlayoutwidget_propertysheet.h b/src/designer/components/formeditor/qlayoutwidget_propertysheet.h index 7edc92e7a..29ef7d0c5 100644 --- a/src/designer/components/formeditor/qlayoutwidget_propertysheet.h +++ b/src/designer/components/formeditor/qlayoutwidget_propertysheet.h @@ -34,9 +34,9 @@ #ifndef QLAYOUTWIDGET_PROPERTYSHEET_H #define QLAYOUTWIDGET_PROPERTYSHEET_H -#include +#include "qdesigner_propertysheet_p.h" #include -#include +#include "qlayout_widget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/designer/components/formeditor/qmdiarea_container.h b/src/designer/components/formeditor/qmdiarea_container.h index 758913734..3dc21d9f7 100644 --- a/src/designer/components/formeditor/qmdiarea_container.h +++ b/src/designer/components/formeditor/qmdiarea_container.h @@ -37,7 +37,7 @@ #include -#include +#include "qdesigner_propertysheet_p.h" #include #include diff --git a/src/designer/components/formeditor/qwizard_container.h b/src/designer/components/formeditor/qwizard_container.h index eeb37c73a..00d809c40 100644 --- a/src/designer/components/formeditor/qwizard_container.h +++ b/src/designer/components/formeditor/qwizard_container.h @@ -36,7 +36,7 @@ #include -#include +#include "qdesigner_propertysheet_p.h" #include #include diff --git a/src/designer/components/formeditor/spacer_propertysheet.h b/src/designer/components/formeditor/spacer_propertysheet.h index 311399294..70dc003eb 100644 --- a/src/designer/components/formeditor/spacer_propertysheet.h +++ b/src/designer/components/formeditor/spacer_propertysheet.h @@ -34,7 +34,7 @@ #ifndef SPACER_PROPERTYSHEET_H #define SPACER_PROPERTYSHEET_H -#include +#include "qdesigner_propertysheet_p.h" #include #include diff --git a/src/designer/components/formeditor/tool_widgeteditor.cpp b/src/designer/components/formeditor/tool_widgeteditor.cpp index 67834b112..6eccd8e38 100644 --- a/src/designer/components/formeditor/tool_widgeteditor.cpp +++ b/src/designer/components/formeditor/tool_widgeteditor.cpp @@ -48,7 +48,7 @@ #include #include -#include +#include "qdesigner_dnditem_p.h" #include "qdesigner_resource.h" #include diff --git a/src/designer/components/formeditor/widgetselection.cpp b/src/designer/components/formeditor/widgetselection.cpp index 559dbfef6..ac939bef3 100644 --- a/src/designer/components/formeditor/widgetselection.cpp +++ b/src/designer/components/formeditor/widgetselection.cpp @@ -48,8 +48,8 @@ #include // shared -#include -#include +#include "qdesigner_command_p.h" +#include "qdesigner_propertycommand_p.h" #include #include #include diff --git a/src/designer/components/objectinspector/objectinspector.cpp b/src/designer/components/objectinspector/objectinspector.cpp index 10c8bd0bf..8dacc47e6 100644 --- a/src/designer/components/objectinspector/objectinspector.cpp +++ b/src/designer/components/objectinspector/objectinspector.cpp @@ -54,12 +54,12 @@ #include // shared -#include +#include "qdesigner_utils_p.h" #include #include -#include +#include "qdesigner_dnditem_p.h" #include -#include +#include "qdesigner_command_p.h" #include // Qt diff --git a/src/designer/components/objectinspector/objectinspectormodel.cpp b/src/designer/components/objectinspector/objectinspectormodel.cpp index 3a41ca13a..2c264dc59 100644 --- a/src/designer/components/objectinspector/objectinspectormodel.cpp +++ b/src/designer/components/objectinspector/objectinspectormodel.cpp @@ -41,10 +41,10 @@ #include "objectinspectormodel_p.h" -#include +#include "qlayout_widget_p.h" #include -#include -#include +#include "qdesigner_propertycommand_p.h" +#include "qdesigner_utils_p.h" #include #include diff --git a/src/designer/components/propertyeditor/designerpropertymanager.h b/src/designer/components/propertyeditor/designerpropertymanager.h index 67d15d15b..0aa5abe27 100644 --- a/src/designer/components/propertyeditor/designerpropertymanager.h +++ b/src/designer/components/propertyeditor/designerpropertymanager.h @@ -38,7 +38,7 @@ #include "brushpropertymanager.h" #include "fontpropertymanager.h" -#include +#include "qdesigner_utils_p.h" #include #include diff --git a/src/designer/components/propertyeditor/fontpropertymanager.cpp b/src/designer/components/propertyeditor/fontpropertymanager.cpp index 9c0916840..4bc99a073 100644 --- a/src/designer/components/propertyeditor/fontpropertymanager.cpp +++ b/src/designer/components/propertyeditor/fontpropertymanager.cpp @@ -44,7 +44,7 @@ #include "qtvariantproperty.h" #include "qtpropertybrowserutils_p.h" -#include +#include "qdesigner_utils_p.h" #include #include diff --git a/src/designer/components/propertyeditor/newdynamicpropertydialog.cpp b/src/designer/components/propertyeditor/newdynamicpropertydialog.cpp index f0ac35465..5d314dbed 100644 --- a/src/designer/components/propertyeditor/newdynamicpropertydialog.cpp +++ b/src/designer/components/propertyeditor/newdynamicpropertydialog.cpp @@ -42,7 +42,7 @@ #include "newdynamicpropertydialog.h" #include "ui_newdynamicpropertydialog.h" #include -#include +#include "qdesigner_propertysheet_p.h" #include diff --git a/src/designer/components/propertyeditor/propertyeditor.cpp b/src/designer/components/propertyeditor/propertyeditor.cpp index ac9a1ff56..191840cd9 100644 --- a/src/designer/components/propertyeditor/propertyeditor.cpp +++ b/src/designer/components/propertyeditor/propertyeditor.cpp @@ -61,8 +61,8 @@ #include #include // shared -#include -#include +#include "qdesigner_utils_p.h" +#include "qdesigner_propertycommand_p.h" #include #include #ifdef Q_OS_WIN diff --git a/src/designer/components/propertyeditor/propertyeditor.h b/src/designer/components/propertyeditor/propertyeditor.h index 60f36b158..0d693dc34 100644 --- a/src/designer/components/propertyeditor/propertyeditor.h +++ b/src/designer/components/propertyeditor/propertyeditor.h @@ -35,7 +35,7 @@ #define PROPERTYEDITOR_H #include "propertyeditor_global.h" -#include +#include "qdesigner_propertyeditor_p.h" #include #include diff --git a/src/designer/components/qdesigner_components.cpp b/src/designer/components/qdesigner_components.cpp index 4a179dfdf..90868f760 100644 --- a/src/designer/components/qdesigner_components.cpp +++ b/src/designer/components/qdesigner_components.cpp @@ -51,7 +51,7 @@ #include #include #include "qtresourceview_p.h" -#include +#include "qdesigner_integration_p.h" #include #include diff --git a/src/designer/components/signalsloteditor/signalslot_utils.cpp b/src/designer/components/signalsloteditor/signalslot_utils.cpp index b827683db..20b4d73e5 100644 --- a/src/designer/components/signalsloteditor/signalslot_utils.cpp +++ b/src/designer/components/signalsloteditor/signalslot_utils.cpp @@ -41,7 +41,7 @@ #include "signalslot_utils_p.h" -#include +#include "qdesigner_membersheet_p.h" #include #include diff --git a/src/designer/components/signalsloteditor/signalsloteditor.cpp b/src/designer/components/signalsloteditor/signalsloteditor.cpp index 3d683b817..ccd796e9f 100644 --- a/src/designer/components/signalsloteditor/signalsloteditor.cpp +++ b/src/designer/components/signalsloteditor/signalsloteditor.cpp @@ -46,7 +46,7 @@ #include #include -#include +#include "qdesigner_formwindowcommand_p.h" #include #include diff --git a/src/designer/components/signalsloteditor/signalsloteditorwindow.cpp b/src/designer/components/signalsloteditor/signalsloteditorwindow.cpp index 465d0c38c..2a1ec7805 100644 --- a/src/designer/components/signalsloteditor/signalsloteditorwindow.cpp +++ b/src/designer/components/signalsloteditor/signalsloteditorwindow.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include "qlayout_widget_p.h" #include #include diff --git a/src/designer/components/tabordereditor/tabordereditor.cpp b/src/designer/components/tabordereditor/tabordereditor.cpp index 2643ff669..77faf539b 100644 --- a/src/designer/components/tabordereditor/tabordereditor.cpp +++ b/src/designer/components/tabordereditor/tabordereditor.cpp @@ -42,9 +42,9 @@ #include "tabordereditor.h" #include -#include -#include -#include +#include "qdesigner_command_p.h" +#include "qdesigner_utils_p.h" +#include "qlayout_widget_p.h" #include #include "qdesignercommon_p.h" diff --git a/src/designer/components/taskmenu/button_taskmenu.cpp b/src/designer/components/taskmenu/button_taskmenu.cpp index f91def67c..580577c56 100644 --- a/src/designer/components/taskmenu/button_taskmenu.cpp +++ b/src/designer/components/taskmenu/button_taskmenu.cpp @@ -41,7 +41,7 @@ #include "button_taskmenu.h" #include "inplace_editor.h" -#include +#include "qdesigner_formwindowcommand_p.h" #include #include diff --git a/src/designer/components/taskmenu/button_taskmenu.h b/src/designer/components/taskmenu/button_taskmenu.h index 6c2f2335e..08525468a 100644 --- a/src/designer/components/taskmenu/button_taskmenu.h +++ b/src/designer/components/taskmenu/button_taskmenu.h @@ -38,7 +38,7 @@ #include #include -#include +#include "qdesigner_taskmenu_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/designer/components/taskmenu/combobox_taskmenu.cpp b/src/designer/components/taskmenu/combobox_taskmenu.cpp index 8033e2437..b6b32d6fb 100644 --- a/src/designer/components/taskmenu/combobox_taskmenu.cpp +++ b/src/designer/components/taskmenu/combobox_taskmenu.cpp @@ -42,7 +42,7 @@ #include "combobox_taskmenu.h" #include "listwidgeteditor.h" #include "qdesigner_utils_p.h" -#include +#include "qdesigner_command_p.h" #include diff --git a/src/designer/components/taskmenu/combobox_taskmenu.h b/src/designer/components/taskmenu/combobox_taskmenu.h index 489567a96..e70a5fbc3 100644 --- a/src/designer/components/taskmenu/combobox_taskmenu.h +++ b/src/designer/components/taskmenu/combobox_taskmenu.h @@ -37,7 +37,7 @@ #include #include -#include +#include "qdesigner_taskmenu_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/designer/components/taskmenu/containerwidget_taskmenu.cpp b/src/designer/components/taskmenu/containerwidget_taskmenu.cpp index 1c76173d7..b778580b6 100644 --- a/src/designer/components/taskmenu/containerwidget_taskmenu.cpp +++ b/src/designer/components/taskmenu/containerwidget_taskmenu.cpp @@ -46,8 +46,8 @@ #include #include -#include -#include +#include "qdesigner_command_p.h" +#include "qdesigner_dockwidget_p.h" #include #include diff --git a/src/designer/components/taskmenu/containerwidget_taskmenu.h b/src/designer/components/taskmenu/containerwidget_taskmenu.h index 8878cbed1..c46bbd6f0 100644 --- a/src/designer/components/taskmenu/containerwidget_taskmenu.h +++ b/src/designer/components/taskmenu/containerwidget_taskmenu.h @@ -34,7 +34,7 @@ #ifndef CONTAINERWIDGER_TASKMENU_H #define CONTAINERWIDGER_TASKMENU_H -#include +#include "qdesigner_taskmenu_p.h" #include #include diff --git a/src/designer/components/taskmenu/groupbox_taskmenu.h b/src/designer/components/taskmenu/groupbox_taskmenu.h index d84fa5c26..341ea334e 100644 --- a/src/designer/components/taskmenu/groupbox_taskmenu.h +++ b/src/designer/components/taskmenu/groupbox_taskmenu.h @@ -37,7 +37,7 @@ #include #include -#include +#include "qdesigner_taskmenu_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/designer/components/taskmenu/inplace_editor.h b/src/designer/components/taskmenu/inplace_editor.h index 7996dc714..0f8e04063 100644 --- a/src/designer/components/taskmenu/inplace_editor.h +++ b/src/designer/components/taskmenu/inplace_editor.h @@ -38,7 +38,7 @@ #include #include "inplace_widget_helper.h" -#include +#include "qdesigner_utils_p.h" #include diff --git a/src/designer/components/taskmenu/label_taskmenu.h b/src/designer/components/taskmenu/label_taskmenu.h index 4956cff80..4b63a81aa 100644 --- a/src/designer/components/taskmenu/label_taskmenu.h +++ b/src/designer/components/taskmenu/label_taskmenu.h @@ -37,7 +37,7 @@ #include #include -#include +#include "qdesigner_taskmenu_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/designer/components/taskmenu/layouttaskmenu.h b/src/designer/components/taskmenu/layouttaskmenu.h index 304bb8524..16950e1eb 100644 --- a/src/designer/components/taskmenu/layouttaskmenu.h +++ b/src/designer/components/taskmenu/layouttaskmenu.h @@ -36,7 +36,7 @@ #include -#include +#include "qlayout_widget_p.h" #include #include diff --git a/src/designer/components/taskmenu/lineedit_taskmenu.h b/src/designer/components/taskmenu/lineedit_taskmenu.h index 5feacf287..1f89f8e8c 100644 --- a/src/designer/components/taskmenu/lineedit_taskmenu.h +++ b/src/designer/components/taskmenu/lineedit_taskmenu.h @@ -37,7 +37,7 @@ #include #include -#include +#include "qdesigner_taskmenu_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/designer/components/taskmenu/listwidget_taskmenu.cpp b/src/designer/components/taskmenu/listwidget_taskmenu.cpp index 0f35af269..de2b9dff4 100644 --- a/src/designer/components/taskmenu/listwidget_taskmenu.cpp +++ b/src/designer/components/taskmenu/listwidget_taskmenu.cpp @@ -42,7 +42,7 @@ #include "listwidget_taskmenu.h" #include "listwidgeteditor.h" #include "qdesigner_utils_p.h" -#include +#include "qdesigner_command_p.h" #include diff --git a/src/designer/components/taskmenu/listwidget_taskmenu.h b/src/designer/components/taskmenu/listwidget_taskmenu.h index 9e350d61c..14cc33d99 100644 --- a/src/designer/components/taskmenu/listwidget_taskmenu.h +++ b/src/designer/components/taskmenu/listwidget_taskmenu.h @@ -37,7 +37,7 @@ #include #include -#include +#include "qdesigner_taskmenu_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/designer/components/taskmenu/listwidgeteditor.h b/src/designer/components/taskmenu/listwidgeteditor.h index 6aa1a0312..4484e228f 100644 --- a/src/designer/components/taskmenu/listwidgeteditor.h +++ b/src/designer/components/taskmenu/listwidgeteditor.h @@ -35,7 +35,7 @@ #define LISTWIDGETEDITOR_H #include "itemlisteditor.h" -#include +#include "qdesigner_command_p.h" #include diff --git a/src/designer/components/taskmenu/menutaskmenu.h b/src/designer/components/taskmenu/menutaskmenu.h index 6c5cd6952..4da2d9429 100644 --- a/src/designer/components/taskmenu/menutaskmenu.h +++ b/src/designer/components/taskmenu/menutaskmenu.h @@ -36,8 +36,8 @@ #include -#include -#include +#include "qdesigner_menu_p.h" +#include "qdesigner_menubar_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/designer/components/taskmenu/tablewidget_taskmenu.h b/src/designer/components/taskmenu/tablewidget_taskmenu.h index 45fb64c4d..3f102e050 100644 --- a/src/designer/components/taskmenu/tablewidget_taskmenu.h +++ b/src/designer/components/taskmenu/tablewidget_taskmenu.h @@ -34,7 +34,7 @@ #ifndef TABLEWIDGET_TASKMENU_H #define TABLEWIDGET_TASKMENU_H -#include +#include "qdesigner_taskmenu_p.h" #include #include diff --git a/src/designer/components/taskmenu/tablewidgeteditor.cpp b/src/designer/components/taskmenu/tablewidgeteditor.cpp index 420a7d1ed..b39a6c8a0 100644 --- a/src/designer/components/taskmenu/tablewidgeteditor.cpp +++ b/src/designer/components/taskmenu/tablewidgeteditor.cpp @@ -42,7 +42,7 @@ #include "tablewidgeteditor.h" #include #include -#include +#include "qdesigner_command_p.h" #include "formwindowbase_p.h" #include "qdesigner_utils_p.h" #include diff --git a/src/designer/components/taskmenu/textedit_taskmenu.h b/src/designer/components/taskmenu/textedit_taskmenu.h index 5b8cb0bdf..65a673fbe 100644 --- a/src/designer/components/taskmenu/textedit_taskmenu.h +++ b/src/designer/components/taskmenu/textedit_taskmenu.h @@ -37,7 +37,7 @@ #include #include -#include +#include "qdesigner_taskmenu_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/designer/components/taskmenu/toolbar_taskmenu.cpp b/src/designer/components/taskmenu/toolbar_taskmenu.cpp index edfac4266..ee94cbb11 100644 --- a/src/designer/components/taskmenu/toolbar_taskmenu.cpp +++ b/src/designer/components/taskmenu/toolbar_taskmenu.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include "qdesigner_command_p.h" #include #include diff --git a/src/designer/components/taskmenu/treewidget_taskmenu.h b/src/designer/components/taskmenu/treewidget_taskmenu.h index 45f2b1ad8..f26775a2e 100644 --- a/src/designer/components/taskmenu/treewidget_taskmenu.h +++ b/src/designer/components/taskmenu/treewidget_taskmenu.h @@ -37,7 +37,7 @@ #include #include -#include +#include "qdesigner_taskmenu_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/designer/components/taskmenu/treewidgeteditor.cpp b/src/designer/components/taskmenu/treewidgeteditor.cpp index 53309bcf5..a5b0612ca 100644 --- a/src/designer/components/taskmenu/treewidgeteditor.cpp +++ b/src/designer/components/taskmenu/treewidgeteditor.cpp @@ -42,8 +42,8 @@ #include "treewidgeteditor.h" #include #include -#include -#include +#include "qdesigner_command_p.h" +#include "qdesigner_utils_p.h" #include #include #include diff --git a/src/designer/components/widgetbox/widgetbox.cpp b/src/designer/components/widgetbox/widgetbox.cpp index c5b55d3ae..0fcbefbfe 100644 --- a/src/designer/components/widgetbox/widgetbox.cpp +++ b/src/designer/components/widgetbox/widgetbox.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include "qdesigner_utils_p.h" #include #include diff --git a/src/designer/components/widgetbox/widgetbox.h b/src/designer/components/widgetbox/widgetbox.h index 6b4cfe9cb..0056e16e0 100644 --- a/src/designer/components/widgetbox/widgetbox.h +++ b/src/designer/components/widgetbox/widgetbox.h @@ -35,7 +35,7 @@ #define WIDGETBOX_H #include "widgetbox_global.h" -#include +#include "qdesigner_widgetbox_p.h" QT_BEGIN_NAMESPACE diff --git a/src/designer/components/widgetbox/widgetbox_dnditem.cpp b/src/designer/components/widgetbox/widgetbox_dnditem.cpp index b5a93b305..f8ae2bce3 100644 --- a/src/designer/components/widgetbox/widgetbox_dnditem.cpp +++ b/src/designer/components/widgetbox/widgetbox_dnditem.cpp @@ -44,13 +44,13 @@ #include #include -#include -#include +#include "qdesigner_formbuilder_p.h" +#include "qtresourcemodel_p.h" #include #include -#include -#include -#include +#include "qdesigner_utils_p.h" +#include "qdesigner_dockwidget_p.h" +#include "qsimpleresource_p.h" #include #include diff --git a/src/designer/components/widgetbox/widgetbox_dnditem.h b/src/designer/components/widgetbox/widgetbox_dnditem.h index 40bf6b8d3..1be6b7d12 100644 --- a/src/designer/components/widgetbox/widgetbox_dnditem.h +++ b/src/designer/components/widgetbox/widgetbox_dnditem.h @@ -34,7 +34,7 @@ #ifndef WIDGETBOX_DNDITEM_H #define WIDGETBOX_DNDITEM_H -#include +#include "qdesigner_dnditem_p.h" #include "widgetbox_global.h" QT_BEGIN_NAMESPACE diff --git a/src/designer/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/components/widgetbox/widgetboxtreewidget.cpp index 8c9077bdb..f455836de 100644 --- a/src/designer/components/widgetbox/widgetboxtreewidget.cpp +++ b/src/designer/components/widgetbox/widgetboxtreewidget.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include "qdesigner_utils_p.h" #include // sdk diff --git a/src/designer/components/widgetbox/widgetboxtreewidget.h b/src/designer/components/widgetbox/widgetboxtreewidget.h index 5e81a5d34..4d6efa2a9 100644 --- a/src/designer/components/widgetbox/widgetboxtreewidget.h +++ b/src/designer/components/widgetbox/widgetboxtreewidget.h @@ -34,7 +34,7 @@ #ifndef WIDGETBOXTREEWIDGET_H #define WIDGETBOXTREEWIDGET_H -#include +#include "qdesigner_widgetbox_p.h" #include #include diff --git a/src/designer/sdk/abstractformeditor.cpp b/src/designer/sdk/abstractformeditor.cpp index e00b523a0..1d59084b4 100644 --- a/src/designer/sdk/abstractformeditor.cpp +++ b/src/designer/sdk/abstractformeditor.cpp @@ -58,7 +58,7 @@ #include #include #include -#include +#include "qtresourcemodel_p.h" #include #include #include diff --git a/src/designer/shared/deviceprofile.cpp b/src/designer/shared/deviceprofile.cpp index 96c5c0ace..3a28f486f 100644 --- a/src/designer/shared/deviceprofile.cpp +++ b/src/designer/shared/deviceprofile.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include "qdesigner_utils_p.h" #include #include diff --git a/src/designer/shared/iconselector.cpp b/src/designer/shared/iconselector.cpp index dd396b971..16d475edc 100644 --- a/src/designer/shared/iconselector.cpp +++ b/src/designer/shared/iconselector.cpp @@ -48,7 +48,7 @@ #include "formwindowbase_p.h" #include -#include +#include "qdesigner_integration_p.h" #include #include #include diff --git a/src/designer/shared/qdesigner_formbuilder.cpp b/src/designer/shared/qdesigner_formbuilder.cpp index dc2e2510d..1d365a511 100644 --- a/src/designer/shared/qdesigner_formbuilder.cpp +++ b/src/designer/shared/qdesigner_formbuilder.cpp @@ -59,10 +59,10 @@ #include // shared -#include -#include +#include "qdesigner_propertysheet_p.h" +#include "qdesigner_utils_p.h" #include -#include +#include "qtresourcemodel_p.h" #include #include diff --git a/src/designer/shared/qdesigner_widgetitem.cpp b/src/designer/shared/qdesigner_widgetitem.cpp index 0f40b7b63..88f43494c 100644 --- a/src/designer/shared/qdesigner_widgetitem.cpp +++ b/src/designer/shared/qdesigner_widgetitem.cpp @@ -57,7 +57,7 @@ #include #include -#include +#include "qlayout_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/accessible/qaccessiblewidget.cpp b/src/gui/accessible/qaccessiblewidget.cpp index 21d1cc725..2b9643d68 100644 --- a/src/gui/accessible/qaccessiblewidget.cpp +++ b/src/gui/accessible/qaccessiblewidget.cpp @@ -280,7 +280,7 @@ QRect QAccessibleWidget::rect(int child) const } QT_BEGIN_INCLUDE_NAMESPACE -#include +#include "qobject_p.h" QT_END_INCLUDE_NAMESPACE class QACConnectionObject : public QObject diff --git a/src/gui/animation/qabstractanimation_p.h b/src/gui/animation/qabstractanimation_p.h index 6d7d69af1..1ef730954 100644 --- a/src/gui/animation/qabstractanimation_p.h +++ b/src/gui/animation/qabstractanimation_p.h @@ -49,7 +49,7 @@ #include #include #include -#include +#include "qobject_p.h" #include "qabstractanimation.h" #ifndef QT_NO_ANIMATION diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp index 6b196b33b..045b255c4 100644 --- a/src/gui/animation/qguivariantanimation.cpp +++ b/src/gui/animation/qguivariantanimation.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ #include "qvariantanimation.h" -#include +#include "qvariantanimation_p.h" #ifndef QT_NO_ANIMATION diff --git a/src/gui/animation/qpropertyanimation.cpp b/src/gui/animation/qpropertyanimation.cpp index e6e098b9f..330ac3cea 100644 --- a/src/gui/animation/qpropertyanimation.cpp +++ b/src/gui/animation/qpropertyanimation.cpp @@ -92,7 +92,7 @@ #include "qanimationgroup.h" #include "qpropertyanimation_p.h" -#include +#include "qmutexpool_p.h" #ifndef QT_NO_ANIMATION diff --git a/src/gui/animation/qvariantanimation.cpp b/src/gui/animation/qvariantanimation.cpp index b2898263e..986fd07bb 100644 --- a/src/gui/animation/qvariantanimation.cpp +++ b/src/gui/animation/qvariantanimation.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include "qmutexpool_p.h" #ifndef QT_NO_ANIMATION diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index 2ea0437cd..f5f7946c6 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qvariant.h" -#include +#include "qwidgetitemdata_p.h" #include "qfiledialog.h" #ifndef QT_NO_FILEDIALOG @@ -57,7 +57,7 @@ #include "qdebug.h" #include "qapplication.h" #include "qstylepainter.h" -#include +#include "qfileiconprovider_p.h" #include "ui_qfiledialog.h" #include diff --git a/src/gui/dialogs/qfilesystemmodel_p.h b/src/gui/dialogs/qfilesystemmodel_p.h index ddc728bb5..df39f1386 100644 --- a/src/gui/dialogs/qfilesystemmodel_p.h +++ b/src/gui/dialogs/qfilesystemmodel_p.h @@ -49,7 +49,7 @@ #ifndef QT_NO_FILESYSTEMMODEL -#include +#include "qabstractitemmodel_p.h" #include "qabstractitemmodel.h" #include "qfileinfogatherer_p.h" #include "qpair.h" diff --git a/src/gui/dialogs/qfontdialog.cpp b/src/gui/dialogs/qfontdialog.cpp index b082d79f6..d41755faf 100644 --- a/src/gui/dialogs/qfontdialog.cpp +++ b/src/gui/dialogs/qfontdialog.cpp @@ -62,8 +62,8 @@ #include "qlistview.h" #include "qstringlistmodel.h" #include "qvalidator.h" -#include -#include +#include "qdialog_p.h" +#include "qfont_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/dialogs/qpagesetupdialog.cpp b/src/gui/dialogs/qpagesetupdialog.cpp index f1dbbb9b3..3f6fce9b1 100644 --- a/src/gui/dialogs/qpagesetupdialog.cpp +++ b/src/gui/dialogs/qpagesetupdialog.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include -#include +#include "qabstractpagesetupdialog_p.h" +#include "qpagesetupdialog_p.h" #ifndef QT_NO_PRINTDIALOG diff --git a/src/gui/dialogs/qpagesetupdialog_unix.cpp b/src/gui/dialogs/qpagesetupdialog_unix.cpp index fc31dbbd6..992f8c0e7 100644 --- a/src/gui/dialogs/qpagesetupdialog_unix.cpp +++ b/src/gui/dialogs/qpagesetupdialog_unix.cpp @@ -48,16 +48,16 @@ #include "qprintdialog.h" #include "qdialogbuttonbox.h" #include "qprinter.h" -#include -#include +#include "qabstractpagesetupdialog_p.h" +#include "qprinter_p.h" #include "qpagesetupdialog_p.h" #include #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) -# include +# include "qcups_p.h" # include -# include +# include "qpdf_p.h" #endif QT_BEGIN_NAMESPACE diff --git a/src/gui/dialogs/qprintdialog_unix.cpp b/src/gui/dialogs/qprintdialog_unix.cpp index 9bf02e4df..c2d1c8f4f 100644 --- a/src/gui/dialogs/qprintdialog_unix.cpp +++ b/src/gui/dialogs/qprintdialog_unix.cpp @@ -54,16 +54,16 @@ #include #include #include -#include +#include "qprinterinfo_unix_p.h" #include "ui_qprintpropertieswidget.h" #include "ui_qprintsettingsoutput.h" #include "ui_qprintwidget.h" #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) -# include +# include "qcups_p.h" # include -# include +# include "qpdf_p.h" #endif QT_BEGIN_NAMESPACE diff --git a/src/gui/dialogs/qprintpreviewdialog.cpp b/src/gui/dialogs/qprintpreviewdialog.cpp index 1958ea354..7ddac5438 100644 --- a/src/gui/dialogs/qprintpreviewdialog.cpp +++ b/src/gui/dialogs/qprintpreviewdialog.cpp @@ -41,7 +41,7 @@ #include "qprintpreviewdialog.h" #include "qprintpreviewwidget.h" -#include +#include "qprinter_p.h" #include "qdialog_p.h" #include diff --git a/src/gui/dialogs/qprogressdialog.cpp b/src/gui/dialogs/qprogressdialog.cpp index df14661e9..87c2a107a 100644 --- a/src/gui/dialogs/qprogressdialog.cpp +++ b/src/gui/dialogs/qprogressdialog.cpp @@ -53,7 +53,8 @@ #include "qcursor.h" #include "qtimer.h" #include "qelapsedtimer.h" -#include +#include "qdialog_p.h" + #include QT_BEGIN_NAMESPACE diff --git a/src/gui/effects/qgraphicseffect.cpp b/src/gui/effects/qgraphicseffect.cpp index ad361a12e..88d02ce3d 100644 --- a/src/gui/effects/qgraphicseffect.cpp +++ b/src/gui/effects/qgraphicseffect.cpp @@ -113,7 +113,7 @@ #include #include #include -#include +#include "qdrawhelper_p.h" #ifndef QT_NO_GRAPHICSEFFECT QT_BEGIN_NAMESPACE diff --git a/src/gui/effects/qgraphicseffect_p.h b/src/gui/effects/qgraphicseffect_p.h index abcf3fe35..aaa1bbc13 100644 --- a/src/gui/effects/qgraphicseffect_p.h +++ b/src/gui/effects/qgraphicseffect_p.h @@ -49,8 +49,8 @@ #include -#include -#include +#include "qobject_p.h" +#include "qpixmapfilter_p.h" #ifndef QT_NO_GRAPHICSEFFECT QT_BEGIN_NAMESPACE diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h index 9c932edd3..1c61e8888 100644 --- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h +++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h @@ -46,7 +46,7 @@ // #include -#include +#include "qobject_p.h" #include "qgraphicslayout_p.h" #include "qgraphicsanchorlayout.h" #include "qgraph_p.h" diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 23b635be5..f58b2eaad 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -742,20 +742,20 @@ # include "qaccessible.h" #endif -#include -#include -#include -#include -#include -#include -#include +#include "qgraphicsitem_p.h" +#include "qgraphicswidget_p.h" +#include "qtextcontrol_p.h" +#include "qtextdocumentlayout_p.h" +#include "qtextengine_p.h" +#include "qwidget_p.h" +#include "qapplication_p.h" #ifdef Q_WS_X11 -#include -#include +#include "qt_x11_p.h" +#include "qpixmap_x11_p.h" #endif -#include +#include "qgesturemanager_p.h" #include diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index bc2248d06..252de7511 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -48,11 +48,11 @@ #include "qgraphicsitem.h" #include "qset.h" #include "qpixmapcache.h" -#include +#include "qgraphicsview_p.h" #include "qgraphicstransform.h" -#include +#include "qgraphicstransform_p.h" -#include +#include "qgraphicseffect_p.h" #include "qgraphicseffect.h" #include diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 216d68d59..65bc5228a 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -247,14 +247,14 @@ # include #endif -#include -#include +#include "qapplication_p.h" +#include "qobject_p.h" #ifdef Q_WS_X11 -#include +#include "qt_x11_p.h" #endif -#include -#include -#include +#include "qgraphicseffect_p.h" +#include "qgesturemanager_p.h" +#include "qpathclipper_p.h" // #define GESTURE_DEBUG #ifndef GESTURE_DEBUG diff --git a/src/gui/graphicsview/qgraphicsscene_bsp.cpp b/src/gui/graphicsview/qgraphicsscene_bsp.cpp index 246ca3f0e..999b3f999 100644 --- a/src/gui/graphicsview/qgraphicsscene_bsp.cpp +++ b/src/gui/graphicsview/qgraphicsscene_bsp.cpp @@ -44,7 +44,7 @@ #ifndef QT_NO_GRAPHICSVIEW #include -#include +#include "qgraphicsitem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h index a80b34fb4..c2f93f40c 100644 --- a/src/gui/graphicsview/qgraphicsscene_p.h +++ b/src/gui/graphicsview/qgraphicsscene_p.h @@ -54,7 +54,7 @@ #include "qgraphicsview_p.h" #include "qgraphicsitem_p.h" -#include +#include "qobject_p.h" #include #include #include diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp index e14084d8f..f5112ba90 100644 --- a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp +++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp @@ -78,9 +78,9 @@ #ifndef QT_NO_GRAPHICSVIEW -#include -#include -#include +#include "qgraphicsscene_p.h" +#include "qgraphicsscenebsptreeindex_p.h" +#include "qgraphicssceneindex_p.h" #include #include diff --git a/src/gui/graphicsview/qgraphicssceneevent.cpp b/src/gui/graphicsview/qgraphicssceneevent.cpp index c93bc1c22..dc8b50d48 100644 --- a/src/gui/graphicsview/qgraphicssceneevent.cpp +++ b/src/gui/graphicsview/qgraphicssceneevent.cpp @@ -264,7 +264,7 @@ #include "qgraphicsview.h" #include "qgraphicsitem.h" #include -#include +#include "qevent_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/graphicsview/qgraphicssceneindex_p.h b/src/gui/graphicsview/qgraphicssceneindex_p.h index 6c0ec89a1..bf4b8bd40 100644 --- a/src/gui/graphicsview/qgraphicssceneindex_p.h +++ b/src/gui/graphicsview/qgraphicssceneindex_p.h @@ -47,7 +47,7 @@ #include "qgraphicsscene_p.h" #include "qgraphicsscene.h" -#include +#include "qobject_p.h" #include #include diff --git a/src/gui/graphicsview/qgraphicsscenelinearindex.cpp b/src/gui/graphicsview/qgraphicsscenelinearindex.cpp index 73fb2d3a6..5bbf47f5f 100644 --- a/src/gui/graphicsview/qgraphicsscenelinearindex.cpp +++ b/src/gui/graphicsview/qgraphicsscenelinearindex.cpp @@ -53,7 +53,7 @@ \sa QGraphicsScene, QGraphicsView, QGraphicsSceneIndex, QGraphicsSceneBspTreeIndex */ -#include +#include "qgraphicsscenelinearindex_p.h" /*! \fn QGraphicsSceneLinearIndex::QGraphicsSceneLinearIndex(QGraphicsScene *scene = 0): diff --git a/src/gui/graphicsview/qgraphicsscenelinearindex_p.h b/src/gui/graphicsview/qgraphicsscenelinearindex_p.h index ad9247df7..b8bc5b724 100644 --- a/src/gui/graphicsview/qgraphicsscenelinearindex_p.h +++ b/src/gui/graphicsview/qgraphicsscenelinearindex_p.h @@ -52,7 +52,7 @@ #include #include #include -#include +#include "qgraphicssceneindex_p.h" QT_BEGIN_HEADER diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index dcf87da04..c48725e10 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -281,10 +281,10 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime < #include #ifdef Q_WS_X11 #include -#include +#include "qt_x11_p.h" #endif -#include +#include "qevent_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/graphicsview/qgraphicsview_p.h b/src/gui/graphicsview/qgraphicsview_p.h index 012a4bc3d..641e52e93 100644 --- a/src/gui/graphicsview/qgraphicsview_p.h +++ b/src/gui/graphicsview/qgraphicsview_p.h @@ -53,8 +53,8 @@ #include #include "qgraphicssceneevent.h" #include -#include -#include +#include "qabstractscrollarea_p.h" +#include "qapplication_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index 616a422d9..f3fb1605f 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -51,12 +51,12 @@ #include "qgraphicssceneevent.h" #ifndef QT_NO_ACTION -#include +#include "qaction_p.h" #endif -#include -#include +#include "qapplication_p.h" +#include "qgraphicsscene_p.h" #ifndef QT_NO_SHORTCUT -#include +#include "qshortcutmap_p.h" #endif #include #include diff --git a/src/gui/graphicsview/qgraphicswidget_p.h b/src/gui/graphicsview/qgraphicswidget_p.h index c9b93f339..db640b73e 100644 --- a/src/gui/graphicsview/qgraphicswidget_p.h +++ b/src/gui/graphicsview/qgraphicswidget_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qobject_p.h" #include "qgraphicsitem_p.h" #include "qgraphicswidget.h" #include diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp index 7b107bea7..48da3fb80 100644 --- a/src/gui/image/qbitmap.cpp +++ b/src/gui/image/qbitmap.cpp @@ -44,8 +44,8 @@ #include "qimage.h" #include "qvariant.h" #include "qpainter.h" -#include -#include +#include "qgraphicssystem_p.h" +#include "qapplication_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 18551aa59..e11fc9e7d 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -57,7 +57,7 @@ #include #include -#include +#include "qstylehelper_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h index 0e487459e..b14f02b02 100644 --- a/src/gui/image/qiconloader_p.h +++ b/src/gui/image/qiconloader_p.h @@ -50,7 +50,7 @@ #include #include #include -#include +#include "qicon_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 9c49e1aba..21c6f9744 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -54,16 +54,16 @@ #include #include #include -#include -#include -#include +#include "qdrawhelper_p.h" +#include "qmemrotate_p.h" +#include "qpixmapdata_p.h" #include "qhash.h" -#include +#include "qpaintengine_raster_p.h" -#include -#include +#include "qimage_p.h" +#include "qfont_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index 7ffdb37e9..ac216c47a 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -135,24 +135,24 @@ #include "qguicommon_p.h" // image handlers -#include -#include -#include -#include +#include "qbmphandler_p.h" +#include "qppmhandler_p.h" +#include "qxbmhandler_p.h" +#include "qxpmhandler_p.h" #ifndef QT_NO_IMAGEFORMAT_PNG -#include +#include "qpnghandler_p.h" #endif #ifndef QT_NO_IMAGEFORMAT_JPEG -#include +#include "qjpeghandler_p.h" #endif #ifndef QT_NO_IMAGEFORMAT_MNG -#include +#include "qmnghandler_p.h" #endif #ifndef QT_NO_IMAGEFORMAT_TIFF -#include +#include "qtiffhandler_p.h" #endif #ifdef QT_BUILTIN_GIF_READER -#include +#include "qgifhandler_p.h" #endif QT_BEGIN_NAMESPACE diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp index ae06a95e3..08d990d2b 100644 --- a/src/gui/image/qimagewriter.cpp +++ b/src/gui/image/qimagewriter.cpp @@ -108,24 +108,24 @@ #include "qguicommon_p.h" // image handlers -#include -#include -#include -#include +#include "qbmphandler_p.h" +#include "qppmhandler_p.h" +#include "qxbmhandler_p.h" +#include "qxpmhandler_p.h" #ifndef QT_NO_IMAGEFORMAT_PNG -#include +#include "qpnghandler_p.h" #endif #ifndef QT_NO_IMAGEFORMAT_JPEG -#include +#include "qjpeghandler_p.h" #endif #ifndef QT_NO_IMAGEFORMAT_MNG -#include +#include "qmnghandler_p.h" #endif #ifndef QT_NO_IMAGEFORMAT_TIFF -#include +#include "qtiffhandler_p.h" #endif #ifdef QT_BUILTIN_GIF_READER -#include +#include "qgifhandler_p.h" #endif QT_BEGIN_NAMESPACE diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp index c39307b43..f724735cb 100644 --- a/src/gui/image/qpixmap_x11.cpp +++ b/src/gui/image/qpixmap_x11.cpp @@ -58,12 +58,12 @@ #include "qimage.h" #include "qmatrix.h" #include "qapplication.h" -#include -#include +#include "qpaintengine_x11_p.h" +#include "qt_x11_p.h" #include "qx11info_x11.h" -#include -#include -#include +#include "qdrawhelper_p.h" +#include "qimage_p.h" +#include "qguicommon_p.h" #include diff --git a/src/gui/image/qpixmapdata.cpp b/src/gui/image/qpixmapdata.cpp index 70230251a..1f7d4d538 100644 --- a/src/gui/image/qpixmapdata.cpp +++ b/src/gui/image/qpixmapdata.cpp @@ -43,8 +43,8 @@ #include #include #include -#include -#include +#include "qgraphicssystem_p.h" +#include "qapplication_p.h" #include "qguicommon_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp index 6de744ca2..5aa68b4cb 100644 --- a/src/gui/image/qxpmhandler.cpp +++ b/src/gui/image/qxpmhandler.cpp @@ -43,7 +43,7 @@ #ifndef QT_NO_IMAGEFORMAT_XPM -#include +#include "qcolor_p.h" #include "qimage.h" #include "qmap.h" #include "qtextstream.h" diff --git a/src/gui/itemviews/qabstractitemdelegate.cpp b/src/gui/itemviews/qabstractitemdelegate.cpp index 60fc5dc83..4dd304478 100644 --- a/src/gui/itemviews/qabstractitemdelegate.cpp +++ b/src/gui/itemviews/qabstractitemdelegate.cpp @@ -50,7 +50,7 @@ #include "qevent.h" #include "qstring.h" #include "qdebug.h" -#include +#include "qtextengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index 287e19906..031ddbf74 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -56,8 +56,8 @@ #include "qlineedit.h" #include "qspinbox.h" #include "qstyleditemdelegate.h" -#include -#include +#include "qabstractitemview_p.h" +#include "qabstractitemmodel_p.h" #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" #include "qaccessible2.h" diff --git a/src/gui/itemviews/qabstractproxymodel.cpp b/src/gui/itemviews/qabstractproxymodel.cpp index ecc93a027..2516992da 100644 --- a/src/gui/itemviews/qabstractproxymodel.cpp +++ b/src/gui/itemviews/qabstractproxymodel.cpp @@ -44,7 +44,7 @@ #ifndef QT_NO_PROXYMODEL #include "qitemselectionmodel.h" -#include +#include "qabstractproxymodel_p.h" #include #include diff --git a/src/gui/itemviews/qcolumnview_p.h b/src/gui/itemviews/qcolumnview_p.h index e53e40406..2f9542080 100644 --- a/src/gui/itemviews/qcolumnview_p.h +++ b/src/gui/itemviews/qcolumnview_p.h @@ -49,7 +49,7 @@ #ifndef QT_NO_QCOLUMNVIEW -#include +#include "qabstractitemview_p.h" #include #include diff --git a/src/gui/itemviews/qcolumnviewgrip_p.h b/src/gui/itemviews/qcolumnviewgrip_p.h index 6371ac498..b38c309d5 100644 --- a/src/gui/itemviews/qcolumnviewgrip_p.h +++ b/src/gui/itemviews/qcolumnviewgrip_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qwidget_p.h" #ifndef QT_NO_QCOLUMNVIEW diff --git a/src/gui/itemviews/qdirmodel.cpp b/src/gui/itemviews/qdirmodel.cpp index 19cd85371..1dde8d1d6 100644 --- a/src/gui/itemviews/qdirmodel.cpp +++ b/src/gui/itemviews/qdirmodel.cpp @@ -54,7 +54,7 @@ #include "qlocale.h" #include "qstyle.h" #include "qapplication.h" -#include +#include "qabstractitemmodel_p.h" #include "qdebug.h" /*! diff --git a/src/gui/itemviews/qheaderview.cpp b/src/gui/itemviews/qheaderview.cpp index 7f12e867a..c23801df8 100644 --- a/src/gui/itemviews/qheaderview.cpp +++ b/src/gui/itemviews/qheaderview.cpp @@ -57,8 +57,8 @@ #include "qvarlengtharray.h" #include "qabstractitemdelegate.h" #include "qvariant.h" -#include -#include +#include "qheaderview_p.h" +#include "qabstractitemmodel_p.h" #ifndef QT_NO_DATASTREAM #include "qdatastream.h" diff --git a/src/gui/itemviews/qidentityproxymodel.cpp b/src/gui/itemviews/qidentityproxymodel.cpp index e18742b07..9a78faf38 100644 --- a/src/gui/itemviews/qidentityproxymodel.cpp +++ b/src/gui/itemviews/qidentityproxymodel.cpp @@ -43,7 +43,7 @@ #ifndef QT_NO_IDENTITYPROXYMODEL #include "qitemselectionmodel.h" -#include +#include "qabstractproxymodel_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp index 48ae34191..eddc68b89 100644 --- a/src/gui/itemviews/qitemdelegate.cpp +++ b/src/gui/itemviews/qitemdelegate.cpp @@ -63,9 +63,9 @@ #include "qitemeditorfactory.h" #include "qmetaobject.h" #include "qtextlayout.h" -#include -#include -#include +#include "qobject_p.h" +#include "qdnd_p.h" +#include "qtextengine_p.h" #include "qdebug.h" #include "qlocale.h" #include "qdialog.h" diff --git a/src/gui/itemviews/qitemselectionmodel.cpp b/src/gui/itemviews/qitemselectionmodel.cpp index ac6349c81..e41f3111f 100644 --- a/src/gui/itemviews/qitemselectionmodel.cpp +++ b/src/gui/itemviews/qitemselectionmodel.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qitemselectionmodel.h" -#include +#include "qitemselectionmodel_p.h" #include "qdebug.h" #ifndef QT_NO_ITEMVIEWS diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp index 64621087e..b3eb20f19 100644 --- a/src/gui/itemviews/qlistview.cpp +++ b/src/gui/itemviews/qlistview.cpp @@ -51,7 +51,7 @@ #include "qevent.h" #include "qscrollbar.h" #include "qrubberband.h" -#include +#include "qlistview_p.h" #include "qdebug.h" #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/gui/itemviews/qlistwidget.cpp index 3d6ed2760..cf6cbf41d 100644 --- a/src/gui/itemviews/qlistwidget.cpp +++ b/src/gui/itemviews/qlistwidget.cpp @@ -43,9 +43,9 @@ #ifndef QT_NO_LISTWIDGET #include "qitemdelegate.h" -#include -#include -#include +#include "qlistview_p.h" +#include "qwidgetitemdata_p.h" +#include "qlistwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/itemviews/qlistwidget_p.h b/src/gui/itemviews/qlistwidget_p.h index fef2255bd..704df9c39 100644 --- a/src/gui/itemviews/qlistwidget_p.h +++ b/src/gui/itemviews/qlistwidget_p.h @@ -48,8 +48,8 @@ #include #include #include "qitemdelegate.h" -#include -#include +#include "qlistview_p.h" +#include "qwidgetitemdata_p.h" #ifndef QT_NO_LISTWIDGET diff --git a/src/gui/itemviews/qproxymodel.cpp b/src/gui/itemviews/qproxymodel.cpp index fa7417f29..3aa4ff01c 100644 --- a/src/gui/itemviews/qproxymodel.cpp +++ b/src/gui/itemviews/qproxymodel.cpp @@ -42,7 +42,7 @@ #include "qproxymodel.h" #ifndef QT_NO_PROXYMODEL -#include +#include "qproxymodel_p.h" #include "qsize.h" #include "qstringlist.h" diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp index 9d5eb74a6..8a3d7cbb9 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.cpp +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp @@ -49,8 +49,8 @@ #include "qdatetime.h" #include "qpair.h" #include "qstringlist.h" -#include -#include +#include "qabstractitemmodel_p.h" +#include "qabstractproxymodel_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/itemviews/qstandarditemmodel.cpp b/src/gui/itemviews/qstandarditemmodel.cpp index e4d42196c..51f6fca2d 100644 --- a/src/gui/itemviews/qstandarditemmodel.cpp +++ b/src/gui/itemviews/qstandarditemmodel.cpp @@ -53,7 +53,7 @@ #include #include -#include +#include "qstandarditemmodel_p.h" #include "qdebug.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/itemviews/qstandarditemmodel_p.h b/src/gui/itemviews/qstandarditemmodel_p.h index 0d10bea74..d37717e82 100644 --- a/src/gui/itemviews/qstandarditemmodel_p.h +++ b/src/gui/itemviews/qstandarditemmodel_p.h @@ -49,7 +49,7 @@ #ifndef QT_NO_STANDARDITEMMODEL -#include +#include "qwidgetitemdata_p.h" #include #include #include diff --git a/src/gui/itemviews/qstyleditemdelegate.cpp b/src/gui/itemviews/qstyleditemdelegate.cpp index d93308924..15356a0cc 100644 --- a/src/gui/itemviews/qstyleditemdelegate.cpp +++ b/src/gui/itemviews/qstyleditemdelegate.cpp @@ -61,13 +61,13 @@ #include "qbitmap.h" #include "qpixmapcache.h" #include "qitemeditorfactory.h" -#include +#include "qitemeditorfactory_p.h" #include "qmetaobject.h" #include "qtextlayout.h" -#include -#include -#include -#include +#include "qobject_p.h" +#include "qdnd_p.h" +#include "qtextengine_p.h" +#include "qlayoutengine_p.h" #include "qdebug.h" #include "qlocale.h" #include "qdialog.h" diff --git a/src/gui/itemviews/qtableview.cpp b/src/gui/itemviews/qtableview.cpp index 1fd2e16f5..e3652e15d 100644 --- a/src/gui/itemviews/qtableview.cpp +++ b/src/gui/itemviews/qtableview.cpp @@ -52,7 +52,7 @@ #include "qbitarray.h" #include "qscrollbar.h" #include "qabstractbutton.h" -#include +#include "qtableview_p.h" #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" #endif diff --git a/src/gui/itemviews/qtablewidget.cpp b/src/gui/itemviews/qtablewidget.cpp index 0d63c3f74..01445a91f 100644 --- a/src/gui/itemviews/qtablewidget.cpp +++ b/src/gui/itemviews/qtablewidget.cpp @@ -44,7 +44,7 @@ #ifndef QT_NO_TABLEWIDGET #include "qitemdelegate.h" #include "qpainter.h" -#include +#include "qtablewidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/itemviews/qtablewidget_p.h b/src/gui/itemviews/qtablewidget_p.h index 40b63dc1d..1c9d18a19 100644 --- a/src/gui/itemviews/qtablewidget_p.h +++ b/src/gui/itemviews/qtablewidget_p.h @@ -47,9 +47,9 @@ #include "qheaderview.h" #include "qtablewidget.h" #include "qabstractitemmodel.h" -#include -#include -#include +#include "qabstractitemmodel_p.h" +#include "qtableview_p.h" +#include "qwidgetitemdata_p.h" #ifndef QT_NO_TABLEWIDGET diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp index 7a968306b..a026f4109 100644 --- a/src/gui/itemviews/qtreeview.cpp +++ b/src/gui/itemviews/qtreeview.cpp @@ -57,7 +57,7 @@ #include "qaccessible2.h" #endif -#include +#include "qtreeview_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp index 90bc34308..6a218d375 100644 --- a/src/gui/itemviews/qtreewidget.cpp +++ b/src/gui/itemviews/qtreewidget.cpp @@ -47,9 +47,9 @@ #include "qitemdelegate.h" #include "qstack.h" #include "qdebug.h" -#include -#include -#include +#include "qtreewidget_p.h" +#include "qwidgetitemdata_p.h" +#include "qtreewidgetitemiterator_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/itemviews/qtreewidget_p.h b/src/gui/itemviews/qtreewidget_p.h index b22889fd9..c486db3da 100644 --- a/src/gui/itemviews/qtreewidget_p.h +++ b/src/gui/itemviews/qtreewidget_p.h @@ -45,11 +45,11 @@ // #include -#include +#include "qabstractitemmodel_p.h" #include #include #include -#include +#include "qtreeview_p.h" #include #include "qabstractitemmodel_p.h" diff --git a/src/gui/itemviews/qtreewidgetitemiterator.cpp b/src/gui/itemviews/qtreewidgetitemiterator.cpp index d3b157347..ee6358cd5 100644 --- a/src/gui/itemviews/qtreewidgetitemiterator.cpp +++ b/src/gui/itemviews/qtreewidgetitemiterator.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include "qtreewidgetitemiterator_p.h" #include "qtreewidget.h" #include "qtreewidget_p.h" #include "qwidgetitemdata_p.h" diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index 11b7e45c3..604133673 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -48,9 +48,9 @@ #include "qevent.h" #include "qlist.h" #include "qdebug.h" -#include -#include -#include +#include "qshortcutmap_p.h" +#include "qapplication_p.h" +#include "qmenu_p.h" #define QAPP_CHECK(functionName) \ if (!qApp) { \ diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index a839f49fb..2293d61f0 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -87,7 +87,7 @@ #endif #ifdef Q_WS_X11 -#include +#include "qt_x11_p.h" #endif #include diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 591abfc93..51cf4244f 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -76,10 +76,10 @@ #include "qguiplatformplugin.h" #include "qthread_p.h" #include "qeventdispatcher_x11_p.h" -#include -#include -#include -#include +#include "qpaintengine_x11_p.h" +#include "qkeymapper_p.h" +#include "qwidget_p.h" +#include "qbackingstore_p.h" #if !defined(QT_NO_GLIB) # include "qguieventdispatcher_glib_p.h" diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp index 331eaf27a..ee8c75fe2 100644 --- a/src/gui/kernel/qcursor.cpp +++ b/src/gui/kernel/qcursor.cpp @@ -48,7 +48,7 @@ #include "qimage.h" #include "qdatastream.h" #include "qvariant.h" -#include +#include "qcursor_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qcursor_x11.cpp b/src/gui/kernel/qcursor_x11.cpp index ba1968f5f..9a8a95c47 100644 --- a/src/gui/kernel/qcursor_x11.cpp +++ b/src/gui/kernel/qcursor_x11.cpp @@ -41,10 +41,10 @@ #include "qbitmap.h" #include "qcursor.h" -#include +#include "qcursor_p.h" #include "qx11info_x11.h" -#include -#include +#include "qpixmap_x11_p.h" +#include "qt_x11_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp index e40895052..db74b0ba1 100644 --- a/src/gui/kernel/qdnd.cpp +++ b/src/gui/kernel/qdnd.cpp @@ -60,7 +60,7 @@ #include "qdebug.h" #include -#include +#include "qapplication_p.h" #ifndef QT_NO_DRAGANDDROP diff --git a/src/gui/kernel/qeventdispatcher_x11.cpp b/src/gui/kernel/qeventdispatcher_x11.cpp index 3e76b89a9..2cb8beabf 100644 --- a/src/gui/kernel/qeventdispatcher_x11.cpp +++ b/src/gui/kernel/qeventdispatcher_x11.cpp @@ -45,7 +45,7 @@ #include "qx11info_x11.h" #include "qt_x11_p.h" -#include +#include "qeventdispatcher_unix_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp index 1d5c207b7..70b8b215f 100644 --- a/src/gui/kernel/qkeymapper.cpp +++ b/src/gui/kernel/qkeymapper.cpp @@ -42,7 +42,7 @@ #include "qapplication.h" -#include +#include "qobject_p.h" #include "qkeymapper_p.h" #include "qwidget.h" diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h index a57182370..a2b64f23d 100644 --- a/src/gui/kernel/qkeymapper_p.h +++ b/src/gui/kernel/qkeymapper_p.h @@ -45,7 +45,7 @@ // #include "qobject.h" -#include +#include "qobject_p.h" #include "qkeysequence.h" #include "qlist.h" #include "qlocale.h" diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index b089cfcf0..fcec09315 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -53,9 +53,9 @@ #include "qmenubar.h" #include "qshortcut.h" #include "qapplication_p.h" -#include -#include -#include +#include "qaction_p.h" +#include "qkeymapper_p.h" +#include "qwidget_p.h" #ifndef QT_NO_SHORTCUT diff --git a/src/gui/kernel/qtooltip.cpp b/src/gui/kernel/qtooltip.cpp index 5844cc502..fbe4a92cf 100644 --- a/src/gui/kernel/qtooltip.cpp +++ b/src/gui/kernel/qtooltip.cpp @@ -50,10 +50,10 @@ #include "qstylepainter.h" #include "qtimer.h" #include "qtooltip.h" -#include +#include "qeffects_p.h" #include "qtextdocument.h" #include "qdebug.h" -#include +#include "qstylesheetstyle_p.h" #include "qbasictimer.h" #ifndef QT_NO_TOOLTIP diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 3ac03911f..ab1dd3d34 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -69,14 +69,14 @@ #include "qfileinfo.h" #if defined(Q_WS_X11) -# include +# include "qpaintengine_x11_p.h" # include "qx11info_x11.h" #endif -#include -#include -#include -#include +#include "qgraphicseffect_p.h" +#include "qwindowsurface_p.h" +#include "qbackingstore_p.h" +#include "qpaintengine_raster_p.h" #include "qwidget_p.h" diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 1795faf30..ee157284d 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -54,11 +54,11 @@ #include "QtGui/qsizepolicy.h" #include "QtGui/qstyle.h" #include "QtGui/qapplication.h" -#include +#include "qgraphicseffect_p.h" #include "QtGui/qgraphicsproxywidget.h" #include "QtGui/qgraphicsscene.h" #include "QtGui/qgraphicsview.h" -#include +#include "qgesture_p.h" #ifdef Q_WS_X11 #include "QtGui/qx11info_x11.h" diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp index b68a0922a..944370cd0 100644 --- a/src/gui/kernel/qx11embed_x11.cpp +++ b/src/gui/kernel/qx11embed_x11.cpp @@ -50,9 +50,9 @@ #include "qelapsedtimer.h" #include "qpointer.h" #include "qdebug.h" -#include +#include "qwidget_p.h" #include "qx11info_x11.h" -#include +#include "qt_x11_p.h" //#define QX11EMBED_DEBUG diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp index 35beca629..bb5e5c7d7 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/painting/qbackingstore.cpp @@ -52,11 +52,11 @@ #include #include -#include -#include -#include -#include -#include +#include "qwidget_p.h" +#include "qwindowsurface_raster_p.h" +#include "qapplication_p.h" +#include "qpaintengine_raster_p.h" +#include "qgraphicseffect_p.h" #include "qgraphicssystem_p.h" diff --git a/src/gui/painting/qbackingstore_p.h b/src/gui/painting/qbackingstore_p.h index 816006087..0932cadb8 100644 --- a/src/gui/painting/qbackingstore_p.h +++ b/src/gui/painting/qbackingstore_p.h @@ -47,8 +47,8 @@ #include #include -#include -#include +#include "qwidget_p.h" +#include "qwindowsurface_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp index b9972d4cf..35c7bd430 100644 --- a/src/gui/painting/qbezier.cpp +++ b/src/gui/painting/qbezier.cpp @@ -48,7 +48,7 @@ #include "qlist.h" #include "qmath.h" -#include +#include "qmath_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 84830626e..06804d09c 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include -#include -#include -#include +#include "qdrawhelper_p.h" +#include "qpaintengine_raster_p.h" +#include "qpainter_p.h" +#include "qmath_p.h" #include "qmath.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp index 67362b9de..4ce0b2db2 100644 --- a/src/gui/painting/qdrawutil.cpp +++ b/src/gui/painting/qdrawutil.cpp @@ -45,10 +45,10 @@ #include "qapplication.h" #include "qpainter.h" #include "qpalette.h" -#include +#include "qpaintengineex_p.h" #include "qvarlengtharray.h" #include "qmath.h" -#include +#include "qstylehelper_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qoutlinemapper.cpp b/src/gui/painting/qoutlinemapper.cpp index 5c5c264ba..6aad33bad 100644 --- a/src/gui/painting/qoutlinemapper.cpp +++ b/src/gui/painting/qoutlinemapper.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qoutlinemapper_p.h" -#include +#include "qpainterpath_p.h" #include "qmath.h" #include diff --git a/src/gui/painting/qoutlinemapper_p.h b/src/gui/painting/qoutlinemapper_p.h index 4d04213fe..905dcf19e 100644 --- a/src/gui/painting/qoutlinemapper_p.h +++ b/src/gui/painting/qoutlinemapper_p.h @@ -53,8 +53,8 @@ #define QT_FT_BEGIN_HEADER #define QT_FT_END_HEADER -#include -#include +#include "qrasterdefs_p.h" +#include "qdatabuffer_p.h" #include "qpaintengineex_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qpaintdevice_x11.cpp b/src/gui/painting/qpaintdevice_x11.cpp index 52f634c42..7edb086f4 100644 --- a/src/gui/painting/qpaintdevice_x11.cpp +++ b/src/gui/painting/qpaintdevice_x11.cpp @@ -44,7 +44,7 @@ #include "qwidget.h" #include "qbitmap.h" #include "qapplication.h" -#include +#include "qt_x11_p.h" #include "qx11info_x11.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp index a1953f234..d4f7c34e8 100644 --- a/src/gui/painting/qpaintengine.cpp +++ b/src/gui/painting/qpaintengine.cpp @@ -46,10 +46,10 @@ #include "qapplication.h" #include "qdebug.h" #include "qmath.h" -#include +#include "qtextengine_p.h" #include "qvarlengtharray.h" -#include -#include +#include "qfontengine_p.h" +#include "qpaintengineex_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qpaintengine_preview.cpp b/src/gui/painting/qpaintengine_preview.cpp index a8437fcaf..fa5ba2ff7 100644 --- a/src/gui/painting/qpaintengine_preview.cpp +++ b/src/gui/painting/qpaintengine_preview.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include -#include -#include +#include "qpaintengine_preview_p.h" +#include "qpainter_p.h" +#include "qpaintengine_p.h" #include #include diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 409272d56..8e8ea2b70 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -45,20 +45,20 @@ #define QT_FT_BEGIN_HEADER #define QT_FT_END_HEADER -#include +#include "qrasterdefs_p.h" #include "qpainterpath.h" #include "qdebug.h" #include "qcache.h" #include "qlabel.h" #include "qbitmap.h" #include "qmath.h" -#include -#include -#include -#include -#include -#include -#include +#include "qfontengine_ft_p.h" +#include "qmath_p.h" +#include "qtextengine_p.h" +#include "qfontengine_p.h" +#include "qpixmap_raster_p.h" +#include "qimage_p.h" +#include "qstatictext_p.h" #include "qmemrotate_p.h" #include "qpaintengine_raster_p.h" #include "qoutlinemapper_p.h" diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp index 06b2a9802..be37df534 100644 --- a/src/gui/painting/qpaintengine_x11.cpp +++ b/src/gui/painting/qpaintengine_x11.cpp @@ -53,17 +53,15 @@ #include "qcoreevent.h" #include "qiodevice.h" #include "qmath.h" - #include "qpainter_p.h" #include "qtextlayout.h" #include "qvarlengtharray.h" -#include -#include -#include -#include -#include -#include - +#include "qfont_p.h" +#include "qtextengine_p.h" +#include "qpaintengine_x11_p.h" +#include "qfontengine_x11_p.h" +#include "qwidget_p.h" +#include "qpainterpath_p.h" #include "qpen.h" #include "qcolor.h" #include "qcolormap.h" diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index c4b8d803d..274ecf617 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -42,9 +42,9 @@ #include "qpaintengineex_p.h" #include "qpainter_p.h" #include "qstroker_p.h" -#include -#include -#include +#include "qpainterpath_p.h" +#include "qfontengine_p.h" +#include "qstatictext_p.h" #include "qvarlengtharray.h" #include "qdebug.h" diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h index 370a43a3b..de2313547 100644 --- a/src/gui/painting/qpaintengineex_p.h +++ b/src/gui/painting/qpaintengineex_p.h @@ -47,10 +47,10 @@ #include -#include -#include -#include -#include +#include "qpaintengine_p.h" +#include "qstroker_p.h" +#include "qpainter_p.h" +#include "qvectorpath_p.h" QT_BEGIN_HEADER diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 15c1621eb..edd6992a0 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -39,12 +39,9 @@ ** ****************************************************************************/ -// QtCore #include "qdebug.h" #include "qmath.h" #include "qmutex.h" - -// QtGui #include "qbitmap.h" #include "qimage.h" #include "qpaintdevice.h" @@ -61,16 +58,15 @@ #include "qthread.h" #include "qvarlengtharray.h" #include "qstatictext.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "qfontengine_p.h" +#include "qpaintengine_p.h" +#include "qpainterpath_p.h" +#include "qtextengine_p.h" +#include "qwidget_p.h" +#include "qpaintengine_raster_p.h" +#include "qmath_p.h" +#include "qstatictext_p.h" +#include "qstylehelper_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index 7e32d1a3a..aa53aa4e5 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -53,13 +53,13 @@ #include "qvarlengtharray.h" #include "qmath.h" -#include -#include +#include "qbezier_p.h" +#include "qfontengine_p.h" #include "qnumeric.h" -#include -#include -#include -#include +#include "qobject_p.h" +#include "qpathclipper_p.h" +#include "qstroker_p.h" +#include "qtextengine_p.h" #include diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp index b6b78708f..49afef67c 100644 --- a/src/gui/painting/qpathclipper.cpp +++ b/src/gui/painting/qpathclipper.cpp @@ -41,7 +41,7 @@ #include "qpathclipper_p.h" -#include +#include "qbezier_p.h" #include "qmath.h" #include "qnumeric.h" #include "qdebug.h" diff --git a/src/gui/painting/qpathclipper_p.h b/src/gui/painting/qpathclipper_p.h index 489ca6edd..90c138d1d 100644 --- a/src/gui/painting/qpathclipper_p.h +++ b/src/gui/painting/qpathclipper_p.h @@ -45,10 +45,10 @@ // We mean it. // -#include -#include +#include "qpainterpath.h" +#include "qlist.h" +#include "qdatabuffer_p.h" -#include #include QT_BEGIN_HEADER diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index 43465b2d2..e8e75ff18 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -43,7 +43,7 @@ #include "qpdf_p.h" #include "qfile.h" #include "qtemporaryfile.h" -#include +#include "qmath_p.h" #include "qcups_p.h" #include "qprinterinfo.h" #include "qnumeric.h" diff --git a/src/gui/painting/qprintengine_ps.cpp b/src/gui/painting/qprintengine_ps.cpp index e0de6b6bd..261c8cd40 100644 --- a/src/gui/painting/qprintengine_ps.cpp +++ b/src/gui/painting/qprintengine_ps.cpp @@ -40,11 +40,11 @@ ****************************************************************************/ #include "qplatformdefs.h" -#include -#include -#include -#include -#include +#include "qprintengine_ps_p.h" +#include "qpainter_p.h" +#include "qfontengine_p.h" +#include "qpaintengine_p.h" +#include "qpdf_p.h" #ifndef QT_NO_PRINTER @@ -63,10 +63,10 @@ #include "qbitmap.h" #include "qregion.h" #include "qimagewriter.h" -#include +#include "qpainterpath_p.h" #include "qdebug.h" -#include -#include +#include "qdrawhelper_p.h" +#include "qmutexpool_p.h" #include #include diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp index d810729c6..fd6600511 100644 --- a/src/gui/painting/qprinter.cpp +++ b/src/gui/painting/qprinter.cpp @@ -53,10 +53,10 @@ #ifndef QT_NO_PRINTER -#include +#include "qprintengine_ps_p.h" #if defined(Q_WS_X11) -#include +#include "qt_x11_p.h" #endif #ifndef QT_NO_PDF @@ -64,7 +64,7 @@ #endif #include "qimage.h" -#include +#include "qpaintengine_preview_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/painting/qprinterinfo_unix.cpp index 6190558fb..c20872ddf 100644 --- a/src/gui/painting/qprinterinfo_unix.cpp +++ b/src/gui/painting/qprinterinfo_unix.cpp @@ -49,16 +49,16 @@ #include "qtextstream.h" #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) -# include +# include "qcups_p.h" # include -# include +# include "qpdf_p.h" #endif #ifndef QT_NO_NSL #include #endif -#include +#include "qprinterinfo_unix_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qrasterizer.cpp b/src/gui/painting/qrasterizer.cpp index c832f3833..d511ac973 100644 --- a/src/gui/painting/qrasterizer.cpp +++ b/src/gui/painting/qrasterizer.cpp @@ -44,9 +44,9 @@ #include #include -#include -#include -#include +#include "qmath_p.h" +#include "qdatabuffer_p.h" +#include "qdrawhelper_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qrasterizer_p.h b/src/gui/painting/qrasterizer_p.h index ac9083ed3..1af91ab16 100644 --- a/src/gui/painting/qrasterizer_p.h +++ b/src/gui/painting/qrasterizer_p.h @@ -45,11 +45,9 @@ // We mean it. // -#include "QtCore/qglobal.h" #include "QtGui/qpainter.h" - -#include -#include +#include "qdrawhelper_p.h" +#include "qrasterdefs_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qregion_x11.cpp b/src/gui/painting/qregion_x11.cpp index 1d7bed055..adad13b66 100644 --- a/src/gui/painting/qregion_x11.cpp +++ b/src/gui/painting/qregion_x11.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include "qt_x11_p.h" #include diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h index 6f749e02a..f767fe914 100644 --- a/src/gui/painting/qtextureglyphcache_p.h +++ b/src/gui/painting/qtextureglyphcache_p.h @@ -50,7 +50,7 @@ #include "qobject.h" #include "qtransform.h" -#include +#include "qfontengineglyphcache_p.h" #ifndef QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH #define QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH 256 diff --git a/src/gui/painting/qvectorpath_p.h b/src/gui/painting/qvectorpath_p.h index dadedb454..3d64fcad4 100644 --- a/src/gui/painting/qvectorpath_p.h +++ b/src/gui/painting/qvectorpath_p.h @@ -47,8 +47,8 @@ #include -#include -#include +#include "qpaintengine_p.h" +#include "qpainter_p.h" QT_BEGIN_HEADER diff --git a/src/gui/painting/qwindowsurface.cpp b/src/gui/painting/qwindowsurface.cpp index 7d3456a43..79c11d79d 100644 --- a/src/gui/painting/qwindowsurface.cpp +++ b/src/gui/painting/qwindowsurface.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include +#include "qwindowsurface_p.h" #include "qwidget.h" -#include -#include -#include +#include "qwidget_p.h" +#include "qbackingstore_p.h" +#include "qapplication_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp index 911fa7d8f..cea4f02c9 100644 --- a/src/gui/styles/qcleanlooksstyle.cpp +++ b/src/gui/styles/qcleanlooksstyle.cpp @@ -64,7 +64,7 @@ #include "qprogressbar.h" #include "qtoolbar.h" #include "qwizard.h" -#include +#include "qstylehelper_p.h" #include "qpen.h" #include "qguicommon_p.h" diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index f20d03d66..c0046855f 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -63,8 +63,8 @@ #include "qtoolbar.h" #include "qtoolbutton.h" #include "qrubberband.h" -#include -#include +#include "qcommonstylepixmaps_p.h" +#include "qmath_p.h" #include "qdebug.h" #include "qtextformat.h" #include "qwizard.h" @@ -80,7 +80,7 @@ # include "qtextengine_p.h" #endif -#include +#include "qstylehelper_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/styles/qproxystyle.cpp b/src/gui/styles/qproxystyle.cpp index 25fbcef9e..4f6e1019d 100644 --- a/src/gui/styles/qproxystyle.cpp +++ b/src/gui/styles/qproxystyle.cpp @@ -40,11 +40,11 @@ ****************************************************************************/ #include "qstyle.h" -#include -#include +#include "qproxystyle_p.h" +#include "qapplication_p.h" #include "qproxystyle.h" #include "qstylefactory.h" -#include +#include "qstyle_p.h" #if !defined(QT_NO_STYLE_PROXY) || defined(QT_PLUGIN) diff --git a/src/gui/styles/qstylehelper.cpp b/src/gui/styles/qstylehelper.cpp index e2fc8f020..5b77865ed 100644 --- a/src/gui/styles/qstylehelper.cpp +++ b/src/gui/styles/qstylehelper.cpp @@ -42,8 +42,8 @@ #include "qstyleoption.h" #include "qpainter.h" #include "qpixmapcache.h" -#include -#include +#include "qmath_p.h" +#include "qstyle_p.h" #include "qmath.h" #include "qpen.h" #include "qstylehelper_p.h" diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 70f8ac0a9..7df8547cd 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -82,7 +82,7 @@ #include "qlabel.h" #include "qdrawutil.h" #include "qtoolbar.h" -#include +#include "qguicommon_p.h" #include diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp index 741a8361f..41c5c902e 100644 --- a/src/gui/styles/qwindowsstyle.cpp +++ b/src/gui/styles/qwindowsstyle.cpp @@ -50,7 +50,7 @@ #include "qevent.h" #include "qmenu.h" #include "qmenubar.h" -#include +#include "qmenubar_p.h" #include "qpaintengine.h" #include "qpainter.h" #include "qprogressbar.h" diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 563e07d9a..0a1ae7d31 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -52,18 +52,18 @@ #include "qstringlist.h" #include "qthread.h" -#include +#include "qunicodetables_p.h" #include "qfont_p.h" -#include -#include -#include +#include "qfontengine_p.h" +#include "qpainter_p.h" +#include "qtextengine_p.h" #include "qmutex.h" #include #ifdef Q_WS_X11 #include "qx11info_x11.h" -#include +#include "qt_x11_p.h" #endif // #define QFONTCACHE_DEBUG diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h index df1146227..d5da989b1 100644 --- a/src/gui/text/qfont_p.h +++ b/src/gui/text/qfont_p.h @@ -48,7 +48,7 @@ #include "QtGui/qfont.h" #include "QtCore/qmap.h" #include "QtCore/qobject.h" -#include +#include "qunicodetables_p.h" #include #include "qfixed_p.h" diff --git a/src/gui/text/qfont_x11.cpp b/src/gui/text/qfont_x11.cpp index bf3a9db66..210128480 100644 --- a/src/gui/text/qfont_x11.cpp +++ b/src/gui/text/qfont_x11.cpp @@ -53,13 +53,13 @@ #include "qiodevice.h" #include "qhash.h" -#include +#include "qunicodetables_p.h" #include "qfont_p.h" #include "qfontengine_p.h" #include "qfontengine_x11_p.h" #include "qtextengine_p.h" -#include +#include "qt_x11_p.h" #include "qx11info_x11.h" #include diff --git a/src/gui/text/qfontdatabase_x11.h b/src/gui/text/qfontdatabase_x11.h index 23a005634..b03e4c75e 100644 --- a/src/gui/text/qfontdatabase_x11.h +++ b/src/gui/text/qfontdatabase_x11.h @@ -47,9 +47,9 @@ #include #include -#include +#include "qt_x11_p.h" #include "qx11info_x11.h" -#include +#include "qfontengine_x11_p.h" #ifndef QT_NO_FONTCONFIG #include diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index b15b0357d..6045ff487 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qdebug.h" -#include +#include "qfontengine_p.h" #include "qbitmap.h" #include "qpainter.h" @@ -48,7 +48,7 @@ #include "qvarlengtharray.h" #include "qmath.h" #include "qendian.h" -#include +#include "qharfbuzz_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/text/qfontengine_x11.cpp index 3e5b3c316..7af28ce2e 100644 --- a/src/gui/text/qfontengine_x11.cpp +++ b/src/gui/text/qfontengine_x11.cpp @@ -57,17 +57,17 @@ #include "qsettings.h" #include "qfile.h" -#include +#include "qpaintengine_x11_p.h" #include "qfont.h" #include "qfont_p.h" #include "qfontengine_p.h" #include "qhash.h" -#include -#include +#include "qpainter_p.h" +#include "qunicodetables_p.h" -#include -#include +#include "qt_x11_p.h" +#include "qpixmap_x11_p.h" #include "qx11info_x11.h" #include "qfontengine_x11_p.h" diff --git a/src/gui/text/qfontengine_x11_p.h b/src/gui/text/qfontengine_x11_p.h index f68ea2155..cd3a33ae4 100644 --- a/src/gui/text/qfontengine_x11_p.h +++ b/src/gui/text/qfontengine_x11_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qfontengine_ft_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index 1dee123de..8d9d78ecb 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -45,7 +45,7 @@ #include "qfont_p.h" #include "qfontengine_p.h" -#include +#include "qunicodetables_p.h" #include diff --git a/src/gui/text/qfragmentmap.cpp b/src/gui/text/qfragmentmap.cpp index bc27a2384..ee88445b3 100644 --- a/src/gui/text/qfragmentmap.cpp +++ b/src/gui/text/qfragmentmap.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include "qtools_p.h" #include "qfragmentmap_p.h" diff --git a/src/gui/text/qfragmentmap_p.h b/src/gui/text/qfragmentmap_p.h index 546eecdd5..bd58e2c9e 100644 --- a/src/gui/text/qfragmentmap_p.h +++ b/src/gui/text/qfragmentmap_p.h @@ -46,7 +46,7 @@ // #include "qglobal.h" -#include +#include "qtools_p.h" #include diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 59a2b7c05..c5c13654e 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -41,8 +41,8 @@ #include "qstatictext.h" #include "qstatictext_p.h" -#include -#include +#include "qtextengine_p.h" +#include "qfontengine_p.h" #include "qfontmetrics.h" #include "qabstracttextdocumentlayout.h" #include "qapplication.h" diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp index 2df6c2b72..b2826af16 100644 --- a/src/gui/text/qsyntaxhighlighter.cpp +++ b/src/gui/text/qsyntaxhighlighter.cpp @@ -42,9 +42,9 @@ #include "qsyntaxhighlighter.h" #ifndef QT_NO_SYNTAXHIGHLIGHTER -#include +#include "qobject_p.h" #include "qtextdocument.h" -#include +#include "qtextdocument_p.h" #include "qtextlayout.h" #include "qpointer.h" #include "qtextobject.h" diff --git a/src/gui/text/qtextcursor_p.h b/src/gui/text/qtextcursor_p.h index 0b2426b9c..c062918b1 100644 --- a/src/gui/text/qtextcursor_p.h +++ b/src/gui/text/qtextcursor_p.h @@ -48,7 +48,7 @@ #include "qtextcursor.h" #include "qtextdocument.h" #include "qtextdocument_p.h" -#include +#include "qtextformat_p.h" #include "qtextobject.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index ee86e7b60..28faa88f1 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -65,8 +65,8 @@ #include "qdataurl_p.h" #include "qtextdocument_p.h" -#include -#include +#include "qprinter_p.h" +#include "qabstracttextdocumentlayout_p.h" #include diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp index fb0b16055..da36357e1 100644 --- a/src/gui/text/qtextdocument_p.cpp +++ b/src/gui/text/qtextdocument_p.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include "qtools_p.h" #include "qdebug.h" #include "qtextdocument_p.h" diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp index 7a3d4b5cb..2da1733a7 100644 --- a/src/gui/text/qtextimagehandler.cpp +++ b/src/gui/text/qtextimagehandler.cpp @@ -46,7 +46,7 @@ #include "qtextformat.h" #include "qpainter.h" #include "qdebug.h" -#include +#include "qtextengine_p.h" #include "qpalette.h" #include "qtextbrowser.h" #include "qthread.h" diff --git a/src/gui/util/qsystemtrayicon_p.h b/src/gui/util/qsystemtrayicon_p.h index be9dabaee..18850dc11 100644 --- a/src/gui/util/qsystemtrayicon_p.h +++ b/src/gui/util/qsystemtrayicon_p.h @@ -57,7 +57,7 @@ #if defined(Q_WS_X11) #include -#include +#include "qt_x11_p.h" #endif QT_BEGIN_NAMESPACE diff --git a/src/gui/util/qundostack_p.h b/src/gui/util/qundostack_p.h index fb5cf278d..ceeba5a7b 100644 --- a/src/gui/util/qundostack_p.h +++ b/src/gui/util/qundostack_p.h @@ -34,7 +34,7 @@ #ifndef QUNDOSTACK_P_H #define QUNDOSTACK_P_H -#include +#include "qobject_p.h" #include #include #include diff --git a/src/gui/util/qundoview.cpp b/src/gui/util/qundoview.cpp index a760af3af..f8e3bd6ca 100644 --- a/src/gui/util/qundoview.cpp +++ b/src/gui/util/qundoview.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include "qlistview_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/widgets/qabstractspinbox.cpp b/src/gui/widgets/qabstractspinbox.cpp index f09640a88..db7e53cb8 100644 --- a/src/gui/widgets/qabstractspinbox.cpp +++ b/src/gui/widgets/qabstractspinbox.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include -#include -#include +#include "qabstractspinbox_p.h" +#include "qlineedit_p.h" #include "qabstractspinbox.h" #ifndef QT_NO_SPINBOX diff --git a/src/gui/widgets/qcalendarwidget.cpp b/src/gui/widgets/qcalendarwidget.cpp index e70181586..93edf6bef 100644 --- a/src/gui/widgets/qcalendarwidget.cpp +++ b/src/gui/widgets/qcalendarwidget.cpp @@ -51,7 +51,7 @@ #include "qevent.h" #include "qtextformat.h" #include "qheaderview.h" -#include +#include "qwidget_p.h" #include "qpushbutton.h" #include "qtoolbutton.h" #include "qlabel.h" @@ -60,7 +60,7 @@ #include "qapplication.h" #include "qbasictimer.h" #include "qstylepainter.h" -#include +#include "qcalendartextnavigator_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index b4e2d4faf..3c9dde429 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -57,14 +57,14 @@ #include "qtreeview.h" #include "qheaderview.h" #include "qmath.h" -#include -#include -#include -#include +#include "qapplication_p.h" +#include "qcombobox_p.h" +#include "qabstractitemmodel_p.h" +#include "qabstractscrollarea_p.h" #include "qdebug.h" #ifndef QT_NO_EFFECTS -# include +# include "qeffects_p.h" #endif #ifndef QT_NO_ACCESSIBILITY diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp index be194ef77..860f505df 100644 --- a/src/gui/widgets/qdatetimeedit.cpp +++ b/src/gui/widgets/qdatetimeedit.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include -#include +#include "qdatetimeedit_p.h" #include "qabstractspinbox.h" #include "qapplication.h" #include "qdatetimeedit.h" @@ -48,7 +48,7 @@ #include "qdebug.h" #include "qevent.h" #include "qlineedit.h" -#include +#include "qlineedit_p.h" #include "qlocale.h" #include "qpainter.h" #include "qlayout.h" diff --git a/src/gui/widgets/qdial.cpp b/src/gui/widgets/qdial.cpp index f69499417..7d455dfaa 100644 --- a/src/gui/widgets/qdial.cpp +++ b/src/gui/widgets/qdial.cpp @@ -54,8 +54,8 @@ #include "qstylepainter.h" #include "qstyleoption.h" #include "qslider.h" -#include -#include +#include "qabstractslider_p.h" +#include "qmath_p.h" #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" #endif diff --git a/src/gui/widgets/qdockarealayout.cpp b/src/gui/widgets/qdockarealayout.cpp index bbde971b3..469c15389 100644 --- a/src/gui/widgets/qdockarealayout.cpp +++ b/src/gui/widgets/qdockarealayout.cpp @@ -51,8 +51,8 @@ #include "qwidgetanimator_p.h" #include "qmainwindowlayout_p.h" #include "qdockwidget_p.h" -#include -#include +#include "qlayoutengine_p.h" +#include "qguicommon_p.h" #include "qpainter.h" #include "qstyleoption.h" diff --git a/src/gui/widgets/qdockwidget.cpp b/src/gui/widgets/qdockwidget.cpp index 88beaca9e..a7d36a48c 100644 --- a/src/gui/widgets/qdockwidget.cpp +++ b/src/gui/widgets/qdockwidget.cpp @@ -53,7 +53,7 @@ #include "qtoolbutton.h" #include "qdebug.h" -#include +#include "qwidgetresizehandler_p.h" #include "qdockwidget_p.h" #include "qmainwindowlayout_p.h" diff --git a/src/gui/widgets/qfocusframe.cpp b/src/gui/widgets/qfocusframe.cpp index a3cf55dc5..4ed929aa2 100644 --- a/src/gui/widgets/qfocusframe.cpp +++ b/src/gui/widgets/qfocusframe.cpp @@ -45,7 +45,7 @@ #include "qstylepainter.h" #include "qstyleoption.h" #include "qdebug.h" -#include +#include "qwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/widgets/qfontcombobox.cpp b/src/gui/widgets/qfontcombobox.cpp index 4fe260f52..085a95478 100644 --- a/src/gui/widgets/qfontcombobox.cpp +++ b/src/gui/widgets/qfontcombobox.cpp @@ -49,7 +49,7 @@ #include "qpainter.h" #include "qevent.h" #include "qapplication.h" -#include +#include "qcombobox_p.h" #include "qdebug.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/widgets/qgroupbox.cpp b/src/gui/widgets/qgroupbox.cpp index 9075af201..51829e350 100644 --- a/src/gui/widgets/qgroupbox.cpp +++ b/src/gui/widgets/qgroupbox.cpp @@ -52,7 +52,7 @@ #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" #endif -#include +#include "qwidget_p.h" #include "qdebug.h" diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index 183ff9882..781923757 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -63,7 +63,7 @@ #include "qwhatsthis.h" #include "qdebug.h" #include "qtextedit.h" -#include +#include "qtextedit_p.h" #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" #endif diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index b80ab7f76..c4dfefaf8 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -55,7 +55,7 @@ #include "qstyle.h" #include "qdebug.h" #include "qpainter.h" -#include +#include "qwidget_p.h" #include "qtoolbar_p.h" #include "qwidgetanimator_p.h" diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp index de627c5f4..72f199e36 100644 --- a/src/gui/widgets/qmainwindowlayout.cpp +++ b/src/gui/widgets/qmainwindowlayout.cpp @@ -60,9 +60,9 @@ #include "qmap.h" #include "qtimer.h" #include "qdebug.h" -#include -#include -#include +#include "qapplication_p.h" +#include "qlayoutengine_p.h" +#include "qguicommon_p.h" #ifdef QT_NO_DOCKWIDGET extern QMainWindowLayout *qt_mainwindow_layout(const QMainWindow *window); diff --git a/src/gui/widgets/qmdiarea.cpp b/src/gui/widgets/qmdiarea.cpp index 81b771765..b5f4fe209 100644 --- a/src/gui/widgets/qmdiarea.cpp +++ b/src/gui/widgets/qmdiarea.cpp @@ -172,8 +172,8 @@ #include #include #include "qmath.h" -#include -#include +#include "qlayoutengine_p.h" +#include "qguicommon_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/widgets/qmdiarea_p.h b/src/gui/widgets/qmdiarea_p.h index 958128425..a586ade41 100644 --- a/src/gui/widgets/qmdiarea_p.h +++ b/src/gui/widgets/qmdiarea_p.h @@ -54,8 +54,8 @@ #include #include #include -#include -#include +#include "qmdisubwindow_p.h" +#include "qabstractscrollarea_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/widgets/qmdisubwindow_p.h b/src/gui/widgets/qmdisubwindow_p.h index 1c67e037b..570b6d8df 100644 --- a/src/gui/widgets/qmdisubwindow_p.h +++ b/src/gui/widgets/qmdisubwindow_p.h @@ -55,7 +55,7 @@ #include #include #include -#include +#include "qwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 99837aa9e..b4de0569a 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -56,15 +56,15 @@ #include "qwidgetaction.h" #include "qtoolbutton.h" #include "qpushbutton.h" -#include -#include +#include "qpushbutton_p.h" +#include "qaction_p.h" #ifndef QT_NO_ACCESSIBILITY # include "qaccessible.h" #endif #ifndef QT_NO_EFFECTS -# include +# include "qeffects_p.h" #endif #ifndef QT_NO_WHATSTHIS diff --git a/src/gui/widgets/qprintpreviewwidget.cpp b/src/gui/widgets/qprintpreviewwidget.cpp index 7a02990a3..1486f7a5c 100644 --- a/src/gui/widgets/qprintpreviewwidget.cpp +++ b/src/gui/widgets/qprintpreviewwidget.cpp @@ -41,7 +41,7 @@ #include "qprintpreviewwidget.h" #include "qwidget_p.h" -#include +#include "qprinter_p.h" #include #include diff --git a/src/gui/widgets/qprogressbar.cpp b/src/gui/widgets/qprogressbar.cpp index 70f9ee944..56dce0c8b 100644 --- a/src/gui/widgets/qprogressbar.cpp +++ b/src/gui/widgets/qprogressbar.cpp @@ -45,10 +45,11 @@ #include "qpainter.h" #include "qstylepainter.h" #include "qstyleoption.h" -#include +#include "qwidget_p.h" #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" #endif + #include QT_BEGIN_NAMESPACE diff --git a/src/gui/widgets/qpushbutton.cpp b/src/gui/widgets/qpushbutton.cpp index a1b58c8bd..5f5900026 100644 --- a/src/gui/widgets/qpushbutton.cpp +++ b/src/gui/widgets/qpushbutton.cpp @@ -43,7 +43,7 @@ #include "qbitmap.h" #include "qdesktopwidget.h" #include "qdialog.h" -#include +#include "qdialog_p.h" #include "qevent.h" #include "qfontmetrics.h" #include "qmenu.h" diff --git a/src/gui/widgets/qsizegrip.cpp b/src/gui/widgets/qsizegrip.cpp index 9f7bdee52..50c84509a 100644 --- a/src/gui/widgets/qsizegrip.cpp +++ b/src/gui/widgets/qsizegrip.cpp @@ -53,10 +53,10 @@ #include #if defined(Q_WS_X11) -#include +#include "qt_x11_p.h" #endif -#include +#include "qwidget_p.h" #include #define SZ_SIZEBOTTOMRIGHT 0xf008 diff --git a/src/gui/widgets/qspinbox.cpp b/src/gui/widgets/qspinbox.cpp index e438e2849..85cfbd16c 100644 --- a/src/gui/widgets/qspinbox.cpp +++ b/src/gui/widgets/qspinbox.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include "qabstractspinbox_p.h" #include "qspinbox.h" #ifndef QT_NO_SPINBOX diff --git a/src/gui/widgets/qsplashscreen.cpp b/src/gui/widgets/qsplashscreen.cpp index 6682d3a98..e448debc6 100644 --- a/src/gui/widgets/qsplashscreen.cpp +++ b/src/gui/widgets/qsplashscreen.cpp @@ -50,7 +50,7 @@ #include "qtextdocument.h" #include "qtextcursor.h" #include -#include +#include "qwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/widgets/qstackedwidget.cpp b/src/gui/widgets/qstackedwidget.cpp index 1ebeb4934..81ac75243 100644 --- a/src/gui/widgets/qstackedwidget.cpp +++ b/src/gui/widgets/qstackedwidget.cpp @@ -45,7 +45,7 @@ #include "qstackedlayout.h" #include "qevent.h" -#include +#include "qframe_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/widgets/qstatusbar.cpp b/src/gui/widgets/qstatusbar.cpp index 12f3a76e5..3342b2df3 100644 --- a/src/gui/widgets/qstatusbar.cpp +++ b/src/gui/widgets/qstatusbar.cpp @@ -57,8 +57,8 @@ #include "qaccessible.h" #endif -#include -#include +#include "qlayoutengine_p.h" +#include "qwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/widgets/qtoolbar.cpp b/src/gui/widgets/qtoolbar.cpp index 607cbab26..1e6f202f8 100644 --- a/src/gui/widgets/qtoolbar.cpp +++ b/src/gui/widgets/qtoolbar.cpp @@ -56,8 +56,8 @@ #include "qtoolbutton.h" #include "qwidgetaction.h" #include "qtimer.h" -#include -#include +#include "qwidgetaction_p.h" +#include "qmainwindowlayout_p.h" #include "qtoolbar_p.h" #include "qtoolbarlayout_p.h" diff --git a/src/gui/widgets/qtoolbarlayout_p.h b/src/gui/widgets/qtoolbarlayout_p.h index 318047389..573dcb6ce 100644 --- a/src/gui/widgets/qtoolbarlayout_p.h +++ b/src/gui/widgets/qtoolbarlayout_p.h @@ -46,7 +46,7 @@ // #include -#include +#include "qlayoutengine_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/gui/widgets/qtoolbutton.cpp b/src/gui/widgets/qtoolbutton.cpp index 435e90e59..85c21e2f3 100644 --- a/src/gui/widgets/qtoolbutton.cpp +++ b/src/gui/widgets/qtoolbutton.cpp @@ -56,9 +56,9 @@ #include "qtoolbar.h" #include "qvariant.h" #include "qstylepainter.h" -#include -#include -#include +#include "qabstractbutton_p.h" +#include "qaction_p.h" +#include "qmenu_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/widgets/qworkspace.cpp b/src/gui/widgets/qworkspace.cpp index 94e37cf19..32b252ea2 100644 --- a/src/gui/widgets/qworkspace.cpp +++ b/src/gui/widgets/qworkspace.cpp @@ -61,9 +61,9 @@ #include "qelapsedtimer.h" #include "qtooltip.h" #include "qdebug.h" -#include -#include -#include +#include "qwidget_p.h" +#include "qwidgetresizehandler_p.h" +#include "qlayoutengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp index 03f81ae93..46dfe2479 100644 --- a/src/imports/gestures/qdeclarativegesturearea.cpp +++ b/src/imports/gestures/qdeclarativegesturearea.cpp @@ -44,8 +44,8 @@ #include "qdeclarativeexpression.h" #include "qdeclarativecontext.h" #include "qdeclarativeinfo.h" -#include -#include +#include "qdeclarativeproperty_p.h" +#include "qdeclarativeitem_p.h" #include #include diff --git a/src/imports/gestures/qdeclarativegesturearea_p.h b/src/imports/gestures/qdeclarativegesturearea_p.h index 9aa326113..18de1d4fd 100644 --- a/src/imports/gestures/qdeclarativegesturearea_p.h +++ b/src/imports/gestures/qdeclarativegesturearea_p.h @@ -36,7 +36,7 @@ #include "qdeclarativeitem.h" #include "qdeclarativescriptstring.h" -#include +#include "qdeclarativecustomparser_p.h" #include #include diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp index 1eb55adcc..5784a9188 100644 --- a/src/imports/particles/qdeclarativeparticles.cpp +++ b/src/imports/particles/qdeclarativeparticles.cpp @@ -42,9 +42,9 @@ #include "qdeclarativeparticles_p.h" #include "qdeclarativeinfo.h" -#include +#include "qdeclarativeitem_p.h" -#include +#include "qdeclarativepixmapcache_p.h" #include #include diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp index a3f8dfae0..ab9b6f26f 100644 --- a/src/network/access/qftp.cpp +++ b/src/network/access/qftp.cpp @@ -57,7 +57,7 @@ #include "qhash.h" #include "qtcpserver.h" #include "qlocale.h" -#include +#include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 180e17246..6f615fc03 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include +#include "qabstractsocket_p.h" #include "qhttpnetworkconnection_p.h" #include "qhttpnetworkconnectionchannel_p.h" #include "qnoncontiguousbytedevice_p.h" -#include -#include -#include +#include "qnetworkrequest_p.h" +#include "qobject_p.h" +#include "qauthenticator_p.h" #include "qnetworkproxy.h" #include "qauthenticator.h" #include "qcoreapplication.h" @@ -57,7 +57,7 @@ #ifndef QT_NO_HTTP -#include +#include "qsslsocket_p.h" #include #include #include diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index e81f25276..dbb1e04a3 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -51,16 +51,16 @@ #include #include -#include +#include "qobject_p.h" #include "qauthenticator.h" #include "qnetworkproxy.h" #include "qbuffer.h" -#include -#include -#include +#include "qhttpnetworkheader_p.h" +#include "qhttpnetworkrequest_p.h" +#include "qhttpnetworkreply_p.h" -#include +#include "qhttpnetworkconnectionchannel_p.h" #ifndef QT_NO_HTTP diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h index 8e2e373ea..8a6ef039d 100644 --- a/src/network/access/qhttpnetworkconnectionchannel_p.h +++ b/src/network/access/qhttpnetworkconnectionchannel_p.h @@ -50,16 +50,16 @@ #include #include -#include +#include "qobject_p.h" #include "qauthenticator.h" #include "qnetworkproxy.h" #include "qbuffer.h" -#include -#include -#include +#include "qhttpnetworkheader_p.h" +#include "qhttpnetworkrequest_p.h" +#include "qhttpnetworkreply_p.h" -#include +#include "qhttpnetworkconnection_p.h" #ifndef QT_NO_HTTP diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index 774047b85..753ac6142 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -68,11 +68,11 @@ static const unsigned char gz_magic[2] = {0x1f, 0x8b}; // gzip magic header #include #include "qbuffer.h" -#include -#include -#include -#include -#include +#include "qobject_p.h" +#include "qhttpnetworkheader_p.h" +#include "qhttpnetworkrequest_p.h" +#include "qauthenticator_p.h" +#include "qbytedata_p.h" QT_BEGIN_NAMESPACE diff --git a/src/network/access/qhttpnetworkrequest_p.h b/src/network/access/qhttpnetworkrequest_p.h index b35f0fd79..c3fa0fe5c 100644 --- a/src/network/access/qhttpnetworkrequest_p.h +++ b/src/network/access/qhttpnetworkrequest_p.h @@ -46,7 +46,7 @@ // #ifndef QT_NO_HTTP -#include +#include "qhttpnetworkheader_p.h" QT_BEGIN_NAMESPACE diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp index aeb7f6d50..86423fc0e 100644 --- a/src/network/kernel/qauthenticator.cpp +++ b/src/network/kernel/qauthenticator.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qauthenticator.h" -#include +#include "qauthenticator_p.h" #include "qdebug.h" #include "qhash.h" #include "qbytearray.h" diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index c83cc632e..e90a936e9 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -49,7 +49,7 @@ #include "qstringlist.h" #include "qthread.h" #include "qurl.h" -#include +#include "qnetworksession_p.h" #ifdef Q_OS_UNIX # include diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp index c4050bfa2..5292570fb 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp @@ -49,7 +49,7 @@ #include "qbytearray.h" #include "qurl.h" #include "qfile.h" -#include +#include "qnet_unix_p.h" #include #include diff --git a/src/network/kernel/qnetworkinterface_p.h b/src/network/kernel/qnetworkinterface_p.h index 45db38c78..4a2545aba 100644 --- a/src/network/kernel/qnetworkinterface_p.h +++ b/src/network/kernel/qnetworkinterface_p.h @@ -51,7 +51,7 @@ #include #include #include -#include +#include "qhostaddress_p.h" #ifndef QT_NO_NETWORKINTERFACE diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 4e93c670f..876f516c2 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -379,8 +379,8 @@ #include "qelapsedtimer.h" #include "qscopedvaluerollback.h" #include "qsslsocket.h" -#include -#include +#include "qthread_p.h" +#include "qcore_unix_p.h" #include "qnetworkcommon_p.h" #ifdef QABSTRACTSOCKET_DEBUG diff --git a/src/network/socket/qlocalserver_p.h b/src/network/socket/qlocalserver_p.h index 38005a8a3..9a58f6347 100644 --- a/src/network/socket/qlocalserver_p.h +++ b/src/network/socket/qlocalserver_p.h @@ -50,7 +50,7 @@ #include "qlocalserver.h" #include "qobject_p.h" #include "qqueue.h" -#include +#include "qabstractsocketengine_p.h" #include "qsocketnotifier.h" QT_BEGIN_NAMESPACE diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp index 64e0ef802..e02f53dab 100644 --- a/src/network/socket/qnativesocketengine.cpp +++ b/src/network/socket/qnativesocketengine.cpp @@ -101,8 +101,8 @@ #include "qnetworkinterface.h" #include "qnativesocketengine_p.h" -#include -#include +#include "qthread_p.h" +#include "qobject_p.h" #if !defined(QT_NO_NETWORKPROXY) # include "qnetworkproxy.h" diff --git a/src/network/socket/qtcpsocket_p.h b/src/network/socket/qtcpsocket_p.h index dd17999c7..6ddf8fe45 100644 --- a/src/network/socket/qtcpsocket_p.h +++ b/src/network/socket/qtcpsocket_p.h @@ -46,7 +46,7 @@ // #include -#include +#include "qabstractsocket_p.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp index 0a0b2d66b..4eb5808af 100644 --- a/src/plugins/accessible/widgets/complexwidgets.cpp +++ b/src/plugins/accessible/widgets/complexwidgets.cpp @@ -55,7 +55,7 @@ #include "qtooltip.h" #include "qwhatsthis.h" #include "qtreeview.h" -#include +#include "qtabbar_p.h" #include #include #include diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp index c935ba234..d2dce428d 100644 --- a/src/plugins/accessible/widgets/itemviews.cpp +++ b/src/plugins/accessible/widgets/itemviews.cpp @@ -45,7 +45,7 @@ #include "qtableview.h" #include "qlistview.h" #include "qtreeview.h" -#include +#include "qtreewidget_p.h" #include "qaccessible2.h" #include diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp index 1f2989e62..5d1d8b665 100644 --- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp +++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp @@ -65,7 +65,7 @@ #include #include #include -#include +#include "qdockwidget_p.h" #include #ifndef QT_NO_ACCESSIBILITY diff --git a/src/plugins/accessible/widgets/rangecontrols.cpp b/src/plugins/accessible/widgets/rangecontrols.cpp index 7002392f4..fcbbfa909 100644 --- a/src/plugins/accessible/widgets/rangecontrols.cpp +++ b/src/plugins/accessible/widgets/rangecontrols.cpp @@ -52,7 +52,7 @@ #include #include #include "qmath.h" -#include +#include "qmath_p.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp index aea17e317..8eeb10a6b 100644 --- a/src/plugins/accessible/widgets/simplewidgets.cpp +++ b/src/plugins/accessible/widgets/simplewidgets.cpp @@ -53,7 +53,7 @@ #include "qlcdnumber.h" #include "qtextdocument.h" #include "qlineedit.h" -#include +#include "qlineedit_p.h" #include "qstyle.h" #include "qstyleoption.h" diff --git a/src/plugins/imageformats/gif/qgifplugin.cpp b/src/plugins/imageformats/gif/qgifplugin.cpp index 1147c152e..8c74ad8d5 100644 --- a/src/plugins/imageformats/gif/qgifplugin.cpp +++ b/src/plugins/imageformats/gif/qgifplugin.cpp @@ -47,7 +47,7 @@ #ifdef QT_NO_IMAGEFORMAT_GIF #undef QT_NO_IMAGEFORMAT_GIF #endif -#include +#include "qgifhandler_p.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/imageformats/jpeg/qjpegplugin.cpp b/src/plugins/imageformats/jpeg/qjpegplugin.cpp index c72af2d88..1be2db5bd 100644 --- a/src/plugins/imageformats/jpeg/qjpegplugin.cpp +++ b/src/plugins/imageformats/jpeg/qjpegplugin.cpp @@ -47,7 +47,7 @@ #ifdef QT_NO_IMAGEFORMAT_JPEG #undef QT_NO_IMAGEFORMAT_JPEG #endif -#include +#include "qjpeghandler_p.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/imageformats/mng/qmngplugin.cpp b/src/plugins/imageformats/mng/qmngplugin.cpp index c1f49b9d4..cf86c60d6 100644 --- a/src/plugins/imageformats/mng/qmngplugin.cpp +++ b/src/plugins/imageformats/mng/qmngplugin.cpp @@ -47,7 +47,7 @@ #ifdef QT_NO_IMAGEFORMAT_MNG #undef QT_NO_IMAGEFORMAT_MNG #endif -#include +#include "qmnghandler_p.h" #include "qiodevice.h" #include "qbytearray.h" diff --git a/src/plugins/imageformats/tiff/qtiffplugin.cpp b/src/plugins/imageformats/tiff/qtiffplugin.cpp index c6acaf58b..7d3afeec4 100644 --- a/src/plugins/imageformats/tiff/qtiffplugin.cpp +++ b/src/plugins/imageformats/tiff/qtiffplugin.cpp @@ -47,7 +47,7 @@ #ifdef QT_NO_IMAGEFORMAT_TIFF #undef QT_NO_IMAGEFORMAT_TIFF #endif -#include +#include "qtiffhandler_p.h" QT_BEGIN_NAMESPACE diff --git a/src/script/bridge/qscriptdeclarativeclass.cpp b/src/script/bridge/qscriptdeclarativeclass.cpp index 0ca3af86e..d8c9852cb 100644 --- a/src/script/bridge/qscriptdeclarativeclass.cpp +++ b/src/script/bridge/qscriptdeclarativeclass.cpp @@ -28,10 +28,10 @@ #include #include #include -#include -#include -#include -#include +#include "qscriptengine_p.h" +#include "qscriptvalue_p.h" +#include "qscriptqobject_p.h" +#include "qscriptactivationobject_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h index c51222bc9..1710ee5ef 100644 --- a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h b/src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h index e0e612c6f..453228ad6 100644 --- a/src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h +++ b/src/scripttools/debugging/qscriptcompletiontaskinterface_p_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qobject_p.h" #include #include diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h index 0f035c4de..cbd0746ea 100644 --- a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h index 4000212fb..7df7cc653 100644 --- a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h index 39022bb3a..058e8386e 100644 --- a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp index 56183c4a1..aaca48991 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp @@ -46,7 +46,7 @@ #include "qscriptdebuggerconsole_p.h" #include "qscriptdebuggerconsolecommandmanager_p.h" -#include +#include "qobject_p.h" #include diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h index cd9594fba..57ecd588b 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h index 89d926120..26258af02 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h index 828fb0551..63e328a82 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h index d4550160f..d47610b08 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h index 1a2a3a67d..60a564ce9 100644 --- a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptenginedebugger.cpp b/src/scripttools/debugging/qscriptenginedebugger.cpp index 8b115eb57..424101bce 100644 --- a/src/scripttools/debugging/qscriptenginedebugger.cpp +++ b/src/scripttools/debugging/qscriptenginedebugger.cpp @@ -43,7 +43,7 @@ #include "qscriptdebugger_p.h" #include "qscriptenginedebuggerfrontend_p.h" #include "qscriptdebuggerstandardwidgetfactory_p.h" -#include +#include "qobject_p.h" #include #include diff --git a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h index 46e84d6c1..ffc480c66 100644 --- a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h +++ b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p_p.h @@ -45,7 +45,7 @@ // We mean it. // -#include +#include "qwidget_p.h" QT_BEGIN_NAMESPACE diff --git a/src/shared/linguist/numerus.cpp b/src/shared/linguist/numerus.cpp index 20af17f2b..8c8180362 100644 --- a/src/shared/linguist/numerus.cpp +++ b/src/shared/linguist/numerus.cpp @@ -48,7 +48,7 @@ #include #include -#include +#include "qtranslator_p.h" QT_BEGIN_NAMESPACE diff --git a/src/shared/linguist/translator.cpp b/src/shared/linguist/translator.cpp index a845007bb..3336eec4b 100644 --- a/src/shared/linguist/translator.cpp +++ b/src/shared/linguist/translator.cpp @@ -52,7 +52,7 @@ #include #include -#include +#include "qtranslator_p.h" QT_BEGIN_NAMESPACE diff --git a/src/tools/designer/qdesigner.cpp b/src/tools/designer/qdesigner.cpp index 6c94055ce..a0f44ec6f 100644 --- a/src/tools/designer/qdesigner.cpp +++ b/src/tools/designer/qdesigner.cpp @@ -46,7 +46,7 @@ #include "qdesigner_workbench.h" #include "mainwindow.h" -#include +#include "qdesigner_propertysheet_p.h" #include #include diff --git a/src/tools/designer/qdesigner_actions.cpp b/src/tools/designer/qdesigner_actions.cpp index 8b8550b75..83006944e 100644 --- a/src/tools/designer/qdesigner_actions.cpp +++ b/src/tools/designer/qdesigner_actions.cpp @@ -52,13 +52,13 @@ #include "appfontdialog.h" #include -#include -#include +#include "qdesigner_formbuilder_p.h" +#include "qdesigner_utils_p.h" #include -#include +#include "qsimpleresource_p.h" #include #include -#include +#include "qdesigner_formwindowmanager_p.h" #include "qdesigner_integration_p.h" // sdk diff --git a/src/tools/designer/qdesigner_settings.cpp b/src/tools/designer/qdesigner_settings.cpp index 1089d058c..b43459836 100644 --- a/src/tools/designer/qdesigner_settings.cpp +++ b/src/tools/designer/qdesigner_settings.cpp @@ -46,7 +46,7 @@ #include #include -#include +#include "qdesigner_utils_p.h" #include #include diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 279fd6524..5332be362 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -44,7 +44,7 @@ #include #include -#include //for the flags. +#include "qmetaobject_p.h" //for the flags. QT_BEGIN_NAMESPACE diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 83d3dcdf2..8acac027e 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -45,7 +45,7 @@ #include "utils.h" // for normalizeTypeInternal -#include +#include "qmetaobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/uitools/abstractformbuilder.cpp b/src/uitools/abstractformbuilder.cpp index 29b004431..0c117ab2f 100644 --- a/src/uitools/abstractformbuilder.cpp +++ b/src/uitools/abstractformbuilder.cpp @@ -78,7 +78,7 @@ #include #include #ifndef QFORMINTERNAL_NAMESPACE -# include // Compiling within Designer +# include "qlayout_p.h" // Compiling within Designer #endif #include