From 99d73216071af0f8f85535375d463d42053f4fd9 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 16 May 2012 18:14:18 +0200 Subject: [PATCH] Update the includes after QIcon was moved to back to QtGui Change-Id: I103c7c48f2280b22a8b224a82a07c29ffbae3c77 Reviewed-by: Lars Knoll --- examples/designer/arthurplugin/plugin.cpp | 2 +- src/assistant/assistant/bookmarkmodel.h | 2 +- src/designer/src/components/objectinspector/objectinspectormodel_p.h | 2 +- src/designer/src/components/propertyeditor/brushpropertymanager.h | 2 +- src/designer/src/components/propertyeditor/designerpropertymanager.h | 2 +- src/designer/src/components/widgetbox/widgetbox.cpp | 2 +- src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp | 2 +- src/designer/src/components/widgetbox/widgetboxtreewidget.h | 2 +- src/designer/src/designer/qdesigner.cpp | 2 +- src/designer/src/designer/qdesigner_actions.cpp | 2 +- src/designer/src/lib/sdk/abstractformeditor.cpp | 2 +- src/designer/src/lib/sdk/abstractwidgetbox.h | 2 +- src/designer/src/lib/shared/actionrepository_p.h | 2 +- src/designer/src/lib/shared/codedialog.cpp | 2 +- src/designer/src/lib/shared/dialoggui.cpp | 2 +- src/designer/src/lib/shared/iconloader.cpp | 2 +- src/designer/src/lib/shared/qdesigner_command_p.h | 2 +- src/designer/src/lib/shared/qdesigner_tabwidget_p.h | 2 +- src/designer/src/lib/shared/qdesigner_utils.cpp | 2 +- src/designer/src/lib/shared/qdesigner_utils_p.h | 2 +- src/designer/src/lib/shared/qsimpleresource.cpp | 2 +- src/designer/src/lib/shared/richtexteditor.cpp | 2 +- src/designer/src/lib/shared/widgetdatabase_p.h | 2 +- src/designer/src/lib/uilib/customwidget.h | 2 +- src/designer/src/lib/uilib/properties.cpp | 2 +- src/designer/src/lib/uilib/resourcebuilder.cpp | 2 +- src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp | 2 +- src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp | 2 +- src/shared/findwidget/abstractfindwidget.h | 2 +- src/shared/qtpropertybrowser/qtpropertybrowser.cpp | 2 +- src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h | 2 +- src/shared/qtpropertybrowser/qtpropertymanager.cpp | 2 +- src/shared/qtpropertybrowser/qttreepropertybrowser.cpp | 2 +- src/shared/qtpropertybrowser/qtvariantproperty.cpp | 2 +- src/shared/qtpropertybrowser/qtvariantproperty.h | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/examples/designer/arthurplugin/plugin.cpp b/examples/designer/arthurplugin/plugin.cpp index 6dfa41f..e6c966b 100644 --- a/examples/designer/arthurplugin/plugin.cpp +++ b/examples/designer/arthurplugin/plugin.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include "xform.h" diff --git a/src/assistant/assistant/bookmarkmodel.h b/src/assistant/assistant/bookmarkmodel.h index d5ce7af..45cb993 100644 --- a/src/assistant/assistant/bookmarkmodel.h +++ b/src/assistant/assistant/bookmarkmodel.h @@ -43,7 +43,7 @@ #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/designer/src/components/objectinspector/objectinspectormodel_p.h b/src/designer/src/components/objectinspector/objectinspectormodel_p.h index 2071194..dc18cf8 100644 --- a/src/designer/src/components/objectinspector/objectinspectormodel_p.h +++ b/src/designer/src/components/objectinspector/objectinspectormodel_p.h @@ -56,7 +56,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/designer/src/components/propertyeditor/brushpropertymanager.h b/src/designer/src/components/propertyeditor/brushpropertymanager.h index 4163a4d..30f34c6 100644 --- a/src/designer/src/components/propertyeditor/brushpropertymanager.h +++ b/src/designer/src/components/propertyeditor/brushpropertymanager.h @@ -44,7 +44,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.h b/src/designer/src/components/propertyeditor/designerpropertymanager.h index 3876f7e..75522a3 100644 --- a/src/designer/src/components/propertyeditor/designerpropertymanager.h +++ b/src/designer/src/components/propertyeditor/designerpropertymanager.h @@ -52,7 +52,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/designer/src/components/widgetbox/widgetbox.cpp b/src/designer/src/components/widgetbox/widgetbox.cpp index f44a3d6..590ef90 100644 --- a/src/designer/src/components/widgetbox/widgetbox.cpp +++ b/src/designer/src/components/widgetbox/widgetbox.cpp @@ -54,7 +54,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp index 14eb167..4f9666e 100644 --- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp +++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp @@ -46,7 +46,7 @@ #include -#include +#include #include #include #include diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.h b/src/designer/src/components/widgetbox/widgetboxtreewidget.h index 279e720..dd50b2e 100644 --- a/src/designer/src/components/widgetbox/widgetboxtreewidget.h +++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.h @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include // Cannot forward declare them on Mac diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp index 3eb937b..0cf8973 100644 --- a/src/designer/src/designer/qdesigner.cpp +++ b/src/designer/src/designer/qdesigner.cpp @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp index 8f39996..0b02045 100644 --- a/src/designer/src/designer/qdesigner_actions.cpp +++ b/src/designer/src/designer/qdesigner_actions.cpp @@ -81,7 +81,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/designer/src/lib/sdk/abstractformeditor.cpp b/src/designer/src/lib/sdk/abstractformeditor.cpp index f0e4789..a5f2dfe 100644 --- a/src/designer/src/lib/sdk/abstractformeditor.cpp +++ b/src/designer/src/lib/sdk/abstractformeditor.cpp @@ -66,7 +66,7 @@ #include #include -#include +#include // Must be done outside of the Qt namespace static void initResources() diff --git a/src/designer/src/lib/sdk/abstractwidgetbox.h b/src/designer/src/lib/sdk/abstractwidgetbox.h index bbcf0f8..159c951 100644 --- a/src/designer/src/lib/sdk/abstractwidgetbox.h +++ b/src/designer/src/lib/sdk/abstractwidgetbox.h @@ -47,7 +47,7 @@ #include #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/designer/src/lib/shared/actionrepository_p.h b/src/designer/src/lib/shared/actionrepository_p.h index 9f5f3eb..26c1f99 100644 --- a/src/designer/src/lib/shared/actionrepository_p.h +++ b/src/designer/src/lib/shared/actionrepository_p.h @@ -59,7 +59,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/codedialog.cpp b/src/designer/src/lib/shared/codedialog.cpp index ff2b687..7f5e3fa 100644 --- a/src/designer/src/lib/shared/codedialog.cpp +++ b/src/designer/src/lib/shared/codedialog.cpp @@ -52,7 +52,7 @@ #endif #include #include -#include +#include #include #include #include diff --git a/src/designer/src/lib/shared/dialoggui.cpp b/src/designer/src/lib/shared/dialoggui.cpp index 325a8a9..5aa0e00 100644 --- a/src/designer/src/lib/shared/dialoggui.cpp +++ b/src/designer/src/lib/shared/dialoggui.cpp @@ -42,7 +42,7 @@ #include "dialoggui_p.h" #include -#include +#include #include #include #include diff --git a/src/designer/src/lib/shared/iconloader.cpp b/src/designer/src/lib/shared/iconloader.cpp index 5202f1a..ed28cd3 100644 --- a/src/designer/src/lib/shared/iconloader.cpp +++ b/src/designer/src/lib/shared/iconloader.cpp @@ -42,7 +42,7 @@ #include "iconloader_p.h" #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_command_p.h b/src/designer/src/lib/shared/qdesigner_command_p.h index 4ab9a03..8ca63f0 100644 --- a/src/designer/src/lib/shared/qdesigner_command_p.h +++ b/src/designer/src/lib/shared/qdesigner_command_p.h @@ -62,7 +62,7 @@ #include -#include +#include #include #include #include diff --git a/src/designer/src/lib/shared/qdesigner_tabwidget_p.h b/src/designer/src/lib/shared/qdesigner_tabwidget_p.h index b9413a5..3706467 100644 --- a/src/designer/src/lib/shared/qdesigner_tabwidget_p.h +++ b/src/designer/src/lib/shared/qdesigner_tabwidget_p.h @@ -58,7 +58,7 @@ #include "qdesigner_utils_p.h" #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_utils.cpp b/src/designer/src/lib/shared/qdesigner_utils.cpp index c501166..5b6e618 100644 --- a/src/designer/src/lib/shared/qdesigner_utils.cpp +++ b/src/designer/src/lib/shared/qdesigner_utils.cpp @@ -59,7 +59,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/designer/src/lib/shared/qdesigner_utils_p.h b/src/designer/src/lib/shared/qdesigner_utils_p.h index 4ba70c1..0dbed23 100644 --- a/src/designer/src/lib/shared/qdesigner_utils_p.h +++ b/src/designer/src/lib/shared/qdesigner_utils_p.h @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qsimpleresource.cpp b/src/designer/src/lib/shared/qsimpleresource.cpp index d498db1..86f97bc 100644 --- a/src/designer/src/lib/shared/qsimpleresource.cpp +++ b/src/designer/src/lib/shared/qsimpleresource.cpp @@ -52,7 +52,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp index f244871..924d695 100644 --- a/src/designer/src/lib/shared/richtexteditor.cpp +++ b/src/designer/src/lib/shared/richtexteditor.cpp @@ -62,7 +62,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/designer/src/lib/shared/widgetdatabase_p.h b/src/designer/src/lib/shared/widgetdatabase_p.h index d86dddb..1c59317 100644 --- a/src/designer/src/lib/shared/widgetdatabase_p.h +++ b/src/designer/src/lib/shared/widgetdatabase_p.h @@ -58,7 +58,7 @@ #include -#include +#include #include #include #include diff --git a/src/designer/src/lib/uilib/customwidget.h b/src/designer/src/lib/uilib/customwidget.h index 6320f58..bfe0b18 100644 --- a/src/designer/src/lib/uilib/customwidget.h +++ b/src/designer/src/lib/uilib/customwidget.h @@ -45,7 +45,7 @@ #include "extension.h" #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/designer/src/lib/uilib/properties.cpp b/src/designer/src/lib/uilib/properties.cpp index 8b80066..c8ea346 100644 --- a/src/designer/src/lib/uilib/properties.cpp +++ b/src/designer/src/lib/uilib/properties.cpp @@ -49,7 +49,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/designer/src/lib/uilib/resourcebuilder.cpp b/src/designer/src/lib/uilib/resourcebuilder.cpp index 49cfc38..f1b4679 100644 --- a/src/designer/src/lib/uilib/resourcebuilder.cpp +++ b/src/designer/src/lib/uilib/resourcebuilder.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp b/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp index 3e7bdde..6e4dfa6 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp @@ -49,7 +49,7 @@ #include #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp b/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp index cf7298a..e07919e 100644 --- a/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp +++ b/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/src/shared/findwidget/abstractfindwidget.h b/src/shared/findwidget/abstractfindwidget.h index 9cbf828..0e595b9 100644 --- a/src/shared/findwidget/abstractfindwidget.h +++ b/src/shared/findwidget/abstractfindwidget.h @@ -42,7 +42,7 @@ #ifndef ABSTRACTFINDWIDGET_H #define ABSTRACTFINDWIDGET_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtpropertybrowser.cpp index 5b31db0..1adfab8 100644 --- a/src/shared/qtpropertybrowser/qtpropertybrowser.cpp +++ b/src/shared/qtpropertybrowser/qtpropertybrowser.cpp @@ -42,7 +42,7 @@ #include "qtpropertybrowser.h" #include #include -#include +#include #if defined(Q_CC_MSVC) # pragma warning(disable: 4786) /* MS VS 6: truncating debug info after 255 characters */ diff --git a/src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h b/src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h index 6b602ad..0928202 100644 --- a/src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h +++ b/src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h @@ -54,7 +54,7 @@ #define QTPROPERTYBROWSERUTILS_H #include -#include +#include #include #include diff --git a/src/shared/qtpropertybrowser/qtpropertymanager.cpp b/src/shared/qtpropertybrowser/qtpropertymanager.cpp index 1ccd191..9a53d67 100644 --- a/src/shared/qtpropertybrowser/qtpropertymanager.cpp +++ b/src/shared/qtpropertybrowser/qtpropertymanager.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp index 51cb01c..52e845b 100644 --- a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp +++ b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp @@ -41,7 +41,7 @@ #include "qttreepropertybrowser.h" #include -#include +#include #include #include #include diff --git a/src/shared/qtpropertybrowser/qtvariantproperty.cpp b/src/shared/qtpropertybrowser/qtvariantproperty.cpp index bdc0b0c..d01b7f9 100644 --- a/src/shared/qtpropertybrowser/qtvariantproperty.cpp +++ b/src/shared/qtpropertybrowser/qtvariantproperty.cpp @@ -43,7 +43,7 @@ #include "qtpropertymanager.h" #include "qteditorfactory.h" #include -#include +#include #include #include diff --git a/src/shared/qtpropertybrowser/qtvariantproperty.h b/src/shared/qtpropertybrowser/qtvariantproperty.h index 0306c93..a4e9610 100644 --- a/src/shared/qtpropertybrowser/qtvariantproperty.h +++ b/src/shared/qtpropertybrowser/qtvariantproperty.h @@ -44,7 +44,7 @@ #include "qtpropertybrowser.h" #include -#include +#include QT_BEGIN_NAMESPACE -- 2.7.4