From 67cb9e24e5cd08b07715cd1053b9cbd7ebbd560d Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@nokia.com>
Date: Wed, 5 Sep 2012 15:07:42 +0200
Subject: Removing duplicate includes

Do not include a header more than once

Change-Id: Ia2e5d66e72988ad833cf5177a3f8aa988bf510e9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/gui/image/qimage.cpp                | 1 -
 src/gui/image/qmovie.h                  | 1 -
 src/gui/image/qnativeimage.cpp          | 3 ---
 src/gui/kernel/qguiapplication.cpp      | 3 ---
 src/gui/kernel/qguivariant.cpp          | 4 ----
 src/gui/kernel/qplatformintegration.cpp | 1 -
 src/gui/text/qfontengine_ft.cpp         | 1 -
 7 files changed, 14 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index ef184c0a78..524ab9150d 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -64,7 +64,6 @@
 
 #include <qhash.h>
 
-#include <private/qguiapplication_p.h>
 #include <private/qpaintengine_raster_p.h>
 
 #include <private/qimage_p.h>
diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h
index e11dea6ad3..f0d52906b4 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>
 
 QT_BEGIN_HEADER
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index c562b0bd6d..2794f093f2 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -47,9 +47,6 @@
 
 #include "private/qpaintengine_raster_p.h"
 
-#include "private/qguiapplication_p.h"
-
-
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index d48112e0a4..f59c7dcf4a 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -66,11 +66,9 @@
 #include <private/qdrawhelper_p.h>
 
 #include <QtGui/qgenericpluginfactory.h>
-#include <qpa/qplatformintegration.h>
 #include <QtGui/qstylehints.h>
 #include <QtGui/qinputmethod.h>
 #include <QtGui/qpixmapcache.h>
-#include <qpa/qplatformtheme.h>
 #include <qpa/qplatforminputcontext.h>
 #include <qpa/qplatforminputcontext_p.h>
 
@@ -81,7 +79,6 @@
 
 #include "private/qdnd_p.h"
 #include <qpa/qplatformthemefactory_p.h>
-#include <qpa/qplatformdrag.h>
 
 #ifndef QT_NO_CURSOR
 #include <qpa/qplatformcursor.h>
diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp
index 8a5c083840..417dc4b742 100644
--- a/src/gui/kernel/qguivariant.cpp
+++ b/src/gui/kernel/qguivariant.cpp
@@ -39,15 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qvariant.h"
-
 // Gui types
 #include "qbitmap.h"
 #include "qbrush.h"
 #include "qcolor.h"
 #include "qcursor.h"
-#include "qdatastream.h"
-#include "qdebug.h"
 #include "qfont.h"
 #include "qimage.h"
 #include "qkeysequence.h"
diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp
index 85933de8b2..54ba3b6a2b 100644
--- a/src/gui/kernel/qplatformintegration.cpp
+++ b/src/gui/kernel/qplatformintegration.cpp
@@ -48,7 +48,6 @@
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <qpa/qplatformscreen_p.h>
-#include <qpa/qplatformtheme.h>
 #include <private/qdnd_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index af0a510980..946285b89d 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -53,7 +53,6 @@
 #include "qthreadstorage.h"
 #include <qmath.h>
 
-#include "qfontengine_ft_p.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_OUTLINE_H
-- 
cgit v1.2.3