u20.04 porting

diff --git a/src/CAF/CAF_Tools.h b/src/CAF/CAF_Tools.h
index fe2f33bd2092c835be1e0ab246c79a73418c9929..6e3f20d9c3a7401793bb8a99d3bf246e1655fe2f 100644 (file)
--- a/src/CAF/CAF_Tools.h
+++ b/src/CAF/CAF_Tools.h
@@ -30,7 +30,7 @@
 
 #include <SUIT_Tools.h>
 
-#include <QColor>
+#include <QtGui/QColor>
 
 #include <Quantity_Color.hxx>
 

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 61d979ea59e5aac6f81e7d78338ff7e1e319a2fa..164dfd9f771eb9bb234ba50ea4108f794d47ded8 100644 (file)
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -34,7 +34,7 @@
 #include <KERNEL_version.h>
 #include <GUI_version.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QRegExp>
 
 #ifdef WIN32

diff --git a/src/CAM/CAM_Module.h b/src/CAM/CAM_Module.h
index 75a08dfb8a249ff4e0a781dfa4b781d4eb5b75dd..fc14cc6658c9e25b7513560599bed9a4a0ecd9ff 100644 (file)
--- a/src/CAM/CAM_Module.h
+++ b/src/CAM/CAM_Module.h
@@ -26,11 +26,11 @@
 #include "CAM.h"
 
 #include <QObject>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 #include <QString>
 #include <QMap>
 #include <QPair>
-#include <QKeySequence>
+#include <QtGui/QKeySequence>
 
 class QAction;
 class QMenu;

diff --git a/src/Event/SALOME_Event.cxx b/src/Event/SALOME_Event.cxx
index 6aef679368936e86fb4d9e507554d47277aa3ce4..417900e6b22677f7f220d5a588e2d77078bec254 100644 (file)
--- a/src/Event/SALOME_Event.cxx
+++ b/src/Event/SALOME_Event.cxx
@@ -27,7 +27,7 @@
 #include "SALOME_Event.h"
 
 #include <QSemaphore>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 // asv 21.02.05 : introducing multi-platform approach of thread comparison
 // - on Unix using pthread_t type for storing ThreadId

diff --git a/src/Event/SALOME_EventFilter.cxx b/src/Event/SALOME_EventFilter.cxx
index 5a963dd464c206871e61e42c70b5d0f882ff8cbf..ea328879a21913cf2502e0f8a04e043e38f22518 100644 (file)
--- a/src/Event/SALOME_EventFilter.cxx
+++ b/src/Event/SALOME_EventFilter.cxx
@@ -20,7 +20,7 @@
 #include "SALOME_EventFilter.h"
 #include "SALOME_Event.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 SALOME_EventFilter* SALOME_EventFilter::myFilter = NULL;
 

diff --git a/src/GLViewer/GLViewer_AspectLine.h b/src/GLViewer/GLViewer_AspectLine.h
index 3e44960f8b88e130a252d2694fe5348562cf441e..2972b75ec9ee4f740f2bc1a4215337e57771919c 100644 (file)
--- a/src/GLViewer/GLViewer_AspectLine.h
+++ b/src/GLViewer/GLViewer_AspectLine.h
@@ -29,7 +29,7 @@
 
 #include "GLViewer.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/GLViewer/GLViewer_BaseObjects.h b/src/GLViewer/GLViewer_BaseObjects.h
index 2f108f0b0fe6725641f0c4ba286188b751e0d71b..d2c8d891b7dee8c253a3ecb88e85f1eeb4ae6d41 100644 (file)
--- a/src/GLViewer/GLViewer_BaseObjects.h
+++ b/src/GLViewer/GLViewer_BaseObjects.h
@@ -30,7 +30,7 @@
 #include "GLViewer.h"
 #include "GLViewer_Object.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 
 #include <TColStd_SequenceOfInteger.hxx>
 

diff --git a/src/GLViewer/GLViewer_Compass.h b/src/GLViewer/GLViewer_Compass.h
index b1e92572e0d008ba704a8234990b3d6544934c76..db2365eb0f3939d4b6ccc1457f418e0292942008 100644 (file)
--- a/src/GLViewer/GLViewer_Compass.h
+++ b/src/GLViewer/GLViewer_Compass.h
@@ -29,7 +29,7 @@
 
 #include "GLViewer.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 
 class QFont;
 

diff --git a/src/GLViewer/GLViewer_Drawer.cxx b/src/GLViewer/GLViewer_Drawer.cxx
index 2351575586dd6a45f2be4f3a64e8a0efcb7dd854..f1b48c685fcbf382f40b7f2cf436ea661727768d 100644 (file)
--- a/src/GLViewer/GLViewer_Drawer.cxx
+++ b/src/GLViewer/GLViewer_Drawer.cxx
@@ -31,9 +31,9 @@
 #include "GLViewer_ViewFrame.h"
 #include "GLViewer_ViewPort2d.h"
 
-#include <QApplication>
-#include <QImage>
-#include <QPainter>
+#include <QtWidgets/QApplication>
+#include <QtGui/QImage>
+#include <QtGui/QPainter>
 #include <QFile>
 
 #if defined(__APPLE__)

diff --git a/src/GLViewer/GLViewer_Drawer.h b/src/GLViewer/GLViewer_Drawer.h
index 0a1bcf3d96dcd11a5e210bf0ac472372868cd0e5..edb26f063c69699949448f62d9cff5db82df4ba8 100644 (file)
--- a/src/GLViewer/GLViewer_Drawer.h
+++ b/src/GLViewer/GLViewer_Drawer.h
@@ -31,8 +31,8 @@
 #include "windows.h"
 #endif
 
-#include <QColor>
-#include <QFont>
+#include <QtGui/QColor>
+#include <QtGui/QFont>
 
 class QFile;
 

diff --git a/src/GLViewer/GLViewer_Text.cxx b/src/GLViewer/GLViewer_Text.cxx
index e98e25dbbd712b8ac379bd691bc5e0997a7a7733..79401ed7aae5b8756dbe91329a8267b44d63f8f9 100644 (file)
--- a/src/GLViewer/GLViewer_Text.cxx
+++ b/src/GLViewer/GLViewer_Text.cxx
@@ -25,8 +25,8 @@
 //
 #include "GLViewer_Text.h"
 
-#include <QApplication>
-#include <QFontMetrics>
+#include <QtWidgets/QApplication>
+#include <QtGui/QFontMetrics>
 
 /*!
   Constructor

diff --git a/src/GLViewer/GLViewer_Text.h b/src/GLViewer/GLViewer_Text.h
index 8c825e33327dee542d1c01f26ec65a0b5da99a44..297f34d72f3461a71c27a5ef933eb36f53aae921 100644 (file)
--- a/src/GLViewer/GLViewer_Text.h
+++ b/src/GLViewer/GLViewer_Text.h
@@ -40,9 +40,9 @@
 #include <GL/gl.h>
 #endif
 
-#include <QFont>
+#include <QtGui/QFont>
 #include <QString>
-#include <QColor>
+#include <QtGui/QColor>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/GLViewer/GLViewer_ToolTip.cxx b/src/GLViewer/GLViewer_ToolTip.cxx
index 06158778b674278ab37009f49953ec875a529c59..ace7f33777ec2d35546b3bde1c364f31ff240c6b 100644 (file)
--- a/src/GLViewer/GLViewer_ToolTip.cxx
+++ b/src/GLViewer/GLViewer_ToolTip.cxx
@@ -33,10 +33,10 @@
 
 #include <QLabel>
 #include <QTimer>
-#include <QBitmap>
-#include <QApplication>
+#include <QtGui/QBitmap>
+#include <QtWidgets/QApplication>
 #include <QToolTip>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 
 /*!
   constructor

diff --git a/src/GLViewer/GLViewer_ViewFrame.cxx b/src/GLViewer/GLViewer_ViewFrame.cxx
index 630bf523feeecaa94a115e60d683be998de01823..8cb1231d9e809b9b80ea8d699fd2ecbb78fe3f20 100644 (file)
--- a/src/GLViewer/GLViewer_ViewFrame.cxx
+++ b/src/GLViewer/GLViewer_ViewFrame.cxx
@@ -35,13 +35,13 @@
 
 #include <QColor>
 #include <QFileDialog>
-#include <QImage>
+#include <QtGui/QImage>
 #include <QHBoxLayout>
 #include <QString>
 #include <QFrame>
-#include <QMouseEvent>
-#include <QKeyEvent>
-#include <QWheelEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QWheelEvent>
 
 #ifdef WIN32
 #include <Standard_Integer.hxx>

diff --git a/src/GLViewer/GLViewer_ViewPort.cxx b/src/GLViewer/GLViewer_ViewPort.cxx
index 4f1ca1fdc7945f94d051d083df3074d9885d543b..5ca69b5f8c28fc67818921826c12239d2db2a6f0 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort.cxx
+++ b/src/GLViewer/GLViewer_ViewPort.cxx
@@ -31,13 +31,13 @@
 #include "SUIT_Session.h"
 
 #include <QRect>
-#include <QCursor>
-#include <QPainter>
+#include <QtGui/QCursor>
+#include <QtGui/QPainter>
 #include <QMultiHash>
 //#include <QMenu>
 #include <QColorDialog>
 #include <QColormap>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QCoreApplication>
 
 #include <stdlib.h>

diff --git a/src/GLViewer/GLViewer_ViewPort.h b/src/GLViewer/GLViewer_ViewPort.h
index bd7ab30fd3cabc34bbda96231e48b501b8ee6b29..1e3dcf99a5f99a79231bfb5c0bf0e9a599d515a0 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort.h
+++ b/src/GLViewer/GLViewer_ViewPort.h
@@ -30,7 +30,7 @@
 #include "GLViewer.h"
 
 //#include <QList>
-#include <QColor>
+#include <QtGui/QColor>
 //#include <QAction>
 #include <QWidget>
 

diff --git a/src/GLViewer/GLViewer_ViewPort2d.cxx b/src/GLViewer/GLViewer_ViewPort2d.cxx
index 2acfb57fb618a76208a45fc63b2ba4bb15da0825..f6e418e220ff23aaae3722e34b20d9eaca341b47 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort2d.cxx
+++ b/src/GLViewer/GLViewer_ViewPort2d.cxx
@@ -40,13 +40,13 @@
 //#include <QtxToolTip.h>
 
 #include <QHBoxLayout>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QRect>
 //#include <QMenu>
 //#include <QToolTip>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QClipboard>
-#include <QBitmap>
+#include <QtGui/QBitmap>
 #include <QLabel>
 #include <QWidget>
 #include <QRubberBand>

diff --git a/src/GLViewer/GLViewer_ViewPort2d.h b/src/GLViewer/GLViewer_ViewPort2d.h
index 22fb6e1648578b2a5422890bc92e46967633b4fa..91cc0876a3007171dfaa8a44681fe23b4cea957c 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort2d.h
+++ b/src/GLViewer/GLViewer_ViewPort2d.h
@@ -44,7 +44,7 @@
 #include "GLViewer_Geom.h"
 
 #include <QtOpenGL/QtOpenGL>
-#include <QColor>
+#include <QtGui/QColor>
 #include <QPaintDevice>
 
 #ifdef WIN32

diff --git a/src/GLViewer/GLViewer_Viewer.cxx b/src/GLViewer/GLViewer_Viewer.cxx
index dab34eb0ec1c83a805c73fdbcd4ebe50089111b4..7075ce5d865c73ba301a385e5bd1aa3539be31bc 100644 (file)
--- a/src/GLViewer/GLViewer_Viewer.cxx
+++ b/src/GLViewer/GLViewer_Viewer.cxx
@@ -34,11 +34,11 @@
 #include "SUIT_ViewWindow.h"
 #include "SUIT_ViewManager.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QMenu>
 #include <QColorDialog>
-#include <QMouseEvent>
-#include <QWheelEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QWheelEvent>
 #include <QRect>
 #include <QRubberBand>
 

diff --git a/src/GLViewer/GLViewer_Viewer.h b/src/GLViewer/GLViewer_Viewer.h
index 731c089e524c296c5936db8bc41583d372acd8c7..38dba96c5695f874b2de6a28685c8a72f3bce709 100644 (file)
--- a/src/GLViewer/GLViewer_Viewer.h
+++ b/src/GLViewer/GLViewer_Viewer.h
@@ -31,7 +31,7 @@
 #include "GLViewer_Defs.h"
 #include <SUIT_ViewModel.h>
 
-#include <QCursor>
+#include <QtGui/QCursor>
 #include <QObject>
 
 class QMouseEvent;

diff --git a/src/GLViewer/GLViewer_Viewer2d.cxx b/src/GLViewer/GLViewer_Viewer2d.cxx
index 9438c066c4da1fb49b4b57d9f350a321276feaeb..a387272e12c514fa034dc315649626d72cc87547 100644 (file)
--- a/src/GLViewer/GLViewer_Viewer2d.cxx
+++ b/src/GLViewer/GLViewer_Viewer2d.cxx
@@ -43,7 +43,7 @@
 #include <QRect>
 #include <QFile>
 #include <QPolygon>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QColorDialog>
 
 /*!

diff --git a/src/GLViewer/GLViewer_Widget.cxx b/src/GLViewer/GLViewer_Widget.cxx
index 8fabfd1ddade7c4c3277495af14a57d055274610..d065c5e917c0a202bc9aafd42861b60fbbdf4fd0 100644 (file)
--- a/src/GLViewer/GLViewer_Widget.cxx
+++ b/src/GLViewer/GLViewer_Widget.cxx
@@ -30,11 +30,11 @@
 #include <cmath>
 
 #include <QEvent>
-#include <QPaintEvent>
+#include <QtGui/QPaintEvent>
 #include <QRect>
 #include <QFile>
-#include <QImage>
-#include <QApplication>
+#include <QtGui/QImage>
+#include <QtWidgets/QApplication>
 #include <QToolTip>
 
 /*!

diff --git a/src/GraphicsView/GraphicsView_ViewFrame.cxx b/src/GraphicsView/GraphicsView_ViewFrame.cxx
index ee55ab2de01e7f6464d12a3d2876db461430c66c..fa4b82a32e68de3ab6ad26e6dca8af17e504e645 100644 (file)
--- a/src/GraphicsView/GraphicsView_ViewFrame.cxx
+++ b/src/GraphicsView/GraphicsView_ViewFrame.cxx
@@ -38,10 +38,10 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsSceneWheelEvent>
 #include <QHBoxLayout>
-#include <QImage>
-#include <QMouseEvent>
+#include <QtGui/QImage>
+#include <QtGui/QMouseEvent>
 #include <QString>
-#include <QWheelEvent>
+#include <QtGui/QWheelEvent>
 
 //=======================================================================
 // Name    : GraphicsView_ViewFrame

diff --git a/src/GraphicsView/GraphicsView_ViewPort.cxx b/src/GraphicsView/GraphicsView_ViewPort.cxx
index 1cf1c05f1feacd465e6e6beea45daab38d9e7986..0cf63370063103f1519ec83dfbfa562696085fbf 100644 (file)
--- a/src/GraphicsView/GraphicsView_ViewPort.cxx
+++ b/src/GraphicsView/GraphicsView_ViewPort.cxx
@@ -26,7 +26,7 @@
 #include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
 
-#include <QCursor>
+#include <QtGui/QCursor>
 #include <QGraphicsSceneMouseEvent>
 #include <QGridLayout>
 #include <QLabel>
@@ -35,7 +35,7 @@
 #include <QRubberBand>
 #include <QScrollBar>
 #include <QtPrintSupport/QPrinter>
-#include <QPainter>
+#include <QtGui/QPainter>
 
 #include <math.h>
 

diff --git a/src/GraphicsView/GraphicsView_ViewTransformer.h b/src/GraphicsView/GraphicsView_ViewTransformer.h
index e2ddb596c2c2ab86ba9901259d548d5c4cffa3d8..5eac02127de2fe0a0b5d522c8c4ff767207f1320 100644 (file)
--- a/src/GraphicsView/GraphicsView_ViewTransformer.h
+++ b/src/GraphicsView/GraphicsView_ViewTransformer.h
@@ -22,7 +22,7 @@
 
 #include "GraphicsView.h"
 
-#include <QCursor>
+#include <QtGui/QCursor>
 #include <QObject>
 
 class QRectF;

diff --git a/src/GraphicsView/GraphicsView_Viewer.cxx b/src/GraphicsView/GraphicsView_Viewer.cxx
index ea9bd6b9292002903107f17a8a18c830e7b139d7..147c2c82425e71f6872cd4d7bd74e11f34aad17a 100644 (file)
--- a/src/GraphicsView/GraphicsView_Viewer.cxx
+++ b/src/GraphicsView/GraphicsView_Viewer.cxx
@@ -30,11 +30,11 @@
 
 #include <ImageComposer_Image.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QColorDialog>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsSceneWheelEvent>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QMenu>
 
 #include <math.h>

diff --git a/src/GraphicsView/GraphicsView_Viewer.h b/src/GraphicsView/GraphicsView_Viewer.h
index d6b98b362df414c8a6fc1be5d30200d4c7215a3b..92a1457a4ee63a7e1e56378dee6e074a4d509dde 100644 (file)
--- a/src/GraphicsView/GraphicsView_Viewer.h
+++ b/src/GraphicsView/GraphicsView_Viewer.h
@@ -26,7 +26,7 @@
 
 #include <SUIT_ViewModel.h>
 
-#include <QPainterPath>
+#include <QtGui/QPainterPath>
 
 class QGraphicsSceneMouseEvent;
 class QGraphicsSceneWheelEvent;

diff --git a/src/GuiHelpers/StandardApp_Module.cxx b/src/GuiHelpers/StandardApp_Module.cxx
index d1e2bf9f5f47b75963c478b5a0041a7443384875..cc881c514909c2500f2a36d8f136594f92100695 100644 (file)
--- a/src/GuiHelpers/StandardApp_Module.cxx
+++ b/src/GuiHelpers/StandardApp_Module.cxx
@@ -32,7 +32,7 @@
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
 
 // QT Includes
-#include <QIcon>
+#include <QtGui/QIcon>
 #include <QAction>
 
 #include <Basics_Utils.hxx>

diff --git a/src/HelpBrowser/qtsingleapplication.h b/src/HelpBrowser/qtsingleapplication.h
index cb2bfaf73171e1ccdb88670826d7171072987f19..0309574ee21ce42ca791a77a28f6c88db9e56a5f 100644 (file)
--- a/src/HelpBrowser/qtsingleapplication.h
+++ b/src/HelpBrowser/qtsingleapplication.h
@@ -41,7 +41,7 @@
 #ifndef QTSINGLEAPPLICATION_H
 #define QTSINGLEAPPLICATION_H
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 class QtLocalPeer;
 

diff --git a/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx b/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx
index 89024b2d32ce4e81c89909b62cab4af8b9a29038..552a8324beff2f5c3e0602e9e9bce8a0ff43e318 100644 (file)
--- a/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx
+++ b/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx
@@ -20,9 +20,9 @@
 #include "ImageComposer_ColorMaskOperator.h"
 #include "ImageComposer_MetaTypes.h"
 #include <QRectF>
-#include <QRgb>
-#include <QPixmap>
-#include <QPainter>
+#include <QtGui/QRgb>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 
 /**
   Constructor

diff --git a/src/ImageComposer/ImageComposer_ColorMaskOperator.h b/src/ImageComposer/ImageComposer_ColorMaskOperator.h
index f0baf08c94728557aa1349c16dd39ed82d70fd6b..8074e01653a6837c004792bd55ac8aeb1321aac9 100644 (file)
--- a/src/ImageComposer/ImageComposer_ColorMaskOperator.h
+++ b/src/ImageComposer/ImageComposer_ColorMaskOperator.h
@@ -21,7 +21,7 @@
 #define IMAGE_COMPOSER_COLOR_MASK_OPERATOR_HEADER
 
 #include "ImageComposer_Operator.h"
-#include <QColor>
+#include <QtGui/QColor>
 
 /**
   \class ImageComposer_ColorMaskOperator

diff --git a/src/ImageComposer/ImageComposer_CropOperator.cxx b/src/ImageComposer/ImageComposer_CropOperator.cxx
index 6ba14f82599f59afb2556d196776b839e04d1839..5b07e95565857dfd0fef83050f6ee4602331a398 100644 (file)
--- a/src/ImageComposer/ImageComposer_CropOperator.cxx
+++ b/src/ImageComposer/ImageComposer_CropOperator.cxx
@@ -21,8 +21,8 @@
 #include "ImageComposer_Image.h"
 #include "ImageComposer_MetaTypes.h"
 
-#include <QPixmap>
-#include <QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 
 /**
   Constructor

diff --git a/src/ImageComposer/ImageComposer_CropOperator.h b/src/ImageComposer/ImageComposer_CropOperator.h
index 61ac0403973fdad43f9c7da43cc8250fb682adeb..25a1c0827f2fd8f936c51be60a51e87183872206 100644 (file)
--- a/src/ImageComposer/ImageComposer_CropOperator.h
+++ b/src/ImageComposer/ImageComposer_CropOperator.h
@@ -21,8 +21,8 @@
 #define IMAGE_COMPOSER_CROP_OPERATOR_HEADER
 
 #include "ImageComposer_Operator.h"
-#include <QColor>
-#include <QPainterPath>
+#include <QtGui/QColor>
+#include <QtGui/QPainterPath>
 
 /**
   \class ImageComposer_CropOperator

diff --git a/src/ImageComposer/ImageComposer_CutOperator.cxx b/src/ImageComposer/ImageComposer_CutOperator.cxx
index 53b3475480a02e228898fd697393dd66b447fabb..bf2f2aa1150e76b88d7bc28c00d80c9f2a7d8d8b 100644 (file)
--- a/src/ImageComposer/ImageComposer_CutOperator.cxx
+++ b/src/ImageComposer/ImageComposer_CutOperator.cxx
@@ -20,8 +20,8 @@
 #include "ImageComposer_CutOperator.h"
 #include "ImageComposer_MetaTypes.h"
 #include <QString>
-#include <QPixmap>
-#include <QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 
 /**
   Constructor

diff --git a/src/ImageComposer/ImageComposer_CutOperator.h b/src/ImageComposer/ImageComposer_CutOperator.h
index 0f32e2157160b43c85ab6dbe8d398f1388738768..d6000b2dfae697364790db477821ee5799145f9e 100644 (file)
--- a/src/ImageComposer/ImageComposer_CutOperator.h
+++ b/src/ImageComposer/ImageComposer_CutOperator.h
@@ -21,7 +21,7 @@
 #define IMAGE_COMPOSER_CUT_OPERATOR_HEADER
 
 #include "ImageComposer_Operator.h"
-#include <QColor>
+#include <QtGui/QColor>
 
 /**
   \class ImageComposer_CutOperator

diff --git a/src/ImageComposer/ImageComposer_FuseOperator.cxx b/src/ImageComposer/ImageComposer_FuseOperator.cxx
index 615e8f70e6a498c6c41e0e6658b673654cafd04e..abcf875aa3e44985f8f86a43b2fc22b5f45de484 100644 (file)
--- a/src/ImageComposer/ImageComposer_FuseOperator.cxx
+++ b/src/ImageComposer/ImageComposer_FuseOperator.cxx
@@ -20,8 +20,8 @@
 #include "ImageComposer_FuseOperator.h"
 #include "ImageComposer_MetaTypes.h"
 #include <QString>
-#include <QPixmap>
-#include <QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 
 /**
   Constructor

diff --git a/src/ImageComposer/ImageComposer_FuseOperator.h b/src/ImageComposer/ImageComposer_FuseOperator.h
index ba03dbe8c02ad5bd395c4169467da92fe5c9611f..fd784e7fb33bdfb5ebd860e5a794766dd9fc7d33 100644 (file)
--- a/src/ImageComposer/ImageComposer_FuseOperator.h
+++ b/src/ImageComposer/ImageComposer_FuseOperator.h
@@ -21,7 +21,7 @@
 #define IMAGE_COMPOSER_FUSE_OPERATOR_HEADER
 
 #include "ImageComposer_Operator.h"
-#include <QColor>
+#include <QtGui/QColor>
 
 /**
   \class ImageComposer_FuseOperator

diff --git a/src/ImageComposer/ImageComposer_Image.cxx b/src/ImageComposer/ImageComposer_Image.cxx
index 738703cef9f867f8f08bca633ff88e649b06dd17..8c61bcc952d5a4ecb1e9fe07a4b6278946586040 100644 (file)
--- a/src/ImageComposer/ImageComposer_Image.cxx
+++ b/src/ImageComposer/ImageComposer_Image.cxx
@@ -23,7 +23,7 @@
 #include "ImageComposer_FuseOperator.h"
 #include "ImageComposer_MetaTypes.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 
 QColor ImageComposer_Image::myDefaultBackground = TRANSPARENT;
 

diff --git a/src/ImageComposer/ImageComposer_Image.h b/src/ImageComposer/ImageComposer_Image.h
index db94e1426d910663d2957ea750655fbfe430613b..645181e872da9cbb50cef4d5200cd989251ebbf0 100644 (file)
--- a/src/ImageComposer/ImageComposer_Image.h
+++ b/src/ImageComposer/ImageComposer_Image.h
@@ -22,7 +22,7 @@
 
 #include "ImageComposer.h"
 
-#include <QImage>
+#include <QtGui/QImage>
 
 class QVariant;
 class ImageComposer_Operator;

diff --git a/src/ImageComposer/ImageComposer_MetaTypes.h b/src/ImageComposer/ImageComposer_MetaTypes.h
index 4a7bd7540fa054606ad1df984094e1e4a206cc3e..07e91b704d4404d5e5e4b807470446e222da500c 100644 (file)
--- a/src/ImageComposer/ImageComposer_MetaTypes.h
+++ b/src/ImageComposer/ImageComposer_MetaTypes.h
@@ -20,7 +20,7 @@
 #include "ImageComposer_Image.h"
 
 #include <QVariant>
-#include <QPainterPath>
+#include <QtGui/QPainterPath>
 
 // Here we declare the meta types for classes which used by
 // ImageComposer operators so that it could be wrapped to QVariant

diff --git a/src/ImageComposer/ImageComposer_Operator.cxx b/src/ImageComposer/ImageComposer_Operator.cxx
index 3505a52a0b47a2cd28a39e4486d71579da9f3d94..8685ae6ac5515542a2bcd3bee20e808eb6058fb3 100644 (file)
--- a/src/ImageComposer/ImageComposer_Operator.cxx
+++ b/src/ImageComposer/ImageComposer_Operator.cxx
@@ -19,8 +19,8 @@
 
 #include "ImageComposer_Operator.h"
 #include "ImageComposer_MetaTypes.h"
-#include <QPixmap>
-#include <QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 
 /**
   Constructor

diff --git a/src/ImageComposer/ImageComposer_Operator.h b/src/ImageComposer/ImageComposer_Operator.h
index a8fa49a199edc05faea148de4cc54d3c77f556d6..f5fceb6fbd95e7334dcad4d35990f44199080d17 100644 (file)
--- a/src/ImageComposer/ImageComposer_Operator.h
+++ b/src/ImageComposer/ImageComposer_Operator.h
@@ -22,7 +22,7 @@
 
 #include "ImageComposer.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 
 class QString;
 class QRectF;

diff --git a/src/LightApp/LightApp_AboutDlg.cxx b/src/LightApp/LightApp_AboutDlg.cxx
index 0f682efc9bf020586889ce7a1bca7efe37ce2f65..630ee72d10197b4cdfcc5d3ab1da105b3210bc65 100644 (file)
--- a/src/LightApp/LightApp_AboutDlg.cxx
+++ b/src/LightApp/LightApp_AboutDlg.cxx
@@ -34,8 +34,8 @@
 
 #include <QLabel>
 #include <QVBoxLayout>
-#include <QPixmap>
-#include <QIcon>
+#include <QtGui/QPixmap>
+#include <QtGui/QIcon>
 #include <QGroupBox>
 #include <QTabWidget>
 #include <QPushButton>

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index ba73f8d245b6fb3036c2430a13c18a735bca234f..e384539d7ea9882436d23db48afcb79a99d7bdac 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -169,20 +169,20 @@
 #define VISIBILITY_COLUMN_WIDTH 25
 
 #include <QDir>
-#include <QImage>
+#include <QtGui/QImage>
 #include <QString>
 #include <QWidget>
 #include <QStringList>
 #include <QFile>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QMap>
 #include <QStatusBar>
 #include <QThread>
 #include <QObjectList>
 #include <QComboBox>
 #include <QInputDialog>
-#include <QFontDatabase>
-#include <QIcon>
+#include <QtGui/QFontDatabase>
+#include <QtGui/QIcon>
 #include <QByteArray>
 #include <QMenu>
 #include <QProcess>

diff --git a/src/LightApp/LightApp_Dialog.h b/src/LightApp/LightApp_Dialog.h
index 75efbf36837bfc45a79b09caa43857e98dc97173..c60a92d3cc674c9e8a563784dc4234a7f8516eef 100644 (file)
--- a/src/LightApp/LightApp_Dialog.h
+++ b/src/LightApp/LightApp_Dialog.h
@@ -31,7 +31,7 @@
 
 #include <QList>
 #include <QMap>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 
 class QLineEdit;
 class QAbstractButton;

diff --git a/src/LightApp/LightApp_EventFilter.cxx b/src/LightApp/LightApp_EventFilter.cxx
index 736a2a803d134e567812d10fbc9b9be38118d7a1..764979d4cd341b46b8f54421946ed10ae07d029b 100644 (file)
--- a/src/LightApp/LightApp_EventFilter.cxx
+++ b/src/LightApp/LightApp_EventFilter.cxx
@@ -24,7 +24,7 @@
 
 #include <SUIT_Desktop.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 #include <SALOME_Event.h>
 

diff --git a/src/LightApp/LightApp_ModuleAction.cxx b/src/LightApp/LightApp_ModuleAction.cxx
index b8104c5c799d5d55408b987855e1987d7a3a1b33..21d84025e46ff18e45b4330b85d4719f8d19d079 100644 (file)
--- a/src/LightApp/LightApp_ModuleAction.cxx
+++ b/src/LightApp/LightApp_ModuleAction.cxx
@@ -25,7 +25,7 @@
 #include <QtxComboBox.h>
 #include <QtxActionSet.h>
 #include <QVBoxLayout>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QEvent>
 
 /*!

diff --git a/src/LightApp/LightApp_ModuleDlg.h b/src/LightApp/LightApp_ModuleDlg.h
index 8147ebf2c840d9ebd5a4a1fa28410f729ee23c61..3167e40e79292369a3d005bfa298088f2228bac8 100644 (file)
--- a/src/LightApp/LightApp_ModuleDlg.h
+++ b/src/LightApp/LightApp_ModuleDlg.h
@@ -28,8 +28,8 @@
 
 #include "LightApp.h"
 
-#include <QDialog> 
-#include <QPixmap>
+#include <QtWidgets/QDialog> 
+#include <QtGui/QPixmap>
 #include <QMap>
 
 class QPushButton;

diff --git a/src/LightApp/LightApp_NameDlg.h b/src/LightApp/LightApp_NameDlg.h
index 32540095783884f083ad848c205425b3f32993ea..7f6d76c1a7f881a213b2dd2a8e0b896074671224 100644 (file)
--- a/src/LightApp/LightApp_NameDlg.h
+++ b/src/LightApp/LightApp_NameDlg.h
@@ -27,7 +27,7 @@
 #define LIGHTAPP_NAMEDLG_H
 
 #include "LightApp.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QLineEdit;
 class QPushButton;

diff --git a/src/LightApp/LightApp_SwitchOp.cxx b/src/LightApp/LightApp_SwitchOp.cxx
index 4a9c923fa39654e32d3b3dc31464c48eee244298..70a74d5e8573033ef8e1d4a7e57a20b2316a68bd 100644 (file)
--- a/src/LightApp/LightApp_SwitchOp.cxx
+++ b/src/LightApp/LightApp_SwitchOp.cxx
@@ -31,7 +31,7 @@
 #include <QEvent>
 #include <QWidget>
 #include <QList>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
  * \brief Constructor

diff --git a/src/LogWindow/LogWindow.cxx b/src/LogWindow/LogWindow.cxx
index f74164f07f7624853c4887c22b0ab0b5d5c3f589..86a79155d03bf33109b19f517a35f3a5edc81bd3 100644 (file)
--- a/src/LogWindow/LogWindow.cxx
+++ b/src/LogWindow/LogWindow.cxx
@@ -27,7 +27,7 @@
 #include "LogWindow.h"
 
 #include <QAction>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDate>
 #include <QFile>
 #include <QMenu>

diff --git a/src/OCCViewer/OCCViewer.h b/src/OCCViewer/OCCViewer.h
index fdccb5c1a256b14c7f361de675d51e4d13585959..f70b712b50a39cb3a678124dab7aca554dcbe5ef 100644 (file)
--- a/src/OCCViewer/OCCViewer.h
+++ b/src/OCCViewer/OCCViewer.h
@@ -39,7 +39,7 @@
 
 #include <Quantity_Color.hxx>
 
-#include <QColor>
+#include <QtGui/QColor>
 
 namespace OCCViewer
 {

diff --git a/src/OCCViewer/OCCViewer_AxialScaleDlg.h b/src/OCCViewer/OCCViewer_AxialScaleDlg.h
index 81013ea06150660dd8eda69245a6a68e9895745a..001edbc16e6fa08b0fa5b4596640c862363aca84 100644 (file)
--- a/src/OCCViewer/OCCViewer_AxialScaleDlg.h
+++ b/src/OCCViewer/OCCViewer_AxialScaleDlg.h
@@ -22,7 +22,7 @@
 
 #include "OCCViewer.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class OCCViewer_ViewWindow;
 class QtxDoubleSpinBox;

diff --git a/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx
index 4184b23bdd81d14ee7c3eb56b1bfd9d2a8de41a0..95f86a3d38089efb2dacccada1be5d420cc76658 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx
+++ b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx
@@ -32,8 +32,8 @@
 #include <GeomAPI_IntCS.hxx>
 #include <gce_MakeDir.hxx>
 
-#include <QMouseEvent>
-#include <QKeyEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
 
 /*!
   \brief Constructor.

diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.cxx b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
index 2847a50dca4fe665b7be127d9781de1e9ad6c8ab..adf023d3cea878d819ab6b4675a15634bce17346 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClippingDlg.cxx
+++ b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
@@ -52,7 +52,7 @@
 #include <math.h>
 
 // QT Includes
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QVBoxLayout>

diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.h b/src/OCCViewer/OCCViewer_ClippingDlg.h
index 9b5871660fc934a86e5cdbb668bada7f3013d166..610788dd31d33b532c921976e54ea085ce2e0c3d 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClippingDlg.h
+++ b/src/OCCViewer/OCCViewer_ClippingDlg.h
@@ -26,7 +26,7 @@
 #include "OCCViewer.h"
 #include "OCCViewer_ClipPlane.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 #include <AIS_Plane.hxx>
 #include <V3d_Plane.hxx>

diff --git a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
index 6014ffb1186ae92983761832478afee517f8257e..76b3f30801a2fca15aa7b93415c0d250443bfee0 100644 (file)
--- a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
+++ b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
@@ -28,7 +28,7 @@
 #include <QHBoxLayout>
 #include <QListWidgetItem>
 #include <QEvent>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 
 /*!
   Constructor

diff --git a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
index e55d853968c47a0ed15abb43186133ac97aae217..606f17b15830ffcbf0ae38753423e5aeb2ac7e6a 100644 (file)
--- a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
+++ b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
@@ -30,7 +30,7 @@
 #include <QtxDialog.h>
 #include <SUIT_Application.h>
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <QListWidget>
 
 class OCCViewer_ViewPort3d;

diff --git a/src/OCCViewer/OCCViewer_EnvTextureDlg.h b/src/OCCViewer/OCCViewer_EnvTextureDlg.h
index 4bf4a6cb4011fecec2a04b9242003c73e97f6e5e..4689a9a2c65c471302afa59cca51c27c8ad9406d 100644 (file)
--- a/src/OCCViewer/OCCViewer_EnvTextureDlg.h
+++ b/src/OCCViewer/OCCViewer_EnvTextureDlg.h
@@ -21,7 +21,7 @@
 #define OCCVIEWER_ENVTEXTUREDLG_H
 
 #include "OCCViewer.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <V3d_View.hxx>
 
 class OCCViewer_ViewWindow;

diff --git a/src/OCCViewer/OCCViewer_LightSourceDlg.h b/src/OCCViewer/OCCViewer_LightSourceDlg.h
index 94496cd987d303eeb2182e233abfabc84537224b..817f4d9127f7fe1c22b7515e09b382644d9785b6 100644 (file)
--- a/src/OCCViewer/OCCViewer_LightSourceDlg.h
+++ b/src/OCCViewer/OCCViewer_LightSourceDlg.h
@@ -21,7 +21,7 @@
 #define OCCVIEWER_LIGHTSOURCEDLG_H
 
 #include "OCCViewer.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <V3d_DirectionalLight.hxx>
 #include <V3d_PositionalLight.hxx>
 #include <V3d_TypeOfLight.hxx>

diff --git a/src/OCCViewer/OCCViewer_RayTracingDlg.h b/src/OCCViewer/OCCViewer_RayTracingDlg.h
index 6dbfaa603cfc709e177205288846b792bcd88a4d..3ab963ff9b713ab3adca9ac73ef7a105e703b192 100644 (file)
--- a/src/OCCViewer/OCCViewer_RayTracingDlg.h
+++ b/src/OCCViewer/OCCViewer_RayTracingDlg.h
@@ -21,7 +21,7 @@
 #define OCCVIEWER_RAYTRACINGDLG_H
 
 #include "OCCViewer.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <V3d_View.hxx>
 
 class OCCViewer_ViewWindow;

diff --git a/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx b/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
index 9b246012af197b802a13a4cf81af33bba651ab64..0b644dfae71908ac870abcc65f10bef8c9982fd2 100644 (file)
--- a/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
+++ b/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
@@ -32,7 +32,7 @@
 #include <QPushButton>
 #include <QMenu>
 #include <QGridLayout>
-#include <QDoubleValidator>
+#include <QtGui/QDoubleValidator>
 #include <QCheckBox>
 #include <QHBoxLayout>
 

diff --git a/src/OCCViewer/OCCViewer_SetRotationPointDlg.h b/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
index 2478090676ebea5f4a4b884011364bc0b1f8c05a..38ba331cf6826a581f60793334e28c9c3bec688b 100644 (file)
--- a/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
+++ b/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
@@ -25,7 +25,7 @@
 
 #include "OCCViewer.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <QMap>
 
 #include <TopAbs_ShapeEnum.hxx>

diff --git a/src/OCCViewer/OCCViewer_ToolTip.h b/src/OCCViewer/OCCViewer_ToolTip.h
index ab9267cd316e24c9987a768759716b58ddd070ad..5faafaa60766dce7cbb0cf7e43f2e84520612ea3 100644 (file)
--- a/src/OCCViewer/OCCViewer_ToolTip.h
+++ b/src/OCCViewer/OCCViewer_ToolTip.h
@@ -22,7 +22,7 @@
 
 #include "OCCViewer.h"
 #include <QtxToolTip.h>
-#include <QFont>
+#include <QtGui/QFont>
 
 #include <SelectMgr_EntityOwner.hxx>
 #include <AIS_InteractiveObject.hxx>

diff --git a/src/OCCViewer/OCCViewer_Utilities.cxx b/src/OCCViewer/OCCViewer_Utilities.cxx
index ee5a55667c8c7a253939151ff7560743bc57541a..02b26d13d145cd2ac7b6d97f1ea916e5c09dba17 100644 (file)
--- a/src/OCCViewer/OCCViewer_Utilities.cxx
+++ b/src/OCCViewer/OCCViewer_Utilities.cxx
@@ -32,9 +32,9 @@
 #include <Graphic3d_MapIteratorOfMapOfStructure.hxx>
 
 // QT includes
-#include <QImage>
+#include <QtGui/QImage>
 #include <QAction>
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 Handle(Image_PixMap) OCCViewer_Utilities::imageToPixmap( const QImage& anImage )
 {

diff --git a/src/OCCViewer/OCCViewer_ViewFrame.cxx b/src/OCCViewer/OCCViewer_ViewFrame.cxx
index 91e39769e8a6951ca1b8a54e32e24a3dbaa01b41..d96a828725d14472de0312f901c0376a5230c360 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewFrame.cxx
+++ b/src/OCCViewer/OCCViewer_ViewFrame.cxx
@@ -34,7 +34,7 @@
 
 #include <QFrame>
 #include <QLayout>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 OCCViewer_ViewFrame::OCCViewer_ViewFrame(SUIT_Desktop* theDesktop, OCCViewer_Viewer* theModel)
   : OCCViewer_ViewWindow( theDesktop, theModel ), myPopupRequestedView(0), mySplitMode(-1)

diff --git a/src/OCCViewer/OCCViewer_ViewModel.cxx b/src/OCCViewer/OCCViewer_ViewModel.cxx
index 0acca6fc514813cef08c138401a88ce96d6ab95c..3502278c3a0f07f7592a1759b54834459c87e3dd 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewModel.cxx
+++ b/src/OCCViewer/OCCViewer_ViewModel.cxx
@@ -40,14 +40,14 @@
 #include "QtxActionToolMgr.h"
 #include "QtxBackgroundTool.h"
 
-#include <QPainter>
-#include <QApplication>
+#include <QtGui/QPainter>
+#include <QtWidgets/QApplication>
 #include <QColorDialog>
 #include <QFileDialog>
-#include <QPalette>
-#include <QKeyEvent>
+#include <QtGui/QPalette>
+#include <QtGui/QKeyEvent>
 #include <QMenu>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QToolBar>
 #include <QDesktopWidget>
 

diff --git a/src/OCCViewer/OCCViewer_ViewModel.h b/src/OCCViewer/OCCViewer_ViewModel.h
index dddf9d11a5827136d76986e47232042ec0afd52c..00aa607b67da0f01c853a011fdfe547601aaf0ca 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewModel.h
+++ b/src/OCCViewer/OCCViewer_ViewModel.h
@@ -23,7 +23,7 @@
 #ifndef OCCVIEWER_VIEWMODEL_H
 #define OCCVIEWER_VIEWMODEL_H
 
-#include <QColor>
+#include <QtGui/QColor>
 #include <QPoint>
 #include <QVector>
 

diff --git a/src/OCCViewer/OCCViewer_ViewPort.cxx b/src/OCCViewer/OCCViewer_ViewPort.cxx
index 1e55845669976f1f05ab8b8376ea51ec597e56be..34f9a407045d7f8e111a19ad0f39840f259a8785 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewPort.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort.cxx
@@ -30,8 +30,8 @@
 
 #include <QColor>
 #include <QRect>
-#include <QPixmap>
-#include <QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 #include <QMultiHash>
 #include <QMenu>
 #include <QColorDialog>

diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
index b1de819761471bb28861fe09da6e42306e0ab15f..9f1b973fbe1061b2e3d07cc0660ce9d7b5c2bae1 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
@@ -35,9 +35,9 @@
 #include <QFileInfo>
 #include <QString>
 #include <QRect>
-#include <QPaintEvent>
-#include <QResizeEvent>
-#include <QApplication>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QResizeEvent>
+#include <QtWidgets/QApplication>
 #include <QTimer>
 
 #include <V3d_View.hxx>

diff --git a/src/OCCViewer/OCCViewer_ViewSketcher.cxx b/src/OCCViewer/OCCViewer_ViewSketcher.cxx
index 676a13e7e49fd90357fc5657d98ad2e5baef7286..88eaf1e1d43685155903e5b6aa670923b1e3588d 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewSketcher.cxx
+++ b/src/OCCViewer/OCCViewer_ViewSketcher.cxx
@@ -23,11 +23,11 @@
 
 #include "QtxRubberBand.h"
 
-#include <QApplication>
-#include <QPainter>
+#include <QtWidgets/QApplication>
+#include <QtGui/QPainter>
 #include <QPolygon>
-#include <QMouseEvent>
-#include <QKeyEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
 
 /****************************************************************
 **  Class: OCCViewer_ViewSketcher

diff --git a/src/OCCViewer/OCCViewer_ViewSketcher.h b/src/OCCViewer/OCCViewer_ViewSketcher.h
index 48d79cac990f3f4c930f6f2a240961be89b626a0..80c73300c4ff43e898eed0d55a0cd2f33af2b868 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewSketcher.h
+++ b/src/OCCViewer/OCCViewer_ViewSketcher.h
@@ -23,7 +23,7 @@
 #include "OCCViewer.h"
 
 #include <QObject>
-#include <QCursor>
+#include <QtGui/QCursor>
 #include <QSize>
 
 class OCCViewer_ViewWindow;

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx
index a5826fd381ee26b4690b145fe8ec9ced2e3dd2fb..225865d55a14593f4c80774a0b4656a794d02300 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@ -52,12 +52,12 @@
 #include <QtxMultiAction.h>
 #include <QtxRubberBand.h>
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QTime>
-#include <QImage>
-#include <QKeyEvent>
-#include <QMouseEvent>
-#include <QApplication>
+#include <QtGui/QImage>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QMouseEvent>
+#include <QtWidgets/QApplication>
 #include <QActionGroup>
 #include <QMenu>
 

diff --git a/src/OCCViewer/OCCViewer_ViewportInputFilter.cxx b/src/OCCViewer/OCCViewer_ViewportInputFilter.cxx
index d953f44930fe3a68e4f61ebabca5d2381f1b1123..3c97d38643a21bfa4938dfe93c0d777ff39b488b 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewportInputFilter.cxx
+++ b/src/OCCViewer/OCCViewer_ViewportInputFilter.cxx
@@ -26,8 +26,8 @@
 #include "OCCViewer_ViewWindow.h"
 #include "OCCViewer_ViewPort3d.h"
 
-#include <QMouseEvent>
-#include <QKeyEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
 
 /*!
   \brief Constructor.

diff --git a/src/ObjBrowser/OB_Browser.cxx b/src/ObjBrowser/OB_Browser.cxx
index 51aaa85ee447fc8da7ce0307288f451764819e51..994c53c527b60b7060cf5b1726f41100a182c31c 100644 (file)
--- a/src/ObjBrowser/OB_Browser.cxx
+++ b/src/ObjBrowser/OB_Browser.cxx
@@ -36,7 +36,7 @@
 #include <QAction>
 #include <QMenu>
 #include <QItemSelection>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QVBoxLayout>
 #include <QAbstractItemModel>
 #include <QAbstractItemDelegate>

diff --git a/src/PVViewer/PVViewer_Core.cxx b/src/PVViewer/PVViewer_Core.cxx
index e59820f0d5ce24b4c57b3520ffa22de8e6c87b8a..df9ab54c4d8d43288e0a3c5c608c6d78db83f0c1 100644 (file)
--- a/src/PVViewer/PVViewer_Core.cxx
+++ b/src/PVViewer/PVViewer_Core.cxx
@@ -27,7 +27,7 @@
 
 #include <Qtx.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QStringList>
 #include <QDir>
 #include <QMainWindow>

diff --git a/src/Plot2d/Plot2d.cxx b/src/Plot2d/Plot2d.cxx
index 0f7826eb386bf34ea1a25da76c79499fa72c67fb..56cf0eebfafdb9a61de78f05284353c8b2f910a7 100644 (file)
--- a/src/Plot2d/Plot2d.cxx
+++ b/src/Plot2d/Plot2d.cxx
@@ -22,7 +22,7 @@
 //
 #include "Plot2d.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 
 #include <qwt_plot.h>
 #include <qwt_plot_curve.h>

diff --git a/src/Plot2d/Plot2d.h b/src/Plot2d/Plot2d.h
index 8aafe39dfc6758551aa025bc19228a5e0eafb9ee..8014f5248167fd8b10b49cd829a6633c507b9a39 100644 (file)
--- a/src/Plot2d/Plot2d.h
+++ b/src/Plot2d/Plot2d.h
@@ -38,8 +38,8 @@
 
 #include <qwt_symbol.h>
 #include <QString>
-#include <QColor>
-#include <QPixmap>
+#include <QtGui/QColor>
+#include <QtGui/QPixmap>
 
 class QPainter;
 class QwtPlot;

diff --git a/src/Plot2d/Plot2d_AnalyticalCurveDlg.h b/src/Plot2d/Plot2d_AnalyticalCurveDlg.h
index 8a28881aabd95d2d0dd8dd72346b56bcd9c5c318..ab382f87883286f30a01deefa5f7fb27c41b78e3 100644 (file)
--- a/src/Plot2d/Plot2d_AnalyticalCurveDlg.h
+++ b/src/Plot2d/Plot2d_AnalyticalCurveDlg.h
@@ -29,7 +29,7 @@
 #include "Plot2d.h"
 #include "Plot2d_AnalyticalCurve.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <QMap>
 
 class QListWidget;

diff --git a/src/Plot2d/Plot2d_FitDataDlg.cxx b/src/Plot2d/Plot2d_FitDataDlg.cxx
index 0c6d6ee2fe0f02e33eca909ecd1af9a81d4396f8..3be7b9aa6f67d7da66c655f984803f993087587e 100644 (file)
--- a/src/Plot2d/Plot2d_FitDataDlg.cxx
+++ b/src/Plot2d/Plot2d_FitDataDlg.cxx
@@ -26,7 +26,7 @@
 #include "Plot2d_FitDataDlg.h"
 #include <QLabel>
 #include <QLayout>
-#include <QValidator>
+#include <QtGui/QValidator>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QGroupBox>

diff --git a/src/Plot2d/Plot2d_FitDataDlg.h b/src/Plot2d/Plot2d_FitDataDlg.h
index f24839fc721d4fc66632f98bad56e5ae34bc351c..3661cc4f1dd3ad0fe725af4dff1783dd6c0f8b77 100644 (file)
--- a/src/Plot2d/Plot2d_FitDataDlg.h
+++ b/src/Plot2d/Plot2d_FitDataDlg.h
@@ -24,7 +24,7 @@
 #define PLOT2D_FITDATADLG_H
 
 #include "Plot2d.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QGroupBox;
 class QRadioButton;

diff --git a/src/Plot2d/Plot2d_PlotItems.cxx b/src/Plot2d/Plot2d_PlotItems.cxx
index c1b523c532176467d07ca7f782035f049ecd2256..f1cafdb9d9834be48f3c748bf58bb42ae50aa842 100644 (file)
--- a/src/Plot2d/Plot2d_PlotItems.cxx
+++ b/src/Plot2d/Plot2d_PlotItems.cxx
@@ -26,13 +26,13 @@
 #include "Plot2d_Object.h"
 #include "Plot2d_ViewFrame.h"
 
-#include <QPainter>
-#include <QPalette>
+#include <QtGui/QPainter>
+#include <QtGui/QPalette>
 #include <QLayout>
 #include <QLine>
 #include <QVariant>
 #include <QStyleOption>
-#include <QPaintEvent>
+#include <QtGui/QPaintEvent>
 #include <QTileRules>
 
 #include <qwt_plot.h>

diff --git a/src/Plot2d/Plot2d_SetupCurveDlg.cxx b/src/Plot2d/Plot2d_SetupCurveDlg.cxx
index c9045915622e4dff325659496d5899537211ab03..91ae71bd0b57d15f222300301fe360740465e672 100644 (file)
--- a/src/Plot2d/Plot2d_SetupCurveDlg.cxx
+++ b/src/Plot2d/Plot2d_SetupCurveDlg.cxx
@@ -36,7 +36,7 @@
 #include <QPushButton>
 #include <QComboBox>
 #include <QSpinBox>
-#include <QPainter>
+#include <QtGui/QPainter>
 
 const int MARGIN_SIZE     = 11;
 const int SPACING_SIZE    = 6;

diff --git a/src/Plot2d/Plot2d_SetupCurveDlg.h b/src/Plot2d/Plot2d_SetupCurveDlg.h
index 6fdee0036bf248057b772f45ebcf8b60c3ec4514..cdb4729c033a8273c774b35b86cd253df4e02cea 100644 (file)
--- a/src/Plot2d/Plot2d_SetupCurveDlg.h
+++ b/src/Plot2d/Plot2d_SetupCurveDlg.h
@@ -28,7 +28,7 @@
 
 #include "Plot2d.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QPushButton;
 class QComboBox;

diff --git a/src/Plot2d/Plot2d_SetupCurveScaleDlg.h b/src/Plot2d/Plot2d_SetupCurveScaleDlg.h
index 4468fdb2736f3265c7c88e62e668f3d364442f6a..6afc3f4c12ec4a6797f756fc797fe718ed71456a 100644 (file)
--- a/src/Plot2d/Plot2d_SetupCurveScaleDlg.h
+++ b/src/Plot2d/Plot2d_SetupCurveScaleDlg.h
@@ -27,7 +27,7 @@
 
 #include "Plot2d.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QPushButton;
 class QLabel;

diff --git a/src/Plot2d/Plot2d_SetupViewDlg.h b/src/Plot2d/Plot2d_SetupViewDlg.h
index 3a4c610d1a3da28c033b1cbe168f6168ce644b28..b4ccf81cb3870de803b49650c361f0c9e9342906 100644 (file)
--- a/src/Plot2d/Plot2d_SetupViewDlg.h
+++ b/src/Plot2d/Plot2d_SetupViewDlg.h
@@ -28,7 +28,7 @@
 
 #include "Plot2d.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QSpinBox;
 class QCheckBox;

diff --git a/src/Plot2d/Plot2d_ToolTip.cxx b/src/Plot2d/Plot2d_ToolTip.cxx
index 82a3cb3fc5f6f6a6fbca01a79b94dbfe13f37481..d2375da72b6b622b75676c20427f6754341b04b0 100644 (file)
--- a/src/Plot2d/Plot2d_ToolTip.cxx
+++ b/src/Plot2d/Plot2d_ToolTip.cxx
@@ -26,9 +26,9 @@
 #include "Plot2d_ViewFrame.h"
 #include "Plot2d_Curve.h"
 
-#include <QFontMetrics>
+#include <QtGui/QFontMetrics>
 #include <QEvent>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 
 #include <qwt_plot.h>
 #include <qwt_plot_canvas.h>

diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx
index 1e38ed82934b074aa2bb10a32e705dc10e3d4fe2..4ad64ff4b6b7df081faecaeabbae4dbd0f34b6a4 100644 (file)
--- a/src/Plot2d/Plot2d_ViewFrame.cxx
+++ b/src/Plot2d/Plot2d_ViewFrame.cxx
@@ -46,20 +46,20 @@
 #include <QMessageBox>
 #endif
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QToolBar>
 #include <QToolButton>
-#include <QCursor>
+#include <QtGui/QCursor>
 #include <QColorDialog>
 #include <QLayout>
 #include <QMap>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QPaintDevice>
 #include <QEvent>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QContextMenuEvent>
 #include <QtPrintSupport/QPrinter>
-#include <QPalette>
+#include <QtGui/QPalette>
 #include <QLocale>
 #include <QXmlStreamWriter>
 #include <QXmlStreamReader>

diff --git a/src/Plot2d/Plot2d_ViewFrame.h b/src/Plot2d/Plot2d_ViewFrame.h
index 00fe34c8572ca903234c29bc5f75679989b85365..599200f1834a0a9a99ee88ca895d4fe677fc2ac8 100644 (file)
--- a/src/Plot2d/Plot2d_ViewFrame.h
+++ b/src/Plot2d/Plot2d_ViewFrame.h
@@ -34,7 +34,7 @@
 #include <QMultiHash>
 #include <QMap>
 #include <QList>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <qwt_symbol.h>
 #include <qwt_scale_draw.h>
 #include <qwt_plot_marker.h>

diff --git a/src/Plot2d/Plot2d_ViewWindow.cxx b/src/Plot2d/Plot2d_ViewWindow.cxx
index 654a89712ceb096ea9660056698bd39662866c07..2e2a5d47637fc166a7624e5bfd2fab268ddc29d7 100644 (file)
--- a/src/Plot2d/Plot2d_ViewWindow.cxx
+++ b/src/Plot2d/Plot2d_ViewWindow.cxx
@@ -39,13 +39,13 @@
 
 #include <QStatusBar>
 #include <QLayout>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QMenu>
-#include <QImage>
+#include <QtGui/QImage>
 #include <QToolBar>
-#include <QPaintEvent>
+#include <QtGui/QPaintEvent>
 #include <QActionGroup>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QtPrintSupport/QPrinter>
 #include <QtPrintSupport/QPrintDialog>
 

diff --git a/src/PyViewer/PyViewer_ViewWindow.cxx b/src/PyViewer/PyViewer_ViewWindow.cxx
index e6c778ac5e8886fbf9fe8ce4dbc1ba2ee54e027c..ecbbc562bf5b4c961b8982c0ee6d19506c0af085 100644 (file)
--- a/src/PyViewer/PyViewer_ViewWindow.cxx
+++ b/src/PyViewer/PyViewer_ViewWindow.cxx
@@ -31,7 +31,7 @@
 #include "QtxAction.h"
 #include "QtxActionToolMgr.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QCloseEvent>
 #include <QFileDialog>
 #include <QMessageBox>

diff --git a/src/QDS/QDS_ComboBox.h b/src/QDS/QDS_ComboBox.h
index 5e9063626ff6cc008f7b102258c7490b8cecd39a..e7ee681c1feba416b483411b9ff1e092ebcd37a1 100644 (file)
--- a/src/QDS/QDS_ComboBox.h
+++ b/src/QDS/QDS_ComboBox.h
@@ -26,7 +26,7 @@
 #include "QDS_Datum.h"
 
 #include <QMap>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 #include <QStringList>
 
 #include <Qtx.h>

diff --git a/src/QDS/QDS_Datum.cxx b/src/QDS/QDS_Datum.cxx
index 5eb2929cc4676d3ab4924e558f87b412a8b4db6e..efa5e081e81f98d08ff07c0cd79bcf5695deb445 100644 (file)
--- a/src/QDS/QDS_Datum.cxx
+++ b/src/QDS/QDS_Datum.cxx
@@ -27,7 +27,7 @@
 #include <QTimer>
 #include <QEvent>
 #include <QMessageBox>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 #include "QDS_Validator.h"
 #include <DDS_Dictionary.h>

diff --git a/src/QDS/QDS_LineEdit.cxx b/src/QDS/QDS_LineEdit.cxx
index c57509ce98ed55a20bd53f243c409f207f413e7d..fd20cc4f3d220dbc3ff72199f452c9232ba2ef32 100644 (file)
--- a/src/QDS/QDS_LineEdit.cxx
+++ b/src/QDS/QDS_LineEdit.cxx
@@ -23,7 +23,7 @@
 #include "QDS_LineEdit.h"
 
 #include <QLineEdit>
-#include <QValidator>
+#include <QtGui/QValidator>
 
 /*!
   \class QDS_LineEdit::Editor

diff --git a/src/QDS/QDS_Validator.h b/src/QDS/QDS_Validator.h
index eafd7ea42d7801a06c130cc53fb674572fabfce3..d0dcb861a9b0540f1e206df932f16a40ae62a22a 100644 (file)
--- a/src/QDS/QDS_Validator.h
+++ b/src/QDS/QDS_Validator.h
@@ -25,7 +25,7 @@
 
 #include "QDS.h"
 
-#include <QValidator>
+#include <QtGui/QValidator>
 
 class QDS_EXPORT QDS_IntegerValidator : public QIntValidator
 {

diff --git a/src/Qtx/QtxActionSet.cxx b/src/Qtx/QtxActionSet.cxx
index c12eaab75e9896f189cfbd1f8586f1fe99ddb2eb..37c0aaa9981ef6de6b4d8917ded5c6552b2a51c0 100644 (file)
--- a/src/Qtx/QtxActionSet.cxx
+++ b/src/Qtx/QtxActionSet.cxx
@@ -22,7 +22,7 @@
 //
 #include "QtxActionSet.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxActionSet

diff --git a/src/Qtx/QtxActionToolMgr.cxx b/src/Qtx/QtxActionToolMgr.cxx
index 672f5b56869e0819e71fab761152c376d8b8162f..76dceead0e4194476bab0a05c5fbbe23172ce782 100644 (file)
--- a/src/Qtx/QtxActionToolMgr.cxx
+++ b/src/Qtx/QtxActionToolMgr.cxx
@@ -28,8 +28,8 @@
 #include "QtxAction.h"
 #include "QtxToolBar.h"
 
-#include <QApplication>
-#include <QHideEvent>
+#include <QtWidgets/QApplication>
+#include <QtGui/QHideEvent>
 #include <QMainWindow>
 
 /*!

diff --git a/src/Qtx/QtxBiColorTool.cxx b/src/Qtx/QtxBiColorTool.cxx
index 4ba74ad6361e96a4bdcfc11af1e1c0ce7ab98046..76fcb865079c376820d9116c6db315b20d800ba6 100644 (file)
--- a/src/Qtx/QtxBiColorTool.cxx
+++ b/src/Qtx/QtxBiColorTool.cxx
@@ -25,7 +25,7 @@
 
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QSlider>
 #include <QStyle>
 #include <QStylePainter>

diff --git a/src/Qtx/QtxBiColorTool.h b/src/Qtx/QtxBiColorTool.h
index bf4c9b69702967e9ff3c87039b28b50d6d17133c..6f442c177f5a2e13c0adbb569392e1a3f81877b1 100644 (file)
--- a/src/Qtx/QtxBiColorTool.h
+++ b/src/Qtx/QtxBiColorTool.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 #include <QWidget>
 
 class QLabel;

diff --git a/src/Qtx/QtxColorButton.cxx b/src/Qtx/QtxColorButton.cxx
index e62902060db287736bd268ae8aad3dfb2e2a90a1..4b69f709fb707f2cff66cd4f06802cb5f4ba5fa6 100644 (file)
--- a/src/Qtx/QtxColorButton.cxx
+++ b/src/Qtx/QtxColorButton.cxx
@@ -25,9 +25,9 @@
 #include <QMenu>
 #include <QStyle>
 #include <QLayout>
-#include <QBitmap>
-#include <QPainter>
-#include <QPaintEvent>
+#include <QtGui/QBitmap>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
 #include <QColorDialog>
 #include <QStyleOptionToolButton>
 

diff --git a/src/Qtx/QtxColorButton.h b/src/Qtx/QtxColorButton.h
index 13239b628b462a445dbbb9163e86378b31c79d9d..f1bba122ef0ae815869cd5c187dee01e8e6b277c 100644 (file)
--- a/src/Qtx/QtxColorButton.h
+++ b/src/Qtx/QtxColorButton.h
@@ -26,8 +26,8 @@
 #include "Qtx.h"
 
 #include <QMap>
-#include <QColor>
-#include <QPixmap>
+#include <QtGui/QColor>
+#include <QtGui/QPixmap>
 #include <QToolButton>
 
 class QPaintDevice;

diff --git a/src/Qtx/QtxColorScale.cxx b/src/Qtx/QtxColorScale.cxx
index d90c92c757046da3ba1b874a0f47c6d0ef2365e1..b2a6e64f8ebf737650eb4cc429bdfd53418b3aa9 100644 (file)
--- a/src/Qtx/QtxColorScale.cxx
+++ b/src/Qtx/QtxColorScale.cxx
@@ -28,9 +28,9 @@
 #include <QMap>
 #include <QRegExp>
 #include <QStringList>
-#include <QPixmap>
-#include <QPainter>
-#include <QTextDocument>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
+#include <QtGui/QTextDocument>
 
 #include <math.h>
 

diff --git a/src/Qtx/QtxComboBox.cxx b/src/Qtx/QtxComboBox.cxx
index 6ba82ef0b0e5bb210ba02dca9fece7fc9ac6d639..9fcb6cfd6c341eeb4d5fc404bd397a3ccaf82b2d 100644 (file)
--- a/src/Qtx/QtxComboBox.cxx
+++ b/src/Qtx/QtxComboBox.cxx
@@ -24,10 +24,10 @@
 
 #include "QtxComboBox.h"
 
-#include <QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 #include <QLineEdit>
 #include <QEvent>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxComboBox::Model

diff --git a/src/Qtx/QtxDialog.cxx b/src/Qtx/QtxDialog.cxx
index dae1914312570209b9a9af981ae3055412a487f5..f36d498bf8042096ced3fd6db4a198b1a9280b99 100644 (file)
--- a/src/Qtx/QtxDialog.cxx
+++ b/src/Qtx/QtxDialog.cxx
@@ -27,11 +27,11 @@
 
 #include <QLabel>
 #include <QLayout>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QFrame>
 #include <QTabWidget>
 #include <QPushButton>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxDialog::Area

diff --git a/src/Qtx/QtxDialog.h b/src/Qtx/QtxDialog.h
index 6346e88cd269115126a9e96aed129b38b4b7c913..273dfd02fe613884a1fe7d9f708058f495dc8da8 100644 (file)
--- a/src/Qtx/QtxDialog.h
+++ b/src/Qtx/QtxDialog.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <QMap>
 
 class QFrame;

diff --git a/src/Qtx/QtxDockWidget.cxx b/src/Qtx/QtxDockWidget.cxx
index d46bed62aaefa964bb29f16efa61aaa282af987b..9aa4a25a795250077f6fefe582acae1d1426bb2d 100644 (file)
--- a/src/Qtx/QtxDockWidget.cxx
+++ b/src/Qtx/QtxDockWidget.cxx
@@ -28,8 +28,8 @@
 #include <QAction>
 #include <QLayout>
 #include <QMainWindow>
-#include <QResizeEvent>
-#include <QApplication>
+#include <QtGui/QResizeEvent>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxDockWidget::Watcher

diff --git a/src/Qtx/QtxDoubleSpinBox.cxx b/src/Qtx/QtxDoubleSpinBox.cxx
index 8bd521fb5ea7c7db52004f466e67b176bec03d0f..9d2380bce18e2ee59fe5ce9d690224eecca0265c 100644 (file)
--- a/src/Qtx/QtxDoubleSpinBox.cxx
+++ b/src/Qtx/QtxDoubleSpinBox.cxx
@@ -23,7 +23,7 @@
 #include "QtxDoubleSpinBox.h"
 
 #include <QLineEdit>
-#include <QDoubleValidator>
+#include <QtGui/QDoubleValidator>
 #include <QVariant>
 
 #include <limits>

diff --git a/src/Qtx/QtxDoubleSpinBox.h b/src/Qtx/QtxDoubleSpinBox.h
index d960c3d908be0224263e16aa65e184b8e343c19a..00e822a84ad3c90f9222ea4961bf0f9927541ec8 100644 (file)
--- a/src/Qtx/QtxDoubleSpinBox.h
+++ b/src/Qtx/QtxDoubleSpinBox.h
@@ -26,7 +26,7 @@
 #include "Qtx.h"
 
 #include <QDoubleSpinBox>
-#include <QValidator>
+#include <QtGui/QValidator>
 
 class QTX_EXPORT QtxDoubleSpinBox : public QDoubleSpinBox
 {

diff --git a/src/Qtx/QtxFontEdit.cxx b/src/Qtx/QtxFontEdit.cxx
index 5537138cdda4cef530903dcd07499cd291ccc945..c1abb3cbec63d6430897ea542ed07bfefb35d919 100644 (file)
--- a/src/Qtx/QtxFontEdit.cxx
+++ b/src/Qtx/QtxFontEdit.cxx
@@ -27,7 +27,7 @@
 #include <QLayout>
 #include <QToolButton>
 #include <QFontDialog>
-#include <QFontDatabase>
+#include <QtGui/QFontDatabase>
 #include <QFontComboBox>
 
 /*!

diff --git a/src/Qtx/QtxGroupBox.cxx b/src/Qtx/QtxGroupBox.cxx
index 80f03a2ce97cdd7a5aadd19dfb41614890e28a15..b005a9e827114df995f4b1e25616c375d62dcf88 100644 (file)
--- a/src/Qtx/QtxGroupBox.cxx
+++ b/src/Qtx/QtxGroupBox.cxx
@@ -29,7 +29,7 @@
 #include <QHBoxLayout>
 #include <QEvent>
 #include <QObjectList>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxGroupBox

diff --git a/src/Qtx/QtxListAction.cxx b/src/Qtx/QtxListAction.cxx
index 8b18e214c1465a36f4bd9b817efb7b4c76a7cfc9..fd833712355b4faca8e6f9b3c1055dfff37fdd22 100644 (file)
--- a/src/Qtx/QtxListAction.cxx
+++ b/src/Qtx/QtxListAction.cxx
@@ -28,10 +28,10 @@
 #include <QMenu>
 #include <QLabel>
 #include <QVBoxLayout>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QListWidget>
 #include <QToolButton>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxListAction::ScrollEvent

diff --git a/src/Qtx/QtxLogoMgr.cxx b/src/Qtx/QtxLogoMgr.cxx
index 5eb786f168e240e9b9814453385370293838ac8b..09fd5de4c277f83a37de9d71ccdfb683a4d78b3d 100644 (file)
--- a/src/Qtx/QtxLogoMgr.cxx
+++ b/src/Qtx/QtxLogoMgr.cxx
@@ -26,13 +26,13 @@
 #include "QtxLogoMgr.h"
 
 #include <QLabel>
-#include <QImage>
-#include <QBitmap>
+#include <QtGui/QImage>
+#include <QtGui/QBitmap>
 #include <QHBoxLayout>
 #include <QMenuBar>
 #include <QPointer>
-#include <QApplication>
-#include <QMovie>
+#include <QtWidgets/QApplication>
+#include <QtGui/QMovie>
 
 /*!
   \class QtxLogoMgr::LogoBox

diff --git a/src/Qtx/QtxLogoMgr.h b/src/Qtx/QtxLogoMgr.h
index 83c960e456706ea2788d7d143d1f424d021c4d79..4b806b03ee0bd0f720a803331ea2f1ff6411c586 100644 (file)
--- a/src/Qtx/QtxLogoMgr.h
+++ b/src/Qtx/QtxLogoMgr.h
@@ -30,7 +30,7 @@
 
 #include <QObject>
 #include <QList>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 
 class QMenuBar;
 class QMovie;

diff --git a/src/Qtx/QtxMRUAction.cxx b/src/Qtx/QtxMRUAction.cxx
index c405713c1761badb39be60150a51381073f9e66a..6eadfe92c89c45fad7529ab59e2872e1aae05eec 100644 (file)
--- a/src/Qtx/QtxMRUAction.cxx
+++ b/src/Qtx/QtxMRUAction.cxx
@@ -28,7 +28,7 @@
 #include "QtxResourceMgr.h"
 
 #include <QMenu>
-#include <QIcon>
+#include <QtGui/QIcon>
 
 /*!
   \class QtxMRUAction

diff --git a/src/Qtx/QtxMainWindow.cxx b/src/Qtx/QtxMainWindow.cxx
index 64353bfa71117670ac9249b0860421695739739f..7d1655338d512c9bf479adaae04f57ccf52ae54d 100644 (file)
--- a/src/Qtx/QtxMainWindow.cxx
+++ b/src/Qtx/QtxMainWindow.cxx
@@ -33,8 +33,8 @@
 #include <QMenuBar>
 #include <QStatusBar>
 #include <QRubberBand>
-#include <QMouseEvent>
-#include <QApplication>
+#include <QtGui/QMouseEvent>
+#include <QtWidgets/QApplication>
 #include <QDesktopWidget>
 #include <cstdio>
 /*!

diff --git a/src/Qtx/QtxMenu.cxx b/src/Qtx/QtxMenu.cxx
index 1fa4acad607b2364dabca7a8c77565d4d895605f..36514c6c939684be74c3dbb7e6a579915efbdf5a 100644 (file)
--- a/src/Qtx/QtxMenu.cxx
+++ b/src/Qtx/QtxMenu.cxx
@@ -24,12 +24,12 @@
 
 #include <QLabel>
 #include <QLayout>
-#include <QPainter>
-#include <QPaintEvent>
-#include <QTextDocument>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QTextDocument>
 #include <QWidgetAction>
-#include <QLinearGradient>
-#include <QAbstractTextDocumentLayout>
+#include <QtGui/QLinearGradient>
+#include <QtGui/QAbstractTextDocumentLayout>
 
 /*!
   \class QtxMenu::Title

diff --git a/src/Qtx/QtxMultiAction.cxx b/src/Qtx/QtxMultiAction.cxx
index 134afcf6b374e3dc05c05c1119494d47e7ceae0b..13d75f95916fdb850c43dcf88a1fd1b05de1701d 100644 (file)
--- a/src/Qtx/QtxMultiAction.cxx
+++ b/src/Qtx/QtxMultiAction.cxx
@@ -25,10 +25,10 @@
 #include <QMenu>
 #include <QLayout>
 #include <QToolBar>
-#include <QPainter>
-#include <QHelpEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QHelpEvent>
 #include <QToolButton>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QStyleOptionButton>
 
 /*!

diff --git a/src/Qtx/QtxNotify.cxx b/src/Qtx/QtxNotify.cxx
index 87f79a09f8dd7dc37b3b77a32de3db9ae1d47dae..a953d8513ebc0f8402903a96219239b40aed5e2a 100644 (file)
--- a/src/Qtx/QtxNotify.cxx
+++ b/src/Qtx/QtxNotify.cxx
@@ -23,10 +23,10 @@
 #include "QtxNotify.h"
 
 #include <QTimer>
-#include <QPainter>
-#include <QMouseEvent>
-#include <QApplication>
-#include <QTextDocument>
+#include <QtGui/QPainter>
+#include <QtGui/QMouseEvent>
+#include <QtWidgets/QApplication>
+#include <QtGui/QTextDocument>
 #include <QDesktopWidget>
 #include <QSharedPointer>
 #include <QPropertyAnimation>

diff --git a/src/Qtx/QtxPagePrefMgr.cxx b/src/Qtx/QtxPagePrefMgr.cxx
index e7694954ce526c7441985d84ba6ca986077474a1..f1427c22587076527c00d2222c058b7a7ea6fb06 100644 (file)
--- a/src/Qtx/QtxPagePrefMgr.cxx
+++ b/src/Qtx/QtxPagePrefMgr.cxx
@@ -43,7 +43,7 @@
 #include <QSplitter>
 #include <QTabWidget>
 #include <QListWidget>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDateTimeEdit>
 #include <QStackedWidget>
 #include <QSlider>

diff --git a/src/Qtx/QtxPagePrefMgr.h b/src/Qtx/QtxPagePrefMgr.h
index bf996033885c0c624e75747a90858332fec26e55..952ea12e3cde5cc30a2d8b4844370077371adac3 100644 (file)
--- a/src/Qtx/QtxPagePrefMgr.h
+++ b/src/Qtx/QtxPagePrefMgr.h
@@ -31,7 +31,7 @@
 #include <QFrame>
 #include <QLabel>
 #include <QPointer>
-#include <QIcon>
+#include <QtGui/QIcon>
 
 class QtxGridBox;
 class QtxFontEdit;

diff --git a/src/Qtx/QtxPathDialog.cxx b/src/Qtx/QtxPathDialog.cxx
index 3f7733af0fd41fe8f42fd439934d6788c6b202b3..9e48f4571fdfe6996bee89e27f496f58eba303ba 100644 (file)
--- a/src/Qtx/QtxPathDialog.cxx
+++ b/src/Qtx/QtxPathDialog.cxx
@@ -30,7 +30,7 @@
 
 #include <QDir>
 #include <QLabel>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 #include <QLayout>
 #include <QLineEdit>
 #include <QObjectList>

diff --git a/src/Qtx/QtxPathEdit.cxx b/src/Qtx/QtxPathEdit.cxx
index 00e19967a4e6134fd573e1997b115bc0ad1fa386..10d50ffea00f621a757a5f89863258429edb9ad9 100644 (file)
--- a/src/Qtx/QtxPathEdit.cxx
+++ b/src/Qtx/QtxPathEdit.cxx
@@ -22,15 +22,15 @@
 //
 #include "QtxPathEdit.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QLayout>
 #include <QDirModel>
 #include <QLineEdit>
 #include <QCompleter>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QToolButton>
 #include <QFileDialog>
-#include <QRegExpValidator>
+#include <QtGui/QRegExpValidator>
 
 static const char* browse_icon[] = {
 "16 16 5 1",

diff --git a/src/Qtx/QtxPathListEdit.cxx b/src/Qtx/QtxPathListEdit.cxx
index 414afcd7c90701a74629da535dd1b87cd43da000..08b7c4662f7e5c7ac7fbedc24854d9c86794f42f 100644 (file)
--- a/src/Qtx/QtxPathListEdit.cxx
+++ b/src/Qtx/QtxPathListEdit.cxx
@@ -25,10 +25,10 @@
 #include "QtxPathEdit.h"
 
 #include <QLayout>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QListView>
 #include <QLineEdit>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QDirModel>
 #include <QCompleter>
 #include <QToolButton>

diff --git a/src/Qtx/QtxPreferenceMgr.cxx b/src/Qtx/QtxPreferenceMgr.cxx
index e63c43e7a04f51eab64f90182e37eb91a027f3ad..db6807c085aa11a28abfc4062b0f4bbb6b9ea070 100644 (file)
--- a/src/Qtx/QtxPreferenceMgr.cxx
+++ b/src/Qtx/QtxPreferenceMgr.cxx
@@ -25,7 +25,7 @@
 #include "QtxResourceMgr.h"
 
 #include <QEvent>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxPreferenceItem::Updater

diff --git a/src/Qtx/QtxPreferenceMgr.h b/src/Qtx/QtxPreferenceMgr.h
index d81dc05cff32ec28e7f5ad453265270faa96df0c..7e4314020ddf8d2069fceeff5f5d6b56b2a8050b 100644 (file)
--- a/src/Qtx/QtxPreferenceMgr.h
+++ b/src/Qtx/QtxPreferenceMgr.h
@@ -29,9 +29,9 @@
 
 #include "Qtx.h"
 
-#include <QFont>
-#include <QIcon>
-#include <QColor>
+#include <QtGui/QFont>
+#include <QtGui/QIcon>
+#include <QtGui/QColor>
 #include <QVariant>
 
 class QtxResourceMgr;

diff --git a/src/Qtx/QtxResourceMgr.cxx b/src/Qtx/QtxResourceMgr.cxx
index 711893b92ef34841c0a848c7f52fca20c996ea15..3abd8cea9a977ca9185bc7b69ff64d1799f2a4c4 100644 (file)
--- a/src/Qtx/QtxResourceMgr.cxx
+++ b/src/Qtx/QtxResourceMgr.cxx
@@ -32,7 +32,7 @@
 #include <QFileInfo>
 #include <QRegExp>
 #include <QTextStream>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QLibraryInfo>
 #include <QtDebug>
 #ifndef QT_NO_DOM

diff --git a/src/Qtx/QtxResourceMgr.h b/src/Qtx/QtxResourceMgr.h
index 5f9c1a2d094dd62caaa6574f3e04cf1f30e733d8..48389b0131799937b8f442e17915483153ebfe54 100644 (file)
--- a/src/Qtx/QtxResourceMgr.h
+++ b/src/Qtx/QtxResourceMgr.h
@@ -34,14 +34,14 @@
 
 #include <QMap>
 #include <QList>
-#include <QFont>
-#include <QColor>
-#include <QPixmap>
+#include <QtGui/QFont>
+#include <QtGui/QColor>
+#include <QtGui/QPixmap>
 #include <QByteArray>
 #include <QStringList>
-#include <QLinearGradient>
-#include <QRadialGradient>
-#include <QConicalGradient>
+#include <QtGui/QLinearGradient>
+#include <QtGui/QRadialGradient>
+#include <QtGui/QConicalGradient>
 
 class QTranslator;
 

diff --git a/src/Qtx/QtxRubberBand.cxx b/src/Qtx/QtxRubberBand.cxx
index fe4bbd6a7db313d229b10b4d85053171601baf64..260b5c239e199a3b2cf6418cd02373141ac05b9e 100644 (file)
--- a/src/Qtx/QtxRubberBand.cxx
+++ b/src/Qtx/QtxRubberBand.cxx
@@ -22,12 +22,12 @@
 //
 #include "QtxRubberBand.h"
 
-#include <QBitmap>
-#include <QImage>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QPalette>
-#include <QShowEvent>
+#include <QtGui/QBitmap>
+#include <QtGui/QImage>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPalette>
+#include <QtGui/QShowEvent>
 #include <QVectorIterator>
 
 #include <math.h>

diff --git a/src/Qtx/QtxSearchTool.cxx b/src/Qtx/QtxSearchTool.cxx
index 91869f27d9077316b9ecf13fa481b05be5f2ada4..c8421528e96ce1aa5ada1844a881915b45b88a38 100644 (file)
--- a/src/Qtx/QtxSearchTool.cxx
+++ b/src/Qtx/QtxSearchTool.cxx
@@ -22,11 +22,11 @@
 //
 #include "QtxSearchTool.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QCheckBox>
 #include <QEvent>
 #include <QHBoxLayout>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QLineEdit>
 #include <QPersistentModelIndex>
 #include <QShortcut>

diff --git a/src/Qtx/QtxShortcutEdit.cxx b/src/Qtx/QtxShortcutEdit.cxx
index 5f430ee406bdfa3758a322e99a15383f55ea14f3..e23119d96934effd098351b93ba54e2c6ff7747e 100644 (file)
--- a/src/Qtx/QtxShortcutEdit.cxx
+++ b/src/Qtx/QtxShortcutEdit.cxx
@@ -28,8 +28,8 @@
 #include <QTableWidgetItem>
 #include <QMessageBox>
 
-#include <QKeyEvent>
-#include <QKeySequence>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QKeySequence>
 
 #define COLUMN_SIZE  500
 

diff --git a/src/Qtx/QtxSplash.cxx b/src/Qtx/QtxSplash.cxx
index e3c68a583881073c4e2687bc1d26f6d3dbe34757..19cbb5319fa6ab44a84ebe31310ac658a183f411 100644 (file)
--- a/src/Qtx/QtxSplash.cxx
+++ b/src/Qtx/QtxSplash.cxx
@@ -27,8 +27,8 @@
 #include "QtxResourceMgr.h"
 #include <cstdio>
 
-#include <QApplication>
-#include <QPainter>
+#include <QtWidgets/QApplication>
+#include <QtGui/QPainter>
 #include <QMessageBox>
 #include <QDesktopWidget>
 

diff --git a/src/Qtx/QtxSplash.h b/src/Qtx/QtxSplash.h
index 4a33f2e2691de2958ddbb2d9c0b446d752d1db0d..8bcc2c208b262c9c3f31e0c9191220b32c9b9edc 100644 (file)
--- a/src/Qtx/QtxSplash.h
+++ b/src/Qtx/QtxSplash.h
@@ -29,8 +29,8 @@
 #include "Qtx.h"
 
 #include <QWidget>
-#include <QPixmap>
-#include <QGradient>
+#include <QtGui/QPixmap>
+#include <QtGui/QGradient>
 #include <QMap>
 
 #ifdef WIN32

diff --git a/src/Qtx/QtxToolBar.cxx b/src/Qtx/QtxToolBar.cxx
index 89e7c7e12211ef8685eb950d7e001299031f93f4..0e5d382b4adfe7ac098f0426908c05f824f3dfd5 100644 (file)
--- a/src/Qtx/QtxToolBar.cxx
+++ b/src/Qtx/QtxToolBar.cxx
@@ -27,7 +27,7 @@
 
 #include <QAction>
 #include <QMainWindow>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxToolBar::Watcher

diff --git a/src/Qtx/QtxToolButton.cxx b/src/Qtx/QtxToolButton.cxx
index 35565f83183109fed21612c9e96f543d6f3d732d..826a47001e50f74f00cbb7bcc471c3012f479318 100644 (file)
--- a/src/Qtx/QtxToolButton.cxx
+++ b/src/Qtx/QtxToolButton.cxx
@@ -20,8 +20,8 @@
 #include "QtxToolButton.h"
 #include "QtxMenu.h"
 
-#include <QKeyEvent>
-#include <QWheelEvent>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QWheelEvent>
 
 namespace
 {

diff --git a/src/Qtx/QtxToolTip.cxx b/src/Qtx/QtxToolTip.cxx
index a50bb3b282ac9a9b049a70aa9542d7975aea5e14..c45eec420ec12a33ae9cdd8aa2f1deda7685a383 100644 (file)
--- a/src/Qtx/QtxToolTip.cxx
+++ b/src/Qtx/QtxToolTip.cxx
@@ -25,13 +25,13 @@
 //
 #include "QtxToolTip.h"
 
-#include <QFont>
+#include <QtGui/QFont>
 #include <QTimer>
-#include <QCursor>
-#include <QFontMetrics>
-#include <QApplication>
-#include <QPalette>
-#include <QMouseEvent>
+#include <QtGui/QCursor>
+#include <QtGui/QFontMetrics>
+#include <QtWidgets/QApplication>
+#include <QtGui/QPalette>
+#include <QtGui/QMouseEvent>
 
 #define TOOLTIP_SHOW_DELAY 0500
 #define TOOLTIP_HIDE_DELAY 7000

diff --git a/src/Qtx/QtxTreeView.cxx b/src/Qtx/QtxTreeView.cxx
index 1147f43498b01277e51f1c24edb6927fe40425a4..5206cc00ec9fbb5fa16af34430cce73ac496a72d 100644 (file)
--- a/src/Qtx/QtxTreeView.cxx
+++ b/src/Qtx/QtxTreeView.cxx
@@ -24,7 +24,7 @@
 
 #include <QHeaderView>
 #include <QMenu>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 
 /*!
   \class QtxTreeView::Header

diff --git a/src/Qtx/QtxValidator.h b/src/Qtx/QtxValidator.h
index b93a6b59f696554225dd77facf9ae3314005cc1f..8904032b39b22600b565d3a3c06b4b6f23224eb1 100644 (file)
--- a/src/Qtx/QtxValidator.h
+++ b/src/Qtx/QtxValidator.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QValidator>
+#include <QtGui/QValidator>
 
 class QTX_EXPORT QtxIntValidator : public QIntValidator
 {

diff --git a/src/Qtx/QtxWebBrowser.cxx b/src/Qtx/QtxWebBrowser.cxx
index 5c1d70a1e48067b65642283f043381a330a3d8cf..14ef0fd3ef41a2fc05a45daa8a1ce09a88d5bd00 100644 (file)
--- a/src/Qtx/QtxWebBrowser.cxx
+++ b/src/Qtx/QtxWebBrowser.cxx
@@ -27,7 +27,7 @@
 #include "QtxResourceMgr.h"
 #include "QtxSearchTool.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QFileDialog>

diff --git a/src/Qtx/QtxWebBrowser.h b/src/Qtx/QtxWebBrowser.h
index bd3e695bf83e36b1b4773a6d533781fab0cc4b38..041609591970747688e3cbf0ccdbe0145919807c 100644 (file)
--- a/src/Qtx/QtxWebBrowser.h
+++ b/src/Qtx/QtxWebBrowser.h
@@ -30,7 +30,7 @@
 #include "Qtx.h"
 
 #include <QtGlobal>
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <QMainWindow>
 #include <QUrl>
 

diff --git a/src/Qtx/QtxWorkstack.cxx b/src/Qtx/QtxWorkstack.cxx
index 41eb47fc4acd7ea15fe3e835bb9b301899f97715..fde056f4c0412ab3481fa4c7b12ac2f0ffd3f4b2 100644 (file)
--- a/src/Qtx/QtxWorkstack.cxx
+++ b/src/Qtx/QtxWorkstack.cxx
@@ -31,12 +31,12 @@
 #include <QStyle>
 #include <QRegExp>
 #include <QLayout>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QDataStream>
-#include <QFocusEvent>
-#include <QMouseEvent>
+#include <QtGui/QFocusEvent>
+#include <QtGui/QMouseEvent>
 #include <QRubberBand>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QStyleOption>
 #include <QInputDialog>
 #include <QStackedWidget>

diff --git a/src/Qtx/QtxWorkstackAction.cxx b/src/Qtx/QtxWorkstackAction.cxx
index dadbd0788eaa10e63512e0138b47d3c5d771f0e5..91386254186cd06220540a04da5e06ce5ed41712 100644 (file)
--- a/src/Qtx/QtxWorkstackAction.cxx
+++ b/src/Qtx/QtxWorkstackAction.cxx
@@ -28,7 +28,7 @@
 #include "QtxWorkstack.h"
 
 #include <QMenu>
-#include <QWidgetList>
+#include <QtGui/QWidgetList>
 #include <QGroupBox>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
@@ -37,8 +37,8 @@
 #include <QListWidget>
 #include <QStackedLayout>
 #include <QToolButton>
-#include <QIcon>
-#include <QPixmap>
+#include <QtGui/QIcon>
+#include <QtGui/QPixmap>
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QLabel>

diff --git a/src/Qtx/QtxWorkstackAction.h b/src/Qtx/QtxWorkstackAction.h
index 03525db83d668417b5e942cf4a1b1aaf226fffb6..17103a1ad27cba9ee2e9fbe996ec0397a4f29cbb 100644 (file)
--- a/src/Qtx/QtxWorkstackAction.h
+++ b/src/Qtx/QtxWorkstackAction.h
@@ -27,7 +27,7 @@
 #define QTXWORKSTACKACTION_H
 
 #include "QtxActionSet.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QtxWorkstack;
 class QRadioButton;

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
index 2b4b64e0135fa2e08d5bb62ef9f48a480d26c330..9c41399cbe27c32b10f69869233c204aa83bbb71 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
@@ -28,7 +28,7 @@
 #include "PyInterp_Interp.h" // !!! WARNING !!! THIS INCLUDE MUST BE THE VERY FIRST !!!
 #include "LightApp_Module.h"
 
-#include <QIcon>
+#include <QtGui/QIcon>
 #include <QMap>
 #include <QStringList>
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
index a811775e13b3e85e4d2d1da8083e89b63b519592..039b7d2beb9283f643163517cb575b062cba966c 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
@@ -40,7 +40,7 @@
 #include "SUIT_ViewModel.h"
 #include "SUIT_ViewWindow.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QtXml/QDomDocument>
 #include <QtXml/QDomElement>
 #include <QtXml/QDomNode>

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.h
index 095b88507663be6449af8b10a299b03e90deacb6..cea72baf18da9fd45f332bae1124a43b8087c6db 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.h
@@ -28,7 +28,7 @@
 
 #include "PyInterp_Interp.h" // !!! WARNING !!! THIS INCLUDE MUST BE THE VERY FIRST !!!
 
-#include <QIcon>
+#include <QtGui/QIcon>
 #include <QList>
 #include <QMap>
 #include <QObject>

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
index 825bcc9c07da926dd1c5df7fece5fdf2cc16043c..2b6a58604c9f0baa413a6f9055359801cb7774f7 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
@@ -67,8 +67,8 @@
 #include "PyConsole_Console.h"
 
 #include <QAction>
-#include <QApplication>
-#include <QPaintEvent>
+#include <QtWidgets/QApplication>
+#include <QtGui/QPaintEvent>
 #include <QCoreApplication>
 #include <QVBoxLayout>
 

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
index 90b52419f69854e201c566e06d92f205ca56b1c5..187dd7bd7a9f19dcd585a7e92db6a3b1be7e02e6 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
@@ -30,7 +30,7 @@
 
 #include <QObject>
 #include <QString>
-#include <QColor>
+#include <QtGui/QColor>
 
 #include <LightApp_Application.h>
 #ifndef GUI_DISABLE_CORBA

diff --git a/src/SPlot2d/SPlot2d_ViewModel.cxx b/src/SPlot2d/SPlot2d_ViewModel.cxx
index 2a53ff69d0f7012d24e2bb9e09f592379fbfcdea..0a8074fd737c0c861f2dc8a9a50164e17d57ca2c 100644 (file)
--- a/src/SPlot2d/SPlot2d_ViewModel.cxx
+++ b/src/SPlot2d/SPlot2d_ViewModel.cxx
@@ -36,10 +36,10 @@
 
 #include "SALOME_ListIO.hxx"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QToolBar>
 #include <QToolButton>
-#include <QCursor>
+#include <QtGui/QCursor>
 #include <QColorDialog>
 
 //#include <qwt_math>

diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx
index 523d571dfdad6193166f14371a423d4954128a2b..58845aff9271b0cea2d600d4a347b9f0c3c288ae 100644 (file)
--- a/src/STD/STD_Application.cxx
+++ b/src/STD/STD_Application.cxx
@@ -41,7 +41,7 @@
 #include <QStatusBar>
 #include <QCloseEvent>
 #include <QFileDialog>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!Create and return new instance of STD_Application*/
 extern "C" STD_EXPORT SUIT_Application* createApplication()

diff --git a/src/SUIT/SUIT_Accel.cxx b/src/SUIT/SUIT_Accel.cxx
index a367df284f4890152f224da45485416ff0ddf0c6..fe64fb319dfe343b2a0c316c0b4712d50d859bf2 100644 (file)
--- a/src/SUIT/SUIT_Accel.cxx
+++ b/src/SUIT/SUIT_Accel.cxx
@@ -30,7 +30,7 @@
 
 #include <QCoreApplication>
 #include <QEvent>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 
 /*!
   \class SUIT_Accel

diff --git a/src/SUIT/SUIT_ActionOperation.h b/src/SUIT/SUIT_ActionOperation.h
index 0ccdf9df7f0bb9204499c655699d20736613a666..19f9e80c708726821e66f8861bd75e4afd65f961 100644 (file)
--- a/src/SUIT/SUIT_ActionOperation.h
+++ b/src/SUIT/SUIT_ActionOperation.h
@@ -25,7 +25,7 @@
 
 #include "SUIT_Operation.h"
 
-#include <QKeySequence>
+#include <QtGui/QKeySequence>
 
 class QIcon;
 class QString;

diff --git a/src/SUIT/SUIT_Application.cxx b/src/SUIT/SUIT_Application.cxx
index cdd063ff0512875bf4d7a9223a5a6d1761fc4e60..fd157553b2e81cfb0d54590c44caef888e83201d 100644 (file)
--- a/src/SUIT/SUIT_Application.cxx
+++ b/src/SUIT/SUIT_Application.cxx
@@ -31,7 +31,7 @@
 #include <QTimer>
 #include <QLabel>
 #include <QStatusBar>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QSize>
 
 #include <QtxAction.h>

diff --git a/src/SUIT/SUIT_DataObject.h b/src/SUIT/SUIT_DataObject.h
index 35e4239af8d9bbcfef9cf6289537edb7deab091a..09f6185f19965416ae19a6804e1b19d1b76a8ed7 100644 (file)
--- a/src/SUIT/SUIT_DataObject.h
+++ b/src/SUIT/SUIT_DataObject.h
@@ -33,8 +33,8 @@
 #include <QList>
 #include <QObject>
 #include <QString>
-#include <QPixmap>
-#include <QFont>
+#include <QtGui/QPixmap>
+#include <QtGui/QFont>
 
 class SUIT_DataObject;
 class SUIT_DataObjectKey;

diff --git a/src/SUIT/SUIT_Desktop.cxx b/src/SUIT/SUIT_Desktop.cxx
index 71d888c31c0b7eed1b736bbc70a5834aa8f2ea73..c34781c1b00dc5cd0b518b8ca6aabbdd1f176fc4 100644 (file)
--- a/src/SUIT/SUIT_Desktop.cxx
+++ b/src/SUIT/SUIT_Desktop.cxx
@@ -30,7 +30,7 @@
 
 #include <QPointer>
 #include <QCloseEvent>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!\class SUIT_Desktop
  * Provide desktop management:\n

diff --git a/src/SUIT/SUIT_ExceptionHandler.cxx b/src/SUIT/SUIT_ExceptionHandler.cxx
index 14a02e8760ffc8f58b278c53a6b077665e50030c..15a393746cf8c90ddccc8d52338f116abea25662 100644 (file)
--- a/src/SUIT/SUIT_ExceptionHandler.cxx
+++ b/src/SUIT/SUIT_ExceptionHandler.cxx
@@ -24,7 +24,7 @@
 
 #include "SUIT_MessageBox.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!\class SUIT_ExceptionHandler
  * Show exception message on error handler.

diff --git a/src/SUIT/SUIT_FileDlg.cxx b/src/SUIT/SUIT_FileDlg.cxx
index 3da672826a8cc8aaef504e4f8787ada8deca51dd..462ba0cdbfdccdc90b2f847a4797a804847cad42 100644 (file)
--- a/src/SUIT/SUIT_FileDlg.cxx
+++ b/src/SUIT/SUIT_FileDlg.cxx
@@ -89,7 +89,7 @@
 #include <QComboBox>
 #include <QPushButton>
 #include <QGridLayout>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QListView>
 #include <QLineEdit>
 #include <QUrl>

diff --git a/src/SUIT/SUIT_LicenseDlg.cxx b/src/SUIT/SUIT_LicenseDlg.cxx
index 2282389ddc02fa654356aadf0ccdd7d3c1b400aa..a674d38166438117cca846b60c7aaef9cf13afe4 100644 (file)
--- a/src/SUIT/SUIT_LicenseDlg.cxx
+++ b/src/SUIT/SUIT_LicenseDlg.cxx
@@ -19,7 +19,7 @@
 
 #include "SUIT_LicenseDlg.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QTextEdit>
 #include <QLayout> 
 #include <QPushButton>
@@ -27,8 +27,8 @@
 #include <QFile>
 #include <QtPrintSupport/QPrinter>
 //#include <QSimpleRichText>
-#include <QTextDocument>
-#include <QPainter>
+#include <QtGui/QTextDocument>
+#include <QtGui/QPainter>
 
 #include <math.h>
 

diff --git a/src/SUIT/SUIT_LicenseDlg.h b/src/SUIT/SUIT_LicenseDlg.h
index f4f005ac86ddcb831753e1331e86c73cd57ffd69..cb8dbb49bd595b1bac705febe4ce95d44766e233 100644 (file)
--- a/src/SUIT/SUIT_LicenseDlg.h
+++ b/src/SUIT/SUIT_LicenseDlg.h
@@ -22,7 +22,7 @@
 
 #include "SUIT.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 class QTextEdit;
 
 #ifdef WIN32

diff --git a/src/SUIT/SUIT_MessageBox.cxx b/src/SUIT/SUIT_MessageBox.cxx
index 7f07debc61466d2cfc1ae591aadadb67ccb99985..67225980f6ef67c3eb0570125fa4639104018d5e 100644 (file)
--- a/src/SUIT/SUIT_MessageBox.cxx
+++ b/src/SUIT/SUIT_MessageBox.cxx
@@ -26,7 +26,7 @@
 
 #include <QMessageBox>
 #include <QPushButton>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QString>
 
 #include <stdarg.h>

diff --git a/src/SUIT/SUIT_OverrideCursor.cxx b/src/SUIT/SUIT_OverrideCursor.cxx
index 6fadf15783d0920bbe1f017d248705067740dd2d..c70467004e81230c1fdfb1009cfce72a6f18bfdd 100644 (file)
--- a/src/SUIT/SUIT_OverrideCursor.cxx
+++ b/src/SUIT/SUIT_OverrideCursor.cxx
@@ -22,7 +22,7 @@
 
 #include "SUIT_OverrideCursor.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!Constructor. Initialize wait cursor.*/
 SUIT_OverrideCursor::SUIT_OverrideCursor()

diff --git a/src/SUIT/SUIT_OverrideCursor.h b/src/SUIT/SUIT_OverrideCursor.h
index b420b82ddedd0ddea843f4e88165b2cf0fa65e18..f19ca51881049ac8836029048d16f0bbdaeca5db 100644 (file)
--- a/src/SUIT/SUIT_OverrideCursor.h
+++ b/src/SUIT/SUIT_OverrideCursor.h
@@ -26,7 +26,7 @@
 #include "SUIT.h"
 
 #include <QList>
-#include <QCursor>
+#include <QtGui/QCursor>
 
 /*! \brief Class used for management cursors.*/
 class SUIT_EXPORT SUIT_OverrideCursor

diff --git a/src/SUIT/SUIT_ResourceMgr.cxx b/src/SUIT/SUIT_ResourceMgr.cxx
index 6da123a541d1d483d90376f4397e1dd596e9b4ed..256245f6960bff396a3cc92880e5a102fd290131 100644 (file)
--- a/src/SUIT/SUIT_ResourceMgr.cxx
+++ b/src/SUIT/SUIT_ResourceMgr.cxx
@@ -25,7 +25,7 @@
 
 #include <QDir>
 #include <QFileInfo>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QRegExp>
 
 #ifndef WIN32

diff --git a/src/SUIT/SUIT_Session.cxx b/src/SUIT/SUIT_Session.cxx
index 630d97387b9de2c12ab2c5c287799faecb41a79f..54cee5f9ed63d763371d27840c16eae2dec26208 100644 (file)
--- a/src/SUIT/SUIT_Session.cxx
+++ b/src/SUIT/SUIT_Session.cxx
@@ -28,7 +28,7 @@
 #include "SUIT_ExceptionHandler.h"
 #include "SUIT_ResourceMgr.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 #ifdef WIN32
 #include <windows.h>

diff --git a/src/SUIT/SUIT_ShortcutMgr.cxx b/src/SUIT/SUIT_ShortcutMgr.cxx
index e7ba1d1bfb04f7a46ac2d2e4ab00ab3c9f9692a3..b469bbdd205c47ca59f8779402578156597e8776 100644 (file)
--- a/src/SUIT/SUIT_ShortcutMgr.cxx
+++ b/src/SUIT/SUIT_ShortcutMgr.cxx
@@ -27,7 +27,7 @@
 
 #include <QtxAction.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QActionEvent>
 
 SUIT_ShortcutMgr* SUIT_ShortcutMgr::myShortcutMgr = NULL;

diff --git a/src/SUIT/SUIT_Tools.h b/src/SUIT/SUIT_Tools.h
index a2a54645a97aabf7d09842eee3ea0fe944e4067f..8357d0d668c1b08f69a8b3c5d16b85b226cc5001 100644 (file)
--- a/src/SUIT/SUIT_Tools.h
+++ b/src/SUIT/SUIT_Tools.h
@@ -29,7 +29,7 @@
 
 #include <QRect>
 #include <QString>
-#include <QFont>
+#include <QtGui/QFont>
 
 /*!
   \class SUIT_Tools

diff --git a/src/SUIT/SUIT_TreeModel.cxx b/src/SUIT/SUIT_TreeModel.cxx
index 8feae8ad9c52626ec22b390dfef5df30d1aff769..466bec8215b4272313787c0507ecfc144adb635d 100644 (file)
--- a/src/SUIT/SUIT_TreeModel.cxx
+++ b/src/SUIT/SUIT_TreeModel.cxx
@@ -26,7 +26,7 @@
 #include "SUIT_DataObject.h"
 #include "SUIT_ResourceMgr.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QHash>
 #include <QMimeData>
 

diff --git a/src/SUIT/SUIT_ViewManager.cxx b/src/SUIT/SUIT_ViewManager.cxx
index c730d92e37b317726d579d2c5488d4280df83079..5ad57f4137c6f37e188b1a0a5ae4b240863385d0 100644 (file)
--- a/src/SUIT/SUIT_ViewManager.cxx
+++ b/src/SUIT/SUIT_ViewManager.cxx
@@ -30,7 +30,7 @@
 
 #include <QMap>
 #include <QRegExp>
-#include <QIcon>
+#include <QtGui/QIcon>
 
 #ifdef WIN32
 #include <windows.h>

diff --git a/src/SUIT/SUIT_ViewManager.h b/src/SUIT/SUIT_ViewManager.h
index a77302cf2013e379b74615a7eccb7abf7687df06..45e72e8a74571c30db5f59e3ba841a92fd0358a0 100644 (file)
--- a/src/SUIT/SUIT_ViewManager.h
+++ b/src/SUIT/SUIT_ViewManager.h
@@ -28,7 +28,7 @@
 #include "SUIT_PopupClient.h"
 
 #include <QObject>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 #include <QVector>
 #include <QPointer>
 

diff --git a/src/SUIT/SUIT_ViewWindow.cxx b/src/SUIT/SUIT_ViewWindow.cxx
index 78b60849bd13ac7dc25a8ba68d9b0a4ce376b62c..bf4772ead16fe040693d474c97f94194c6d2d68b 100644 (file)
--- a/src/SUIT/SUIT_ViewWindow.cxx
+++ b/src/SUIT/SUIT_ViewWindow.cxx
@@ -37,9 +37,9 @@
 #include "QtxMultiAction.h"
 
 #include <QEvent>
-#include <QIcon>
+#include <QtGui/QIcon>
 #include <QMenu>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QContextMenuEvent>
 
 /*!\class SUIT_ViewWindow

diff --git a/src/SUITApp/SUITApp_Application.h b/src/SUITApp/SUITApp_Application.h
index c6d9b31c05f2ea61cd609cbd6b84e00bcc782d6c..8952eaaee4e4d22bd7a2ebbab2662f6933c2b579 100644 (file)
--- a/src/SUITApp/SUITApp_Application.h
+++ b/src/SUITApp/SUITApp_Application.h
@@ -23,7 +23,7 @@
 #ifndef SUITAPP_APPLICATION_H
 #define SUITAPP_APPLICATION_H
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 class SUIT_ExceptionHandler;
 

diff --git a/src/SVTK/SVTK_InteractorStyle.cxx b/src/SVTK/SVTK_InteractorStyle.cxx
index 1a90f7239a7d0d91a6c5bf21a3be38009c199f54..65f946ffd37915066599e9fad291c73479085e6f 100644 (file)
--- a/src/SVTK/SVTK_InteractorStyle.cxx
+++ b/src/SVTK/SVTK_InteractorStyle.cxx
@@ -59,7 +59,7 @@
 
 #include <QtxRubberBand.h>
 
-#include <QPixmap>
+#include <QtGui/QPixmap>
 #include <QWidget>
 #include <QPolygon>
 

diff --git a/src/SVTK/SVTK_InteractorStyle.h b/src/SVTK/SVTK_InteractorStyle.h
index ae757ad084850fb7dbd0ed5694a9c518d0c05342..354f6731d346d40e085a35da4c172702f3c77832 100644 (file)
--- a/src/SVTK/SVTK_InteractorStyle.h
+++ b/src/SVTK/SVTK_InteractorStyle.h
@@ -36,7 +36,7 @@
 #include <vtkInteractorStyle.h>
 #include <vtkSmartPointer.h>
 
-#include <QCursor>
+#include <QtGui/QCursor>
 #include <QtxRubberBand.h>
 
 #include <map>

diff --git a/src/SVTK/SVTK_PsOptionsDlg.h b/src/SVTK/SVTK_PsOptionsDlg.h
index 39aee11aec22a592ce817044042aef86c68c8613..0573c9c194317ef53ccab394d415378fdce9a130 100644 (file)
--- a/src/SVTK/SVTK_PsOptionsDlg.h
+++ b/src/SVTK/SVTK_PsOptionsDlg.h
@@ -20,7 +20,7 @@
 #ifndef SVTK_PSOPTIONSDLG_H
 #define SVTK_PSOPTIONSDLG_H
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QtxDoubleSpinBox;
 class QCheckBox;

diff --git a/src/SVTK/SVTK_Recorder.cxx b/src/SVTK/SVTK_Recorder.cxx
index 0326124d0b8b39186037bde7e8178fd4aa55269d..77a08d2cb612a5a400b260a734007b4cd0741d37 100644 (file)
--- a/src/SVTK/SVTK_Recorder.cxx
+++ b/src/SVTK/SVTK_Recorder.cxx
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #endif
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QFileInfo>
 #include <QDir>
 

diff --git a/src/SVTK/SVTK_RecorderDlg.cxx b/src/SVTK/SVTK_RecorderDlg.cxx
index b8816ad77eda3ad372a422055bdc8670677f70aa..af32c7f67f7f37398131eb055f6cf256a216ca69 100644 (file)
--- a/src/SVTK/SVTK_RecorderDlg.cxx
+++ b/src/SVTK/SVTK_RecorderDlg.cxx
@@ -33,7 +33,7 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QGroupBox>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QLabel>
 #include <QLayout>
 #include <QLineEdit>

diff --git a/src/SVTK/SVTK_RecorderDlg.h b/src/SVTK/SVTK_RecorderDlg.h
index d0bb078addfdb2b9830e3a2dbcdad931620a90e9..d03028da5265fcabd9c13dd788824e203e46ef6e 100644 (file)
--- a/src/SVTK/SVTK_RecorderDlg.h
+++ b/src/SVTK/SVTK_RecorderDlg.h
@@ -20,7 +20,7 @@
 #ifndef SVTK_RECORDERDLG_H
 #define SVTK_RECORDERDLG_H
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QCheckBox;
 class QComboBox;

diff --git a/src/SVTK/SVTK_RenderWindowInteractor.cxx b/src/SVTK/SVTK_RenderWindowInteractor.cxx
index e7026ded2bf4f82d43ef989f1ced4e60efa095f5..617975fedd28e5cdc8386b5ef5e8d738d459e9a9 100644 (file)
--- a/src/SVTK/SVTK_RenderWindowInteractor.cxx
+++ b/src/SVTK/SVTK_RenderWindowInteractor.cxx
@@ -38,7 +38,7 @@
 #include <xcb/xcb.h>
 #include <QX11Info>
 #endif
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 
 #include "SVTK_SpaceMouse.h" 
 #include "SVTK_Event.h" 

diff --git a/src/SVTK/SVTK_SetRotationPointDlg.cxx b/src/SVTK/SVTK_SetRotationPointDlg.cxx
index b53ff0e3ba68b0942cb4c423effc2c8a14093974..f2d1fb95a1b7c162709bd962a89359730bfbade0 100644 (file)
--- a/src/SVTK/SVTK_SetRotationPointDlg.cxx
+++ b/src/SVTK/SVTK_SetRotationPointDlg.cxx
@@ -40,7 +40,7 @@
 #include <QPushButton>
 #include <QMenu>
 #include <QGridLayout>
-#include <QDoubleValidator>
+#include <QtGui/QDoubleValidator>
 #include <QCheckBox>
 
 #include <vtkCallbackCommand.h>

diff --git a/src/SVTK/SVTK_ViewModel.h b/src/SVTK/SVTK_ViewModel.h
index 3b6e56dbb4acf3581502352fb37b77e36f80401a..98387e5fafc1933dabd8179383e45bf23ed9bd59 100644 (file)
--- a/src/SVTK/SVTK_ViewModel.h
+++ b/src/SVTK/SVTK_ViewModel.h
@@ -33,7 +33,7 @@
 #include <SALOME_InteractiveObject.hxx>
 #include <SALOME_ListIO.hxx>
 
-#include <QColor>
+#include <QtGui/QColor>
 #include <QMap>
 
 class QMouseEvent;

diff --git a/src/SVTK/SVTK_ViewParameterDlg.cxx b/src/SVTK/SVTK_ViewParameterDlg.cxx
index a555c47944d85e9e9bad4f98b498cc0a91a909c0..538c0647d4897aa534dc71b169663c3956764d9e 100644 (file)
--- a/src/SVTK/SVTK_ViewParameterDlg.cxx
+++ b/src/SVTK/SVTK_ViewParameterDlg.cxx
@@ -36,7 +36,7 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QGridLayout>
-#include <QDoubleValidator>
+#include <QtGui/QDoubleValidator>
 #include <QCheckBox>
 #include <QRadioButton>
 #include <QButtonGroup>

diff --git a/src/SVTK/SVTK_ViewWindow.h b/src/SVTK/SVTK_ViewWindow.h
index db129ddf2fc756c6d6870be996fde42e0d021278..cc9ef4cf2ea03d3a9588329611fced2907aaf095 100644 (file)
--- a/src/SVTK/SVTK_ViewWindow.h
+++ b/src/SVTK/SVTK_ViewWindow.h
@@ -35,7 +35,7 @@
 #include "SALOME_InteractiveObject.hxx"
 #include "SALOME_ListIO.hxx"
 
-#include <QImage>
+#include <QtGui/QImage>
 #include <vtkSmartPointer.h>
 
 class SUIT_Desktop;

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index db4f1244717718a548c6714ec6da21fd24f1068b..7df168366c5631c11134010136008db464ae0c5a 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -84,7 +84,7 @@
 #include <Utils_SINGLETON.hxx>
 #include <SALOME_LifeCycleCORBA.hxx>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QWidget>
 #include <QAction>
 #include <QRegExp>

diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
index 5e0c82bf42e1cbc10d66124a68889afb4e8880a2..a5dc983546c6adf9ae89d1f9e9195aed01a556ca 100644 (file)
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
@@ -34,7 +34,7 @@
 #include "SALOMEDSClient_ClientFactory.hxx" 
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QLineEdit>
 #include <QToolTip>
 #include <QRegExp>

diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.h b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
index c7d7819f3d6c1bea35c6dec00480470f3d9e6cc6..0edcb884aefe885636ff9428877557c66b095395 100644 (file)
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.h
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
@@ -27,7 +27,7 @@
 
 #include <QtxDoubleSpinBox.h>
 
-#include <QValidator>
+#include <QtGui/QValidator>
 
 class SALOMEAPP_EXPORT SalomeApp_DoubleSpinBox : public QtxDoubleSpinBox
 {

diff --git a/src/SalomeApp/SalomeApp_Engine_i.cxx b/src/SalomeApp/SalomeApp_Engine_i.cxx
index ffa1429359a3fe81e7fd29a147fbfd89cad7aa1b..861d912ea3ac239aaa7873b576e9742a596688ff 100644 (file)
--- a/src/SalomeApp/SalomeApp_Engine_i.cxx
+++ b/src/SalomeApp/SalomeApp_Engine_i.cxx
@@ -38,7 +38,7 @@
 #include <Utils_SALOME_Exception.hxx>
 #include <utilities.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDir>
 #include <QFile>
 

diff --git a/src/SalomeApp/SalomeApp_ExitDlg.h b/src/SalomeApp/SalomeApp_ExitDlg.h
index ed513466979b1c860ad24e6ccb43481e11fc0b3c..ddc1b1e0effd75e7c010ea8b94f4386b211b4e55 100644 (file)
--- a/src/SalomeApp/SalomeApp_ExitDlg.h
+++ b/src/SalomeApp/SalomeApp_ExitDlg.h
@@ -23,7 +23,7 @@
 #ifndef SALOMEAPP_EXITDLG_H
 #define SALOMEAPP_EXITDLG_H
 
-#include <QDialog> 
+#include <QtWidgets/QDialog> 
 
 class QCheckBox;
 

diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.cxx b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
index 0a93a06a10b9a956d88137cb52b63cc4b340b2d1..da6657d03c31983deb482339ebd43068f0f8d5ae 100644 (file)
--- a/src/SalomeApp/SalomeApp_IntSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
@@ -34,7 +34,7 @@
 #include "SALOMEDSClient_ClientFactory.hxx" 
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QLineEdit>
 #include <QToolTip>
 #include <QRegExp>

diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.h b/src/SalomeApp/SalomeApp_IntSpinBox.h
index 1921247062574f5ac47281e54b0bc4430c61fc1e..aff04f2ab525b572500ea62f771c7cfa4e5c34c1 100644 (file)
--- a/src/SalomeApp/SalomeApp_IntSpinBox.h
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.h
@@ -27,7 +27,7 @@
 
 #include <QtxIntSpinBox.h>
 
-#include <QValidator>
+#include <QtGui/QValidator>
 
 class SALOMEAPP_EXPORT SalomeApp_IntSpinBox : public QtxIntSpinBox
 {

diff --git a/src/SalomeApp/SalomeApp_ListView.cxx b/src/SalomeApp/SalomeApp_ListView.cxx
index 62b52d73aaaf1b27272f22146d7ed7cad984362a..f65d11c2d89e21c0fb2dc3b2923f1c7f311da9f1 100644 (file)
--- a/src/SalomeApp/SalomeApp_ListView.cxx
+++ b/src/SalomeApp/SalomeApp_ListView.cxx
@@ -31,11 +31,11 @@
 
 #include "utilities.h"
 
-#include <QValidator>
+#include <QtGui/QValidator>
 #include <QToolButton>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 #include <QHeaderView>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 
 #include <TColStd_ListOfInteger.hxx>
 #include <TColStd_ListOfReal.hxx>

diff --git a/src/SalomeApp/SalomeApp_LoadStudiesDlg.h b/src/SalomeApp/SalomeApp_LoadStudiesDlg.h
index aa1f2f0b483e7f82661a8e5154795cdf2a682c09..b84b97d70edb6c0fdb5d4fc3e907734f1a17c71f 100644 (file)
--- a/src/SalomeApp/SalomeApp_LoadStudiesDlg.h
+++ b/src/SalomeApp/SalomeApp_LoadStudiesDlg.h
@@ -22,7 +22,7 @@
 
 #include "SalomeApp.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QListWidget;
 class QPushButton;

diff --git a/src/SalomeApp/SalomeApp_NoteBook.cxx b/src/SalomeApp/SalomeApp_NoteBook.cxx
index b848e16cd69ccb8b2b0cfd6bb76eb008f9dcaf3a..f55f5f2c99317f95b6d74a8fe9a1542a1a038081 100644 (file)
--- a/src/SalomeApp/SalomeApp_NoteBook.cxx
+++ b/src/SalomeApp/SalomeApp_NoteBook.cxx
@@ -43,10 +43,10 @@
 #include <QTableWidget>
 #include <QTableWidgetItem>
 #include <QPushButton>
-#include <QFont>
+#include <QtGui/QFont>
 #include <QGroupBox>
 #include <QList>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDir>
 
 #include <string>

diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
index 9997bfb6751a539a3aae5a423352cdda2129640e..1e64bacb9ad98a61ef3fb3cf7a8c93b883090e29 100644 (file)
--- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
+++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
@@ -29,7 +29,7 @@
 
 #include "SalomeApp.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)

diff --git a/src/SalomeApp/SalomeApp_VisualState.cxx b/src/SalomeApp/SalomeApp_VisualState.cxx
index 37d5c2bfc0908aebf947e7c07af4026a4a1f8bae..a6db48879a0cc3f07fed176e649f35040d139b0d 100644 (file)
--- a/src/SalomeApp/SalomeApp_VisualState.cxx
+++ b/src/SalomeApp/SalomeApp_VisualState.cxx
@@ -35,7 +35,7 @@
 #include <STD_TabDesktop.h>
 
 #include <QList>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QMultiHash>
 
 #include <SALOMEDSClient_ClientFactory.hxx>//?

diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index a73426a5de0e7b56503cb160bf4b442671f6e4a4..e6cb5d2d3ad25ec8638e0c4a508462a4f1c03c54 100644 (file)
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -65,7 +65,7 @@
 #endif
 #include <time.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDir>
 #include <QFile>
 #include <QMutex>

diff --git a/src/Session/Session_ServerCheck.cxx b/src/Session/Session_ServerCheck.cxx
index 5024589183b3789c3637083d07da6c4fd06f20be..4ebd1d4eff41a7da6c5dc5d42aef15bdc951b548 100644 (file)
--- a/src/Session/Session_ServerCheck.cxx
+++ b/src/Session/Session_ServerCheck.cxx
@@ -39,7 +39,7 @@
 #include "utilities.h"
 #include "Qtx.h"
 
-#include <QApplication> 
+#include <QtWidgets/QApplication> 
 #include <QWaitCondition>
 #include <QMutexLocker>
 #include <QStringList>

diff --git a/src/Style/Style_Model.cxx b/src/Style/Style_Model.cxx
index 19a6da330a61631c5346cbc0d40f4e0046db4963..c43bd028389003c36489e908efbb483537cc4131 100644 (file)
--- a/src/Style/Style_Model.cxx
+++ b/src/Style/Style_Model.cxx
@@ -25,10 +25,10 @@
 
 #include <QtxResourceMgr.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QColor>
-#include <QFont>
-#include <QPalette>
+#include <QtGui/QFont>
+#include <QtGui/QPalette>
 
 /*!
   \brief Mix two colors to get color with averaged red, green, blue and alpha-channel values

diff --git a/src/Style/Style_Model.h b/src/Style/Style_Model.h
index b05b3f6cd186777b253da0acd9efbcabdc02e65c..034c57f5913813ba3205e62718b62c624947b9a9 100644 (file)
--- a/src/Style/Style_Model.h
+++ b/src/Style/Style_Model.h
@@ -27,8 +27,8 @@
 
 #include <QMap>
 #include <QString>
-#include <QPalette>
-#include <QFont>
+#include <QtGui/QPalette>
+#include <QtGui/QFont>
 
 class QStyle;
 class QtxResourceMgr;

diff --git a/src/Style/Style_PrefDlg.cxx b/src/Style/Style_PrefDlg.cxx
index f95977daf711a937f64b2fc0cfec731d3ede70df..b8bb76e4b19a2fd0307ef6f4fd836e21f2436556 100644 (file)
--- a/src/Style/Style_PrefDlg.cxx
+++ b/src/Style/Style_PrefDlg.cxx
@@ -29,7 +29,7 @@
 #include <QtxDoubleSpinBox.h>
 #include <QtxFontEdit.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QColorDialog>
@@ -37,7 +37,7 @@
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QLabel>
 #include <QListWidget>
 #include <QMap>

diff --git a/src/Style/Style_Salome.cxx b/src/Style/Style_Salome.cxx
index 2e3012529f1efd5409722c8e4d89f48507190b11..163893d0cc228049fc54525a539da2c95d62bb46 100644 (file)
--- a/src/Style/Style_Salome.cxx
+++ b/src/Style/Style_Salome.cxx
@@ -24,8 +24,8 @@
 #include "Style_Tools.h"
 #include "Style_Model.h"
 
-#include <QApplication>
-#include <QPainter>
+#include <QtWidgets/QApplication>
+#include <QtGui/QPainter>
 #include <QMap>
 #include <QPainterPath>
 #include <QWidget>

diff --git a/src/Style/Style_Salome.h b/src/Style/Style_Salome.h
index 066d01ca9201c2d85cb9a2e072ad6526e14dba9d..a14d9d31098c851da2c9f3bf847d253c6058814c 100644 (file)
--- a/src/Style/Style_Salome.h
+++ b/src/Style/Style_Salome.h
@@ -25,7 +25,7 @@
 
 #include <QtGlobal>
 #include "Style.h"
-#include <QCommonStyle>
+#include <QtWidgets/QCommonStyle>
 #define BaseStyle QCommonStyle
 
 class Style_Model;

diff --git a/src/Style/Style_Tools.cxx b/src/Style/Style_Tools.cxx
index 8c0fb4720633071570ce9424fb3bc5da9a710d7c..056425a8ea7be84467e5c9e4f9dca65a64ab8e3d 100644 (file)
--- a/src/Style/Style_Tools.cxx
+++ b/src/Style/Style_Tools.cxx
@@ -22,7 +22,7 @@
 //
 #include "Style_Tools.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QPainterPath>
 #include <QRect>
 #include <QColor>

diff --git a/src/Style/Style_Tools.h b/src/Style/Style_Tools.h
index 1b49891e5ce3549a18e44dce57ebec1e27c8ac12..16bdbb8d5ac6763039d4d9c400f0805ee6007628 100644 (file)
--- a/src/Style/Style_Tools.h
+++ b/src/Style/Style_Tools.h
@@ -25,9 +25,9 @@
 
 #include "Style.h"
 
-#include <QPainterPath>
+#include <QtGui/QPainterPath>
 #include <QRect>
-#include <QColor>
+#include <QtGui/QColor>
 #include <QStyle>
 
 //

diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h
index 7c43397e3391bbed5873480976ddd8037454bff3..7b5163bfcb7a4e3c5217d1e51ffa3927a3a94b66 100644 (file)
--- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h
+++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h
@@ -29,7 +29,7 @@
 
 #include "ToolsGUI.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QLineEdit;
 class QPushButton;

diff --git a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
index af90eb6311329f7044190a56cdfd696c937f48c5..c1cea7c5bfe05aa0927d950bc7748511d9bf5c08 100644 (file)
--- a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
+++ b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
@@ -22,7 +22,7 @@
 
 # include "ToolsGUI_RegWidget.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QInputDialog>
 #include <QMenuBar>
 #include <QStatusBar>

diff --git a/src/TreeData/Test/guitester.cxx b/src/TreeData/Test/guitester.cxx
index ac85a51946663c96b3bfb84bfefbe958369f6f54..bbabf18f786e4c9edcf29986816660a7ff97b5e9 100644 (file)
--- a/src/TreeData/Test/guitester.cxx
+++ b/src/TreeData/Test/guitester.cxx
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QMainWindow>
 #include <QDockWidget>
 #include <QTreeView>

diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.cxx b/src/VTKViewer/VTKViewer_InteractorStyle.cxx
index c2b429db13cb3f772cbffb11586d93ebb94a4de8..d6e4b916b8307f7f7de7eb6bed1c7227a15e1cd3 100644 (file)
--- a/src/VTKViewer/VTKViewer_InteractorStyle.cxx
+++ b/src/VTKViewer/VTKViewer_InteractorStyle.cxx
@@ -47,7 +47,7 @@
 #include <vtkSmartPointer.h>
 #include <vtkProperty.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QRubberBand>
 
 #include <algorithm>

diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.h b/src/VTKViewer/VTKViewer_InteractorStyle.h
index d061e327e7ba51255ba02b4e67ba4d86c78b135e..fa5e1f2480f3ba6a06e24786315d283c6d5b0ae5 100644 (file)
--- a/src/VTKViewer/VTKViewer_InteractorStyle.h
+++ b/src/VTKViewer/VTKViewer_InteractorStyle.h
@@ -35,7 +35,7 @@ class vtkRenderWindowInteractor;
 class vtkTDxInteractorStyle;
 
 #include <QObject>
-#include <QCursor>
+#include <QtGui/QCursor>
 
 class QRubberBand;
 

diff --git a/src/VTKViewer/VTKViewer_MarkerDlg.cxx b/src/VTKViewer/VTKViewer_MarkerDlg.cxx
index cec04d818ed9e0301e13624ca7aa14299c1c58a0..281c5560ea52bd2dcb76e8b8a308bfdb39db9da6 100644 (file)
--- a/src/VTKViewer/VTKViewer_MarkerDlg.cxx
+++ b/src/VTKViewer/VTKViewer_MarkerDlg.cxx
@@ -29,7 +29,7 @@
 
 #include <QFrame>
 #include <QVBoxLayout>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 
 /*!
   \class VTKViewer_MarkerDlg

diff --git a/src/VTKViewer/VTKViewer_MarkerUtils.cxx b/src/VTKViewer/VTKViewer_MarkerUtils.cxx
index baf4c111689981c9686c019872b1835aa8b6d5b2..6b8ffe4b0fcd53e9a34a4e01e4b802320e96836d 100644 (file)
--- a/src/VTKViewer/VTKViewer_MarkerUtils.cxx
+++ b/src/VTKViewer/VTKViewer_MarkerUtils.cxx
@@ -24,7 +24,7 @@
 
 // QT Includes
 #include <QFile>
-#include <QImage>
+#include <QtGui/QImage>
 #include <QString>
 #include <QTextStream>
 

diff --git a/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx b/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
index 841bd409dd8f49e27b6ba3c7f529fefe9c5888a5..a8f036b3c2845be3bb17ef51e18b7d6189fca4ce 100644 (file)
--- a/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
+++ b/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
@@ -50,8 +50,8 @@
 
 // QT Includes
 #include <QTimer>
-#include <QMouseEvent>
-#include <QKeyEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
 #include <QContextMenuEvent>
 
 /*! Create new instance of VTKViewer_RenderWindowInteractor*/

diff --git a/src/VTKViewer/VTKViewer_ViewModel.cxx b/src/VTKViewer/VTKViewer_ViewModel.cxx
index f4625b1226148ecfc613aac5945483ed82e57743..e0d47ff0ff08269357d100e6e025b2f45abb6add 100644 (file)
--- a/src/VTKViewer/VTKViewer_ViewModel.cxx
+++ b/src/VTKViewer/VTKViewer_ViewModel.cxx
@@ -32,7 +32,7 @@
 
 #include <QColorDialog>
 #include <QMenu>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QToolBar>
 
 // VSR: Uncomment below line to allow texture background support in VTK viewer

diff --git a/src/VTKViewer/VTKViewer_ViewModel.h b/src/VTKViewer/VTKViewer_ViewModel.h
index 92aae9057be1b9d182aa1c42fee3f8942991c50d..3bae459764f21aba217b81a2ad1738a8288d4563 100644 (file)
--- a/src/VTKViewer/VTKViewer_ViewModel.h
+++ b/src/VTKViewer/VTKViewer_ViewModel.h
@@ -27,7 +27,7 @@
 #include "Qtx.h"
 #include "SUIT_ViewModel.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 
 class QMouseEvent;
 

diff --git a/src/VTKViewer/VTKViewer_ViewWindow.cxx b/src/VTKViewer/VTKViewer_ViewWindow.cxx
index 1bd3fd5aa4807f73fa306e2ac27667100b6f5c8f..affd6c6d3a89d43016f39b6fe480e66bfb28b4a1 100644 (file)
--- a/src/VTKViewer/VTKViewer_ViewWindow.cxx
+++ b/src/VTKViewer/VTKViewer_ViewWindow.cxx
@@ -37,7 +37,7 @@
 #include <SUIT_ResourceMgr.h>
 
 #include <QFileInfo>
-#include <QImage>
+#include <QtGui/QImage>
 
 #include <vtkCamera.h>
 #include <vtkJPEGReader.h>

diff --git a/src/ViewerTools/ViewerTools_DialogBase.h b/src/ViewerTools/ViewerTools_DialogBase.h
index 635c47c5812ee7a0c9df6c55991caf6eeab241a8..bd5dd0a2e84bf1f6f0ce8f3408758e4f1e3a779d 100644 (file)
--- a/src/ViewerTools/ViewerTools_DialogBase.h
+++ b/src/ViewerTools/ViewerTools_DialogBase.h
@@ -25,7 +25,7 @@
 
 #include "ViewerTools.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QtxAction;
 

diff --git a/tools/CurvePlot/src/cpp/test/test_curveplot.cxx b/tools/CurvePlot/src/cpp/test/test_curveplot.cxx
index 26b2d2ee8a6ba8b0dac77bbef4daf5b2d73b8eaf..1ae7fc369a8c6a029aef16c027b0382207b056c0 100644 (file)
--- a/tools/CurvePlot/src/cpp/test/test_curveplot.cxx
+++ b/tools/CurvePlot/src/cpp/test/test_curveplot.cxx
@@ -29,7 +29,7 @@
 
 #include <PyInterp_Interp.h>  // GUI
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDesktopWidget>
 #include <QMainWindow>
 #include <QList>

diff --git a/tools/PyConsole/src/PyConsole_Console.cxx b/tools/PyConsole/src/PyConsole_Console.cxx
index 3e2057c868b01013e95aa258549fe59e0c80c9b1..78b1b952e503a5dc94daa6672477e703e8c86146 100644 (file)
--- a/tools/PyConsole/src/PyConsole_Console.cxx
+++ b/tools/PyConsole/src/PyConsole_Console.cxx
@@ -27,7 +27,7 @@
 #include "PyConsole_Editor.h"
 
 #include <QAction>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QClipboard>
 #include <QContextMenuEvent>
 #include <QMenu>

diff --git a/tools/PyConsole/src/PyConsole_Editor.cxx b/tools/PyConsole/src/PyConsole_Editor.cxx
index 11b940e166dec1a7b39a6d84185f0e6f6eaa3964..585ab5aeb8a91f4e9372cd72d5da190580a04b47 100644 (file)
--- a/tools/PyConsole/src/PyConsole_Editor.cxx
+++ b/tools/PyConsole/src/PyConsole_Editor.cxx
@@ -94,13 +94,13 @@
 #include "PyInterp_Dispatcher.h"
 #include "PyConsole_Request.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QClipboard>
 #include <QDropEvent>
 #include <QEvent>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QMimeData>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QScrollBar>
 #include <QTextBlock>
 #include <QTextCursor>

diff --git a/tools/PyEditor/src/PyEditor.cxx b/tools/PyEditor/src/PyEditor.cxx
index a9ec8dc8c72003cf815537a501b593905d117fcf..39bbb2f3a0278bcd47e8c94e6e9f2bf4b3d413c3 100644 (file)
--- a/tools/PyEditor/src/PyEditor.cxx
+++ b/tools/PyEditor/src/PyEditor.cxx
@@ -24,7 +24,7 @@
 #include "PyEditor_Window.h"
 #include "PyEditor_StdSettings.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QCommandLineParser>
 #include <QDir>
 #include <QLibraryInfo>

diff --git a/tools/PyEditor/src/PyEditor_Completer.cxx b/tools/PyEditor/src/PyEditor_Completer.cxx
index 7850dc187b0521d89d211be9de28f7ee84783cc5..27a688ec2439b5efa7b498490b3b7d5346183e74 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Completer.cxx
+++ b/tools/PyEditor/src/PyEditor_Completer.cxx
@@ -29,9 +29,9 @@
 #include <QTimer>
 #include <QTextBlock>
 #include <QTextCursor>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QAbstractItemView>
-#include <QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 
 /*!
   \brief Constructor.

diff --git a/tools/PyEditor/src/PyEditor_Editor.cxx b/tools/PyEditor/src/PyEditor_Editor.cxx
index 0c8c29e1dd7aff57d0a402910d0f686fd79ae657..de11e4cacf2f73e8485d8e4fa3ebcb403b70aa26 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Editor.cxx
+++ b/tools/PyEditor/src/PyEditor_Editor.cxx
@@ -28,7 +28,7 @@
 #include "PyEditor_Keywords.h"
 
 #include <QMenu>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QTextBlock>
 #include <QScrollBar>
 

diff --git a/tools/PyEditor/src/PyEditor_FindTool.cxx b/tools/PyEditor/src/PyEditor_FindTool.cxx
index fc63863253eb638b67624fc295c665395a1da5c1..7555e6368668eed3a34fc9e36febdd7dbedc68ca 100644 (file)
--- a/tools/PyEditor/src/PyEditor_FindTool.cxx
+++ b/tools/PyEditor/src/PyEditor_FindTool.cxx
@@ -27,7 +27,7 @@
 #include <QCompleter>
 #include <QEvent>
 #include <QGridLayout>
-#include <QIcon>
+#include <QtGui/QIcon>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMenu>

diff --git a/tools/PyEditor/src/PyEditor_FindTool.h b/tools/PyEditor/src/PyEditor_FindTool.h
index 7eda9c3c20740dbc78c6be7432b59e0bb122a19d..e1a3b84a4edd5d7cdd11aee601a87c8dcfa7e7b1 100644 (file)
--- a/tools/PyEditor/src/PyEditor_FindTool.h
+++ b/tools/PyEditor/src/PyEditor_FindTool.h
@@ -25,7 +25,7 @@
 
 #include "PyEditor.h"
 
-#include <QTextDocument>
+#include <QtGui/QTextDocument>
 #include <QStringListModel>
 #include <QWidget>
 

diff --git a/tools/PyEditor/src/PyEditor_Keywords.h b/tools/PyEditor/src/PyEditor_Keywords.h
index d8ad39500b2a282783768b1dd843b99709f29e5a..eb6166378704715b5f142df00c2cdf346ce87d58 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Keywords.h
+++ b/tools/PyEditor/src/PyEditor_Keywords.h
@@ -24,7 +24,7 @@
 #define PYEDITOR_KEYWORDS_H
 
 #include <QObject>
-#include <QColor>
+#include <QtGui/QColor>
 #include <QList>
 #include <QMap>
 

diff --git a/tools/PyEditor/src/PyEditor_Settings.h b/tools/PyEditor/src/PyEditor_Settings.h
index acde1c099d2bca3f5fc38aa5dc0fdf8c581c2f96..c60a3b7cabe3de21a5f587c7de722f12eb358588 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Settings.h
+++ b/tools/PyEditor/src/PyEditor_Settings.h
@@ -25,7 +25,7 @@
 
 #include "PyEditor.h"
 
-#include <QFont>
+#include <QtGui/QFont>
 
 class PYEDITOR_EXPORT PyEditor_Settings
 {

diff --git a/tools/PyEditor/src/PyEditor_SettingsDlg.h b/tools/PyEditor/src/PyEditor_SettingsDlg.h
index bb6e0291f8728e7d6dba572b256baa45cf4f35ac..ef2b4a5b40e3b6f375629e58db29bfed86be333b 100644 (file)
--- a/tools/PyEditor/src/PyEditor_SettingsDlg.h
+++ b/tools/PyEditor/src/PyEditor_SettingsDlg.h
@@ -23,7 +23,7 @@
 #ifndef PYEDITOR_SETTINGSDLG_H
 #define PYEDITOR_SETTINGSDLG_H
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include "PyEditor.h"
 
 class PyEditor_Editor;

diff --git a/tools/PyEditor/src/PyEditor_Window.cxx b/tools/PyEditor/src/PyEditor_Window.cxx
index 2df1d0c756cc1373d821e9009ac734db66ed2aa5..552749a2f41d3538d93efb1bc93bca452b96cd9f 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Window.cxx
+++ b/tools/PyEditor/src/PyEditor_Window.cxx
@@ -26,7 +26,7 @@
 #include "PyEditor_SettingsDlg.h"
 
 #include <QAction>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QCloseEvent>
 #include <QFileDialog>
 #include <QMenuBar>

diff --git a/tools/dlgfactory/GenericDialog.h b/tools/dlgfactory/GenericDialog.h
index 2821fd88a479840b3055f0e43773b2737cd53adf..53c6c71bbf548393428b61acda7b710a6ebf28ec 100644 (file)
--- a/tools/dlgfactory/GenericDialog.h
+++ b/tools/dlgfactory/GenericDialog.h
@@ -20,7 +20,7 @@
 #ifndef _GenericDialog_HXX
 #define _GenericDialog_HXX
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 #include "ui_GenericDialog.h"
 

diff --git a/tools/dlgfactory/__QDIALOG__.h b/tools/dlgfactory/__QDIALOG__.h
index 37ca4437523a083170f38e6b1827a05c68d46bb3..1d2db1fc8055ac27300a3ff468827d31ea7860d8 100644 (file)
--- a/tools/dlgfactory/__QDIALOG__.h
+++ b/tools/dlgfactory/__QDIALOG__.h
@@ -1,7 +1,7 @@
 #ifndef ___CLASSNAME___HXX
 #define ___CLASSNAME___HXX
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 #include "ui___CLASSNAME__.h"
 

diff --git a/tools/dlgfactory/gtester.cxx b/tools/dlgfactory/gtester.cxx
index ce278494cdc033fbbd80073fbd35570f793c9dff..cd6c9b08db1d2927b032fb58bc22211afbd985ab 100644 (file)
--- a/tools/dlgfactory/gtester.cxx
+++ b/tools/dlgfactory/gtester.cxx
@@ -22,7 +22,7 @@
 // use the dialog class as illustrated in the functions TEST_*.
 // (gboulant - 12/10/2010)
 //
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include "GDialogTest.h"
 
 void TEST_show() {

diff --git a/tools/dlgfactory/qtester.cxx b/tools/dlgfactory/qtester.cxx
index 6104d0a0251c2a889a6415097934bfe0375e576d..278611c632b5bfcf9de98cfa4929b7a2fd04148f 100644 (file)
--- a/tools/dlgfactory/qtester.cxx
+++ b/tools/dlgfactory/qtester.cxx
@@ -22,7 +22,7 @@
 // use the dialog class as illustrated in the functions TEST_*.
 // (gboulant - 12/10/2010)
 //
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include "QDialogTest.h"
 
 void TEST_show() {