From: mpv Date: Tue, 26 Apr 2005 10:10:01 +0000 (+0000) Subject: MPV: Porting to the Python 2.3 and higher: Python includes must be before Qt includes... X-Git-Tag: V2_2_3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3d9ccdb7334b6313cba7be25097fa257b13d3162;p=modules%2Fsuperv.git MPV: Porting to the Python 2.3 and higher: Python includes must be before Qt includes: Python contains "slots" field, redefined in the Qt. --- diff --git a/src/GraphBase/DataFlowBase_XmlHandler.hxx b/src/GraphBase/DataFlowBase_XmlHandler.hxx index d92285b..b4f3d9e 100755 --- a/src/GraphBase/DataFlowBase_XmlHandler.hxx +++ b/src/GraphBase/DataFlowBase_XmlHandler.hxx @@ -29,6 +29,8 @@ #define INCLUDE_MENUITEM_DEF #define QT_ALTERNATE_QTSMANIP +#include "DataFlowBase_Graph.hxx" + #include #include #include @@ -37,7 +39,6 @@ //#include //#include CORBA_CLIENT_HEADER(SALOME_SuperVision) -#include "DataFlowBase_Graph.hxx" #define maxlevel 7 diff --git a/src/SUPERVGUI/SUPERVGUI_Main.cxx b/src/SUPERVGUI/SUPERVGUI_Main.cxx index 33e2a18..7fde70d 100644 --- a/src/SUPERVGUI/SUPERVGUI_Main.cxx +++ b/src/SUPERVGUI/SUPERVGUI_Main.cxx @@ -27,11 +27,11 @@ using namespace std; +#include "QAD_PyEditor.h" #include "QAD_Splitter.h" #include "QAD_LeftFrame.h" #include "QAD_ObjectBrowser.h" #include "QAD_ObjectBrowserItem.h" -#include "QAD_PyEditor.h" #include "QAD_Message.h" #include "QAD_FileDlg.h" #include "QAD_Application.h"