diff options
Diffstat (limited to 'src/plugins/designer')
48 files changed, 161 insertions, 161 deletions
diff --git a/src/plugins/designer/codemodelhelpers.cpp b/src/plugins/designer/codemodelhelpers.cpp index c18d206c39..0cf6eb48df 100644 --- a/src/plugins/designer/codemodelhelpers.cpp +++ b/src/plugins/designer/codemodelhelpers.cpp @@ -48,8 +48,8 @@ #include <projectexplorer/session.h> #include <utils/qtcassert.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> +#include <QCoreApplication> +#include <QDebug> // Debug helpers for code model. @todo: Move to some CppTools library? diff --git a/src/plugins/designer/codemodelhelpers.h b/src/plugins/designer/codemodelhelpers.h index 5b2d6e7536..f6291c6184 100644 --- a/src/plugins/designer/codemodelhelpers.h +++ b/src/plugins/designer/codemodelhelpers.h @@ -33,7 +33,7 @@ #ifndef CODEMODELHELPERS_H #define CODEMODELHELPERS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/designer/cpp/cppsettingspage.cpp b/src/plugins/designer/cpp/cppsettingspage.cpp index e9c28d69c1..b55df33b80 100644 --- a/src/plugins/designer/cpp/cppsettingspage.cpp +++ b/src/plugins/designer/cpp/cppsettingspage.cpp @@ -33,8 +33,8 @@ #include "cppsettingspage.h" #include "designerconstants.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QTextStream> +#include <QCoreApplication> +#include <QTextStream> #include <coreplugin/icore.h> namespace Designer { diff --git a/src/plugins/designer/cpp/cppsettingspage.h b/src/plugins/designer/cpp/cppsettingspage.h index 1227ad0b7f..16b2fc689d 100644 --- a/src/plugins/designer/cpp/cppsettingspage.h +++ b/src/plugins/designer/cpp/cppsettingspage.h @@ -38,7 +38,7 @@ #include <coreplugin/dialogs/ioptionspage.h> -#include <QtCore/QPointer> +#include <QPointer> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/cpp/formclasswizard.cpp b/src/plugins/designer/cpp/formclasswizard.cpp index fe5e5155d6..4e3c1e029c 100644 --- a/src/plugins/designer/cpp/formclasswizard.cpp +++ b/src/plugins/designer/cpp/formclasswizard.cpp @@ -40,8 +40,8 @@ #include <coreplugin/icore.h> #include <cppeditor/cppeditorconstants.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> +#include <QDebug> +#include <QSettings> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp index 815192e12e..6c6ea44c6a 100644 --- a/src/plugins/designer/cpp/formclasswizarddialog.cpp +++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp @@ -37,8 +37,8 @@ #include <coreplugin/basefilewizard.h> -#include <QtCore/QDebug> -#include <QtGui/QAbstractButton> +#include <QDebug> +#include <QAbstractButton> enum { FormPageId, ClassPageId }; diff --git a/src/plugins/designer/cpp/formclasswizardpage.cpp b/src/plugins/designer/cpp/formclasswizardpage.cpp index ca489fd754..c0b2dddf18 100644 --- a/src/plugins/designer/cpp/formclasswizardpage.cpp +++ b/src/plugins/designer/cpp/formclasswizardpage.cpp @@ -39,11 +39,11 @@ #include <cppeditor/cppeditorconstants.h> #include <cpptools/cpptoolsconstants.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> +#include <QDebug> +#include <QSettings> -#include <QtGui/QAbstractButton> -#include <QtGui/QMessageBox> +#include <QAbstractButton> +#include <QMessageBox> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/cpp/formclasswizardpage.h b/src/plugins/designer/cpp/formclasswizardpage.h index 7fbbcacf28..b897d576de 100644 --- a/src/plugins/designer/cpp/formclasswizardpage.h +++ b/src/plugins/designer/cpp/formclasswizardpage.h @@ -33,7 +33,7 @@ #ifndef FORMCLASSWIZARDPAGE_H #define FORMCLASSWIZARDPAGE_H -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Designer { diff --git a/src/plugins/designer/cpp/formclasswizardparameters.h b/src/plugins/designer/cpp/formclasswizardparameters.h index 2a14f012f6..8a64ff186f 100644 --- a/src/plugins/designer/cpp/formclasswizardparameters.h +++ b/src/plugins/designer/cpp/formclasswizardparameters.h @@ -33,8 +33,8 @@ #ifndef FORMCLASSWIZARDPARAMETERS_H #define FORMCLASSWIZARDPARAMETERS_H -#include <QtCore/QString> -#include <QtCore/QMetaType> +#include <QString> +#include <QMetaType> namespace Designer { /* Parameters passed to generate the code part of a form class. diff --git a/src/plugins/designer/designer_export.h b/src/plugins/designer/designer_export.h index 5d2cd3f433..245d118f1c 100644 --- a/src/plugins/designer/designer_export.h +++ b/src/plugins/designer/designer_export.h @@ -33,7 +33,7 @@ #ifndef DESIGNER_EXPORT_H #define DESIGNER_EXPORT_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(DESIGNER_LIBRARY) # define DESIGNER_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h index 36063fc1ce..59d4fec04d 100644 --- a/src/plugins/designer/designerconstants.h +++ b/src/plugins/designer/designerconstants.h @@ -33,7 +33,7 @@ #ifndef DESIGNERPLUGIN_CONSTANTS_H #define DESIGNERPLUGIN_CONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace Designer { namespace Constants { diff --git a/src/plugins/designer/designercontext.cpp b/src/plugins/designer/designercontext.cpp index c9c87824c4..8c75eb01e6 100644 --- a/src/plugins/designer/designercontext.cpp +++ b/src/plugins/designer/designercontext.cpp @@ -34,17 +34,17 @@ #include "designerconstants.h" #include "formeditorw.h" -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QDesignerFormEditorInterface> #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerIntegration> +# include <QDesignerIntegration> #else # include "qt_private/qdesigner_integration_p.h" #endif -#include <QtGui/QWidget> -#include <QtCore/QDebug> -#include <QtCore/QSettings> +#include <QWidget> +#include <QDebug> +#include <QSettings> enum { debug = 0 }; diff --git a/src/plugins/designer/designercontext.h b/src/plugins/designer/designercontext.h index c04ae64fd7..6218230efd 100644 --- a/src/plugins/designer/designercontext.h +++ b/src/plugins/designer/designercontext.h @@ -35,7 +35,7 @@ #include <coreplugin/icontext.h> -#include <QtCore/QList> +#include <QList> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/designerxmleditor.cpp b/src/plugins/designer/designerxmleditor.cpp index f60bae1ebb..3a52efdf72 100644 --- a/src/plugins/designer/designerxmleditor.cpp +++ b/src/plugins/designer/designerxmleditor.cpp @@ -34,8 +34,8 @@ #include "formwindoweditor.h" #include "designerconstants.h" -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtCore/QDebug> +#include <QDesignerFormWindowInterface> +#include <QDebug> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/editorwidget.cpp b/src/plugins/designer/editorwidget.cpp index edeb582b3b..4d7aaa062b 100644 --- a/src/plugins/designer/editorwidget.cpp +++ b/src/plugins/designer/editorwidget.cpp @@ -38,9 +38,9 @@ #include <utils/qtcassert.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QDockWidget> -#include <QtGui/QAbstractItemView> +#include <QVBoxLayout> +#include <QDockWidget> +#include <QAbstractItemView> using namespace Designer::Constants; diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp index dec41b9076..a1a32a05be 100644 --- a/src/plugins/designer/formeditorfactory.cpp +++ b/src/plugins/designer/formeditorfactory.cpp @@ -44,8 +44,8 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/modemanager.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QFileInfo> +#include <QDebug> using namespace Designer::Constants; diff --git a/src/plugins/designer/formeditorfactory.h b/src/plugins/designer/formeditorfactory.h index 6123e96531..c0bf0c7b54 100644 --- a/src/plugins/designer/formeditorfactory.h +++ b/src/plugins/designer/formeditorfactory.h @@ -35,7 +35,7 @@ #include <coreplugin/editormanager/ieditorfactory.h> -#include <QtCore/QStringList> +#include <QStringList> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index 0df6333acf..c90aaaca9a 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/src/plugins/designer/formeditorplugin.cpp @@ -51,14 +51,14 @@ #include <coreplugin/id.h> #include <extensionsystem/pluginmanager.h> -#include <QtCore/QDebug> -#include <QtCore/QLibraryInfo> -#include <QtCore/QTranslator> -#include <QtCore/QtPlugin> +#include <QDebug> +#include <QLibraryInfo> +#include <QTranslator> +#include <QtPlugin> #ifdef CPP_ENABLED -# include <QtGui/QWizard> -# include <QtGui/QMainWindow> +# include <QWizard> +# include <QMainWindow> #endif using namespace Designer::Internal; diff --git a/src/plugins/designer/formeditorstack.cpp b/src/plugins/designer/formeditorstack.cpp index 6693e9a213..7e5d217538 100644 --- a/src/plugins/designer/formeditorstack.cpp +++ b/src/plugins/designer/formeditorstack.cpp @@ -43,14 +43,14 @@ #include <utils/qtcassert.h> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormWindowManagerInterface> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerPropertyEditorInterface> - -#include <QtCore/QDebug> -#include <QtCore/QVariant> -#include <QtCore/QRect> +#include <QDesignerFormWindowInterface> +#include <QDesignerFormWindowManagerInterface> +#include <QDesignerFormEditorInterface> +#include <QDesignerPropertyEditorInterface> + +#include <QDebug> +#include <QVariant> +#include <QRect> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/formeditorstack.h b/src/plugins/designer/formeditorstack.h index f1d5d2be59..29972516d5 100644 --- a/src/plugins/designer/formeditorstack.h +++ b/src/plugins/designer/formeditorstack.h @@ -35,9 +35,9 @@ #include "editordata.h" -#include <QtGui/QStackedWidget> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QStackedWidget> +#include <QList> +#include <QString> QT_BEGIN_NAMESPACE class QDesignerFormWindowInterface; diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index 81b1b7a3f7..f5be9b430c 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -62,12 +62,12 @@ #include <cpptools/cpptoolsconstants.h> #include <utils/qtcassert.h> -#include <QtDesigner/QDesignerFormEditorPluginInterface> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerComponents> +#include <QDesignerFormEditorPluginInterface> +#include <QDesignerFormEditorInterface> +#include <QDesignerComponents> #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerFormWindowManagerInterface> +# include <QDesignerFormWindowManagerInterface> #else # include "qt_private/pluginmanager_p.h" # include "qt_private/iconloader_p.h" // createIconSet @@ -75,33 +75,33 @@ # include "qt_private/formwindowbase_p.h" #endif -#include <QtDesigner/QDesignerWidgetBoxInterface> -#include <QtDesigner/abstractobjectinspector.h> -#include <QtDesigner/QDesignerPropertyEditorInterface> -#include <QtDesigner/QDesignerActionEditorInterface> -#include <QtDesigner/QDesignerFormEditorInterface> - -#include <QtGui/QAction> -#include <QtGui/QActionGroup> -#include <QtGui/QApplication> -#include <QtGui/QCursor> -#include <QtGui/QDockWidget> -#include <QtGui/QMenu> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> -#include <QtGui/QKeySequence> -#include <QtGui/QPrintDialog> -#include <QtGui/QPrinter> -#include <QtGui/QPainter> -#include <QtGui/QStyle> -#include <QtGui/QToolBar> -#include <QtGui/QVBoxLayout> - -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtCore/QSignalMapper> -#include <QtCore/QPluginLoader> -#include <QtCore/QTime> +#include <QDesignerWidgetBoxInterface> +#include <abstractobjectinspector.h> +#include <QDesignerPropertyEditorInterface> +#include <QDesignerActionEditorInterface> +#include <QDesignerFormEditorInterface> + +#include <QAction> +#include <QActionGroup> +#include <QApplication> +#include <QCursor> +#include <QDockWidget> +#include <QMenu> +#include <QMainWindow> +#include <QMessageBox> +#include <QKeySequence> +#include <QPrintDialog> +#include <QPrinter> +#include <QPainter> +#include <QStyle> +#include <QToolBar> +#include <QVBoxLayout> + +#include <QDebug> +#include <QSettings> +#include <QSignalMapper> +#include <QPluginLoader> +#include <QTime> static const char settingsGroupC[] = "Designer"; diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditorw.h index 87d455a964..3a239579cb 100644 --- a/src/plugins/designer/formeditorw.h +++ b/src/plugins/designer/formeditorw.h @@ -38,9 +38,9 @@ #include <coreplugin/icontext.h> #include <coreplugin/dialogs/ioptionspage.h> -#include <QtCore/QMap> -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QMap> +#include <QObject> +#include <QStringList> QT_BEGIN_NAMESPACE diff --git a/src/plugins/designer/formtemplatewizardpage.cpp b/src/plugins/designer/formtemplatewizardpage.cpp index d05dc992cd..d6a946936c 100644 --- a/src/plugins/designer/formtemplatewizardpage.cpp +++ b/src/plugins/designer/formtemplatewizardpage.cpp @@ -35,25 +35,25 @@ #include "designerconstants.h" #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerNewFormWidgetInterface> +# include <QDesignerNewFormWidgetInterface> #else # include "qt_private/abstractnewformwidget_p.h" #endif -#include <QtCore/QDebug> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamAttributes> -#include <QtCore/QByteArray> -#include <QtCore/QBuffer> +#include <QDebug> +#include <QXmlStreamReader> +#include <QXmlStreamAttributes> +#include <QByteArray> +#include <QBuffer> -#include <QtGui/QVBoxLayout> -#include <QtGui/QMessageBox> -#include <QtGui/QAbstractButton> +#include <QVBoxLayout> +#include <QMessageBox> +#include <QAbstractButton> #ifdef USE_XSLT -# include <QtXmlPatterns/QXmlQuery> +# include <QXmlQuery> #else -# include <QtXml/QDomDocument> +# include <QDomDocument> #endif namespace Designer { diff --git a/src/plugins/designer/formtemplatewizardpage.h b/src/plugins/designer/formtemplatewizardpage.h index e12a37b201..45c06b0b67 100644 --- a/src/plugins/designer/formtemplatewizardpage.h +++ b/src/plugins/designer/formtemplatewizardpage.h @@ -33,7 +33,7 @@ #ifndef FORMWIZARDPAGE_H #define FORMWIZARDPAGE_H -#include <QtGui/QWizardPage> +#include <QWizardPage> QT_BEGIN_NAMESPACE class QDesignerNewFormWidgetInterface; diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp index 9552fd7586..822b1b26a3 100644 --- a/src/plugins/designer/formwindoweditor.cpp +++ b/src/plugins/designer/formwindoweditor.cpp @@ -48,16 +48,16 @@ #include <utils/fileutils.h> #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerFormWindowInterface> -# include <QtCore/QBuffer> +# include <QDesignerFormWindowInterface> +# include <QBuffer> #else # include "qt_private/formwindowbase_p.h" #endif -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QFile> -#include <QtGui/QApplication> +#include <QDebug> +#include <QFileInfo> +#include <QFile> +#include <QApplication> namespace Designer { diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp index 3defd2c1a6..985f5c6328 100644 --- a/src/plugins/designer/formwindowfile.cpp +++ b/src/plugins/designer/formwindowfile.cpp @@ -38,22 +38,22 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormWindowManagerInterface> -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QDesignerFormWindowInterface> +#include <QDesignerFormWindowManagerInterface> +#include <QDesignerFormEditorInterface> #if QT_VERSION < 0x050000 # include "qt_private/qsimpleresource_p.h" #endif -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> -#include <QtGui/QUndoStack> +#include <QMessageBox> +#include <QMainWindow> +#include <QUndoStack> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QByteArray> -#include <QtCore/QDebug> -#include <QtCore/QTextCodec> +#include <QFile> +#include <QFileInfo> +#include <QByteArray> +#include <QDebug> +#include <QTextCodec> namespace Designer { namespace Internal { diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h index eb58152884..bf9eee1989 100644 --- a/src/plugins/designer/formwindowfile.h +++ b/src/plugins/designer/formwindowfile.h @@ -35,7 +35,7 @@ #include <coreplugin/textfile.h> -#include <QtCore/QPointer> +#include <QPointer> QT_BEGIN_NAMESPACE class QDesignerFormWindowInterface; diff --git a/src/plugins/designer/formwizard.cpp b/src/plugins/designer/formwizard.cpp index bae0a83ff1..9026b3dd66 100644 --- a/src/plugins/designer/formwizard.cpp +++ b/src/plugins/designer/formwizard.cpp @@ -36,7 +36,7 @@ #include "designerconstants.h" #include <qtsupport/qtsupportconstants.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace Designer; using namespace Designer::Internal; diff --git a/src/plugins/designer/formwizarddialog.cpp b/src/plugins/designer/formwizarddialog.cpp index 949054bcf7..f379fd1951 100644 --- a/src/plugins/designer/formwizarddialog.cpp +++ b/src/plugins/designer/formwizarddialog.cpp @@ -39,8 +39,8 @@ #include <utils/filewizardpage.h> -#include <QtCore/QDebug> -#include <QtGui/QAbstractButton> +#include <QDebug> +#include <QAbstractButton> // Make sure there is a gap before the extension pages enum { FormPageId, FilePageId, FirstExtensionPageId = 10 }; diff --git a/src/plugins/designer/qt_private/abstractnewformwidget_p.h b/src/plugins/designer/qt_private/abstractnewformwidget_p.h index 3f87f6547c..e56c0859c8 100644 --- a/src/plugins/designer/qt_private/abstractnewformwidget_p.h +++ b/src/plugins/designer/qt_private/abstractnewformwidget_p.h @@ -44,9 +44,9 @@ #ifndef ABSTRACTNEWFORMWIDGET_H #define ABSTRACTNEWFORMWIDGET_H -#include <QtDesigner/sdk_global.h> +#include <sdk_global.h> -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_HEADER diff --git a/src/plugins/designer/qt_private/abstractoptionspage_p.h b/src/plugins/designer/qt_private/abstractoptionspage_p.h index 3c19208950..487fa90107 100644 --- a/src/plugins/designer/qt_private/abstractoptionspage_p.h +++ b/src/plugins/designer/qt_private/abstractoptionspage_p.h @@ -44,7 +44,7 @@ #ifndef ABSTRACTOPTIONSPAGE_P_H #define ABSTRACTOPTIONSPAGE_P_H -#include <QtDesigner/sdk_global.h> +#include <sdk_global.h> QT_BEGIN_HEADER diff --git a/src/plugins/designer/qt_private/abstractsettings_p.h b/src/plugins/designer/qt_private/abstractsettings_p.h index 9447caae88..68be516879 100644 --- a/src/plugins/designer/qt_private/abstractsettings_p.h +++ b/src/plugins/designer/qt_private/abstractsettings_p.h @@ -44,7 +44,7 @@ #ifndef ABSTRACTSETTINGS_P_H #define ABSTRACTSETTINGS_P_H -#include <QtDesigner/sdk_global.h> +#include <sdk_global.h> #include <QVariant> diff --git a/src/plugins/designer/qt_private/formwindowbase_p.h b/src/plugins/designer/qt_private/formwindowbase_p.h index caa3037d15..f576a3bb05 100644 --- a/src/plugins/designer/qt_private/formwindowbase_p.h +++ b/src/plugins/designer/qt_private/formwindowbase_p.h @@ -46,10 +46,10 @@ #include "shared_global_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> +#include <QDesignerFormWindowInterface> -#include <QtCore/QVariantMap> -#include <QtCore/QList> +#include <QVariantMap> +#include <QList> QT_BEGIN_NAMESPACE diff --git a/src/plugins/designer/qt_private/pluginmanager_p.h b/src/plugins/designer/qt_private/pluginmanager_p.h index 62f5969e85..c627f1f970 100644 --- a/src/plugins/designer/qt_private/pluginmanager_p.h +++ b/src/plugins/designer/qt_private/pluginmanager_p.h @@ -47,10 +47,10 @@ #include "shared_global_p.h" #include "shared_enums_p.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QMap> -#include <QtCore/QPair> -#include <QtCore/QStringList> +#include <QSharedDataPointer> +#include <QMap> +#include <QPair> +#include <QStringList> QT_BEGIN_NAMESPACE diff --git a/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h b/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h index 12b939320c..3118353e0b 100644 --- a/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h +++ b/src/plugins/designer/qt_private/qdesigner_formwindowmanager_p.h @@ -45,7 +45,7 @@ #define QDESIGNER_FORMWINDOMANAGER_H #include "shared_global_p.h" -#include <QtDesigner/QDesignerFormWindowManagerInterface> +#include <QDesignerFormWindowManagerInterface> QT_BEGIN_NAMESPACE diff --git a/src/plugins/designer/qt_private/qdesigner_integration_p.h b/src/plugins/designer/qt_private/qdesigner_integration_p.h index 0ac39ebc30..66f2fe87e1 100644 --- a/src/plugins/designer/qt_private/qdesigner_integration_p.h +++ b/src/plugins/designer/qt_private/qdesigner_integration_p.h @@ -45,9 +45,9 @@ #define QDESIGNER_INTEGRATION_H #include "shared_global_p.h" -#include <QtDesigner/QDesignerIntegrationInterface> +#include <QDesignerIntegrationInterface> -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE diff --git a/src/plugins/designer/qt_private/qsimpleresource_p.h b/src/plugins/designer/qt_private/qsimpleresource_p.h index 30eafce1a9..810ab1b863 100644 --- a/src/plugins/designer/qt_private/qsimpleresource_p.h +++ b/src/plugins/designer/qt_private/qsimpleresource_p.h @@ -46,7 +46,7 @@ #include "shared_global_p.h" #include "abstractformbuilder.h" -#include <QtCore/QStringList> +#include <QStringList> QT_BEGIN_NAMESPACE diff --git a/src/plugins/designer/qt_private/qtresourcemodel_p.h b/src/plugins/designer/qt_private/qtresourcemodel_p.h index 7339a967dd..b44be27149 100644 --- a/src/plugins/designer/qt_private/qtresourcemodel_p.h +++ b/src/plugins/designer/qt_private/qtresourcemodel_p.h @@ -45,9 +45,9 @@ #define QTRESOURCEMODEL_H #include "shared_global_p.h" -#include <QtCore/QMap> -#include <QtCore/QObject> -#include <QtCore/QScopedPointer> +#include <QMap> +#include <QObject> +#include <QScopedPointer> QT_BEGIN_NAMESPACE diff --git a/src/plugins/designer/qt_private/shared_global_p.h b/src/plugins/designer/qt_private/shared_global_p.h index 1a6f745399..c682758c4d 100644 --- a/src/plugins/designer/qt_private/shared_global_p.h +++ b/src/plugins/designer/qt_private/shared_global_p.h @@ -44,7 +44,7 @@ #ifndef SHARED_GLOBAL_H #define SHARED_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #ifdef QT_DESIGNER_STATIC #define QDESIGNER_SHARED_EXTERN diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index 205d9820bc..12788ea66a 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/src/plugins/designer/qtcreatorintegration.cpp @@ -63,15 +63,15 @@ #include <utils/qtcassert.h> #include <utils/fileutils.h> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QDesignerFormWindowInterface> +#include <QDesignerFormEditorInterface> -#include <QtGui/QMessageBox> +#include <QMessageBox> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QUrl> +#include <QFileInfo> +#include <QDir> +#include <QDebug> +#include <QUrl> enum { indentation = 4 }; diff --git a/src/plugins/designer/qtcreatorintegration.h b/src/plugins/designer/qtcreatorintegration.h index ba170bc550..87b52e5ca1 100644 --- a/src/plugins/designer/qtcreatorintegration.h +++ b/src/plugins/designer/qtcreatorintegration.h @@ -36,7 +36,7 @@ #include <cplusplus/ModelManagerInterface.h> #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerIntegration> +# include <QDesignerIntegration> #else # include "qt_private/qdesigner_integration_p.h" #endif diff --git a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp index 3874da23b9..ba8752b25b 100644 --- a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp +++ b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp @@ -38,11 +38,11 @@ #include <coreplugin/icore.h> #include <cpptools/abstracteditorsupport.h> -#include <QtCore/QTextStream> -#include <QtCore/QSettings> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QSharedData> +#include <QTextStream> +#include <QSettings> +#include <QFileInfo> +#include <QDebug> +#include <QSharedData> static const char uiMemberC[] = "ui"; static const char uiNamespaceC[] = "Ui"; diff --git a/src/plugins/designer/qtdesignerformclasscodegenerator.h b/src/plugins/designer/qtdesignerformclasscodegenerator.h index 4ce200a307..ffab76138b 100644 --- a/src/plugins/designer/qtdesignerformclasscodegenerator.h +++ b/src/plugins/designer/qtdesignerformclasscodegenerator.h @@ -33,9 +33,9 @@ #ifndef QTDESIGNERFORMCLASSCODEGENERATOR_H #define QTDESIGNERFORMCLASSCODEGENERATOR_H -#include <QtCore/QString> -#include <QtCore/QVariant> -#include <QtCore/QObject> +#include <QString> +#include <QVariant> +#include <QObject> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp index d9a329c5a9..b898e00542 100644 --- a/src/plugins/designer/resourcehandler.cpp +++ b/src/plugins/designer/resourcehandler.cpp @@ -40,7 +40,7 @@ #include <projectexplorer/session.h> #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerFormWindowInterface> +# include <QDesignerFormWindowInterface> #else # include "qt_private/formwindowbase_p.h" # include "qt_private/qtresourcemodel_p.h" diff --git a/src/plugins/designer/resourcehandler.h b/src/plugins/designer/resourcehandler.h index 8c86ab8fb1..5acd1f6823 100644 --- a/src/plugins/designer/resourcehandler.h +++ b/src/plugins/designer/resourcehandler.h @@ -33,8 +33,8 @@ #ifndef RESOURCEHANDLER_H #define RESOURCEHANDLER_H -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QObject> +#include <QStringList> QT_BEGIN_NAMESPACE #if QT_VERSION >= 0x050000 diff --git a/src/plugins/designer/settingsmanager.cpp b/src/plugins/designer/settingsmanager.cpp index 8bdbc8f849..48bb48f642 100644 --- a/src/plugins/designer/settingsmanager.cpp +++ b/src/plugins/designer/settingsmanager.cpp @@ -36,8 +36,8 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtCore/QSettings> -#include <QtCore/QDebug> +#include <QSettings> +#include <QDebug> using namespace Designer::Internal; diff --git a/src/plugins/designer/settingsmanager.h b/src/plugins/designer/settingsmanager.h index 88e6bea621..523936bb9c 100644 --- a/src/plugins/designer/settingsmanager.h +++ b/src/plugins/designer/settingsmanager.h @@ -34,7 +34,7 @@ #define SETTINGSMANAGER_H #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerSettingsInterface> +# include <QDesignerSettingsInterface> #else # include "qt_private/abstractsettings_p.h" #endif diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp index 4e43a57d21..12cdab0278 100644 --- a/src/plugins/designer/settingspage.cpp +++ b/src/plugins/designer/settingspage.cpp @@ -36,13 +36,13 @@ #include <extensionsystem/pluginmanager.h> #if QT_VERSION >= 0x050000 -# include <QtDesigner/QDesignerOptionsPageInterface> +# include <QDesignerOptionsPageInterface> #else # include "qt_private/abstractoptionspage_p.h" #endif -#include <QtCore/QCoreApplication> -#include <QtGui/QIcon> +#include <QCoreApplication> +#include <QIcon> using namespace Designer::Internal; |