diff options
author | Ahmad Samir <[email protected]> | 2023-01-20 19:21:30 +0200 |
---|---|---|
committer | Ahmad Samir <[email protected]> | 2023-01-31 20:15:58 +0200 |
commit | 6ff4c3d787ecc2e6d2740f22d0406b34346faede (patch) | |
tree | 8bbc9ddf4e751abdd212b8413d6da066ae55de92 | |
parent | fe90f8aa45e792c386b1cba7121e58e3402a9a5d (diff) |
Remove redundant qsharedpointer.h #includes
In some cases added #include <QtCore/qshareddata.h>.
Change-Id: Idc84c4ad6b0bd58e1a67af335dfcff67fdf80b2a
Reviewed-by: Thiago Macieira <[email protected]>
-rw-r--r-- | src/corelib/kernel/qobject.cpp | 1 | ||||
-rw-r--r-- | src/corelib/kernel/qobject_p.h | 2 | ||||
-rw-r--r-- | src/gui/accessible/linux/atspiadaptor_p.h | 1 | ||||
-rw-r--r-- | src/gui/image/qpicture.h | 2 | ||||
-rw-r--r-- | src/gui/image/qpixmap.h | 2 | ||||
-rw-r--r-- | src/gui/painting/qpagelayout.h | 2 | ||||
-rw-r--r-- | src/gui/text/qfont.h | 2 | ||||
-rw-r--r-- | src/gui/text/qfontengineglyphcache_p.h | 2 | ||||
-rw-r--r-- | src/gui/text/qfontinfo.h | 1 | ||||
-rw-r--r-- | src/gui/text/qfontmetrics.h | 1 | ||||
-rw-r--r-- | src/gui/text/qglyphrun.h | 2 | ||||
-rw-r--r-- | src/gui/text/qglyphrun_p.h | 1 | ||||
-rw-r--r-- | src/network/kernel/qdnslookup.h | 1 | ||||
-rw-r--r-- | src/network/kernel/qdnslookup_p.h | 1 | ||||
-rw-r--r-- | src/network/kernel/qhostinfo_p.h | 2 | ||||
-rw-r--r-- | src/network/ssl/qsslcertificate.h | 2 | ||||
-rw-r--r-- | src/network/ssl/qsslkey.h | 2 | ||||
-rw-r--r-- | src/network/ssl/qtlsbackend_p.h | 1 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbdrag.h | 1 |
19 files changed, 10 insertions, 19 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 81bcf19114b..00309b53f41 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -28,7 +28,6 @@ #if QT_CONFIG(thread) #include <qsemaphore.h> #endif -#include <qsharedpointer.h> #include <private/qorderedmutexlocker_p.h> #include <private/qhooks_p.h> diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index dbb4eb2326a..3680e15ac3a 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -21,9 +21,9 @@ #include "QtCore/qlist.h" #include "QtCore/qobject.h" #include "QtCore/qpointer.h" -#include "QtCore/qsharedpointer.h" #include "QtCore/qvariant.h" #include "QtCore/qproperty.h" +#include <QtCore/qshareddata.h> #include "QtCore/private/qproperty_p.h" #include <string> diff --git a/src/gui/accessible/linux/atspiadaptor_p.h b/src/gui/accessible/linux/atspiadaptor_p.h index c9877f048c0..3a890f3d7d1 100644 --- a/src/gui/accessible/linux/atspiadaptor_p.h +++ b/src/gui/accessible/linux/atspiadaptor_p.h @@ -19,7 +19,6 @@ #include <atspi/atspi-constants.h> #include <QtGui/private/qtguiglobal_p.h> -#include <QtCore/qsharedpointer.h> #include <QtDBus/qdbusvirtualobject.h> #include <QtGui/qaccessible.h> diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h index c8b0966a28b..bc8be6c4e9a 100644 --- a/src/gui/image/qpicture.h +++ b/src/gui/image/qpicture.h @@ -6,8 +6,8 @@ #include <QtGui/qtguiglobal.h> #include <QtCore/qiodevice.h> +#include <QtCore/qshareddata.h> #include <QtCore/qstringlist.h> -#include <QtCore/qsharedpointer.h> #include <QtGui/qpaintdevice.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index b6fa5da8afa..5be98be14d8 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -8,8 +8,8 @@ #include <QtGui/qpaintdevice.h> #include <QtGui/qcolor.h> #include <QtCore/qnamespace.h> +#include <QtCore/qshareddata.h> #include <QtCore/qstring.h> // char*->QString conversion -#include <QtCore/qsharedpointer.h> #include <QtGui/qimage.h> #include <QtGui/qtransform.h> diff --git a/src/gui/painting/qpagelayout.h b/src/gui/painting/qpagelayout.h index 04f58bd403c..29be2f97254 100644 --- a/src/gui/painting/qpagelayout.h +++ b/src/gui/painting/qpagelayout.h @@ -5,7 +5,7 @@ #define QPAGELAYOUT_H #include <QtGui/qtguiglobal.h> -#include <QtCore/qsharedpointer.h> +#include <QtCore/qshareddata.h> #include <QtCore/qstring.h> #include <QtCore/qmargins.h> diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index 7fb591b51da..6a5c8903950 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -4,10 +4,10 @@ #ifndef QFONT_H #define QFONT_H +#include <QtCore/qshareddata.h> #include <QtGui/qtguiglobal.h> #include <QtGui/qwindowdefs.h> #include <QtCore/qstring.h> -#include <QtCore/qsharedpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/text/qfontengineglyphcache_p.h b/src/gui/text/qfontengineglyphcache_p.h index b829b797882..9054ea59506 100644 --- a/src/gui/text/qfontengineglyphcache_p.h +++ b/src/gui/text/qfontengineglyphcache_p.h @@ -15,7 +15,7 @@ // We mean it. // - +#include <QtCore/qshareddata.h> #include <QtGui/private/qtguiglobal_p.h> #include "QtCore/qatomic.h" #include <QtCore/qvarlengtharray.h> diff --git a/src/gui/text/qfontinfo.h b/src/gui/text/qfontinfo.h index 5818ca0d000..c162003801f 100644 --- a/src/gui/text/qfontinfo.h +++ b/src/gui/text/qfontinfo.h @@ -6,7 +6,6 @@ #include <QtGui/qtguiglobal.h> #include <QtGui/qfont.h> -#include <QtCore/qsharedpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h index 18b54861f02..8f16ccb5a73 100644 --- a/src/gui/text/qfontmetrics.h +++ b/src/gui/text/qfontmetrics.h @@ -6,7 +6,6 @@ #include <QtGui/qtguiglobal.h> #include <QtGui/qfont.h> -#include <QtCore/qsharedpointer.h> #ifndef QT_INCLUDE_COMPAT #include <QtCore/qrect.h> #endif diff --git a/src/gui/text/qglyphrun.h b/src/gui/text/qglyphrun.h index a338a35bc12..88f9957dd8a 100644 --- a/src/gui/text/qglyphrun.h +++ b/src/gui/text/qglyphrun.h @@ -7,8 +7,8 @@ #include <QtGui/qtguiglobal.h> #include <QtCore/qlist.h> #include <QtCore/qpoint.h> -#include <QtCore/qsharedpointer.h> #include <QtGui/qrawfont.h> +#include <QtCore/qshareddata.h> #if !defined(QT_NO_RAWFONT) diff --git a/src/gui/text/qglyphrun_p.h b/src/gui/text/qglyphrun_p.h index c95ec8ab7f7..db160344c67 100644 --- a/src/gui/text/qglyphrun_p.h +++ b/src/gui/text/qglyphrun_p.h @@ -15,6 +15,7 @@ // We mean it. // +#include <QtCore/qshareddata.h> #include <QtGui/private/qtguiglobal_p.h> #include "qglyphrun.h" #include "qrawfont.h" diff --git a/src/network/kernel/qdnslookup.h b/src/network/kernel/qdnslookup.h index b0bb34ee755..bf31b81da1a 100644 --- a/src/network/kernel/qdnslookup.h +++ b/src/network/kernel/qdnslookup.h @@ -8,7 +8,6 @@ #include <QtCore/qlist.h> #include <QtCore/qobject.h> #include <QtCore/qshareddata.h> -#include <QtCore/qsharedpointer.h> #include <QtCore/qstring.h> #include <QtCore/qproperty.h> diff --git a/src/network/kernel/qdnslookup_p.h b/src/network/kernel/qdnslookup_p.h index 21262346b5c..995640362cc 100644 --- a/src/network/kernel/qdnslookup_p.h +++ b/src/network/kernel/qdnslookup_p.h @@ -18,7 +18,6 @@ #include <QtNetwork/private/qtnetworkglobal_p.h> #include "QtCore/qmutex.h" #include "QtCore/qrunnable.h" -#include "QtCore/qsharedpointer.h" #if QT_CONFIG(thread) #include "QtCore/qthreadpool.h" #endif diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index 22b6ccc0177..2176b464aed 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/src/network/kernel/qhostinfo_p.h @@ -34,8 +34,6 @@ #include <QElapsedTimer> #include <QCache> -#include <QSharedPointer> - #include <atomic> QT_BEGIN_NAMESPACE diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index 5807c8d2c77..cdf11b28b07 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -14,8 +14,8 @@ #include <QtCore/qbytearray.h> #include <QtCore/qcryptographichash.h> #include <QtCore/qdatetime.h> -#include <QtCore/qsharedpointer.h> #include <QtCore/qmap.h> +#include <QtCore/qshareddata.h> #include <QtNetwork/qssl.h> QT_BEGIN_NAMESPACE diff --git a/src/network/ssl/qsslkey.h b/src/network/ssl/qsslkey.h index db14c89c98a..decfc4b5a11 100644 --- a/src/network/ssl/qsslkey.h +++ b/src/network/ssl/qsslkey.h @@ -8,7 +8,7 @@ #include <QtNetwork/qtnetworkglobal.h> #include <QtCore/qnamespace.h> #include <QtCore/qbytearray.h> -#include <QtCore/qsharedpointer.h> +#include <QtCore/qshareddata.h> #include <QtNetwork/qssl.h> QT_BEGIN_NAMESPACE diff --git a/src/network/ssl/qtlsbackend_p.h b/src/network/ssl/qtlsbackend_p.h index c69e6418549..76fa0994f57 100644 --- a/src/network/ssl/qtlsbackend_p.h +++ b/src/network/ssl/qtlsbackend_p.h @@ -31,7 +31,6 @@ #include <QtNetwork/qssl.h> #include <QtCore/qloggingcategory.h> -#include <QtCore/qsharedpointer.h> #include <QtCore/qnamespace.h> #include <QtCore/qobject.h> #include <QtCore/qglobal.h> diff --git a/src/plugins/platforms/xcb/qxcbdrag.h b/src/plugins/platforms/xcb/qxcbdrag.h index a58b7e850e4..5f49b0fd57c 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.h +++ b/src/plugins/platforms/xcb/qxcbdrag.h @@ -14,7 +14,6 @@ #include <qpoint.h> #include <qpointer.h> #include <qrect.h> -#include <qsharedpointer.h> #include <qxcbobject.h> #include <QtCore/QDebug> |