diff options
author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-09-05 15:07:42 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-09 18:30:43 +0200 |
commit | 67cb9e24e5cd08b07715cd1053b9cbd7ebbd560d (patch) | |
tree | d10e87d6aa52b4d1bdb7dec9f71a6df9ac3c32eb /src/widgets | |
parent | 4d3a53305f8638ff60d32a548d94b3c603e5ffcd (diff) |
Removing duplicate includes
Do not include a header more than once
Change-Id: Ia2e5d66e72988ad833cf5177a3f8aa988bf510e9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/dialogs/qdialog.cpp | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qfilesystemmodel_p.h | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qabstractitemview_p.h | 1 | ||||
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 7 | ||||
-rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 1 | ||||
-rw-r--r-- | src/widgets/styles/qstylesheetstyle.cpp | 1 | ||||
-rw-r--r-- | src/widgets/styles/qwindowsmobilestyle.cpp | 2 | ||||
-rw-r--r-- | src/widgets/styles/qwindowsvistastyle_p.h | 2 | ||||
-rw-r--r-- | src/widgets/util/qcompleter.cpp | 1 | ||||
-rw-r--r-- | src/widgets/util/qsystemtrayicon.cpp | 1 | ||||
-rw-r--r-- | src/widgets/widgets/qdialogbuttonbox.cpp | 5 | ||||
-rw-r--r-- | src/widgets/widgets/qlineedit_p.h | 1 | ||||
-rw-r--r-- | src/widgets/widgets/qmainwindowlayout.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qmenu.cpp | 1 | ||||
-rw-r--r-- | src/widgets/widgets/qwidgetlinecontrol_p.h | 2 |
15 files changed, 2 insertions, 28 deletions
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 0e57a16757..efb850d615 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -55,7 +55,6 @@ #include <qpa/qplatformtheme.h> #include "private/qdialog_p.h" #include "private/qguiapplication_p.h" -#include <qpa/qplatformtheme.h> #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" #endif diff --git a/src/widgets/dialogs/qfilesystemmodel_p.h b/src/widgets/dialogs/qfilesystemmodel_p.h index 3a02b91b09..48bd82d7d9 100644 --- a/src/widgets/dialogs/qfilesystemmodel_p.h +++ b/src/widgets/dialogs/qfilesystemmodel_p.h @@ -63,8 +63,6 @@ #include <qpair.h> #include <qdir.h> #include <qicon.h> -#include <qdir.h> -#include <qicon.h> #include <qfileinfo.h> #include <qtimer.h> #include <qhash.h> diff --git a/src/widgets/itemviews/qabstractitemview_p.h b/src/widgets/itemviews/qabstractitemview_p.h index dc2b2dfa90..4575dd3847 100644 --- a/src/widgets/itemviews/qabstractitemview_p.h +++ b/src/widgets/itemviews/qabstractitemview_p.h @@ -62,7 +62,6 @@ #include "QtCore/qpair.h" #include "QtGui/qregion.h" #include "QtCore/qdebug.h" -#include "QtGui/qpainter.h" #include "QtCore/qbasictimer.h" #include "QtCore/qelapsedtimer.h" diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 34b2893e89..7e672f4725 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -88,24 +88,21 @@ #include "private/qevent_p.h" #include "qwidget_p.h" -#include "qapplication.h" - #include "qgesture.h" #include "private/qgesturemanager_p.h" -#include "private/qguiapplication_p.h" #include <qpa/qplatformfontdatabase.h> #ifndef QT_NO_LIBRARY #include "qlibrary.h" #endif -#ifdef Q_OS_WINCE #include "qdatetime.h" + +#ifdef Q_OS_WINCE extern bool qt_wince_is_smartphone(); //qguifunctions_wince.cpp extern bool qt_wince_is_mobile(); //qguifunctions_wince.cpp extern bool qt_wince_is_pocket_pc(); //qguifunctions_wince.cpp #endif -#include "qdatetime.h" #include <qpa/qplatformwindow.h> //#define ALIEN_DEBUG diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index da6298a4b5..417a043977 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -70,7 +70,6 @@ #include <qdebug.h> #include <qtextformat.h> #include <qwizard.h> -#include <qtabbar.h> #include <qfileinfo.h> #include <qdir.h> #include <qsettings.h> diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index ffbf7c2f5b..d25092bfbc 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -54,7 +54,6 @@ #include <qlineedit.h> #include <qwindowsstyle.h> #include <qcombobox.h> -#include <qwindowsstyle.h> #include <qplastiquestyle.h> #include "private/qcssparser_p.h" #include "private/qmath_p.h" diff --git a/src/widgets/styles/qwindowsmobilestyle.cpp b/src/widgets/styles/qwindowsmobilestyle.cpp index 863bd1aa62..6b36260e71 100644 --- a/src/widgets/styles/qwindowsmobilestyle.cpp +++ b/src/widgets/styles/qwindowsmobilestyle.cpp @@ -61,8 +61,6 @@ #include "qabstractscrollarea.h" #include "qabstractbutton.h" #include "qcombobox.h" -#include "qabstractscrollarea.h" -#include "qframe.h" #include "qscrollbar.h" #include "qabstractitemview.h" #include "qmenubar.h" diff --git a/src/widgets/styles/qwindowsvistastyle_p.h b/src/widgets/styles/qwindowsvistastyle_p.h index cdb1227319..494d9fa836 100644 --- a/src/widgets/styles/qwindowsvistastyle_p.h +++ b/src/widgets/styles/qwindowsvistastyle_p.h @@ -82,8 +82,6 @@ #include <qmessagebox.h> #include <qdialogbuttonbox.h> #include <qinputdialog.h> -#include <qtreeview.h> -#include <qlistview.h> #include <qtableview.h> #include <qbasictimer.h> #include <qdatetime.h> diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp index 245857b3c3..f6277341fb 100644 --- a/src/widgets/util/qcompleter.cpp +++ b/src/widgets/util/qcompleter.cpp @@ -154,7 +154,6 @@ #include "QtWidgets/qlistview.h" #include "QtWidgets/qapplication.h" #include "QtGui/qevent.h" -#include "QtWidgets/qheaderview.h" #include "QtWidgets/qdesktopwidget.h" #include "QtWidgets/qlineedit.h" diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp index 9e667b1781..e88a03a477 100644 --- a/src/widgets/util/qsystemtrayicon.cpp +++ b/src/widgets/util/qsystemtrayicon.cpp @@ -57,7 +57,6 @@ #include "qdesktopwidget.h" #include "qbitmap.h" #include "private/qlabel_p.h" -#include "qapplication.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp index a7d923fb07..6028d96634 100644 --- a/src/widgets/widgets/qdialogbuttonbox.cpp +++ b/src/widgets/widgets/qdialogbuttonbox.cpp @@ -50,11 +50,6 @@ #include "qdialogbuttonbox.h" -#ifdef QT_SOFTKEYS_ENABLED -#include <QtWidgets/qaction.h> -#endif - - QT_BEGIN_NAMESPACE /*! diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h index d6af91fd65..2d02694f66 100644 --- a/src/widgets/widgets/qlineedit_p.h +++ b/src/widgets/widgets/qlineedit_p.h @@ -64,7 +64,6 @@ #include "QtWidgets/qcompleter.h" #include "QtCore/qpointer.h" #include "QtCore/qmimedata.h" -#include "QtWidgets/qlineedit.h" #include "private/qwidgetlinecontrol_p.h" diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index 6446453a6b..6a72a32511 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -47,12 +47,10 @@ #include "qdockwidget_p.h" #include "qtoolbar_p.h" #include "qmainwindow.h" -#include "qmainwindowlayout_p.h" #include "qtoolbar.h" #include "qtoolbarlayout_p.h" #include "qwidgetanimator_p.h" #include "qrubberband.h" -#include "qdockwidget_p.h" #include "qtabbar_p.h" #include <qapplication.h> diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index b201179661..c8d2b39ca3 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -71,7 +71,6 @@ #include <private/qaction_p.h> #include <private/qsoftkeymanager_p.h> #include <private/qguiapplication_p.h> -#include <qpa/qplatformtheme.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h index 2dce790c1e..3e7dd227cd 100644 --- a/src/widgets/widgets/qwidgetlinecontrol_p.h +++ b/src/widgets/widgets/qwidgetlinecontrol_p.h @@ -69,8 +69,6 @@ #include "qplatformdefs.h" -#include "qplatformdefs.h" - QT_BEGIN_HEADER #ifdef DrawText |