diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-22 11:38:34 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-23 10:42:53 +0000 |
| commit | e7e93c7f6b7db9d23da0e5252a57cb6d3e41e23f (patch) | |
| tree | fd864c2ab3c3e484f689d85308f39277f132d0f2 /src/designer/src/lib/shared | |
| parent | 0f8872a9ba627d5a08f573ccdf15c208cf74a933 (diff) | |
Qt Designer: Fix Qt include statements
Change
#include <QtCore/QDebug>
to
#include <QtCore/qdebug.h>
according to the coding style.
Change-Id: I2ba2e99d003f245c61ce836acb5af3208e1e0b29
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/lib/shared')
142 files changed, 1025 insertions, 1044 deletions
diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp index a31cb94ac..64e337c5f 100644 --- a/src/designer/src/lib/shared/actioneditor.cpp +++ b/src/designer/src/lib/shared/actioneditor.cpp @@ -39,34 +39,34 @@ #include "formwindowbase_p.h" #include "qdesigner_taskmenu_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerPropertyEditorInterface> -#include <QtDesigner/QDesignerPropertySheetExtension> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerMetaDataBaseInterface> -#include <QtDesigner/QDesignerSettingsInterface> - -#include <QtWidgets/QMenu> -#include <QtWidgets/QToolBar> -#include <QtWidgets/QSplitter> -#include <QtWidgets/QAction> -#include <QtWidgets/QApplication> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractpropertyeditor.h> +#include <QtDesigner/propertysheet.h> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/abstractmetadatabase.h> +#include <QtDesigner/abstractsettings.h> + +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qtoolbar.h> +#include <QtWidgets/qsplitter.h> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qapplication.h> #ifndef QT_NO_CLIPBOARD -#include <QtGui/QClipboard> +#include <QtGui/qclipboard.h> #endif -#include <QtWidgets/QItemDelegate> -#include <QtGui/QPainter> -#include <QtWidgets/QVBoxLayout> -#include <QtWidgets/QLineEdit> -#include <QtWidgets/QLabel> -#include <QtWidgets/QPushButton> -#include <QtWidgets/QToolButton> -#include <QtGui/QContextMenuEvent> -#include <QtCore/QItemSelection> - -#include <QtCore/QRegularExpression> -#include <QtCore/QDebug> -#include <QtCore/QBuffer> +#include <QtWidgets/qitemdelegate.h> +#include <QtGui/qpainter.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qlineedit.h> +#include <QtWidgets/qlabel.h> +#include <QtWidgets/qpushbutton.h> +#include <QtWidgets/qtoolbutton.h> +#include <QtGui/qevent.h> +#include <QtCore/qitemselectionmodel.h> + +#include <QtCore/qregularexpression.h> +#include <QtCore/qdebug.h> +#include <QtCore/qbuffer.h> Q_DECLARE_METATYPE(QAction*) diff --git a/src/designer/src/lib/shared/actioneditor_p.h b/src/designer/src/lib/shared/actioneditor_p.h index 7ce095311..5de16da63 100644 --- a/src/designer/src/lib/shared/actioneditor_p.h +++ b/src/designer/src/lib/shared/actioneditor_p.h @@ -42,9 +42,9 @@ #include "shared_global_p.h" #include "shared_enums_p.h" -#include <QtDesigner/QDesignerActionEditorInterface> +#include <QtDesigner/abstractactioneditor.h> -#include <QtCore/QPointer> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/actionprovider_p.h b/src/designer/src/lib/shared/actionprovider_p.h index 4c91d199b..e463af396 100644 --- a/src/designer/src/lib/shared/actionprovider_p.h +++ b/src/designer/src/lib/shared/actionprovider_p.h @@ -41,9 +41,9 @@ // #include <QtDesigner/extension.h> -#include <QtCore/QPoint> -#include <QtCore/QRect> -#include <QtWidgets/QApplication> +#include <QtCore/qpoint.h> +#include <QtCore/qrect.h> +#include <QtWidgets/qapplication.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/actionrepository.cpp b/src/designer/src/lib/shared/actionrepository.cpp index 6ac1f7a87..960d078da 100644 --- a/src/designer/src/lib/shared/actionrepository.cpp +++ b/src/designer/src/lib/shared/actionrepository.cpp @@ -31,22 +31,22 @@ #include "iconloader_p.h" #include "qdesigner_utils_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerPropertySheetExtension> -#include <QtDesigner/QExtensionManager> - -#include <QtGui/QDrag> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QStandardItemModel> -#include <QtWidgets/QToolButton> -#include <QtGui/QPixmap> -#include <QtWidgets/QAction> -#include <QtWidgets/QHeaderView> -#include <QtWidgets/QToolBar> -#include <QtWidgets/QMenu> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/propertysheet.h> +#include <QtDesigner/qextensionmanager.h> + +#include <QtGui/qdrag.h> +#include <QtGui/qevent.h> +#include <QtGui/qstandarditemmodel.h> +#include <QtWidgets/qtoolbutton.h> +#include <QtGui/qpixmap.h> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qheaderview.h> +#include <QtWidgets/qtoolbar.h> +#include <QtWidgets/qmenu.h> #include <QtGui/qevent.h> -#include <QtCore/QSet> -#include <QtCore/QDebug> +#include <QtCore/qset.h> +#include <QtCore/qdebug.h> Q_DECLARE_METATYPE(QAction*) diff --git a/src/designer/src/lib/shared/actionrepository_p.h b/src/designer/src/lib/shared/actionrepository_p.h index d488fb150..e8744881e 100644 --- a/src/designer/src/lib/shared/actionrepository_p.h +++ b/src/designer/src/lib/shared/actionrepository_p.h @@ -41,12 +41,12 @@ #define ACTIONREPOSITORY_H #include "shared_global_p.h" -#include <QtCore/QMimeData> -#include <QtGui/QStandardItemModel> -#include <QtWidgets/QTreeView> -#include <QtWidgets/QListView> -#include <QtWidgets/QStackedWidget> -#include <QtGui/QIcon> +#include <QtCore/qmimedata.h> +#include <QtGui/qstandarditemmodel.h> +#include <QtWidgets/qtreeview.h> +#include <QtWidgets/qlistview.h> +#include <QtWidgets/qstackedwidget.h> +#include <QtGui/qicon.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/codedialog.cpp b/src/designer/src/lib/shared/codedialog.cpp index 87a935d95..474ebe863 100644 --- a/src/designer/src/lib/shared/codedialog.cpp +++ b/src/designer/src/lib/shared/codedialog.cpp @@ -32,24 +32,24 @@ #include <texteditfindwidget.h> -#include <QtWidgets/QAction> -#include <QtWidgets/QApplication> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qapplication.h> #ifndef QT_NO_CLIPBOARD -#include <QtGui/QClipboard> +#include <QtGui/qclipboard.h> #endif -#include <QtWidgets/QDialogButtonBox> -#include <QtWidgets/QFileDialog> -#include <QtGui/QIcon> -#include <QtGui/QKeyEvent> -#include <QtWidgets/QMessageBox> -#include <QtWidgets/QPushButton> -#include <QtWidgets/QTextEdit> -#include <QtWidgets/QToolBar> -#include <QtWidgets/QVBoxLayout> - -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QTemporaryFile> +#include <QtWidgets/qdialogbuttonbox.h> +#include <QtWidgets/qfiledialog.h> +#include <QtGui/qicon.h> +#include <QtGui/qevent.h> +#include <QtWidgets/qmessagebox.h> +#include <QtWidgets/qpushbutton.h> +#include <QtWidgets/qtextedit.h> +#include <QtWidgets/qtoolbar.h> +#include <QtWidgets/qboxlayout.h> + +#include <QtCore/qdebug.h> +#include <QtCore/qdir.h> +#include <QtCore/qtemporaryfile.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/codedialog_p.h b/src/designer/src/lib/shared/codedialog_p.h index 756380934..1e2811f95 100644 --- a/src/designer/src/lib/shared/codedialog_p.h +++ b/src/designer/src/lib/shared/codedialog_p.h @@ -41,7 +41,7 @@ #define CODEPREVIEWDIALOG_H #include "shared_global_p.h" -#include <QtWidgets/QDialog> +#include <QtWidgets/qdialog.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/connectionedit.cpp b/src/designer/src/lib/shared/connectionedit.cpp index 219774113..6bcef8c33 100644 --- a/src/designer/src/lib/shared/connectionedit.cpp +++ b/src/designer/src/lib/shared/connectionedit.cpp @@ -31,17 +31,16 @@ #include <QtDesigner/abstractformwindow.h> -#include <QtGui/QPainter> -#include <QtGui/QPaintEvent> -#include <QtGui/QFontMetrics> -#include <QtGui/QPixmap> -#include <QtGui/QMatrix> -#include <QtWidgets/QApplication> -#include <QtGui/QContextMenuEvent> -#include <QtWidgets/QMenu> -#include <QtWidgets/QAction> - -#include <QtCore/QMultiMap> +#include <QtGui/qpainter.h> +#include <QtGui/qevent.h> +#include <QtGui/qfontmetrics.h> +#include <QtGui/qpixmap.h> +#include <QtGui/qmatrix.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qaction.h> + +#include <QtCore/qmap.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/connectionedit_p.h b/src/designer/src/lib/shared/connectionedit_p.h index 799295789..49ba71daa 100644 --- a/src/designer/src/lib/shared/connectionedit_p.h +++ b/src/designer/src/lib/shared/connectionedit_p.h @@ -43,15 +43,15 @@ #include "shared_global_p.h" -#include <QtCore/QMultiMap> -#include <QtCore/QList> -#include <QtCore/QPointer> +#include <QtCore/qmap.h> +#include <QtCore/qlist.h> +#include <QtCore/qpointer.h> -#include <QtWidgets/QWidget> -#include <QtGui/QPixmap> -#include <QtGui/QPolygonF> +#include <QtWidgets/qwidget.h> +#include <QtGui/qpixmap.h> +#include <QtGui/qpolygon.h> -#include <QtWidgets/QUndoCommand> +#include <QtWidgets/qundostack.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/csshighlighter_p.h b/src/designer/src/lib/shared/csshighlighter_p.h index 7a0f735be..508c56c43 100644 --- a/src/designer/src/lib/shared/csshighlighter_p.h +++ b/src/designer/src/lib/shared/csshighlighter_p.h @@ -40,7 +40,7 @@ #ifndef CSSHIGHLIGHTER_H #define CSSHIGHLIGHTER_H -#include <QtGui/QSyntaxHighlighter> +#include <QtGui/qsyntaxhighlighter.h> #include "shared_global_p.h" QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/deviceprofile.cpp b/src/designer/src/lib/shared/deviceprofile.cpp index ca9b1bd78..eba349bb4 100644 --- a/src/designer/src/lib/shared/deviceprofile.cpp +++ b/src/designer/src/lib/shared/deviceprofile.cpp @@ -28,22 +28,21 @@ #include "deviceprofile_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QtDesigner/abstractformeditor.h> #include <widgetfactory_p.h> #include <qdesigner_utils_p.h> -#include <QtWidgets/QApplication> -#include <QtGui/QFont> -#include <QtWidgets/QDesktopWidget> -#include <QtWidgets/QStyle> -#include <QtWidgets/QStyleFactory> -#include <QtWidgets/QApplication> +#include <QtWidgets/qapplication.h> +#include <QtGui/qfont.h> +#include <QtWidgets/qdesktopwidget.h> +#include <QtWidgets/qstyle.h> +#include <QtWidgets/qstylefactory.h> +#include <QtWidgets/qapplication.h> -#include <QtCore/QSharedData> -#include <QtCore/QTextStream> +#include <QtCore/qshareddata.h> +#include <QtCore/qtextstream.h> -#include <QtCore/QXmlStreamWriter> -#include <QtCore/QXmlStreamReader> +#include <QtCore/qxmlstream.h> static const char *dpiXPropertyC = "_q_customDpiX"; diff --git a/src/designer/src/lib/shared/deviceprofile_p.h b/src/designer/src/lib/shared/deviceprofile_p.h index 4d615d833..60b9518c5 100644 --- a/src/designer/src/lib/shared/deviceprofile_p.h +++ b/src/designer/src/lib/shared/deviceprofile_p.h @@ -42,8 +42,8 @@ #include "shared_global_p.h" -#include <QtCore/QString> -#include <QtCore/QSharedDataPointer> +#include <QtCore/qstring.h> +#include <QtCore/qshareddata.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/dialoggui.cpp b/src/designer/src/lib/shared/dialoggui.cpp index ea3bf65be..b4d7a2fbb 100644 --- a/src/designer/src/lib/shared/dialoggui.cpp +++ b/src/designer/src/lib/shared/dialoggui.cpp @@ -28,15 +28,15 @@ #include "dialoggui_p.h" -#include <QtWidgets/QFileIconProvider> -#include <QtGui/QIcon> -#include <QtGui/QImage> -#include <QtGui/QImageReader> -#include <QtGui/QPixmap> - -#include <QtCore/QFileInfo> -#include <QtCore/QFile> -#include <QtCore/QSet> +#include <QtWidgets/qfileiconprovider.h> +#include <QtGui/qicon.h> +#include <QtGui/qimage.h> +#include <QtGui/qimagereader.h> +#include <QtGui/qpixmap.h> + +#include <QtCore/qfileinfo.h> +#include <QtCore/qfile.h> +#include <QtCore/qset.h> // QFileDialog on X11 does not provide an image preview. Display icons. #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) diff --git a/src/designer/src/lib/shared/extensionfactory_p.h b/src/designer/src/lib/shared/extensionfactory_p.h index 683d4627d..0f853fc2e 100644 --- a/src/designer/src/lib/shared/extensionfactory_p.h +++ b/src/designer/src/lib/shared/extensionfactory_p.h @@ -41,7 +41,7 @@ #define SHARED_EXTENSIONFACTORY_H #include <QtDesigner/default_extensionfactory.h> -#include <QtDesigner/QExtensionManager> +#include <QtDesigner/qextensionmanager.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/formlayoutmenu.cpp b/src/designer/src/lib/shared/formlayoutmenu.cpp index bb43652dd..0dd0e57c5 100644 --- a/src/designer/src/lib/shared/formlayoutmenu.cpp +++ b/src/designer/src/lib/shared/formlayoutmenu.cpp @@ -33,27 +33,27 @@ #include "qdesigner_propertycommand_p.h" #include "ui_formlayoutrowdialog.h" -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerWidgetFactoryInterface> -#include <QtDesigner/QDesignerPropertySheetExtension> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerWidgetDataBaseInterface> -#include <QtDesigner/QDesignerLanguageExtension> - -#include <QtWidgets/QAction> -#include <QtWidgets/QWidget> -#include <QtWidgets/QFormLayout> -#include <QtWidgets/QUndoStack> -#include <QtWidgets/QDialog> -#include <QtWidgets/QPushButton> -#include <QtGui/QRegularExpressionValidator> - -#include <QtCore/QPair> -#include <QtCore/QCoreApplication> -#include <QtCore/QRegularExpression> -#include <QtCore/QMultiHash> -#include <QtCore/QDebug> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractwidgetfactory.h> +#include <QtDesigner/propertysheet.h> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/abstractwidgetdatabase.h> +#include <QtDesigner/abstractlanguage.h> + +#include <QtWidgets/qaction.h> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qformlayout.h> +#include <QtWidgets/qundostack.h> +#include <QtWidgets/qdialog.h> +#include <QtWidgets/qpushbutton.h> +#include <QtGui/qvalidator.h> + +#include <QtCore/qpair.h> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qregularexpression.h> +#include <QtCore/qhash.h> +#include <QtCore/qdebug.h> static const char *buddyPropertyC = "buddy"; static const char *fieldWidgetBaseClasses[] = { diff --git a/src/designer/src/lib/shared/formlayoutmenu_p.h b/src/designer/src/lib/shared/formlayoutmenu_p.h index 8306e7661..5d115ead1 100644 --- a/src/designer/src/lib/shared/formlayoutmenu_p.h +++ b/src/designer/src/lib/shared/formlayoutmenu_p.h @@ -41,9 +41,9 @@ // #include "shared_global_p.h" -#include <QtCore/QObject> -#include <QtCore/QList> -#include <QtCore/QPointer> +#include <QtCore/qobject.h> +#include <QtCore/qlist.h> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/formwindowbase.cpp b/src/designer/src/lib/shared/formwindowbase.cpp index 985d82b99..713d32850 100644 --- a/src/designer/src/lib/shared/formwindowbase.cpp +++ b/src/designer/src/lib/shared/formwindowbase.cpp @@ -39,28 +39,28 @@ #include "qdesigner_utils_p.h" #include "spacer_widget_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerContainerExtension> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerTaskMenuExtension> -#include <QtDesigner/QDesignerIntegrationInterface> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/container.h> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/taskmenu.h> +#include <QtDesigner/abstractintegration.h> #include <QtCore/qdebug.h> -#include <QtCore/QList> -#include <QtCore/QSet> -#include <QtCore/QTimer> -#include <QtWidgets/QMenu> -#include <QtWidgets/QListWidget> -#include <QtWidgets/QTreeWidget> -#include <QtWidgets/QTableWidget> -#include <QtWidgets/QComboBox> -#include <QtWidgets/QTabWidget> -#include <QtWidgets/QToolBox> -#include <QtWidgets/QToolBar> -#include <QtWidgets/QStatusBar> -#include <QtWidgets/QMenu> -#include <QtWidgets/QAction> -#include <QtWidgets/QLabel> +#include <QtCore/qlist.h> +#include <QtCore/qset.h> +#include <QtCore/qtimer.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qlistwidget.h> +#include <QtWidgets/qtreewidget.h> +#include <QtWidgets/qtablewidget.h> +#include <QtWidgets/qcombobox.h> +#include <QtWidgets/qtabwidget.h> +#include <QtWidgets/qtoolbox.h> +#include <QtWidgets/qtoolbar.h> +#include <QtWidgets/qstatusbar.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qlabel.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/formwindowbase_p.h b/src/designer/src/lib/shared/formwindowbase_p.h index a206664f5..3d02718d4 100644 --- a/src/designer/src/lib/shared/formwindowbase_p.h +++ b/src/designer/src/lib/shared/formwindowbase_p.h @@ -42,10 +42,10 @@ #include "shared_global_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> +#include <QtDesigner/abstractformwindow.h> -#include <QtCore/QVariantMap> -#include <QtCore/QList> +#include <QtCore/qvariant.h> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/grid.cpp b/src/designer/src/lib/shared/grid.cpp index 138854c69..5f5f8ea27 100644 --- a/src/designer/src/lib/shared/grid.cpp +++ b/src/designer/src/lib/shared/grid.cpp @@ -28,10 +28,10 @@ #include "grid_p.h" -#include <QtCore/QString> -#include <QtCore/QVector> -#include <QtGui/QPainter> -#include <QtWidgets/QWidget> +#include <QtCore/qstring.h> +#include <QtCore/qvector.h> +#include <QtGui/qpainter.h> +#include <QtWidgets/qwidget.h> #include <QtGui/qevent.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/grid_p.h b/src/designer/src/lib/shared/grid_p.h index 4ead78da6..ca80eba03 100644 --- a/src/designer/src/lib/shared/grid_p.h +++ b/src/designer/src/lib/shared/grid_p.h @@ -42,7 +42,7 @@ #include "shared_global_p.h" -#include <QtCore/QVariantMap> +#include <QtCore/qvariant.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/gridpanel_p.h b/src/designer/src/lib/shared/gridpanel_p.h index 001b05448..997c6d41c 100644 --- a/src/designer/src/lib/shared/gridpanel_p.h +++ b/src/designer/src/lib/shared/gridpanel_p.h @@ -42,7 +42,7 @@ #include "shared_global_p.h" -#include <QtWidgets/QWidget> +#include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/htmlhighlighter.cpp b/src/designer/src/lib/shared/htmlhighlighter.cpp index 30dbb0659..8ce2291da 100644 --- a/src/designer/src/lib/shared/htmlhighlighter.cpp +++ b/src/designer/src/lib/shared/htmlhighlighter.cpp @@ -26,8 +26,8 @@ ** ****************************************************************************/ -#include <QtCore/QTextStream> -#include <QtWidgets/QTextEdit> +#include <QtCore/qtextstream.h> +#include <QtWidgets/qtextedit.h> #include "htmlhighlighter_p.h" diff --git a/src/designer/src/lib/shared/htmlhighlighter_p.h b/src/designer/src/lib/shared/htmlhighlighter_p.h index 870a36734..8a6947eb2 100644 --- a/src/designer/src/lib/shared/htmlhighlighter_p.h +++ b/src/designer/src/lib/shared/htmlhighlighter_p.h @@ -40,7 +40,7 @@ #ifndef HTMLHIGHLIGHTER_H #define HTMLHIGHLIGHTER_H -#include <QtGui/QSyntaxHighlighter> +#include <QtGui/qsyntaxhighlighter.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/iconloader.cpp b/src/designer/src/lib/shared/iconloader.cpp index 030e3c9e9..13c9ad4f7 100644 --- a/src/designer/src/lib/shared/iconloader.cpp +++ b/src/designer/src/lib/shared/iconloader.cpp @@ -28,9 +28,9 @@ #include "iconloader_p.h" -#include <QtCore/QFile> -#include <QtGui/QIcon> -#include <QtGui/QPixmap> +#include <QtCore/qfile.h> +#include <QtGui/qicon.h> +#include <QtGui/qpixmap.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/iconselector.cpp b/src/designer/src/lib/shared/iconselector.cpp index e946da39f..fbccf70b8 100644 --- a/src/designer/src/lib/shared/iconselector.cpp +++ b/src/designer/src/lib/shared/iconselector.cpp @@ -34,28 +34,27 @@ #include "formwindowbase_p.h" #include <abstractdialoggui_p.h> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerResourceBrowserInterface> -#include <QtDesigner/QDesignerLanguageExtension> -#include <QtDesigner/QDesignerIntegrationInterface> -#include <QtDesigner/QExtensionManager> - -#include <QtWidgets/QToolButton> -#include <QtWidgets/QComboBox> -#include <QtWidgets/QAction> -#include <QtWidgets/QDialogButtonBox> -#include <QtWidgets/QPushButton> -#include <QtWidgets/QDialog> -#include <QtWidgets/QMenu> -#include <QtWidgets/QApplication> -#include <QtWidgets/QVBoxLayout> -#include <QtGui/QImageReader> -#include <QtWidgets/QDialogButtonBox> -#include <QtWidgets/QVBoxLayout> -#include <QtWidgets/QLineEdit> -#include <QtWidgets/QLabel> -#include <QtGui/QValidator> -#include <QtCore/QDebug> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractresourcebrowser.h> +#include <QtDesigner/abstractlanguage.h> +#include <QtDesigner/abstractintegration.h> +#include <QtDesigner/qextensionmanager.h> + +#include <QtWidgets/qtoolbutton.h> +#include <QtWidgets/qcombobox.h> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qdialogbuttonbox.h> +#include <QtWidgets/qpushbutton.h> +#include <QtWidgets/qdialog.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qboxlayout.h> +#include <QtGui/qimagereader.h> +#include <QtWidgets/qdialogbuttonbox.h> +#include <QtWidgets/qlineedit.h> +#include <QtWidgets/qlabel.h> +#include <QtGui/qvalidator.h> +#include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/iconselector_p.h b/src/designer/src/lib/shared/iconselector_p.h index 9dc8bfcbc..4e9645a07 100644 --- a/src/designer/src/lib/shared/iconselector_p.h +++ b/src/designer/src/lib/shared/iconselector_p.h @@ -43,10 +43,10 @@ #include "shared_global_p.h" -#include <QtWidgets/QWidget> -#include <QtWidgets/QDialog> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qdialog.h> -#include <QtCore/QScopedPointer> +#include <QtCore/qscopedpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/invisible_widget_p.h b/src/designer/src/lib/shared/invisible_widget_p.h index cddab5e7f..fbbaf4c92 100644 --- a/src/designer/src/lib/shared/invisible_widget_p.h +++ b/src/designer/src/lib/shared/invisible_widget_p.h @@ -42,7 +42,7 @@ #include "shared_global_p.h" -#include <QtWidgets/QWidget> +#include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/layout.cpp b/src/designer/src/lib/shared/layout.cpp index c845386f4..780a22dbf 100644 --- a/src/designer/src/lib/shared/layout.cpp +++ b/src/designer/src/lib/shared/layout.cpp @@ -34,31 +34,30 @@ #include "widgetfactory_p.h" #include "qdesigner_widgetitem_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerContainerExtension> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerPropertySheetExtension> -#include <QtDesigner/QDesignerWidgetDataBaseInterface> -#include <QtDesigner/QDesignerMetaDataBaseInterface> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/container.h> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/propertysheet.h> +#include <QtDesigner/abstractwidgetdatabase.h> +#include <QtDesigner/abstractmetadatabase.h> #include <QtCore/qdebug.h> -#include <QtCore/QVector> - -#include <QtGui/QKeyEvent> -#include <QtWidgets/QGridLayout> -#include <QtGui/QPainter> -#include <QtGui/QBitmap> -#include <QtWidgets/QSplitter> -#include <QtWidgets/QMainWindow> -#include <QtWidgets/QApplication> -#include <QtWidgets/QScrollArea> -#include <QtWidgets/QFormLayout> -#include <QtWidgets/QLabel> -#include <QtWidgets/QWizardPage> -#include <QtWidgets/QWizard> -#include <QtCore/QDebug> -#include <QtCore/QSet> +#include <QtCore/qvector.h> + +#include <QtGui/qevent.h> +#include <QtWidgets/qgridlayout.h> +#include <QtGui/qpainter.h> +#include <QtGui/qbitmap.h> +#include <QtWidgets/qsplitter.h> +#include <QtWidgets/qmainwindow.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qscrollarea.h> +#include <QtWidgets/qformlayout.h> +#include <QtWidgets/qlabel.h> +#include <QtWidgets/qwizard.h> +#include <QtCore/qdebug.h> +#include <QtCore/qset.h> #include <algorithm> diff --git a/src/designer/src/lib/shared/layout_p.h b/src/designer/src/lib/shared/layout_p.h index 51fca30a4..a64ac46c5 100644 --- a/src/designer/src/lib/shared/layout_p.h +++ b/src/designer/src/lib/shared/layout_p.h @@ -43,14 +43,14 @@ #include "shared_global_p.h" #include "layoutinfo_p.h" -#include <QtCore/QPointer> -#include <QtCore/QObject> -#include <QtCore/QMap> -#include <QtCore/QHash> - -#include <QtWidgets/QLayout> -#include <QtWidgets/QGridLayout> -#include <QtWidgets/QWidget> +#include <QtCore/qpointer.h> +#include <QtCore/qobject.h> +#include <QtCore/qmap.h> +#include <QtCore/qhash.h> + +#include <QtWidgets/qlayout.h> +#include <QtWidgets/qgridlayout.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/layoutinfo.cpp b/src/designer/src/lib/shared/layoutinfo.cpp index 4708539f1..060ea6bd5 100644 --- a/src/designer/src/lib/shared/layoutinfo.cpp +++ b/src/designer/src/lib/shared/layoutinfo.cpp @@ -28,17 +28,17 @@ #include "layoutinfo_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerContainerExtension> -#include <QtDesigner/QDesignerMetaDataBaseInterface> -#include <QtDesigner/QExtensionManager> - -#include <QtWidgets/QHBoxLayout> -#include <QtWidgets/QFormLayout> -#include <QtWidgets/QSplitter> -#include <QtCore/QDebug> -#include <QtCore/QHash> -#include <QtCore/QRect> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/container.h> +#include <QtDesigner/abstractmetadatabase.h> +#include <QtDesigner/qextensionmanager.h> + +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qformlayout.h> +#include <QtWidgets/qsplitter.h> +#include <QtCore/qdebug.h> +#include <QtCore/qhash.h> +#include <QtCore/qrect.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/metadatabase.cpp b/src/designer/src/lib/shared/metadatabase.cpp index bf3ad5c68..a31a1e98b 100644 --- a/src/designer/src/lib/shared/metadatabase.cpp +++ b/src/designer/src/lib/shared/metadatabase.cpp @@ -30,10 +30,10 @@ #include "widgetdatabase_p.h" // sdk -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QtDesigner/abstractformeditor.h> // Qt -#include <QtWidgets/QWidget> +#include <QtWidgets/qwidget.h> #include <QtCore/qalgorithms.h> #include <QtCore/qdebug.h> diff --git a/src/designer/src/lib/shared/metadatabase_p.h b/src/designer/src/lib/shared/metadatabase_p.h index ab0dc8615..0c5e98b1b 100644 --- a/src/designer/src/lib/shared/metadatabase_p.h +++ b/src/designer/src/lib/shared/metadatabase_p.h @@ -42,11 +42,11 @@ #include "shared_global_p.h" -#include <QtDesigner/QDesignerMetaDataBaseInterface> +#include <QtDesigner/abstractmetadatabase.h> -#include <QtCore/QHash> -#include <QtCore/QStringList> -#include <QtGui/QCursor> +#include <QtCore/qhash.h> +#include <QtCore/qstringlist.h> +#include <QtGui/qcursor.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/morphmenu.cpp b/src/designer/src/lib/shared/morphmenu.cpp index 226f7e9f4..f5997e962 100644 --- a/src/designer/src/lib/shared/morphmenu.cpp +++ b/src/designer/src/lib/shared/morphmenu.cpp @@ -34,39 +34,39 @@ #include "layoutinfo_p.h" #include "qdesigner_propertycommand_p.h" -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerContainerExtension> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerLanguageExtension> -#include <QtDesigner/QDesignerWidgetDataBaseInterface> -#include <QtDesigner/QDesignerMetaDataBaseInterface> -#include <QtDesigner/QDesignerPropertySheetExtension> - -#include <QtWidgets/QWidget> -#include <QtWidgets/QAction> -#include <QtWidgets/QMenu> -#include <QtWidgets/QApplication> -#include <QtWidgets/QLayout> -#include <QtWidgets/QUndoStack> -#include <QtWidgets/QSplitter> - -#include <QtWidgets/QFrame> -#include <QtWidgets/QGroupBox> -#include <QtWidgets/QTabWidget> -#include <QtWidgets/QStackedWidget> -#include <QtWidgets/QToolBox> -#include <QtWidgets/QAbstractItemView> -#include <QtWidgets/QAbstractButton> -#include <QtWidgets/QAbstractSpinBox> -#include <QtWidgets/QTextEdit> -#include <QtWidgets/QPlainTextEdit> -#include <QtWidgets/QLabel> - -#include <QtCore/QStringList> -#include <QtCore/QMap> -#include <QtCore/QVariant> -#include <QtCore/QDebug> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/container.h> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractlanguage.h> +#include <QtDesigner/abstractwidgetdatabase.h> +#include <QtDesigner/abstractmetadatabase.h> +#include <QtDesigner/propertysheet.h> + +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qlayout.h> +#include <QtWidgets/qundostack.h> +#include <QtWidgets/qsplitter.h> + +#include <QtWidgets/qframe.h> +#include <QtWidgets/qgroupbox.h> +#include <QtWidgets/qtabwidget.h> +#include <QtWidgets/qstackedwidget.h> +#include <QtWidgets/qtoolbox.h> +#include <QtWidgets/qabstractitemview.h> +#include <QtWidgets/qabstractbutton.h> +#include <QtWidgets/qabstractspinbox.h> +#include <QtWidgets/qtextedit.h> +#include <QtWidgets/qplaintextedit.h> +#include <QtWidgets/qlabel.h> + +#include <QtCore/qstringlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qvariant.h> +#include <QtCore/qdebug.h> Q_DECLARE_METATYPE(QWidgetList) diff --git a/src/designer/src/lib/shared/newactiondialog.cpp b/src/designer/src/lib/shared/newactiondialog.cpp index 0b4c08533..676d4a80a 100644 --- a/src/designer/src/lib/shared/newactiondialog.cpp +++ b/src/designer/src/lib/shared/newactiondialog.cpp @@ -37,7 +37,7 @@ #include <QtDesigner/abstractformwindow.h> #include <QtDesigner/abstractformeditor.h> -#include <QtWidgets/QPushButton> +#include <QtWidgets/qpushbutton.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/newactiondialog_p.h b/src/designer/src/lib/shared/newactiondialog_p.h index 57995dc9f..9f1e81a36 100644 --- a/src/designer/src/lib/shared/newactiondialog_p.h +++ b/src/designer/src/lib/shared/newactiondialog_p.h @@ -42,8 +42,8 @@ #include "qdesigner_utils_p.h" // PropertySheetIconValue -#include <QtWidgets/QDialog> -#include <QtGui/QKeySequence> +#include <QtWidgets/qdialog.h> +#include <QtGui/qkeysequence.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp index 72efc4b05..1b09e4073 100644 --- a/src/designer/src/lib/shared/newformwidget.cpp +++ b/src/designer/src/lib/shared/newformwidget.cpp @@ -33,27 +33,27 @@ #include "widgetdatabase_p.h" #include "shared_settings_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerLanguageExtension> -#include <QtDesigner/QDesignerWidgetDataBaseInterface> - -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QByteArray> -#include <QtCore/QBuffer> -#include <QtCore/QDir> -#include <QtCore/QTextStream> - -#include <QtWidgets/QApplication> -#include <QtWidgets/QDesktopWidget> -#include <QtWidgets/QHeaderView> -#include <QtWidgets/QTreeWidgetItem> -#include <QtGui/QPainter> -#include <QtWidgets/QPushButton> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/abstractlanguage.h> +#include <QtDesigner/abstractwidgetdatabase.h> + +#include <QtCore/qdir.h> +#include <QtCore/qfile.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qdebug.h> +#include <QtCore/qbytearray.h> +#include <QtCore/qbuffer.h> +#include <QtCore/qdir.h> +#include <QtCore/qtextstream.h> + +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qdesktopwidget.h> +#include <QtWidgets/qheaderview.h> +#include <QtWidgets/qtreewidget.h> +#include <QtGui/qpainter.h> +#include <QtWidgets/qpushbutton.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/newformwidget_p.h b/src/designer/src/lib/shared/newformwidget_p.h index 7dc5d88e7..e382bf3a2 100644 --- a/src/designer/src/lib/shared/newformwidget_p.h +++ b/src/designer/src/lib/shared/newformwidget_p.h @@ -43,14 +43,14 @@ #include "shared_global_p.h" #include "deviceprofile_p.h" -#include <QtDesigner/QDesignerNewFormWidgetInterface> +#include <QtDesigner/abstractnewformwidget.h> -#include <QtWidgets/QWidget> -#include <QtGui/QPixmap> +#include <QtWidgets/qwidget.h> +#include <QtGui/qpixmap.h> -#include <QtCore/QStringList> -#include <QtCore/QPair> -#include <QtCore/QMap> +#include <QtCore/qstringlist.h> +#include <QtCore/qpair.h> +#include <QtCore/qmap.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/orderdialog.cpp b/src/designer/src/lib/shared/orderdialog.cpp index 2b92b3204..51389a974 100644 --- a/src/designer/src/lib/shared/orderdialog.cpp +++ b/src/designer/src/lib/shared/orderdialog.cpp @@ -30,12 +30,11 @@ #include "iconloader_p.h" #include "ui_orderdialog.h" -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerContainerExtension> -#include <QtCore/QAbstractItemModel> -#include <QtCore/QModelIndex> -#include <QtWidgets/QPushButton> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/container.h> +#include <QtCore/qabstractitemmodel.h> +#include <QtWidgets/qpushbutton.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/orderdialog_p.h b/src/designer/src/lib/shared/orderdialog_p.h index 7635214b1..7ff0f5e55 100644 --- a/src/designer/src/lib/shared/orderdialog_p.h +++ b/src/designer/src/lib/shared/orderdialog_p.h @@ -42,8 +42,8 @@ #include "shared_global_p.h" -#include <QtWidgets/QDialog> -#include <QtCore/QMap> +#include <QtWidgets/qdialog.h> +#include <QtCore/qmap.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/plaintexteditor.cpp b/src/designer/src/lib/shared/plaintexteditor.cpp index 0f352c51e..91f842f62 100644 --- a/src/designer/src/lib/shared/plaintexteditor.cpp +++ b/src/designer/src/lib/shared/plaintexteditor.cpp @@ -28,13 +28,13 @@ #include "plaintexteditor_p.h" -#include <QtDesigner/QDesignerSettingsInterface> -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QtDesigner/abstractsettings.h> +#include <QtDesigner/abstractformeditor.h> -#include <QtWidgets/QPlainTextEdit> -#include <QtWidgets/QDialogButtonBox> -#include <QtWidgets/QVBoxLayout> -#include <QtWidgets/QPushButton> +#include <QtWidgets/qplaintextedit.h> +#include <QtWidgets/qdialogbuttonbox.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qpushbutton.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/plaintexteditor_p.h b/src/designer/src/lib/shared/plaintexteditor_p.h index b2ab94a31..f255487f8 100644 --- a/src/designer/src/lib/shared/plaintexteditor_p.h +++ b/src/designer/src/lib/shared/plaintexteditor_p.h @@ -40,7 +40,7 @@ #ifndef PLAINTEXTEDITOR_H #define PLAINTEXTEDITOR_H -#include <QtWidgets/QDialog> +#include <QtWidgets/qdialog.h> #include "shared_global_p.h" QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/plugindialog.cpp b/src/designer/src/lib/shared/plugindialog.cpp index 32294daa3..06671e00b 100644 --- a/src/designer/src/lib/shared/plugindialog.cpp +++ b/src/designer/src/lib/shared/plugindialog.cpp @@ -31,17 +31,17 @@ #include "pluginmanager_p.h" #include "iconloader_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerIntegrationInterface> -#include <QtDesigner/QDesignerWidgetDataBaseInterface> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractintegration.h> +#include <QtDesigner/abstractwidgetdatabase.h> -#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface> +#include <QtUiPlugin/customwidget.h> -#include <QtWidgets/QStyle> -#include <QtWidgets/QHeaderView> -#include <QtWidgets/QPushButton> -#include <QtCore/QFileInfo> -#include <QtCore/QPluginLoader> +#include <QtWidgets/qstyle.h> +#include <QtWidgets/qheaderview.h> +#include <QtWidgets/qpushbutton.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qpluginloader.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp index 1a13aa5c3..c4a770e02 100644 --- a/src/designer/src/lib/shared/pluginmanager.cpp +++ b/src/designer/src/lib/shared/pluginmanager.cpp @@ -30,27 +30,25 @@ #include "qdesigner_utils_p.h" #include "qdesigner_qsettings_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerLanguageExtension> - -#include <QtUiPlugin/QDesignerCustomWidgetInterface> - -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QSet> -#include <QtCore/QPluginLoader> -#include <QtCore/QLibrary> -#include <QtCore/QLibraryInfo> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/abstractlanguage.h> + +#include <QtUiPlugin/customwidget.h> + +#include <QtCore/qdir.h> +#include <QtCore/qfile.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qset.h> +#include <QtCore/qpluginloader.h> +#include <QtCore/qlibrary.h> +#include <QtCore/qlibraryinfo.h> #include <QtCore/qdebug.h> -#include <QtCore/QMap> -#include <QtCore/QSettings> -#include <QtCore/QCoreApplication> +#include <QtCore/qmap.h> +#include <QtCore/qsettings.h> +#include <QtCore/qcoreapplication.h> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamAttributes> -#include <QtCore/QXmlStreamAttribute> +#include <QtCore/qxmlstream.h> static const char *uiElementC = "ui"; static const char *languageAttributeC = "language"; diff --git a/src/designer/src/lib/shared/pluginmanager_p.h b/src/designer/src/lib/shared/pluginmanager_p.h index 35a2bf12c..3c44a3c29 100644 --- a/src/designer/src/lib/shared/pluginmanager_p.h +++ b/src/designer/src/lib/shared/pluginmanager_p.h @@ -43,11 +43,11 @@ #include "shared_global_p.h" #include "shared_enums_p.h" -#include <QtCore/QSharedDataPointer> -#include <QtCore/QMap> -#include <QtCore/QPair> -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QtCore/qshareddata.h> +#include <QtCore/qmap.h> +#include <QtCore/qpair.h> +#include <QtCore/qobject.h> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp index a1d675f92..0fbf7d736 100644 --- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp +++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp @@ -36,17 +36,17 @@ #include <deviceskin.h> -#include <QtDesigner/QDesignerSettingsInterface> - -#include <QtWidgets/QFileDialog> -#include <QtWidgets/QStyleFactory> -#include <QtWidgets/QFileDialog> -#include <QtWidgets/QMessageBox> -#include <QtCore/QPair> -#include <QtCore/QList> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QSharedData> +#include <QtDesigner/abstractsettings.h> + +#include <QtWidgets/qfiledialog.h> +#include <QtWidgets/qstylefactory.h> +#include <QtWidgets/qfiledialog.h> +#include <QtWidgets/qmessagebox.h> +#include <QtCore/qpair.h> +#include <QtCore/qlist.h> +#include <QtCore/qdebug.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qshareddata.h> static const char *skinResourcePathC = ":/skins/"; diff --git a/src/designer/src/lib/shared/previewconfigurationwidget_p.h b/src/designer/src/lib/shared/previewconfigurationwidget_p.h index f4cf74c14..367890574 100644 --- a/src/designer/src/lib/shared/previewconfigurationwidget_p.h +++ b/src/designer/src/lib/shared/previewconfigurationwidget_p.h @@ -42,8 +42,8 @@ #include "shared_global_p.h" -#include <QtWidgets/QGroupBox> -#include <QtCore/QSharedDataPointer> +#include <QtWidgets/qgroupbox.h> +#include <QtCore/qshareddata.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp index f0305715d..932a5ebf1 100644 --- a/src/designer/src/lib/shared/previewmanager.cpp +++ b/src/designer/src/lib/shared/previewmanager.cpp @@ -36,29 +36,29 @@ #include <deviceskin.h> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerFormWindowManagerInterface> -#include <QtDesigner/QDesignerSettingsInterface> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractformwindowmanager.h> +#include <QtDesigner/abstractsettings.h> -#include <QtWidgets/QWidget> +#include <QtWidgets/qwidget.h> #include <QtGui/qevent.h> -#include <QtWidgets/QDesktopWidget> -#include <QtWidgets/QMainWindow> -#include <QtWidgets/QDockWidget> -#include <QtWidgets/QApplication> -#include <QtGui/QPixmap> -#include <QtWidgets/QVBoxLayout> -#include <QtWidgets/QDialog> -#include <QtWidgets/QMenu> -#include <QtWidgets/QAction> -#include <QtWidgets/QActionGroup> -#include <QtGui/QCursor> -#include <QtGui/QMatrix> - -#include <QtCore/QMap> -#include <QtCore/QDebug> -#include <QtCore/QSharedData> +#include <QtWidgets/qdesktopwidget.h> +#include <QtWidgets/qmainwindow.h> +#include <QtWidgets/qdockwidget.h> +#include <QtWidgets/qapplication.h> +#include <QtGui/qpixmap.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qdialog.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qactiongroup.h> +#include <QtGui/qcursor.h> +#include <QtGui/qmatrix.h> + +#include <QtCore/qmap.h> +#include <QtCore/qdebug.h> +#include <QtCore/qshareddata.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/previewmanager_p.h b/src/designer/src/lib/shared/previewmanager_p.h index 271df5d1e..20df2c4f6 100644 --- a/src/designer/src/lib/shared/previewmanager_p.h +++ b/src/designer/src/lib/shared/previewmanager_p.h @@ -42,9 +42,9 @@ #include "shared_global_p.h" -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QSharedDataPointer> +#include <QtCore/qobject.h> +#include <QtCore/qstring.h> +#include <QtCore/qshareddata.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/promotionmodel.cpp b/src/designer/src/lib/shared/promotionmodel.cpp index fcda653b2..45929df26 100644 --- a/src/designer/src/lib/shared/promotionmodel.cpp +++ b/src/designer/src/lib/shared/promotionmodel.cpp @@ -29,12 +29,12 @@ #include "promotionmodel_p.h" #include "widgetdatabase_p.h" -#include <QtDesigner/QDesignerWidgetDataBaseInterface> -#include <QtDesigner/QDesignerPromotionInterface> -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QtDesigner/abstractwidgetdatabase.h> +#include <QtDesigner/abstractpromotioninterface.h> +#include <QtDesigner/abstractformeditor.h> -#include <QtGui/QStandardItem> -#include <QtCore/QCoreApplication> +#include <QtGui/qstandarditemmodel.h> +#include <QtCore/qcoreapplication.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/promotionmodel_p.h b/src/designer/src/lib/shared/promotionmodel_p.h index f06a6659b..3acd119ff 100644 --- a/src/designer/src/lib/shared/promotionmodel_p.h +++ b/src/designer/src/lib/shared/promotionmodel_p.h @@ -40,9 +40,9 @@ #ifndef PROMOTIONMODEL_H #define PROMOTIONMODEL_H -#include <QtGui/QStandardItemModel> -#include <QtCore/QMetaType> -#include <QtCore/QSet> +#include <QtGui/qstandarditemmodel.h> +#include <QtCore/qmetatype.h> +#include <QtCore/qset.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/promotiontaskmenu.cpp b/src/designer/src/lib/shared/promotiontaskmenu.cpp index 929f8e539..481b944cc 100644 --- a/src/designer/src/lib/shared/promotiontaskmenu.cpp +++ b/src/designer/src/lib/shared/promotiontaskmenu.cpp @@ -36,15 +36,15 @@ #include "qdesigner_objectinspector_p.h" #include "abstractintrospection_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormWindowCursorInterface> -#include <QtDesigner/QDesignerLanguageExtension> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QExtensionManager> - -#include <QtWidgets/QAction> -#include <QtWidgets/QWidget> -#include <QtWidgets/QMenu> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractformwindowcursor.h> +#include <QtDesigner/abstractlanguage.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/qextensionmanager.h> + +#include <QtWidgets/qaction.h> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qmenu.h> #include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/promotiontaskmenu_p.h b/src/designer/src/lib/shared/promotiontaskmenu_p.h index 314dc5003..c9c6312e0 100644 --- a/src/designer/src/lib/shared/promotiontaskmenu_p.h +++ b/src/designer/src/lib/shared/promotiontaskmenu_p.h @@ -42,9 +42,9 @@ #include "shared_global_p.h" -#include <QtCore/QObject> -#include <QtCore/QPointer> -#include <QtCore/QList> +#include <QtCore/qobject.h> +#include <QtCore/qpointer.h> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/propertylineedit.cpp b/src/designer/src/lib/shared/propertylineedit.cpp index 0a3f2134a..6e5b68412 100644 --- a/src/designer/src/lib/shared/propertylineedit.cpp +++ b/src/designer/src/lib/shared/propertylineedit.cpp @@ -28,9 +28,8 @@ #include "propertylineedit_p.h" -#include <QtGui/QContextMenuEvent> -#include <QtGui/QKeyEvent> -#include <QtWidgets/QMenu> +#include <QtGui/qevent.h> +#include <QtWidgets/qmenu.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/propertylineedit_p.h b/src/designer/src/lib/shared/propertylineedit_p.h index c4c5256e7..6207aa1d7 100644 --- a/src/designer/src/lib/shared/propertylineedit_p.h +++ b/src/designer/src/lib/shared/propertylineedit_p.h @@ -42,7 +42,7 @@ #include "shared_global_p.h" -#include <QtWidgets/QLineEdit> +#include <QtWidgets/qlineedit.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_command.cpp b/src/designer/src/lib/shared/qdesigner_command.cpp index 90dd00bf2..a21f126c9 100644 --- a/src/designer/src/lib/shared/qdesigner_command.cpp +++ b/src/designer/src/lib/shared/qdesigner_command.cpp @@ -38,38 +38,38 @@ #include "formwindowbase_p.h" #include <abstractformbuilder.h> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerPropertySheetExtension> -#include <QtDesigner/QDesignerActionEditorInterface> -#include <QtDesigner/QDesignerPropertyEditorInterface> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerContainerExtension> -#include <QtDesigner/QDesignerLayoutDecorationExtension> -#include <QtDesigner/QDesignerWidgetFactoryInterface> -#include <QtDesigner/QDesignerObjectInspectorInterface> -#include <QtDesigner/QDesignerIntegrationInterface> -#include <QtDesigner/QDesignerFormWindowCursorInterface> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/propertysheet.h> +#include <QtDesigner/abstractactioneditor.h> +#include <QtDesigner/abstractpropertyeditor.h> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/container.h> +#include <QtDesigner/layoutdecoration.h> +#include <QtDesigner/abstractwidgetfactory.h> +#include <QtDesigner/abstractobjectinspector.h> +#include <QtDesigner/abstractintegration.h> +#include <QtDesigner/abstractformwindowcursor.h> #include <QtCore/qdebug.h> -#include <QtCore/QTextStream> -#include <QtCore/QQueue> - -#include <QtWidgets/QMenuBar> -#include <QtWidgets/QStatusBar> -#include <QtWidgets/QToolBar> -#include <QtWidgets/QToolBox> -#include <QtWidgets/QStackedWidget> -#include <QtWidgets/QTabWidget> -#include <QtWidgets/QTableWidget> -#include <QtWidgets/QTreeWidget> -#include <QtWidgets/QListWidget> -#include <QtWidgets/QComboBox> -#include <QtWidgets/QSplitter> -#include <QtWidgets/QDockWidget> -#include <QtWidgets/QMainWindow> -#include <QtWidgets/QWizardPage> -#include <QtWidgets/QApplication> -#include <QtWidgets/QFormLayout> +#include <QtCore/qtextstream.h> +#include <QtCore/qqueue.h> + +#include <QtWidgets/qmenubar.h> +#include <QtWidgets/qstatusbar.h> +#include <QtWidgets/qtoolbar.h> +#include <QtWidgets/qtoolbox.h> +#include <QtWidgets/qstackedwidget.h> +#include <QtWidgets/qtabwidget.h> +#include <QtWidgets/qtablewidget.h> +#include <QtWidgets/qtreewidget.h> +#include <QtWidgets/qlistwidget.h> +#include <QtWidgets/qcombobox.h> +#include <QtWidgets/qsplitter.h> +#include <QtWidgets/qdockwidget.h> +#include <QtWidgets/qmainwindow.h> +#include <QtWidgets/qwizard.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qformlayout.h> Q_DECLARE_METATYPE(QWidgetList) diff --git a/src/designer/src/lib/shared/qdesigner_command2.cpp b/src/designer/src/lib/shared/qdesigner_command2.cpp index 998179543..8f72e2a0a 100644 --- a/src/designer/src/lib/shared/qdesigner_command2.cpp +++ b/src/designer/src/lib/shared/qdesigner_command2.cpp @@ -33,11 +33,11 @@ #include "widgetfactory_p.h" #include "qlayout_widget_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerMetaDataBaseInterface> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractmetadatabase.h> -#include <QtWidgets/QApplication> -#include <QtWidgets/QLayout> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qlayout.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_command2_p.h b/src/designer/src/lib/shared/qdesigner_command2_p.h index 204bab05e..793585c28 100644 --- a/src/designer/src/lib/shared/qdesigner_command2_p.h +++ b/src/designer/src/lib/shared/qdesigner_command2_p.h @@ -43,7 +43,7 @@ #include "shared_global_p.h" #include "qdesigner_formwindowcommand_p.h" -#include <QtWidgets/QWidget> +#include <QtWidgets/qwidget.h> 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 2cccea04b..0cdf0e028 100644 --- a/src/designer/src/lib/shared/qdesigner_command_p.h +++ b/src/designer/src/lib/shared/qdesigner_command_p.h @@ -49,13 +49,13 @@ #include <QtDesigner/layoutdecoration.h> -#include <QtGui/QIcon> -#include <QtCore/QObject> -#include <QtCore/QPair> -#include <QtCore/QMap> -#include <QtCore/QHash> -#include <QtCore/QPoint> -#include <QtCore/QRect> +#include <QtGui/qicon.h> +#include <QtCore/qobject.h> +#include <QtCore/qpair.h> +#include <QtCore/qmap.h> +#include <QtCore/qhash.h> +#include <QtCore/qpoint.h> +#include <QtCore/qrect.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_dnditem.cpp b/src/designer/src/lib/shared/qdesigner_dnditem.cpp index 1bb50e8a2..e6ba17219 100644 --- a/src/designer/src/lib/shared/qdesigner_dnditem.cpp +++ b/src/designer/src/lib/shared/qdesigner_dnditem.cpp @@ -30,17 +30,17 @@ #include "formwindowbase_p.h" #include <QtDesigner/private/ui4_p.h> -#include <QtGui/QPainter> -#include <QtGui/QBitmap> -#include <QtGui/QPixmap> -#include <QtGui/QImage> -#include <QtWidgets/QLabel> -#include <QtGui/QDrag> -#include <QtGui/QCursor> -#include <QtGui/QDropEvent> -#include <QtGui/QRgb> - -#include <QtCore/QMultiMap> +#include <QtGui/qpainter.h> +#include <QtGui/qbitmap.h> +#include <QtGui/qpixmap.h> +#include <QtGui/qimage.h> +#include <QtWidgets/qlabel.h> +#include <QtGui/qdrag.h> +#include <QtGui/qcursor.h> +#include <QtGui/qevent.h> +#include <QtGui/qrgb.h> + +#include <QtCore/qmap.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_dnditem_p.h b/src/designer/src/lib/shared/qdesigner_dnditem_p.h index f8bc9124f..43b955956 100644 --- a/src/designer/src/lib/shared/qdesigner_dnditem_p.h +++ b/src/designer/src/lib/shared/qdesigner_dnditem_p.h @@ -43,9 +43,9 @@ #include "shared_global_p.h" #include <QtDesigner/abstractdnditem.h> -#include <QtCore/QPoint> -#include <QtCore/QList> -#include <QtCore/QMimeData> +#include <QtCore/qpoint.h> +#include <QtCore/qlist.h> +#include <QtCore/qmimedata.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_dockwidget.cpp b/src/designer/src/lib/shared/qdesigner_dockwidget.cpp index 45443cf4f..aead225a8 100644 --- a/src/designer/src/lib/shared/qdesigner_dockwidget.cpp +++ b/src/designer/src/lib/shared/qdesigner_dockwidget.cpp @@ -29,14 +29,14 @@ #include "qdesigner_dockwidget_p.h" #include "layoutinfo_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerContainerExtension> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerFormWindowCursorInterface> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/container.h> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/abstractformwindowcursor.h> -#include <QtWidgets/QMainWindow> -#include <QtWidgets/QLayout> +#include <QtWidgets/qmainwindow.h> +#include <QtWidgets/qlayout.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_dockwidget_p.h b/src/designer/src/lib/shared/qdesigner_dockwidget_p.h index 2044a6206..1fa17d772 100644 --- a/src/designer/src/lib/shared/qdesigner_dockwidget_p.h +++ b/src/designer/src/lib/shared/qdesigner_dockwidget_p.h @@ -41,7 +41,7 @@ #define QDESIGNER_DOCKWIDGET_H #include "shared_global_p.h" -#include <QtWidgets/QDockWidget> +#include <QtWidgets/qdockwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp index cbd7b0a46..52eb386c5 100644 --- a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp +++ b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp @@ -37,13 +37,13 @@ // sdk #include <QtDesigner/container.h> #include <QtDesigner/propertysheet.h> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerWidgetFactoryInterface> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractwidgetfactory.h> #include <abstractdialoggui_p.h> -#include <QtUiPlugin/QDesignerCustomWidgetInterface> +#include <QtUiPlugin/customwidget.h> // shared #include <qdesigner_propertysheet_p.h> @@ -51,21 +51,21 @@ #include <formwindowbase_p.h> #include <qtresourcemodel_p.h> -#include <QtWidgets/QWidget> -#include <QtWidgets/QMenu> -#include <QtWidgets/QToolBar> -#include <QtWidgets/QMenuBar> -#include <QtWidgets/QMainWindow> -#include <QtWidgets/QStyleFactory> -#include <QtWidgets/QStyle> -#include <QtWidgets/QApplication> -#include <QtWidgets/QAbstractScrollArea> -#include <QtWidgets/QMessageBox> -#include <QtGui/QPixmap> - -#include <QtCore/QBuffer> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qtoolbar.h> +#include <QtWidgets/qmenubar.h> +#include <QtWidgets/qmainwindow.h> +#include <QtWidgets/qstylefactory.h> +#include <QtWidgets/qstyle.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qabstractscrollarea.h> +#include <QtWidgets/qmessagebox.h> +#include <QtGui/qpixmap.h> + +#include <QtCore/qbuffer.h> #include <QtCore/qdebug.h> -#include <QtCore/QCoreApplication> +#include <QtCore/qcoreapplication.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder_p.h b/src/designer/src/lib/shared/qdesigner_formbuilder_p.h index 5ea570520..bceeb2a60 100644 --- a/src/designer/src/lib/shared/qdesigner_formbuilder_p.h +++ b/src/designer/src/lib/shared/qdesigner_formbuilder_p.h @@ -45,8 +45,8 @@ #include <QtDesigner/formbuilder.h> -#include <QtCore/QMap> -#include <QtCore/QSet> +#include <QtCore/qmap.h> +#include <QtCore/qset.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_formeditorcommand.cpp b/src/designer/src/lib/shared/qdesigner_formeditorcommand.cpp index 3c32dc812..926bc0b3d 100644 --- a/src/designer/src/lib/shared/qdesigner_formeditorcommand.cpp +++ b/src/designer/src/lib/shared/qdesigner_formeditorcommand.cpp @@ -28,7 +28,7 @@ #include "qdesigner_formeditorcommand_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QtDesigner/abstractformeditor.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_formeditorcommand_p.h b/src/designer/src/lib/shared/qdesigner_formeditorcommand_p.h index 5c4a40c17..e6ee08301 100644 --- a/src/designer/src/lib/shared/qdesigner_formeditorcommand_p.h +++ b/src/designer/src/lib/shared/qdesigner_formeditorcommand_p.h @@ -41,8 +41,8 @@ #define QDESIGNER_FORMEDITORCOMMAND_H #include "shared_global_p.h" -#include <QtCore/QPointer> -#include <QtWidgets/QUndoCommand> +#include <QtCore/qpointer.h> +#include <QtWidgets/qundostack.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_formwindowcommand.cpp b/src/designer/src/lib/shared/qdesigner_formwindowcommand.cpp index 22b99e793..6b70031cd 100644 --- a/src/designer/src/lib/shared/qdesigner_formwindowcommand.cpp +++ b/src/designer/src/lib/shared/qdesigner_formwindowcommand.cpp @@ -31,18 +31,18 @@ #include "qdesigner_objectinspector_p.h" #include "layout_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerObjectInspectorInterface> -#include <QtDesigner/QDesignerActionEditorInterface> -#include <QtDesigner/QDesignerMetaDataBaseInterface> -#include <QtDesigner/QDesignerPropertySheetExtension> -#include <QtDesigner/QDesignerPropertyEditorInterface> -#include <QtDesigner/QExtensionManager> - -#include <QtCore/QVariant> -#include <QtWidgets/QWidget> -#include <QtWidgets/QLabel> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractobjectinspector.h> +#include <QtDesigner/abstractactioneditor.h> +#include <QtDesigner/abstractmetadatabase.h> +#include <QtDesigner/propertysheet.h> +#include <QtDesigner/abstractpropertyeditor.h> +#include <QtDesigner/qextensionmanager.h> + +#include <QtCore/qvariant.h> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qlabel.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_formwindowcommand_p.h b/src/designer/src/lib/shared/qdesigner_formwindowcommand_p.h index 7d811ab4c..3298a87db 100644 --- a/src/designer/src/lib/shared/qdesigner_formwindowcommand_p.h +++ b/src/designer/src/lib/shared/qdesigner_formwindowcommand_p.h @@ -42,8 +42,8 @@ #include "shared_global_p.h" -#include <QtCore/QPointer> -#include <QtWidgets/QUndoCommand> +#include <QtCore/qpointer.h> +#include <QtWidgets/qundostack.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp b/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp index a9fb8fcad..2b2695159 100644 --- a/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp +++ b/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp @@ -29,7 +29,7 @@ #include "qdesigner_formwindowmanager_p.h" #include "plugindialog_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QtDesigner/abstractformeditor.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_formwindowmanager_p.h b/src/designer/src/lib/shared/qdesigner_formwindowmanager_p.h index 8d2bb9a68..bb8840c2c 100644 --- a/src/designer/src/lib/shared/qdesigner_formwindowmanager_p.h +++ b/src/designer/src/lib/shared/qdesigner_formwindowmanager_p.h @@ -41,7 +41,7 @@ #define QDESIGNER_FORMWINDOMANAGER_H #include "shared_global_p.h" -#include <QtDesigner/QDesignerFormWindowManagerInterface> +#include <QtDesigner/abstractformwindowmanager.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_introspection.cpp b/src/designer/src/lib/shared/qdesigner_introspection.cpp index 321140c8c..59c108a2e 100644 --- a/src/designer/src/lib/shared/qdesigner_introspection.cpp +++ b/src/designer/src/lib/shared/qdesigner_introspection.cpp @@ -28,10 +28,9 @@ #include "qdesigner_introspection_p.h" -#include <QtCore/QMetaObject> -#include <QtCore/QMetaEnum> -#include <QtCore/QStringList> -#include <QtCore/QVector> +#include <QtCore/qmetaobject.h> +#include <QtCore/qstringlist.h> +#include <QtCore/qvector.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_introspection_p.h b/src/designer/src/lib/shared/qdesigner_introspection_p.h index 75d6206b6..77f676ddd 100644 --- a/src/designer/src/lib/shared/qdesigner_introspection_p.h +++ b/src/designer/src/lib/shared/qdesigner_introspection_p.h @@ -42,7 +42,7 @@ #include "shared_global_p.h" #include <abstractintrospection_p.h> -#include <QtCore/QMap> +#include <QtCore/qmap.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_membersheet.cpp b/src/designer/src/lib/shared/qdesigner_membersheet.cpp index 2c1fc2ef0..47451f5a3 100644 --- a/src/designer/src/lib/shared/qdesigner_membersheet.cpp +++ b/src/designer/src/lib/shared/qdesigner_membersheet.cpp @@ -28,10 +28,10 @@ #include "qdesigner_membersheet_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QtDesigner/abstractformeditor.h> #include <abstractintrospection_p.h> -#include <QtWidgets/QWidget> +#include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE static QList<QByteArray> stringListToByteArray(const QStringList &l) diff --git a/src/designer/src/lib/shared/qdesigner_membersheet_p.h b/src/designer/src/lib/shared/qdesigner_membersheet_p.h index 78776d75c..83ee77655 100644 --- a/src/designer/src/lib/shared/qdesigner_membersheet_p.h +++ b/src/designer/src/lib/shared/qdesigner_membersheet_p.h @@ -44,7 +44,7 @@ #include <QtDesigner/membersheet.h> #include <QtDesigner/default_extensionfactory.h> -#include <QtCore/QStringList> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_menu.cpp b/src/designer/src/lib/shared/qdesigner_menu.cpp index ccb7f8520..d5cd187ca 100644 --- a/src/designer/src/lib/shared/qdesigner_menu.cpp +++ b/src/designer/src/lib/shared/qdesigner_menu.cpp @@ -37,22 +37,22 @@ #include "qdesigner_utils_p.h" #include "qdesigner_objectinspector_p.h" -#include <QtCore/QTimer> +#include <QtCore/qtimer.h> #include <QtCore/qdebug.h> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerWidgetFactoryInterface> -#include <QtDesigner/QDesignerMetaDataBaseInterface> -#include <QtDesigner/QExtensionManager> - -#include <QtWidgets/QAction> -#include <QtWidgets/QApplication> -#include <QtWidgets/QLineEdit> -#include <QtGui/QPainter> -#include <QtGui/QDrag> -#include <QtWidgets/QRubberBand> -#include <QtWidgets/QToolTip> -#include <QtWidgets/QToolBar> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractwidgetfactory.h> +#include <QtDesigner/abstractmetadatabase.h> +#include <QtDesigner/qextensionmanager.h> + +#include <QtWidgets/qaction.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qlineedit.h> +#include <QtGui/qpainter.h> +#include <QtGui/qdrag.h> +#include <QtWidgets/qrubberband.h> +#include <QtWidgets/qtooltip.h> +#include <QtWidgets/qtoolbar.h> #include <QtGui/qevent.h> Q_DECLARE_METATYPE(QAction*) diff --git a/src/designer/src/lib/shared/qdesigner_menu_p.h b/src/designer/src/lib/shared/qdesigner_menu_p.h index f868bf3b9..c03f165fd 100644 --- a/src/designer/src/lib/shared/qdesigner_menu_p.h +++ b/src/designer/src/lib/shared/qdesigner_menu_p.h @@ -42,10 +42,10 @@ #include "shared_global_p.h" -#include <QtWidgets/QAction> -#include <QtWidgets/QMenu> -#include <QtGui/QPixmap> -#include <QtCore/QHash> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qmenu.h> +#include <QtGui/qpixmap.h> +#include <QtCore/qhash.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_menubar.cpp b/src/designer/src/lib/shared/qdesigner_menubar.cpp index 639fbd96f..c70c56118 100644 --- a/src/designer/src/lib/shared/qdesigner_menubar.cpp +++ b/src/designer/src/lib/shared/qdesigner_menubar.cpp @@ -37,19 +37,19 @@ #include "promotiontaskmenu_p.h" #include "qdesigner_objectinspector_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerWidgetFactoryInterface> -#include <QtDesigner/QExtensionManager> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractwidgetfactory.h> +#include <QtDesigner/qextensionmanager.h> -#include <QtCore/QMimeData> +#include <QtCore/qmimedata.h> #include <QtCore/qdebug.h> -#include <QtWidgets/QApplication> -#include <QtGui/QDrag> -#include <QtWidgets/QLineEdit> -#include <QtGui/QPainter> +#include <QtWidgets/qapplication.h> +#include <QtGui/qdrag.h> +#include <QtWidgets/qlineedit.h> +#include <QtGui/qpainter.h> #include <QtGui/qevent.h> Q_DECLARE_METATYPE(QAction*) diff --git a/src/designer/src/lib/shared/qdesigner_menubar_p.h b/src/designer/src/lib/shared/qdesigner_menubar_p.h index 0045c4f71..08340e12e 100644 --- a/src/designer/src/lib/shared/qdesigner_menubar_p.h +++ b/src/designer/src/lib/shared/qdesigner_menubar_p.h @@ -42,11 +42,11 @@ #include "shared_global_p.h" -#include <QtWidgets/QAction> -#include <QtWidgets/QMenuBar> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qmenubar.h> -#include <QtCore/QPointer> -#include <QtCore/QMimeData> +#include <QtCore/qpointer.h> +#include <QtCore/qmimedata.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_objectinspector_p.h b/src/designer/src/lib/shared/qdesigner_objectinspector_p.h index 33eeb2d2d..7c7464cfb 100644 --- a/src/designer/src/lib/shared/qdesigner_objectinspector_p.h +++ b/src/designer/src/lib/shared/qdesigner_objectinspector_p.h @@ -41,8 +41,8 @@ #define DESIGNEROBJECTINSPECTOR_H #include "shared_global_p.h" -#include <QtDesigner/QDesignerObjectInspectorInterface> -#include <QtCore/QList> +#include <QtDesigner/abstractobjectinspector.h> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_promotion.cpp b/src/designer/src/lib/shared/qdesigner_promotion.cpp index a1e2acd42..65cf35cff 100644 --- a/src/designer/src/lib/shared/qdesigner_promotion.cpp +++ b/src/designer/src/lib/shared/qdesigner_promotion.cpp @@ -31,15 +31,15 @@ #include "metadatabase_p.h" #include "widgetdatabase_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormWindowManagerInterface> -#include <QtDesigner/QDesignerObjectInspectorInterface> -#include <QtDesigner/QDesignerWidgetBoxInterface> -#include <QtDesigner/QDesignerWidgetDataBaseInterface> - -#include <QtCore/QMap> -#include <QtCore/QCoreApplication> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractformwindowmanager.h> +#include <QtDesigner/abstractobjectinspector.h> +#include <QtDesigner/abstractwidgetbox.h> +#include <QtDesigner/abstractwidgetdatabase.h> + +#include <QtCore/qmap.h> +#include <QtCore/qcoreapplication.h> #include <qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_promotion_p.h b/src/designer/src/lib/shared/qdesigner_promotion_p.h index 9017d6de4..53a862795 100644 --- a/src/designer/src/lib/shared/qdesigner_promotion_p.h +++ b/src/designer/src/lib/shared/qdesigner_promotion_p.h @@ -42,7 +42,7 @@ #include "shared_global_p.h" -#include <QtDesigner/QDesignerPromotionInterface> +#include <QtDesigner/abstractpromotioninterface.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp index 5830549e3..24e10fb70 100644 --- a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp +++ b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp @@ -32,31 +32,29 @@ #include "widgetdatabase_p.h" #include "signalslotdialog_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerPromotionInterface> -#include <QtDesigner/QDesignerWidgetDataBaseItemInterface> -#include <QtDesigner/QDesignerIntegrationInterface> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractpromotioninterface.h> +#include <QtDesigner/abstractwidgetdatabase.h> +#include <QtDesigner/abstractintegration.h> #include <abstractdialoggui_p.h> -#include <QtCore/QTimer> -#include <QtWidgets/QVBoxLayout> -#include <QtWidgets/QHBoxLayout> -#include <QtWidgets/QFormLayout> -#include <QtWidgets/QDialogButtonBox> -#include <QtWidgets/QTreeView> -#include <QtWidgets/QHeaderView> -#include <QtWidgets/QPushButton> -#include <QtCore/QItemSelectionModel> -#include <QtCore/QItemSelection> -#include <QtWidgets/QComboBox> -#include <QtWidgets/QLineEdit> -#include <QtWidgets/QCheckBox> -#include <QtGui/QRegularExpressionValidator> -#include <QtWidgets/QLabel> -#include <QtWidgets/QSpacerItem> -#include <QtWidgets/QMenu> -#include <QtWidgets/QAction> +#include <QtCore/qtimer.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qformlayout.h> +#include <QtWidgets/qdialogbuttonbox.h> +#include <QtWidgets/qtreeview.h> +#include <QtWidgets/qheaderview.h> +#include <QtWidgets/qpushbutton.h> +#include <QtCore/qitemselectionmodel.h> +#include <QtWidgets/qcombobox.h> +#include <QtWidgets/qlineedit.h> +#include <QtWidgets/qcheckbox.h> +#include <QtGui/qvalidator.h> +#include <QtWidgets/qlabel.h> +#include <QtWidgets/qlayoutitem.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qaction.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog_p.h b/src/designer/src/lib/shared/qdesigner_promotiondialog_p.h index 9773b3abc..461b02192 100644 --- a/src/designer/src/lib/shared/qdesigner_promotiondialog_p.h +++ b/src/designer/src/lib/shared/qdesigner_promotiondialog_p.h @@ -40,8 +40,8 @@ #ifndef PROMOTIONEDITORDIALOG_H #define PROMOTIONEDITORDIALOG_H -#include <QtWidgets/QDialog> -#include <QtWidgets/QGroupBox> +#include <QtWidgets/qdialog.h> +#include <QtWidgets/qgroupbox.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp index 43da500ad..6b40aec8c 100644 --- a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp +++ b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp @@ -33,26 +33,26 @@ #include "spacer_widget_p.h" #include "qdesigner_propertysheet_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerIntegrationInterface> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormWindowCursorInterface> -#include <QtDesigner/QDesignerDynamicPropertySheetExtension> -#include <QtDesigner/QDesignerPropertySheetExtension> -#include <QtDesigner/QDesignerPropertyEditorInterface> -#include <QtDesigner/QDesignerObjectInspectorInterface> -#include <QtDesigner/QDesignerIntegrationInterface> -#include <QtDesigner/QDesignerWidgetDataBaseInterface> -#include <QtDesigner/QExtensionManager> - -#include <QtCore/QSize> -#include <QtCore/QTextStream> -#include <QtWidgets/QWidget> -#include <QtWidgets/QApplication> -#include <QtWidgets/QAction> -#include <QtWidgets/QDialog> -#include <QtWidgets/QPushButton> -#include <QtWidgets/QLayout> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractintegration.h> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractformwindowcursor.h> +#include <QtDesigner/dynamicpropertysheet.h> +#include <QtDesigner/propertysheet.h> +#include <QtDesigner/abstractpropertyeditor.h> +#include <QtDesigner/abstractobjectinspector.h> +#include <QtDesigner/abstractintegration.h> +#include <QtDesigner/abstractwidgetdatabase.h> +#include <QtDesigner/qextensionmanager.h> + +#include <QtCore/qsize.h> +#include <QtCore/qtextstream.h> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qdialog.h> +#include <QtWidgets/qpushbutton.h> +#include <QtWidgets/qlayout.h> #include <qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand_p.h b/src/designer/src/lib/shared/qdesigner_propertycommand_p.h index 0f0230aa7..cc607ae91 100644 --- a/src/designer/src/lib/shared/qdesigner_propertycommand_p.h +++ b/src/designer/src/lib/shared/qdesigner_propertycommand_p.h @@ -42,10 +42,10 @@ #include "qdesigner_formwindowcommand_p.h" -#include <QtCore/QVariant> -#include <QtCore/QList> -#include <QtCore/QPair> -#include <QtCore/QSharedPointer> +#include <QtCore/qvariant.h> +#include <QtCore/qlist.h> +#include <QtCore/qpair.h> +#include <QtCore/qsharedpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp b/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp index 45a50d021..e3806ba96 100644 --- a/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp +++ b/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp @@ -29,14 +29,14 @@ #include "qdesigner_propertyeditor_p.h" #include "pluginmanager_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerDynamicPropertySheetExtension> -#include <QtDesigner/QDesignerPropertySheetExtension> -#include <QtDesigner/QExtensionManager> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/dynamicpropertysheet.h> +#include <QtDesigner/propertysheet.h> +#include <QtDesigner/qextensionmanager.h> #include <widgetfactory_p.h> -#include <QtWidgets/QAction> -#include <QtWidgets/QLineEdit> -#include <QtWidgets/QAbstractButton> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qlineedit.h> +#include <QtWidgets/qabstractbutton.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_propertyeditor_p.h b/src/designer/src/lib/shared/qdesigner_propertyeditor_p.h index b11a3faa3..7d98e2c86 100644 --- a/src/designer/src/lib/shared/qdesigner_propertyeditor_p.h +++ b/src/designer/src/lib/shared/qdesigner_propertyeditor_p.h @@ -43,7 +43,7 @@ #include "shared_global_p.h" #include "shared_enums_p.h" -#include <QtDesigner/QDesignerPropertyEditorInterface> +#include <QtDesigner/abstractpropertyeditor.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp index 6a0910e2a..31c88da1e 100644 --- a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp +++ b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp @@ -35,22 +35,22 @@ #include <QtDesigner/private/formbuilderextra_p.h> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerWidgetDataBaseInterface> - -#include <QtCore/QDebug> - -#include <QtWidgets/QLayout> -#include <QtWidgets/QDockWidget> -#include <QtWidgets/QDialog> -#include <QtWidgets/QLabel> -#include <QtWidgets/QGroupBox> -#include <QtWidgets/QStyle> -#include <QtWidgets/QApplication> -#include <QtWidgets/QToolBar> -#include <QtWidgets/QMainWindow> -#include <QtWidgets/QMenuBar> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractwidgetdatabase.h> + +#include <QtCore/qdebug.h> + +#include <QtWidgets/qlayout.h> +#include <QtWidgets/qdockwidget.h> +#include <QtWidgets/qdialog.h> +#include <QtWidgets/qlabel.h> +#include <QtWidgets/qgroupbox.h> +#include <QtWidgets/qstyle.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qtoolbar.h> +#include <QtWidgets/qmainwindow.h> +#include <QtWidgets/qmenubar.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet_p.h b/src/designer/src/lib/shared/qdesigner_propertysheet_p.h index 70557a798..87c5e879e 100644 --- a/src/designer/src/lib/shared/qdesigner_propertysheet_p.h +++ b/src/designer/src/lib/shared/qdesigner_propertysheet_p.h @@ -44,12 +44,12 @@ #include "dynamicpropertysheet.h" #include <QtDesigner/propertysheet.h> #include <QtDesigner/default_extensionfactory.h> -#include <QtDesigner/QExtensionManager> +#include <QtDesigner/qextensionmanager.h> -#include <QtCore/QVariant> -#include <QtCore/QPair> +#include <QtCore/qvariant.h> +#include <QtCore/qpair.h> -#include <QtCore/QPointer> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_qsettings.cpp b/src/designer/src/lib/shared/qdesigner_qsettings.cpp index d67c930be..0fa7d676e 100644 --- a/src/designer/src/lib/shared/qdesigner_qsettings.cpp +++ b/src/designer/src/lib/shared/qdesigner_qsettings.cpp @@ -28,11 +28,11 @@ #include "qdesigner_qsettings_p.h" -#include <QtCore/QSettings> -#include <QtCore/QCoreApplication> -#include <QtCore/QTextStream> -#include <QtCore/QString> -#include <QtCore/QDebug> +#include <QtCore/qsettings.h> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qtextstream.h> +#include <QtCore/qstring.h> +#include <QtCore/qdebug.h> QDesignerQSettings::QDesignerQSettings() : m_settings(qApp->organizationName(), settingsApplicationName()) diff --git a/src/designer/src/lib/shared/qdesigner_qsettings_p.h b/src/designer/src/lib/shared/qdesigner_qsettings_p.h index 9135bd241..fe25142ea 100644 --- a/src/designer/src/lib/shared/qdesigner_qsettings_p.h +++ b/src/designer/src/lib/shared/qdesigner_qsettings_p.h @@ -42,9 +42,9 @@ #include "shared_global_p.h" -#include <QtDesigner/QDesignerSettingsInterface> +#include <QtDesigner/abstractsettings.h> -#include <QtCore/QSettings> +#include <QtCore/qsettings.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_stackedbox.cpp b/src/designer/src/lib/shared/qdesigner_stackedbox.cpp index ed7267459..ac91b7ed9 100644 --- a/src/designer/src/lib/shared/qdesigner_stackedbox.cpp +++ b/src/designer/src/lib/shared/qdesigner_stackedbox.cpp @@ -33,14 +33,14 @@ #include "promotiontaskmenu_p.h" #include "widgetfactory_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> +#include <QtDesigner/abstractformwindow.h> -#include <QtWidgets/QToolButton> -#include <QtWidgets/QAction> +#include <QtWidgets/qtoolbutton.h> +#include <QtWidgets/qaction.h> #include <QtGui/qevent.h> -#include <QtWidgets/QMenu> -#include <QtWidgets/QStackedWidget> -#include <QtCore/QDebug> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qstackedwidget.h> +#include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp index efcd85a8c..a785c2d53 100644 --- a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp +++ b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp @@ -32,19 +32,19 @@ #include "promotiontaskmenu_p.h" #include "formwindowbase_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> +#include <QtDesigner/abstractformwindow.h> -#include <QtWidgets/QApplication> -#include <QtWidgets/QTabBar> -#include <QtWidgets/QAction> -#include <QtGui/QMouseEvent> -#include <QtGui/QDrag> -#include <QtWidgets/QMenu> -#include <QtWidgets/QLabel> -#include <QtWidgets/QTabWidget> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qtabbar.h> +#include <QtWidgets/qaction.h> +#include <QtGui/qevent.h> +#include <QtGui/qdrag.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qlabel.h> +#include <QtWidgets/qtabwidget.h> #include <QtCore/qdebug.h> -#include <QtCore/QMimeData> +#include <QtCore/qmimedata.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_tabwidget_p.h b/src/designer/src/lib/shared/qdesigner_tabwidget_p.h index e9419eb30..ab431fb60 100644 --- a/src/designer/src/lib/shared/qdesigner_tabwidget_p.h +++ b/src/designer/src/lib/shared/qdesigner_tabwidget_p.h @@ -44,8 +44,8 @@ #include "qdesigner_propertysheet_p.h" #include "qdesigner_utils_p.h" -#include <QtCore/QPointer> -#include <QtGui/QIcon> +#include <QtCore/qpointer.h> +#include <QtGui/qicon.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp index af3c2af83..b81979062 100644 --- a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp +++ b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp @@ -52,26 +52,26 @@ #include <shared_enums_p.h> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormWindowCursorInterface> -#include <QtDesigner/QDesignerPropertySheetExtension> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerLanguageExtension> -#include <QtDesigner/QDesignerIntegrationInterface> -#include <QtDesigner/QExtensionManager> - -#include <QtWidgets/QAction> -#include <QtWidgets/QActionGroup> -#include <QtWidgets/QWidget> -#include <QtWidgets/QMenuBar> -#include <QtWidgets/QMainWindow> -#include <QtWidgets/QStatusBar> -#include <QtWidgets/QDialogButtonBox> -#include <QtWidgets/QVBoxLayout> -#include <QtWidgets/QPushButton> -#include <QtWidgets/QUndoStack> -#include <QtCore/QDebug> -#include <QtCore/QCoreApplication> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractformwindowcursor.h> +#include <QtDesigner/propertysheet.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractlanguage.h> +#include <QtDesigner/abstractintegration.h> +#include <QtDesigner/qextensionmanager.h> + +#include <QtWidgets/qaction.h> +#include <QtWidgets/qactiongroup.h> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qmenubar.h> +#include <QtWidgets/qmainwindow.h> +#include <QtWidgets/qstatusbar.h> +#include <QtWidgets/qdialogbuttonbox.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qpushbutton.h> +#include <QtWidgets/qundostack.h> +#include <QtCore/qdebug.h> +#include <QtCore/qcoreapplication.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu_p.h b/src/designer/src/lib/shared/qdesigner_taskmenu_p.h index 0d3061e84..d4f1e6654 100644 --- a/src/designer/src/lib/shared/qdesigner_taskmenu_p.h +++ b/src/designer/src/lib/shared/qdesigner_taskmenu_p.h @@ -42,13 +42,13 @@ #include "shared_global_p.h" #include "extensionfactory_p.h" -#include <QtDesigner/QDesignerTaskMenuExtension> +#include <QtDesigner/taskmenu.h> #include <QtGui/qwindowdefs.h> -#include <QtCore/QObject> -#include <QtCore/QPointer> -#include <QtCore/QList> +#include <QtCore/qobject.h> +#include <QtCore/qpointer.h> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_toolbar.cpp b/src/designer/src/lib/shared/qdesigner_toolbar.cpp index b98530025..baa36880d 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbar.cpp +++ b/src/designer/src/lib/shared/qdesigner_toolbar.cpp @@ -34,22 +34,22 @@ #include "qdesigner_objectinspector_p.h" #include "promotiontaskmenu_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerPropertyEditorInterface> -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractpropertyeditor.h> +#include <QtDesigner/abstractformeditor.h> #include <actionprovider_p.h> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerWidgetFactoryInterface> - -#include <QtWidgets/QAction> -#include <QtWidgets/QApplication> -#include <QtWidgets/QToolButton> -#include <QtWidgets/QToolBar> -#include <QtWidgets/QMenu> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/abstractwidgetfactory.h> + +#include <QtWidgets/qaction.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qtoolbutton.h> +#include <QtWidgets/qtoolbar.h> +#include <QtWidgets/qmenu.h> #include <QtGui/qevent.h> -#include <QtGui/QDrag> -#include <QtWidgets/QApplication> -#include <QtCore/QDebug> +#include <QtGui/qdrag.h> +#include <QtWidgets/qapplication.h> +#include <QtCore/qdebug.h> Q_DECLARE_METATYPE(QAction*) diff --git a/src/designer/src/lib/shared/qdesigner_toolbar_p.h b/src/designer/src/lib/shared/qdesigner_toolbar_p.h index d5173dc66..97d957c0c 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbar_p.h +++ b/src/designer/src/lib/shared/qdesigner_toolbar_p.h @@ -42,11 +42,11 @@ #include "shared_global_p.h" -#include <QtWidgets/QAction> -#include <QtWidgets/QToolButton> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qtoolbutton.h> -#include <QtCore/QList> -#include <QtCore/QPoint> +#include <QtCore/qlist.h> +#include <QtCore/qpoint.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_toolbox.cpp b/src/designer/src/lib/shared/qdesigner_toolbox.cpp index 61e2e0137..435354459 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbox.cpp +++ b/src/designer/src/lib/shared/qdesigner_toolbox.cpp @@ -32,16 +32,15 @@ #include "promotiontaskmenu_p.h" #include "formwindowbase_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> - -#include <QtCore/QEvent> -#include <QtWidgets/QAction> -#include <QtWidgets/QToolBox> -#include <QtWidgets/QMenu> -#include <QtWidgets/QLayout> -#include <QtWidgets/QApplication> -#include <QtGui/QContextMenuEvent> -#include <QtCore/QHash> +#include <QtDesigner/abstractformwindow.h> + +#include <QtWidgets/qaction.h> +#include <QtWidgets/qtoolbox.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qlayout.h> +#include <QtWidgets/qapplication.h> +#include <QtGui/qevent.h> +#include <QtCore/qhash.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_toolbox_p.h b/src/designer/src/lib/shared/qdesigner_toolbox_p.h index a41df57e2..12be40c39 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbox_p.h +++ b/src/designer/src/lib/shared/qdesigner_toolbox_p.h @@ -43,7 +43,7 @@ #include "shared_global_p.h" #include "qdesigner_propertysheet_p.h" #include "qdesigner_utils_p.h" -#include <QtGui/QPalette> +#include <QtGui/qpalette.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_utils.cpp b/src/designer/src/lib/shared/qdesigner_utils.cpp index 27144f4e7..2cf61b04a 100644 --- a/src/designer/src/lib/shared/qdesigner_utils.cpp +++ b/src/designer/src/lib/shared/qdesigner_utils.cpp @@ -31,27 +31,27 @@ #include "abstractformbuilder.h" #include "formwindowbase_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerResourceBrowserInterface> -#include <QtDesigner/QDesignerLanguageExtension> -#include <QtDesigner/QDesignerTaskMenuExtension> -#include <QtDesigner/QExtensionManager> - -#include <QtCore/QDir> -#include <QtCore/QProcess> -#include <QtCore/QLibraryInfo> -#include <QtCore/QDebug> -#include <QtCore/QQueue> -#include <QtCore/QSharedData> - -#include <QtWidgets/QApplication> -#include <QtGui/QIcon> -#include <QtGui/QPixmap> -#include <QtWidgets/QListWidget> -#include <QtWidgets/QTreeWidget> -#include <QtWidgets/QTableWidget> -#include <QtWidgets/QComboBox> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractresourcebrowser.h> +#include <QtDesigner/abstractlanguage.h> +#include <QtDesigner/taskmenu.h> +#include <QtDesigner/qextensionmanager.h> + +#include <QtCore/qdir.h> +#include <QtCore/qprocess.h> +#include <QtCore/qlibraryinfo.h> +#include <QtCore/qdebug.h> +#include <QtCore/qqueue.h> +#include <QtCore/qshareddata.h> + +#include <QtWidgets/qapplication.h> +#include <QtGui/qicon.h> +#include <QtGui/qpixmap.h> +#include <QtWidgets/qlistwidget.h> +#include <QtWidgets/qtreewidget.h> +#include <QtWidgets/qtablewidget.h> +#include <QtWidgets/qcombobox.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_utils_p.h b/src/designer/src/lib/shared/qdesigner_utils_p.h index 41e84fe6e..fca5ca956 100644 --- a/src/designer/src/lib/shared/qdesigner_utils_p.h +++ b/src/designer/src/lib/shared/qdesigner_utils_p.h @@ -42,14 +42,14 @@ #include "shared_global_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> - -#include <QtCore/QVariant> -#include <QtCore/QSharedDataPointer> -#include <QtCore/QMap> -#include <QtWidgets/QMainWindow> -#include <QtGui/QIcon> -#include <QtGui/QPixmap> +#include <QtDesigner/abstractformwindow.h> + +#include <QtCore/qvariant.h> +#include <QtCore/qshareddata.h> +#include <QtCore/qmap.h> +#include <QtWidgets/qmainwindow.h> +#include <QtGui/qicon.h> +#include <QtGui/qpixmap.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_widget.cpp b/src/designer/src/lib/shared/qdesigner_widget.cpp index 984d5d59b..ae6e277d6 100644 --- a/src/designer/src/lib/shared/qdesigner_widget.cpp +++ b/src/designer/src/lib/shared/qdesigner_widget.cpp @@ -30,10 +30,10 @@ #include "formwindowbase_p.h" #include "grid_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtGui/QPainter> -#include <QtWidgets/QStyle> -#include <QtWidgets/QStyleOption> +#include <QtDesigner/abstractformwindow.h> +#include <QtGui/qpainter.h> +#include <QtWidgets/qstyle.h> +#include <QtWidgets/qstyleoption.h> #include <QtGui/qevent.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_widget_p.h b/src/designer/src/lib/shared/qdesigner_widget_p.h index 6efdcbbf2..5555b84a4 100644 --- a/src/designer/src/lib/shared/qdesigner_widget_p.h +++ b/src/designer/src/lib/shared/qdesigner_widget_p.h @@ -41,8 +41,8 @@ #define QDESIGNER_WIDGET_H #include "shared_global_p.h" -#include <QtWidgets/QDialog> -#include <QtWidgets/QLabel> +#include <QtWidgets/qdialog.h> +#include <QtWidgets/qlabel.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_widgetbox.cpp b/src/designer/src/lib/shared/qdesigner_widgetbox.cpp index 1e581ba02..8d64d76ee 100644 --- a/src/designer/src/lib/shared/qdesigner_widgetbox.cpp +++ b/src/designer/src/lib/shared/qdesigner_widgetbox.cpp @@ -31,10 +31,10 @@ #include <QtDesigner/private/ui4_p.h> -#include <QtCore/QRegularExpression> -#include <QtCore/QDebug> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QSharedData> +#include <QtCore/qregularexpression.h> +#include <QtCore/qdebug.h> +#include <QtCore/qxmlstream.h> +#include <QtCore/qshareddata.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_widgetbox_p.h b/src/designer/src/lib/shared/qdesigner_widgetbox_p.h index 87bf046b8..7a3aaad32 100644 --- a/src/designer/src/lib/shared/qdesigner_widgetbox_p.h +++ b/src/designer/src/lib/shared/qdesigner_widgetbox_p.h @@ -41,7 +41,7 @@ #define QDESIGNER_WIDGETBOX_H #include "shared_global_p.h" -#include <QtDesigner/QDesignerWidgetBoxInterface> +#include <QtDesigner/abstractwidgetbox.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_widgetitem.cpp b/src/designer/src/lib/shared/qdesigner_widgetitem.cpp index 598ab277f..03f8a241f 100644 --- a/src/designer/src/lib/shared/qdesigner_widgetitem.cpp +++ b/src/designer/src/lib/shared/qdesigner_widgetitem.cpp @@ -30,20 +30,19 @@ #include "qdesigner_widget_p.h" #include "widgetfactory_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerContainerExtension> -#include <QtDesigner/QDesignerWidgetDataBaseInterface> - -#include <QtWidgets/QVBoxLayout> -#include <QtWidgets/QHBoxLayout> -#include <QtWidgets/QGridLayout> -#include <QtWidgets/QFormLayout> -#include <QtWidgets/QApplication> - -#include <QtCore/QTextStream> -#include <QtCore/QDebug> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/container.h> +#include <QtDesigner/abstractwidgetdatabase.h> + +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qgridlayout.h> +#include <QtWidgets/qformlayout.h> +#include <QtWidgets/qapplication.h> + +#include <QtCore/qtextstream.h> +#include <QtCore/qdebug.h> #include <private/qlayout_p.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_widgetitem_p.h b/src/designer/src/lib/shared/qdesigner_widgetitem_p.h index 8f9ab7816..d65be4833 100644 --- a/src/designer/src/lib/shared/qdesigner_widgetitem_p.h +++ b/src/designer/src/lib/shared/qdesigner_widgetitem_p.h @@ -42,8 +42,8 @@ #include "shared_global_p.h" -#include <QtWidgets/QLayoutItem> -#include <QtCore/QObject> +#include <QtWidgets/qlayoutitem.h> +#include <QtCore/qobject.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp index a7bec9180..2956f3e77 100644 --- a/src/designer/src/lib/shared/qlayout_widget.cpp +++ b/src/designer/src/lib/shared/qlayout_widget.cpp @@ -33,26 +33,25 @@ #include "invisible_widget_p.h" #include "qdesigner_widgetitem_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerPropertySheetExtension> -#include <QtDesigner/QDesignerWidgetFactoryInterface> - -#include <QtGui/QPainter> -#include <QtWidgets/QHBoxLayout> -#include <QtWidgets/QVBoxLayout> -#include <QtWidgets/QGridLayout> -#include <QtWidgets/QFormLayout> -#include <QtWidgets/QApplication> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/propertysheet.h> +#include <QtDesigner/abstractwidgetfactory.h> + +#include <QtGui/qpainter.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qgridlayout.h> +#include <QtWidgets/qformlayout.h> +#include <QtWidgets/qapplication.h> #include <QtGui/qevent.h> #include <QtCore/qdebug.h> -#include <QtCore/QtAlgorithms> -#include <QtCore/QMap> -#include <QtCore/QStack> -#include <QtCore/QPair> -#include <QtCore/QSet> +#include <QtCore/qalgorithms.h> +#include <QtCore/qmap.h> +#include <QtCore/qstack.h> +#include <QtCore/qpair.h> +#include <QtCore/qset.h> #include <algorithm> diff --git a/src/designer/src/lib/shared/qlayout_widget_p.h b/src/designer/src/lib/shared/qlayout_widget_p.h index 2aa91f1c4..1a70c71a2 100644 --- a/src/designer/src/lib/shared/qlayout_widget_p.h +++ b/src/designer/src/lib/shared/qlayout_widget_p.h @@ -42,12 +42,12 @@ #include "shared_global_p.h" -#include <QtDesigner/QDesignerLayoutDecorationExtension> +#include <QtDesigner/layoutdecoration.h> -#include <QtCore/QPointer> -#include <QtCore/QVariant> -#include <QtWidgets/QWidget> -#include <QtWidgets/QLayout> +#include <QtCore/qpointer.h> +#include <QtCore/qvariant.h> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qlayout.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qsimpleresource.cpp b/src/designer/src/lib/shared/qsimpleresource.cpp index 95210559c..fea62f88c 100644 --- a/src/designer/src/lib/shared/qsimpleresource.cpp +++ b/src/designer/src/lib/shared/qsimpleresource.cpp @@ -33,18 +33,18 @@ #include <QtDesigner/private/properties_p.h> #include <QtDesigner/private/ui4_p.h> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerLanguageExtension> -#include <QtDesigner/QExtensionManager> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractlanguage.h> +#include <QtDesigner/qextensionmanager.h> #include <QtDesigner/extrainfo.h> -#include <QtUiPlugin/QDesignerCustomWidgetInterface> +#include <QtUiPlugin/customwidget.h> -#include <QtGui/QIcon> -#include <QtWidgets/QWidget> -#include <QtWidgets/QAction> -#include <QtCore/QDebug> -#include <QtCore/QCoreApplication> +#include <QtGui/qicon.h> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qaction.h> +#include <QtCore/qdebug.h> +#include <QtCore/qcoreapplication.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qsimpleresource_p.h b/src/designer/src/lib/shared/qsimpleresource_p.h index 8bd5d5f0d..727529126 100644 --- a/src/designer/src/lib/shared/qsimpleresource_p.h +++ b/src/designer/src/lib/shared/qsimpleresource_p.h @@ -42,8 +42,8 @@ #include "shared_global_p.h" #include "abstractformbuilder.h" -#include <QtCore/QStringList> -#include <QtCore/QVector> +#include <QtCore/qstringlist.h> +#include <QtCore/qvector.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qtresourceeditordialog.cpp b/src/designer/src/lib/shared/qtresourceeditordialog.cpp index 38c7cbd65..e5db4d640 100644 --- a/src/designer/src/lib/shared/qtresourceeditordialog.cpp +++ b/src/designer/src/lib/shared/qtresourceeditordialog.cpp @@ -33,19 +33,19 @@ #include <abstractdialoggui_p.h> -#include <QtDesigner/QDesignerSettingsInterface> -#include <QtDesigner/QDesignerFormEditorInterface> - -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QCoreApplication> -#include <QtXml/QDomDocument> -#include <QtWidgets/QMenu> -#include <QtWidgets/QHeaderView> -#include <QtWidgets/QInputDialog> -#include <QtWidgets/QMessageBox> -#include <QtWidgets/QPushButton> -#include <QtGui/QStandardItemModel> +#include <QtDesigner/abstractsettings.h> +#include <QtDesigner/abstractformeditor.h> + +#include <QtCore/qfileinfo.h> +#include <QtCore/qdir.h> +#include <QtCore/qcoreapplication.h> +#include <QtXml/qdom.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qheaderview.h> +#include <QtWidgets/qinputdialog.h> +#include <QtWidgets/qmessagebox.h> +#include <QtWidgets/qpushbutton.h> +#include <QtGui/qstandarditemmodel.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qtresourceeditordialog_p.h b/src/designer/src/lib/shared/qtresourceeditordialog_p.h index 2ae8305fb..bfd9bb76c 100644 --- a/src/designer/src/lib/shared/qtresourceeditordialog_p.h +++ b/src/designer/src/lib/shared/qtresourceeditordialog_p.h @@ -40,8 +40,8 @@ #ifndef QTRESOURCEEDITOR_H #define QTRESOURCEEDITOR_H -#include <QtCore/QScopedPointer> -#include <QtWidgets/QDialog> +#include <QtCore/qscopedpointer.h> +#include <QtWidgets/qdialog.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qtresourcemodel.cpp b/src/designer/src/lib/shared/qtresourcemodel.cpp index 4b08f3670..098dc984a 100644 --- a/src/designer/src/lib/shared/qtresourcemodel.cpp +++ b/src/designer/src/lib/shared/qtresourcemodel.cpp @@ -29,15 +29,15 @@ #include "qtresourcemodel_p.h" #include "rcc_p.h" -#include <QtCore/QStringList> -#include <QtCore/QMap> -#include <QtCore/QResource> -#include <QtCore/QFileInfo> -#include <QtCore/QIODevice> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QBuffer> -#include <QtCore/QFileSystemWatcher> +#include <QtCore/qstringlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qresource.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qiodevice.h> +#include <QtCore/qdir.h> +#include <QtCore/qdebug.h> +#include <QtCore/qbuffer.h> +#include <QtCore/qfilesystemwatcher.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qtresourcemodel_p.h b/src/designer/src/lib/shared/qtresourcemodel_p.h index b51eb3851..4430da4a9 100644 --- a/src/designer/src/lib/shared/qtresourcemodel_p.h +++ b/src/designer/src/lib/shared/qtresourcemodel_p.h @@ -41,9 +41,9 @@ #define QTRESOURCEMODEL_H #include "shared_global_p.h" -#include <QtCore/QMap> -#include <QtCore/QObject> -#include <QtCore/QScopedPointer> +#include <QtCore/qmap.h> +#include <QtCore/qobject.h> +#include <QtCore/qscopedpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp index 8a1a39b53..150d2c8b8 100644 --- a/src/designer/src/lib/shared/qtresourceview.cpp +++ b/src/designer/src/lib/shared/qtresourceview.cpp @@ -31,33 +31,33 @@ #include "qtresourceeditordialog_p.h" #include "iconloader_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerSettingsInterface> - -#include <QtWidgets/QToolBar> -#include <QtWidgets/QAction> -#include <QtWidgets/QSplitter> -#include <QtWidgets/QTreeWidget> -#include <QtWidgets/QListWidget> -#include <QtWidgets/QHeaderView> -#include <QtWidgets/QVBoxLayout> -#include <QtGui/QPainter> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QQueue> -#include <QtGui/QPainter> -#include <QtWidgets/QDialogButtonBox> -#include <QtWidgets/QPushButton> -#include <QtWidgets/QMessageBox> -#include <QtWidgets/QApplication> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractsettings.h> + +#include <QtWidgets/qtoolbar.h> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qsplitter.h> +#include <QtWidgets/qtreewidget.h> +#include <QtWidgets/qlistwidget.h> +#include <QtWidgets/qheaderview.h> +#include <QtWidgets/qboxlayout.h> +#include <QtGui/qpainter.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qdir.h> +#include <QtCore/qqueue.h> +#include <QtGui/qpainter.h> +#include <QtWidgets/qdialogbuttonbox.h> +#include <QtWidgets/qpushbutton.h> +#include <QtWidgets/qmessagebox.h> +#include <QtWidgets/qapplication.h> #ifndef QT_NO_CLIPBOARD -#include <QtGui/QClipboard> +#include <QtGui/qclipboard.h> #endif -#include <QtWidgets/QMenu> -#include <QtWidgets/QLineEdit> -#include <QtGui/QDrag> -#include <QtCore/QMimeData> -#include <QtXml/QDomDocument> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qlineedit.h> +#include <QtGui/qdrag.h> +#include <QtCore/qmimedata.h> +#include <QtXml/qdom.h> #include <algorithm> diff --git a/src/designer/src/lib/shared/qtresourceview_p.h b/src/designer/src/lib/shared/qtresourceview_p.h index 6d0fa5d92..ff4a4e657 100644 --- a/src/designer/src/lib/shared/qtresourceview_p.h +++ b/src/designer/src/lib/shared/qtresourceview_p.h @@ -41,8 +41,8 @@ #define QTRESOURCEVIEW_H #include "shared_global_p.h" -#include <QtWidgets/QWidget> -#include <QtWidgets/QDialog> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qdialog.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/rcc.cpp b/src/designer/src/lib/shared/rcc.cpp index b1321bc5d..d2cdb4f25 100644 --- a/src/designer/src/lib/shared/rcc.cpp +++ b/src/designer/src/lib/shared/rcc.cpp @@ -30,17 +30,17 @@ #include "rcc_p.h" -#include <QtCore/QByteArray> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QDirIterator> -#include <QtCore/QFile> -#include <QtCore/QIODevice> -#include <QtCore/QLocale> -#include <QtCore/QRegExp> -#include <QtCore/QStack> -#include <QtCore/QXmlStreamReader> +#include <QtCore/qbytearray.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qdebug.h> +#include <QtCore/qdir.h> +#include <QtCore/qdiriterator.h> +#include <QtCore/qfile.h> +#include <QtCore/qiodevice.h> +#include <QtCore/qlocale.h> +#include <QtCore/qregexp.h> +#include <QtCore/qstack.h> +#include <QtCore/qxmlstream.h> #include <algorithm> diff --git a/src/designer/src/lib/shared/rcc_p.h b/src/designer/src/lib/shared/rcc_p.h index 142c55365..bd7e1c44c 100644 --- a/src/designer/src/lib/shared/rcc_p.h +++ b/src/designer/src/lib/shared/rcc_p.h @@ -40,9 +40,9 @@ #ifndef RCC_H #define RCC_H -#include <QtCore/QStringList> -#include <QtCore/QHash> -#include <QtCore/QString> +#include <QtCore/qstringlist.h> +#include <QtCore/qhash.h> +#include <QtCore/qstring.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp index ccbd33fea..d78959fec 100644 --- a/src/designer/src/lib/shared/richtexteditor.cpp +++ b/src/designer/src/lib/shared/richtexteditor.cpp @@ -33,34 +33,31 @@ #include "iconloader_p.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerSettingsInterface> - -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QPointer> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamWriter> -#include <QtCore/QXmlStreamAttributes> - -#include <QtWidgets/QAction> -#include <QtWidgets/QColorDialog> -#include <QtWidgets/QComboBox> -#include <QtGui/QFontDatabase> -#include <QtGui/QTextCursor> -#include <QtGui/QPainter> -#include <QtGui/QIcon> -#include <QtWidgets/QMenu> -#include <QtGui/QMoveEvent> -#include <QtWidgets/QTabWidget> -#include <QtGui/QTextDocument> -#include <QtGui/QTextBlock> -#include <QtWidgets/QToolBar> -#include <QtWidgets/QToolButton> -#include <QtWidgets/QVBoxLayout> -#include <QtWidgets/QHBoxLayout> -#include <QtWidgets/QPushButton> -#include <QtWidgets/QDialogButtonBox> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractsettings.h> + +#include <QtCore/qlist.h> +#include <QtCore/qmap.h> +#include <QtCore/qpointer.h> +#include <QtCore/qxmlstream.h> + +#include <QtWidgets/qaction.h> +#include <QtWidgets/qcolordialog.h> +#include <QtWidgets/qcombobox.h> +#include <QtGui/qfontdatabase.h> +#include <QtGui/qtextcursor.h> +#include <QtGui/qpainter.h> +#include <QtGui/qicon.h> +#include <QtWidgets/qmenu.h> +#include <QtGui/qevent.h> +#include <QtWidgets/qtabwidget.h> +#include <QtGui/qtextobject.h> +#include <QtGui/qtextdocument.h> +#include <QtWidgets/qtoolbar.h> +#include <QtWidgets/qtoolbutton.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qpushbutton.h> +#include <QtWidgets/qdialogbuttonbox.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/richtexteditor_p.h b/src/designer/src/lib/shared/richtexteditor_p.h index 333a8fc06..7098e7ce2 100644 --- a/src/designer/src/lib/shared/richtexteditor_p.h +++ b/src/designer/src/lib/shared/richtexteditor_p.h @@ -40,8 +40,8 @@ #ifndef RICHTEXTEDITOR_H #define RICHTEXTEDITOR_H -#include <QtWidgets/QTextEdit> -#include <QtWidgets/QDialog> +#include <QtWidgets/qtextedit.h> +#include <QtWidgets/qdialog.h> #include "shared_global_p.h" QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/selectsignaldialog.cpp b/src/designer/src/lib/shared/selectsignaldialog.cpp index 8350f1710..2c0d2d46c 100644 --- a/src/designer/src/lib/shared/selectsignaldialog.cpp +++ b/src/designer/src/lib/shared/selectsignaldialog.cpp @@ -30,21 +30,20 @@ #include "ui_selectsignaldialog.h" -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerPromotionInterface> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractpromotioninterface.h> #include "abstractintrospection_p.h" #include "metadatabase_p.h" #include "widgetdatabase_p.h" -#include <QtWidgets/QApplication> -#include <QtWidgets/QDesktopWidget> -#include <QtWidgets/QPushButton> -#include <QtGui/QStandardItem> -#include <QtGui/QStandardItemModel> -#include <QtCore/QItemSelectionModel> -#include <QtCore/QVariant> -#include <QtCore/QVector> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qdesktopwidget.h> +#include <QtWidgets/qpushbutton.h> +#include <QtGui/qstandarditemmodel.h> +#include <QtCore/qitemselectionmodel.h> +#include <QtCore/qvariant.h> +#include <QtCore/qvector.h> #include <algorithm> diff --git a/src/designer/src/lib/shared/selectsignaldialog_p.h b/src/designer/src/lib/shared/selectsignaldialog_p.h index c29bfd60f..47cf8e862 100644 --- a/src/designer/src/lib/shared/selectsignaldialog_p.h +++ b/src/designer/src/lib/shared/selectsignaldialog_p.h @@ -40,8 +40,8 @@ #ifndef SELECTSIGNALDIALOG_H #define SELECTSIGNALDIALOG_H -#include <QtWidgets/QDialog> -#include <QtCore/QStringList> +#include <QtWidgets/qdialog.h> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/shared_settings.cpp b/src/designer/src/lib/shared/shared_settings.cpp index b11eb068e..b759555bd 100644 --- a/src/designer/src/lib/shared/shared_settings.cpp +++ b/src/designer/src/lib/shared/shared_settings.cpp @@ -33,14 +33,14 @@ #include <actioneditor_p.h> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerSettingsInterface> - -#include <QtCore/QStringList> -#include <QtCore/QDir> -#include <QtCore/QVariantMap> -#include <QtCore/QCoreApplication> -#include <QtCore/QSize> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractsettings.h> + +#include <QtCore/qstringlist.h> +#include <QtCore/qdir.h> +#include <QtCore/qvariant.h> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qsize.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/shared_settings_p.h b/src/designer/src/lib/shared/shared_settings_p.h index 3a2fafd9a..f08691203 100644 --- a/src/designer/src/lib/shared/shared_settings_p.h +++ b/src/designer/src/lib/shared/shared_settings_p.h @@ -45,7 +45,7 @@ #include "deviceprofile_p.h" #include <QtCore/qglobal.h> -#include <QtCore/QList> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/sheet_delegate.cpp b/src/designer/src/lib/shared/sheet_delegate.cpp index 60a2cd963..8bdafb4e3 100644 --- a/src/designer/src/lib/shared/sheet_delegate.cpp +++ b/src/designer/src/lib/shared/sheet_delegate.cpp @@ -28,10 +28,10 @@ #include "sheet_delegate_p.h" -#include <QtCore/QAbstractItemModel> -#include <QtWidgets/QTreeView> -#include <QtWidgets/QStyle> -#include <QtGui/QPainter> +#include <QtCore/qabstractitemmodel.h> +#include <QtWidgets/qtreeview.h> +#include <QtWidgets/qstyle.h> +#include <QtGui/qpainter.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/sheet_delegate_p.h b/src/designer/src/lib/shared/sheet_delegate_p.h index b10a4222e..f896643f0 100644 --- a/src/designer/src/lib/shared/sheet_delegate_p.h +++ b/src/designer/src/lib/shared/sheet_delegate_p.h @@ -43,8 +43,8 @@ #include "shared_global_p.h" -#include <QtWidgets/QItemDelegate> -#include <QtWidgets/QTreeView> +#include <QtWidgets/qitemdelegate.h> +#include <QtWidgets/qtreeview.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/signalslotdialog.cpp b/src/designer/src/lib/shared/signalslotdialog.cpp index 6734cad56..7e606829f 100644 --- a/src/designer/src/lib/shared/signalslotdialog.cpp +++ b/src/designer/src/lib/shared/signalslotdialog.cpp @@ -34,22 +34,22 @@ #include "qdesigner_formwindowcommand_p.h" #include "iconloader_p.h" -#include <QtDesigner/QDesignerMemberSheetExtension> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerWidgetFactoryInterface> +#include <QtDesigner/membersheet.h> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractwidgetfactory.h> #include <abstractdialoggui_p.h> -#include <QtGui/QStandardItemModel> -#include <QtGui/QRegularExpressionValidator> -#include <QtWidgets/QItemDelegate> -#include <QtWidgets/QLineEdit> -#include <QtWidgets/QApplication> -#include <QtWidgets/QMessageBox> +#include <QtGui/qstandarditemmodel.h> +#include <QtGui/qvalidator.h> +#include <QtWidgets/qitemdelegate.h> +#include <QtWidgets/qlineedit.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qmessagebox.h> -#include <QtCore/QRegularExpression> -#include <QtCore/QDebug> +#include <QtCore/qregularexpression.h> +#include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/signalslotdialog_p.h b/src/designer/src/lib/shared/signalslotdialog_p.h index a106aeb72..06ce011ca 100644 --- a/src/designer/src/lib/shared/signalslotdialog_p.h +++ b/src/designer/src/lib/shared/signalslotdialog_p.h @@ -41,9 +41,9 @@ #define _SIGNALSLOTDIALOG_H #include "shared_global_p.h" -#include <QtCore/QStringList> -#include <QtWidgets/QDialog> -#include <QtGui/QStandardItemModel> +#include <QtCore/qstringlist.h> +#include <QtWidgets/qdialog.h> +#include <QtGui/qstandarditemmodel.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/spacer_widget.cpp b/src/designer/src/lib/shared/spacer_widget.cpp index 9b3d6dbee..f465ba807 100644 --- a/src/designer/src/lib/shared/spacer_widget.cpp +++ b/src/designer/src/lib/shared/spacer_widget.cpp @@ -30,13 +30,12 @@ #include "layoutinfo_p.h" #include <QtDesigner/abstractformwindow.h> -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerPropertySheetExtension> -#include <QtDesigner/QExtensionManager> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/propertysheet.h> +#include <QtDesigner/qextensionmanager.h> -#include <QtWidgets/QLayout> -#include <QtGui/QPainter> +#include <QtWidgets/qlayout.h> +#include <QtGui/qpainter.h> #include <QtGui/qevent.h> #include <QtCore/qdebug.h> diff --git a/src/designer/src/lib/shared/spacer_widget_p.h b/src/designer/src/lib/shared/spacer_widget_p.h index 39e92d17d..8dfccc5b3 100644 --- a/src/designer/src/lib/shared/spacer_widget_p.h +++ b/src/designer/src/lib/shared/spacer_widget_p.h @@ -43,8 +43,8 @@ #include "shared_global_p.h" -#include <QtWidgets/QWidget> -#include <QtWidgets/QSizePolicy> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qsizepolicy.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/stylesheeteditor.cpp b/src/designer/src/lib/shared/stylesheeteditor.cpp index ccbd6974a..4426c71a4 100644 --- a/src/designer/src/lib/shared/stylesheeteditor.cpp +++ b/src/designer/src/lib/shared/stylesheeteditor.cpp @@ -34,23 +34,23 @@ #include "qtgradientutils.h" #include "qdesigner_utils_p.h" -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormWindowCursorInterface> -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerPropertySheetExtension> -#include <QtDesigner/QDesignerIntegrationInterface> -#include <QtDesigner/QDesignerSettingsInterface> -#include <QtDesigner/QExtensionManager> - -#include <QtWidgets/QAction> -#include <QtWidgets/QColorDialog> -#include <QtWidgets/QDialogButtonBox> -#include <QtWidgets/QFontDialog> -#include <QtWidgets/QMenu> -#include <QtWidgets/QPushButton> -#include <QtGui/QTextDocument> -#include <QtWidgets/QToolBar> -#include <QtWidgets/QVBoxLayout> +#include <QtDesigner/abstractformwindow.h> +#include <QtDesigner/abstractformwindowcursor.h> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/propertysheet.h> +#include <QtDesigner/abstractintegration.h> +#include <QtDesigner/abstractsettings.h> +#include <QtDesigner/qextensionmanager.h> + +#include <QtWidgets/qaction.h> +#include <QtWidgets/qcolordialog.h> +#include <QtWidgets/qdialogbuttonbox.h> +#include <QtWidgets/qfontdialog.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qpushbutton.h> +#include <QtGui/qtextdocument.h> +#include <QtWidgets/qtoolbar.h> +#include <QtWidgets/qboxlayout.h> #include <private/qcssparser_p.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/stylesheeteditor_p.h b/src/designer/src/lib/shared/stylesheeteditor_p.h index 9c16f748f..6494cf503 100644 --- a/src/designer/src/lib/shared/stylesheeteditor_p.h +++ b/src/designer/src/lib/shared/stylesheeteditor_p.h @@ -40,9 +40,9 @@ #ifndef STYLESHEETEDITOR_H #define STYLESHEETEDITOR_H -#include <QtWidgets/QTextEdit> -#include <QtWidgets/QDialog> -#include <QtWidgets/QLabel> +#include <QtWidgets/qtextedit.h> +#include <QtWidgets/qdialog.h> +#include <QtWidgets/qlabel.h> #include "shared_global_p.h" QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/textpropertyeditor.cpp b/src/designer/src/lib/shared/textpropertyeditor.cpp index afd9bf4e8..ba289d3c8 100644 --- a/src/designer/src/lib/shared/textpropertyeditor.cpp +++ b/src/designer/src/lib/shared/textpropertyeditor.cpp @@ -30,15 +30,15 @@ #include "propertylineedit_p.h" #include "stylesheeteditor_p.h" -#include <QtWidgets/QLineEdit> -#include <QtGui/QRegularExpressionValidator> -#include <QtGui/QResizeEvent> -#include <QtWidgets/QCompleter> -#include <QtWidgets/QAbstractItemView> -#include <QtCore/QRegularExpression> -#include <QtCore/QUrl> -#include <QtCore/QFile> -#include <QtCore/QDebug> +#include <QtWidgets/qlineedit.h> +#include <QtGui/qvalidator.h> +#include <QtGui/qevent.h> +#include <QtWidgets/qcompleter.h> +#include <QtWidgets/qabstractitemview.h> +#include <QtCore/qregularexpression.h> +#include <QtCore/qurl.h> +#include <QtCore/qfile.h> +#include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/textpropertyeditor_p.h b/src/designer/src/lib/shared/textpropertyeditor_p.h index eb9389253..7b79166a9 100644 --- a/src/designer/src/lib/shared/textpropertyeditor_p.h +++ b/src/designer/src/lib/shared/textpropertyeditor_p.h @@ -43,7 +43,7 @@ #include "shared_global_p.h" #include "shared_enums_p.h" -#include <QtWidgets/QWidget> +#include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/widgetdatabase.cpp b/src/designer/src/lib/shared/widgetdatabase.cpp index 08726def9..60da933af 100644 --- a/src/designer/src/lib/shared/widgetdatabase.cpp +++ b/src/designer/src/lib/shared/widgetdatabase.cpp @@ -36,18 +36,18 @@ #include <QtDesigner/private/ui4_p.h> #include <QtDesigner/propertysheet.h> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/abstractformeditor.h> #include <QtUiPlugin/customwidget.h> -#include <QtCore/QXmlStreamWriter> +#include <QtCore/qxmlstream.h> -#include <QtCore/QScopedPointer> +#include <QtCore/qscopedpointer.h> #include <QtCore/qdebug.h> -#include <QtCore/QMetaProperty> -#include <QtCore/QTextStream> -#include <QtCore/QCoreApplication> +#include <QtCore/qmetaobject.h> +#include <QtCore/qtextstream.h> +#include <QtCore/qcoreapplication.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/widgetdatabase_p.h b/src/designer/src/lib/shared/widgetdatabase_p.h index 58c5850e1..d4bec9783 100644 --- a/src/designer/src/lib/shared/widgetdatabase_p.h +++ b/src/designer/src/lib/shared/widgetdatabase_p.h @@ -43,13 +43,13 @@ #include "shared_global_p.h" -#include <QtDesigner/QDesignerWidgetDataBaseInterface> +#include <QtDesigner/abstractwidgetdatabase.h> -#include <QtGui/QIcon> -#include <QtCore/QString> -#include <QtCore/QVariant> -#include <QtCore/QPair> -#include <QtCore/QStringList> +#include <QtGui/qicon.h> +#include <QtCore/qstring.h> +#include <QtCore/qvariant.h> +#include <QtCore/qpair.h> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp index 0692916bc..ddbc7d5ed 100644 --- a/src/designer/src/lib/shared/widgetfactory.cpp +++ b/src/designer/src/lib/shared/widgetfactory.cpp @@ -48,27 +48,27 @@ #include "abstractintrospection_p.h" // sdk -#include <QtDesigner/QDesignerFormEditorInterface> -#include <QtDesigner/QDesignerContainerExtension> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerPropertySheetExtension> -#include <QtDesigner/QDesignerLanguageExtension> -#include <QtDesigner/QDesignerFormWindowManagerInterface> -#include <QtDesigner/QDesignerFormWindowCursorInterface> +#include <QtDesigner/abstractformeditor.h> +#include <QtDesigner/container.h> +#include <QtDesigner/qextensionmanager.h> +#include <QtDesigner/propertysheet.h> +#include <QtDesigner/abstractlanguage.h> +#include <QtDesigner/abstractformwindowmanager.h> +#include <QtDesigner/abstractformwindowcursor.h> -#include <QtUiPlugin/QDesignerCustomWidgetInterface> +#include <QtUiPlugin/customwidget.h> #include <QtWidgets/QtWidgets> -#include <QtWidgets/QScrollBar> -#include <QtWidgets/QFontComboBox> -#include <QtWidgets/QAbstractSpinBox> -#include <QtWidgets/QLineEdit> -#include <QtWidgets/QButtonGroup> -#include <QtWidgets/QStyle> -#include <QtWidgets/QStyleFactory> -#include <QtWidgets/QWizard> +#include <QtWidgets/qscrollbar.h> +#include <QtWidgets/qfontcombobox.h> +#include <QtWidgets/qabstractspinbox.h> +#include <QtWidgets/qlineedit.h> +#include <QtWidgets/qbuttongroup.h> +#include <QtWidgets/qstyle.h> +#include <QtWidgets/qstylefactory.h> +#include <QtWidgets/qwizard.h> #include <QtCore/qdebug.h> -#include <QtCore/QMetaObject> +#include <QtCore/qmetaobject.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/widgetfactory_p.h b/src/designer/src/lib/shared/widgetfactory_p.h index 4f4ce90a5..1d45e17cd 100644 --- a/src/designer/src/lib/shared/widgetfactory_p.h +++ b/src/designer/src/lib/shared/widgetfactory_p.h @@ -44,12 +44,12 @@ #include "shared_global_p.h" #include "pluginmanager_p.h" -#include <QtDesigner/QDesignerWidgetFactoryInterface> +#include <QtDesigner/abstractwidgetfactory.h> -#include <QtCore/QMap> -#include <QtCore/QHash> -#include <QtCore/QVariant> -#include <QtCore/QPointer> +#include <QtCore/qmap.h> +#include <QtCore/qhash.h> +#include <QtCore/qvariant.h> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp index b79f81156..1e3de9d29 100644 --- a/src/designer/src/lib/shared/zoomwidget.cpp +++ b/src/designer/src/lib/shared/zoomwidget.cpp @@ -28,18 +28,18 @@ #include "zoomwidget_p.h" -#include <QtWidgets/QGraphicsScene> -#include <QtWidgets/QGraphicsProxyWidget> -#include <QtWidgets/QMenu> -#include <QtWidgets/QAction> -#include <QtWidgets/QActionGroup> -#include <QtGui/QContextMenuEvent> -#include <QtWidgets/QScrollBar> - -#include <QtCore/QTextStream> +#include <QtWidgets/qgraphicsscene.h> +#include <QtWidgets/qgraphicsproxywidget.h> +#include <QtWidgets/qmenu.h> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qactiongroup.h> +#include <QtGui/qevent.h> +#include <QtWidgets/qscrollbar.h> + +#include <QtCore/qtextstream.h> #include <QtCore/qmath.h> -#include <QtCore/QDebug> -#include <QtCore/QList> +#include <QtCore/qdebug.h> +#include <QtCore/qlist.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/zoomwidget_p.h b/src/designer/src/lib/shared/zoomwidget_p.h index f1062ae63..abc3dae0a 100644 --- a/src/designer/src/lib/shared/zoomwidget_p.h +++ b/src/designer/src/lib/shared/zoomwidget_p.h @@ -42,9 +42,9 @@ #include "shared_global_p.h" -#include <QtWidgets/QGraphicsView> -#include <QtWidgets/QGraphicsProxyWidget> -#include <QtCore/QVector> +#include <QtWidgets/qgraphicsview.h> +#include <QtWidgets/qgraphicsproxywidget.h> +#include <QtCore/qvector.h> QT_BEGIN_NAMESPACE |