From: vsr Date: Wed, 15 Oct 2008 12:48:35 +0000 (+0000) Subject: Issue 0019994: integrate patch for compilation with cmake (from E.Adam) X-Git-Tag: V5_1_0a3~18 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1706c207c2ab298c6382e8151c370834a048a8bb;p=modules%2Fgui.git Issue 0019994: integrate patch for compilation with cmake (from E.Adam) --- diff --git a/src/OCCViewer/OCCViewer.cxx b/src/OCCViewer/OCCViewer.cxx index cf7f06e6a..7a5c47e72 100644 --- a/src/OCCViewer/OCCViewer.cxx +++ b/src/OCCViewer/OCCViewer.cxx @@ -17,7 +17,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include +#include "OCCViewer_Trihedron.h" #include #include diff --git a/src/OCCViewer/OCCViewer_Trihedron.h b/src/OCCViewer/OCCViewer_Trihedron.h index 5836264e1..5c2bfc88d 100644 --- a/src/OCCViewer/OCCViewer_Trihedron.h +++ b/src/OCCViewer/OCCViewer_Trihedron.h @@ -19,7 +19,7 @@ #ifndef OCCVIEWER_TRIHEDRON_H #define OCCVIEWER_TRIHEDRON_H -#include +#include "OCCViewer.h" #include #include diff --git a/src/Plot2d/Plot2d_ToolTip.cxx b/src/Plot2d/Plot2d_ToolTip.cxx index bf94e310f..043c5c487 100644 --- a/src/Plot2d/Plot2d_ToolTip.cxx +++ b/src/Plot2d/Plot2d_ToolTip.cxx @@ -19,9 +19,9 @@ // File: Plot2d_ToolTip.cxx // Author: Alexandre SOLOVYOV -#include -#include -#include +#include "Plot2d_ToolTip.h" +#include "Plot2d_ViewFrame.h" +#include "Plot2d_Curve.h" #include #include diff --git a/src/Plot2d/Plot2d_ToolTip.h b/src/Plot2d/Plot2d_ToolTip.h index c2f2d785f..06fcb70d1 100644 --- a/src/Plot2d/Plot2d_ToolTip.h +++ b/src/Plot2d/Plot2d_ToolTip.h @@ -22,7 +22,7 @@ #ifndef PLOT2D_TOOLTIP_H #define PLOT2D_TOOLTIP_H -#include +#include "Plot2d.h" #include class Plot2d_ViewFrame; diff --git a/src/QxGraph/QxGraph_Prs.h b/src/QxGraph/QxGraph_Prs.h index 161610314..f93cea445 100644 --- a/src/QxGraph/QxGraph_Prs.h +++ b/src/QxGraph/QxGraph_Prs.h @@ -19,7 +19,7 @@ #ifndef QXGRAPH_PRS_H #define QXGRAPH_PRS_H -#include +#include "QxGraph.h" #include #include diff --git a/src/SUIT/SUIT_DataBrowser.cxx b/src/SUIT/SUIT_DataBrowser.cxx index 1f9e4d042..1444ab357 100644 --- a/src/SUIT/SUIT_DataBrowser.cxx +++ b/src/SUIT/SUIT_DataBrowser.cxx @@ -21,7 +21,7 @@ // #include "SUIT_DataBrowser.h" -#include +#include "SUIT_TreeModel.h" #include #include diff --git a/src/SUIT/SUIT_Session.h b/src/SUIT/SUIT_Session.h index e6ece73e3..bc3ca3486 100755 --- a/src/SUIT/SUIT_Session.h +++ b/src/SUIT/SUIT_Session.h @@ -20,8 +20,7 @@ #define SUIT_SESSION_H #include "SUIT.h" - -#include +#include "SUIT_Application.h" #include #include diff --git a/src/SUIT/SUIT_ViewManager.cxx b/src/SUIT/SUIT_ViewManager.cxx index 34ee0c10c..ed32ea6f2 100755 --- a/src/SUIT/SUIT_ViewManager.cxx +++ b/src/SUIT/SUIT_ViewManager.cxx @@ -20,7 +20,7 @@ #include "SUIT_Desktop.h" #include "SUIT_ViewModel.h" -#include +#include "SUIT_ViewWindow.h" #include "SUIT_Study.h" #include diff --git a/src/SUIT/SUIT_ViewModel.cxx b/src/SUIT/SUIT_ViewModel.cxx index 3ecd9eeae..038cb6bc3 100755 --- a/src/SUIT/SUIT_ViewModel.cxx +++ b/src/SUIT/SUIT_ViewModel.cxx @@ -20,8 +20,7 @@ // #include "SUIT_ViewModel.h" - -#include +#include "SUIT_ViewWindow.h" SUIT_ViewModel::StatesMap SUIT_ViewModel::myStateMap; SUIT_ViewModel::ButtonsMap SUIT_ViewModel::myButtonMap; diff --git a/src/SVTK/SVTK_Extension.h b/src/SVTK/SVTK_Extension.h index 0b39e59f2..73619dd21 100755 --- a/src/SVTK/SVTK_Extension.h +++ b/src/SVTK/SVTK_Extension.h @@ -24,7 +24,7 @@ Functions of loading OpenGL extensions. */ -#include +#include "SVTK.h" namespace SVTK { diff --git a/src/SVTK/SVTK_Prs.h b/src/SVTK/SVTK_Prs.h index 7931972d4..33285a78a 100644 --- a/src/SVTK/SVTK_Prs.h +++ b/src/SVTK/SVTK_Prs.h @@ -29,7 +29,7 @@ #ifndef SVTK_Prs_H #define SVTK_Prs_H -#include +#include "SVTK.h" #include "SALOME_Prs.h" class vtkActorCollection; diff --git a/src/SVTK/SVTK_ViewModel.cxx b/src/SVTK/SVTK_ViewModel.cxx index 954d39f8b..4fce1eb19 100644 --- a/src/SVTK/SVTK_ViewModel.cxx +++ b/src/SVTK/SVTK_ViewModel.cxx @@ -37,7 +37,7 @@ #include "SUIT_ViewModel.h" #include "SUIT_ViewManager.h" -#include +#include "SALOME_Actor.h" #include diff --git a/src/SalomeApp/SalomeApp_CheckFileDlg.h b/src/SalomeApp/SalomeApp_CheckFileDlg.h index 53e56683c..28f7f6e4d 100644 --- a/src/SalomeApp/SalomeApp_CheckFileDlg.h +++ b/src/SalomeApp/SalomeApp_CheckFileDlg.h @@ -19,7 +19,7 @@ #ifndef SALOMEAPP_CHECKFILEDIALOG_H #define SALOMEAPP_CHECKFILEDIALOG_H -#include +#include "SalomeApp.h" #include diff --git a/src/Session/SalomeApp_Engine_i.hxx b/src/Session/SalomeApp_Engine_i.hxx index abadbdd67..baede8f53 100755 --- a/src/Session/SalomeApp_Engine_i.hxx +++ b/src/Session/SalomeApp_Engine_i.hxx @@ -29,7 +29,7 @@ #ifndef _SALOMEAPP_ENGINE_I_HXX_ #define _SALOMEAPP_ENGINE_I_HXX_ -#include +#include "SALOME_Session.hxx" #include "SALOME_Component_i.hxx" diff --git a/src/Session/Session_ServerLauncher.hxx b/src/Session/Session_ServerLauncher.hxx index 6f0fede88..c81ec50dc 100755 --- a/src/Session/Session_ServerLauncher.hxx +++ b/src/Session/Session_ServerLauncher.hxx @@ -29,7 +29,7 @@ #ifndef _SESSION_SERVERLAUNCHER_HXX_ #define _SESSION_SERVERLAUNCHER_HXX_ -#include +#include "SALOME_Session.hxx" #include #include diff --git a/src/Session/Session_ServerThread.hxx b/src/Session/Session_ServerThread.hxx index 146183da7..632ee0efd 100755 --- a/src/Session/Session_ServerThread.hxx +++ b/src/Session/Session_ServerThread.hxx @@ -29,7 +29,7 @@ #ifndef _SESSION_SERVERTHREAD_HXX_ #define _SESSION_SERVERTHREAD_HXX_ -#include +#include "SALOME_Session.hxx" #include #include diff --git a/src/Session/Session_Session_i.hxx b/src/Session/Session_Session_i.hxx index fc7a1e56e..25e923417 100755 --- a/src/Session/Session_Session_i.hxx +++ b/src/Session/Session_Session_i.hxx @@ -29,7 +29,7 @@ #ifndef _SESSION_SESSION_I_HXX_ #define _SESSION_SESSION_I_HXX_ -#include +#include "SALOME_Session.hxx" #include #include CORBA_SERVER_HEADER(SALOME_Component)