u20.04 end

diff --git a/patchQtInc.py b/patchQtInc.py
new file mode 100644 (file)
index 0000000..b893ee6
--- /dev/null
+++ b/patchQtInc.py
@@ -0,0 +1,52 @@
+import os,re,shutil
+
+#lines2 = [elt.replace("#include <QColor>","#include <QtGui/QColor>") for elt in lines]
+#lines2 = [elt.replace("#include <QHideEvent>","#include <QtGui/QHideEvent>") for elt in lines]
+#something = "QPainterPath"
+#"QHideEvent","QPixmap","QRgb" QtWidgets
+
+pat = re.compile("#include <(Q[A-Z][^\>]+)")
+
+def isQtHeader(f):
+    for r,dirs,fis in os.walk("/usr/include/x86_64-linux-gnu/qt5"):
+        if f in fis:
+            return os.path.join(os.path.basename(r),f)
+    return None
+
+def dealWith(fn):
+    fn2 = "{}.new".format(fn)
+    for something in ["QMainWindow"]:
+        with open(fn) as f:
+            lines = f.readlines()
+            lines2 = []
+            for line in lines:
+                m = pat.match(line)
+                if m:
+                    p = m.group(1)
+                    if "/" in p:
+                        lines2.append(line)
+                    else:
+                        s = isQtHeader(p)
+                        if s:
+                            print(p,s)
+                            lines2.append(line.replace(p,s))
+                        else:
+                            lines2.append(line)
+                else:
+                    lines2.append(line)
+                pass
+            pass
+        #lines2 = [elt.replace("#include <{}>".format(something),"#include <QtWidgets/{}>".format(something)) for elt in lines]
+        if lines2 != lines:
+            with open(fn2,"w") as f:
+                f.writelines(lines2)
+            shutil.move(fn2,fn)
+
+for r,dirs,fis in os.walk(os.getcwd()):
+    for fi in fis:
+        if os.path.splitext(fi)[1] in [".h",".cxx"]:
+            dealWith(os.path.join(r,fi))
+
+
+
+#QPainterPath

diff --git a/src/CAF/CAF_Application.cxx b/src/CAF/CAF_Application.cxx
index 4a6a9d0de74767dc4a09ebb4db1798c276b175ca..a1402519e79d66d56c4edba1cb9115c751d20e90 100644 (file)
--- a/src/CAF/CAF_Application.cxx
+++ b/src/CAF/CAF_Application.cxx
@@ -32,8 +32,8 @@
 #include <QtxAction.h>
 #include <QtxListAction.h>
 
-#include <QMap>
-#include <QStringList>
+#include <QtCore/QMap>
+#include <QtCore/QStringList>
 
 #include <Resource_Manager.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>

diff --git a/src/CAF/CAF_Study.cxx b/src/CAF/CAF_Study.cxx
index a1f25a99f465ecc5276d85065656fb1b69bcb5da..165013aa2cadda7c54eab7424889af6adb7ab255 100644 (file)
--- a/src/CAF/CAF_Study.cxx
+++ b/src/CAF/CAF_Study.cxx
@@ -29,7 +29,7 @@
 #include <SUIT_MessageBox.h>
 #include <SUIT_Application.h>
 
-#include <QDir>
+#include <QtCore/QDir>
 
 #include <TDF_Delta.hxx>
 #include <TDF_ListIteratorOfDeltaList.hxx>

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

diff --git a/src/CAM/CAM_Application.h b/src/CAM/CAM_Application.h
index 2fbc4b4b63c4a02f96fb46fc88cdb770d796c9c9..4098588360c4e49fc5c48093d7086469baf59a64 100644 (file)
--- a/src/CAM/CAM_Application.h
+++ b/src/CAM/CAM_Application.h
@@ -26,7 +26,7 @@
 #include "CAM.h"
 
 #include <STD_Application.h>
-#include <QList>
+#include <QtCore/QList>
 
 class QMenu;
 class CAM_Module;

diff --git a/src/CAM/CAM_DataModel.h b/src/CAM/CAM_DataModel.h
index 760aa46cc5396f0eb42d5b684de75af38046218e..8202213d2dc41c6d654b8962e7f9ca37550fc6c9 100644 (file)
--- a/src/CAM/CAM_DataModel.h
+++ b/src/CAM/CAM_DataModel.h
@@ -25,8 +25,8 @@
 
 #include "CAM.h"
 
-#include <QObject>
-#include <QStringList>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
 
 class CAM_Module;
 class CAM_DataObject;

diff --git a/src/CAM/CAM_Module.cxx b/src/CAM/CAM_Module.cxx
index d48741ec749689a43382396dea468ba68ebea8e4..6332af8373d870ab728a0e0dd24c535c2cbd1d55 100644 (file)
--- a/src/CAM/CAM_Module.cxx
+++ b/src/CAM/CAM_Module.cxx
@@ -35,7 +35,7 @@
 #include <SUIT_Session.h>
 #include <SUIT_ResourceMgr.h>
 
-#include <QMenu>
+#include <QtWidgets/QMenu>
 
 /*!
   \class CAM_Module

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

diff --git a/src/CAM/CAM_Study.h b/src/CAM/CAM_Study.h
index 1b6b36fe40e0b33ac709c6beddc7f7ceed9b994d..fc2768742277d993b6526ade903589b603ba030f 100644 (file)
--- a/src/CAM/CAM_Study.h
+++ b/src/CAM/CAM_Study.h
@@ -26,7 +26,7 @@
 #include "CAM.h"
 
 #include <SUIT_Study.h>
-#include <QList>
+#include <QtCore/QList>
 
 class CAM_DataModel;
 

diff --git a/src/Event/SALOME_Event.cxx b/src/Event/SALOME_Event.cxx
index 417900e6b22677f7f220d5a588e2d77078bec254..1307f4e1ce85aa0099840568c7fbf5de7a097183 100644 (file)
--- a/src/Event/SALOME_Event.cxx
+++ b/src/Event/SALOME_Event.cxx
@@ -26,7 +26,7 @@
 //
 #include "SALOME_Event.h"
 
-#include <QSemaphore>
+#include <QtCore/QSemaphore>
 #include <QtWidgets/QApplication>
 
 // asv 21.02.05 : introducing multi-platform approach of thread comparison

diff --git a/src/Event/SALOME_Event.h b/src/Event/SALOME_Event.h
index 23810663024a4ebb636bfec02b2a4c840f9feafb..428db25a18e5ac29ee5b68e66b66f84cbbc5d975 100644 (file)
--- a/src/Event/SALOME_Event.h
+++ b/src/Event/SALOME_Event.h
@@ -26,7 +26,7 @@
 
 #include "Event.h"
 
-#include <QEvent>
+#include <QtCore/QEvent>
 
 //! SALOME custom event type
 #define SALOME_EVENT QEvent::Type( QEvent::User + 10000 )

diff --git a/src/Event/SALOME_EventFilter.h b/src/Event/SALOME_EventFilter.h
index 3b42567a20fbe59fa41edc2255ce67841830db91..3f42eb38aea7f40dd1c124ed146c313b42908ab4 100644 (file)
--- a/src/Event/SALOME_EventFilter.h
+++ b/src/Event/SALOME_EventFilter.h
@@ -21,7 +21,7 @@
 #define SALOME_EVENTFILTER_H
 
 #include "Event.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 #if defined WIN32
 #pragma warning( disable: 4251 )

diff --git a/src/GLViewer/GLViewer_BaseDrawers.cxx b/src/GLViewer/GLViewer_BaseDrawers.cxx
index 5491843611b49a5b860f400001e2cb6de376f7fa..5ff6a0abc8491cc1c85ac40d56a4cce9278f3b4a 100644 (file)
--- a/src/GLViewer/GLViewer_BaseDrawers.cxx
+++ b/src/GLViewer/GLViewer_BaseDrawers.cxx
@@ -32,7 +32,7 @@
 #include "GLViewer_BaseObjects.h"
 
 // Qt includes
-#include <QColor>
+#include <QtGui/QColor>
 
 #if !defined(WIN32) && !defined(__APPLE__)
 #include <GL/glx.h>

diff --git a/src/GLViewer/GLViewer_BaseObjects.cxx b/src/GLViewer/GLViewer_BaseObjects.cxx
index 2decf66ce530c4ebcc4cfb7f0e6740fc722f3cf7..e8b21d37f3b4ab52a1eaa59f8a760877c26dc4d0 100644 (file)
--- a/src/GLViewer/GLViewer_BaseObjects.cxx
+++ b/src/GLViewer/GLViewer_BaseObjects.cxx
@@ -28,7 +28,7 @@
 #include "GLViewer_Group.h"
 #include "GLViewer_Drawer.h"
 
-#include <QFile>
+#include <QtCore/QFile>
 
 /*!
   Constructor

diff --git a/src/GLViewer/GLViewer_Context.cxx b/src/GLViewer/GLViewer_Context.cxx
index 3df09c6f625dec0cecf52cabcd04f97262559ec5..52275755ae973ebe8b5cffcb7d7c1c670983d663 100644 (file)
--- a/src/GLViewer/GLViewer_Context.cxx
+++ b/src/GLViewer/GLViewer_Context.cxx
@@ -38,7 +38,7 @@
 #include "GLViewer_ViewFrame.h"
 
 //QT includes
-#include <QRect>
+#include <QtCore/QRect>
 
 #include <TColStd_SequenceOfInteger.hxx>
 

diff --git a/src/GLViewer/GLViewer_Defs.h b/src/GLViewer/GLViewer_Defs.h
index 28e47a9a2298fd63afd5aa48f6b8531ca59ca7fb..ed99a7852d3c13aeafaae044c837752f30e2719b 100644 (file)
--- a/src/GLViewer/GLViewer_Defs.h
+++ b/src/GLViewer/GLViewer_Defs.h
@@ -27,8 +27,8 @@
 #ifndef GLVIEWER_DEFS_H
 #define GLVIEWER_DEFS_H
 
-#include <QMap>
-#include <QList>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 
 class GLViewer_Object;
 //Selection staus 

diff --git a/src/GLViewer/GLViewer_Drawer.cxx b/src/GLViewer/GLViewer_Drawer.cxx
index f1b48c685fcbf382f40b7f2cf436ea661727768d..6052e8b7c68108a37bce748dd393299bae5fb5a2 100644 (file)
--- a/src/GLViewer/GLViewer_Drawer.cxx
+++ b/src/GLViewer/GLViewer_Drawer.cxx
@@ -34,7 +34,7 @@
 #include <QtWidgets/QApplication>
 #include <QtGui/QImage>
 #include <QtGui/QPainter>
-#include <QFile>
+#include <QtCore/QFile>
 
 #if defined(__APPLE__)
 #include <OpenGL/CGLCurrent.h>

diff --git a/src/GLViewer/GLViewer_Geom.h b/src/GLViewer/GLViewer_Geom.h
index 49ac0f19481c1892cc6633ffcacd731e0d9af3d5..33ae47595376a079e344f2aa72cb563316b329de 100644 (file)
--- a/src/GLViewer/GLViewer_Geom.h
+++ b/src/GLViewer/GLViewer_Geom.h
@@ -29,7 +29,7 @@
 
 #include "GLViewer.h"
 
-#include <QRect>
+#include <QtCore/QRect>
 #include <QtOpenGL/QtOpenGL>
 #include <math.h>
 

diff --git a/src/GLViewer/GLViewer_MimeData.h b/src/GLViewer/GLViewer_MimeData.h
index e1959dc971a99578d50db41db5d3cd6d4fbbf845..828a70345749af4559b769f2bca3b47a918c804b 100644 (file)
--- a/src/GLViewer/GLViewer_MimeData.h
+++ b/src/GLViewer/GLViewer_MimeData.h
@@ -30,7 +30,7 @@
 
 #include "GLViewer.h"
 
-#include <QMimeData>
+#include <QtCore/QMimeData>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/GLViewer/GLViewer_Object.h b/src/GLViewer/GLViewer_Object.h
index 917696f5dad1d6058f47f24bafea63d4b3988a74..b40d8f3af2cf3d26292508e889111039d0f87700 100644 (file)
--- a/src/GLViewer/GLViewer_Object.h
+++ b/src/GLViewer/GLViewer_Object.h
@@ -40,7 +40,7 @@
 #include <GL/gl.h>
 #endif
 
-#include <QString>
+#include <QtCore/QString>
 
 class QFile;
 

diff --git a/src/GLViewer/GLViewer_Selector.h b/src/GLViewer/GLViewer_Selector.h
index 451e2654cf58088ba20a9ce5e0ae2d5b694d3162..3895606af9c0db89d56622f52a70612f9dadd8de 100644 (file)
--- a/src/GLViewer/GLViewer_Selector.h
+++ b/src/GLViewer/GLViewer_Selector.h
@@ -30,8 +30,8 @@
 #include "GLViewer.h"
 #include "GLViewer_Defs.h"
 
-#include <QSize>
-#include <QObject>
+#include <QtCore/QSize>
+#include <QtCore/QObject>
 
 class QRect;
 

diff --git a/src/GLViewer/GLViewer_Text.h b/src/GLViewer/GLViewer_Text.h
index 297f34d72f3461a71c27a5ef933eb36f53aae921..636459714282612b5fe5bcab94381ff4e96b6e44 100644 (file)
--- a/src/GLViewer/GLViewer_Text.h
+++ b/src/GLViewer/GLViewer_Text.h
@@ -41,7 +41,7 @@
 #endif
 
 #include <QtGui/QFont>
-#include <QString>
+#include <QtCore/QString>
 #include <QtGui/QColor>
 
 #ifdef WIN32

diff --git a/src/GLViewer/GLViewer_ToolTip.cxx b/src/GLViewer/GLViewer_ToolTip.cxx
index ace7f33777ec2d35546b3bde1c364f31ff240c6b..bee118d00ece7d2b9e08f454811a3ea5ce5ae0bb 100644 (file)
--- a/src/GLViewer/GLViewer_ToolTip.cxx
+++ b/src/GLViewer/GLViewer_ToolTip.cxx
@@ -31,11 +31,11 @@
 #include "GLViewer_ViewPort2d.h"
 #include "GLViewer_ViewFrame.h"
 
-#include <QLabel>
-#include <QTimer>
+#include <QtWidgets/QLabel>
+#include <QtCore/QTimer>
 #include <QtGui/QBitmap>
 #include <QtWidgets/QApplication>
-#include <QToolTip>
+#include <QtWidgets/QToolTip>
 #include <QtGui/QMouseEvent>
 
 /*!

diff --git a/src/GLViewer/GLViewer_ToolTip.h b/src/GLViewer/GLViewer_ToolTip.h
index 8dca0d5336845fd73a6a22e3c70e65901125608d..0fd161046ca7a5e99d836380eab8470aa0b17cfa 100644 (file)
--- a/src/GLViewer/GLViewer_ToolTip.h
+++ b/src/GLViewer/GLViewer_ToolTip.h
@@ -31,8 +31,8 @@
 
 //#include <qtooltip.h>
 //#include <QtxToolTip.h>
-#include <QObject>
-#include <QPoint>
+#include <QtCore/QObject>
+#include <QtCore/QPoint>
 
 #define TIP_TIME            1000
 

diff --git a/src/GLViewer/GLViewer_ViewFrame.cxx b/src/GLViewer/GLViewer_ViewFrame.cxx
index 8cb1231d9e809b9b80ea8d699fd2ecbb78fe3f20..3b75577626036da1d2aafee796c7054aa475e84f 100644 (file)
--- a/src/GLViewer/GLViewer_ViewFrame.cxx
+++ b/src/GLViewer/GLViewer_ViewFrame.cxx
@@ -33,12 +33,12 @@
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_MessageBox.h>
 
-#include <QColor>
-#include <QFileDialog>
+#include <QtGui/QColor>
+#include <QtWidgets/QFileDialog>
 #include <QtGui/QImage>
-#include <QHBoxLayout>
-#include <QString>
-#include <QFrame>
+#include <QtWidgets/QHBoxLayout>
+#include <QtCore/QString>
+#include <QtWidgets/QFrame>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QWheelEvent>

diff --git a/src/GLViewer/GLViewer_ViewPort.cxx b/src/GLViewer/GLViewer_ViewPort.cxx
index 5ca69b5f8c28fc67818921826c12239d2db2a6f0..4cdc0dce773a420d5ca3de5eeac092a265f00f31 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort.cxx
+++ b/src/GLViewer/GLViewer_ViewPort.cxx
@@ -30,20 +30,20 @@
 #include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
 
-#include <QRect>
+#include <QtCore/QRect>
 #include <QtGui/QCursor>
 #include <QtGui/QPainter>
-#include <QMultiHash>
-//#include <QMenu>
-#include <QColorDialog>
-#include <QColormap>
+#include <QtCore/QMultiHash>
+//#include <QtWidgets/QMenu>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QColormap>
 #include <QtGui/QMouseEvent>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 #include <stdlib.h>
 
 #if !defined WIN32 && !defined __APPLE__
-#include <QX11Info>
+#include <QtX11Extras/QX11Info>
 #include <GL/glx.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

diff --git a/src/GLViewer/GLViewer_ViewPort.h b/src/GLViewer/GLViewer_ViewPort.h
index 1e3dcf99a5f99a79231bfb5c0bf0e9a599d515a0..3364e8117cce4db76f6e7b5c042d8fc925d5887e 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort.h
+++ b/src/GLViewer/GLViewer_ViewPort.h
@@ -31,8 +31,8 @@
 
 //#include <QList>
 #include <QtGui/QColor>
-//#include <QAction>
-#include <QWidget>
+//#include <QtWidgets/QAction>
+#include <QtWidgets/QWidget>
 
 //#include <Aspect_Window.hxx>
 

diff --git a/src/GLViewer/GLViewer_ViewPort2d.cxx b/src/GLViewer/GLViewer_ViewPort2d.cxx
index f6e418e220ff23aaae3722e34b20d9eaca341b47..b05e208a569bfc5f2a1a9098eba456246f768f92 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort2d.cxx
+++ b/src/GLViewer/GLViewer_ViewPort2d.cxx
@@ -39,17 +39,17 @@
 // TODO: Porting to Qt4
 //#include <QtxToolTip.h>
 
-#include <QHBoxLayout>
+#include <QtWidgets/QHBoxLayout>
 #include <QtGui/QMouseEvent>
-#include <QRect>
-//#include <QMenu>
+#include <QtCore/QRect>
+//#include <QtWidgets/QMenu>
 //#include <QToolTip>
 #include <QtWidgets/QApplication>
-#include <QClipboard>
+#include <QtGui/QClipboard>
 #include <QtGui/QBitmap>
-#include <QLabel>
-#include <QWidget>
-#include <QRubberBand>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QRubberBand>
 
 #define WIDTH       640
 #define HEIGHT      480

diff --git a/src/GLViewer/GLViewer_ViewPort2d.h b/src/GLViewer/GLViewer_ViewPort2d.h
index 91cc0876a3007171dfaa8a44681fe23b4cea957c..e36049c13a199aad8f74b83e48b78818d6f0ef10 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort2d.h
+++ b/src/GLViewer/GLViewer_ViewPort2d.h
@@ -45,7 +45,7 @@
 
 #include <QtOpenGL/QtOpenGL>
 #include <QtGui/QColor>
-#include <QPaintDevice>
+#include <QtGui/QPaintDevice>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/GLViewer/GLViewer_Viewer.cxx b/src/GLViewer/GLViewer_Viewer.cxx
index 7075ce5d865c73ba301a385e5bd1aa3539be31bc..aa6b80a44d1df0f5cfc7924925ae89e38983a0e1 100644 (file)
--- a/src/GLViewer/GLViewer_Viewer.cxx
+++ b/src/GLViewer/GLViewer_Viewer.cxx
@@ -35,12 +35,12 @@
 #include "SUIT_ViewManager.h"
 
 #include <QtWidgets/QApplication>
-#include <QMenu>
-#include <QColorDialog>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QColorDialog>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QWheelEvent>
-#include <QRect>
-#include <QRubberBand>
+#include <QtCore/QRect>
+#include <QtWidgets/QRubberBand>
 
 /* used for sketching */
 static QEvent* l_mbPressEvent = 0;

diff --git a/src/GLViewer/GLViewer_Viewer.h b/src/GLViewer/GLViewer_Viewer.h
index 38dba96c5695f874b2de6a28685c8a72f3bce709..65ebe4e4de8942a197e7f7e052d542ead701a668 100644 (file)
--- a/src/GLViewer/GLViewer_Viewer.h
+++ b/src/GLViewer/GLViewer_Viewer.h
@@ -32,7 +32,7 @@
 #include <SUIT_ViewModel.h>
 
 #include <QtGui/QCursor>
-#include <QObject>
+#include <QtCore/QObject>
 
 class QMouseEvent;
 class QKeyEvent;

diff --git a/src/GLViewer/GLViewer_Viewer2d.cxx b/src/GLViewer/GLViewer_Viewer2d.cxx
index a387272e12c514fa034dc315649626d72cc87547..87d587d0d8fd3e228cc6da2a44b0c7e1db2220c2 100644 (file)
--- a/src/GLViewer/GLViewer_Viewer2d.cxx
+++ b/src/GLViewer/GLViewer_Viewer2d.cxx
@@ -39,12 +39,12 @@
 #include "SUIT_ViewWindow.h"
 #include "SUIT_ViewManager.h"
 
-#include <QMenu>
-#include <QRect>
-#include <QFile>
-#include <QPolygon>
+#include <QtWidgets/QMenu>
+#include <QtCore/QRect>
+#include <QtCore/QFile>
+#include <QtGui/QPolygon>
 #include <QtGui/QMouseEvent>
-#include <QColorDialog>
+#include <QtWidgets/QColorDialog>
 
 /*!
   Constructor

diff --git a/src/GLViewer/GLViewer_Widget.cxx b/src/GLViewer/GLViewer_Widget.cxx
index d065c5e917c0a202bc9aafd42861b60fbbdf4fd0..f1b856bf9f68c38fcf45a771d52b1ccbe94a168b 100644 (file)
--- a/src/GLViewer/GLViewer_Widget.cxx
+++ b/src/GLViewer/GLViewer_Widget.cxx
@@ -29,13 +29,13 @@
 
 #include <cmath>
 
-#include <QEvent>
+#include <QtCore/QEvent>
 #include <QtGui/QPaintEvent>
-#include <QRect>
-#include <QFile>
+#include <QtCore/QRect>
+#include <QtCore/QFile>
 #include <QtGui/QImage>
 #include <QtWidgets/QApplication>
-#include <QToolTip>
+#include <QtWidgets/QToolTip>
 
 /*!
   A constructor

diff --git a/src/GraphicsView/GraphicsView_Defs.h b/src/GraphicsView/GraphicsView_Defs.h
index fd283b1bf53342f8393a5fb49c9fee29a944694e..ed416ed2896ab5aa72b48f7e9d0229f4b684abb1 100644 (file)
--- a/src/GraphicsView/GraphicsView_Defs.h
+++ b/src/GraphicsView/GraphicsView_Defs.h
@@ -20,7 +20,7 @@
 #ifndef GRAPHICSVIEW_DEFS_H
 #define GRAPHICSVIEW_DEFS_H
 
-#include <QList>
+#include <QtCore/QList>
 
 class GraphicsView_Object;
 typedef QList<GraphicsView_Object*> GraphicsView_ObjectList;

diff --git a/src/GraphicsView/GraphicsView_Object.h b/src/GraphicsView/GraphicsView_Object.h
index 1a1d9aeec266762cff00f2e57d7e295fb0d3f234..785caa32443c043a4429188eb090adccc5f5718c 100644 (file)
--- a/src/GraphicsView/GraphicsView_Object.h
+++ b/src/GraphicsView/GraphicsView_Object.h
@@ -24,7 +24,7 @@
 
 #include "GraphicsView_Defs.h"
 
-#include <QGraphicsItemGroup>
+#include <QtWidgets/QGraphicsItemGroup>
 
 class GraphicsView_ViewPort;
 

diff --git a/src/GraphicsView/GraphicsView_Scene.cxx b/src/GraphicsView/GraphicsView_Scene.cxx
index df927674c0a790ff4660fe834b387302358ff157..34c8f909798cd1c08bf6cde0cafc1a4cecaacf6a 100644 (file)
--- a/src/GraphicsView/GraphicsView_Scene.cxx
+++ b/src/GraphicsView/GraphicsView_Scene.cxx
@@ -19,9 +19,9 @@
 
 #include "GraphicsView_Scene.h"
 
-#include <QGraphicsLineItem>
-#include <QGraphicsRectItem>
-#include <QGraphicsSceneWheelEvent>
+#include <QtWidgets/QGraphicsLineItem>
+#include <QtWidgets/QGraphicsRectItem>
+#include <QtWidgets/QGraphicsSceneWheelEvent>
 
 //#define VIEWER_DEBUG
 

diff --git a/src/GraphicsView/GraphicsView_Scene.h b/src/GraphicsView/GraphicsView_Scene.h
index 021d7ac51e5d4a9ed430fcd904fa8acd6fb0bdd7..7d779c66459fa187b519caf6c5313ca373e6af18 100644 (file)
--- a/src/GraphicsView/GraphicsView_Scene.h
+++ b/src/GraphicsView/GraphicsView_Scene.h
@@ -22,7 +22,7 @@
 
 #include "GraphicsView.h"
 
-#include <QGraphicsScene>
+#include <QtWidgets/QGraphicsScene>
 
 class QGraphicsRectItem;
 

diff --git a/src/GraphicsView/GraphicsView_Selector.h b/src/GraphicsView/GraphicsView_Selector.h
index 60811cf1301497b7c27803604829cf12256fc0ac..dfad65ace808c61cd4de99a78c63b809ffb2c5d2 100644 (file)
--- a/src/GraphicsView/GraphicsView_Selector.h
+++ b/src/GraphicsView/GraphicsView_Selector.h
@@ -24,8 +24,8 @@
 
 #include "GraphicsView_Defs.h"
 
-#include <QObject>
-#include <QRectF>
+#include <QtCore/QObject>
+#include <QtCore/QRectF>
 
 class GraphicsView_Viewer;
 

diff --git a/src/GraphicsView/GraphicsView_ViewFrame.cxx b/src/GraphicsView/GraphicsView_ViewFrame.cxx
index fa4b82a32e68de3ab6ad26e6dca8af17e504e645..76616d9613066bd5194a24a00050b33bbeb7dca3 100644 (file)
--- a/src/GraphicsView/GraphicsView_ViewFrame.cxx
+++ b/src/GraphicsView/GraphicsView_ViewFrame.cxx
@@ -32,15 +32,15 @@
 #include <SUIT_Session.h>
 #include <SUIT_ResourceMgr.h>
 
-#include <QColor>
-#include <QFrame>
-#include <QFileDialog>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneWheelEvent>
-#include <QHBoxLayout>
+#include <QtGui/QColor>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QGraphicsSceneMouseEvent>
+#include <QtWidgets/QGraphicsSceneWheelEvent>
+#include <QtWidgets/QHBoxLayout>
 #include <QtGui/QImage>
 #include <QtGui/QMouseEvent>
-#include <QString>
+#include <QtCore/QString>
 #include <QtGui/QWheelEvent>
 
 //=======================================================================

diff --git a/src/GraphicsView/GraphicsView_ViewPort.cxx b/src/GraphicsView/GraphicsView_ViewPort.cxx
index 0cf63370063103f1519ec83dfbfa562696085fbf..f020e820728578d659527d610daa3d53ca34dc80 100644 (file)
--- a/src/GraphicsView/GraphicsView_ViewPort.cxx
+++ b/src/GraphicsView/GraphicsView_ViewPort.cxx
@@ -27,13 +27,13 @@
 #include "SUIT_Session.h"
 
 #include <QtGui/QCursor>
-#include <QGraphicsSceneMouseEvent>
-#include <QGridLayout>
-#include <QLabel>
-#include <QMoveEvent>
-#include <QRectF>
-#include <QRubberBand>
-#include <QScrollBar>
+#include <QtWidgets/QGraphicsSceneMouseEvent>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QLabel>
+#include <QtGui/QMoveEvent>
+#include <QtCore/QRectF>
+#include <QtWidgets/QRubberBand>
+#include <QtWidgets/QScrollBar>
 #include <QtPrintSupport/QPrinter>
 #include <QtGui/QPainter>
 

diff --git a/src/GraphicsView/GraphicsView_ViewPort.h b/src/GraphicsView/GraphicsView_ViewPort.h
index c5df1fb64506cb7c47d39168d6f42004502a91b5..67638e1d1867881becd5560f6b7b63017afe95ae 100644 (file)
--- a/src/GraphicsView/GraphicsView_ViewPort.h
+++ b/src/GraphicsView/GraphicsView_ViewPort.h
@@ -24,7 +24,7 @@
 
 #include "GraphicsView_Defs.h"
 
-#include <QGraphicsView>
+#include <QtWidgets/QGraphicsView>
 
 class QGridLayout;
 class QRubberBand;

diff --git a/src/GraphicsView/GraphicsView_ViewTransformer.cxx b/src/GraphicsView/GraphicsView_ViewTransformer.cxx
index 5a3a2d0c0df7b121e49fa61f214e3156a9d31b2d..26bdc55ba41c1f047c8bb0da1d0164852e652c5f 100644 (file)
--- a/src/GraphicsView/GraphicsView_ViewTransformer.cxx
+++ b/src/GraphicsView/GraphicsView_ViewTransformer.cxx
@@ -23,9 +23,9 @@
 #include "GraphicsView_ViewPort.h"
 #include "GraphicsView_Viewer.h"
 
-#include <QGraphicsSceneMouseEvent>
-#include <QRectF>
-#include <QRubberBand>
+#include <QtWidgets/QGraphicsSceneMouseEvent>
+#include <QtCore/QRectF>
+#include <QtWidgets/QRubberBand>
 
 int GraphicsView_ViewTransformer::panBtn = Qt::MidButton;
 int GraphicsView_ViewTransformer::zoomBtn = Qt::LeftButton;

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

diff --git a/src/GraphicsView/GraphicsView_Viewer.cxx b/src/GraphicsView/GraphicsView_Viewer.cxx
index 147c2c82425e71f6872cd4d7bd74e11f34aad17a..3197ce6898d6f119cfb9a44ca0a0ec14651ddafc 100644 (file)
--- a/src/GraphicsView/GraphicsView_Viewer.cxx
+++ b/src/GraphicsView/GraphicsView_Viewer.cxx
@@ -31,11 +31,11 @@
 #include <ImageComposer_Image.h>
 
 #include <QtWidgets/QApplication>
-#include <QColorDialog>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneWheelEvent>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QGraphicsSceneMouseEvent>
+#include <QtWidgets/QGraphicsSceneWheelEvent>
 #include <QtGui/QKeyEvent>
-#include <QMenu>
+#include <QtWidgets/QMenu>
 
 #include <math.h>
 
@@ -43,7 +43,7 @@
 /*
 #include "GraphicsView_PrsImage.h"
 #include "GraphicsView_PrsPropDlg.h"
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
 */
 
 //=======================================================================

diff --git a/src/GuiHelpers/StandardApp_Module.cxx b/src/GuiHelpers/StandardApp_Module.cxx
index cc881c514909c2500f2a36d8f136594f92100695..e0c2e3f464f7b4b4080a48f58a5563b0eb3de541 100644 (file)
--- a/src/GuiHelpers/StandardApp_Module.cxx
+++ b/src/GuiHelpers/StandardApp_Module.cxx
@@ -33,7 +33,7 @@
 
 // QT Includes
 #include <QtGui/QIcon>
-#include <QAction>
+#include <QtWidgets/QAction>
 
 #include <Basics_Utils.hxx>
 #include "QtHelper.hxx"

diff --git a/src/HelpBrowser/HelpBrowser.cxx b/src/HelpBrowser/HelpBrowser.cxx
index 052e0d969cb67523a7787e05cb40e8cd605ae7f6..eba076ddc8ca3d723ee7baad25ea59b575ba1c4f 100644 (file)
--- a/src/HelpBrowser/HelpBrowser.cxx
+++ b/src/HelpBrowser/HelpBrowser.cxx
@@ -26,14 +26,14 @@
 
 #include "HelpBrowser_Application.h"
 
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QFileSystemWatcher>
-#include <QLibraryInfo>
-#include <QMessageBox>
-#include <QTextStream>
-#include <QTimer>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QFileSystemWatcher>
+#include <QtCore/QLibraryInfo>
+#include <QtWidgets/QMessageBox>
+#include <QtCore/QTextStream>
+#include <QtCore/QTimer>
 #include <QtxResourceMgr.h>
 #include <QtxTranslator.h>
 #include <QtxWebBrowser.h>

diff --git a/src/HelpBrowser/HelpBrowser_Application.cxx b/src/HelpBrowser/HelpBrowser_Application.cxx
index f39e43b83e8c84e2d3cf577623a3918757f7fddd..c000c7a817a710cfb67ecdfc32fbb2d340f73308 100644 (file)
--- a/src/HelpBrowser/HelpBrowser_Application.cxx
+++ b/src/HelpBrowser/HelpBrowser_Application.cxx
@@ -25,10 +25,10 @@
 
 #include "HelpBrowser_Application.h"
 
-#include <QFile>
-#include <QFileSystemWatcher>
-#include <QTextStream>
-#include <QWidget>
+#include <QtCore/QFile>
+#include <QtCore/QFileSystemWatcher>
+#include <QtCore/QTextStream>
+#include <QtWidgets/QWidget>
 
 /*!
   \brief Constructor

diff --git a/src/HelpBrowser/qtlocalpeer.h b/src/HelpBrowser/qtlocalpeer.h
index 1b533b1ab23a822bb00765a7c20d4551677ef892..c495257ff80a81ebbef89efb8658da720b77b6a6 100644 (file)
--- a/src/HelpBrowser/qtlocalpeer.h
+++ b/src/HelpBrowser/qtlocalpeer.h
@@ -41,9 +41,9 @@
 #ifndef QTLOCALPEER_H
 #define QTLOCALPEER_H
 
-#include <QLocalServer>
-#include <QLocalSocket>
-#include <QDir>
+#include <QtNetwork/QLocalServer>
+#include <QtNetwork/QLocalSocket>
+#include <QtCore/QDir>
 
 #include "qtlockedfile.h"
 

diff --git a/src/HelpBrowser/qtlockedfile.h b/src/HelpBrowser/qtlockedfile.h
index 84c18e5c9ac092b85306b8b2a8d752bdeb0cdae8..e0f5d3f013a8b154ef1f1c2f4f43246fdabd72f5 100644 (file)
--- a/src/HelpBrowser/qtlockedfile.h
+++ b/src/HelpBrowser/qtlockedfile.h
@@ -41,9 +41,9 @@
 #ifndef QTLOCKEDFILE_H
 #define QTLOCKEDFILE_H
 
-#include <QFile>
+#include <QtCore/QFile>
 #ifdef Q_OS_WIN
-#include <QVector>
+#include <QtCore/QVector>
 #endif
 
 #if defined(Q_OS_WIN)

diff --git a/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx b/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx
index 552a8324beff2f5c3e0602e9e9bce8a0ff43e318..22085218386ef896517eae76e111e6d324754a30 100644 (file)
--- a/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx
+++ b/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx
@@ -19,7 +19,7 @@
 
 #include "ImageComposer_ColorMaskOperator.h"
 #include "ImageComposer_MetaTypes.h"
-#include <QRectF>
+#include <QtCore/QRectF>
 #include <QtGui/QRgb>
 #include <QtGui/QPixmap>
 #include <QtGui/QPainter>

diff --git a/src/ImageComposer/ImageComposer_CutOperator.cxx b/src/ImageComposer/ImageComposer_CutOperator.cxx
index bf2f2aa1150e76b88d7bc28c00d80c9f2a7d8d8b..b665be6bd634ba5fa0e115cc75b936633dcf6c27 100644 (file)
--- a/src/ImageComposer/ImageComposer_CutOperator.cxx
+++ b/src/ImageComposer/ImageComposer_CutOperator.cxx
@@ -19,7 +19,7 @@
 
 #include "ImageComposer_CutOperator.h"
 #include "ImageComposer_MetaTypes.h"
-#include <QString>
+#include <QtCore/QString>
 #include <QtGui/QPixmap>
 #include <QtGui/QPainter>
 

diff --git a/src/ImageComposer/ImageComposer_FuseOperator.cxx b/src/ImageComposer/ImageComposer_FuseOperator.cxx
index abcf875aa3e44985f8f86a43b2fc22b5f45de484..cedd59d3334b8d950c351a14d949a57cbb2ba1a6 100644 (file)
--- a/src/ImageComposer/ImageComposer_FuseOperator.cxx
+++ b/src/ImageComposer/ImageComposer_FuseOperator.cxx
@@ -19,7 +19,7 @@
 
 #include "ImageComposer_FuseOperator.h"
 #include "ImageComposer_MetaTypes.h"
-#include <QString>
+#include <QtCore/QString>
 #include <QtGui/QPixmap>
 #include <QtGui/QPainter>
 

diff --git a/src/ImageComposer/ImageComposer_MetaTypes.h b/src/ImageComposer/ImageComposer_MetaTypes.h
index 07e91b704d4404d5e5e4b807470446e222da500c..2715118715af5958ac9a346764b35d23020d9043 100644 (file)
--- a/src/ImageComposer/ImageComposer_MetaTypes.h
+++ b/src/ImageComposer/ImageComposer_MetaTypes.h
@@ -19,7 +19,7 @@
 
 #include "ImageComposer_Image.h"
 
-#include <QVariant>
+#include <QtCore/QVariant>
 #include <QtGui/QPainterPath>
 
 // Here we declare the meta types for classes which used by

diff --git a/src/LightApp/LightApp_AboutDlg.cxx b/src/LightApp/LightApp_AboutDlg.cxx
index 630ee72d10197b4cdfcc5d3ab1da105b3210bc65..f73cd43b65522c9198d60584ab9241f6831a93f6 100644 (file)
--- a/src/LightApp/LightApp_AboutDlg.cxx
+++ b/src/LightApp/LightApp_AboutDlg.cxx
@@ -32,13 +32,13 @@
 
 #include <QtxGridBox.h>
 
-#include <QLabel>
-#include <QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QVBoxLayout>
 #include <QtGui/QPixmap>
 #include <QtGui/QIcon>
-#include <QGroupBox>
-#include <QTabWidget>
-#include <QPushButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QPushButton>
 
 /*!Constructor.*/
 LightApp_AboutDlg::LightApp_AboutDlg( const QString& defName, const QString& defVer, QWidget* parent )

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index e384539d7ea9882436d23db48afcb79a99d7bdac..ba1855bdb4f899178668d5f2145f0f7dc59cefa0 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -168,30 +168,30 @@
 
 #define VISIBILITY_COLUMN_WIDTH 25
 
-#include <QDir>
+#include <QtCore/QDir>
 #include <QtGui/QImage>
-#include <QString>
-#include <QWidget>
-#include <QStringList>
-#include <QFile>
+#include <QtCore/QString>
+#include <QtWidgets/QWidget>
+#include <QtCore/QStringList>
+#include <QtCore/QFile>
 #include <QtWidgets/QApplication>
-#include <QMap>
-#include <QStatusBar>
-#include <QThread>
-#include <QObjectList>
-#include <QComboBox>
-#include <QInputDialog>
+#include <QtCore/QMap>
+#include <QtWidgets/QStatusBar>
+#include <QtCore/QThread>
+#include <QtCore/QObjectList>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QInputDialog>
 #include <QtGui/QFontDatabase>
 #include <QtGui/QIcon>
-#include <QByteArray>
-#include <QMenu>
-#include <QProcess>
-#include <QTimer>
-#include <QHeaderView>
-#include <QTreeView>
-#include <QMimeData>
-#include <QShortcut>
-#include <QRegExp>
+#include <QtCore/QByteArray>
+#include <QtWidgets/QMenu>
+#include <QtCore/QProcess>
+#include <QtCore/QTimer>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QTreeView>
+#include <QtCore/QMimeData>
+#include <QtWidgets/QShortcut>
+#include <QtCore/QRegExp>
 
 #include <utilities.h>
 

diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h
index 6236e23b11fb78746b0f55e938fe0bbd1e26ffb0..10d3956090b0d14e767264d030af728f4e33c34b 100644 (file)
--- a/src/LightApp/LightApp_Application.h
+++ b/src/LightApp/LightApp_Application.h
@@ -36,8 +36,8 @@
 #include <SUIT_DataObject.h>
 #include <CAM_Application.h>
 
-#include <QPointer>
-#include <QStringList>
+#include <QtCore/QPointer>
+#include <QtCore/QStringList>
 
 class LogWindow;
 #ifndef DISABLE_PYCONSOLE

diff --git a/src/LightApp/LightApp_DataObject.cxx b/src/LightApp/LightApp_DataObject.cxx
index 19dd612f4cbe3bdce68e3d45305c04b75cda19e9..04222bfbe907c8c1709cbc2ed9d157b0cba7ad0a 100644 (file)
--- a/src/LightApp/LightApp_DataObject.cxx
+++ b/src/LightApp/LightApp_DataObject.cxx
@@ -32,7 +32,7 @@
 #include <CAM_Module.h>
 #include <SUIT_DataObjectKey.h>
 
-#include <QVariant>
+#include <QtCore/QVariant>
 
 #include <iostream>
 

diff --git a/src/LightApp/LightApp_Dialog.cxx b/src/LightApp/LightApp_Dialog.cxx
index aac06726bba5dd9e13d5e4c1ae1d9368a57be718..c745d4ccfb1aab1c3927a48d8e0643912836f8e2 100644 (file)
--- a/src/LightApp/LightApp_Dialog.cxx
+++ b/src/LightApp/LightApp_Dialog.cxx
@@ -27,10 +27,10 @@
 #include <SUIT_Session.h>
 #include <SUIT_ResourceMgr.h>
 
-#include <QAbstractButton>
-#include <QToolButton>
-#include <QLineEdit>
-#include <QLabel>
+#include <QtWidgets/QAbstractButton>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QLabel>
 
 /*!
   Constructor

diff --git a/src/LightApp/LightApp_Dialog.h b/src/LightApp/LightApp_Dialog.h
index c60a92d3cc674c9e8a563784dc4234a7f8516eef..a1eb2060401596ef858f0813e67f7c6f2150748b 100644 (file)
--- a/src/LightApp/LightApp_Dialog.h
+++ b/src/LightApp/LightApp_Dialog.h
@@ -29,8 +29,8 @@
 #include "LightApp.h"
 #include <QtxDialog.h>
 
-#include <QList>
-#include <QMap>
+#include <QtCore/QList>
+#include <QtCore/QMap>
 #include <QtGui/QPixmap>
 
 class QLineEdit;

diff --git a/src/LightApp/LightApp_Displayer.cxx b/src/LightApp/LightApp_Displayer.cxx
index 92c6257c4d13cfa4b909c0a3d3a707061ccbc235..4ebe7b9b1e3d80daa5b3b17ac39bb9b530611af9 100644 (file)
--- a/src/LightApp/LightApp_Displayer.cxx
+++ b/src/LightApp/LightApp_Displayer.cxx
@@ -33,8 +33,8 @@
 #include <SUIT_ViewModel.h>
 #include <SUIT_ViewWindow.h>
 
-#include <QStringList>
-#include <QString>
+#include <QtCore/QStringList>
+#include <QtCore/QString>
 #ifndef DISABLE_SALOMEOBJECT
   #include "SALOME_InteractiveObject.hxx"
 #endif

diff --git a/src/LightApp/LightApp_Driver.cxx b/src/LightApp/LightApp_Driver.cxx
index 7a92a830c24fcffb566b7bd1c47f057e89faf32d..93883cea9882e5fbebdcf1b56eb6c0d02d951da6 100644 (file)
--- a/src/LightApp/LightApp_Driver.cxx
+++ b/src/LightApp/LightApp_Driver.cxx
@@ -30,8 +30,8 @@
 #include <OSD_Protection.hxx>
 #include <OSD_FileIterator.hxx>
 
-#include <QFileInfo>
-#include <QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
 
 #include <Qtx.h>
 

diff --git a/src/LightApp/LightApp_EventFilter.h b/src/LightApp/LightApp_EventFilter.h
index 0704a003f932b1cdc614f2f3ddc332babe573700..55c932dfa508c0764278e14e655ed99745f06073 100644 (file)
--- a/src/LightApp/LightApp_EventFilter.h
+++ b/src/LightApp/LightApp_EventFilter.h
@@ -25,7 +25,7 @@
 
 #include "LightApp.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #if defined WIN32
 #pragma warning( disable: 4251 )

diff --git a/src/LightApp/LightApp_FileValidator.cxx b/src/LightApp/LightApp_FileValidator.cxx
index ca002eee4f6dbbcd6a3a36b712acb5d4cd64a90a..5e89b6a0c22e892f6232739f03af91317a216b10 100644 (file)
--- a/src/LightApp/LightApp_FileValidator.cxx
+++ b/src/LightApp/LightApp_FileValidator.cxx
@@ -23,7 +23,7 @@
 #include "LightApp_FileValidator.h"
 #include "SUIT_MessageBox.h"
 
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 
 /*!
   \class LightApp_PyFileValidator

diff --git a/src/LightApp/LightApp_FullScreenHelper.cxx b/src/LightApp/LightApp_FullScreenHelper.cxx
index a146560b8a564eeab59e4670117e8ae395b75bf6..bc8cf51ddf8bbc4170ba955a287904fe554c7b3a 100644 (file)
--- a/src/LightApp/LightApp_FullScreenHelper.cxx
+++ b/src/LightApp/LightApp_FullScreenHelper.cxx
@@ -24,10 +24,10 @@
 // Created:   04/10/2011 18:44:25 PM
 // Author:    OCC team
 //
-#include <QAction>
-#include <QMenuBar>
-#include <QStatusBar>
-#include <QToolBar>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QToolBar>
 
 #include <QtxWorkstack.h>
 

diff --git a/src/LightApp/LightApp_FullScreenHelper.h b/src/LightApp/LightApp_FullScreenHelper.h
index 02ab29b47f3fe70e9009c73ce38842433fae7e30..b7187d3ebe384706b3c777e192e995fb81fcbcab 100644 (file)
--- a/src/LightApp/LightApp_FullScreenHelper.h
+++ b/src/LightApp/LightApp_FullScreenHelper.h
@@ -29,9 +29,9 @@
 
 #include "LightApp.h"
 
-#include <QMap>
-#include <QDockWidget>
-#include <QToolBar>
+#include <QtCore/QMap>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QToolBar>
 
 
 class LIGHTAPP_EXPORT LightApp_FullScreenHelper {

diff --git a/src/LightApp/LightApp_GLSelector.h b/src/LightApp/LightApp_GLSelector.h
index 30a3e276cd2d75e1513f12a4978d4b26fc56b79d..67d06f7975fcf1b3d6c6c4f6ed96053a0b99dfbd 100644 (file)
--- a/src/LightApp/LightApp_GLSelector.h
+++ b/src/LightApp/LightApp_GLSelector.h
@@ -29,7 +29,7 @@
 
 #include <GLViewer_Viewer2d.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class LightApp_DataObject;
 

diff --git a/src/LightApp/LightApp_GVSelector.h b/src/LightApp/LightApp_GVSelector.h
index 6c4446c436dc4f42cfff64418f3cf204b87a6595..f2cb47c99bf86b0155ab545b71270eea8cf31edc 100644 (file)
--- a/src/LightApp/LightApp_GVSelector.h
+++ b/src/LightApp/LightApp_GVSelector.h
@@ -22,7 +22,7 @@
 
 #include "LightApp.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <SUIT_Selector.h>
 #include <SUIT_DataOwner.h>
 #include <GraphicsView_Defs.h>

diff --git a/src/LightApp/LightApp_Module.cxx b/src/LightApp/LightApp_Module.cxx
index 0a1e2cb1552e8399ef4b39364853b93a79c3f66a..0ed3c1c46d39bb2915a731306a8fa1ab39959ba2 100644 (file)
--- a/src/LightApp/LightApp_Module.cxx
+++ b/src/LightApp/LightApp_Module.cxx
@@ -93,10 +93,10 @@
 
 #include <QtxPopupMgr.h>
 
-#include <QVariant>
-#include <QString>
-#include <QStringList>
-#include <QAction>
+#include <QtCore/QVariant>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtWidgets/QAction>
 
 #include <iostream>
 

diff --git a/src/LightApp/LightApp_ModuleAction.cxx b/src/LightApp/LightApp_ModuleAction.cxx
index 21d84025e46ff18e45b4330b85d4719f8d19d079..997b089bf0603fce96e91972d3be4320a351168f 100644 (file)
--- a/src/LightApp/LightApp_ModuleAction.cxx
+++ b/src/LightApp/LightApp_ModuleAction.cxx
@@ -24,9 +24,9 @@
 
 #include <QtxComboBox.h>
 #include <QtxActionSet.h>
-#include <QVBoxLayout>
+#include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QApplication>
-#include <QEvent>
+#include <QtCore/QEvent>
 
 /*!
   \class LightApp_ModuleAction::ActionSet

diff --git a/src/LightApp/LightApp_ModuleDlg.cxx b/src/LightApp/LightApp_ModuleDlg.cxx
index fa765fca37a6fb64cfbaccdba3381e7ece7c9670..7ed57f6c0da37122cbe6d1c845ad1184555c63e7 100644 (file)
--- a/src/LightApp/LightApp_ModuleDlg.cxx
+++ b/src/LightApp/LightApp_ModuleDlg.cxx
@@ -25,10 +25,10 @@
 //
 #include "LightApp_ModuleDlg.h"
 
-#include <QLabel>
-#include <QPushButton>
-#include <QGridLayout>
-#include <QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
 
 /*!
   \brief Pixmap used as default icon for the module.

diff --git a/src/LightApp/LightApp_ModuleDlg.h b/src/LightApp/LightApp_ModuleDlg.h
index 3167e40e79292369a3d005bfa298088f2228bac8..51709eaa4c409dd5f9756e767bd67aa5f06e7bdf 100644 (file)
--- a/src/LightApp/LightApp_ModuleDlg.h
+++ b/src/LightApp/LightApp_ModuleDlg.h
@@ -30,7 +30,7 @@
 
 #include <QtWidgets/QDialog> 
 #include <QtGui/QPixmap>
-#include <QMap>
+#include <QtCore/QMap>
 
 class QPushButton;
 class QHBoxLayout;

diff --git a/src/LightApp/LightApp_NameDlg.cxx b/src/LightApp/LightApp_NameDlg.cxx
index 930f5434772aeef7c39a6ec93b140d51b41cd5f4..8391ea2ea6fe8817271fb3e3d43cb08e18ea87d7 100644 (file)
--- a/src/LightApp/LightApp_NameDlg.cxx
+++ b/src/LightApp/LightApp_NameDlg.cxx
@@ -26,12 +26,12 @@
 #include "LightApp_NameDlg.h"
 #include <SUIT_Tools.h>
 
-#include <QGroupBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
 
 /*!
   Constructor

diff --git a/src/LightApp/LightApp_OBSelector.cxx b/src/LightApp/LightApp_OBSelector.cxx
index b2e84dfdec36233172eec29308d8e74803c8dce7..d0875e7245fa18d667aca73e8a831619f58711f1 100644 (file)
--- a/src/LightApp/LightApp_OBSelector.cxx
+++ b/src/LightApp/LightApp_OBSelector.cxx
@@ -31,7 +31,7 @@
 #include <SUIT_DataBrowser.h>
 #include <SUIT_Session.h>
 #include <SUIT_DataObjectIterator.h>
-#include <QTime>
+#include <QtCore/QTime>
 #include <time.h>
 
 /*!

diff --git a/src/LightApp/LightApp_OBSelector.h b/src/LightApp/LightApp_OBSelector.h
index 4a8f330a0ad70824cc924e66766578f7045ee3e7..769db463ce6895887fcc443bf72cc9d16b4c78ef 100644 (file)
--- a/src/LightApp/LightApp_OBSelector.h
+++ b/src/LightApp/LightApp_OBSelector.h
@@ -31,7 +31,7 @@
 #include <SUIT_Selector.h>
 #include <SUIT_DataOwner.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class SUIT_DataBrowser;
 class LightApp_DataObject;

diff --git a/src/LightApp/LightApp_OCCSelector.h b/src/LightApp/LightApp_OCCSelector.h
index 7256138403c8c895eebbe382a994d352df22bc78..a2bbafb9f4f81afd998c6c194d9f92779f96be7f 100644 (file)
--- a/src/LightApp/LightApp_OCCSelector.h
+++ b/src/LightApp/LightApp_OCCSelector.h
@@ -28,7 +28,7 @@
 #include <SUIT_Selector.h>
 #include <SUIT_DataOwner.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #ifndef DISABLE_OCCVIEWER
 #include <OCCViewer_ViewModel.h>

diff --git a/src/LightApp/LightApp_Preferences.h b/src/LightApp/LightApp_Preferences.h
index accbe9b4af10fd588d3831173b1453dafae68b9f..7c5234b3ba1701485dac6af3ede138b8cfa5657f 100644 (file)
--- a/src/LightApp/LightApp_Preferences.h
+++ b/src/LightApp/LightApp_Preferences.h
@@ -29,8 +29,8 @@
 #include "LightApp.h"
 #include <SUIT_PreferenceMgr.h>
 
-#include <QMap>
-#include <QStringList>
+#include <QtCore/QMap>
+#include <QtCore/QStringList>
 
 class QtxResourceMgr;
 

diff --git a/src/LightApp/LightApp_PreferencesDlg.cxx b/src/LightApp/LightApp_PreferencesDlg.cxx
index 26e0d83c5913a497b3979b899b27314f22452e38..4fed68e390fae88b0e363616a47e3c9e49eaf8b0 100644 (file)
--- a/src/LightApp/LightApp_PreferencesDlg.cxx
+++ b/src/LightApp/LightApp_PreferencesDlg.cxx
@@ -33,9 +33,9 @@
 #include <SUIT_MessageBox.h>
 #include <SUIT_FileDlg.h>
 
-#include <QAbstractButton>
-#include <QVBoxLayout>
-#include <QFileDialog>
+#include <QtWidgets/QAbstractButton>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QFileDialog>
 
 /*!
   Constructor.

diff --git a/src/LightApp/LightApp_SelectionMgr.h b/src/LightApp/LightApp_SelectionMgr.h
index cd242e078a2e885690e957b9427240515ac14a94..85d909d5908c1a1529543a7b22a05e172d3fe176 100644 (file)
--- a/src/LightApp/LightApp_SelectionMgr.h
+++ b/src/LightApp/LightApp_SelectionMgr.h
@@ -40,7 +40,7 @@
   class SALOME_ListIO;
   class TCollection_AsciiString;
 #else
-#include <QStringList>
+#include <QtCore/QStringList>
 #endif
 
 class LightApp_Application;

diff --git a/src/LightApp/LightApp_Study.h b/src/LightApp/LightApp_Study.h
index ea06fc49e666155b927ad0cbd82e52b381377a59..ff7e5332033229f645bd655f7e0d73f32d12933b 100644 (file)
--- a/src/LightApp/LightApp_Study.h
+++ b/src/LightApp/LightApp_Study.h
@@ -32,8 +32,8 @@
 #include "vector"
 #include <Qtx.h>
 
-#include <QMap>
-#include <QVariant>
+#include <QtCore/QMap>
+#include <QtCore/QVariant>
 
 class SUIT_Study;
 class SUIT_Application;

diff --git a/src/LightApp/LightApp_SwitchOp.cxx b/src/LightApp/LightApp_SwitchOp.cxx
index 70a74d5e8573033ef8e1d4a7e57a20b2316a68bd..fc4fbecf70fe41c75da320b20870b192876b893b 100644 (file)
--- a/src/LightApp/LightApp_SwitchOp.cxx
+++ b/src/LightApp/LightApp_SwitchOp.cxx
@@ -28,9 +28,9 @@
 #include <SUIT_Operation.h>
 #include <SUIT_Study.h>
 
-#include <QEvent>
-#include <QWidget>
-#include <QList>
+#include <QtCore/QEvent>
+#include <QtWidgets/QWidget>
+#include <QtCore/QList>
 #include <QtWidgets/QApplication>
 
 /*!

diff --git a/src/LightApp/LightApp_SwitchOp.h b/src/LightApp/LightApp_SwitchOp.h
index 313b3ef246039006cb62d445e33f1cec168cb4ae..63c4e9924f8f5e15c0480a0d57507c5c34c0d1e4 100644 (file)
--- a/src/LightApp/LightApp_SwitchOp.h
+++ b/src/LightApp/LightApp_SwitchOp.h
@@ -24,7 +24,7 @@
 #define LightApp_SwitchOp_H
 
 #include "LightApp.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 class LightApp_Module;
 class LightApp_Operation;

diff --git a/src/LightApp/LightApp_VTKSelector.h b/src/LightApp/LightApp_VTKSelector.h
index 2e7a728c1aad8129a8a41786acf498c38b79cb22..a7771d1c1b7d6c6457bfb7520a92f1d11ba5c7ed 100644 (file)
--- a/src/LightApp/LightApp_VTKSelector.h
+++ b/src/LightApp/LightApp_VTKSelector.h
@@ -27,7 +27,7 @@
 #include "LightApp.h"
 #include "LightApp_DataOwner.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class SUIT_Desktop;
 

diff --git a/src/LogWindow/LogWindow.cxx b/src/LogWindow/LogWindow.cxx
index 86a79155d03bf33109b19f517a35f3a5edc81bd3..8e2edb4b45db8b2d9a12ee1dbfb7973415df1b31 100644 (file)
--- a/src/LogWindow/LogWindow.cxx
+++ b/src/LogWindow/LogWindow.cxx
@@ -26,16 +26,16 @@
 //
 #include "LogWindow.h"
 
-#include <QAction>
+#include <QtWidgets/QAction>
 #include <QtWidgets/QApplication>
-#include <QDate>
-#include <QFile>
-#include <QMenu>
-#include <QTextBlock>
-#include <QTextEdit>
-#include <QTextStream>
-#include <QTime>
-#include <QVBoxLayout>
+#include <QtCore/QDate>
+#include <QtCore/QFile>
+#include <QtWidgets/QMenu>
+#include <QtGui/QTextBlock>
+#include <QtWidgets/QTextEdit>
+#include <QtCore/QTextStream>
+#include <QtCore/QTime>
+#include <QtWidgets/QVBoxLayout>
 
 #include <SUIT_MessageBox.h>
 #include <SUIT_ResourceMgr.h>

diff --git a/src/LogWindow/LogWindow.h b/src/LogWindow/LogWindow.h
index d387b2de6273aa42c4cddc30c1e3d939713ef53d..c4b7eafe547e09d12f9b6acd29d9c675773893d3 100644 (file)
--- a/src/LogWindow/LogWindow.h
+++ b/src/LogWindow/LogWindow.h
@@ -40,9 +40,9 @@
 #include "QtxMsgHandler.h"
 #include "SUIT_PopupClient.h"
 
-#include <QWidget>
-#include <QMap>
-#include <QStringList>
+#include <QtWidgets/QWidget>
+#include <QtCore/QMap>
+#include <QtCore/QStringList>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/OCCViewer/OCCViewer_AISSelector.h b/src/OCCViewer/OCCViewer_AISSelector.h
index de5076d14fcb073127a9aebb9aecc7f5b52ea904..2c69c90d0c943a6fea40b6766b40657686dff435 100644 (file)
--- a/src/OCCViewer/OCCViewer_AISSelector.h
+++ b/src/OCCViewer/OCCViewer_AISSelector.h
@@ -24,7 +24,7 @@
 #define OCCVIEWER_AISSELECTOR_H
 
 #include "OCCViewer.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <Quantity_NameOfColor.hxx>
 #include <AIS_InteractiveContext.hxx>

diff --git a/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx b/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
index b753bdf8ab21161322c0d7adb3d6da145d0046f3..e8ce4a8765d46ae6a3494c3a003416e221cffcd6 100644 (file)
--- a/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
+++ b/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
@@ -24,11 +24,11 @@
 
 #include <QtxDoubleSpinBox.h>
 
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
 
 /*!
   \class OCCViewer_AxialScaleDlg

diff --git a/src/OCCViewer/OCCViewer_ClipPlaneInteractor.h b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.h
index 8c921d378166aa056f3749726030ddfcb4152963..a97aea1d9b10279f265ef67eafd698354f1845d8 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClipPlaneInteractor.h
+++ b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.h
@@ -30,7 +30,7 @@
 #include <gp_Pln.hxx>
 #include <gp_Ax3.hxx>
 
-#include <QPoint>
+#include <QtCore/QPoint>
 
 #include <vector>
 

diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.cxx b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
index adf023d3cea878d819ab6b4675a15634bce17346..2b1d5aee990b9f03273debe335c7a988c29de2f0 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClippingDlg.cxx
+++ b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
@@ -53,17 +53,17 @@
 
 // QT Includes
 #include <QtWidgets/QApplication>
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QGridLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QStackedLayout>
-#include <QSlider>
-#include <QMenu>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QStackedLayout>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QMenu>
 
 /**********************************************************************************
  ************************        Internal functions        ************************

diff --git a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
index 76b3f30801a2fca15aa7b93415c0d250443bfee0..3fe05c5c874a038cdb999f0da2b514ff69311754 100644 (file)
--- a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
+++ b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
@@ -23,11 +23,11 @@
 #include "OCCViewer_CreateRestoreViewDlg.h"
 #include "OCCViewer_ViewPort3d.h"
 
-#include <QPushButton>
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QListWidgetItem>
-#include <QEvent>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QListWidgetItem>
+#include <QtCore/QEvent>
 #include <QtGui/QKeyEvent>
 
 /*!

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

diff --git a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
index 18af957735dd76fd197808496aa1a7b7a886bc67..e788410fa6c014dac4a362db6d7f280791a918de 100644 (file)
--- a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
+++ b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
@@ -31,9 +31,9 @@
 
 #include <Graphic3d_GraduatedTrihedron.hxx>
 
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QLineEdit>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLineEdit>
 
 /*!
   \class OCCViewer_CubeAxesDlg::AxisWidget

diff --git a/src/OCCViewer/OCCViewer_EnvTextureDlg.cxx b/src/OCCViewer/OCCViewer_EnvTextureDlg.cxx
index 8365dacb7566203708ed326bc5be8ca7a0c1c532..c319c8d5499fe25a52a8f658bdd53fd4bd3ba1c6 100644 (file)
--- a/src/OCCViewer/OCCViewer_EnvTextureDlg.cxx
+++ b/src/OCCViewer/OCCViewer_EnvTextureDlg.cxx
@@ -30,12 +30,12 @@
 #include <Graphic3d_TextureEnv.hxx>
 
 // QT Includes
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QComboBox>
-#include <QFileDialog>
-#include <QLineEdit>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QLineEdit>
 
 /*!
   \class OCCViewer_EnvTextureDlg

diff --git a/src/OCCViewer/OCCViewer_FontWidget.cxx b/src/OCCViewer/OCCViewer_FontWidget.cxx
index f3661901eec151c42742c85093db35834ec0bc53..90cf13bd6ef4b9d8a9e57926609e655812b32385 100644 (file)
--- a/src/OCCViewer/OCCViewer_FontWidget.cxx
+++ b/src/OCCViewer/OCCViewer_FontWidget.cxx
@@ -22,7 +22,7 @@
 
 #include "OCCViewer_FontWidget.h"
 
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
 
 //#include <vtkTextProperty.h>
 

diff --git a/src/OCCViewer/OCCViewer_LightSourceDlg.cxx b/src/OCCViewer/OCCViewer_LightSourceDlg.cxx
index 91bf4ea5b5ed9afbaf9158d416a971fa385e3705..e6f515768d9f7dc0c591261d0219f1684791dc42 100644 (file)
--- a/src/OCCViewer/OCCViewer_LightSourceDlg.cxx
+++ b/src/OCCViewer/OCCViewer_LightSourceDlg.cxx
@@ -29,14 +29,14 @@
 #include <QtxColorButton.h>
 
 // Qt includes
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QCheckBox>
-#include <QStackedLayout>
-#include <QRadioButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QStackedLayout>
+#include <QtWidgets/QRadioButton>
 
 /*!
   \class OCCViewer_LightSourceDlg

diff --git a/src/OCCViewer/OCCViewer_RayTracingDlg.cxx b/src/OCCViewer/OCCViewer_RayTracingDlg.cxx
index 457ee3053bb9501f2d244ba867bf41d282342183..764bbba72810bdc4d958a4308e77805578b659f7 100644 (file)
--- a/src/OCCViewer/OCCViewer_RayTracingDlg.cxx
+++ b/src/OCCViewer/OCCViewer_RayTracingDlg.cxx
@@ -28,11 +28,11 @@
 #include <QtxIntSpinBox.h>
 
 // QT Includes
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QCheckBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QCheckBox>
 
 /*!
   \class OCCViewer_RayTracingDlg

diff --git a/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx b/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
index 0b644dfae71908ac870abcc65f10bef8c9982fd2..8f7c128c6222f137398370575978a7f40c195ed9 100644 (file)
--- a/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
+++ b/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
@@ -26,15 +26,15 @@
 
 #include "OCCViewer_ViewWindow.h"
 
-#include <QLineEdit>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QMenu>
-#include <QGridLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QGridLayout>
 #include <QtGui/QDoubleValidator>
-#include <QCheckBox>
-#include <QHBoxLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QHBoxLayout>
 
 /*!
   Constructor

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

diff --git a/src/OCCViewer/OCCViewer_Utilities.cxx b/src/OCCViewer/OCCViewer_Utilities.cxx
index 02b26d13d145cd2ac7b6d97f1ea916e5c09dba17..133f26b5235667d3d2a2a9e7cbc58103c879f522 100644 (file)
--- a/src/OCCViewer/OCCViewer_Utilities.cxx
+++ b/src/OCCViewer/OCCViewer_Utilities.cxx
@@ -33,7 +33,7 @@
 
 // QT includes
 #include <QtGui/QImage>
-#include <QAction>
+#include <QtWidgets/QAction>
 #include <QtWidgets/QDialog>
 
 Handle(Image_PixMap) OCCViewer_Utilities::imageToPixmap( const QImage& anImage )

diff --git a/src/OCCViewer/OCCViewer_VService.h b/src/OCCViewer/OCCViewer_VService.h
index 838ce87e237510e4104181d1b08afdea0708a2bf..ac237c9c3921729ba6bf3a0a7af40d7deb03758f 100644 (file)
--- a/src/OCCViewer/OCCViewer_VService.h
+++ b/src/OCCViewer/OCCViewer_VService.h
@@ -32,7 +32,7 @@
 #include <Quantity_Length.hxx>
 #include <V3d_TypeOfOrientation.hxx>
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class Standard_EXPORT OCCViewer_VService
 {

diff --git a/src/OCCViewer/OCCViewer_ViewFrame.cxx b/src/OCCViewer/OCCViewer_ViewFrame.cxx
index d96a828725d14472de0312f901c0376a5230c360..f8cf053689a7c6090b17ff8d6df0f14dc623b4e7 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewFrame.cxx
+++ b/src/OCCViewer/OCCViewer_ViewFrame.cxx
@@ -32,8 +32,8 @@
 #include <QtxResourceMgr.h>
 #include <QtxWorkstackAction.h>
 
-#include <QFrame>
-#include <QLayout>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QLayout>
 #include <QtWidgets/QApplication>
 
 OCCViewer_ViewFrame::OCCViewer_ViewFrame(SUIT_Desktop* theDesktop, OCCViewer_Viewer* theModel)

diff --git a/src/OCCViewer/OCCViewer_ViewModel.cxx b/src/OCCViewer/OCCViewer_ViewModel.cxx
index 3502278c3a0f07f7592a1759b54834459c87e3dd..dd618d74a6da17ada5d56772324516279ec0de19 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewModel.cxx
+++ b/src/OCCViewer/OCCViewer_ViewModel.cxx
@@ -42,14 +42,14 @@
 
 #include <QtGui/QPainter>
 #include <QtWidgets/QApplication>
-#include <QColorDialog>
-#include <QFileDialog>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QFileDialog>
 #include <QtGui/QPalette>
 #include <QtGui/QKeyEvent>
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QtGui/QMouseEvent>
-#include <QToolBar>
-#include <QDesktopWidget>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QDesktopWidget>
 
 #include <AIS_Axis.hxx>
 #include <Prs3d_Drawer.hxx>

diff --git a/src/OCCViewer/OCCViewer_ViewModel.h b/src/OCCViewer/OCCViewer_ViewModel.h
index 00aa607b67da0f01c853a011fdfe547601aaf0ca..dbdc25a8091c4f5e58c4179181f0128f572a08e8 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewModel.h
+++ b/src/OCCViewer/OCCViewer_ViewModel.h
@@ -24,8 +24,8 @@
 #define OCCVIEWER_VIEWMODEL_H
 
 #include <QtGui/QColor>
-#include <QPoint>
-#include <QVector>
+#include <QtCore/QPoint>
+#include <QtCore/QVector>
 
 #include "OCCViewer.h"
 #include "OCCViewer_ClipPlane.h"

diff --git a/src/OCCViewer/OCCViewer_ViewPort.cxx b/src/OCCViewer/OCCViewer_ViewPort.cxx
index 34f9a407045d7f8e111a19ad0f39840f259a8785..60019ae16eae0de45c1bd38861af46bbc7d307ee 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewPort.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort.cxx
@@ -28,20 +28,20 @@
 
 #include "SUIT_Session.h"
 
-#include <QColor>
-#include <QRect>
+#include <QtGui/QColor>
+#include <QtCore/QRect>
 #include <QtGui/QPixmap>
 #include <QtGui/QPainter>
-#include <QMultiHash>
-#include <QMenu>
-#include <QColorDialog>
-#include <QColormap>
-#include <QCoreApplication>
+#include <QtCore/QMultiHash>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QColormap>
+#include <QtCore/QCoreApplication>
 
 #include <stdlib.h>
 
 #if !defined WIN32 && !defined __APPLE__
-#include <QX11Info>
+#include <QtX11Extras/QX11Info>
 #include <GL/glx.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

diff --git a/src/OCCViewer/OCCViewer_ViewPort.h b/src/OCCViewer/OCCViewer_ViewPort.h
index f7776ca5d27292aae0be4183d266cdd29ea7b9db..d53dd4689915580e351a968a3f4e57c7c5088e0f 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewPort.h
+++ b/src/OCCViewer/OCCViewer_ViewPort.h
@@ -27,8 +27,8 @@
 
 #include "QtxAction.h"
 
-#include <QList>
-#include <QWidget>
+#include <QtCore/QList>
+#include <QtWidgets/QWidget>
 
 #include <Aspect_Window.hxx>
 

diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
index 9f1b973fbe1061b2e3d07cc0660ce9d7b5c2bae1..82e9ce00dca797b0d654286426d561307b2d59e5 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
@@ -31,14 +31,14 @@
 #include <SUIT_Session.h>
 #include <SUIT_ResourceMgr.h>
 
-#include <QColor>
-#include <QFileInfo>
-#include <QString>
-#include <QRect>
+#include <QtGui/QColor>
+#include <QtCore/QFileInfo>
+#include <QtCore/QString>
+#include <QtCore/QRect>
 #include <QtGui/QPaintEvent>
 #include <QtGui/QResizeEvent>
 #include <QtWidgets/QApplication>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include <V3d_View.hxx>
 #include <Quantity_Ratio.hxx>

diff --git a/src/OCCViewer/OCCViewer_ViewSketcher.cxx b/src/OCCViewer/OCCViewer_ViewSketcher.cxx
index 88eaf1e1d43685155903e5b6aa670923b1e3588d..eedd858ab7b617dc12861397cebbb0418406d970 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewSketcher.cxx
+++ b/src/OCCViewer/OCCViewer_ViewSketcher.cxx
@@ -25,7 +25,7 @@
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QPainter>
-#include <QPolygon>
+#include <QtGui/QPolygon>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QKeyEvent>
 

diff --git a/src/OCCViewer/OCCViewer_ViewSketcher.h b/src/OCCViewer/OCCViewer_ViewSketcher.h
index 80c73300c4ff43e898eed0d55a0cd2f33af2b868..9a8a8b36e28f2c4d0af3f8854b9814daf36c57c4 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewSketcher.h
+++ b/src/OCCViewer/OCCViewer_ViewSketcher.h
@@ -22,9 +22,9 @@
 
 #include "OCCViewer.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtGui/QCursor>
-#include <QSize>
+#include <QtCore/QSize>
 
 class OCCViewer_ViewWindow;
 class QKeyEvent;

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx
index 225865d55a14593f4c80774a0b4656a794d02300..4a22ef0a0361a8d1f36833b97105d19cd2f24035 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@ -53,13 +53,13 @@
 #include <QtxRubberBand.h>
 
 #include <QtGui/QPainter>
-#include <QTime>
+#include <QtCore/QTime>
 #include <QtGui/QImage>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QMouseEvent>
 #include <QtWidgets/QApplication>
-#include <QActionGroup>
-#include <QMenu>
+#include <QtWidgets/QActionGroup>
+#include <QtWidgets/QMenu>
 
 #include <AIS_ListOfInteractive.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>

diff --git a/src/OCCViewer/OCCViewer_ViewportInputFilter.h b/src/OCCViewer/OCCViewer_ViewportInputFilter.h
index 532444a005766340f788297509d478c21644e2d4..5e94abd0f1d942f15809c32e0d1d57aa16625631 100644 (file)
--- a/src/OCCViewer/OCCViewer_ViewportInputFilter.h
+++ b/src/OCCViewer/OCCViewer_ViewportInputFilter.h
@@ -23,7 +23,7 @@
 #ifndef OCCVIEWER_VIEWPORTINPUTFILTER_H
 #define OCCVIEWER_VIEWPORTINPUTFILTER_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class OCCViewer_ViewManager;
 class OCCViewer_ViewPort3d;

diff --git a/src/ObjBrowser/OB_Browser.cxx b/src/ObjBrowser/OB_Browser.cxx
index 994c53c527b60b7060cf5b1726f41100a182c31c..106cecd6fbe9f55301cf5a3853465182075e21da 100644 (file)
--- a/src/ObjBrowser/OB_Browser.cxx
+++ b/src/ObjBrowser/OB_Browser.cxx
@@ -33,14 +33,14 @@
 #include <QtxSearchTool.h>
 //#include <SUIT_DataObjectIterator.h>
 
-#include <QAction>
-#include <QMenu>
-#include <QItemSelection>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMenu>
+#include <QtCore/QItemSelection>
 #include <QtGui/QKeyEvent>
-#include <QVBoxLayout>
-#include <QAbstractItemModel>
-#include <QAbstractItemDelegate>
-#include <QHeaderView>
+#include <QtWidgets/QVBoxLayout>
+#include <QtCore/QAbstractItemModel>
+#include <QtWidgets/QAbstractItemDelegate>
+#include <QtWidgets/QHeaderView>
 
 #include <time.h>
 

diff --git a/src/ObjBrowser/OB_Browser.h b/src/ObjBrowser/OB_Browser.h
index cf9ae146c6e6d0e9ae1230b93a2d4e3f5ae4c269..9876bab7c3be1d5e133d57a6be01d94c785c347c 100644 (file)
--- a/src/ObjBrowser/OB_Browser.h
+++ b/src/ObjBrowser/OB_Browser.h
@@ -28,10 +28,10 @@
 
 #include "OB.h"
 
-#include <QWidget>
-#include <QMap>
-#include <QModelIndex>
-#include <QItemSelection>
+#include <QtWidgets/QWidget>
+#include <QtCore/QMap>
+#include <QtCore/QModelIndex>
+#include <QtCore/QItemSelection>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/PVViewer/PVViewer_Behaviors.cxx b/src/PVViewer/PVViewer_Behaviors.cxx
index 425456be28e44402a16ca50042798e6da0da4267..6aa1412942b954e5096546fd0c36f2d52e549df7 100644 (file)
--- a/src/PVViewer/PVViewer_Behaviors.cxx
+++ b/src/PVViewer/PVViewer_Behaviors.cxx
@@ -20,7 +20,7 @@
 
 #include "PVViewer_Behaviors.h"
 
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 #include <pqInterfaceTracker.h>
 #include <pqApplicationCore.h>

diff --git a/src/PVViewer/PVViewer_Behaviors.h b/src/PVViewer/PVViewer_Behaviors.h
index 6d8ef87bfd9a9a3e861b2e1caea71264eb500c07..5796aae5efd0451f822ce029aa21e87c85db4340 100644 (file)
--- a/src/PVViewer/PVViewer_Behaviors.h
+++ b/src/PVViewer/PVViewer_Behaviors.h
@@ -24,7 +24,7 @@
 
 #include "PVViewer.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class QMainWindow;
 class pqPropertiesPanel;

diff --git a/src/PVViewer/PVViewer_Core.cxx b/src/PVViewer/PVViewer_Core.cxx
index df9ab54c4d8d43288e0a3c5c608c6d78db83f0c1..e665b4e7731146e2d5862fb39bc54aef61e61f01 100644 (file)
--- a/src/PVViewer/PVViewer_Core.cxx
+++ b/src/PVViewer/PVViewer_Core.cxx
@@ -28,10 +28,10 @@
 #include <Qtx.h>
 
 #include <QtWidgets/QApplication>
-#include <QStringList>
-#include <QDir>
-#include <QMainWindow>
-#include <QStandardPaths>
+#include <QtCore/QStringList>
+#include <QtCore/QDir>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QStandardPaths>
 
 #include <string>
 

diff --git a/src/PVViewer/PVViewer_Core.h b/src/PVViewer/PVViewer_Core.h
index a5ac1473814cff3fcdcc2baa94e288fcc66a1f39..a31f84b108fe92649c430e60bfcff4d7f8d1a0ad 100644 (file)
--- a/src/PVViewer/PVViewer_Core.h
+++ b/src/PVViewer/PVViewer_Core.h
@@ -23,7 +23,7 @@
 
 #include "PVViewer.h"
 
-#include <QString>
+#include <QtCore/QString>
 
 class PVServer_ServiceWrapper;
 class PVViewer_Behaviors;

diff --git a/src/PVViewer/PVViewer_GUIElements.cxx b/src/PVViewer/PVViewer_GUIElements.cxx
index 24ca57cce68bd20e0476f14e109ff6c79451113a..c31ce86750b5e5280908f57d6865426a167834a2 100644 (file)
--- a/src/PVViewer/PVViewer_GUIElements.cxx
+++ b/src/PVViewer/PVViewer_GUIElements.cxx
@@ -51,13 +51,13 @@
 
 #include <vtkPVConfig.h>
 
-#include <QAction>
-#include <QCoreApplication>
-#include <QLayout>
-#include <QList>
-#include <QMainWindow>
-#include <QMenu>
-#include <QToolBar>
+#include <QtWidgets/QAction>
+#include <QtCore/QCoreApplication>
+#include <QtWidgets/QLayout>
+#include <QtCore/QList>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QToolBar>
 
 PVViewer_GUIElements * PVViewer_GUIElements::theInstance = 0;
 

diff --git a/src/PVViewer/PVViewer_GUIElements.h b/src/PVViewer/PVViewer_GUIElements.h
index 1cb181fea6d6d18e76a1a6fa10eee07fb1d7bad2..5452066bedba0261e4bb8517aaf68de77027b5e8 100644 (file)
--- a/src/PVViewer/PVViewer_GUIElements.h
+++ b/src/PVViewer/PVViewer_GUIElements.h
@@ -23,8 +23,8 @@
 
 #include "PVViewer.h"
 
-#include <QObject>
-#include <QList>
+#include <QtCore/QObject>
+#include <QtCore/QList>
 
 class QAction;
 class QMainWindow;

diff --git a/src/PVViewer/PVViewer_OutputWindow.h b/src/PVViewer/PVViewer_OutputWindow.h
index a825df6fae2951fa31ab53cc816049bc03bbaca2..4aa6099f4c17870ae8d9ddd8f4aff8cae5775458 100644 (file)
--- a/src/PVViewer/PVViewer_OutputWindow.h
+++ b/src/PVViewer/PVViewer_OutputWindow.h
@@ -22,7 +22,7 @@
 
 #include "PVViewer.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <vtkOutputWindow.h>
 
 /**

diff --git a/src/PVViewer/PVViewer_ViewWindow.h b/src/PVViewer/PVViewer_ViewWindow.h
index 9ac856898760e51bcafd3e7584284ea8fc80b1aa..64d0b6e6f74e6cee4f1364d6f7abcd4deaeb4990 100644 (file)
--- a/src/PVViewer/PVViewer_ViewWindow.h
+++ b/src/PVViewer/PVViewer_ViewWindow.h
@@ -24,7 +24,7 @@
 #include "PVViewer.h"
 
 #include "SUIT_ViewWindow.h"
-#include <QMap>
+#include <QtCore/QMap>
 
 class SUIT_Desktop;
 class PVViewer_Viewer;

diff --git a/src/Plot2d/Plot2d.h b/src/Plot2d/Plot2d.h
index 8014f5248167fd8b10b49cd829a6633c507b9a39..818ee83edcd267850eac0c89790db76b7f105ef5 100644 (file)
--- a/src/Plot2d/Plot2d.h
+++ b/src/Plot2d/Plot2d.h
@@ -37,7 +37,7 @@
 #endif
 
 #include <qwt_symbol.h>
-#include <QString>
+#include <QtCore/QString>
 #include <QtGui/QColor>
 #include <QtGui/QPixmap>
 

diff --git a/src/Plot2d/Plot2d_Algorithm.h b/src/Plot2d/Plot2d_Algorithm.h
index f8cf3eef042113d05810d72eedc4e94fd39961a2..20a2109a22896151c20d958254cf0d2635dca7fe 100644 (file)
--- a/src/Plot2d/Plot2d_Algorithm.h
+++ b/src/Plot2d/Plot2d_Algorithm.h
@@ -26,9 +26,9 @@
 
 #include "Plot2d.h"
 
-#include <QPair>
-#include <QList>
-#include <QMap>
+#include <QtCore/QPair>
+#include <QtCore/QList>
+#include <QtCore/QMap>
 
 class Plot2d_Object;
 

diff --git a/src/Plot2d/Plot2d_AnalyticalCurveDlg.cxx b/src/Plot2d/Plot2d_AnalyticalCurveDlg.cxx
index ac9df16c24b59e591f0a26964e8655a5a64066e2..c8bca194d6f5bae0dbd0065ca3919b8412a117f8 100644 (file)
--- a/src/Plot2d/Plot2d_AnalyticalCurveDlg.cxx
+++ b/src/Plot2d/Plot2d_AnalyticalCurveDlg.cxx
@@ -43,15 +43,15 @@
 #include <SUIT_Application.h>
 
 //Qt includes
-#include <QListWidget>
-#include <QGroupBox>
-#include <QFrame>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QPushButton>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QPushButton>
 
 //qwt includes
 #include <qwt_plot.h>

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

diff --git a/src/Plot2d/Plot2d_FitDataDlg.cxx b/src/Plot2d/Plot2d_FitDataDlg.cxx
index 3be7b9aa6f67d7da66c655f984803f993087587e..59bc1ca3342e3189f4265145376cd94b8fb33b79 100644 (file)
--- a/src/Plot2d/Plot2d_FitDataDlg.cxx
+++ b/src/Plot2d/Plot2d_FitDataDlg.cxx
@@ -24,13 +24,13 @@
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
 #include "Plot2d_FitDataDlg.h"
-#include <QLabel>
-#include <QLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLayout>
 #include <QtGui/QValidator>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QGroupBox>
-#include <QLineEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLineEdit>
 
 #define SPACING_SIZE      6
 #define MARGIN_SIZE       11

diff --git a/src/Plot2d/Plot2d_NormalizeAlgorithm.cxx b/src/Plot2d/Plot2d_NormalizeAlgorithm.cxx
index 03ff3301e2651f8500ef9a0a3231ccefc11b9f34..bb367e2d6cfb3f51534fb7c6cc69f6b35f4f1393 100644 (file)
--- a/src/Plot2d/Plot2d_NormalizeAlgorithm.cxx
+++ b/src/Plot2d/Plot2d_NormalizeAlgorithm.cxx
@@ -22,7 +22,7 @@
 //  File   : Plot2d_NormalizeAlgorithm.cxx
 
 #include "Plot2d_NormalizeAlgorithm.h"
-#include <QMap>
+#include <QtCore/QMap>
 #include <algorithm>
 #include "Plot2d_Object.h"
 

diff --git a/src/Plot2d/Plot2d_NormalizeAlgorithm.h b/src/Plot2d/Plot2d_NormalizeAlgorithm.h
index c5f3b39132a64962c400a6f6d80afeddb3286d00..a4e7e251774e405a8ff1b411c3e10f1235802998 100644 (file)
--- a/src/Plot2d/Plot2d_NormalizeAlgorithm.h
+++ b/src/Plot2d/Plot2d_NormalizeAlgorithm.h
@@ -26,7 +26,7 @@
 
 #include "Plot2d.h"
 #include "Plot2d_Algorithm.h"
-#include <QList>
+#include <QtCore/QList>
 
 class Plot2d_Object;
 

diff --git a/src/Plot2d/Plot2d_Object.h b/src/Plot2d/Plot2d_Object.h
index 3789a9bc867860e10d9130ddc8391e884cc3d4cd..e69efdeb8da8c28f98ef66d3e2323520d618dbe7 100644 (file)
--- a/src/Plot2d/Plot2d_Object.h
+++ b/src/Plot2d/Plot2d_Object.h
@@ -28,7 +28,7 @@
 
 #include "Plot2d.h"
 
-#include <QList>
+#include <QtCore/QList>
 #include <qwt_plot.h>
 
 

diff --git a/src/Plot2d/Plot2d_PlotItems.cxx b/src/Plot2d/Plot2d_PlotItems.cxx
index f1cafdb9d9834be48f3c748bf58bb42ae50aa842..aca6471b2ac72d540eb5b92d2020037a7f68c310 100644 (file)
--- a/src/Plot2d/Plot2d_PlotItems.cxx
+++ b/src/Plot2d/Plot2d_PlotItems.cxx
@@ -28,12 +28,12 @@
 
 #include <QtGui/QPainter>
 #include <QtGui/QPalette>
-#include <QLayout>
-#include <QLine>
-#include <QVariant>
-#include <QStyleOption>
+#include <QtWidgets/QLayout>
+#include <QtCore/QLine>
+#include <QtCore/QVariant>
+#include <QtWidgets/QStyleOption>
 #include <QtGui/QPaintEvent>
-#include <QTileRules>
+#include <QtWidgets/QTileRules>
 
 #include <qwt_plot.h>
 #include <qwt_painter.h>

diff --git a/src/Plot2d/Plot2d_SetupCurveDlg.cxx b/src/Plot2d/Plot2d_SetupCurveDlg.cxx
index 91ae71bd0b57d15f222300301fe360740465e672..da3b9e8310ec860a9ef0aa33a085ddd70a407883 100644 (file)
--- a/src/Plot2d/Plot2d_SetupCurveDlg.cxx
+++ b/src/Plot2d/Plot2d_SetupCurveDlg.cxx
@@ -30,12 +30,12 @@
 #include <SUIT_Tools.h>
 #endif
 
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QComboBox>
-#include <QSpinBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QSpinBox>
 #include <QtGui/QPainter>
 
 const int MARGIN_SIZE     = 11;

diff --git a/src/Plot2d/Plot2d_SetupCurveScaleDlg.cxx b/src/Plot2d/Plot2d_SetupCurveScaleDlg.cxx
index 4e009dc2a13d4f813e3117a4fa20b477c2064c56..7418bc52c4e86f6b631f91db42295a540b1627a6 100644 (file)
--- a/src/Plot2d/Plot2d_SetupCurveScaleDlg.cxx
+++ b/src/Plot2d/Plot2d_SetupCurveScaleDlg.cxx
@@ -26,11 +26,11 @@
 
 #include <SUIT_Tools.h>
 
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
 
 #include <QtxDoubleSpinBox.h>
 

diff --git a/src/Plot2d/Plot2d_SetupViewDlg.cxx b/src/Plot2d/Plot2d_SetupViewDlg.cxx
index 785221bbdd5424feeb2276a603bbbd6d5e6c6035..55f0e0acbab770e85403aba0d359b4ae9fac6ed6 100644 (file)
--- a/src/Plot2d/Plot2d_SetupViewDlg.cxx
+++ b/src/Plot2d/Plot2d_SetupViewDlg.cxx
@@ -32,16 +32,16 @@
 #include <QtxColorButton.h>
 #include <QtxFontEdit.h>
 
-#include <QCheckBox>
-#include <QLineEdit>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QTabWidget>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QTabWidget>
 
 const int MARGIN_SIZE     = 11;
 const int SPACING_SIZE    = 6;

diff --git a/src/Plot2d/Plot2d_ToolTip.cxx b/src/Plot2d/Plot2d_ToolTip.cxx
index d2375da72b6b622b75676c20427f6754341b04b0..140f4b5dde0ed8ecd762adf6de59dc5046b9ce32 100644 (file)
--- a/src/Plot2d/Plot2d_ToolTip.cxx
+++ b/src/Plot2d/Plot2d_ToolTip.cxx
@@ -27,7 +27,7 @@
 #include "Plot2d_Curve.h"
 
 #include <QtGui/QFontMetrics>
-#include <QEvent>
+#include <QtCore/QEvent>
 #include <QtGui/QMouseEvent>
 
 #include <qwt_plot.h>

diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx
index 4ad64ff4b6b7df081faecaeabbae4dbd0f34b6a4..ec1da3870edba445dffaa8d8ccaca4600e2b7a46 100644 (file)
--- a/src/Plot2d/Plot2d_ViewFrame.cxx
+++ b/src/Plot2d/Plot2d_ViewFrame.cxx
@@ -43,26 +43,26 @@
 #include "SUIT_ResourceMgr.h"
 #include "SUIT_Application.h"
 #else
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 #endif
 
 #include <QtWidgets/QApplication>
-#include <QToolBar>
-#include <QToolButton>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QToolButton>
 #include <QtGui/QCursor>
-#include <QColorDialog>
-#include <QLayout>
-#include <QMap>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QLayout>
+#include <QtCore/QMap>
 #include <QtGui/QPainter>
-#include <QPaintDevice>
-#include <QEvent>
+#include <QtGui/QPaintDevice>
+#include <QtCore/QEvent>
 #include <QtGui/QMouseEvent>
-#include <QContextMenuEvent>
+#include <QtGui/QContextMenuEvent>
 #include <QtPrintSupport/QPrinter>
 #include <QtGui/QPalette>
-#include <QLocale>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
+#include <QtCore/QLocale>
+#include <QtCore/QXmlStreamWriter>
+#include <QtCore/QXmlStreamReader>
 
 #include <qwt_math.h>
 #include <qwt_plot_layout.h>

diff --git a/src/Plot2d/Plot2d_ViewFrame.h b/src/Plot2d/Plot2d_ViewFrame.h
index 599200f1834a0a9a99ee88ca895d4fe677fc2ac8..3b3740bd61a8f3b278e2146e213e0ca03ddea743 100644 (file)
--- a/src/Plot2d/Plot2d_ViewFrame.h
+++ b/src/Plot2d/Plot2d_ViewFrame.h
@@ -30,10 +30,10 @@
 #endif
 #include "Plot2d_NormalizeAlgorithm.h"
 
-#include <QWidget>
-#include <QMultiHash>
-#include <QMap>
-#include <QList>
+#include <QtWidgets/QWidget>
+#include <QtCore/QMultiHash>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 #include <QtGui/QPainter>
 #include <qwt_symbol.h>
 #include <qwt_scale_draw.h>

diff --git a/src/Plot2d/Plot2d_ViewModel.cxx b/src/Plot2d/Plot2d_ViewModel.cxx
index 5fc92bfa0c32000d05d10a950c1627e9ac10fdeb..4879a6915a4152adc9bfc53dbfcabfc8de078649 100644 (file)
--- a/src/Plot2d/Plot2d_ViewModel.cxx
+++ b/src/Plot2d/Plot2d_ViewModel.cxx
@@ -28,9 +28,9 @@
 #include "Plot2d_ViewFrame.h"
 #include "Plot2d_Prs.h"
 
-#include <QMenu>
-#include <QToolBar>
-#include <QVector>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QToolBar>
+#include <QtCore/QVector>
 
 /*!
   Constructor

diff --git a/src/Plot2d/Plot2d_ViewWindow.cxx b/src/Plot2d/Plot2d_ViewWindow.cxx
index 2e2a5d47637fc166a7624e5bfd2fab268ddc29d7..b7dac89983d3a2f4e27cbf7be1389dd0309626ed 100644 (file)
--- a/src/Plot2d/Plot2d_ViewWindow.cxx
+++ b/src/Plot2d/Plot2d_ViewWindow.cxx
@@ -37,14 +37,14 @@
 #include <QtxMultiAction.h>
 #include <QtxActionToolMgr.h>
 
-#include <QStatusBar>
-#include <QLayout>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QLayout>
 #include <QtWidgets/QApplication>
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QtGui/QImage>
-#include <QToolBar>
+#include <QtWidgets/QToolBar>
 #include <QtGui/QPaintEvent>
-#include <QActionGroup>
+#include <QtWidgets/QActionGroup>
 #include <QtGui/QPainter>
 #include <QtPrintSupport/QPrinter>
 #include <QtPrintSupport/QPrintDialog>

diff --git a/src/Plot2d/Plot2d_ViewWindow.h b/src/Plot2d/Plot2d_ViewWindow.h
index 6c7f3f1758dac047361eef53ff4e211b6067703b..925f125c54392751c5a8592756798d05d92ad9f8 100644 (file)
--- a/src/Plot2d/Plot2d_ViewWindow.h
+++ b/src/Plot2d/Plot2d_ViewWindow.h
@@ -28,7 +28,7 @@
 
 #include "Plot2d.h"
 #include <SUIT_ViewWindow.h>
-#include <QMap>
+#include <QtCore/QMap>
 
 
 #ifdef WIN32

diff --git a/src/PyViewer/PyViewer_ViewWindow.cxx b/src/PyViewer/PyViewer_ViewWindow.cxx
index ecbbc562bf5b4c961b8982c0ee6d19506c0af085..e34c4a5c595877324823c6d65558194d55f52187 100644 (file)
--- a/src/PyViewer/PyViewer_ViewWindow.cxx
+++ b/src/PyViewer/PyViewer_ViewWindow.cxx
@@ -32,11 +32,11 @@
 #include "QtxActionToolMgr.h"
 
 #include <QtWidgets/QApplication>
-#include <QCloseEvent>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QTextStream>
-#include <QVBoxLayout>
+#include <QtGui/QCloseEvent>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMessageBox>
+#include <QtCore/QTextStream>
+#include <QtWidgets/QVBoxLayout>
 
 /*!
   \class PyViewer_ViewWindow

diff --git a/src/QDS/QDS.cxx b/src/QDS/QDS.cxx
index 7f8888f40c740d482fdb4433a980ba9100363127..1dd7c87745c23f54f6f24f963338f211272491da 100644 (file)
--- a/src/QDS/QDS.cxx
+++ b/src/QDS/QDS.cxx
@@ -24,7 +24,7 @@
 
 #include "QDS_Datum.h"
 
-#include <QTextCodec>
+#include <QtCore/QTextCodec>
 
 #include <DDS_DicItem.h>
 #include <DDS_Dictionary.h>

diff --git a/src/QDS/QDS.h b/src/QDS/QDS.h
index c4f7fe7a641e2cba2e5ac967df3676985ee26ec2..b2b4bc14b8e24b6dc0029955018de8c808606996 100644 (file)
--- a/src/QDS/QDS.h
+++ b/src/QDS/QDS.h
@@ -38,8 +38,8 @@
 #pragma warning ( disable:4786 )
 #endif
 
-#include <QString>
-#include <QList>
+#include <QtCore/QString>
+#include <QtCore/QList>
 
 #include <TCollection_HExtendedString.hxx>
 #include <TCollection_HAsciiString.hxx>

diff --git a/src/QDS/QDS_CheckBox.cxx b/src/QDS/QDS_CheckBox.cxx
index f28180bff7ca2f3a490a7d38e27d7434fe10b501..86693b7b874458cb7404784f8839ac6c9180037e 100644 (file)
--- a/src/QDS/QDS_CheckBox.cxx
+++ b/src/QDS/QDS_CheckBox.cxx
@@ -22,7 +22,7 @@
 
 #include "QDS_CheckBox.h"
 
-#include <QCheckBox>
+#include <QtWidgets/QCheckBox>
 
 /*
   \class QDS_CheckBox

diff --git a/src/QDS/QDS_ComboBox.cxx b/src/QDS/QDS_ComboBox.cxx
index e1bc4c2f8fc65963221de8d3f52d4acc4e8e7d97..de2c32ca554b6694f48bfffd23f81d6133918095 100644 (file)
--- a/src/QDS/QDS_ComboBox.cxx
+++ b/src/QDS/QDS_ComboBox.cxx
@@ -27,7 +27,7 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfExtendedString.hxx>
 
-#include <QLineEdit>
+#include <QtWidgets/QLineEdit>
 
 /*
   \class QDS_ComboBox

diff --git a/src/QDS/QDS_ComboBox.h b/src/QDS/QDS_ComboBox.h
index e7ee681c1feba416b483411b9ff1e092ebcd37a1..2be1d721f75d1ec87447367102a5b9b26871be6e 100644 (file)
--- a/src/QDS/QDS_ComboBox.h
+++ b/src/QDS/QDS_ComboBox.h
@@ -25,9 +25,9 @@
 
 #include "QDS_Datum.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <QtGui/QPixmap>
-#include <QStringList>
+#include <QtCore/QStringList>
 
 #include <Qtx.h>
 

diff --git a/src/QDS/QDS_Datum.cxx b/src/QDS/QDS_Datum.cxx
index efa5e081e81f98d08ff07c0cd79bcf5695deb445..acee99bd55ccd1b738277857583e62487a9983e7 100644 (file)
--- a/src/QDS/QDS_Datum.cxx
+++ b/src/QDS/QDS_Datum.cxx
@@ -22,11 +22,11 @@
 
 #include "QDS_Datum.h"
 
-#include <QLayout>
-#include <QVariant>
-#include <QTimer>
-#include <QEvent>
-#include <QMessageBox>
+#include <QtWidgets/QLayout>
+#include <QtCore/QVariant>
+#include <QtCore/QTimer>
+#include <QtCore/QEvent>
+#include <QtWidgets/QMessageBox>
 #include <QtWidgets/QApplication>
 
 #include "QDS_Validator.h"

diff --git a/src/QDS/QDS_Datum.h b/src/QDS/QDS_Datum.h
index b4474509026dec75ddfe7b6bb7943e3754460649..cb3815dfaa247d91303423d618be3af7e6d09298 100644 (file)
--- a/src/QDS/QDS_Datum.h
+++ b/src/QDS/QDS_Datum.h
@@ -24,9 +24,9 @@
 #define QDS_DATUM_H
 
 #include "QDS.h"
-#include <QPointer>
-#include <QMap>
-#include <QLabel>
+#include <QtCore/QPointer>
+#include <QtCore/QMap>
+#include <QtWidgets/QLabel>
 
 class QHBoxLayout;
 class QVBoxLayout;

diff --git a/src/QDS/QDS_LineEdit.cxx b/src/QDS/QDS_LineEdit.cxx
index fd20cc4f3d220dbc3ff72199f452c9232ba2ef32..05cada62854f66b5e4cc01c58c645fe4b4b31c61 100644 (file)
--- a/src/QDS/QDS_LineEdit.cxx
+++ b/src/QDS/QDS_LineEdit.cxx
@@ -22,7 +22,7 @@
 
 #include "QDS_LineEdit.h"
 
-#include <QLineEdit>
+#include <QtWidgets/QLineEdit>
 #include <QtGui/QValidator>
 
 /*!

diff --git a/src/QDS/QDS_RadioBox.cxx b/src/QDS/QDS_RadioBox.cxx
index 8bdcb0e5dcae9391cd16c9a85d1aa95ec72c9bd7..64188c46b0499b50b3177b271a05be77a7ce9f02 100644 (file)
--- a/src/QDS/QDS_RadioBox.cxx
+++ b/src/QDS/QDS_RadioBox.cxx
@@ -25,10 +25,10 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfExtendedString.hxx>
 
-#include <QButtonGroup>
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QRadioButton>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QRadioButton>
 
 /*
   \class QDS_RadioBox

diff --git a/src/QDS/QDS_RadioBox.h b/src/QDS/QDS_RadioBox.h
index ef52b461d63caa9992e5e15c9e698b28d404b20c..07b7b452dc36f7e4ba7bff8fb11be183ee73f4d6 100644 (file)
--- a/src/QDS/QDS_RadioBox.h
+++ b/src/QDS/QDS_RadioBox.h
@@ -27,8 +27,8 @@
 
 #include <Qtx.h>
 
-#include <QMap>
-#include <QStringList>
+#include <QtCore/QMap>
+#include <QtCore/QStringList>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/QDS/QDS_Table.h b/src/QDS/QDS_Table.h
index b4c1d0b5f5e9405ff0d96261601e053ae89b7b7e..fcc2eaf4d518777d3ef29e95e8d7e78857fc2242 100644 (file)
--- a/src/QDS/QDS_Table.h
+++ b/src/QDS/QDS_Table.h
@@ -27,8 +27,8 @@
 
 #include <QtxTable.h>
 
-#include <QMap>
-#include <QVector>
+#include <QtCore/QMap>
+#include <QtCore/QVector>
 
 class QDS_EXPORT QDS_Table : public QtxTable
 {

diff --git a/src/QDS/QDS_TextEdit.cxx b/src/QDS/QDS_TextEdit.cxx
index 632591eff2742f767db385f22fc2929bbe053866..32a56dab33be3916f55d3ae099c50a696d2ab04a 100644 (file)
--- a/src/QDS/QDS_TextEdit.cxx
+++ b/src/QDS/QDS_TextEdit.cxx
@@ -22,7 +22,7 @@
 
 #include "QDS_TextEdit.h"
 
-#include <QTextEdit>
+#include <QtWidgets/QTextEdit>
 
 /*
   \class QDS_TextEdit

diff --git a/src/Qtx/CMakeLists.txt b/src/Qtx/CMakeLists.txt
index 6a55257aa0933081edd88375df84e7ba1d6a1436..df65f5752d8d28ca1d69ce614b362dd0e6231873 100644 (file)
--- a/src/Qtx/CMakeLists.txt
+++ b/src/Qtx/CMakeLists.txt
@@ -29,7 +29,7 @@ INCLUDE_DIRECTORIES("/usr/include/x86_64-linux-gnu/qt5/QtWidgets")
 ADD_DEFINITIONS(${QT_DEFINITIONS})
 #/usr/lib/x86_64-linux-gnu/libQt5Widgets.so
 # libraries to link to
-SET(_link_LIBRARIES ${QT_LIBRARIES} /usr/lib/x86_64-linux-gnu/libQt5Xml.so ${OPENGL_LIBRARIES})
+SET(_link_LIBRARIES ${QT_LIBRARIES} /usr/lib/x86_64-linux-gnu/libQt5Widgets.so /usr/lib/x86_64-linux-gnu/libQt5Xml.so ${OPENGL_LIBRARIES})
 
 # --- headers ---
 

diff --git a/src/Qtx/Qtx.cxx b/src/Qtx/Qtx.cxx
index 283196d2957ba83ac7f5a00882d4b1c9680b7e43..395d4c762d8100ebbb8b62780cf565afdc50e433 100644 (file)
--- a/src/Qtx/Qtx.cxx
+++ b/src/Qtx/Qtx.cxx
@@ -25,15 +25,15 @@
 //
 #include "Qtx.h"
 
-#include <QDir>
+#include <QtCore/QDir>
 #include <QtWidgets/QMenu>
-#include <QRegExp>
+#include <QtCore/QRegExp>
 #include <QtGui/QBitmap>
 #include <QtWidgets/QWidget>
 #include <QtWidgets/QLayout>
 #include <QtGui/QPainter>
 #include <QtWidgets/QDirModel>
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 #include <QtWidgets/QCompleter>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QDesktopWidget>

diff --git a/src/Qtx/Qtx.h b/src/Qtx/Qtx.h
index 9105d8658b556bf35c9dfbec0516d9911e41032d..599f7790e2c906eb9f3518170d398716846de9c2 100644 (file)
--- a/src/Qtx/Qtx.h
+++ b/src/Qtx/Qtx.h
@@ -42,8 +42,8 @@
 #define true  1
 #endif
 
-#include <QString>
-#include <QList>
+#include <QtCore/QString>
+#include <QtCore/QList>
 #include <QtGui/QFont>
 #include <QtGui/QColor>
 #include <QtGui/QImage>

diff --git a/src/Qtx/QtxAction.cxx b/src/Qtx/QtxAction.cxx
index 08ba3d2619b3971f3014f9e87c024154e6862756..48d7f4b40f64953435b96e39cd65114a24a34cd5 100644 (file)
--- a/src/Qtx/QtxAction.cxx
+++ b/src/Qtx/QtxAction.cxx
@@ -25,8 +25,8 @@
 //
 #include "QtxAction.h"
 
-#include <QEvent>
-#include <QPointer>
+#include <QtCore/QEvent>
+#include <QtCore/QPointer>
 #include <QtGui/QActionEvent>
 #include <QtWidgets/QApplication>
 

diff --git a/src/Qtx/QtxActionMenuMgr.cxx b/src/Qtx/QtxActionMenuMgr.cxx
index 999cb81c921f3614aa0d87e04265727f172d32e3..bfec2c58dbac4426cd5608250b46fba73c479b79 100644 (file)
--- a/src/Qtx/QtxActionMenuMgr.cxx
+++ b/src/Qtx/QtxActionMenuMgr.cxx
@@ -27,10 +27,10 @@
 
 #include "QtxAction.h"
 
-#include <QMenu>
-#include <QMenuBar>
-#include <QWidget>
-#include <QMainWindow>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QMainWindow>
 
 /*!
   \class QtxActionMenuMgr::MenuNode

diff --git a/src/Qtx/QtxActionMenuMgr.h b/src/Qtx/QtxActionMenuMgr.h
index 0f9de3a8eeacf11bcee8e1576e8402b225d89ccb..c0e119013e04b98d605e3161afd623ade9a7d5e7 100644 (file)
--- a/src/Qtx/QtxActionMenuMgr.h
+++ b/src/Qtx/QtxActionMenuMgr.h
@@ -29,7 +29,7 @@
 #include "Qtx.h"
 #include "QtxActionMgr.h"
 
-#include <QList>
+#include <QtCore/QList>
 
 class QMenu;
 class QMainWindow;

diff --git a/src/Qtx/QtxActionMgr.cxx b/src/Qtx/QtxActionMgr.cxx
index c82e54c2964ff237f1987bca9392531140003624..cbbc22b8d70c1e140db733fd63ed52cece3a2ac3 100644 (file)
--- a/src/Qtx/QtxActionMgr.cxx
+++ b/src/Qtx/QtxActionMgr.cxx
@@ -26,8 +26,8 @@
 #include "Qtx.h"
 #include "QtxActionMgr.h"
 #include "QtxAction.h"
-#include <QFile>
-#include <QTimer>
+#include <QtCore/QFile>
+#include <QtCore/QTimer>
 #ifndef QT_NO_DOM
 #include <QtXml/QDomDocument>
 #include <QtXml/QDomNode>

diff --git a/src/Qtx/QtxActionMgr.h b/src/Qtx/QtxActionMgr.h
index 8f14d5951784e2382d0d80fcbf6dae55c96cc897..ca14d7fafdf456af132377b2851ec8db8a254ac7 100644 (file)
--- a/src/Qtx/QtxActionMgr.h
+++ b/src/Qtx/QtxActionMgr.h
@@ -28,9 +28,9 @@
 
 #include "Qtx.h"
 
-#include <QMap>
-#include <QObject>
-#include <QPointer>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
 
 class QTimer;
 class QAction;

diff --git a/src/Qtx/QtxActionSet.h b/src/Qtx/QtxActionSet.h
index 59d6f22bab8de5412ce804913b9500e84f676b35..b7fbecc362ca751540f22cf9841d84bace3bacde 100644 (file)
--- a/src/Qtx/QtxActionSet.h
+++ b/src/Qtx/QtxActionSet.h
@@ -25,7 +25,7 @@
 
 #include "QtxAction.h"
 
-#include <QList>
+#include <QtCore/QList>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/Qtx/QtxActionToolMgr.cxx b/src/Qtx/QtxActionToolMgr.cxx
index 76dceead0e4194476bab0a05c5fbbe23172ce782..876a81c278a231b136abbd85216202b93fd269b9 100644 (file)
--- a/src/Qtx/QtxActionToolMgr.cxx
+++ b/src/Qtx/QtxActionToolMgr.cxx
@@ -30,7 +30,7 @@
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QHideEvent>
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 /*!
   \class QtxActionToolMgr::ToolNode

diff --git a/src/Qtx/QtxActionToolMgr.h b/src/Qtx/QtxActionToolMgr.h
index f3fd459998a448bdf3125061659f0667ae2aa01f..85b71bf981f97a6afc067ebbc39c3c22f288b9bb 100644 (file)
--- a/src/Qtx/QtxActionToolMgr.h
+++ b/src/Qtx/QtxActionToolMgr.h
@@ -29,8 +29,8 @@
 #include "Qtx.h"
 #include "QtxActionMgr.h"
 
-#include <QMap>
-#include <QList>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 
 class QToolBar;
 class QMainWindow;

diff --git a/src/Qtx/QtxBackgroundTool.cxx b/src/Qtx/QtxBackgroundTool.cxx
index 89bc046d73fae22d651e5edb9ffb1b7adb5c4ec1..f5827cacb294b377c49b1a1cb4db41120dcc6a5b 100644 (file)
--- a/src/Qtx/QtxBackgroundTool.cxx
+++ b/src/Qtx/QtxBackgroundTool.cxx
@@ -23,15 +23,15 @@
 #include "QtxBackgroundTool.h"
 #include "QtxColorButton.h"
 
-#include <QCheckBox>
-#include <QComboBox>
-#include <QFileDialog>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QStackedWidget>
-#include <QVBoxLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QVBoxLayout>
 
 
 /*!

diff --git a/src/Qtx/QtxBackgroundTool.h b/src/Qtx/QtxBackgroundTool.h
index c9c1b9451039731e4fad9f3bf6b09fd04fd525e9..a86f8f462683b318bfdfa715831eba79bedbf2f0 100644 (file)
--- a/src/Qtx/QtxBackgroundTool.h
+++ b/src/Qtx/QtxBackgroundTool.h
@@ -26,8 +26,8 @@
 #include "Qtx.h"
 #include "QtxDialog.h"
 
-#include <QWidget>
-#include <QMap>
+#include <QtWidgets/QWidget>
+#include <QtCore/QMap>
 
 class QCheckBox;
 class QComboBox;

diff --git a/src/Qtx/QtxBiColorTool.cxx b/src/Qtx/QtxBiColorTool.cxx
index 76fcb865079c376820d9116c6db315b20d800ba6..0560386f75e2a5e836b4bdc2eaca0151133fbaa0 100644 (file)
--- a/src/Qtx/QtxBiColorTool.cxx
+++ b/src/Qtx/QtxBiColorTool.cxx
@@ -23,13 +23,13 @@
 #include "QtxBiColorTool.h"
 #include "QtxColorButton.h"
 
-#include <QHBoxLayout>
-#include <QLabel>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
 #include <QtGui/QPainter>
-#include <QSlider>
-#include <QStyle>
-#include <QStylePainter>
-#include <QStyleOptionButton>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QStylePainter>
+#include <QtWidgets/QStyleOptionButton>
 
 const int BICOLOR_MAX_DELTA = 100;
 

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

diff --git a/src/Qtx/QtxColorButton.cxx b/src/Qtx/QtxColorButton.cxx
index 4b69f709fb707f2cff66cd4f06802cb5f4ba5fa6..d2f8ee4aee1ad4a091967b62c101bc93e23ed4f3 100644 (file)
--- a/src/Qtx/QtxColorButton.cxx
+++ b/src/Qtx/QtxColorButton.cxx
@@ -22,14 +22,14 @@
 //
 #include "QtxColorButton.h"
 
-#include <QMenu>
-#include <QStyle>
-#include <QLayout>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QLayout>
 #include <QtGui/QBitmap>
 #include <QtGui/QPainter>
 #include <QtGui/QPaintEvent>
-#include <QColorDialog>
-#include <QStyleOptionToolButton>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QStyleOptionToolButton>
 
 /*!
   \class QtxColorButton

diff --git a/src/Qtx/QtxColorButton.h b/src/Qtx/QtxColorButton.h
index f1bba122ef0ae815869cd5c187dee01e8e6b277c..142eab179f0cf88b3b0453685c11083486d645ab 100644 (file)
--- a/src/Qtx/QtxColorButton.h
+++ b/src/Qtx/QtxColorButton.h
@@ -25,10 +25,10 @@
 
 #include "Qtx.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <QtGui/QColor>
 #include <QtGui/QPixmap>
-#include <QToolButton>
+#include <QtWidgets/QToolButton>
 
 class QPaintDevice;
 

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

diff --git a/src/Qtx/QtxColorScale.h b/src/Qtx/QtxColorScale.h
index 67e4383569eefdcec53a5a3ec7e2fa5249f0f7b0..549622926bfbc72a2e4c1680c4c43e4eeafe17e2 100644 (file)
--- a/src/Qtx/QtxColorScale.h
+++ b/src/Qtx/QtxColorScale.h
@@ -28,8 +28,8 @@
 
 #include "Qtx.h"
 
-#include <QFrame>
-#include <QList>
+#include <QtWidgets/QFrame>
+#include <QtCore/QList>
 
 class QTextDocument;
 

diff --git a/src/Qtx/QtxComboBox.cxx b/src/Qtx/QtxComboBox.cxx
index 9fcb6cfd6c341eeb4d5fc404bd397a3ccaf82b2d..0a8e63c94245f944f21f980a5a5108f6b35a2976 100644 (file)
--- a/src/Qtx/QtxComboBox.cxx
+++ b/src/Qtx/QtxComboBox.cxx
@@ -25,8 +25,8 @@
 #include "QtxComboBox.h"
 
 #include <QtGui/QStandardItemModel>
-#include <QLineEdit>
-#include <QEvent>
+#include <QtWidgets/QLineEdit>
+#include <QtCore/QEvent>
 #include <QtWidgets/QApplication>
 
 /*!

diff --git a/src/Qtx/QtxComboBox.h b/src/Qtx/QtxComboBox.h
index e9fb2c18c6be75db01bbb32c4e0803f287d8c230..9d53239ccf32e937793c856f0b97558f5b666819 100644 (file)
--- a/src/Qtx/QtxComboBox.h
+++ b/src/Qtx/QtxComboBox.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <QtWidgets/QComboBox>
 
 #ifdef WIN32

diff --git a/src/Qtx/QtxDialog.cxx b/src/Qtx/QtxDialog.cxx
index f36d498bf8042096ced3fd6db4a198b1a9280b99..712c0ca4b7fb8f36339405482c2ca3d80a60adee 100644 (file)
--- a/src/Qtx/QtxDialog.cxx
+++ b/src/Qtx/QtxDialog.cxx
@@ -25,12 +25,12 @@
 //
 #include "QtxDialog.h"
 
-#include <QLabel>
-#include <QLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLayout>
 #include <QtGui/QKeyEvent>
-#include <QFrame>
-#include <QTabWidget>
-#include <QPushButton>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QPushButton>
 #include <QtWidgets/QApplication>
 
 /*!

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

diff --git a/src/Qtx/QtxDockAction.cxx b/src/Qtx/QtxDockAction.cxx
index 068285148d8ea348daa8acda6d78ca400b6e2ee7..6dc792b321231fefbdbf4cac4520b794be6db3c5 100644 (file)
--- a/src/Qtx/QtxDockAction.cxx
+++ b/src/Qtx/QtxDockAction.cxx
@@ -25,10 +25,10 @@
 //
 #include "QtxDockAction.h"
 
-#include <QMenu>
-#include <QToolBar>
-#include <QDockWidget>
-#include <QMainWindow>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QMainWindow>
 
 /*!
   \class QtxDockAction

diff --git a/src/Qtx/QtxDockAction.h b/src/Qtx/QtxDockAction.h
index 87fe61771f1541929fd465c0e26ea592adde0a69..3567db16f2dce37f362c60a7f6e567702d558481 100644 (file)
--- a/src/Qtx/QtxDockAction.h
+++ b/src/Qtx/QtxDockAction.h
@@ -28,7 +28,7 @@
 
 #include "QtxAction.h"
 
-#include <QList>
+#include <QtCore/QList>
 
 class QIcon;
 class QString;

diff --git a/src/Qtx/QtxDockWidget.cxx b/src/Qtx/QtxDockWidget.cxx
index 9aa4a25a795250077f6fefe582acae1d1426bb2d..cda787596d465c6dbb6a98a5d64d4d158772a6b0 100644 (file)
--- a/src/Qtx/QtxDockWidget.cxx
+++ b/src/Qtx/QtxDockWidget.cxx
@@ -25,9 +25,9 @@
 //
 #include "QtxDockWidget.h"
 
-#include <QAction>
-#include <QLayout>
-#include <QMainWindow>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QMainWindow>
 #include <QtGui/QResizeEvent>
 #include <QtWidgets/QApplication>
 

diff --git a/src/Qtx/QtxDockWidget.h b/src/Qtx/QtxDockWidget.h
index 0a3cade387c7edf3cc769fe9c1dfe0f3be6e62b0..3259d42dde6b0346f9428c365432e2c681974560 100644 (file)
--- a/src/Qtx/QtxDockWidget.h
+++ b/src/Qtx/QtxDockWidget.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QDockWidget>
+#include <QtWidgets/QDockWidget>
 
 class QTX_EXPORT QtxDockWidget : public QDockWidget
 {

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

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

diff --git a/src/Qtx/QtxEvalExpr.cxx b/src/Qtx/QtxEvalExpr.cxx
index f802c94559e7f114e9f1f27a3e5cb4fa27ec466b..d56dc09c4d0722caa88932098e5a350506a640bb 100644 (file)
--- a/src/Qtx/QtxEvalExpr.cxx
+++ b/src/Qtx/QtxEvalExpr.cxx
@@ -22,7 +22,7 @@
 //
 #include "QtxEvalExpr.h"
 
-#include <QStack>
+#include <QtCore/QStack>
 
 #include <math.h>
 

diff --git a/src/Qtx/QtxEvalExpr.h b/src/Qtx/QtxEvalExpr.h
index bcd107f1dc960fec23385f94b1e62a2a6e4d316b..7e0cd0779d02e16820db578606a6f6ad8e5d0f53 100644 (file)
--- a/src/Qtx/QtxEvalExpr.h
+++ b/src/Qtx/QtxEvalExpr.h
@@ -25,8 +25,8 @@
 
 #include "Qtx.h"
 
-#include <QList>
-#include <QVariant>
+#include <QtCore/QList>
+#include <QtCore/QVariant>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/Qtx/QtxFontEdit.cxx b/src/Qtx/QtxFontEdit.cxx
index c1abb3cbec63d6430897ea542ed07bfefb35d919..093bc1f0c1120374cab97db7d50687ae10992039 100644 (file)
--- a/src/Qtx/QtxFontEdit.cxx
+++ b/src/Qtx/QtxFontEdit.cxx
@@ -24,11 +24,11 @@
 
 #include "QtxComboBox.h"
 
-#include <QLayout>
-#include <QToolButton>
-#include <QFontDialog>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QFontDialog>
 #include <QtGui/QFontDatabase>
-#include <QFontComboBox>
+#include <QtWidgets/QFontComboBox>
 
 /*!
   \class QtxFontEdit

diff --git a/src/Qtx/QtxFontEdit.h b/src/Qtx/QtxFontEdit.h
index 55a201e67e53d69e6780466cd9f936ba45cba56e..9bf47a8314cf50af6c11a1082eb2e9346bebd5e5 100644 (file)
--- a/src/Qtx/QtxFontEdit.h
+++ b/src/Qtx/QtxFontEdit.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QFrame>
+#include <QtWidgets/QFrame>
 
 class QtxComboBox;
 class QComboBox;

diff --git a/src/Qtx/QtxGridBox.cxx b/src/Qtx/QtxGridBox.cxx
index c82aba951e5ab7cd96fe1b86f3d8596ca363d89f..7da2dd9a933b3344b90aec2f94b5538d7b54e736 100644 (file)
--- a/src/Qtx/QtxGridBox.cxx
+++ b/src/Qtx/QtxGridBox.cxx
@@ -22,8 +22,8 @@
 //
 #include "QtxGridBox.h"
 
-#include <QGridLayout>
-#include <QChildEvent>
+#include <QtWidgets/QGridLayout>
+#include <QtCore/QChildEvent>
 
 /*!
   \class QtxGridBox::Space

diff --git a/src/Qtx/QtxGridBox.h b/src/Qtx/QtxGridBox.h
index f054a170735b300d0038140575d2e3eb9327e4ed..57c3877c847b3b2ed9c45acc2063513166cdf6b3 100644 (file)
--- a/src/Qtx/QtxGridBox.h
+++ b/src/Qtx/QtxGridBox.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class QGridLayout;
 

diff --git a/src/Qtx/QtxGroupBox.cxx b/src/Qtx/QtxGroupBox.cxx
index b005a9e827114df995f4b1e25616c375d62dcf88..82486291efa994c1b15f7066e6ec5f8239780180 100644 (file)
--- a/src/Qtx/QtxGroupBox.cxx
+++ b/src/Qtx/QtxGroupBox.cxx
@@ -25,10 +25,10 @@
 //
 #include "QtxGroupBox.h"
 
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QEvent>
-#include <QObjectList>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtCore/QEvent>
+#include <QtCore/QObjectList>
 #include <QtWidgets/QApplication>
 
 /*!

diff --git a/src/Qtx/QtxGroupBox.h b/src/Qtx/QtxGroupBox.h
index 11ebf51e9ff22fdc85b1b1d8e5666430a12b8452..9705d02507b32530d91d2e83f016fd4301ea1fb8 100644 (file)
--- a/src/Qtx/QtxGroupBox.h
+++ b/src/Qtx/QtxGroupBox.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QGroupBox>
+#include <QtWidgets/QGroupBox>
 
 class QTX_EXPORT QtxGroupBox : public QGroupBox
 {

diff --git a/src/Qtx/QtxIntSpinBox.cxx b/src/Qtx/QtxIntSpinBox.cxx
index 69a72c4697f5bc544cb4cbbeca3ad836428daa88..b562284f0e64e33fedda964a28919e5270a6ee9c 100644 (file)
--- a/src/Qtx/QtxIntSpinBox.cxx
+++ b/src/Qtx/QtxIntSpinBox.cxx
@@ -25,7 +25,7 @@
 //
 #include "QtxIntSpinBox.h"
 
-#include <QLineEdit>
+#include <QtWidgets/QLineEdit>
 /*!
   \class QtxIntSpinBox
   \brief Enhanced version of the Qt's spin box.

diff --git a/src/Qtx/QtxIntSpinBox.h b/src/Qtx/QtxIntSpinBox.h
index 25c66c78ecd1d81ebf3682baa82c558f3acd79c2..c7ef2b221a0712869ac49861f1d7014fea4b777b 100644 (file)
--- a/src/Qtx/QtxIntSpinBox.h
+++ b/src/Qtx/QtxIntSpinBox.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QSpinBox>
+#include <QtWidgets/QSpinBox>
 
 class QTX_EXPORT QtxIntSpinBox : public QSpinBox
 {

diff --git a/src/Qtx/QtxListAction.cxx b/src/Qtx/QtxListAction.cxx
index fd833712355b4faca8e6f9b3c1055dfff37fdd22..97b5eeb01b975f825c5aa29a47e97acb6c024fbb 100644 (file)
--- a/src/Qtx/QtxListAction.cxx
+++ b/src/Qtx/QtxListAction.cxx
@@ -25,12 +25,12 @@
 //
 #include "QtxListAction.h"
 
-#include <QMenu>
-#include <QLabel>
-#include <QVBoxLayout>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QVBoxLayout>
 #include <QtGui/QMouseEvent>
-#include <QListWidget>
-#include <QToolButton>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QToolButton>
 #include <QtWidgets/QApplication>
 
 /*!

diff --git a/src/Qtx/QtxListAction.h b/src/Qtx/QtxListAction.h
index 9d87b9ecd3442184b10af5dd87f3bbe561efb17e..72c146d4540d280fb10a06a3c033660ba57d1971 100644 (file)
--- a/src/Qtx/QtxListAction.h
+++ b/src/Qtx/QtxListAction.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 #include "QtxAction.h"
-#include <QStringList>
+#include <QtCore/QStringList>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/Qtx/QtxListBox.h b/src/Qtx/QtxListBox.h
index 2960bbeb702b5b7fbdadb1eb841f5bb6a6097e82..078a3db05ff4374a602446a09c8f66883ea75998 100644 (file)
--- a/src/Qtx/QtxListBox.h
+++ b/src/Qtx/QtxListBox.h
@@ -30,8 +30,8 @@
 
 // This file isn't yet ported to Qt4 => there are some corrections for OCCViewer porting  -->
 //#include <qlistbox.h>
-#include <QListWidget>
-#include <QListWidgetItem>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QListWidgetItem>
 // <--
 
 #ifdef WIN32

diff --git a/src/Qtx/QtxLogoMgr.cxx b/src/Qtx/QtxLogoMgr.cxx
index 09fd5de4c277f83a37de9d71ccdfb683a4d78b3d..f65319dea4d5a404145e701863d80efe1c5a8595 100644 (file)
--- a/src/Qtx/QtxLogoMgr.cxx
+++ b/src/Qtx/QtxLogoMgr.cxx
@@ -25,12 +25,12 @@
 //
 #include "QtxLogoMgr.h"
 
-#include <QLabel>
+#include <QtWidgets/QLabel>
 #include <QtGui/QImage>
 #include <QtGui/QBitmap>
-#include <QHBoxLayout>
-#include <QMenuBar>
-#include <QPointer>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QMenuBar>
+#include <QtCore/QPointer>
 #include <QtWidgets/QApplication>
 #include <QtGui/QMovie>
 

diff --git a/src/Qtx/QtxLogoMgr.h b/src/Qtx/QtxLogoMgr.h
index 4b806b03ee0bd0f720a803331ea2f1ff6411c586..c1f44d16948f9c2d0c4fe832a1f91952700b0678 100644 (file)
--- a/src/Qtx/QtxLogoMgr.h
+++ b/src/Qtx/QtxLogoMgr.h
@@ -28,8 +28,8 @@
 
 #include "Qtx.h"
 
-#include <QObject>
-#include <QList>
+#include <QtCore/QObject>
+#include <QtCore/QList>
 #include <QtGui/QPixmap>
 
 class QMenuBar;

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

diff --git a/src/Qtx/QtxMRUAction.h b/src/Qtx/QtxMRUAction.h
index 54c7bb06a5abef8690713bb70cd4a501380fb7f8..5cfb4379f3f6d18272717fda19e50ce98ac3e2eb 100644 (file)
--- a/src/Qtx/QtxMRUAction.h
+++ b/src/Qtx/QtxMRUAction.h
@@ -28,7 +28,7 @@
 
 #include "QtxAction.h"
 
-#include <QStringList>
+#include <QtCore/QStringList>
 
 class QtxResourceMgr;
 

diff --git a/src/Qtx/QtxMainWindow.cxx b/src/Qtx/QtxMainWindow.cxx
index 7d1655338d512c9bf479adaae04f57ccf52ae54d..63569a282dc8951f6eb68dc1ddc6e55da27b054d 100644 (file)
--- a/src/Qtx/QtxMainWindow.cxx
+++ b/src/Qtx/QtxMainWindow.cxx
@@ -26,16 +26,16 @@
 
 #include "QtxToolBar.h"
 
-#include <QEvent>
-#include <QPoint>
-#include <QTimer>
-#include <QLayout>
-#include <QMenuBar>
-#include <QStatusBar>
-#include <QRubberBand>
+#include <QtCore/QEvent>
+#include <QtCore/QPoint>
+#include <QtCore/QTimer>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QRubberBand>
 #include <QtGui/QMouseEvent>
 #include <QtWidgets/QApplication>
-#include <QDesktopWidget>
+#include <QtWidgets/QDesktopWidget>
 #include <cstdio>
 /*!
   \class QtxMainWindow::Filter

diff --git a/src/Qtx/QtxMainWindow.h b/src/Qtx/QtxMainWindow.h
index 68df5bbfad7751da992ab4ea3d17f75b9c7a68a9..53ddf3284a286be10fcf8769892b674b2a869067 100644 (file)
--- a/src/Qtx/QtxMainWindow.h
+++ b/src/Qtx/QtxMainWindow.h
@@ -27,7 +27,7 @@
 
 #include "Qtx.h"
 
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 class QtxResourceMgr;
 

diff --git a/src/Qtx/QtxMenu.cxx b/src/Qtx/QtxMenu.cxx
index 36514c6c939684be74c3dbb7e6a579915efbdf5a..b784215b4d07b41d3589c569a4dea225e485e3cd 100644 (file)
--- a/src/Qtx/QtxMenu.cxx
+++ b/src/Qtx/QtxMenu.cxx
@@ -22,12 +22,12 @@
 //
 #include "QtxMenu.h"
 
-#include <QLabel>
-#include <QLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLayout>
 #include <QtGui/QPainter>
 #include <QtGui/QPaintEvent>
 #include <QtGui/QTextDocument>
-#include <QWidgetAction>
+#include <QtWidgets/QWidgetAction>
 #include <QtGui/QLinearGradient>
 #include <QtGui/QAbstractTextDocumentLayout>
 

diff --git a/src/Qtx/QtxMenu.h b/src/Qtx/QtxMenu.h
index ddbe04495b6bf4a2e0fe716b93a84ffa388788c0..d3b33d10633c8ee8b2592bf97f2573671fccaf7b 100644 (file)
--- a/src/Qtx/QtxMenu.h
+++ b/src/Qtx/QtxMenu.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QMenu>
+#include <QtWidgets/QMenu>
 
 class QWidgetAction;
 

diff --git a/src/Qtx/QtxMsgHandler.h b/src/Qtx/QtxMsgHandler.h
index daa5896548d98d3f2a039e797df0d8ff6c9b2e04..98d5eae1e0f9884e63a9e15c693d722f4aa4bdb6 100644 (file)
--- a/src/Qtx/QtxMsgHandler.h
+++ b/src/Qtx/QtxMsgHandler.h
@@ -24,7 +24,7 @@
 #define QTXMSGHANDLER_H
 
 #include "Qtx.h"
-#include <QList>
+#include <QtCore/QList>
 
 void QTX_EXPORT QtxMsgHandler(QtMsgType, const QMessageLogContext&, const QString&);
 

diff --git a/src/Qtx/QtxMultiAction.cxx b/src/Qtx/QtxMultiAction.cxx
index 13d75f95916fdb850c43dcf88a1fd1b05de1701d..1b7baa13504ea964ff346f51ef2fc807191de296 100644 (file)
--- a/src/Qtx/QtxMultiAction.cxx
+++ b/src/Qtx/QtxMultiAction.cxx
@@ -22,14 +22,14 @@
 //
 #include "QtxMultiAction.h"
 
-#include <QMenu>
-#include <QLayout>
-#include <QToolBar>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QToolBar>
 #include <QtGui/QPainter>
 #include <QtGui/QHelpEvent>
-#include <QToolButton>
+#include <QtWidgets/QToolButton>
 #include <QtWidgets/QApplication>
-#include <QStyleOptionButton>
+#include <QtWidgets/QStyleOptionButton>
 
 /*!
   \class QtxMultiAction::Filter

diff --git a/src/Qtx/QtxNotify.cxx b/src/Qtx/QtxNotify.cxx
index a953d8513ebc0f8402903a96219239b40aed5e2a..9e9173e3f1f53694d94a464cb194c0922048e163 100644 (file)
--- a/src/Qtx/QtxNotify.cxx
+++ b/src/Qtx/QtxNotify.cxx
@@ -22,15 +22,15 @@
 
 #include "QtxNotify.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QtGui/QPainter>
 #include <QtGui/QMouseEvent>
 #include <QtWidgets/QApplication>
 #include <QtGui/QTextDocument>
-#include <QDesktopWidget>
-#include <QSharedPointer>
-#include <QPropertyAnimation>
-#include <QParallelAnimationGroup>
+#include <QtWidgets/QDesktopWidget>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QPropertyAnimation>
+#include <QtCore/QParallelAnimationGroup>
 
 /*!
     \brief QtxNotify::NotifyWidget

diff --git a/src/Qtx/QtxNotify.h b/src/Qtx/QtxNotify.h
index 212adf3c1a47f12f43bbaf9e782c329a5811fca7..2c06bf140e4d92774567e90ac9d01a2c21af36da 100644 (file)
--- a/src/Qtx/QtxNotify.h
+++ b/src/Qtx/QtxNotify.h
@@ -25,10 +25,10 @@
 
 #include "Qtx.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
-#include <QList>
-#include <QAbstractAnimation>
+#include <QtCore/QList>
+#include <QtCore/QAbstractAnimation>
 
 class QTimer;
 

diff --git a/src/Qtx/QtxPagePrefMgr.cxx b/src/Qtx/QtxPagePrefMgr.cxx
index f1427c22587076527c00d2222c058b7a7ea6fb06..fe3e941071167c70dfba13444e682eb8d67a0ac0 100644 (file)
--- a/src/Qtx/QtxPagePrefMgr.cxx
+++ b/src/Qtx/QtxPagePrefMgr.cxx
@@ -34,20 +34,20 @@
 #include "QtxBackgroundTool.h"
 #include "QtxResourceMgr.h"
 
-#include <QEvent>
-#include <QLayout>
-#include <QToolBox>
-#include <QLineEdit>
-#include <QTextEdit>
-#include <QCheckBox>
-#include <QSplitter>
-#include <QTabWidget>
-#include <QListWidget>
+#include <QtCore/QEvent>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QToolBox>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QSplitter>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QListWidget>
 #include <QtWidgets/QApplication>
-#include <QDateTimeEdit>
-#include <QStackedWidget>
-#include <QSlider>
-#include <QScrollArea>
+#include <QtWidgets/QDateTimeEdit>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QScrollArea>
 
 #include <stdio.h>
 

diff --git a/src/Qtx/QtxPagePrefMgr.h b/src/Qtx/QtxPagePrefMgr.h
index 952ea12e3cde5cc30a2d8b4844370077371adac3..5b99f008c009284906abdd80c650a619a852f616 100644 (file)
--- a/src/Qtx/QtxPagePrefMgr.h
+++ b/src/Qtx/QtxPagePrefMgr.h
@@ -28,9 +28,9 @@
 #include "QtxPathEdit.h"
 #include "QtxPathListEdit.h"
 
-#include <QFrame>
-#include <QLabel>
-#include <QPointer>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QLabel>
+#include <QtCore/QPointer>
 #include <QtGui/QIcon>
 
 class QtxGridBox;

diff --git a/src/Qtx/QtxPathDialog.cxx b/src/Qtx/QtxPathDialog.cxx
index 9e48f4571fdfe6996bee89e27f496f58eba303ba..8b685501afb140bfcab689ad28a32908f1cee583 100644 (file)
--- a/src/Qtx/QtxPathDialog.cxx
+++ b/src/Qtx/QtxPathDialog.cxx
@@ -28,16 +28,16 @@
 #include "QtxGridBox.h"
 #include "QtxGroupBox.h"
 
-#include <QDir>
-#include <QLabel>
+#include <QtCore/QDir>
+#include <QtWidgets/QLabel>
 #include <QtGui/QPixmap>
-#include <QLayout>
-#include <QLineEdit>
-#include <QObjectList>
-#include <QStringList>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QPushButton>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtCore/QObjectList>
+#include <QtCore/QStringList>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QPushButton>
 
 static const char* open_icon[] = {
 "16 16 5 1",

diff --git a/src/Qtx/QtxPathDialog.h b/src/Qtx/QtxPathDialog.h
index 8ddb2234a604cdfb4263616056415f8b954c6327..599212f84d13ca8ad6e6c6e8c40282674185ada7 100644 (file)
--- a/src/Qtx/QtxPathDialog.h
+++ b/src/Qtx/QtxPathDialog.h
@@ -28,7 +28,7 @@
 
 #include "QtxDialog.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 
 class QFrame;
 class QLineEdit;

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

diff --git a/src/Qtx/QtxPathEdit.h b/src/Qtx/QtxPathEdit.h
index 1d587bdad04009db914120dea5948f01a6374179..db807cb8d95f09a9106ece6ca28a90a6330d90a7 100644 (file)
--- a/src/Qtx/QtxPathEdit.h
+++ b/src/Qtx/QtxPathEdit.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QFrame>
+#include <QtWidgets/QFrame>
 
 class QLineEdit;
 

diff --git a/src/Qtx/QtxPathListEdit.cxx b/src/Qtx/QtxPathListEdit.cxx
index 08b7c4662f7e5c7ac7fbedc24854d9c86794f42f..510bd3da0f13838dcc89101b5fb402d0039ef302 100644 (file)
--- a/src/Qtx/QtxPathListEdit.cxx
+++ b/src/Qtx/QtxPathListEdit.cxx
@@ -24,18 +24,18 @@
 
 #include "QtxPathEdit.h"
 
-#include <QLayout>
+#include <QtWidgets/QLayout>
 #include <QtGui/QPainter>
-#include <QListView>
-#include <QLineEdit>
+#include <QtWidgets/QListView>
+#include <QtWidgets/QLineEdit>
 #include <QtGui/QKeyEvent>
-#include <QDirModel>
-#include <QCompleter>
-#include <QToolButton>
-#include <QMessageBox>
-#include <QFileDialog>
-#include <QItemDelegate>
-#include <QStringListModel>
+#include <QtWidgets/QDirModel>
+#include <QtWidgets/QCompleter>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QItemDelegate>
+#include <QtCore/QStringListModel>
 
 static const char* delete_icon[] = {
 "16 16 3 1",

diff --git a/src/Qtx/QtxPathListEdit.h b/src/Qtx/QtxPathListEdit.h
index 15c897031c5c92de273aa3c8fc531b40acf03849..6954f799b84d9a2b165f115392fd4980402dcc53 100644 (file)
--- a/src/Qtx/QtxPathListEdit.h
+++ b/src/Qtx/QtxPathListEdit.h
@@ -25,8 +25,8 @@
 
 #include "Qtx.h"
 
-#include <QFrame>
-#include <QPointer>
+#include <QtWidgets/QFrame>
+#include <QtCore/QPointer>
 
 class QLineEdit;
 class QListView;

diff --git a/src/Qtx/QtxPopupMgr.cxx b/src/Qtx/QtxPopupMgr.cxx
index eae7e4aacbe696a16a238ae9bff04b65f24a39c1..ab5d6e583306c662f4fdbb725001999b868cfae5 100644 (file)
--- a/src/Qtx/QtxPopupMgr.cxx
+++ b/src/Qtx/QtxPopupMgr.cxx
@@ -26,9 +26,9 @@
 #include "QtxPopupMgr.h"
 #include "QtxAction.h"
 #include "QtxEvalExpr.h"
-#include <QList>
-#include <QMenu>
-#include <QVariant>
+#include <QtCore/QList>
+#include <QtWidgets/QMenu>
+#include <QtCore/QVariant>
 
 bool operator<( const QList<QVariant>& v1, const QList<QVariant>& v2 )
 {

diff --git a/src/Qtx/QtxPopupMgr.h b/src/Qtx/QtxPopupMgr.h
index a0dc2f6a0339fd758379147bfcdde369c336310b..1aab2cf1d98579e5f19eb084c7e1bf950494f260 100644 (file)
--- a/src/Qtx/QtxPopupMgr.h
+++ b/src/Qtx/QtxPopupMgr.h
@@ -28,8 +28,8 @@
 
 #include "QtxActionMenuMgr.h"
 
-#include <QMap>
-#include <QVariant>
+#include <QtCore/QMap>
+#include <QtCore/QVariant>
 
 class QtxEvalExpr;
 class QtxEvalParser;

diff --git a/src/Qtx/QtxPreferenceMgr.cxx b/src/Qtx/QtxPreferenceMgr.cxx
index db6807c085aa11a28abfc4062b0f4bbb6b9ea070..a7239e9169ce83b8818b4a21543c7c762d1a719e 100644 (file)
--- a/src/Qtx/QtxPreferenceMgr.cxx
+++ b/src/Qtx/QtxPreferenceMgr.cxx
@@ -24,7 +24,7 @@
 
 #include "QtxResourceMgr.h"
 
-#include <QEvent>
+#include <QtCore/QEvent>
 #include <QtWidgets/QApplication>
 
 /*!

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

diff --git a/src/Qtx/QtxResourceMgr.cxx b/src/Qtx/QtxResourceMgr.cxx
index 3abd8cea9a977ca9185bc7b69ff64d1799f2a4c4..2fb40fd81379ad3eeb5cb7a7514efcbb6ec23802 100644 (file)
--- a/src/Qtx/QtxResourceMgr.cxx
+++ b/src/Qtx/QtxResourceMgr.cxx
@@ -26,14 +26,14 @@
 #include "QtxResourceMgr.h"
 #include "QtxTranslator.h"
 
-#include <QSet>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QRegExp>
-#include <QTextStream>
+#include <QtCore/QSet>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QRegExp>
+#include <QtCore/QTextStream>
 #include <QtWidgets/QApplication>
-#include <QLibraryInfo>
+#include <QtCore/QLibraryInfo>
 #include <QtDebug>
 #ifndef QT_NO_DOM
 #include <QtXml/QDomDocument>

diff --git a/src/Qtx/QtxResourceMgr.h b/src/Qtx/QtxResourceMgr.h
index 48389b0131799937b8f442e17915483153ebfe54..fc6fcd5820b3ee03138d84aeba0918c44130379b 100644 (file)
--- a/src/Qtx/QtxResourceMgr.h
+++ b/src/Qtx/QtxResourceMgr.h
@@ -32,13 +32,13 @@
 #include "QtxMap.h"
 #endif
 
-#include <QMap>
-#include <QList>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 #include <QtGui/QFont>
 #include <QtGui/QColor>
 #include <QtGui/QPixmap>
-#include <QByteArray>
-#include <QStringList>
+#include <QtCore/QByteArray>
+#include <QtCore/QStringList>
 #include <QtGui/QLinearGradient>
 #include <QtGui/QRadialGradient>
 #include <QtGui/QConicalGradient>

diff --git a/src/Qtx/QtxRubberBand.cxx b/src/Qtx/QtxRubberBand.cxx
index 260b5c239e199a3b2cf6418cd02373141ac05b9e..e5dbf1d57777b2299484dde039943a0d70bfeafb 100644 (file)
--- a/src/Qtx/QtxRubberBand.cxx
+++ b/src/Qtx/QtxRubberBand.cxx
@@ -28,7 +28,7 @@
 #include <QtGui/QPainter>
 #include <QtGui/QPalette>
 #include <QtGui/QShowEvent>
-#include <QVectorIterator>
+#include <QtCore/QVectorIterator>
 
 #include <math.h>
 

diff --git a/src/Qtx/QtxRubberBand.h b/src/Qtx/QtxRubberBand.h
index 4e8b1d9397c54245ad8c8229b41e961267248b68..9e94fb59cb72fd778445c8a77e6a266b370d80b7 100644 (file)
--- a/src/Qtx/QtxRubberBand.h
+++ b/src/Qtx/QtxRubberBand.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class QTX_EXPORT QtxAbstractRubberBand : public QWidget
 {

diff --git a/src/Qtx/QtxSearchTool.cxx b/src/Qtx/QtxSearchTool.cxx
index c8421528e96ce1aa5ada1844a881915b45b88a38..497c60f88940d96d375cc5dcdc44d12befe4c6d4 100644 (file)
--- a/src/Qtx/QtxSearchTool.cxx
+++ b/src/Qtx/QtxSearchTool.cxx
@@ -23,16 +23,16 @@
 #include "QtxSearchTool.h"
 
 #include <QtWidgets/QApplication>
-#include <QCheckBox>
-#include <QEvent>
-#include <QHBoxLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtCore/QEvent>
+#include <QtWidgets/QHBoxLayout>
 #include <QtGui/QKeyEvent>
-#include <QLineEdit>
-#include <QPersistentModelIndex>
-#include <QShortcut>
-#include <QTimer>
-#include <QToolButton>
-#include <QTreeView>
+#include <QtWidgets/QLineEdit>
+#include <QtCore/QPersistentModelIndex>
+#include <QtWidgets/QShortcut>
+#include <QtCore/QTimer>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QTreeView>
 
 const char* const first_xpm[] = {
 "16 16 14 1",

diff --git a/src/Qtx/QtxSearchTool.h b/src/Qtx/QtxSearchTool.h
index b5b4d984cf936e6513c1db5f3e27d53eba0a177d..f984e2e21c55d3c19773f5eb2496231f51589511 100644 (file)
--- a/src/Qtx/QtxSearchTool.h
+++ b/src/Qtx/QtxSearchTool.h
@@ -24,11 +24,11 @@
 #define QTXSEARCHTOOL_H
 
 #include "Qtx.h"
-#include <QFrame>
-#include <QList>
-#include <QMap>
-#include <QPersistentModelIndex>
-#include <QPointer>
+#include <QtWidgets/QFrame>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QPersistentModelIndex>
+#include <QtCore/QPointer>
 
 class QCheckBox;
 class QLineEdit;

diff --git a/src/Qtx/QtxShortcutEdit.cxx b/src/Qtx/QtxShortcutEdit.cxx
index e23119d96934effd098351b93ba54e2c6ff7747e..38f40f1ade5de28f53e94d62828cf14a66c8f05b 100644 (file)
--- a/src/Qtx/QtxShortcutEdit.cxx
+++ b/src/Qtx/QtxShortcutEdit.cxx
@@ -19,14 +19,14 @@
 
 #include "QtxShortcutEdit.h"
 
-#include <QWidget>
-#include <QLayout>
-#include <QList>
-
-#include <QToolButton>
-#include <QLineEdit>
-#include <QTableWidgetItem>
-#include <QMessageBox>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QLayout>
+#include <QtCore/QList>
+
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QTableWidgetItem>
+#include <QtWidgets/QMessageBox>
 
 #include <QtGui/QKeyEvent>
 #include <QtGui/QKeySequence>

diff --git a/src/Qtx/QtxShortcutEdit.h b/src/Qtx/QtxShortcutEdit.h
index d29e2c2854375e50d66e335a5307d682299af4c8..8e811fba8e7f116be904d80d66c2a642e4b3c83a 100644 (file)
--- a/src/Qtx/QtxShortcutEdit.h
+++ b/src/Qtx/QtxShortcutEdit.h
@@ -22,8 +22,8 @@
 
 #include "Qtx.h"
 
-#include <QFrame>
-#include <QTreeWidget>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QTreeWidget>
 
 class QLineEdit;
 class QPushButton;

diff --git a/src/Qtx/QtxSlider.h b/src/Qtx/QtxSlider.h
index 9406ad72beca5907c93b5956865cd46b9e8b769d..d3a03c44559cc74b8908dd0594967d5a35b4c5f8 100644 (file)
--- a/src/Qtx/QtxSlider.h
+++ b/src/Qtx/QtxSlider.h
@@ -26,9 +26,9 @@
 #ifndef QTXSLIDER_H
 #define        QTXSLIDER_H
 
-#include <QWidget>
-#include <QHBoxLayout>
-#include <QSlider>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QSlider>
 
 #include "Qtx.h"
 

diff --git a/src/Qtx/QtxSplash.cxx b/src/Qtx/QtxSplash.cxx
index 19cbb5319fa6ab44a84ebe31310ac658a183f411..4dfcea337cf539a657f19fcc7e6809a42b063fd5 100644 (file)
--- a/src/Qtx/QtxSplash.cxx
+++ b/src/Qtx/QtxSplash.cxx
@@ -29,8 +29,8 @@
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QPainter>
-#include <QMessageBox>
-#include <QDesktopWidget>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QDesktopWidget>
 
 /*!
   \class ProgressEvent

diff --git a/src/Qtx/QtxSplash.h b/src/Qtx/QtxSplash.h
index 8bcc2c208b262c9c3f31e0c9191220b32c9b9edc..68914bd4e6fb3a759d044fde7c8c87c0a3de8563 100644 (file)
--- a/src/Qtx/QtxSplash.h
+++ b/src/Qtx/QtxSplash.h
@@ -28,10 +28,10 @@
 
 #include "Qtx.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <QtGui/QPixmap>
 #include <QtGui/QGradient>
-#include <QMap>
+#include <QtCore/QMap>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/Qtx/QtxToolBar.cxx b/src/Qtx/QtxToolBar.cxx
index 0e5d382b4adfe7ac098f0426908c05f824f3dfd5..9b31be66be8485393dfd4fab2040d54cf59c0950 100644 (file)
--- a/src/Qtx/QtxToolBar.cxx
+++ b/src/Qtx/QtxToolBar.cxx
@@ -25,8 +25,8 @@
 //
 #include "QtxToolBar.h"
 
-#include <QAction>
-#include <QMainWindow>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMainWindow>
 #include <QtWidgets/QApplication>
 
 /*!

diff --git a/src/Qtx/QtxToolBar.h b/src/Qtx/QtxToolBar.h
index 31ee9962986820c3b98cb3fa8ec56f55b71d6a14..7d7864c25376a407726398971c029de890e9466e 100644 (file)
--- a/src/Qtx/QtxToolBar.h
+++ b/src/Qtx/QtxToolBar.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QToolBar>
+#include <QtWidgets/QToolBar>
 
 class QTX_EXPORT QtxToolBar : public QToolBar
 {

diff --git a/src/Qtx/QtxToolButton.h b/src/Qtx/QtxToolButton.h
index f80754c4e85b6acaa15e9e34907334ef273cba41..b72996a192f6fe388944063bf8246b104301145c 100644 (file)
--- a/src/Qtx/QtxToolButton.h
+++ b/src/Qtx/QtxToolButton.h
@@ -22,9 +22,9 @@
 
 #include "Qtx.h"
 
-#include <QStringList>
-#include <QToolButton>
-#include <QVariant>
+#include <QtCore/QStringList>
+#include <QtWidgets/QToolButton>
+#include <QtCore/QVariant>
 
 class QTX_EXPORT QtxToolButton : public QToolButton
 {

diff --git a/src/Qtx/QtxToolTip.cxx b/src/Qtx/QtxToolTip.cxx
index c45eec420ec12a33ae9cdd8aa2f1deda7685a383..63f915bf51b5422490546865f490037ce9c164d5 100644 (file)
--- a/src/Qtx/QtxToolTip.cxx
+++ b/src/Qtx/QtxToolTip.cxx
@@ -26,7 +26,7 @@
 #include "QtxToolTip.h"
 
 #include <QtGui/QFont>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QtGui/QCursor>
 #include <QtGui/QFontMetrics>
 #include <QtWidgets/QApplication>

diff --git a/src/Qtx/QtxToolTip.h b/src/Qtx/QtxToolTip.h
index a23e20060dfe53177a3d92d63af64322af5fe8ac..4a0151755b178eb37166b914b4146b8f5218a732 100644 (file)
--- a/src/Qtx/QtxToolTip.h
+++ b/src/Qtx/QtxToolTip.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QLabel>
+#include <QtWidgets/QLabel>
 
 class QTimer;
 

diff --git a/src/Qtx/QtxTranslator.h b/src/Qtx/QtxTranslator.h
index 1ecdff538ba9840418ee8e7baae6e3eb4dc042a5..e62c7ef9f83925906ab2cd3ffc16c9d8ad4274a9 100644 (file)
--- a/src/Qtx/QtxTranslator.h
+++ b/src/Qtx/QtxTranslator.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QTranslator>
+#include <QtCore/QTranslator>
 
 class QTX_EXPORT QtxTranslator : public QTranslator
 {

diff --git a/src/Qtx/QtxTreeView.cxx b/src/Qtx/QtxTreeView.cxx
index 5206cc00ec9fbb5fa16af34430cce73ac496a72d..726ab944555507a8ac8d7ac10c240e566112c11a 100644 (file)
--- a/src/Qtx/QtxTreeView.cxx
+++ b/src/Qtx/QtxTreeView.cxx
@@ -22,8 +22,8 @@
 //
 #include "QtxTreeView.h"
 
-#include <QHeaderView>
-#include <QMenu>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QMenu>
 #include <QtGui/QMouseEvent>
 
 /*!

diff --git a/src/Qtx/QtxTreeView.h b/src/Qtx/QtxTreeView.h
index 9b029fe91ff9882d2052d8a62f696275ee882e24..9d9780f542073957de27747307bb5bc092752179 100644 (file)
--- a/src/Qtx/QtxTreeView.h
+++ b/src/Qtx/QtxTreeView.h
@@ -29,7 +29,7 @@
 #pragma warning( disable:4251 )
 #endif
 
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 class QTX_EXPORT QtxTreeView : public QTreeView
 {

diff --git a/src/Qtx/QtxWebBrowser.cxx b/src/Qtx/QtxWebBrowser.cxx
index 14ef0fd3ef41a2fc05a45daa8a1ce09a88d5bd00..13168a006cc399d6c58a47c753b942cc323fe344 100644 (file)
--- a/src/Qtx/QtxWebBrowser.cxx
+++ b/src/Qtx/QtxWebBrowser.cxx
@@ -28,27 +28,27 @@
 #include "QtxSearchTool.h"
 
 #include <QtWidgets/QApplication>
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QMenu>
-#include <QMenuBar>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QStatusBar>
-#include <QToolBar>
-#include <QVBoxLayout>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QFileInfo>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QVBoxLayout>
 #if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
   #include <QWebView>
 #else
   #include <QWebEngineView>
 #endif
-#include <QProcess>
+#include <QtCore/QProcess>
 
 // RNV:
 // Since from Qt 5.6.0 version QtWebKit tool was removed,

diff --git a/src/Qtx/QtxWebBrowser.h b/src/Qtx/QtxWebBrowser.h
index 041609591970747688e3cbf0ccdbe0145919807c..08e55f8d12883559a6908810be50a5d1f9a7105f 100644 (file)
--- a/src/Qtx/QtxWebBrowser.h
+++ b/src/Qtx/QtxWebBrowser.h
@@ -31,8 +31,8 @@
 
 #include <QtGlobal>
 #include <QtWidgets/QDialog>
-#include <QMainWindow>
-#include <QUrl>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QUrl>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
 // Web Kit

diff --git a/src/Qtx/QtxWorkspace.cxx b/src/Qtx/QtxWorkspace.cxx
index 6fe250197d67115ff5725bb115152aa794f0ca6f..5e1d059946e9b3ed00f5dcd7aa838b8ddf7ff602 100644 (file)
--- a/src/Qtx/QtxWorkspace.cxx
+++ b/src/Qtx/QtxWorkspace.cxx
@@ -22,7 +22,7 @@
 //
 #include "QtxWorkspace.h"
 
-#include <QMdiSubWindow>
+#include <QtWidgets/QMdiSubWindow>
 
 /*!
   \class QtxWorkspace

diff --git a/src/Qtx/QtxWorkspace.h b/src/Qtx/QtxWorkspace.h
index cfe123fcfbe5c2206e0f4472deb31db6cc21fc24..83df4d228a35cffc5de0e2c85111fc752218e572 100644 (file)
--- a/src/Qtx/QtxWorkspace.h
+++ b/src/Qtx/QtxWorkspace.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QMdiArea>
+#include <QtWidgets/QMdiArea>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/Qtx/QtxWorkspaceAction.cxx b/src/Qtx/QtxWorkspaceAction.cxx
index a56193e3a762062c0649e25698dd910ede126ca7..f55b7704134dea84c017739c9a4f298d42c9d3a7 100644 (file)
--- a/src/Qtx/QtxWorkspaceAction.cxx
+++ b/src/Qtx/QtxWorkspaceAction.cxx
@@ -27,8 +27,8 @@
 
 #include "QtxWorkspace.h"
 
-#include <QMenu>
-#include <QMdiSubWindow>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMdiSubWindow>
 
 /*!
   \class QtxWorkspaceAction

diff --git a/src/Qtx/QtxWorkstack.cxx b/src/Qtx/QtxWorkstack.cxx
index fde056f4c0412ab3481fa4c7b12ac2f0ffd3f4b2..4957dea9e873090492575213656e484c250e1cbf 100644 (file)
--- a/src/Qtx/QtxWorkstack.cxx
+++ b/src/Qtx/QtxWorkstack.cxx
@@ -27,20 +27,20 @@
 
 #include "QtxAction.h"
 
-#include <QMenu>
-#include <QStyle>
-#include <QRegExp>
-#include <QLayout>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QStyle>
+#include <QtCore/QRegExp>
+#include <QtWidgets/QLayout>
 #include <QtGui/QPainter>
-#include <QDataStream>
+#include <QtCore/QDataStream>
 #include <QtGui/QFocusEvent>
 #include <QtGui/QMouseEvent>
-#include <QRubberBand>
+#include <QtWidgets/QRubberBand>
 #include <QtWidgets/QApplication>
-#include <QStyleOption>
-#include <QInputDialog>
-#include <QStackedWidget>
-#include <QAbstractButton>
+#include <QtWidgets/QStyleOption>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QAbstractButton>
 
 /*!
   \class QtxWorkstackArea::WidgetEvent

diff --git a/src/Qtx/QtxWorkstack.h b/src/Qtx/QtxWorkstack.h
index 12e1f7257e7a2b9cae18c4bc3ba7921838f7348e..e3c2a4e14c8a6f23eaed01b8d9d389b109b7d177 100644 (file)
--- a/src/Qtx/QtxWorkstack.h
+++ b/src/Qtx/QtxWorkstack.h
@@ -28,14 +28,14 @@
 
 #include "Qtx.h"
 
-#include <QMap>
-#include <QFrame>
-#include <QEvent>
-#include <QWidget>
-#include <QTabBar>
-#include <QPointer>
-#include <QSplitter>
-#include <QByteArray>
+#include <QtCore/QMap>
+#include <QtWidgets/QFrame>
+#include <QtCore/QEvent>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QTabBar>
+#include <QtCore/QPointer>
+#include <QtWidgets/QSplitter>
+#include <QtCore/QByteArray>
 
 class QAction;
 class QDataStream;

diff --git a/src/Qtx/QtxWorkstackAction.cxx b/src/Qtx/QtxWorkstackAction.cxx
index 91386254186cd06220540a04da5e06ce5ed41712..dffcb4503b45d19e82bec36caf999e3fc8f2f8b3 100644 (file)
--- a/src/Qtx/QtxWorkstackAction.cxx
+++ b/src/Qtx/QtxWorkstackAction.cxx
@@ -27,22 +27,22 @@
 
 #include "QtxWorkstack.h"
 
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QtGui/QWidgetList>
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QRadioButton>
-#include <QPushButton>
-#include <QListWidget>
-#include <QStackedLayout>
-#include <QToolButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QStackedLayout>
+#include <QtWidgets/QToolButton>
 #include <QtGui/QIcon>
 #include <QtGui/QPixmap>
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QLabel>
-#include <QComboBox>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QComboBox>
 
 const char* const prev_xpm[] = {
 "16 16 12 1",

diff --git a/src/QxScene/QxScene_ViewModel.cxx b/src/QxScene/QxScene_ViewModel.cxx
index 64e7e8484b48164f91afcf90f3bf1621efcac0c4..e59e02787bbf7ea0b9ee177c6691661bb3766c62 100644 (file)
--- a/src/QxScene/QxScene_ViewModel.cxx
+++ b/src/QxScene/QxScene_ViewModel.cxx
@@ -27,8 +27,8 @@
 #include "SUIT_Session.h"
 
 #include <qcolordialog.h>
-#include <QMenu>
-#include <QToolBar>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QToolBar>
 
 //#define _DEVDEBUG_
 #include "DebTrace.hxx"

diff --git a/src/QxScene/QxScene_ViewWindow.cxx b/src/QxScene/QxScene_ViewWindow.cxx
index 289a89df9cc64b264696320e44786fe27c99b072..df78a7b66f19ee448f2a7d84065357c1cec60a2c 100644 (file)
--- a/src/QxScene/QxScene_ViewWindow.cxx
+++ b/src/QxScene/QxScene_ViewWindow.cxx
@@ -31,8 +31,8 @@
 #include <QtxActionToolMgr.h>
 
 //QT Include
-#include <QToolBar>
-#include <QGraphicsRectItem>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QGraphicsRectItem>
 
 //#define _DEVDEBUG_
 #include "DebTrace.hxx"

diff --git a/src/QxScene/QxScene_ViewWindow.h b/src/QxScene/QxScene_ViewWindow.h
index 56ca7d3984c49bc5e4e72e90d740ef0d6c279221..fee7cdb296ffcf672f8857a327bea19a518ae9be 100644 (file)
--- a/src/QxScene/QxScene_ViewWindow.h
+++ b/src/QxScene/QxScene_ViewWindow.h
@@ -31,8 +31,8 @@
 
 #include <qaction.h>
 
-#include <QGraphicsScene>
-#include <QGraphicsView>
+#include <QtWidgets/QGraphicsScene>
+#include <QtWidgets/QGraphicsView>
 
 #ifdef WIN32
 #pragma warning ( disable:4251 )

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
index ade29ba4ffd695ec4916de34d9fc2dd216e7b792..270fb5564025151123419ddf8870a1eda09bde98 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
@@ -29,7 +29,7 @@
 #include <SALOME_LifeCycleCORBA.hxx>
 #include <Container_init_python.hxx>
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 //
 // NB: Python requests.

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
index 92fda689fc21d19b37f128857478b1687d75ec28..9387e3869135812f6621d19e1f87508cea6e913f 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
@@ -37,7 +37,7 @@
 #include <Container_init_python.hxx>
 #endif
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <utilities.h>
 
 // Py_ssize_t for old Pythons

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 9c41399cbe27c32b10f69869233c204aa83bbb71..825b2cbb1ffb6e521200569db938df5cb4651983 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
@@ -29,8 +29,8 @@
 #include "LightApp_Module.h"
 
 #include <QtGui/QIcon>
-#include <QMap>
-#include <QStringList>
+#include <QtCore/QMap>
+#include <QtCore/QStringList>
 
 class QMenu;
 class PyModuleHelper;

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 039b7d2beb9283f643163517cb575b062cba966c..d23a7968a2632f719cf95de79f43e705f04c50b3 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
@@ -44,9 +44,9 @@
 #include <QtXml/QDomDocument>
 #include <QtXml/QDomElement>
 #include <QtXml/QDomNode>
-#include <QFile>
-#include <QMenu>
-#include <QMutex>
+#include <QtCore/QFile>
+#include <QtWidgets/QMenu>
+#include <QtCore/QMutex>
 
 #include <utilities.h>
 

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 cea72baf18da9fd45f332bae1124a43b8087c6db..d984cf86be8b4cd7836435e1a8e0ef5aa5bcca28 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.h
@@ -29,10 +29,10 @@
 #include "PyInterp_Interp.h" // !!! WARNING !!! THIS INCLUDE MUST BE THE VERY FIRST !!!
 
 #include <QtGui/QIcon>
-#include <QList>
-#include <QMap>
-#include <QObject>
-#include <QStringList>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
 
 class CAM_Application;
 class LightApp_DataObject;

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.cxx
index 249c1d113fbbf8498ef13d5b75f74724c5e1682f..0c02969400d68baf206739212037dfc4178e829d 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.cxx
@@ -32,7 +32,7 @@
 #include "SALOME_PYQT_BorrowedDataObjectLight.h"
 #include <SUIT_Session.h>
 #include <SUIT_DataObjectIterator.h>
-#include <QTime>
+#include <QtCore/QTime>
 #include <time.h>
 
 #include <utilities.h>

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.h
index bbc058e308a75120775163ff99ea7938c6605e8d..c5f6be869e1e602b67ed8b7d7f637faf295841ed 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.h
@@ -34,7 +34,7 @@
 #include <SUIT_Selector.h>
 #include <SUIT_DataOwner.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class SALOME_PYQT_ModuleLight;
 class LightApp_DataObject;

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
index 2b6a58604c9f0baa413a6f9055359801cb7774f7..6ddedc85788153ec375a0455233afb9e954c9442 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
@@ -66,11 +66,11 @@
 #include "SUIT_ViewWindow.h"
 #include "PyConsole_Console.h"
 
-#include <QAction>
+#include <QtWidgets/QAction>
 #include <QtWidgets/QApplication>
 #include <QtGui/QPaintEvent>
-#include <QCoreApplication>
-#include <QVBoxLayout>
+#include <QtCore/QCoreApplication>
+#include <QtWidgets/QVBoxLayout>
 
 #include <utilities.h>
 

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
index 187dd7bd7a9f19dcd585a7e92db6a3b1be7e02e6..1ad7824b673ae4cb5e830ff87305b8ed7ca624b4 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
@@ -28,8 +28,8 @@
 
 #include <Python.h>
 
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #include <QtGui/QColor>
 
 #include <LightApp_Application.h>

diff --git a/src/SPlot2d/SPlot2d_Curve.h b/src/SPlot2d/SPlot2d_Curve.h
index cb1d0a92aa7bc1c1843b4d46247bf149731bdb73..7cc738a4ea9835097db9b8ff98d56fc30fb0982f 100644 (file)
--- a/src/SPlot2d/SPlot2d_Curve.h
+++ b/src/SPlot2d/SPlot2d_Curve.h
@@ -29,7 +29,7 @@
 #include "Plot2d_Curve.h"
 #include "SALOME_InteractiveObject.hxx"
 
-#include <QSet>
+#include <QtCore/QSet>
 
 typedef QSet<QString> OwnerSet;
 

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

diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx
index 58845aff9271b0cea2d600d4a347b9f0c3c288ae..cae2feb1bee0879241ec4ad6e0fa8c12881e15ee 100644 (file)
--- a/src/STD/STD_Application.cxx
+++ b/src/STD/STD_Application.cxx
@@ -37,10 +37,10 @@
 #include <QtxActionMenuMgr.h>
 #include <QtxActionToolMgr.h>
 
-#include <QMenu>
-#include <QStatusBar>
-#include <QCloseEvent>
-#include <QFileDialog>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QStatusBar>
+#include <QtGui/QCloseEvent>
+#include <QtWidgets/QFileDialog>
 #include <QtWidgets/QApplication>
 
 /*!Create and return new instance of STD_Application*/

diff --git a/src/STD/STD_Application.h b/src/STD/STD_Application.h
index 6e7286f76bdd2806ef4a3289054b17cd7fcd263c..8ab4a0e9a72a302f90ff7911525cda005f460c8f 100644 (file)
--- a/src/STD/STD_Application.h
+++ b/src/STD/STD_Application.h
@@ -29,8 +29,8 @@
 
 #include <QtxNotify.h>
 
-#include <QList>
-#include <QPointer>
+#include <QtCore/QList>
+#include <QtCore/QPointer>
 
 class QMenu;
 class QCloseEvent;

diff --git a/src/STD/STD_MDIDesktop.cxx b/src/STD/STD_MDIDesktop.cxx
index 82c6dcd457bd1bf10200c20319eccbb80ccf3a94..4f66128690ab030cf0bdfedaa094277a908595bd 100644 (file)
--- a/src/STD/STD_MDIDesktop.cxx
+++ b/src/STD/STD_MDIDesktop.cxx
@@ -30,9 +30,9 @@
 #include <QtxActionMenuMgr.h>
 #include <QtxWorkspaceAction.h>
 
-#include <QFrame>
-#include <QVBoxLayout>
-#include <QMdiSubWindow>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QMdiSubWindow>
 
 #include <stdarg.h>
 

diff --git a/src/STD/STD_SDIDesktop.cxx b/src/STD/STD_SDIDesktop.cxx
index b9bf591fa8be063efcb1f71c6b7538c9185fef78..e8ee52a80e99b64e913b972d8b35a754812df73e 100644 (file)
--- a/src/STD/STD_SDIDesktop.cxx
+++ b/src/STD/STD_SDIDesktop.cxx
@@ -24,8 +24,8 @@
 
 #include <SUIT_ViewWindow.h>
 
-#include <QFrame>
-#include <QVBoxLayout>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QVBoxLayout>
 
 /*!Constructor. Create instance of QVBox*/
 STD_SDIDesktop::STD_SDIDesktop()

diff --git a/src/STD/STD_TabDesktop.cxx b/src/STD/STD_TabDesktop.cxx
index c71bfdacda3a58e9f3d3333526c0d82c9a152174..2a680550f3b11aac7e44144f995d0e90ae80e2b9 100644 (file)
--- a/src/STD/STD_TabDesktop.cxx
+++ b/src/STD/STD_TabDesktop.cxx
@@ -30,8 +30,8 @@
 #include <QtxActionMenuMgr.h>
 #include <QtxWorkstackAction.h>
 
-#include <QFrame>
-#include <QVBoxLayout>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QVBoxLayout>
 
 #include <stdarg.h>
 

diff --git a/src/SUIT/SUIT_Accel.cxx b/src/SUIT/SUIT_Accel.cxx
index fe64fb319dfe343b2a0c316c0b4712d50d859bf2..ba50e52afcece7f69a54c95faa5de174d9d43712 100644 (file)
--- a/src/SUIT/SUIT_Accel.cxx
+++ b/src/SUIT/SUIT_Accel.cxx
@@ -28,8 +28,8 @@
 #include "SUIT_ViewManager.h"
 #include "SUIT_ViewModel.h"
 
-#include <QCoreApplication>
-#include <QEvent>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QEvent>
 #include <QtGui/QKeyEvent>
 
 /*!

diff --git a/src/SUIT/SUIT_Accel.h b/src/SUIT/SUIT_Accel.h
index 1bf594b589e2f7408dd058a0f7eb98633238974e..52d6ddc7323678bcdbbe0804477bd621b3f86d56 100644 (file)
--- a/src/SUIT/SUIT_Accel.h
+++ b/src/SUIT/SUIT_Accel.h
@@ -27,9 +27,9 @@
 
 #include "SUIT.h"
 
-#include <QMap>
-#include <QObject>
-#include <QString>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 
 class SUIT_EXPORT SUIT_Accel: public QObject
 {

diff --git a/src/SUIT/SUIT_Application.cxx b/src/SUIT/SUIT_Application.cxx
index fd157553b2e81cfb0d54590c44caef888e83201d..0dc538733eec606710fafdf580f1cfa3dbd769c5 100644 (file)
--- a/src/SUIT/SUIT_Application.cxx
+++ b/src/SUIT/SUIT_Application.cxx
@@ -28,11 +28,11 @@
 #include "SUIT_ResourceMgr.h"
 #include "SUIT_ShortcutMgr.h"
 
-#include <QTimer>
-#include <QLabel>
-#include <QStatusBar>
+#include <QtCore/QTimer>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QStatusBar>
 #include <QtWidgets/QApplication>
-#include <QSize>
+#include <QtCore/QSize>
 
 #include <QtxAction.h>
 #include <QtxActionMenuMgr.h>

diff --git a/src/SUIT/SUIT_Application.h b/src/SUIT/SUIT_Application.h
index 9dd2379f2dfd8c5e3cc26cc2caded972953d6c8d..9662204f124c35a9b3be522193f7e7d16cc122b2 100644 (file)
--- a/src/SUIT/SUIT_Application.h
+++ b/src/SUIT/SUIT_Application.h
@@ -25,8 +25,8 @@
 
 #include "SUIT.h"
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 
 class QIcon;
 class QLabel;

diff --git a/src/SUIT/SUIT_DataBrowser.cxx b/src/SUIT/SUIT_DataBrowser.cxx
index f499333ad5157f93caed8520833be5cf4d9519f9..28ceb2f227678751fcd39b9bbaad3d5e8e2afce6 100644 (file)
--- a/src/SUIT/SUIT_DataBrowser.cxx
+++ b/src/SUIT/SUIT_DataBrowser.cxx
@@ -24,7 +24,7 @@
 #include "SUIT_TreeModel.h"
 #include <QtxTreeView.h>
 
-#include <QShortcut>
+#include <QtWidgets/QShortcut>
 
 /*!
   \class SUIT_DataBrowser

diff --git a/src/SUIT/SUIT_DataObject.cxx b/src/SUIT/SUIT_DataObject.cxx
index dd8df4966b5f8e73d7ef114e44b24ab0cc25d855..1761efd0d9f4232b85743251f1159365a626bfa2 100644 (file)
--- a/src/SUIT/SUIT_DataObject.cxx
+++ b/src/SUIT/SUIT_DataObject.cxx
@@ -23,7 +23,7 @@
 // File   : SUIT_DataObject.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 
-#include <QVariant>
+#include <QtCore/QVariant>
 
 #include "SUIT_DataObject.h"
 #include "SUIT_DataObjectKey.h"

diff --git a/src/SUIT/SUIT_DataObject.h b/src/SUIT/SUIT_DataObject.h
index 09f6185f19965416ae19a6804e1b19d1b76a8ed7..aa1c64f48b818661224545fd1c2a8041d93a8f0d 100644 (file)
--- a/src/SUIT/SUIT_DataObject.h
+++ b/src/SUIT/SUIT_DataObject.h
@@ -30,9 +30,9 @@
 
 #include <Qtx.h>
 
-#include <QList>
-#include <QObject>
-#include <QString>
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #include <QtGui/QPixmap>
 #include <QtGui/QFont>
 

diff --git a/src/SUIT/SUIT_DataOwner.h b/src/SUIT/SUIT_DataOwner.h
index 58bd4f4eb21088e6010392afae7045622f4574d0..d2235d078cf31bf6cdaf17a743cacec316a9870a 100644 (file)
--- a/src/SUIT/SUIT_DataOwner.h
+++ b/src/SUIT/SUIT_DataOwner.h
@@ -25,9 +25,9 @@
 
 #include "SUIT_SmartPtr.h"
 
-#include <QMap>
-#include <QList>
-#include <QString>
+#include <QtCore/QMap>
+#include <QtCore/QList>
+#include <QtCore/QString>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/SUIT/SUIT_Desktop.cxx b/src/SUIT/SUIT_Desktop.cxx
index c34781c1b00dc5cd0b518b8ca6aabbdd1f176fc4..334a6cf665c260de79352121c16511e6e648f191 100644 (file)
--- a/src/SUIT/SUIT_Desktop.cxx
+++ b/src/SUIT/SUIT_Desktop.cxx
@@ -28,8 +28,8 @@
 #include <QtxActionMenuMgr.h>
 #include <QtxActionToolMgr.h>
 
-#include <QPointer>
-#include <QCloseEvent>
+#include <QtCore/QPointer>
+#include <QtGui/QCloseEvent>
 #include <QtWidgets/QApplication>
 
 /*!\class SUIT_Desktop

diff --git a/src/SUIT/SUIT_Desktop.h b/src/SUIT/SUIT_Desktop.h
index f191d902b9ad1d7e5d7d0faec9e74306084e47ef..295e480de702867669cf4a54d03d83262b5be2f6 100644 (file)
--- a/src/SUIT/SUIT_Desktop.h
+++ b/src/SUIT/SUIT_Desktop.h
@@ -25,8 +25,8 @@
 
 #include "SUIT.h"
 
-#include <QList>
-#include <QEvent>
+#include <QtCore/QList>
+#include <QtCore/QEvent>
 
 #include <QtxMainWindow.h>
 

diff --git a/src/SUIT/SUIT_ExceptionHandler.h b/src/SUIT/SUIT_ExceptionHandler.h
index e2a4ced49b5d728ba17fdee906002f1d883a7aaa..472659f0a2b004babb11d606060162de6cbe1d51 100644 (file)
--- a/src/SUIT/SUIT_ExceptionHandler.h
+++ b/src/SUIT/SUIT_ExceptionHandler.h
@@ -24,7 +24,7 @@
 #define SUIT_EXCEPTIONHANDLER_H
 
 #include "SUIT.h"
-#include <QList>
+#include <QtCore/QList>
 
 class QEvent;
 class QObject;

diff --git a/src/SUIT/SUIT_FileDlg.cxx b/src/SUIT/SUIT_FileDlg.cxx
index 462ba0cdbfdccdc90b2f847a4797a804847cad42..d44dcf6e90991e85213701eebfe52f230a0dadb6 100644 (file)
--- a/src/SUIT/SUIT_FileDlg.cxx
+++ b/src/SUIT/SUIT_FileDlg.cxx
@@ -82,18 +82,18 @@
 #include "SUIT_FileValidator.h"
 #include "Qtx.h"
 
-#include <QDir>
-#include <QEvent>
-#include <QRegExp>
-#include <QLabel>
-#include <QComboBox>
-#include <QPushButton>
-#include <QGridLayout>
+#include <QtCore/QDir>
+#include <QtCore/QEvent>
+#include <QtCore/QRegExp>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
 #include <QtWidgets/QApplication>
-#include <QListView>
-#include <QLineEdit>
-#include <QUrl>
-#include <QStandardPaths>
+#include <QtWidgets/QListView>
+#include <QtWidgets/QLineEdit>
+#include <QtCore/QUrl>
+#include <QtCore/QStandardPaths>
 
 /*!
   \brief Defines extension behavior.

diff --git a/src/SUIT/SUIT_FileDlg.h b/src/SUIT/SUIT_FileDlg.h
index 159342fc4645efde46f8222637911e76f2391e7b..044dcfdea2221ef9cf843692daf85490a4932983 100644 (file)
--- a/src/SUIT/SUIT_FileDlg.h
+++ b/src/SUIT/SUIT_FileDlg.h
@@ -28,7 +28,7 @@
 
 #include "SUIT.h"
 
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
 
 class QLabel;
 class QLineEdit;

diff --git a/src/SUIT/SUIT_FileValidator.cxx b/src/SUIT/SUIT_FileValidator.cxx
index 4b3d2a92fabcf3b957fb7091fee0bf9282f92415..ab2f6cd353b717cf0bb3c711131e891d9ec57e0d 100644 (file)
--- a/src/SUIT/SUIT_FileValidator.cxx
+++ b/src/SUIT/SUIT_FileValidator.cxx
@@ -26,7 +26,7 @@
 #include "SUIT_FileValidator.h"
 #include "SUIT_MessageBox.h"
 #include "SUIT_Tools.h"   
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 
 /*!
   \class SUIT_FileValidator

diff --git a/src/SUIT/SUIT_LicenseDlg.cxx b/src/SUIT/SUIT_LicenseDlg.cxx
index a674d38166438117cca846b60c7aaef9cf13afe4..9dd0c85f73e2289e03dbefd2e135a9551cf7e6d1 100644 (file)
--- a/src/SUIT/SUIT_LicenseDlg.cxx
+++ b/src/SUIT/SUIT_LicenseDlg.cxx
@@ -20,11 +20,11 @@
 #include "SUIT_LicenseDlg.h"
 
 #include <QtWidgets/QApplication>
-#include <QTextEdit>
-#include <QLayout> 
-#include <QPushButton>
-#include <QTextStream> 
-#include <QFile>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QLayout> 
+#include <QtWidgets/QPushButton>
+#include <QtCore/QTextStream> 
+#include <QtCore/QFile>
 #include <QtPrintSupport/QPrinter>
 //#include <QSimpleRichText>
 #include <QtGui/QTextDocument>

diff --git a/src/SUIT/SUIT_MessageBox.cxx b/src/SUIT/SUIT_MessageBox.cxx
index 67225980f6ef67c3eb0570125fa4639104018d5e..875845616fb427377f4e1b92ae64c0fde7f23448 100644 (file)
--- a/src/SUIT/SUIT_MessageBox.cxx
+++ b/src/SUIT/SUIT_MessageBox.cxx
@@ -24,10 +24,10 @@
 
 #include "SUIT_OverrideCursor.h"
 
-#include <QMessageBox>
-#include <QPushButton>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QPushButton>
 #include <QtWidgets/QApplication>
-#include <QString>
+#include <QtCore/QString>
 
 #include <stdarg.h>
 

diff --git a/src/SUIT/SUIT_MessageBox.h b/src/SUIT/SUIT_MessageBox.h
index 38309a6023431f4df6f3327f1af91ced3753ee83..e160babcce538a6766c82694ff2b7056921d67b1 100644 (file)
--- a/src/SUIT/SUIT_MessageBox.h
+++ b/src/SUIT/SUIT_MessageBox.h
@@ -25,9 +25,9 @@
 
 #include "SUIT.h"
 
-#include <QMap>
-#include <QList>
-#include <QMessageBox>
+#include <QtCore/QMap>
+#include <QtCore/QList>
+#include <QtWidgets/QMessageBox>
 
 class SUIT_EXPORT SUIT_MessageBox : public QMessageBox
 {

diff --git a/src/SUIT/SUIT_Operation.h b/src/SUIT/SUIT_Operation.h
index 22a8a289e0d1ffd3147649d75e1f6f37ac96f13a..162841117c40acf45259d933e97c8f6d2a39a6ca 100644 (file)
--- a/src/SUIT/SUIT_Operation.h
+++ b/src/SUIT/SUIT_Operation.h
@@ -25,8 +25,8 @@
 
 #include "SUIT.h"
 
-#include <QObject>
-#include <QPointer>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
 
 class SUIT_Study;
 class SUIT_Application;

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

diff --git a/src/SUIT/SUIT_PopupClient.h b/src/SUIT/SUIT_PopupClient.h
index 0a97e0a52b7b6bb09697709ce351c2041b53beaf..e609670eabac13c2b52c51a31c889efacdeab332 100644 (file)
--- a/src/SUIT/SUIT_PopupClient.h
+++ b/src/SUIT/SUIT_PopupClient.h
@@ -25,7 +25,7 @@
 
 #include "SUIT.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class QMenu;
 class QContextMenuEvent;

diff --git a/src/SUIT/SUIT_ResourceMgr.cxx b/src/SUIT/SUIT_ResourceMgr.cxx
index 256245f6960bff396a3cc92880e5a102fd290131..0f67ca8704bada6ca7e17802d443c246343345b0 100644 (file)
--- a/src/SUIT/SUIT_ResourceMgr.cxx
+++ b/src/SUIT/SUIT_ResourceMgr.cxx
@@ -23,10 +23,10 @@
 #include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
 
-#include <QDir>
-#include <QFileInfo>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
 #include <QtWidgets/QApplication>
-#include <QRegExp>
+#include <QtCore/QRegExp>
 
 #ifndef WIN32
 #include <unistd.h>

diff --git a/src/SUIT/SUIT_SelectionMgr.h b/src/SUIT/SUIT_SelectionMgr.h
index d7ffba7de2e1eb1053db911ee4577cf14f6397d2..10f3cfa693b3c68589ae8f28cbc61486c9398de2 100644 (file)
--- a/src/SUIT/SUIT_SelectionMgr.h
+++ b/src/SUIT/SUIT_SelectionMgr.h
@@ -25,8 +25,8 @@
 
 #include "SUIT_DataOwner.h"
 
-#include <QList>
-#include <QObject>
+#include <QtCore/QList>
+#include <QtCore/QObject>
 
 class SUIT_Selector;
 class SUIT_SelectionFilter;

diff --git a/src/SUIT/SUIT_Selector.cxx b/src/SUIT/SUIT_Selector.cxx
index 9641030fdee44a5e2023d1ca8e66471b1e0c9b33..b4ce7104a2498b00a230d3996fc7d1b9bb81e542 100644 (file)
--- a/src/SUIT/SUIT_Selector.cxx
+++ b/src/SUIT/SUIT_Selector.cxx
@@ -24,7 +24,7 @@
 
 #include "SUIT_SelectionMgr.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 /*!\class SUIT_Selector::Destroyer
   Class provide the watching for qobject parent class of the selector.

diff --git a/src/SUIT/SUIT_Selector.h b/src/SUIT/SUIT_Selector.h
index 2e81cc8db7a06d5916c1c4bd489840223985827a..74ab0c8c5ce358eebf9ff96ddf869263a7ca75e8 100644 (file)
--- a/src/SUIT/SUIT_Selector.h
+++ b/src/SUIT/SUIT_Selector.h
@@ -25,7 +25,7 @@
 
 #include "SUIT.h"
 
-#include <QList>
+#include <QtCore/QList>
 
 class QObject;
 

diff --git a/src/SUIT/SUIT_Session.h b/src/SUIT/SUIT_Session.h
index 8e244acfb8929de6d9e62dd210fb78c4ee58d83d..296379458e455010e3e024d6070944a7022e7156 100644 (file)
--- a/src/SUIT/SUIT_Session.h
+++ b/src/SUIT/SUIT_Session.h
@@ -26,10 +26,10 @@
 #include "SUIT.h"
 #include "SUIT_Application.h"
 
-#include <QList>
-#include <QObject>
-#include <QString>
-#include <QStringList>
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 #ifdef WIN32
 #include <windows.h>

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

diff --git a/src/SUIT/SUIT_ShortcutMgr.h b/src/SUIT/SUIT_ShortcutMgr.h
index 0eb16827ca862d1aa7a6d65d103231435b27325d..9ca1e0ca27b201776af137f16dcf9e30acaa9514 100644 (file)
--- a/src/SUIT/SUIT_ShortcutMgr.h
+++ b/src/SUIT/SUIT_ShortcutMgr.h
@@ -25,8 +25,8 @@
 
 #include "SUIT.h"
 
-#include <QObject>
-#include <QMultiMap>
+#include <QtCore/QObject>
+#include <QtCore/QMultiMap>
 
 class QtxAction;
 

diff --git a/src/SUIT/SUIT_Study.h b/src/SUIT/SUIT_Study.h
index c6639282e899df4b370e61c929ba418f62b9525a..5673ea9adc914fec2f6c0975c8b73ba0ecd516cb 100644 (file)
--- a/src/SUIT/SUIT_Study.h
+++ b/src/SUIT/SUIT_Study.h
@@ -25,9 +25,9 @@
 
 #include "SUIT.h"
 
-#include <QList>
-#include <QObject>
-#include <QListIterator>
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QListIterator>
 
 class SUIT_DataObject;
 class SUIT_Application;

diff --git a/src/SUIT/SUIT_Tools.cxx b/src/SUIT/SUIT_Tools.cxx
index 08e6f4120f9f7ea203269dccf5b406a51cebf123..65304634fd84da7ae85eeecbc2d9d26ff0506e1a 100644 (file)
--- a/src/SUIT/SUIT_Tools.cxx
+++ b/src/SUIT/SUIT_Tools.cxx
@@ -22,7 +22,7 @@
 
 #include "SUIT_Tools.h"
 
-#include <QDir>
+#include <QtCore/QDir>
 
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/src/SUIT/SUIT_Tools.h b/src/SUIT/SUIT_Tools.h
index 8357d0d668c1b08f69a8b3c5d16b85b226cc5001..8e351867a7325b318b4f51147a41fadefce660b4 100644 (file)
--- a/src/SUIT/SUIT_Tools.h
+++ b/src/SUIT/SUIT_Tools.h
@@ -27,8 +27,8 @@
 
 #include <Qtx.h>
 
-#include <QRect>
-#include <QString>
+#include <QtCore/QRect>
+#include <QtCore/QString>
 #include <QtGui/QFont>
 
 /*!

diff --git a/src/SUIT/SUIT_TreeModel.cxx b/src/SUIT/SUIT_TreeModel.cxx
index 466bec8215b4272313787c0507ecfc144adb635d..a114ea06534a2930035814711ae43026e2183b59 100644 (file)
--- a/src/SUIT/SUIT_TreeModel.cxx
+++ b/src/SUIT/SUIT_TreeModel.cxx
@@ -27,8 +27,8 @@
 #include "SUIT_ResourceMgr.h"
 
 #include <QtWidgets/QApplication>
-#include <QHash>
-#include <QMimeData>
+#include <QtCore/QHash>
+#include <QtCore/QMimeData>
 
 SUIT_AbstractModel::SUIT_AbstractModel() : mySearcher( 0 )
 {

diff --git a/src/SUIT/SUIT_TreeModel.h b/src/SUIT/SUIT_TreeModel.h
index 9e899e86e3afac8ba0a9a024776ce8f7aee72acc..0101ef94d238e7d1fea29456b07a71d9a47f6464 100644 (file)
--- a/src/SUIT/SUIT_TreeModel.h
+++ b/src/SUIT/SUIT_TreeModel.h
@@ -27,12 +27,12 @@
 
 #include <Qtx.h>
 
-#include <QAbstractItemModel>
-#include <QSortFilterProxyModel>
-#include <QModelIndex>
-#include <QItemDelegate>
-#include <QVariant>
-#include <QMap>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QModelIndex>
+#include <QtWidgets/QItemDelegate>
+#include <QtCore/QVariant>
+#include <QtCore/QMap>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )

diff --git a/src/SUIT/SUIT_TreeSync.h b/src/SUIT/SUIT_TreeSync.h
index a52b07ee54658c4137588f987afed6835f9b69c3..9c64b1420cfd8c9c0d08c413f07183a77c18c853 100644 (file)
--- a/src/SUIT/SUIT_TreeSync.h
+++ b/src/SUIT/SUIT_TreeSync.h
@@ -26,7 +26,7 @@
 #ifndef SUIT_TREESYNC_H
 #define SUIT_TREESYNC_H
 
-#include <QList>
+#include <QtCore/QList>
 
 /*!
   \brief The structure representing difference between source and destination items.

diff --git a/src/SUIT/SUIT_ViewManager.cxx b/src/SUIT/SUIT_ViewManager.cxx
index 5ad57f4137c6f37e188b1a0a5ae4b240863385d0..e32de01c29fba053362634b272e8e44c69bbc5fd 100644 (file)
--- a/src/SUIT/SUIT_ViewManager.cxx
+++ b/src/SUIT/SUIT_ViewManager.cxx
@@ -28,8 +28,8 @@
 #include "SUIT_Study.h"
 #include "SUIT_Session.h"
 
-#include <QMap>
-#include <QRegExp>
+#include <QtCore/QMap>
+#include <QtCore/QRegExp>
 #include <QtGui/QIcon>
 
 #ifdef WIN32

diff --git a/src/SUIT/SUIT_ViewManager.h b/src/SUIT/SUIT_ViewManager.h
index 45e72e8a74571c30db5f59e3ba841a92fd0358a0..bed0ebf4be52bbdc9c77a343b196fdad1e88dc16 100644 (file)
--- a/src/SUIT/SUIT_ViewManager.h
+++ b/src/SUIT/SUIT_ViewManager.h
@@ -27,10 +27,10 @@
 
 #include "SUIT_PopupClient.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtGui/QPixmap>
-#include <QVector>
-#include <QPointer>
+#include <QtCore/QVector>
+#include <QtCore/QPointer>
 
 class QMenu;
 class QMouseEvent;

diff --git a/src/SUIT/SUIT_ViewModel.h b/src/SUIT/SUIT_ViewModel.h
index f0d8269c80b98a26c0b6c01e70c6132b6eae2b16..f95f1fac2a3fb178c486e8f521791d9c8edd207b 100644 (file)
--- a/src/SUIT/SUIT_ViewModel.h
+++ b/src/SUIT/SUIT_ViewModel.h
@@ -25,8 +25,8 @@
 
 #include "SUIT.h"
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 
 class QMenu;
 

diff --git a/src/SUIT/SUIT_ViewWindow.cxx b/src/SUIT/SUIT_ViewWindow.cxx
index bf4772ead16fe040693d474c97f94194c6d2d68b..db17964677d3ecfcf238659fc8f2d04f9c548bcd 100644 (file)
--- a/src/SUIT/SUIT_ViewWindow.cxx
+++ b/src/SUIT/SUIT_ViewWindow.cxx
@@ -36,11 +36,11 @@
 #include "QtxActionToolMgr.h"
 #include "QtxMultiAction.h"
 
-#include <QEvent>
+#include <QtCore/QEvent>
 #include <QtGui/QIcon>
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QtWidgets/QApplication>
-#include <QContextMenuEvent>
+#include <QtGui/QContextMenuEvent>
 
 /*!\class SUIT_ViewWindow
  * Class provide view window.

diff --git a/src/SUIT/SUIT_ViewWindow.h b/src/SUIT/SUIT_ViewWindow.h
index ac2f60e3e58175441d8f3ca12dc0516a68cb1cfd..9a34650d7661bc165a53f0fbd741310269f8cc10 100644 (file)
--- a/src/SUIT/SUIT_ViewWindow.h
+++ b/src/SUIT/SUIT_ViewWindow.h
@@ -28,9 +28,9 @@
 #include "SUIT.h"
 #include "SUIT_CameraProperties.h"
 
-#include <QMainWindow>
-#include <QList>
-#include <QMap>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QList>
+#include <QtCore/QMap>
 
 class SUIT_Desktop;
 class SUIT_ViewManager;

diff --git a/src/SUITApp/SUITApp.cxx b/src/SUITApp/SUITApp.cxx
index a2bdfb4110d42640bfce65800c8dfb9c251f1cf6..2782eeb4cb23c96096a52493bad2a593cee25fff 100644 (file)
--- a/src/SUITApp/SUITApp.cxx
+++ b/src/SUITApp/SUITApp.cxx
@@ -35,12 +35,12 @@
 #endif // USE_SALOME_STYLE
 #include "QtxSplash.h"
 
-#include <QDir>
-#include <QFile>
-#include <QLocale>
-#include <QRegExp>
-#include <QString>
-#include <QStringList>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QLocale>
+#include <QtCore/QRegExp>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 #include <stdlib.h>
 

diff --git a/src/SUITApp/SUITApp_Application.cxx b/src/SUITApp/SUITApp_Application.cxx
index 2816250ea74cdec9de8126ac0500657978f4d60c..deca8c2efa3c13ad2f1b0e375a4d6c25eeb1baef 100644 (file)
--- a/src/SUITApp/SUITApp_Application.cxx
+++ b/src/SUITApp/SUITApp_Application.cxx
@@ -27,7 +27,7 @@
 
 #include <Qtx.h>
 
-#include <QDir>
+#include <QtCore/QDir>
 
 #ifdef WIN32
 #include <windows.h>

diff --git a/src/SUITApp/SUITApp_init_python.cxx b/src/SUITApp/SUITApp_init_python.cxx
index 54075a41d72d972593f7b30921d3f4dcd498cd55..35083509fe2da95b1ad027853130f57fee8dae2c 100644 (file)
--- a/src/SUITApp/SUITApp_init_python.cxx
+++ b/src/SUITApp/SUITApp_init_python.cxx
@@ -21,7 +21,7 @@
 //  Date   : 22/06/2007
 //
 #include "SUITApp_init_python.hxx"
-#include <QString>
+#include <QtCore/QString>
 
 #if PY_VERSION_HEX < 0x03050000
 static char*

diff --git a/src/SVTK/SALOME_Actor.cxx b/src/SVTK/SALOME_Actor.cxx
index c2d169dd7c372fd173a1c3489a4e598e1277f150..f4ca53ad7515cebd35f61713590582907fb7784c 100644 (file)
--- a/src/SVTK/SALOME_Actor.cxx
+++ b/src/SVTK/SALOME_Actor.cxx
@@ -69,8 +69,8 @@
 #include <TColStd_IndexedMapOfInteger.hxx>
 
 #include <math.h>
-#include <QPoint>
-#include <QVector>
+#include <QtCore/QPoint>
+#include <QtCore/QVector>
 
 #if defined __GNUC__
   #if __GNUC__ == 2

diff --git a/src/SVTK/SVTK_AreaPicker.h b/src/SVTK/SVTK_AreaPicker.h
index 344c8fca0009f1a74c9d7727c3b14b546ffab13a..1c0d2cc7974398a79fa54029b103a2f99104d2ab 100644 (file)
--- a/src/SVTK/SVTK_AreaPicker.h
+++ b/src/SVTK/SVTK_AreaPicker.h
@@ -36,8 +36,8 @@
 
 #include <vtkAbstractPropPicker.h>
 #include <vtkDataSet.h>
-#include <QVector>
-#include <QPoint>
+#include <QtCore/QVector>
+#include <QtCore/QPoint>
 
 class vtkRenderer;
 

diff --git a/src/SVTK/SVTK_ComboAction.cxx b/src/SVTK/SVTK_ComboAction.cxx
index 1dfed062ba3e299bfeab1e313bfd0a098c134253..750c8820bfecbef22c2453c31c9b828808c3d402 100644 (file)
--- a/src/SVTK/SVTK_ComboAction.cxx
+++ b/src/SVTK/SVTK_ComboAction.cxx
@@ -23,8 +23,8 @@
 
 #include "SVTK_ComboAction.h"
 
-#include <QComboBox>
-#include <QHBoxLayout>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QHBoxLayout>
 
 SVTK_ComboAction::SVTK_ComboAction( QObject* parent )
   : QWidgetAction( parent )

diff --git a/src/SVTK/SVTK_ComboAction.h b/src/SVTK/SVTK_ComboAction.h
index ae2f778d4e3152fba12df40d0999d15c91715e93..162731ab19b5e50c0b40ebeb4d6a2cec06fc0efb 100644 (file)
--- a/src/SVTK/SVTK_ComboAction.h
+++ b/src/SVTK/SVTK_ComboAction.h
@@ -26,7 +26,7 @@
 
 #include "SVTK.h"
 
-#include <QWidgetAction>
+#include <QtWidgets/QWidgetAction>
 
 class QComboBox;
 class SVTK_EXPORT SVTK_ComboAction : public QWidgetAction

diff --git a/src/SVTK/SVTK_CubeAxesDlg.cxx b/src/SVTK/SVTK_CubeAxesDlg.cxx
index 9adc8b4e86a2bc1fbfc79e94365ff887a1db411a..0b4fff3af23912d6fcaf2e0a966cee15ee24379a 100644 (file)
--- a/src/SVTK/SVTK_CubeAxesDlg.cxx
+++ b/src/SVTK/SVTK_CubeAxesDlg.cxx
@@ -35,9 +35,9 @@
 #include "QtxAction.h"
 #include "QtxIntSpinBox.h"
 
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QLineEdit>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLineEdit>
 
 #include <vtkAxisActor2D.h>
 #include <vtkTextProperty.h>

diff --git a/src/SVTK/SVTK_FontWidget.cxx b/src/SVTK/SVTK_FontWidget.cxx
index d218f13247030953468f4285b70b5581c2ef158e..83ebbec07574621d38c7426ac44baf1964894fcf 100644 (file)
--- a/src/SVTK/SVTK_FontWidget.cxx
+++ b/src/SVTK/SVTK_FontWidget.cxx
@@ -27,7 +27,7 @@
 //
 #include "SVTK_FontWidget.h"
 
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
 
 #include <vtkTextProperty.h>
 

diff --git a/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx b/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx
index c7485dc0f1f6c23391912c9b54cee9cbbb7d6cf8..31b4ab4163fc838a893fc5361982f792298aa897 100644 (file)
--- a/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx
+++ b/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx
@@ -30,7 +30,7 @@
 #include <vtkObjectFactory.h>
 #include <vtkCommand.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 vtkStandardNewMacro(QVTK_GenericRenderWindowInteractor);
 

diff --git a/src/SVTK/SVTK_GenericRenderWindowInteractor.h b/src/SVTK/SVTK_GenericRenderWindowInteractor.h
index 22ac36fe23190fe141e8345bb8a9174f121f11ec..1d17fae8a1b1fc8d235c41838a6f68a293d80dec 100644 (file)
--- a/src/SVTK/SVTK_GenericRenderWindowInteractor.h
+++ b/src/SVTK/SVTK_GenericRenderWindowInteractor.h
@@ -29,7 +29,7 @@
 
 #include "SVTK.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <vtkGenericRenderWindowInteractor.h>
 #include <vtkSmartPointer.h>
 

diff --git a/src/SVTK/SVTK_ImageWriter.cxx b/src/SVTK/SVTK_ImageWriter.cxx
index 8900864901d59cbf1f2a6d1b11f5e1e645444eb3..cfc940a2dae64e037b0e6aa57c36179e0ea86ef8 100644 (file)
--- a/src/SVTK/SVTK_ImageWriter.cxx
+++ b/src/SVTK/SVTK_ImageWriter.cxx
@@ -19,7 +19,7 @@
 
 #include "SVTK_ImageWriter.h"
 
-#include <QSemaphore>
+#include <QtCore/QSemaphore>
 
 #include <vtkAlgorithm.h>
 #include <vtkImageData.h>

diff --git a/src/SVTK/SVTK_ImageWriter.h b/src/SVTK/SVTK_ImageWriter.h
index 673fa320866436b87588829e7ad9bfe46658951d..08b0620aff5118c16670aaa4dbc8c11acfd0665c 100644 (file)
--- a/src/SVTK/SVTK_ImageWriter.h
+++ b/src/SVTK/SVTK_ImageWriter.h
@@ -20,7 +20,7 @@
 #ifndef SVTK_IMAGEWRITER_H
 #define SVTK_IMAGEWRITER_H
 
-#include <QThread>
+#include <QtCore/QThread>
 #include <string>
 
 class vtkAlgorithm;

diff --git a/src/SVTK/SVTK_ImageWriterMgr.cxx b/src/SVTK/SVTK_ImageWriterMgr.cxx
index 0712222c54c8f74a0988a5467a254698f8823970..f650a333cb12be03ae53bfa2da1d7f66fc61a650 100644 (file)
--- a/src/SVTK/SVTK_ImageWriterMgr.cxx
+++ b/src/SVTK/SVTK_ImageWriterMgr.cxx
@@ -23,7 +23,7 @@
 #include <vtkAlgorithm.h>
 #include <vtkImageData.h>
 
-#include <QSemaphore>
+#include <QtCore/QSemaphore>
 
 #include <limits>
 

diff --git a/src/SVTK/SVTK_InteractorStyle.cxx b/src/SVTK/SVTK_InteractorStyle.cxx
index 65f946ffd37915066599e9fad291c73479085e6f..336157ca2d3a0a810a6d6dc614ea49e6ae46800f 100644 (file)
--- a/src/SVTK/SVTK_InteractorStyle.cxx
+++ b/src/SVTK/SVTK_InteractorStyle.cxx
@@ -60,8 +60,8 @@
 #include <QtxRubberBand.h>
 
 #include <QtGui/QPixmap>
-#include <QWidget>
-#include <QPolygon>
+#include <QtWidgets/QWidget>
+#include <QtGui/QPolygon>
 
 #include <algorithm>
 #include <iostream>

diff --git a/src/SVTK/SVTK_NonIsometricDlg.cxx b/src/SVTK/SVTK_NonIsometricDlg.cxx
index 68dd0b006b852ed0d56377f4348f23d03e9faea0..b7508f31eda76671eb275215aba8ea8e21097b45 100644 (file)
--- a/src/SVTK/SVTK_NonIsometricDlg.cxx
+++ b/src/SVTK/SVTK_NonIsometricDlg.cxx
@@ -31,10 +31,10 @@
 #include "QtxDoubleSpinBox.h"
 #include "QtxAction.h"
 
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
 
 /*!
   Constructor

diff --git a/src/SVTK/SVTK_PsOptionsDlg.cxx b/src/SVTK/SVTK_PsOptionsDlg.cxx
index f350fe82eab4dd2421e4b411db94d5d8f2a275b7..d7b3fad3a70cf9befc57cd46bda2b5c2315dc581 100644 (file)
--- a/src/SVTK/SVTK_PsOptionsDlg.cxx
+++ b/src/SVTK/SVTK_PsOptionsDlg.cxx
@@ -21,13 +21,13 @@
 
 #include <QtxDoubleSpinBox.h>
 
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QLayout>
-#include <QSlider>
-#include <QPushButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QPushButton>
 
 /*!
  * Constructor

diff --git a/src/SVTK/SVTK_Recorder.cxx b/src/SVTK/SVTK_Recorder.cxx
index 77a08d2cb612a5a400b260a734007b4cd0741d37..f2fd4315300fd29c6a2da7a8366fce6a8e4897d0 100644 (file)
--- a/src/SVTK/SVTK_Recorder.cxx
+++ b/src/SVTK/SVTK_Recorder.cxx
@@ -40,8 +40,8 @@
 #endif
 
 #include <QtWidgets/QApplication>
-#include <QFileInfo>
-#include <QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
 
 //#include "utilities.h"
 

diff --git a/src/SVTK/SVTK_RecorderDlg.cxx b/src/SVTK/SVTK_RecorderDlg.cxx
index af32c7f67f7f37398131eb055f6cf256a216ca69..d3388c4b80a129430c34bb90d991859946fcc2c9 100644 (file)
--- a/src/SVTK/SVTK_RecorderDlg.cxx
+++ b/src/SVTK/SVTK_RecorderDlg.cxx
@@ -30,14 +30,14 @@
 #include <QtxDoubleSpinBox.h>
 #include <QtxIntSpinBox.h>
 
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGroupBox>
 #include <QtGui/QKeyEvent>
-#include <QLabel>
-#include <QLayout>
-#include <QLineEdit>
-#include <QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
 
 /*!
  * Constructor

diff --git a/src/SVTK/SVTK_RenderWindowInteractor.cxx b/src/SVTK/SVTK_RenderWindowInteractor.cxx
index 617975fedd28e5cdc8386b5ef5e8d738d459e9a9..75e4e5cf9589f795854ee2797ca4efeeca857a5e 100644 (file)
--- a/src/SVTK/SVTK_RenderWindowInteractor.cxx
+++ b/src/SVTK/SVTK_RenderWindowInteractor.cxx
@@ -36,7 +36,7 @@
 // (see SVTK_SpaceMouse.h) to avoid the compilation error.
 #if !defined(WIN32) && !defined(__APPLE__)
 #include <xcb/xcb.h>
-#include <QX11Info>
+#include <QtX11Extras/QX11Info>
 #endif
 #include <QtGui/QMouseEvent>
 

diff --git a/src/SVTK/SVTK_RenderWindowInteractor.h b/src/SVTK/SVTK_RenderWindowInteractor.h
index feb30df6a9119231338481bbdae8e33bcc5f819e..cfc0ad656d12196f51aef1dcbc51511a592c18bc 100644 (file)
--- a/src/SVTK/SVTK_RenderWindowInteractor.h
+++ b/src/SVTK/SVTK_RenderWindowInteractor.h
@@ -31,7 +31,7 @@
 #include "SVTK_Selection.h"
 
 #include <vtkSmartPointer.h>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 // undefining min and max because CASCADE's defines them and
 // it clashes with std::min(), std::max()

diff --git a/src/SVTK/SVTK_SelectionEvent.h b/src/SVTK/SVTK_SelectionEvent.h
index 2f4cafbf6f901ecc5356c4a651bdfec508140f7a..f982ad7e40b8dd5abbe30ff97451801fed0a8ced 100644 (file)
--- a/src/SVTK/SVTK_SelectionEvent.h
+++ b/src/SVTK/SVTK_SelectionEvent.h
@@ -28,8 +28,8 @@
 #define SVTK_SELECTIONEVENT_H
 
 #include "SVTK_Selection.h"
-#include <QPoint>
-#include <QVector>
+#include <QtCore/QPoint>
+#include <QtCore/QVector>
 
 //! The structure is used for passing all infromation necessary for claculation of the selection.
 /*!

diff --git a/src/SVTK/SVTK_SetRotationPointDlg.cxx b/src/SVTK/SVTK_SetRotationPointDlg.cxx
index f2d1fb95a1b7c162709bd962a89359730bfbade0..91905b9d6ab0f66ce47cb2346bebdef569734c5f 100644 (file)
--- a/src/SVTK/SVTK_SetRotationPointDlg.cxx
+++ b/src/SVTK/SVTK_SetRotationPointDlg.cxx
@@ -34,14 +34,14 @@
 
 #include "QtxAction.h"
 
-#include <QLineEdit>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QMenu>
-#include <QGridLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QGridLayout>
 #include <QtGui/QDoubleValidator>
-#include <QCheckBox>
+#include <QtWidgets/QCheckBox>
 
 #include <vtkCallbackCommand.h>
 #include <vtkInteractorStyle.h>

diff --git a/src/SVTK/SVTK_SetRotationPointDlg.h b/src/SVTK/SVTK_SetRotationPointDlg.h
index d371d8b7ffa3478aa8e63be0a9bec947bf1ce020..90d17695bd16fb293bd7fd94d3792790c15a85a1 100644 (file)
--- a/src/SVTK/SVTK_SetRotationPointDlg.h
+++ b/src/SVTK/SVTK_SetRotationPointDlg.h
@@ -34,8 +34,8 @@
 
 #include <vtkSmartPointer.h>
 
-#include <QMap>
-#include <QList>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 
 class SVTK_ViewWindow;
 class SVTK_RenderWindowInteractor;

diff --git a/src/SVTK/SVTK_UpdateRateDlg.cxx b/src/SVTK/SVTK_UpdateRateDlg.cxx
index 3b406649232b0bec858b3c0d755e408b094574cb..926f0fb6a0d8c9a0f0ccebec9cfc9dc6d01f78e3 100644 (file)
--- a/src/SVTK/SVTK_UpdateRateDlg.cxx
+++ b/src/SVTK/SVTK_UpdateRateDlg.cxx
@@ -36,11 +36,11 @@
 
 #include <sstream>
 
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QGridLayout>
-#include <QLineEdit>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QLineEdit>
 
 #include <vtkGenericRenderWindowInteractor.h>
 #include <vtkCallbackCommand.h>

diff --git a/src/SVTK/SVTK_View.h b/src/SVTK/SVTK_View.h
index 0820fe8722c3143631551fd45d690dfacbee62ec..7b47436e4d22bad12599b2f4f16539f5a6a2ca4a 100644 (file)
--- a/src/SVTK/SVTK_View.h
+++ b/src/SVTK/SVTK_View.h
@@ -32,7 +32,7 @@
 #include <SALOME_InteractiveObject.hxx>
 #include <SALOME_ListIO.hxx>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class vtkActorCollection;
 class vtkRenderer;

diff --git a/src/SVTK/SVTK_ViewModel.cxx b/src/SVTK/SVTK_ViewModel.cxx
index 600bb3ba94e2e4c143f937de44d5fa7d300a1798..7b7e2056a63d474e476db4cc24b5b45ce99c31b4 100644 (file)
--- a/src/SVTK/SVTK_ViewModel.cxx
+++ b/src/SVTK/SVTK_ViewModel.cxx
@@ -20,9 +20,9 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QMenu>
-#include <QColorDialog>
-#include <QToolBar>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QToolBar>
 
 #include <vtkCamera.h>
 #include <vtkRenderer.h>

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

diff --git a/src/SVTK/SVTK_ViewParameterDlg.cxx b/src/SVTK/SVTK_ViewParameterDlg.cxx
index 538c0647d4897aa534dc71b169663c3956764d9e..62193dd449531627e69b65e43d90ab80a4186216 100644 (file)
--- a/src/SVTK/SVTK_ViewParameterDlg.cxx
+++ b/src/SVTK/SVTK_ViewParameterDlg.cxx
@@ -31,15 +31,15 @@
 
 #include "QtxAction.h"
 
-#include <QLineEdit>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QGridLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
 #include <QtGui/QDoubleValidator>
-#include <QCheckBox>
-#include <QRadioButton>
-#include <QButtonGroup>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QButtonGroup>
 
 #include <vtkCallbackCommand.h>
 #include <vtkRenderer.h>

diff --git a/src/SVTK/SVTK_ViewWindow.cxx b/src/SVTK/SVTK_ViewWindow.cxx
index 68166affab33d3b15e8d990142a7d8e4a1c420bb..aae91362947cf6ff086a0dcb6214eff640dc80a2 100644 (file)
--- a/src/SVTK/SVTK_ViewWindow.cxx
+++ b/src/SVTK/SVTK_ViewWindow.cxx
@@ -32,14 +32,14 @@
 
 #include "SALOME_Actor.h"
 
-#include <QMenu>
-#include <QToolBar>
-#include <QEvent>
-#include <QFileInfo>
-#include <QSignalMapper>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
-#include <QXmlStreamAttributes>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QToolBar>
+#include <QtCore/QEvent>
+#include <QtCore/QFileInfo>
+#include <QtCore/QSignalMapper>
+#include <QtCore/QXmlStreamWriter>
+#include <QtCore/QXmlStreamReader>
+#include <QtCore/QXmlStreamAttributes>
 
 #include <vtkTextProperty.h>
 #include <vtkActorCollection.h>

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 7df168366c5631c11134010136008db464ae0c5a..c48db0d6bf2f66accaff0276b8cdf4461ffc69b3 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -85,15 +85,15 @@
 #include <SALOME_LifeCycleCORBA.hxx>
 
 #include <QtWidgets/QApplication>
-#include <QWidget>
-#include <QAction>
-#include <QRegExp>
-#include <QCheckBox>
-#include <QPushButton>
-#include <QLabel>
-#include <QListWidget>
-#include <QGridLayout>
-#include <QMenu>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QAction>
+#include <QtCore/QRegExp>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QMenu>
 #include <QtDebug>
 
 #include <SALOMEDSClient_ClientFactory.hxx>

diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h
index e0bde79b7e8eae98c8a024b1a3d2db962d98e53c..4bebcf99c7617231fb7616a1770c3979065054cd 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.h
+++ b/src/SalomeApp/SalomeApp_Application.h
@@ -42,7 +42,7 @@
 
 #include "SALOMEDSClient.hxx"
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 class LightApp_Preferences;
 class SalomeApp_Study;

diff --git a/src/SalomeApp/SalomeApp_CheckFileDlg.cxx b/src/SalomeApp/SalomeApp_CheckFileDlg.cxx
index aa275969f25e4045a41e2bf6515e4a0b08e1f6e0..065ec046e1e1c9648078361ae9be95a5e1509075 100644 (file)
--- a/src/SalomeApp/SalomeApp_CheckFileDlg.cxx
+++ b/src/SalomeApp/SalomeApp_CheckFileDlg.cxx
@@ -22,10 +22,10 @@
 
 #include "SalomeApp_CheckFileDlg.h"
 
-#include <QCheckBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QGridLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
 
 /*!
 Constructor

diff --git a/src/SalomeApp/SalomeApp_DataObject.cxx b/src/SalomeApp/SalomeApp_DataObject.cxx
index b8e9a70458359e55abb74eef4df0608e305fe86d..1a5cb85ea04e1617f6813c9fc84e23fcc0f84404 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataObject.cxx
+++ b/src/SalomeApp/SalomeApp_DataObject.cxx
@@ -35,8 +35,8 @@
 #include <SALOME_LifeCycleCORBA.hxx>
 #include <Basics_Utils.hxx>
 
-#include <QObject>
-#include <QVariant>
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
 
 //VSR: uncomment below macro to support unicode text properly in SALOME
 //     current commented out due to regressions

diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
index a5dc983546c6adf9ae89d1f9e9195aed01a556ca..79cb192f3e0520c715a2da2ed823d86d07d62f71 100644 (file)
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
@@ -35,9 +35,9 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
 #include <QtGui/QKeyEvent>
-#include <QLineEdit>
-#include <QToolTip>
-#include <QRegExp>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QToolTip>
+#include <QtCore/QRegExp>
 
 #include <string>
 

diff --git a/src/SalomeApp/SalomeApp_Engine_i.cxx b/src/SalomeApp/SalomeApp_Engine_i.cxx
index 861d912ea3ac239aaa7873b576e9742a596688ff..ca2ad5bb6a6271f73946db24411d360af877e550 100644 (file)
--- a/src/SalomeApp/SalomeApp_Engine_i.cxx
+++ b/src/SalomeApp/SalomeApp_Engine_i.cxx
@@ -39,8 +39,8 @@
 #include <utilities.h>
 
 #include <QtWidgets/QApplication>
-#include <QDir>
-#include <QFile>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
 
 #include <iostream>
 

diff --git a/src/SalomeApp/SalomeApp_Engine_i.h b/src/SalomeApp/SalomeApp_Engine_i.h
index 78f2285636f822089230d8e7bd873b6d32fcd325..4704bb1c4dee325e9ce4bfa39d07eb04c0be1524 100644 (file)
--- a/src/SalomeApp/SalomeApp_Engine_i.h
+++ b/src/SalomeApp/SalomeApp_Engine_i.h
@@ -31,7 +31,7 @@
 
 #include "SALOME_Component_i.hxx"
 
-#include <QString>
+#include <QtCore/QString>
 #include <vector> 
 #include <map> 
 

diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
index f27c739ebd1458e64d62ab3ce9fbaacf4e7751df..33ce3d0091165c285585ba21e5290981bed07ddb 100644 (file)
--- a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
+++ b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
@@ -28,7 +28,7 @@
 #include <stdexcept>
 #include <exception>
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>

diff --git a/src/SalomeApp/SalomeApp_ExitDlg.cxx b/src/SalomeApp/SalomeApp_ExitDlg.cxx
index 079a5a0e59a3543b1ab652ddc524be480f4101ef..ea58a4f83f3362683828783cc7e7a1c8873f061a 100644 (file)
--- a/src/SalomeApp/SalomeApp_ExitDlg.cxx
+++ b/src/SalomeApp/SalomeApp_ExitDlg.cxx
@@ -22,13 +22,13 @@
 //
 #include "SalomeApp_ExitDlg.h"
 
-#include <QLabel> 
-#include <QVBoxLayout> 
-#include <QHBoxLayout> 
-#include <QGridLayout> 
-#include <QPushButton>
-#include <QMessageBox>
-#include <QCheckBox>
+#include <QtWidgets/QLabel> 
+#include <QtWidgets/QVBoxLayout> 
+#include <QtWidgets/QHBoxLayout> 
+#include <QtWidgets/QGridLayout> 
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QCheckBox>
 
 /*!
  * \brief creates a Exit dialog box

diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.cxx b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
index da6657d03c31983deb482339ebd43068f0f8d5ae..cb1ed469bb58d00f7857b11b2233a34b227080b2 100644 (file)
--- a/src/SalomeApp/SalomeApp_IntSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
@@ -35,9 +35,9 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
 #include <QtGui/QKeyEvent>
-#include <QLineEdit>
-#include <QToolTip>
-#include <QRegExp>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QToolTip>
+#include <QtCore/QRegExp>
 
 #include <string>
 

diff --git a/src/SalomeApp/SalomeApp_ListView.cxx b/src/SalomeApp/SalomeApp_ListView.cxx
index f65d11c2d89e21c0fb2dc3b2923f1c7f311da9f1..87c45490155a3ae4fee785e98d0827ce24c6f789 100644 (file)
--- a/src/SalomeApp/SalomeApp_ListView.cxx
+++ b/src/SalomeApp/SalomeApp_ListView.cxx
@@ -32,9 +32,9 @@
 #include "utilities.h"
 
 #include <QtGui/QValidator>
-#include <QToolButton>
+#include <QtWidgets/QToolButton>
 #include <QtGui/QPixmap>
-#include <QHeaderView>
+#include <QtWidgets/QHeaderView>
 #include <QtGui/QKeyEvent>
 
 #include <TColStd_ListOfInteger.hxx>

diff --git a/src/SalomeApp/SalomeApp_ListView.h b/src/SalomeApp/SalomeApp_ListView.h
index ad5364869063a34d9ea19afc040e3419b25df08d..efc774288f45ae0e7ca97406452668b6759396f2 100644 (file)
--- a/src/SalomeApp/SalomeApp_ListView.h
+++ b/src/SalomeApp/SalomeApp_ListView.h
@@ -30,11 +30,11 @@
 
 #include <SUIT_PopupClient.h>
 
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <QString>
-#include <QLineEdit>
-#include <QComboBox>
+#include <QtWidgets/QTreeWidget>
+#include <QtWidgets/QTreeWidgetItem>
+#include <QtCore/QString>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QComboBox>
 
 #include <TColStd_ListOfInteger.hxx>
 #include <TColStd_ListOfReal.hxx>

diff --git a/src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx b/src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx
index e29dc496a5333ec03a1fb52bf52de5fafe51e9ea..78aaef95e1798fe46b98a4a2b5c5deaafbf3cb09 100644 (file)
--- a/src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx
+++ b/src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx
@@ -19,12 +19,12 @@
 
 #include "SalomeApp_LoadStudiesDlg.h"
 
-#include <QLabel>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QListWidget>
-#include <QPushButton>
-#include <QStringList>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QPushButton>
+#include <QtCore/QStringList>
 
 #define SPACING_SIZE             6
 #define MARGIN_SIZE             11

diff --git a/src/SalomeApp/SalomeApp_Module.cxx b/src/SalomeApp/SalomeApp_Module.cxx
index 92d0a4c69da3e916b46e74a580d0a097ec33ff22..6ed0044633a417bce53ef8132541e7cfdef4ccd3 100644 (file)
--- a/src/SalomeApp/SalomeApp_Module.cxx
+++ b/src/SalomeApp/SalomeApp_Module.cxx
@@ -48,7 +48,7 @@
 #include <SUIT_MessageBox.h>
 #include <SUIT_Desktop.h>
 
-#include <QString>
+#include <QtCore/QString>
 
 /*!Constructor.*/
 SalomeApp_Module::SalomeApp_Module( const QString& name )

diff --git a/src/SalomeApp/SalomeApp_NoteBook.cxx b/src/SalomeApp/SalomeApp_NoteBook.cxx
index f55f5f2c99317f95b6d74a8fe9a1542a1a038081..bfe078347043875bd1684da98cb4dfd163b3e675 100644 (file)
--- a/src/SalomeApp/SalomeApp_NoteBook.cxx
+++ b/src/SalomeApp/SalomeApp_NoteBook.cxx
@@ -38,16 +38,16 @@
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
 
-#include <QWidget>
-#include <QGridLayout>
-#include <QTableWidget>
-#include <QTableWidgetItem>
-#include <QPushButton>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QTableWidget>
+#include <QtWidgets/QTableWidgetItem>
+#include <QtWidgets/QPushButton>
 #include <QtGui/QFont>
-#include <QGroupBox>
-#include <QList>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QList>
 #include <QtWidgets/QApplication>
-#include <QDir>
+#include <QtCore/QDir>
 
 #include <string>
 #include <vector>

diff --git a/src/SalomeApp/SalomeApp_NoteBook.h b/src/SalomeApp/SalomeApp_NoteBook.h
index acc1ff487724323140665fb97fe274415509b664..995602ac6d4582c8a966dc7cc4c1cd776640b969 100644 (file)
--- a/src/SalomeApp/SalomeApp_NoteBook.h
+++ b/src/SalomeApp/SalomeApp_NoteBook.h
@@ -29,9 +29,9 @@
 #include "SALOMEDSClient_ClientFactory.hxx" 
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
-#include <QWidget>
-#include <QTableWidget>
-#include <QList>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QTableWidget>
+#include <QtCore/QList>
 
 class QWidget;
 class QPushButton;

diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index e3ffd5930affd756863e106830eab4c72bd55a57..c42f0e3f360c9ed6f7ca66a4e52bd8844a6156fc 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -36,9 +36,9 @@
 // temporary commented
 //#include <OB_Browser.h>
 
-#include <QCoreApplication>
-#include <QEvent>
-#include <QFileInfo>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QEvent>
+#include <QtCore/QFileInfo>
 #include "SALOME_Event.h"
 #include "Basics_Utils.hxx"
 

diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx
index a2db7c0ba21113a1735a2880f35f0e5877bfdd99..b6cf583f25aed943f6656219c047556615a5c32d 100644 (file)
--- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx
+++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx
@@ -37,17 +37,17 @@
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
 
 // QT Includes
-#include <QPushButton>
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QFrame>
-#include <QLineEdit>
-#include <QLabel>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QTextEdit>
-#include <QTreeWidget>
-#include <QPushButton>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QTreeWidget>
+#include <QtWidgets/QPushButton>
 
 #include <iostream>
  

diff --git a/src/SalomeApp/SalomeApp_Tools.cxx b/src/SalomeApp/SalomeApp_Tools.cxx
index 1f04c1265ecc8eb1e3fff14ab0b8442a5bd465b3..ce6a9a1c95f7572c26f8da549986c513fdaa51b0 100644 (file)
--- a/src/SalomeApp/SalomeApp_Tools.cxx
+++ b/src/SalomeApp/SalomeApp_Tools.cxx
@@ -28,8 +28,8 @@
 
 #include <utilities.h>
 
-#include <QColor>
-#include <QString>
+#include <QtGui/QColor>
+#include <QtCore/QString>
 
 #include <Quantity_Color.hxx>
 

diff --git a/src/SalomeApp/SalomeApp_TypeFilter.h b/src/SalomeApp/SalomeApp_TypeFilter.h
index a8cb5cf013ca11ec5cce5537ea7cdfa1616b6e03..c47c1f8c438d49bcb44001f26485112aa502fea1 100644 (file)
--- a/src/SalomeApp/SalomeApp_TypeFilter.h
+++ b/src/SalomeApp/SalomeApp_TypeFilter.h
@@ -23,7 +23,7 @@
 #ifndef SALOMEAPP_TYPEFILTER_H
 #define SALOMEAPP_TYPEFILTER_H
 
-#include <QString>
+#include <QtCore/QString>
 
 #include "SalomeApp_Filter.h"
 

diff --git a/src/SalomeApp/SalomeApp_VisualState.cxx b/src/SalomeApp/SalomeApp_VisualState.cxx
index a6db48879a0cc3f07fed176e649f35040d139b0d..bed1314e2a6f6c5dbce1ae60dd19333d3e244528 100644 (file)
--- a/src/SalomeApp/SalomeApp_VisualState.cxx
+++ b/src/SalomeApp/SalomeApp_VisualState.cxx
@@ -34,9 +34,9 @@
 
 #include <STD_TabDesktop.h>
 
-#include <QList>
+#include <QtCore/QList>
 #include <QtWidgets/QApplication>
-#include <QMultiHash>
+#include <QtCore/QMultiHash>
 
 #include <SALOMEDSClient_ClientFactory.hxx>//?
 #include <SALOMEDSClient_IParameters.hxx>//?

diff --git a/src/SalomeApp/SalomeApp_VisualState.h b/src/SalomeApp/SalomeApp_VisualState.h
index 3eb93b6fbedd5376a5402ebbc822f639f67bf670..47af2533a17acb23a54ad6151c6061685bce5bcf 100644 (file)
--- a/src/SalomeApp/SalomeApp_VisualState.h
+++ b/src/SalomeApp/SalomeApp_VisualState.h
@@ -29,7 +29,7 @@
 
 #include "SalomeApp.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class SalomeApp_Application;
 

diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index e6cb5d2d3ad25ec8638e0c4a508462a4f1c03c54..849c42da91f32cdbae3cf36e3ce3591d6cd3bdaa 100644 (file)
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -66,12 +66,12 @@
 #include <time.h>
 
 #include <QtWidgets/QApplication>
-#include <QDir>
-#include <QFile>
-#include <QMutex>
-#include <QRegExp>
-#include <QTextStream>
-#include <QWaitCondition>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QMutex>
+#include <QtCore/QRegExp>
+#include <QtCore/QTextStream>
+#include <QtCore/QWaitCondition>
 
 //! CORBA server for SALOME GUI session
 /*!

diff --git a/src/Session/Session_ServerCheck.cxx b/src/Session/Session_ServerCheck.cxx
index 4ebd1d4eff41a7da6c5dc5d42aef15bdc951b548..6139aaa7435e64162a5a1b95a0222fe51a402968 100644 (file)
--- a/src/Session/Session_ServerCheck.cxx
+++ b/src/Session/Session_ServerCheck.cxx
@@ -40,9 +40,9 @@
 #include "Qtx.h"
 
 #include <QtWidgets/QApplication> 
-#include <QWaitCondition>
-#include <QMutexLocker>
-#include <QStringList>
+#include <QtCore/QWaitCondition>
+#include <QtCore/QMutexLocker>
+#include <QtCore/QStringList>
 
 //
 // Default settings

diff --git a/src/Session/Session_ServerLauncher.cxx b/src/Session/Session_ServerLauncher.cxx
index 8da162cfe6bfeffa349a9b319b1c1fa147611941..895775add7c0dff57122052e321ea565e519afad 100644 (file)
--- a/src/Session/Session_ServerLauncher.cxx
+++ b/src/Session/Session_ServerLauncher.cxx
@@ -30,8 +30,8 @@
 #include "Utils_SALOME_Exception.hxx"
 #include "utilities.h"
 
-#include <QMutex>
-#include <QWaitCondition>
+#include <QtCore/QMutex>
+#include <QtCore/QWaitCondition>
 
 /*! 
    default constructor not for use

diff --git a/src/Session/Session_ServerThread.cxx b/src/Session/Session_ServerThread.cxx
index cdb0402a84af060be195d52db65a021881d27859..bf9d572c69aa18392f7903a37179d2e3df1e70fe 100644 (file)
--- a/src/Session/Session_ServerThread.cxx
+++ b/src/Session/Session_ServerThread.cxx
@@ -45,8 +45,8 @@
 #include <cstdlib>
 #include <ctime>
 
-#include <QMutex>
-#include <QWaitCondition>
+#include <QtCore/QMutex>
+#include <QtCore/QWaitCondition>
 
 const int Session_ServerThread::NB_SRV_TYP = 6;
 const char* Session_ServerThread::_serverTypes[NB_SRV_TYP] = {"Container",

diff --git a/src/Session/Session_Session_i.cxx b/src/Session/Session_Session_i.cxx
index 05a6e34b4567e9a19eb3b18777e7298709271e4d..d6f2bd9e72a4c37f6541abd72aff0f582ff27052 100644 (file)
--- a/src/Session/Session_Session_i.cxx
+++ b/src/Session/Session_Session_i.cxx
@@ -39,8 +39,8 @@
 
 #include "Basics_Utils.hxx"
 
-#include <QMutex>
-#include <QWaitCondition>
+#include <QtCore/QMutex>
+#include <QtCore/QWaitCondition>
 
 // Open CASCADE Includes
 #include <OSD_SharedLibrary.hxx>

diff --git a/src/Style/Style_Model.cxx b/src/Style/Style_Model.cxx
index c43bd028389003c36489e908efbb483537cc4131..91f97e540120d194863b4d596d0f25e17800e670 100644 (file)
--- a/src/Style/Style_Model.cxx
+++ b/src/Style/Style_Model.cxx
@@ -26,7 +26,7 @@
 #include <QtxResourceMgr.h>
 
 #include <QtWidgets/QApplication>
-#include <QColor>
+#include <QtGui/QColor>
 #include <QtGui/QFont>
 #include <QtGui/QPalette>
 

diff --git a/src/Style/Style_Model.h b/src/Style/Style_Model.h
index 034c57f5913813ba3205e62718b62c624947b9a9..89aad75f13912ca74a98beee21582526c0561ea8 100644 (file)
--- a/src/Style/Style_Model.h
+++ b/src/Style/Style_Model.h
@@ -25,8 +25,8 @@
 
 #include "Style.h"
 
-#include <QMap>
-#include <QString>
+#include <QtCore/QMap>
+#include <QtCore/QString>
 #include <QtGui/QPalette>
 #include <QtGui/QFont>
 

diff --git a/src/Style/Style_PrefDlg.cxx b/src/Style/Style_PrefDlg.cxx
index b8bb76e4b19a2fd0307ef6f4fd836e21f2436556..36d0d305bd82cf7659df44e31861d8962d5f9da2 100644 (file)
--- a/src/Style/Style_PrefDlg.cxx
+++ b/src/Style/Style_PrefDlg.cxx
@@ -30,25 +30,25 @@
 #include <QtxFontEdit.h>
 
 #include <QtWidgets/QApplication>
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QColorDialog>
-#include <QComboBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QHBoxLayout>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QHBoxLayout>
 #include <QtGui/QKeyEvent>
-#include <QLabel>
-#include <QListWidget>
-#include <QMap>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QSlider>
-#include <QSpinBox>
-#include <QStackedWidget>
-#include <QTabWidget>
-#include <QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QListWidget>
+#include <QtCore/QMap>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QVBoxLayout>
 
 static const int MARGIN  = 9;
 static const int SPACING = 6;

diff --git a/src/Style/Style_PrefDlg.h b/src/Style/Style_PrefDlg.h
index d594da82091f5d60c9e13a81ad363bad3cc60c09..6c60897c811f742beb8d8bd6dc543d0fb599760d 100644 (file)
--- a/src/Style/Style_PrefDlg.h
+++ b/src/Style/Style_PrefDlg.h
@@ -26,8 +26,8 @@
 #include "Style.h"
 
 #include <QtxDialog.h>
-#include <QFrame>
-#include <QMap>
+#include <QtWidgets/QFrame>
+#include <QtCore/QMap>
 
 class QCheckBox;
 class QComboBox;

diff --git a/src/Style/Style_Salome.cxx b/src/Style/Style_Salome.cxx
index 163893d0cc228049fc54525a539da2c95d62bb46..80628749ba40d1eea10a7c2f59eedb7f1c7a6dc2 100644 (file)
--- a/src/Style/Style_Salome.cxx
+++ b/src/Style/Style_Salome.cxx
@@ -26,40 +26,40 @@
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QPainter>
-#include <QMap>
-#include <QPainterPath>
-#include <QWidget>
-#include <QComboBox>
-#include <QStyleOptionFrame>
-#include <QStyleOptionComplex>
-#include <QStyleOptionSpinBox>
-#include <QStyleOptionButton>
-#include <QStyleOptionTab>
-#include <QStyleOptionToolButton>
-#include <QStyleOptionFocusRect>
-#include <QStyleOption>
-#include <QSize>
-#include <QToolBar>
-#include <QMenuBar>
-#include <QToolButton>
-#include <QTabWidget>
-#include <QTabBar>
-#include <QToolTip>
-#include <QDockWidget>
-#include <QTextEdit>
-#include <QTreeView>
-#include <QListView>
-#include <QHeaderView>
-#include <QRadioButton>
-#include <QCheckBox>
-#include <QPushButton>
-#include <QAbstractSpinBox>
-#include <QLineEdit>
-#include <QScrollBar>
-#include <QSlider>
-#include <QMainWindow>
-#include <QPixmapCache>
-#include <QTileRules>
+#include <QtCore/QMap>
+#include <QtGui/QPainterPath>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QStyleOptionFrame>
+#include <QtWidgets/QStyleOptionComplex>
+#include <QtWidgets/QStyleOptionSpinBox>
+#include <QtWidgets/QStyleOptionButton>
+#include <QtWidgets/QStyleOptionTab>
+#include <QtWidgets/QStyleOptionToolButton>
+#include <QtWidgets/QStyleOptionFocusRect>
+#include <QtWidgets/QStyleOption>
+#include <QtCore/QSize>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QTabBar>
+#include <QtWidgets/QToolTip>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QListView>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QAbstractSpinBox>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QScrollBar>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QMainWindow>
+#include <QtGui/QPixmapCache>
+#include <QtWidgets/QTileRules>
 
 #define SHADOW          1
 #define LINE_GR_MARGIN  10

diff --git a/src/Style/Style_Tools.cxx b/src/Style/Style_Tools.cxx
index 056425a8ea7be84467e5c9e4f9dca65a64ab8e3d..0b1c294a39fd381ba920c37438c5c6efa6f0c823 100644 (file)
--- a/src/Style/Style_Tools.cxx
+++ b/src/Style/Style_Tools.cxx
@@ -23,11 +23,11 @@
 #include "Style_Tools.h"
 
 #include <QtGui/QPainter>
-#include <QPainterPath>
-#include <QRect>
-#include <QColor>
-#include <QSize>
-#include <QTabWidget>
+#include <QtGui/QPainterPath>
+#include <QtCore/QRect>
+#include <QtGui/QColor>
+#include <QtCore/QSize>
+#include <QtWidgets/QTabWidget>
 
 /*!
   \class Style_Tools

diff --git a/src/Style/Style_Tools.h b/src/Style/Style_Tools.h
index 16bdbb8d5ac6763039d4d9c400f0805ee6007628..ec0bf7bdc0a82016109b2499df8598f67f4a5f17 100644 (file)
--- a/src/Style/Style_Tools.h
+++ b/src/Style/Style_Tools.h
@@ -26,9 +26,9 @@
 #include "Style.h"
 
 #include <QtGui/QPainterPath>
-#include <QRect>
+#include <QtCore/QRect>
 #include <QtGui/QColor>
-#include <QStyle>
+#include <QtWidgets/QStyle>
 
 //
 // This class is private for Style package.

diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
index 4040ab5f7a6193b052a82a494e2166a4e15913f5..82dffa0b88fbc33865c7db23a5b4c0288aac4b11 100644 (file)
--- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
+++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
@@ -33,15 +33,15 @@
 
 #include <stdlib.h>
 
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QStringList>
-#include <QRegExp>
-#include <QIntValidator>
-#include <QFile>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QStringList>
+#include <QtCore/QRegExp>
+#include <QtGui/QIntValidator>
+#include <QtCore/QFile>
 
 #include <Qtx.h>
 

diff --git a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
index c1cea7c5bfe05aa0927d950bc7748511d9bf5c08..9ef08575c685a706d5bd25abf6ce72c8b9386cf3 100644 (file)
--- a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
+++ b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
@@ -23,15 +23,15 @@
 # include "ToolsGUI_RegWidget.h"
 
 #include <QtWidgets/QApplication>
-#include <QInputDialog>
-#include <QMenuBar>
-#include <QStatusBar>
-#include <QTabWidget>
-#include <QTextEdit>
-#include <QTimer>
-#include <QToolBar>
-#include <QTreeWidget>
-#include <QVBoxLayout>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QTextEdit>
+#include <QtCore/QTimer>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QTreeWidget>
+#include <QtWidgets/QVBoxLayout>
 
 #include <Qtx.h>
 

diff --git a/src/TOOLSGUI/ToolsGUI_RegWidget.h b/src/TOOLSGUI/ToolsGUI_RegWidget.h
index f1d799ddacd8fedd12913b77153cfe39d911fe18..9a7a394745f14d4b47da066ca2e913304c152ee5 100644 (file)
--- a/src/TOOLSGUI/ToolsGUI_RegWidget.h
+++ b/src/TOOLSGUI/ToolsGUI_RegWidget.h
@@ -25,8 +25,8 @@
 
 #include "ToolsGUI.h"
 
-#include <QMainWindow>
-#include <QMap>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QMap>
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOME_Registry)

diff --git a/src/TreeData/DockWidgets.cxx b/src/TreeData/DockWidgets.cxx
index 67a09cf9e1f71584756af43e0b7cbf64f70a1660..3473d4085f39f0d7631c19261b4635ed4078ab9f 100644 (file)
--- a/src/TreeData/DockWidgets.cxx
+++ b/src/TreeData/DockWidgets.cxx
@@ -22,7 +22,7 @@
 #include "DockWidgets.hxx"
 
 // Qt includes
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 // SALOME includes
 #include <SUIT_Desktop.h>

diff --git a/src/TreeData/Test/guitester.cxx b/src/TreeData/Test/guitester.cxx
index bbabf18f786e4c9edcf29986816660a7ff97b5e9..6d07014a4545686fe00bde1595a887f0133a201b 100644 (file)
--- a/src/TreeData/Test/guitester.cxx
+++ b/src/TreeData/Test/guitester.cxx
@@ -18,9 +18,9 @@
 //
 
 #include <QtWidgets/QApplication>
-#include <QMainWindow>
-#include <QDockWidget>
-#include <QTreeView>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QTreeView>
 
 #include <Basics_Utils.hxx>
 

diff --git a/src/TreeData/Test/mainwindow.cxx b/src/TreeData/Test/mainwindow.cxx
index b7fa5721ee98d37519a80be1430e1f178460653e..ccf0bfc54c33fbf746690c20879a66fd068b647c 100644 (file)
--- a/src/TreeData/Test/mainwindow.cxx
+++ b/src/TreeData/Test/mainwindow.cxx
@@ -17,8 +17,8 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QInputDialog>
-#include <QContextMenuEvent>
+#include <QtWidgets/QInputDialog>
+#include <QtGui/QContextMenuEvent>
 
 #include "mainwindow.hxx"
 #include "TreeModel.hxx"

diff --git a/src/TreeData/Test/testhelper.cxx b/src/TreeData/Test/testhelper.cxx
index 1f970481337eaa18784cddf448f465ff13ac7620..754e95563fff55b7085148587f3fe19266460007 100644 (file)
--- a/src/TreeData/Test/testhelper.cxx
+++ b/src/TreeData/Test/testhelper.cxx
@@ -19,8 +19,8 @@
 
 #include "testhelper.hxx"
 
-#include <QFile>
-#include <QString>
+#include <QtCore/QFile>
+#include <QtCore/QString>
 
 #include "QtHelper.hxx"
 #include "MyDataModel.hxx"

diff --git a/src/TreeData/TreeGuiManager.cxx b/src/TreeData/TreeGuiManager.cxx
index 6b8d73eb4e292da7e891b128821b95c0d2a86ace..a7c92f57859bb6bcfe502b8a916881a4d9eb7696 100644 (file)
--- a/src/TreeData/TreeGuiManager.cxx
+++ b/src/TreeData/TreeGuiManager.cxx
@@ -22,7 +22,7 @@
 #include "TreeGuiManager.hxx"
 
 // SALOME includes
-#include <QStringList>
+#include <QtCore/QStringList>
 
 // XCAD includes
 #include "TreeView.hxx"

diff --git a/src/TreeData/TreeItem.cxx b/src/TreeData/TreeItem.cxx
index c46aa44e04ce48c6ee0ba3aa49b1205749001c19..f3e1ac4eb1953389f98818af6f1d77fee9d214ad 100644 (file)
--- a/src/TreeData/TreeItem.cxx
+++ b/src/TreeData/TreeItem.cxx
@@ -20,7 +20,7 @@
 // Author: Guillaume Boulant (EDF/R&D)
 
 
-#include <QStringList>
+#include <QtCore/QStringList>
 #include "TreeItem.hxx"
 
 TreeItem::TreeItem(const QString &nameId,

diff --git a/src/TreeData/TreeView.cxx b/src/TreeData/TreeView.cxx
index 87bb26b62e6fa2912d83d2d9b8cc64eb93034f78..aacca10044060d781dc1a34953a549371ecc3874 100644 (file)
--- a/src/TreeData/TreeView.cxx
+++ b/src/TreeData/TreeView.cxx
@@ -21,10 +21,10 @@
 
 
 // include Qt
-#include <QString>
-#include <QMenu>
-#include <QModelIndex>
-#include <QAbstractItemView>
+#include <QtCore/QString>
+#include <QtWidgets/QMenu>
+#include <QtCore/QModelIndex>
+#include <QtWidgets/QAbstractItemView>
 
 // include Xcad
 #include "TreeView.hxx"

diff --git a/src/VTKViewer/VTKViewer_FramedTextActor.cxx b/src/VTKViewer/VTKViewer_FramedTextActor.cxx
index 7d6ff060951677d803b9804d5d3de84fe1570649..1adcfc2b01cc64603f29d0e8d5c2e6943723f8de 100644 (file)
--- a/src/VTKViewer/VTKViewer_FramedTextActor.cxx
+++ b/src/VTKViewer/VTKViewer_FramedTextActor.cxx
@@ -33,7 +33,7 @@
 #include <vtkViewport.h>
 #include <vtkWindow.h>
 
-#include <QStringList>
+#include <QtCore/QStringList>
 
 #define TEXT_MARGIN    4
 #define OFFSET_SPACING 2

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

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

diff --git a/src/VTKViewer/VTKViewer_MarkerDlg.cxx b/src/VTKViewer/VTKViewer_MarkerDlg.cxx
index 281c5560ea52bd2dcb76e8b8a308bfdb39db9da6..602ee193085eac37eb5db00693b08b89b3c01faa 100644 (file)
--- a/src/VTKViewer/VTKViewer_MarkerDlg.cxx
+++ b/src/VTKViewer/VTKViewer_MarkerDlg.cxx
@@ -27,8 +27,8 @@
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
 
-#include <QFrame>
-#include <QVBoxLayout>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QVBoxLayout>
 #include <QtGui/QKeyEvent>
 
 /*!

diff --git a/src/VTKViewer/VTKViewer_MarkerUtils.cxx b/src/VTKViewer/VTKViewer_MarkerUtils.cxx
index 6b8ffe4b0fcd53e9a34a4e01e4b802320e96836d..6f299f4a7b3fc24f15efb15682d059f3c314b80f 100644 (file)
--- a/src/VTKViewer/VTKViewer_MarkerUtils.cxx
+++ b/src/VTKViewer/VTKViewer_MarkerUtils.cxx
@@ -23,10 +23,10 @@
 #include <vtkImageData.h>
 
 // QT Includes
-#include <QFile>
+#include <QtCore/QFile>
 #include <QtGui/QImage>
-#include <QString>
-#include <QTextStream>
+#include <QtCore/QString>
+#include <QtCore/QTextStream>
 
 namespace VTK
 {

diff --git a/src/VTKViewer/VTKViewer_MarkerWidget.cxx b/src/VTKViewer/VTKViewer_MarkerWidget.cxx
index 3e7b09575cf08b79a73f59dda35fdd5ccd718dba..d4a37f184af50d87c4b78daffd5f56782fe9b26c 100644 (file)
--- a/src/VTKViewer/VTKViewer_MarkerWidget.cxx
+++ b/src/VTKViewer/VTKViewer_MarkerWidget.cxx
@@ -25,10 +25,10 @@
 
 #include <vtkImageData.h>
 
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSpinBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QSpinBox>
 
 const int SPACING = 6;
 enum { TypeRole = Qt::UserRole, IdRole };

diff --git a/src/VTKViewer/VTKViewer_MarkerWidget.h b/src/VTKViewer/VTKViewer_MarkerWidget.h
index 23beda143cbfffd81320e11dea5ef6e998e95825..668218c8a843133ba27169dfbb4497e78668e3cc 100644 (file)
--- a/src/VTKViewer/VTKViewer_MarkerWidget.h
+++ b/src/VTKViewer/VTKViewer_MarkerWidget.h
@@ -25,7 +25,7 @@
 #include "VTKViewer.h"
 #include "VTKViewer_MarkerDef.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class QComboBox;
 class QLabel;

diff --git a/src/VTKViewer/VTKViewer_PolyDataMapper.cxx b/src/VTKViewer/VTKViewer_PolyDataMapper.cxx
index b59d4714eef134d4363d04e99e08d4a7a27bbb20..5399ee0e611f7b585b59319e1657eb95f520b08f 100644 (file)
--- a/src/VTKViewer/VTKViewer_PolyDataMapper.cxx
+++ b/src/VTKViewer/VTKViewer_PolyDataMapper.cxx
@@ -25,7 +25,7 @@
 
 #include <utilities.h>
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <vtkCellArray.h>
 #include <vtkXMLImageDataReader.h>

diff --git a/src/VTKViewer/VTKViewer_RenderWindow.cxx b/src/VTKViewer/VTKViewer_RenderWindow.cxx
index 29fdf177ee076866b60cdbcb24fbf867e1e00bfc..96a26e28ba6979205e58267a8bdcdff6ea228de9 100644 (file)
--- a/src/VTKViewer/VTKViewer_RenderWindow.cxx
+++ b/src/VTKViewer/VTKViewer_RenderWindow.cxx
@@ -22,8 +22,8 @@
 
 #include "VTKViewer_RenderWindow.h"
 
-#include <QColorDialog>
-#include <QContextMenuEvent>
+#include <QtWidgets/QColorDialog>
+#include <QtGui/QContextMenuEvent>
 
 #include <stdlib.h>
 #include <math.h>
@@ -32,7 +32,7 @@
 #include <vtkRendererCollection.h>
 #include <vtkCamera.h>
 #if !defined WIN32 && !defined __APPLE__
-#include <QX11Info>
+#include <QtX11Extras/QX11Info>
 #include <vtkXOpenGLRenderWindow.h>
 #endif
 

diff --git a/src/VTKViewer/VTKViewer_RenderWindow.h b/src/VTKViewer/VTKViewer_RenderWindow.h
index c1bfd8eae5c6e76de7f4dee819385cbb0a3a8d56..a729f8488c9ac76ccb9e5010e115ceaccee18759 100644 (file)
--- a/src/VTKViewer/VTKViewer_RenderWindow.h
+++ b/src/VTKViewer/VTKViewer_RenderWindow.h
@@ -27,7 +27,7 @@
 
 #include <vtkRenderWindow.h>
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class VTKVIEWER_EXPORT VTKViewer_RenderWindow : public QWidget 
 {

diff --git a/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx b/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
index a8f036b3c2845be3bb17ef51e18b7d6189fca4ce..e96627f938453e5496e64e432af4688fb842fd02 100644 (file)
--- a/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
+++ b/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
@@ -49,10 +49,10 @@
 #include <vtkProperty.h>
 
 // QT Includes
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QKeyEvent>
-#include <QContextMenuEvent>
+#include <QtGui/QContextMenuEvent>
 
 /*! Create new instance of VTKViewer_RenderWindowInteractor*/
 VTKViewer_RenderWindowInteractor* VTKViewer_RenderWindowInteractor::New() 

diff --git a/src/VTKViewer/VTKViewer_RenderWindowInteractor.h b/src/VTKViewer/VTKViewer_RenderWindowInteractor.h
index 7b997843c7078ce609636c00dcd152ea8ac6088e..67f9eeb1637571ab27426070373909b7046433d3 100644 (file)
--- a/src/VTKViewer/VTKViewer_RenderWindowInteractor.h
+++ b/src/VTKViewer/VTKViewer_RenderWindowInteractor.h
@@ -26,7 +26,7 @@
 #include "VTKViewer.h"
 #include "VTKViewer_Actor.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class QTimer;
 class QMouseEvent;

diff --git a/src/VTKViewer/VTKViewer_ViewModel.cxx b/src/VTKViewer/VTKViewer_ViewModel.cxx
index e0d47ff0ff08269357d100e6e025b2f45abb6add..615f6b0d139ff8d8112d07fc953ec0039848006e 100644 (file)
--- a/src/VTKViewer/VTKViewer_ViewModel.cxx
+++ b/src/VTKViewer/VTKViewer_ViewModel.cxx
@@ -30,10 +30,10 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 
-#include <QColorDialog>
-#include <QMenu>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QMenu>
 #include <QtGui/QMouseEvent>
-#include <QToolBar>
+#include <QtWidgets/QToolBar>
 
 // VSR: Uncomment below line to allow texture background support in VTK viewer
 #define VTK_ENABLE_TEXTURED_BACKGROUND

diff --git a/src/VTKViewer/VTKViewer_ViewWindow.cxx b/src/VTKViewer/VTKViewer_ViewWindow.cxx
index affd6c6d3a89d43016f39b6fe480e66bfb28b4a1..f35016a27943bd95c70b990902f3fdb7e34cc841 100644 (file)
--- a/src/VTKViewer/VTKViewer_ViewWindow.cxx
+++ b/src/VTKViewer/VTKViewer_ViewWindow.cxx
@@ -36,7 +36,7 @@
 #include <SUIT_Tools.h>
 #include <SUIT_ResourceMgr.h>
 
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 #include <QtGui/QImage>
 
 #include <vtkCamera.h>

diff --git a/src/ViewerTools/ViewerTools_CubeAxesDlgBase.cxx b/src/ViewerTools/ViewerTools_CubeAxesDlgBase.cxx
index 17d459703af81993d93a16ec4916bd9e8655e823..46b27ca1aeb2818bb08dce619e486a33c37b801b 100644 (file)
--- a/src/ViewerTools/ViewerTools_CubeAxesDlgBase.cxx
+++ b/src/ViewerTools/ViewerTools_CubeAxesDlgBase.cxx
@@ -27,14 +27,14 @@
 #include "QtxAction.h"
 #include "QtxIntSpinBox.h"
 
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QTabWidget>
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QLineEdit>
-#include <QLabel>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QLabel>
 
 /*!
  * Class       : ViewerTools_AxisWidgetBase

diff --git a/src/ViewerTools/ViewerTools_CubeAxesDlgBase.h b/src/ViewerTools/ViewerTools_CubeAxesDlgBase.h
index 66ed8218f0650180051aa016a3d972427a2f849f..33b337c9354b9a44045498b228fb505c648d864f 100644 (file)
--- a/src/ViewerTools/ViewerTools_CubeAxesDlgBase.h
+++ b/src/ViewerTools/ViewerTools_CubeAxesDlgBase.h
@@ -25,7 +25,7 @@
 
 #include "ViewerTools_DialogBase.h"
 
-#include <QFrame>
+#include <QtWidgets/QFrame>
 
 class QWidget;
 class QPushButton;

diff --git a/src/ViewerTools/ViewerTools_FontWidgetBase.cxx b/src/ViewerTools/ViewerTools_FontWidgetBase.cxx
index 5ae68a9858a06dbf041a0178bf0a10e91d787dc7..7ea1ffd0b7a6c40dd5ff2b52e219e862df954787 100644 (file)
--- a/src/ViewerTools/ViewerTools_FontWidgetBase.cxx
+++ b/src/ViewerTools/ViewerTools_FontWidgetBase.cxx
@@ -22,11 +22,11 @@
 
 #include "ViewerTools_FontWidgetBase.h"
 
-#include <QToolButton>
-#include <QComboBox>
-#include <QColorDialog>
-#include <QCheckBox>
-#include <QHBoxLayout>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QHBoxLayout>
 
 /*!
  * Class       : ViewerTools_FontWidgetBase

diff --git a/src/ViewerTools/ViewerTools_FontWidgetBase.h b/src/ViewerTools/ViewerTools_FontWidgetBase.h
index f9c678deef67e3bd929be5c7fba2ec28c5746ff3..f00df39de69d266e22f093b94e3edb0e6ba8aa03 100644 (file)
--- a/src/ViewerTools/ViewerTools_FontWidgetBase.h
+++ b/src/ViewerTools/ViewerTools_FontWidgetBase.h
@@ -25,7 +25,7 @@
 
 #include "ViewerTools.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class QToolButton;
 class QComboBox;

diff --git a/tools/CurvePlot/src/cpp/test/test_curveplot.cxx b/tools/CurvePlot/src/cpp/test/test_curveplot.cxx
index 1ae7fc369a8c6a029aef16c027b0382207b056c0..28dd0877790f3c7dc4faff6430336d184254bf41 100644 (file)
--- a/tools/CurvePlot/src/cpp/test/test_curveplot.cxx
+++ b/tools/CurvePlot/src/cpp/test/test_curveplot.cxx
@@ -30,13 +30,13 @@
 #include <PyInterp_Interp.h>  // GUI
 
 #include <QtWidgets/QApplication>
-#include <QDesktopWidget>
-#include <QMainWindow>
-#include <QList>
-#include <QWidget>
-#include <QVBoxLayout>
-#include <QDockWidget>
-#include <QPushButton>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QList>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QPushButton>
 
 using namespace CURVEPLOT;
 

diff --git a/tools/PyConsole/src/PyConsole_Console.cxx b/tools/PyConsole/src/PyConsole_Console.cxx
index 78b1b952e503a5dc94daa6672477e703e8c86146..5f303f7105b56546da0deb521443423c318c27eb 100644 (file)
--- a/tools/PyConsole/src/PyConsole_Console.cxx
+++ b/tools/PyConsole/src/PyConsole_Console.cxx
@@ -26,12 +26,12 @@
 #include "PyConsole_Console.h"
 #include "PyConsole_Editor.h"
 
-#include <QAction>
+#include <QtWidgets/QAction>
 #include <QtWidgets/QApplication>
-#include <QClipboard>
-#include <QContextMenuEvent>
-#include <QMenu>
-#include <QVBoxLayout>
+#include <QtGui/QClipboard>
+#include <QtGui/QContextMenuEvent>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QVBoxLayout>
 
 /*!
   \class PyConsole_Console

diff --git a/tools/PyConsole/src/PyConsole_Console.h b/tools/PyConsole/src/PyConsole_Console.h
index 49b3ccb7424fdf730ea371beafe2d68434c746c5..c2c6d0165847d824a7d7dc9dc8c40646eef4bac4 100644 (file)
--- a/tools/PyConsole/src/PyConsole_Console.h
+++ b/tools/PyConsole/src/PyConsole_Console.h
@@ -27,8 +27,8 @@
 
 #include "PyConsole.h"
 
-#include <QWidget>
-#include <QMap>
+#include <QtWidgets/QWidget>
+#include <QtCore/QMap>
 
 class QMenu;
 

diff --git a/tools/PyConsole/src/PyConsole_Editor.cxx b/tools/PyConsole/src/PyConsole_Editor.cxx
index 585ab5aeb8a91f4e9372cd72d5da190580a04b47..af9dc0bf45ad1e80bd8bd5aba80a12546ec21973 100644 (file)
--- a/tools/PyConsole/src/PyConsole_Editor.cxx
+++ b/tools/PyConsole/src/PyConsole_Editor.cxx
@@ -95,19 +95,19 @@
 #include "PyConsole_Request.h"
 
 #include <QtWidgets/QApplication>
-#include <QClipboard>
-#include <QDropEvent>
-#include <QEvent>
+#include <QtGui/QClipboard>
+#include <QtGui/QDropEvent>
+#include <QtCore/QEvent>
 #include <QtGui/QKeyEvent>
-#include <QMimeData>
+#include <QtCore/QMimeData>
 #include <QtGui/QMouseEvent>
-#include <QScrollBar>
-#include <QTextBlock>
-#include <QTextCursor>
-#include <QTextStream>
-#include <QChar>
-#include <QFileDialog>
-#include <QMessageBox>
+#include <QtWidgets/QScrollBar>
+#include <QtGui/QTextBlock>
+#include <QtGui/QTextCursor>
+#include <QtCore/QTextStream>
+#include <QtCore/QChar>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMessageBox>
 
 //VSR: uncomment below macro to support unicode text properly in SALOME
 //     current commented out due to regressions

diff --git a/tools/PyConsole/src/PyConsole_Editor.h b/tools/PyConsole/src/PyConsole_Editor.h
index 3f3bdffc3e80aa58309f4ccff6959b67af6a37e7..e85ba34bea0bc0846c58253b403e36b0e9ebf3e0 100644 (file)
--- a/tools/PyConsole/src/PyConsole_Editor.h
+++ b/tools/PyConsole/src/PyConsole_Editor.h
@@ -29,8 +29,8 @@
 
 #include "PyInterp_RefCounterObj.h"
 
-#include <QTextEdit>
-#include <QQueue>
+#include <QtWidgets/QTextEdit>
+#include <QtCore/QQueue>
 
 class PyConsole_Interp;
 class PyInterp_Request;

diff --git a/tools/PyConsole/src/PyConsole_Event.h b/tools/PyConsole/src/PyConsole_Event.h
index e56afcb885b2238138075c6575d903912f1b59ef..65f85cd032f14f54b6f0c8744ff7a4ce4d31a4e7 100644 (file)
--- a/tools/PyConsole/src/PyConsole_Event.h
+++ b/tools/PyConsole/src/PyConsole_Event.h
@@ -28,9 +28,9 @@
 #include "PyConsole.h"
 #include "PyInterp_Event.h"
 
-#include <QEvent>
-#include <QString>
-#include <QStringList>
+#include <QtCore/QEvent>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 class PyConsole_PrintEvent : public QEvent
 {

diff --git a/tools/PyConsole/src/PyConsole_Interp.h b/tools/PyConsole/src/PyConsole_Interp.h
index f4e409f4a8d8ae34676e34af35d4c45bfc5242ef..6bf86cf13595947f460ad70f74c43b57b5adcefc 100644 (file)
--- a/tools/PyConsole/src/PyConsole_Interp.h
+++ b/tools/PyConsole/src/PyConsole_Interp.h
@@ -28,7 +28,7 @@
 #include "PyInterp_Interp.h"
 #include "PyConsole.h"
 
-#include <QStringList>
+#include <QtCore/QStringList>
 
 class PYCONSOLE_EXPORT PyConsole_Interp : public PyInterp_Interp
 {

diff --git a/tools/PyConsole/src/PyConsole_Request.cxx b/tools/PyConsole/src/PyConsole_Request.cxx
index 92d46211fb81f35d20c06616800349563ca1ff66..eb3e34eaa8f2fddb3866e2899bef521a6ffd2edf 100644 (file)
--- a/tools/PyConsole/src/PyConsole_Request.cxx
+++ b/tools/PyConsole/src/PyConsole_Request.cxx
@@ -23,7 +23,7 @@
 #include "PyConsole_Interp.h"
 #include "PyConsole_Event.h"
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 /*!
   \class PyConsole_ExecCommand

diff --git a/tools/PyConsole/src/PyConsole_Request.h b/tools/PyConsole/src/PyConsole_Request.h
index e71adfb2556a294eecf5ec0ebf035e602002d6e1..1708b83d57a6fb2e5f32577c3a14573afc0c0611 100644 (file)
--- a/tools/PyConsole/src/PyConsole_Request.h
+++ b/tools/PyConsole/src/PyConsole_Request.h
@@ -24,8 +24,8 @@
 
 #include "PyInterp_Request.h"
 
-#include <QString>
-#include <QStringList>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 class QEvent;
 class PyInterp_Interp;

diff --git a/tools/PyEditor/src/PyEditor.cxx b/tools/PyEditor/src/PyEditor.cxx
index 39bbb2f3a0278bcd47e8c94e6e9f2bf4b3d413c3..b11be97dca256f27acb813ee4d7769f65ba8bc02 100644 (file)
--- a/tools/PyEditor/src/PyEditor.cxx
+++ b/tools/PyEditor/src/PyEditor.cxx
@@ -25,12 +25,12 @@
 #include "PyEditor_StdSettings.h"
 
 #include <QtWidgets/QApplication>
-#include <QCommandLineParser>
-#include <QDir>
-#include <QLibraryInfo>
-#include <QLocale>
-#include <QStringList>
-#include <QTranslator>
+#include <QtCore/QCommandLineParser>
+#include <QtCore/QDir>
+#include <QtCore/QLibraryInfo>
+#include <QtCore/QLocale>
+#include <QtCore/QStringList>
+#include <QtCore/QTranslator>
 
 QString qtTrDir()
 {

diff --git a/tools/PyEditor/src/PyEditor_Completer.cxx b/tools/PyEditor/src/PyEditor_Completer.cxx
index 27a688ec2439b5efa7b498490b3b7d5346183e74..08fe70ff04445b551d40587b2080612c973b5729 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Completer.cxx
+++ b/tools/PyEditor/src/PyEditor_Completer.cxx
@@ -25,12 +25,12 @@
 #include "PyEditor_Editor.h"
 #include "PyEditor_Keywords.h"
 
-#include <QSet>
-#include <QTimer>
-#include <QTextBlock>
-#include <QTextCursor>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
+#include <QtGui/QTextBlock>
+#include <QtGui/QTextCursor>
 #include <QtWidgets/QApplication>
-#include <QAbstractItemView>
+#include <QtWidgets/QAbstractItemView>
 #include <QtGui/QStandardItemModel>
 
 /*!

diff --git a/tools/PyEditor/src/PyEditor_Completer.h b/tools/PyEditor/src/PyEditor_Completer.h
index 51239516c04cac15fd087f2ac8265b49101467f2..9c8f0bd26a42db66fdf679e50ea093ff047a51ca 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Completer.h
+++ b/tools/PyEditor/src/PyEditor_Completer.h
@@ -23,7 +23,7 @@
 #ifndef PYEDITOR_COMPLETER_H
 #define PYEDITOR_COMPLETER_H
 
-#include <QCompleter>
+#include <QtWidgets/QCompleter>
 
 class QTimer;
 class PyEditor_Editor;

diff --git a/tools/PyEditor/src/PyEditor_Editor.cxx b/tools/PyEditor/src/PyEditor_Editor.cxx
index de11e4cacf2f73e8485d8e4fa3ebcb403b70aa26..a70e07845787d6a2371e620b7f52dbeacfecb2b0 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Editor.cxx
+++ b/tools/PyEditor/src/PyEditor_Editor.cxx
@@ -27,10 +27,10 @@
 #include "PyEditor_Settings.h"
 #include "PyEditor_Keywords.h"
 
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QtGui/QPainter>
-#include <QTextBlock>
-#include <QScrollBar>
+#include <QtGui/QTextBlock>
+#include <QtWidgets/QScrollBar>
 
 #include <iostream>
 

diff --git a/tools/PyEditor/src/PyEditor_Editor.h b/tools/PyEditor/src/PyEditor_Editor.h
index 349318573db69eebc67a4d3a56981c766ea288e3..73dda720af57363b56dadf69e25639fe515a0094 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Editor.h
+++ b/tools/PyEditor/src/PyEditor_Editor.h
@@ -26,7 +26,7 @@
 #include "PyEditor.h"
 #include "PyEditor_Settings.h"
 
-#include <QPlainTextEdit>
+#include <QtWidgets/QPlainTextEdit>
 
 class PyEditor_Keywords;
 class PyEditor_Completer;

diff --git a/tools/PyEditor/src/PyEditor_FindTool.cxx b/tools/PyEditor/src/PyEditor_FindTool.cxx
index 7555e6368668eed3a34fc9e36febdd7dbedc68ca..34540a88fd727dc33a8630d812d7d35790bbef0e 100644 (file)
--- a/tools/PyEditor/src/PyEditor_FindTool.cxx
+++ b/tools/PyEditor/src/PyEditor_FindTool.cxx
@@ -23,16 +23,16 @@
 #include "PyEditor_FindTool.h"
 #include "PyEditor_Editor.h"
 
-#include <QAction>
-#include <QCompleter>
-#include <QEvent>
-#include <QGridLayout>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QCompleter>
+#include <QtCore/QEvent>
+#include <QtWidgets/QGridLayout>
 #include <QtGui/QIcon>
-#include <QLabel>
-#include <QLineEdit>
-#include <QMenu>
-#include <QSignalMapper>
-#include <QToolButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QMenu>
+#include <QtCore/QSignalMapper>
+#include <QtWidgets/QToolButton>
 
 /*!
   \class PyEditor_FindTool

diff --git a/tools/PyEditor/src/PyEditor_FindTool.h b/tools/PyEditor/src/PyEditor_FindTool.h
index e1a3b84a4edd5d7cdd11aee601a87c8dcfa7e7b1..5d36c12039f82e1f2bf1f925cdbc64eb3fa9ae07 100644 (file)
--- a/tools/PyEditor/src/PyEditor_FindTool.h
+++ b/tools/PyEditor/src/PyEditor_FindTool.h
@@ -26,8 +26,8 @@
 #include "PyEditor.h"
 
 #include <QtGui/QTextDocument>
-#include <QStringListModel>
-#include <QWidget>
+#include <QtCore/QStringListModel>
+#include <QtWidgets/QWidget>
 
 class PyEditor_Editor;
 class QAction;

diff --git a/tools/PyEditor/src/PyEditor_Keywords.cxx b/tools/PyEditor/src/PyEditor_Keywords.cxx
index 0e6620deb79a8443dddd9f37bd0e422c52e19abd..0dd487e0b8673481c784be55f987abd0f9459b20 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Keywords.cxx
+++ b/tools/PyEditor/src/PyEditor_Keywords.cxx
@@ -22,7 +22,7 @@
 
 #include "PyEditor_Keywords.h"
 
-#include <QSet>
+#include <QtCore/QSet>
 
 /*!
   \brief PyEditor_Keywords

diff --git a/tools/PyEditor/src/PyEditor_Keywords.h b/tools/PyEditor/src/PyEditor_Keywords.h
index eb6166378704715b5f142df00c2cdf346ce87d58..1c389e81e28d547ff9599b37873bded0a530597c 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Keywords.h
+++ b/tools/PyEditor/src/PyEditor_Keywords.h
@@ -23,10 +23,10 @@
 #ifndef PYEDITOR_KEYWORDS_H
 #define PYEDITOR_KEYWORDS_H
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtGui/QColor>
-#include <QList>
-#include <QMap>
+#include <QtCore/QList>
+#include <QtCore/QMap>
 
 class PyEditor_Keywords : public QObject
 {

diff --git a/tools/PyEditor/src/PyEditor_LineNumberArea.h b/tools/PyEditor/src/PyEditor_LineNumberArea.h
index 5cbf999952df66b0f6c4ff7fa7db243655d5ac6e..3d794bb3487d512dbb0c908f883067cd7fdd5905 100644 (file)
--- a/tools/PyEditor/src/PyEditor_LineNumberArea.h
+++ b/tools/PyEditor/src/PyEditor_LineNumberArea.h
@@ -23,7 +23,7 @@
 #ifndef PYEDITOR_LINENUMBERAREA_H
 #define PYEDITOR_LINENUMBERAREA_H
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class PyEditor_Editor;
 

diff --git a/tools/PyEditor/src/PyEditor_PyHighlighter.cxx b/tools/PyEditor/src/PyEditor_PyHighlighter.cxx
index 553f5f4e68e10c2de1ce1a558f03065573f50d4f..2677fdc75b77423e750cf986e9bfd724f57cc355 100644 (file)
--- a/tools/PyEditor/src/PyEditor_PyHighlighter.cxx
+++ b/tools/PyEditor/src/PyEditor_PyHighlighter.cxx
@@ -24,7 +24,7 @@
 
 #include "PyEditor_Keywords.h"
 
-#include <QSet>
+#include <QtCore/QSet>
 
 #define NORMAL 0
 #define TRIPLESINGLE 1

diff --git a/tools/PyEditor/src/PyEditor_PyHighlighter.h b/tools/PyEditor/src/PyEditor_PyHighlighter.h
index 071083fe007ff9275d282ebb0af4f9d0faf7bde3..c361554967c0ba147a1e0904b8d1a829d030b265 100644 (file)
--- a/tools/PyEditor/src/PyEditor_PyHighlighter.h
+++ b/tools/PyEditor/src/PyEditor_PyHighlighter.h
@@ -23,7 +23,7 @@
 #ifndef PYEDITOR_PYHIGHLIGHTER_H
 #define PYEDITOR_PYHIGHLIGHTER_H
 
-#include <QSyntaxHighlighter>
+#include <QtGui/QSyntaxHighlighter>
 
 class QTextDocument;
 class PyEditor_Keywords;

diff --git a/tools/PyEditor/src/PyEditor_SettingsDlg.cxx b/tools/PyEditor/src/PyEditor_SettingsDlg.cxx
index e2b77199c152118d633cceaacdc365b51c262057..4edc5e64f0bee202cf7c83ba0b0c6100abef209b 100644 (file)
--- a/tools/PyEditor/src/PyEditor_SettingsDlg.cxx
+++ b/tools/PyEditor/src/PyEditor_SettingsDlg.cxx
@@ -25,14 +25,14 @@
 #include "PyEditor_Editor.h"
 #include "PyEditor_Settings.h"
 
-#include <QCheckBox>
-#include <QComboBox>
-#include <QFontComboBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QVBoxLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QFontComboBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QVBoxLayout>
 
 /*!
   \class PyEditor_SettingsDlg

diff --git a/tools/PyEditor/src/PyEditor_StdSettings.h b/tools/PyEditor/src/PyEditor_StdSettings.h
index 7f9f99663d0c7b60ff5017d7bf0f34380ecabeef..b7d0af7348c3921dccaa7bbfe1f274c424f70ede 100644 (file)
--- a/tools/PyEditor/src/PyEditor_StdSettings.h
+++ b/tools/PyEditor/src/PyEditor_StdSettings.h
@@ -26,7 +26,7 @@
 #include "PyEditor.h"
 #include "PyEditor_Settings.h"
 
-#include <QSettings>
+#include <QtCore/QSettings>
 
 class PYEDITOR_EXPORT PyEditor_StdSettings : public PyEditor_Settings
 {

diff --git a/tools/PyEditor/src/PyEditor_Widget.cxx b/tools/PyEditor/src/PyEditor_Widget.cxx
index b4cfcb959d0e6df17e17a8536369af7eba7fa957..1b5685021f44d38d7a3efd6b9818c554f8585b4d 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Widget.cxx
+++ b/tools/PyEditor/src/PyEditor_Widget.cxx
@@ -24,7 +24,7 @@
 #include "PyEditor_FindTool.h"
 #include "PyEditor_Widget.h"
 
-#include <QVBoxLayout>
+#include <QtWidgets/QVBoxLayout>
 
 /*!
   \class PyEditor_Widget

diff --git a/tools/PyEditor/src/PyEditor_Widget.h b/tools/PyEditor/src/PyEditor_Widget.h
index 8bc78176da24cb29252b4dfa87a068f5dec99526..6b004ca45500fda9c216502b0b295ef5dba55977 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Widget.h
+++ b/tools/PyEditor/src/PyEditor_Widget.h
@@ -26,7 +26,7 @@
 #include "PyEditor.h"
 #include "PyEditor_Settings.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class PyEditor_Editor;
 class PyEditor_FindTool;

diff --git a/tools/PyEditor/src/PyEditor_Window.cxx b/tools/PyEditor/src/PyEditor_Window.cxx
index 552749a2f41d3538d93efb1bc93bca452b96cd9f..636decf037107497fde696a6e2121690523e0d02 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Window.cxx
+++ b/tools/PyEditor/src/PyEditor_Window.cxx
@@ -25,15 +25,15 @@
 #include "PyEditor_Settings.h"
 #include "PyEditor_SettingsDlg.h"
 
-#include <QAction>
+#include <QtWidgets/QAction>
 #include <QtWidgets/QApplication>
-#include <QCloseEvent>
-#include <QFileDialog>
-#include <QMenuBar>
-#include <QMessageBox>
-#include <QStatusBar>
-#include <QTextStream>
-#include <QToolBar>
+#include <QtGui/QCloseEvent>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QStatusBar>
+#include <QtCore/QTextStream>
+#include <QtWidgets/QToolBar>
 
 /*!
   \class PyEditor_Window

diff --git a/tools/PyEditor/src/PyEditor_Window.h b/tools/PyEditor/src/PyEditor_Window.h
index 4cbf67260ff59efdbd4d443f6722dad702383fd6..bdc17e49c55dc7501203f1d5fb3c8883631c7c56 100644 (file)
--- a/tools/PyEditor/src/PyEditor_Window.h
+++ b/tools/PyEditor/src/PyEditor_Window.h
@@ -25,8 +25,8 @@
 
 #include "PyEditor.h"
 
-#include <QMainWindow>
-#include <QMap>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QMap>
 
 class QAction;
 class PyEditor_Widget;

diff --git a/tools/PyInterp/src/PyInterp_Dispatcher.h b/tools/PyInterp/src/PyInterp_Dispatcher.h
index 9d97cc1a9a6d04047dbc35402140c04dea8593e6..62473a8f9ffe3d888ec669f301139480d26c1d2b 100644 (file)
--- a/tools/PyInterp/src/PyInterp_Dispatcher.h
+++ b/tools/PyInterp/src/PyInterp_Dispatcher.h
@@ -30,9 +30,9 @@
 #include "PyInterp_Request.h"   // full include instead of forward declaration
                                 // everyone inc'ing the Dispatcher will get the requests for free.
 
-#include <QMutex>
-#include <QThread>
-#include <QQueue>
+#include <QtCore/QMutex>
+#include <QtCore/QThread>
+#include <QtCore/QQueue>
 
 class PYINTERP_EXPORT PyInterp_Dispatcher : protected QThread
 {

diff --git a/tools/PyInterp/src/PyInterp_Event.h b/tools/PyInterp/src/PyInterp_Event.h
index 2b0a468556ab05e4f3ae97b8e5a7c8259e4a15c4..96c7fbab62a6b241a7a103bdc28374853c0cf4fd 100644 (file)
--- a/tools/PyInterp/src/PyInterp_Event.h
+++ b/tools/PyInterp/src/PyInterp_Event.h
@@ -27,7 +27,7 @@
 
 #include "PyInterp.h"
 
-#include <QEvent>
+#include <QtCore/QEvent>
 
 class PyInterp_Request;
 

diff --git a/tools/PyInterp/src/PyInterp_Interp.cxx b/tools/PyInterp/src/PyInterp_Interp.cxx
index e741cce27cad0005e5cc3fff91fb340c8905608a..7f82b140de4bd5fd021414d0ae1011c7ae399ada 100644 (file)
--- a/tools/PyInterp/src/PyInterp_Interp.cxx
+++ b/tools/PyInterp/src/PyInterp_Interp.cxx
@@ -35,8 +35,8 @@
 #include <sstream>
 #include <algorithm>
 
-#include <QRegExp>
-#include <QStringList>
+#include <QtCore/QRegExp>
+#include <QtCore/QStringList>
 
 #define TOP_HISTORY_PY   "--- top of history ---"
 #define BEGIN_HISTORY_PY "--- begin of history ---"

diff --git a/tools/PyInterp/src/PyInterp_Request.cxx b/tools/PyInterp/src/PyInterp_Request.cxx
index baf83e1c6536db8143daabda68e83986da8b2426..f8108a41b3180473903aa5df6b7f5247e4cabb9b 100644 (file)
--- a/tools/PyInterp/src/PyInterp_Request.cxx
+++ b/tools/PyInterp/src/PyInterp_Request.cxx
@@ -25,7 +25,7 @@
 #include "PyInterp_Request.h"
 #include "PyInterp_Utils.h"
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 void PyInterp_Request::process()
 {

diff --git a/tools/PyInterp/src/PyInterp_Request.h b/tools/PyInterp/src/PyInterp_Request.h
index 98ab6d4b3db654206d6138b705b64525ec9cdf90..399c19850b4bf9f7479d5f2bed3a40c7f887a1f6 100644 (file)
--- a/tools/PyInterp/src/PyInterp_Request.h
+++ b/tools/PyInterp/src/PyInterp_Request.h
@@ -28,7 +28,7 @@
 #include "PyInterp.h"
 #include "PyInterp_Event.h"
 
-#include <QMutex>
+#include <QtCore/QMutex>
 
 class QObject;
 class PyInterp_Interp;

diff --git a/tools/RemoteFileBrowser/QMachineBrowser.h b/tools/RemoteFileBrowser/QMachineBrowser.h
index 5b2efe9e09869da6d1052ca3f0605d108e61faf0..8de5e143d4710cc40e77ade446b21c8f9053f655 100644 (file)
--- a/tools/RemoteFileBrowser/QMachineBrowser.h
+++ b/tools/RemoteFileBrowser/QMachineBrowser.h
@@ -23,8 +23,8 @@
 
 #include "RemoteFileBrowser.h"
 
-#include <QWidget>
-#include <QComboBox>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QComboBox>
 
 class QPushButton;
 class QLineEdit;

diff --git a/tools/dlgfactory/GenericDialog.cxx b/tools/dlgfactory/GenericDialog.cxx
index 6b177d929573e881711c7b1c6cc6574c920a2e56..9f485da298ca789cfc4237b230197a35a91cf516 100644 (file)
--- a/tools/dlgfactory/GenericDialog.cxx
+++ b/tools/dlgfactory/GenericDialog.cxx
@@ -18,7 +18,7 @@
 //
 
 #include "GenericDialog.h"
-#include <QDebug>
+#include <QtCore/QDebug>
 
 GenericDialog::GenericDialog(QDialog* parent) : QDialog(parent)
 {

diff --git a/tools/dlgfactory/__QDIALOG__.cxx b/tools/dlgfactory/__QDIALOG__.cxx
index df9145685bccf92df5457df24400f02091093a98..fdcc5aa9558b8687036eca1010dd432ce296364e 100644 (file)
--- a/tools/dlgfactory/__QDIALOG__.cxx
+++ b/tools/dlgfactory/__QDIALOG__.cxx
@@ -1,5 +1,5 @@
 #include "__CLASSNAME__.h"
-#include <QDebug>
+#include <QtCore/QDebug>
 
 __CLASSNAME__::__CLASSNAME__(QDialog* parent) : QDialog(parent)
 {