From: Ivailo Monev <xakepa10@laimg.moc>
Date: Sun, 12 May 2019 17:57:07 +0000 (+0000)
Subject: remove duplicate headers inclusions
X-Git-Tag: 4.12.0~6126
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b06e9227c535bc48068865bc7e0d4e3c972e02dd;p=kde%2FKatie.git

remove duplicate headers inclusions

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index b789e142b..e5d2273ae 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -62,7 +62,6 @@
 #include "qdeclarativelayoutitem_p.h"
 #include "qdeclarativelistview_p.h"
 #include "qdeclarativeloader_p.h"
-#include "qdeclarativemousearea_p.h"
 #include "qdeclarativepath_p.h"
 #include "qdeclarativepathview_p.h"
 #include "qdeclarativerectangle_p.h"
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index db8cfd7f7..42f310cf6 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -57,8 +57,7 @@
 #include <QMutex>
 #include <QWaitCondition>
 #include <QBuffer>
-#include <QWaitCondition>
-#include <QtCore/qdebug.h>
+#include <QDebug>
 #include <qobject_p.h>
 #include <QSslError>
 
diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h
index 3b6568ccf..82db99bfd 100644
--- a/src/gui/image/qmovie.h
+++ b/src/gui/image/qmovie.h
@@ -48,7 +48,6 @@
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qlist.h>
-#include <QtCore/qobject.h>
 #include <QtGui/qimagereader.h>
 
 
@@ -56,7 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-
 class QByteArray;
 class QColor;
 class QIODevice;
diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp
index 2f63242e0..7660a7c4d 100644
--- a/src/gui/image/qpixmap_raster.cpp
+++ b/src/gui/image/qpixmap_raster.cpp
@@ -48,7 +48,6 @@
 #include "qimage.h"
 #include "qbuffer.h"
 #include "qimagereader.h"
-#include "qimage_p.h"
 #include "qwidget_p.h"
 #include "qdrawhelper_p.h"
 #include "qguicommon_p.h"
diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h
index 4bb17ef70..662835990 100644
--- a/src/gui/itemviews/qabstractitemview_p.h
+++ b/src/gui/itemviews/qabstractitemview_p.h
@@ -64,7 +64,6 @@
 #include "QtGui/qevent.h"
 #include "QtGui/qpainter.h"
 #include "QtGui/qregion.h"
-#include "QtGui/qpainter.h"
 
 #ifndef QT_NO_ITEMVIEWS
 
diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp
index f22fc2a9d..e516e3dda 100644
--- a/src/gui/kernel/qx11embed_x11.cpp
+++ b/src/gui/kernel/qx11embed_x11.cpp
@@ -55,9 +55,6 @@
 #include <qt_x11_p.h>
 
 //#define QX11EMBED_DEBUG
-#ifdef QX11EMBED_DEBUG
-#include <qdebug.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index bd145fadb..c90789187 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -50,7 +50,6 @@
 #ifdef Q_WS_X11
 #include "qpixmap_x11_p.h"
 #include "qt_x11_p.h"
-#include "qwidget_p.h"
 #include "qx11info_x11.h"
 #endif
 #include "qdrawhelper_p.h"
diff --git a/src/gui/text/qfontdatabase_x11.h b/src/gui/text/qfontdatabase_x11.h
index ae55476b8..3bb4322db 100644
--- a/src/gui/text/qfontdatabase_x11.h
+++ b/src/gui/text/qfontdatabase_x11.h
@@ -43,7 +43,6 @@
 #include <qdebug.h>
 #include <qpaintdevice.h>
 #include <qelapsedtimer.h>
-#include <qdebug.h>
 #include <qfile.h>
 #include <qtemporaryfile.h>
 #include <qabstractfileengine.h>
diff --git a/src/gui/widgets/qlineedit_p.h b/src/gui/widgets/qlineedit_p.h
index a7d361eeb..794c96e07 100644
--- a/src/gui/widgets/qlineedit_p.h
+++ b/src/gui/widgets/qlineedit_p.h
@@ -63,7 +63,6 @@
 #include "QtCore/qbasictimer.h"
 #include "QtGui/qcompleter.h"
 #include "QtCore/qpointer.h"
-#include "QtGui/qlineedit.h"
 
 #include "qlinecontrol_p.h"
 
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index 83a160ef5..8638a2b5c 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -53,9 +53,6 @@
 #ifndef QT_NO_IPV6IFNAME
 #include <net/if.h>
 #endif
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
 #ifdef QT_LINUXBASE
 #include <arpa/inet.h>
 #endif
diff --git a/src/shared/qtgradienteditor/qtgradientmanager.h b/src/shared/qtgradienteditor/qtgradientmanager.h
index 6ecb82710..c2e8526f3 100644
--- a/src/shared/qtgradienteditor/qtgradientmanager.h
+++ b/src/shared/qtgradienteditor/qtgradientmanager.h
@@ -46,7 +46,6 @@
 #include <QtCore/QMap>
 #include <QtCore/QSize>
 #include <QtXml/qdom.h>
-#include <QtXml/qdom.h>
 #include <QtGui/qbrush.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/shared/qtgradienteditor/qtgradientutils.cpp b/src/shared/qtgradienteditor/qtgradientutils.cpp
index 6c98dcea0..bc283b4e4 100644
--- a/src/shared/qtgradienteditor/qtgradientutils.cpp
+++ b/src/shared/qtgradienteditor/qtgradientutils.cpp
@@ -42,8 +42,6 @@
 #include "qtgradientutils.h"
 #include "qtgradientmanager.h"
 #include <QtGui/qbrush.h>
-#include <QtGui/qbrush.h>
-#include <QtGui/qbrush.h>
 #include <QtXml/qdom.h>
 #include <QtCore/QDebug>