From: abuhsing <abuhsing>
Date: Wed, 4 Dec 2013 15:06:42 +0000 (+0000)
Subject: Abu : Correction export/import dll
X-Git-Tag: V7_4_0a1~18
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b94555c8d8f4e0123e1cce0868eeb4ea34442ebe;p=modules%2Fhexablock.git

Abu : Correction export/import dll
 Modified Files:
  Tag: V7_main
 	HEXABLOCKGUI.hxx HEXABLOCKGUI_DocumentItem.hxx
 	HEXABLOCKGUI_DocumentModel.hxx HEXABLOCKGUI_DocumentPanel.hxx
 	HEXABLOCKGUI_DocumentSelectionModel.hxx
 	HEXABLOCKGUI_Exception.hxx
 	HEXABLOCKGUI_GraphicViewsHandler.hxx HEXABLOCKGUI_Model.hxx
 	HEXABLOCKGUI_OccGraphicView.hxx HEXABLOCKGUI_Resource.hxx
 	HEXABLOCKGUI_SalomeTools.hxx HEXABLOCKGUI_Trace.hxx
 	HEXABLOCKGUI_VtkDocumentGraphicView.hxx
 	MyBasicGUI_PointDlg.hxx MyGEOMBase_Skeleton.hxx Resource.hxx
 	klinkitemselectionmodel.hxx kmodelindexproxymapper.hxx
 ----------------------------------------------------------------------
---

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
index 4d44098..b67044f 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
@@ -29,6 +29,7 @@
 #include <QDockWidget>
 
 
+#include "HEXABLOCKGUI_Export.hxx"
 #include "klinkitemselectionmodel.hxx"
 
 #include <OB_Browser.h>
@@ -113,7 +114,7 @@ class OCCViewer_ViewWindow;
 class LightApp_VTKSelector;
 
 
-class HexaExport HEXABLOCKGUI : public SalomeApp_Module
+class HEXABLOCK_EXPORT HEXABLOCKGUI : public SalomeApp_Module
 {
   Q_OBJECT
 
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx
index 4bab98b..a92eaa8 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx
@@ -23,6 +23,7 @@
 
 #include <QStandardItem>
 
+#include "HEXABLOCKGUI_Export.hxx"
 #include "HexVertex.hxx"
 #include "HexEdge.hxx"
 #include "HexQuad.hxx"
@@ -151,7 +152,7 @@ namespace HEXABLOCK
 // QVariant::UserType
 
     //===================================================================================
-    class HexaExport ElementItem : public QStandardItem
+    class HEXABLOCK_EXPORT ElementItem : public QStandardItem
     {
       public:
     	ElementItem( HEXA_NS::EltBase* docElement, QString entry, HexaType ttype, HexaTreeRole treeRole);
@@ -169,7 +170,7 @@ namespace HEXABLOCK
     };
     //===================================================================================
 
-    class HexaExport GraphicElementItem : public ElementItem
+    class HEXABLOCK_EXPORT GraphicElementItem : public ElementItem
     {
       public:
     	GraphicElementItem( HEXA_NS::EltBase* docElement, QString entry, HexaType ttype, HexaTreeRole treeRole):
@@ -182,7 +183,7 @@ namespace HEXABLOCK
         int       IDinActor;
     };
 
-    class HexaExport StandardElementItem : public ElementItem
+    class HEXABLOCK_EXPORT StandardElementItem : public ElementItem
     {
        public:
     	StandardElementItem( HEXA_NS::EltBase* docElement, QString entry, HexaType ttype, HexaTreeRole treeRole):
@@ -191,40 +192,40 @@ namespace HEXABLOCK
     	}
     };
 
-    class HexaExport VertexItem : public GraphicElementItem
+    class HEXABLOCK_EXPORT VertexItem : public GraphicElementItem
     {
       public:
         VertexItem( HEXA_NS::Vertex* hexaVertex, QString entry = "");
     };
 
-    class HexaExport EdgeItem : public GraphicElementItem
+    class HEXABLOCK_EXPORT EdgeItem : public GraphicElementItem
     {
       public:
         EdgeItem( HEXA_NS::Edge* hexaEdge, QString entry = "");
     };
     //-----------------------------------------
-    class HexaExport QuadItem : public GraphicElementItem
+    class HEXABLOCK_EXPORT QuadItem : public GraphicElementItem
     {
       public:
         QuadItem( HEXA_NS::Quad* hexaQuad, QString entry = "");
     };
     //-----------------------------------------
 
-    class HexaExport HexaItem : public GraphicElementItem
+    class HEXABLOCK_EXPORT HexaItem : public GraphicElementItem
     {
       public:
         HexaItem( HEXA_NS::Hexa* hexaHexa, QString entry = "");
     };
     //-----------------------------------------
 
-    class HexaExport VectorItem : public StandardElementItem
+    class HEXABLOCK_EXPORT VectorItem : public StandardElementItem
     {
       public:
         VectorItem( HEXA_NS::Vector* hexaVector, QString entry = "");
     };
     //-----------------------------------------
 
-//    class HexaExport CylinderItem : public StandardElementItem
+//    class HEXABLOCK_EXPORT CylinderItem : public StandardElementItem
 //    {
 //      public:
 //        CylinderItem( HEXA_NS::Cylinder* hexaCyl, QString entry = "");
@@ -238,7 +239,7 @@ namespace HEXABLOCK
 //    };
     //-----------------------------------------
 
-    class HexaExport ElementsItem : public StandardElementItem
+    class HEXABLOCK_EXPORT ElementsItem : public StandardElementItem
     {
       public:
         ElementsItem( HEXA_NS::Elements* hexaElements, QString entry = "" );
@@ -251,7 +252,7 @@ namespace HEXABLOCK
 //    };
 
     //------------------------------------------------
-    class HexaExport GeomItem: public StandardElementItem
+    class HEXABLOCK_EXPORT GeomItem: public StandardElementItem
     {
     public:
         GeomItem( HEXA_NS::EltBase* geomShape, QString entry, HexaType ttype, HexaTreeRole treeRole, HEXA_NS::EltBase* assoc = NULL );
@@ -263,35 +264,35 @@ namespace HEXABLOCK
     };
 
     //------------------------------------------------
-    class HexaExport GeomShapeItem: public GeomItem
+    class HEXABLOCK_EXPORT GeomShapeItem: public GeomItem
     {
     public:
         GeomShapeItem( HEXA_NS::NewShape* shape, HEXA_NS::EltBase* assoc = NULL);
     };
 
     //------------------------------------------------
-    class HexaExport GeomPointItem: public GeomItem
+    class HEXABLOCK_EXPORT GeomPointItem: public GeomItem
     {
     public:
         GeomPointItem( HEXA_NS::VertexShape* geomPoint, HEXA_NS::Vertex* associatedVertex = NULL);
     };
 
     //------------------------------------------------
-    class HexaExport GeomEdgeItem: public GeomItem
+    class HEXABLOCK_EXPORT GeomEdgeItem: public GeomItem
     {
     public:
         GeomEdgeItem( HEXA_NS::EdgeShape* geomEdge, HEXA_NS::Edge* associatedEdge = NULL);
     };
 
     //------------------------------------------------
-    class HexaExport GeomFaceItem: public GeomItem
+    class HEXABLOCK_EXPORT GeomFaceItem: public GeomItem
     {
     public:
         GeomFaceItem( HEXA_NS::FaceShape* geomFace, HEXA_NS::Quad* associatedQuad = NULL);
     };
 
     //-----------------------------------------
-    class HexaExport GroupItem : public QStandardItem
+    class HEXABLOCK_EXPORT GroupItem : public QStandardItem
     {
     public:
     	GroupItem( HEXA_NS::Group* hexaGroup );
@@ -303,7 +304,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport LawItem : public QStandardItem
+    class HEXABLOCK_EXPORT LawItem : public QStandardItem
     {
     public:
     	LawItem( HEXA_NS::Law* hexaLaw );
@@ -315,7 +316,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport PropagationItem : public QStandardItem
+    class HEXABLOCK_EXPORT PropagationItem : public QStandardItem
     {
     public:
     	PropagationItem( HEXA_NS::Propagation* hexaPropagation );
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx
index 044459f..19dbf72 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx
@@ -25,6 +25,7 @@
 #include <QStandardItemModel>
 #include <QSortFilterProxyModel>
 
+#include "HEXABLOCKGUI_Export.hxx"
 #include "HEXABLOCKGUI_DocumentItem.hxx"
 #include "HexDocument.hxx"
 #include "HexNewShape.hxx"
@@ -35,7 +36,7 @@ namespace HEXABLOCK
 {
   namespace GUI
   {
-    class HexaExport DocumentModel : public QStandardItemModel
+    class HEXABLOCK_EXPORT DocumentModel : public QStandardItemModel
     {
       Q_OBJECT
     public:
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx
index ee6110f..5ca2f3a 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx
@@ -70,6 +70,7 @@
 #include "HexHexa.hxx"
 
 
+#include "HEXABLOCKGUI_Export.hxx"
 #include "HEXABLOCKGUI_DocumentSelectionModel.hxx"
 #include "HEXABLOCKGUI_DocumentModel.hxx"
 #include "HEXABLOCKGUI_VtkDocumentGraphicView.hxx"
@@ -84,7 +85,7 @@ namespace HEXABLOCK
 {
   namespace GUI
   {
-    class HexaExport HexaBaseDialog : public QDialog
+    class HEXABLOCK_EXPORT HexaBaseDialog : public QDialog
     {
       Q_OBJECT
 
@@ -245,7 +246,7 @@ namespace HEXABLOCK
 
     };
 
-    class HexaExport VertexDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT VertexDialog : public HexaBaseDialog,
     public Ui::VertexDialog
     {
       Q_OBJECT
@@ -273,7 +274,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport EdgeDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT EdgeDialog : public HexaBaseDialog,
     public Ui::EdgeDialog
     {
       Q_OBJECT
@@ -299,7 +300,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport QuadDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT QuadDialog : public HexaBaseDialog,
     public Ui::QuadDialog
     {
       Q_OBJECT
@@ -326,7 +327,7 @@ namespace HEXABLOCK
 
 
 
-    class HexaExport HexaDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT HexaDialog : public HexaBaseDialog,
     public Ui::HexaDialog
     {
       Q_OBJECT
@@ -361,7 +362,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport VectorDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT VectorDialog : public HexaBaseDialog,
     public Ui::VectorDialog
     {
       Q_OBJECT
@@ -386,7 +387,7 @@ namespace HEXABLOCK
     QModelIndex     _ivalue;
     };
 
-    class HexaExport MakeGridDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakeGridDialog : public HexaBaseDialog,
     public Ui::MakeGridDialog
     {
       Q_OBJECT
@@ -415,7 +416,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport MakeCylinderDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakeCylinderDialog : public HexaBaseDialog,
     public Ui::MakeCylinderDialog
     {
       Q_OBJECT
@@ -443,7 +444,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport MakePipeDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakePipeDialog : public HexaBaseDialog,
     public Ui::MakePipeDialog
     {
       Q_OBJECT
@@ -471,7 +472,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport MakeCylindersDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakeCylindersDialog : public HexaBaseDialog,
     public Ui::MakeCylindersDialog
     {
       Q_OBJECT
@@ -490,7 +491,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport MakePipesDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakePipesDialog : public HexaBaseDialog,
     public Ui::MakePipesDialog
     {
       Q_OBJECT
@@ -510,7 +511,7 @@ namespace HEXABLOCK
 
 
 
-    class HexaExport RemoveHexaDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT RemoveHexaDialog : public HexaBaseDialog,
     public Ui::RemoveHexaDialog
     {
       Q_OBJECT
@@ -529,7 +530,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport PrismQuadDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT PrismQuadDialog : public HexaBaseDialog,
     public Ui::PrismQuadDialog
     {
       Q_OBJECT
@@ -558,7 +559,7 @@ namespace HEXABLOCK
 
     };
 
-    class HexaExport JoinQuadDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT JoinQuadDialog : public HexaBaseDialog,
     public Ui::JoinQuadDialog
     {
       Q_OBJECT
@@ -589,7 +590,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport MergeDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MergeDialog : public HexaBaseDialog,
     public Ui::MergeDialog
     {
       Q_OBJECT
@@ -613,7 +614,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport DisconnectDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT DisconnectDialog : public HexaBaseDialog,
     public Ui::DisconnectDialog
     {
       Q_OBJECT
@@ -639,7 +640,7 @@ namespace HEXABLOCK
 
 
 
-    class HexaExport CutEdgeDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT CutEdgeDialog : public HexaBaseDialog,
     public Ui::CutEdgeDialog
     {
       Q_OBJECT
@@ -663,7 +664,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport MakeTransformationDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakeTransformationDialog : public HexaBaseDialog,
     public Ui::TransformationDialog
     {
       Q_OBJECT
@@ -685,7 +686,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport MakeSymmetryDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakeSymmetryDialog : public HexaBaseDialog,
     public Ui::SymmetryDialog
     {
       Q_OBJECT
@@ -709,7 +710,7 @@ namespace HEXABLOCK
 
 
 
-    class HexaExport PerformTransformationDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT PerformTransformationDialog : public HexaBaseDialog,
     public Ui::TransformationDialog
     {
       Q_OBJECT
@@ -731,7 +732,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport PerformSymmetryDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT PerformSymmetryDialog : public HexaBaseDialog,
     public Ui::SymmetryDialog
     {
       Q_OBJECT
@@ -752,7 +753,7 @@ namespace HEXABLOCK
     void updateHelpFileName();
     };
 
-class HexaExport EdgeAssocDialog : public HexaBaseDialog,
+class HEXABLOCK_EXPORT EdgeAssocDialog : public HexaBaseDialog,
     public Ui::EdgeAssocDialog
     {
       Q_OBJECT
@@ -790,7 +791,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
     };
 
 
-    class HexaExport QuadAssocDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT QuadAssocDialog : public HexaBaseDialog,
     public Ui::QuadAssocDialog
     {
       Q_OBJECT
@@ -821,7 +822,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
 
 
 
-    class HexaExport GroupDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT GroupDialog : public HexaBaseDialog,
     public Ui::GroupDialog
     {
       Q_OBJECT
@@ -853,7 +854,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
 
 
 
-    class HexaExport LawDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT LawDialog : public HexaBaseDialog,
     public Ui::LawDialog
     {
       Q_OBJECT
@@ -881,7 +882,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
 
 
 
-    class HexaExport PropagationDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT PropagationDialog : public HexaBaseDialog,
     public Ui::PropagationDialog
     {
       Q_OBJECT
@@ -914,7 +915,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
     // Define the compute mesh dialog box
     // ----------------------------------
 
-    class HexaExport ComputeMeshDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT ComputeMeshDialog : public HexaBaseDialog,
     public Ui::ComputeMeshDialog
     {
       Q_OBJECT
@@ -935,7 +936,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
 
 
 
-    class HexaExport ReplaceHexaDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT ReplaceHexaDialog : public HexaBaseDialog,
     public Ui::ReplaceHexaDialog
     {
       Q_OBJECT
@@ -967,7 +968,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
 
 
 
-    class HexaExport QuadRevolutionDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT QuadRevolutionDialog : public HexaBaseDialog,
     public Ui::QuadRevolutionDialog
     {
       Q_OBJECT
@@ -996,7 +997,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
 
 
 
-    class HexaExport MakeHemiSphereDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakeHemiSphereDialog : public HexaBaseDialog,
     public Ui::MakeHemiSphereDialog
     {
       Q_OBJECT
@@ -1027,7 +1028,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
     HEXA_NS::Elements *_value;
     };
 
-    class HexaExport ModelInfoDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT ModelInfoDialog : public HexaBaseDialog,
     public Ui::ModelInfoDialog
     {
         Q_OBJECT
@@ -1046,7 +1047,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
         virtual void _initInputWidget( Mode editmode ){}
     };
 
-    class HexaExport AddShapeDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT AddShapeDialog : public HexaBaseDialog,
     public Ui::AddShapeDialog
     {
         Q_OBJECT
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx
index 7f55a54..bd2fdb2 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx
@@ -21,6 +21,7 @@
 #define _HEXABLOCKGUI_DOCUMENTSELECTIONMODEL_HXX_
 
 #include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <QItemSelectionModel>
 //#include <LightApp_SelectionMgr.h>
@@ -40,7 +41,7 @@ namespace HEXABLOCK
   namespace GUI
   {
 
-    class HexaExport SelectionModel: public QItemSelectionModel
+    class HEXABLOCK_EXPORT SelectionModel: public QItemSelectionModel
     {
         Q_OBJECT
 
@@ -89,7 +90,7 @@ namespace HEXABLOCK
 //        }
 //    };
 
-    class HexaExport PatternDataSelectionModel : public SelectionModel
+    class HEXABLOCK_EXPORT PatternDataSelectionModel : public SelectionModel
     {
       Q_OBJECT
 
@@ -113,7 +114,7 @@ namespace HEXABLOCK
 
     };
 
-    class HexaExport PatternGeomSelectionModel : public SelectionModel
+    class HEXABLOCK_EXPORT PatternGeomSelectionModel : public SelectionModel
     {
         Q_OBJECT
 
@@ -134,7 +135,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport GroupsSelectionModel : public SelectionModel
+    class HEXABLOCK_EXPORT GroupsSelectionModel : public SelectionModel
     {
       Q_OBJECT
 
@@ -149,7 +150,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport MeshSelectionModel : public SelectionModel
+    class HEXABLOCK_EXPORT MeshSelectionModel : public SelectionModel
     {
       Q_OBJECT
 
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Exception.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Exception.hxx
index 3cda2ab..33a2c4a 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Exception.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Exception.hxx
@@ -21,6 +21,7 @@
 #define __HEXABLOCKGUI_EXCEPTION_HXX__
 
 #include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <string>
 #include <exception>
@@ -29,7 +30,7 @@ namespace HEXABLOCK
 {
   namespace GUI
   {
-    class HexaExport Exception : public std::exception
+    class HEXABLOCK_EXPORT Exception : public std::exception
     {
     protected:
       std::string _what;
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_GraphicViewsHandler.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_GraphicViewsHandler.hxx
index 717694e..34537f1 100644
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_GraphicViewsHandler.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_GraphicViewsHandler.hxx
@@ -29,6 +29,7 @@
 
 //HEXABLOCK Includes
 #include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 #include "HEXABLOCKGUI_VtkDocumentGraphicView.hxx"
 
 namespace HEXABLOCK
@@ -36,7 +37,7 @@ namespace HEXABLOCK
   namespace GUI
   {
 
-      class HexaExport GraphicViewsHandler
+      class HEXABLOCK_EXPORT GraphicViewsHandler
       {
 
       public:
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Model.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Model.hxx
index 9f3b3e2..035b5a2 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Model.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Model.hxx
@@ -23,8 +23,9 @@
 #include <SalomeApp_DataModel.h>
 
 #include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 
-class HexaExport HEXABLOCKGUI_Model : public SalomeApp_DataModel
+class HEXABLOCK_EXPORT HEXABLOCKGUI_Model : public SalomeApp_DataModel
 {
     public:
       HEXABLOCKGUI_Model(CAM_Module* theModule);
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_OccGraphicView.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_OccGraphicView.hxx
index ff1dfc2..67c6889 100644
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_OccGraphicView.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_OccGraphicView.hxx
@@ -33,6 +33,7 @@
 #include <QModelIndexList>
 
 #include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 namespace HEXABLOCK
 {
 
@@ -43,7 +44,7 @@ namespace HEXABLOCK
          *                          OccGraphicView
          ********************************************************************************/
 
-        class HexaExport OccGraphicView
+        class HEXABLOCK_EXPORT OccGraphicView
         {
 
          public:
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
index 50e7a16..5d442f2 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
@@ -21,6 +21,7 @@
 #define _HEXABLOCKGUI_RESOURCE_HXX_
 
 #include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <QtGui>
 
@@ -29,7 +30,7 @@ class SUIT_ResourceMgr;
 
 
 
-class HexaExport HEXABLOCKGUI_Resource 
+class HEXABLOCK_EXPORT HEXABLOCKGUI_Resource 
 {
   public:
     HEXABLOCKGUI_Resource(SUIT_ResourceMgr* r);
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx
index 3965885..d5e92ad 100644
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx
@@ -21,6 +21,7 @@
 #define _HEXABLOCKGUI_SALOMETOOLS_HXX_
 
 #include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <SalomeApp_Application.h>
 #include <SALOME_Actor.h>
@@ -41,48 +42,48 @@ namespace HEXABLOCK
   namespace GUI
   {
 
-HexaExport  SALOME_Actor* findActorByEntry( SVTK_ViewWindow *theVtkViewWindow, const char* theEntry );
+HEXABLOCK_EXPORT  SALOME_Actor* findActorByEntry( SVTK_ViewWindow *theVtkViewWindow, const char* theEntry );
   _PTR(Study)   GetActiveStudyDocument();
 
-HexaExport int GetNameOfSelectedElements( SVTK_ViewWindow *theWindow,/* SVTK_Selector* theSelector,*/
+HEXABLOCK_EXPORT int GetNameOfSelectedElements( SVTK_ViewWindow *theWindow,/* SVTK_Selector* theSelector,*/
                                  const Handle(SALOME_InteractiveObject)& theIO,
                                  QString& theName );
 
-HexaExport std::string shape2string( const TopoDS_Shape& aShape );
+HEXABLOCK_EXPORT std::string shape2string( const TopoDS_Shape& aShape );
 
-HexaExport void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj,
+HEXABLOCK_EXPORT void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj,
                                const Handle(AIS_InteractiveContext)& theIC,
                                SelectMgr_IndexedMapOfOwner& theMap );
 
-HexaExport void indicesToOwners( const TColStd_IndexedMapOfInteger& aIndexMap,
+HEXABLOCK_EXPORT void indicesToOwners( const TColStd_IndexedMapOfInteger& aIndexMap,
                                const TopoDS_Shape& aMainShape,
                                const SelectMgr_IndexedMapOfOwner& anAllMap,
                                SelectMgr_IndexedMapOfOwner& aToHiliteMap );
 
-HexaExport TopoDS_Shape getSubShape(const TopoDS_Shape& theShape, const int theIndex);
-HexaExport int getSubId(const TopoDS_Shape& theShape, const TopoDS_Shape& theSubShape);
+HEXABLOCK_EXPORT TopoDS_Shape getSubShape(const TopoDS_Shape& theShape, const int theIndex);
+HEXABLOCK_EXPORT int getSubId(const TopoDS_Shape& theShape, const TopoDS_Shape& theSubShape);
 
-HexaExport Standard_Boolean getExtremaSolution(const gp_Pnt& theInitPnt,
+HEXABLOCK_EXPORT Standard_Boolean getExtremaSolution(const gp_Pnt& theInitPnt,
   									  const TopoDS_Shape& theRefShape,
   									  gp_Pnt& thePnt);
 
-HexaExport TopoDS_Vertex makePoint(const double x, const double y, const double z);
+HEXABLOCK_EXPORT TopoDS_Vertex makePoint(const double x, const double y, const double z);
 
-HexaExport TopoDS_Vertex makePointWithReference(const TopoDS_Shape& point, const double dx,
+HEXABLOCK_EXPORT TopoDS_Vertex makePointWithReference(const TopoDS_Shape& point, const double dx,
                                                            const double dy,
                                                            const double dz);
 
-HexaExport TopoDS_Vertex makePointOnCurve(const TopoDS_Shape& edge, const double param);
+HEXABLOCK_EXPORT TopoDS_Vertex makePointOnCurve(const TopoDS_Shape& edge, const double param);
 
-HexaExport TopoDS_Vertex makePointOnCurveByLength(const TopoDS_Shape& edge, const TopoDS_Shape& point, const double length);
+HEXABLOCK_EXPORT TopoDS_Vertex makePointOnCurveByLength(const TopoDS_Shape& edge, const TopoDS_Shape& point, const double length);
 
-HexaExport TopoDS_Vertex makePointOnCurveByCoord(const TopoDS_Shape& edge, const double x, const double y, const double z);
+HEXABLOCK_EXPORT TopoDS_Vertex makePointOnCurveByCoord(const TopoDS_Shape& edge, const double x, const double y, const double z);
 
   TopoDS_Vertex makePointOnLinesIntersection(const TopoDS_Shape& line1, const TopoDS_Shape& line2);
 
-HexaExport TopoDS_Vertex makePointOnSurface(const TopoDS_Shape& face, const double param_u, const double param_v);
+HEXABLOCK_EXPORT TopoDS_Vertex makePointOnSurface(const TopoDS_Shape& face, const double param_u, const double param_v);
 
-HexaExport TopoDS_Vertex makePointOnSurfaceByCoord(const TopoDS_Shape& face, const double x, const double y, const double z);
+HEXABLOCK_EXPORT TopoDS_Vertex makePointOnSurfaceByCoord(const TopoDS_Shape& face, const double x, const double y, const double z);
 
   }
 }
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.hxx
index cccd3e3..433fb64 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.hxx
@@ -24,6 +24,7 @@
 #include <sstream>
 
 #include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 #include "HEXABLOCKGUI_Exception.hxx"
 
 #ifdef _DEVDEBUG_
@@ -34,7 +35,7 @@
 
 namespace HEXABLOCK {
   namespace GUI {
-    extern HexaExport int traceLevel;
+    extern HEXABLOCK_EXPORT int traceLevel;
   }
 }
 
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.hxx
index d1b74ea..e15db18 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.hxx
@@ -28,6 +28,7 @@
 #include <QAbstractItemView>
 #include <QMap>
 
+#include "HEXABLOCKGUI_Export.hxx"
 #include <HexVertex.hxx>
 #include <HexQuad.hxx>
 #include <HexEdge.hxx>
@@ -53,7 +54,7 @@ namespace HEXABLOCK
 
     namespace GUI
     {
-        class HexaExport Document_Actor : public SALOME_Actor
+        class HEXABLOCK_EXPORT Document_Actor : public SALOME_Actor
         {
           public:
             Document_Actor(HEXA_NS::Document* doc, const QString& entry);
@@ -71,7 +72,7 @@ namespace HEXABLOCK
 
         };
                    // Abu
-        class HexaExport Associate_Actor : public SALOME_Actor
+        class HEXABLOCK_EXPORT Associate_Actor : public SALOME_Actor
         {
           public:
             Associate_Actor(HEXA_NS::Document* doc, const QString& entry);
@@ -91,7 +92,7 @@ namespace HEXABLOCK
         /********************************************************************************
          *                          VtkDocumentGraphicView
          ********************************************************************************/
-        class HexaExport VtkDocumentGraphicView : public QAbstractItemView
+        class HEXABLOCK_EXPORT VtkDocumentGraphicView : public QAbstractItemView
         {
             Q_OBJECT
 
diff --git a/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx b/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx
index 730c224..555b1c7 100755
--- a/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx
+++ b/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx
@@ -64,7 +64,8 @@ namespace HEXABLOCK
 // purpose  :
 //=================================================================================
 #include "hexa_base.hxx"
-typedef class HexaExport MyBasicGUI_PointDlg : public MyGEOMBase_Skeleton
+#include "HEXABLOCKGUI_Export.hxx"
+typedef class HEXABLOCK_EXPORT MyBasicGUI_PointDlg : public MyGEOMBase_Skeleton
 {
   Q_OBJECT
 
diff --git a/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx b/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx
index da14e2a..4544ee7 100755
--- a/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx
+++ b/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx
@@ -21,6 +21,7 @@
 #define MYGEOMBASE_SKELETON_H
 
 
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include "HEXABLOCKGUI_OccGraphicView.hxx"
 #include "HEXABLOCKGUI.hxx"
@@ -50,7 +51,7 @@ namespace HEXABLOCK
 namespace GUI
 {
 
-class HexaExport MyGEOMBase_Skeleton : public HexaBaseDialog
+class HEXABLOCK_EXPORT MyGEOMBase_Skeleton : public HexaBaseDialog
 {
 	Q_OBJECT
 
diff --git a/src/HEXABLOCKGUI/Resource.hxx b/src/HEXABLOCKGUI/Resource.hxx
index 1b33510..f75a2b9 100755
--- a/src/HEXABLOCKGUI/Resource.hxx
+++ b/src/HEXABLOCKGUI/Resource.hxx
@@ -21,6 +21,7 @@
 #define _RESOURCE_HXX_
 
 #include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <QColor>
 #include <QFont>
@@ -183,7 +184,7 @@
 
 namespace HEXABLOCK {
   namespace GUI {
-    class HexaExport Resource {
+    class HEXABLOCK_EXPORT Resource {
       public:
         Resource();
 
diff --git a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
index f861f74..558fff0 100644
--- a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
+++ b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
@@ -32,11 +32,12 @@
 // #include "klinkitemselectionmodel_p.hxx"
 
 #include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 #include "kmodelindexproxymapper.hxx"
 
 class KLinkItemSelectionModelPrivate;
 
-class HexaExport KLinkItemSelectionModel : public QItemSelectionModel
+class HEXABLOCK_EXPORT KLinkItemSelectionModel : public QItemSelectionModel
 {
     Q_OBJECT
 public:
diff --git a/src/HEXABLOCKGUI/kmodelindexproxymapper.hxx b/src/HEXABLOCKGUI/kmodelindexproxymapper.hxx
index 6af03c9..8f93bf8 100644
--- a/src/HEXABLOCKGUI/kmodelindexproxymapper.hxx
+++ b/src/HEXABLOCKGUI/kmodelindexproxymapper.hxx
@@ -25,6 +25,7 @@
 #include <QObject>
 
 #include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 
 // #include "kdeui_export.h"
 
@@ -33,7 +34,7 @@ class QModelIndex;
 class QItemSelection;
 class KModelIndexProxyMapperPrivate;
 
-class HexaExport KModelIndexProxyMapper : public QObject
+class HEXABLOCK_EXPORT KModelIndexProxyMapper : public QObject
 {
   Q_OBJECT
 public: