diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-01 21:53:14 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-04 14:01:31 -0700 |
commit | f21522a4b4954cdd7b82f8bdd51dbe3a051840d0 (patch) | |
tree | b48af048daa19dd78abb8dc983d9542be49f0c48 /src/corelib/plugin | |
parent | 96a1da00d29b2367643c82f75be7cdc1dad3e2a0 (diff) |
src/corelib/plugin: sort #includes
Change-Id: I2de1b4dfacd443148279fffd16a3e4bdb1a49f88
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/plugin')
-rw-r--r-- | src/corelib/plugin/qfactoryloader.cpp | 24 | ||||
-rw-r--r-- | src/corelib/plugin/qfactoryloader_p.h | 13 | ||||
-rw-r--r-- | src/corelib/plugin/qlibrary.cpp | 30 | ||||
-rw-r--r-- | src/corelib/plugin/qlibrary_p.h | 3 | ||||
-rw-r--r-- | src/corelib/plugin/qlibrary_unix.cpp | 2 | ||||
-rw-r--r-- | src/corelib/plugin/qlibrary_win.cpp | 3 | ||||
-rw-r--r-- | src/corelib/plugin/qpluginloader.cpp | 9 |
7 files changed, 40 insertions, 44 deletions
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index 7e4a9f06fd..1784435371 100644 --- a/src/corelib/plugin/qfactoryloader.cpp +++ b/src/corelib/plugin/qfactoryloader.cpp @@ -42,22 +42,24 @@ #ifndef QT_NO_QOBJECT #include "qfactoryinterface.h" -#include "qmap.h" -#include <qdir.h> -#include <qdebug.h> -#include "qmutex.h" -#include "qplugin.h" -#include "qplugin_p.h" -#include "qpluginloader.h" -#include "private/qobject_p.h" + #include "private/qcoreapplication_p.h" +#include "private/qduplicatetracker_p.h" +#include "private/qobject_p.h" #include "qcbormap.h" #include "qcborvalue.h" +#include "qendian.h" +#include "qjsonarray.h" #include "qjsondocument.h" -#include "qjsonvalue.h" #include "qjsonobject.h" -#include "qjsonarray.h" -#include "private/qduplicatetracker_p.h" +#include "qjsonvalue.h" +#include "qmap.h" +#include "qmutex.h" +#include "qplugin.h" +#include "qplugin_p.h" +#include "qpluginloader.h" +#include <qdebug.h> +#include <qdir.h> #include <qtcore_tracepoints_p.h> diff --git a/src/corelib/plugin/qfactoryloader_p.h b/src/corelib/plugin/qfactoryloader_p.h index 7815ea0b5d..0ad62cc525 100644 --- a/src/corelib/plugin/qfactoryloader_p.h +++ b/src/corelib/plugin/qfactoryloader_p.h @@ -54,19 +54,18 @@ #include "QtCore/qglobal.h" #ifndef QT_NO_QOBJECT -#include "QtCore/qobject.h" -#include "QtCore/qstringlist.h" -#include "QtCore/qcborvalue.h" -#include "QtCore/qjsonobject.h" -#include "QtCore/qjsondocument.h" #include "QtCore/qmap.h" -#include "QtCore/qendian.h" +#include "QtCore/qobject.h" + #if QT_CONFIG(library) -#include "private/qlibrary_p.h" +# include "qlibrary_p.h" #endif QT_BEGIN_NAMESPACE +class QJsonDocument; +class QJsonObject; + QJsonDocument qJsonFromRawLibraryMetaData(const char *raw, qsizetype size, QString *errMsg); class QFactoryLoaderPrivate; diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index d8736c9edb..634dc5a00c 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -37,37 +37,31 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qplatformdefs.h" #include "qlibrary.h" - -#include "qfactoryloader_p.h" #include "qlibrary_p.h" -#include <qstringlist.h> + +#include <q20algorithm.h> +#include <qdebug.h> +#include <qendian.h> #include <qfile.h> #include <qfileinfo.h> -#include <qmutex.h> +#include <qjsondocument.h> #include <qmap.h> -#include <private/qcoreapplication_p.h> -#include <private/qsystemerror_p.h> +#include <qmutex.h> +#include <qstringlist.h> + #ifdef Q_OS_MAC # include <private/qcore_mac_p.h> #endif -#ifndef NO_ERRNO_H -#include <errno.h> -#endif // NO_ERROR_H -#include <qdebug.h> -#include <qlist.h> -#include <qdir.h> -#include <qendian.h> -#include <qjsondocument.h> -#include <qjsonvalue.h> +#include <private/qcoreapplication_p.h> +#include <private/qsystemerror_p.h> + #include "qelfparser_p.h" +#include "qfactoryloader_p.h" #include "qmachparser_p.h" #include <qtcore_tracepoints_p.h> -#include <QtCore/q20algorithm.h> - QT_BEGIN_NAMESPACE #ifdef QT_NO_DEBUG diff --git a/src/corelib/plugin/qlibrary_p.h b/src/corelib/plugin/qlibrary_p.h index 121ecae34e..b42816a469 100644 --- a/src/corelib/plugin/qlibrary_p.h +++ b/src/corelib/plugin/qlibrary_p.h @@ -53,11 +53,12 @@ // #include <QtCore/private/qglobal_p.h> + #include "QtCore/qlibrary.h" #include "QtCore/qmutex.h" +#include "QtCore/qplugin.h" #include "QtCore/qpointer.h" #include "QtCore/qstringlist.h" -#include "QtCore/qplugin.h" #ifdef Q_OS_WIN # include "QtCore/qt_windows.h" #endif diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp index 05b2c92284..c119bee2fc 100644 --- a/src/corelib/plugin/qlibrary_unix.cpp +++ b/src/corelib/plugin/qlibrary_unix.cpp @@ -40,9 +40,9 @@ #include "qplatformdefs.h" +#include <qcoreapplication.h> #include <qfile.h> #include "qlibrary_p.h" -#include <qcoreapplication.h> #include <private/qfilesystementry_p.h> #include <private/qsimd_p.h> diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp index 07f5a4b744..eab7255a7a 100644 --- a/src/corelib/plugin/qlibrary_win.cpp +++ b/src/corelib/plugin/qlibrary_win.cpp @@ -39,8 +39,9 @@ #include "qplatformdefs.h" #include "qlibrary_p.h" -#include "qfile.h" + #include "qdir.h" +#include "qfile.h" #include "qfileinfo.h" #include <private/qfilesystementry_p.h> diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp index 131506f73e..9afdf0e537 100644 --- a/src/corelib/plugin/qpluginloader.cpp +++ b/src/corelib/plugin/qpluginloader.cpp @@ -38,15 +38,14 @@ ** ****************************************************************************/ -#include "qplatformdefs.h" +#include "qpluginloader.h" -#include "qplugin.h" #include "qcoreapplication.h" -#include "qpluginloader.h" -#include <qfileinfo.h> -#include "qfactoryloader_p.h" #include "qdebug.h" #include "qdir.h" +#include "qfactoryloader_p.h" +#include "qfileinfo.h" +#include "qjsondocument.h" QT_BEGIN_NAMESPACE |