Porting on WIN32/WIN64

diff --git a/src/HEXABLOCK/HexDocument.hxx b/src/HEXABLOCK/HexDocument.hxx
index dacddc6eede2a4e3488879bbbdc8bae98591f41c..4d7df443bea287272f6c389e9499861a83132ac3 100755 (executable)
--- a/src/HEXABLOCK/HexDocument.hxx
+++ b/src/HEXABLOCK/HexDocument.hxx
@@ -23,14 +23,21 @@
 #ifndef __DOCUMENT_H_
 #define __DOCUMENT_H_
 
+#include "Hex_defines.hxx"
 #include "HexEltBase.hxx"
 
+#ifdef WIN32
+ #ifdef max
+  #undef max
+#endif
+#endif
+
 
 BEGIN_NAMESPACE_HEXA
 
-class HexaExport NewShape;
+class NewShape;
 
-class Document : public EltBase
+class HexaExport Document : public EltBase
 {
                                    // Fonctions utilisateur
 public :

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
index 13c3df4a75776c191106f193f55b3ef9bdc908d3..d5843dbc7e6e8c80f279021db94eacd1059fc962 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
@@ -2922,12 +2922,12 @@ QStringList HEXABLOCKGUI::getQuickDirList()
 
 extern "C"
 {
-    HexaExport CAM_Module* createModule()
+    HEXABLOCK_EXPORT CAM_Module* createModule()
     {
         return new HEXABLOCKGUI();
     }
 
-    HexaExport char* getModuleVersion()
+    HEXABLOCK_EXPORT char* getModuleVersion()
     {
         return (char*)HEXABLOCK_VERSION_STR;
     }

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
index b0451661df67ae94f586be9503c84d3cb2fd19ed..b0a61705e52a22627c3b7267ab33d1f12e23f2a3 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
@@ -20,6 +20,8 @@
 #ifndef _HEXABLOCKGUI_HXX_
 #define _HEXABLOCKGUI_HXX_
 
+#include "HEXABLOCKGUI_Export.hxx"
+
 #include <iostream>
 #include <map>
 #include <set>
@@ -113,7 +115,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_DocumentDelegate.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentDelegate.hxx
index 59ecf19601932bf2271ee3e4e808c0bfc8bc1828..a3cbe06e36392143551066f57f755ef2ba55d15e 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentDelegate.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentDelegate.hxx
@@ -19,7 +19,7 @@
 #ifndef __HEXABLOCKGUI_DOCUMENTDELEGATE_HXX_
 #define __HEXABLOCKGUI_DOCUMENTDELEGATE_HXX_
 
-
+#include "HEXABLOCKGUI_Export.hxx"
 // QEvent * event, QAbstractItemModel 
 
 #include <QEvent>
@@ -31,19 +31,16 @@
 
 #include <QDockWidget>
 
-
 #include "HEXABLOCKGUI_DocumentModel.hxx"
 #include "HEXABLOCKGUI_DocumentSelectionModel.hxx"
 #include "HEXABLOCKGUI_DocumentItem.hxx"
 #include "HEXABLOCKGUI_DocumentPanel.hxx"
 
-#include "hexa_base.hxx"
-
 namespace HEXABLOCK
 {
   namespace GUI
   {
-      class HexaExport DocumentDelegate : public QItemDelegate
+      class HEXABLOCK_EXPORT DocumentDelegate : public QItemDelegate
       {
           Q_OBJECT
       
@@ -81,7 +78,7 @@ namespace HEXABLOCK
           QDockWidget* _dw; // creator's container
 
       private slots:
-          void commitEditor();
+         // void commitEditor();
 
       };
   }

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx
index 4bab98bf3ce1b6050bd9efdd2521dbb58965d95f..18729593cabed13b95d7e3cfe2d418adf6c6d408 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx
@@ -20,6 +20,7 @@
 #ifndef _HEXABLOCKGUI_DOCUMENTITEM_HXX_
 #define _HEXABLOCKGUI_DOCUMENTITEM_HXX_
 
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <QStandardItem>
 
@@ -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.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.cxx
index dfb011bd073f87a27c83f22cdb14bd85becb3f94..2c89d3aa2a78362b083022545390a95ad049be77 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.cxx
@@ -1075,7 +1075,7 @@ QModelIndex DocumentModel::addQuadVertices( const QModelIndex &i_v0, const QMode
     HEXA_NS::Vertex* hv2 = getHexaPtr<HEXA_NS::Vertex*>(i_v2);
     HEXA_NS::Vertex* hv3 = getHexaPtr<HEXA_NS::Vertex*>(i_v3);
 
-    if ( hv0 and hv1 and hv2 and hv3 ){
+    if ( hv0 && hv1 && hv2 && hv3 ){
         HEXA_NS::Quad* hq = _hexaDocument->addQuadVertices( hv0, hv1, hv2, hv3 );
         if ( BadElement(hq) ) return quadIndex;
 
@@ -1098,7 +1098,7 @@ QModelIndex DocumentModel::addQuadEdges( const QModelIndex &e0, const QModelInde
     HEXA_NS::Edge* he2 = getHexaPtr<HEXA_NS::Edge*>(e2);
     HEXA_NS::Edge* he3 = getHexaPtr<HEXA_NS::Edge*>(e3);
 
-    if ( he0 and he1 and he2 and he3 ){
+    if ( he0 && he1 && he2 && he3 ){
 
         HEXA_NS::Quad* hq = _hexaDocument->addQuad( he0, he1, he2, he3 );
         if ( BadElement(hq) ) return quadIndex;
@@ -2249,7 +2249,7 @@ Qt::ItemFlags PatternDataModel::flags(const QModelIndex &index) const
 
 QVariant PatternDataModel::headerData ( int section, Qt::Orientation orientation, int role ) const
 {
-    if ( section == 0 and orientation == Qt::Horizontal and role == Qt::DisplayRole ){
+    if ( section == 0 && orientation == Qt::Horizontal && role == Qt::DisplayRole ){
         return QVariant( "Data" );
     } else {
         return QSortFilterProxyModel::headerData ( section, orientation, role );
@@ -2345,7 +2345,7 @@ Qt::ItemFlags PatternGeomModel::flags(const QModelIndex &index) const
 
 QVariant PatternGeomModel::headerData ( int section, Qt::Orientation orientation, int role ) const
 {
-    if ( section == 0 and orientation == Qt::Horizontal and role == Qt::DisplayRole ){
+    if ( section == 0 && orientation == Qt::Horizontal && role == Qt::DisplayRole ){
         return QVariant( "Geometry" );
     } else {
         return QSortFilterProxyModel::headerData ( section, orientation, role );
@@ -2390,7 +2390,7 @@ Qt::ItemFlags AssociationsModel::flags(const QModelIndex &index) const
 
 QVariant AssociationsModel::headerData ( int section, Qt::Orientation orientation, int role ) const
 {
-    if ( section == 0 and orientation == Qt::Horizontal and role == Qt::DisplayRole ){
+    if ( section == 0 && orientation == Qt::Horizontal && role == Qt::DisplayRole ){
         return QVariant( "Associations" );
     } else {
         return QSortFilterProxyModel::headerData ( section, orientation, role );
@@ -2433,7 +2433,7 @@ Qt::ItemFlags GroupsModel::flags(const QModelIndex &index) const
 
 QVariant GroupsModel::headerData ( int section, Qt::Orientation orientation, int role ) const
 {
-    if ( section == 0 and orientation == Qt::Horizontal and role == Qt::DisplayRole ){
+    if ( section == 0 && orientation == Qt::Horizontal && role == Qt::DisplayRole ){
         return QVariant( "Groups" );
     } else {
         return QSortFilterProxyModel::headerData ( section, orientation, role );
@@ -2486,7 +2486,7 @@ Qt::ItemFlags MeshModel::flags(const QModelIndex &index) const
 
 QVariant MeshModel::headerData ( int section, Qt::Orientation orientation, int role ) const
 {
-    if ( section == 0 and orientation == Qt::Horizontal and role == Qt::DisplayRole ){
+    if ( section == 0 && orientation == Qt::Horizontal && role == Qt::DisplayRole ){
         return QVariant( "Mesh" );
     } else {
         return QSortFilterProxyModel::headerData ( section, orientation, role );

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx
index 4c37cc9b7f663b85b1c4564ab8b139419a941ea7..26d216d2ca89ef7d8f4c8a8520a61da45270d7c0 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx
@@ -20,6 +20,7 @@
 #ifndef _HEXABLOCKGUI_DOCUMENTMODEL_HXX_
 #define _HEXABLOCKGUI_DOCUMENTMODEL_HXX_
 
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <QTemporaryFile>
 #include <QStandardItemModel>
@@ -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.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx
index 126faf9ff12124993ce37b8df0c0bcd10407b581..685267655d63f7a882be0b40a3a19bbf09a9b9e8 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx
@@ -1718,9 +1718,9 @@ bool HexaDialog::apply(QModelIndex& result)
     }
 
     nbItems = iElts.count();
-    if ( quads_rb->isChecked() and (nbItems>=2 and nbItems<=6) ){ // build from quads iElts.count() should be between [2,6]
+    if ( quads_rb->isChecked() && (nbItems>=2 && nbItems<=6) ){ // build from quads iElts.count() should be between [2,6]
         iHexa = getDocumentModel()->addHexaQuads( iElts );
-    } else if ( vertices_rb->isChecked() and nbItems== 8 ){ // build from vertices
+    } else if ( vertices_rb->isChecked() && nbItems== 8 ){ // build from vertices
         iHexa = getDocumentModel()->addHexaVertices( iElts[0], iElts[1], iElts[2], iElts[3],
                 iElts[4], iElts[5], iElts[6], iElts[7] );
     }

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx
index f9ba91bf1c66619291fbb3cf952c642c71d89f8e..c123698c7f6830c811b73cdc313ec9182a7c2a0e 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx
@@ -19,6 +19,8 @@
 #ifndef __HEXABLOCKGUI_DOCUMENTPANEL_HXX_
 #define __HEXABLOCKGUI_DOCUMENTPANEL_HXX_
 
+#include "HEXABLOCKGUI_Export.hxx"
+
 #define MAX_WIDTH 16777215
 #define MAX_HEIGHT 16777215
 #define MIN_WIDTH 5
@@ -83,7 +85,7 @@ namespace HEXABLOCK
 {
   namespace GUI
   {
-    class HexaExport HexaBaseDialog : public QDialog
+    class HEXABLOCK_EXPORT HexaBaseDialog : public QDialog
     {
       Q_OBJECT
 
@@ -251,7 +253,7 @@ namespace HEXABLOCK
 
 
 
-    class HexaExport VertexDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT VertexDialog : public HexaBaseDialog,
     public Ui::VertexDialog
     {
       Q_OBJECT
@@ -279,7 +281,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport EdgeDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT EdgeDialog : public HexaBaseDialog,
     public Ui::EdgeDialog
     {
       Q_OBJECT
@@ -305,7 +307,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport QuadDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT QuadDialog : public HexaBaseDialog,
     public Ui::QuadDialog
     {
       Q_OBJECT
@@ -332,7 +334,7 @@ namespace HEXABLOCK
 
 
 
-    class HexaExport HexaDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT HexaDialog : public HexaBaseDialog,
     public Ui::HexaDialog
     {
       Q_OBJECT
@@ -367,7 +369,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport VectorDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT VectorDialog : public HexaBaseDialog,
     public Ui::VectorDialog
     {
       Q_OBJECT
@@ -392,7 +394,7 @@ namespace HEXABLOCK
     QModelIndex     _ivalue;
     };
 
-    class HexaExport MakeGridDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakeGridDialog : public HexaBaseDialog,
     public Ui::MakeGridDialog
     {
       Q_OBJECT
@@ -421,7 +423,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport MakeCylinderDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakeCylinderDialog : public HexaBaseDialog,
     public Ui::MakeCylinderDialog
     {
       Q_OBJECT
@@ -449,7 +451,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport MakePipeDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakePipeDialog : public HexaBaseDialog,
     public Ui::MakePipeDialog
     {
       Q_OBJECT
@@ -477,7 +479,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport MakeCylindersDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakeCylindersDialog : public HexaBaseDialog,
     public Ui::MakeCylindersDialog
     {
       Q_OBJECT
@@ -496,7 +498,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport MakePipesDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakePipesDialog : public HexaBaseDialog,
     public Ui::MakePipesDialog
     {
       Q_OBJECT
@@ -516,7 +518,7 @@ namespace HEXABLOCK
 
 
 
-    class HexaExport RemoveHexaDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT RemoveHexaDialog : public HexaBaseDialog,
     public Ui::RemoveHexaDialog
     {
       Q_OBJECT
@@ -535,7 +537,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport PrismQuadDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT PrismQuadDialog : public HexaBaseDialog,
     public Ui::PrismQuadDialog
     {
       Q_OBJECT
@@ -558,13 +560,13 @@ namespace HEXABLOCK
     void updateHelpFileName();
 
     private slots:
-    void addQuad();
+    //void addQuad();
     void removeQuad();
-    void clearQuads();
+    //void clearQuads();
 
     };
 
-    class HexaExport JoinQuadDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT JoinQuadDialog : public HexaBaseDialog,
     public Ui::JoinQuadDialog
     {
       Q_OBJECT
@@ -588,14 +590,14 @@ namespace HEXABLOCK
     void updateHelpFileName();
 
     private slots:
-    void addQuad();
+    //void addQuad();
     void removeQuad();
-    void clearQuads();
+    //void clearQuads();
 
     };
 
 
-    class HexaExport MergeDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MergeDialog : public HexaBaseDialog,
     public Ui::MergeDialog
     {
       Q_OBJECT
@@ -619,7 +621,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport DisconnectDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT DisconnectDialog : public HexaBaseDialog,
     public Ui::DisconnectDialog
     {
       Q_OBJECT
@@ -645,7 +647,7 @@ namespace HEXABLOCK
 
 
 
-    class HexaExport CutEdgeDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT CutEdgeDialog : public HexaBaseDialog,
     public Ui::CutEdgeDialog
     {
       Q_OBJECT
@@ -669,7 +671,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport MakeTransformationDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakeTransformationDialog : public HexaBaseDialog,
     public Ui::TransformationDialog
     {
       Q_OBJECT
@@ -691,7 +693,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport MakeSymmetryDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakeSymmetryDialog : public HexaBaseDialog,
     public Ui::SymmetryDialog
     {
       Q_OBJECT
@@ -715,7 +717,7 @@ namespace HEXABLOCK
 
 
 
-    class HexaExport PerformTransformationDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT PerformTransformationDialog : public HexaBaseDialog,
     public Ui::TransformationDialog
     {
       Q_OBJECT
@@ -737,7 +739,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport PerformSymmetryDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT PerformSymmetryDialog : public HexaBaseDialog,
     public Ui::SymmetryDialog
     {
       Q_OBJECT
@@ -758,7 +760,7 @@ namespace HEXABLOCK
     void updateHelpFileName();
     };
 
-class HexaExport EdgeAssocDialog : public HexaBaseDialog,
+class HEXABLOCK_EXPORT EdgeAssocDialog : public HexaBaseDialog,
     public Ui::EdgeAssocDialog
     {
       Q_OBJECT
@@ -796,7 +798,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
     };
 
 
-    class HexaExport QuadAssocDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT QuadAssocDialog : public HexaBaseDialog,
     public Ui::QuadAssocDialog
     {
       Q_OBJECT
@@ -827,7 +829,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
 
 
 
-    class HexaExport GroupDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT GroupDialog : public HexaBaseDialog,
     public Ui::GroupDialog
     {
       Q_OBJECT
@@ -859,7 +861,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
 
 
 
-    class HexaExport LawDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT LawDialog : public HexaBaseDialog,
     public Ui::LawDialog
     {
       Q_OBJECT
@@ -887,7 +889,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
 
 
 
-    class HexaExport PropagationDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT PropagationDialog : public HexaBaseDialog,
     public Ui::PropagationDialog
     {
       Q_OBJECT
@@ -907,7 +909,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
     void _initInputWidget( Mode editmode );
 
     protected slots:
-    void updateHelpFileName();
+    //void updateHelpFileName();
     void deletePropagationItem();
     virtual void selectElementOfModel();
 
@@ -920,7 +922,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
@@ -941,7 +943,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
 
 
 
-    class HexaExport ReplaceHexaDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT ReplaceHexaDialog : public HexaBaseDialog,
     public Ui::ReplaceHexaDialog
     {
       Q_OBJECT
@@ -971,7 +973,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
 
 
 
-    class HexaExport QuadRevolutionDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT QuadRevolutionDialog : public HexaBaseDialog,
     public Ui::QuadRevolutionDialog
     {
       Q_OBJECT
@@ -1000,7 +1002,7 @@ class HexaExport EdgeAssocDialog : public HexaBaseDialog,
 
 
 
-    class HexaExport MakeHemiSphereDialog : public HexaBaseDialog,
+    class HEXABLOCK_EXPORT MakeHemiSphereDialog : public HexaBaseDialog,
     public Ui::MakeHemiSphereDialog
     {
       Q_OBJECT
@@ -1031,7 +1033,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
@@ -1050,7 +1052,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 6cf842d66c60cedfda0bd5513c468788d81cd2ff..923f1de88ef75f8ba33df25035a7dbe4e666d497 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx
@@ -20,7 +20,7 @@
 #ifndef _HEXABLOCKGUI_DOCUMENTSELECTIONMODEL_HXX_
 #define _HEXABLOCKGUI_DOCUMENTSELECTIONMODEL_HXX_
 
-#include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <QItemSelectionModel>
 #include <LightApp_SelectionMgr.h>
@@ -40,7 +40,7 @@ namespace HEXABLOCK
   namespace GUI
   {
 
-    class HexaExport SelectionModel: public QItemSelectionModel
+    class HEXABLOCK_EXPORT SelectionModel: public QItemSelectionModel
     {
         Q_OBJECT
 
@@ -89,7 +89,7 @@ namespace HEXABLOCK
 //        }
 //    };
 
-    class HexaExport PatternDataSelectionModel : public SelectionModel
+    class HEXABLOCK_EXPORT PatternDataSelectionModel : public SelectionModel
     {
       Q_OBJECT
 
@@ -113,7 +113,7 @@ namespace HEXABLOCK
 
     };
 
-    class HexaExport PatternGeomSelectionModel : public SelectionModel
+    class HEXABLOCK_EXPORT PatternGeomSelectionModel : public SelectionModel
     {
         Q_OBJECT
 
@@ -134,7 +134,7 @@ namespace HEXABLOCK
     };
 
 
-    class HexaExport GroupsSelectionModel : public SelectionModel
+    class HEXABLOCK_EXPORT GroupsSelectionModel : public SelectionModel
     {
       Q_OBJECT
 
@@ -149,7 +149,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 3cda2abfd6cb68697d0ea64f1ce882058c81108d..6ba6a00083dc20cc64b6d27d33896bdf0403a289 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Exception.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Exception.hxx
@@ -20,7 +20,7 @@
 #ifndef __HEXABLOCKGUI_EXCEPTION_HXX__
 #define __HEXABLOCKGUI_EXCEPTION_HXX__
 
-#include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <string>
 #include <exception>
@@ -29,7 +29,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 717694e9e1bcf2d3507efd2c11e83a4923cc21e7..c4164c4b7d2d5b906af322fd3718045ac6a31463 100644 (file)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_GraphicViewsHandler.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_GraphicViewsHandler.hxx
@@ -28,7 +28,7 @@
 #include <QMap>
 
 //HEXABLOCK Includes
-#include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 #include "HEXABLOCKGUI_VtkDocumentGraphicView.hxx"
 
 namespace HEXABLOCK
@@ -36,7 +36,7 @@ namespace HEXABLOCK
   namespace GUI
   {
 
-      class HexaExport GraphicViewsHandler
+      class HEXABLOCK_EXPORT GraphicViewsHandler
       {
 
       public:

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_OCCSelector.h b/src/HEXABLOCKGUI/HEXABLOCKGUI_OCCSelector.h
index cf93b4ae08256bcc41f0921f1a7e2bbe71a348c5..cab143cefea51749ce105ab3f07b896524a1efd0 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_OCCSelector.h
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_OCCSelector.h
@@ -27,11 +27,11 @@
 #ifndef HEXABLOCKGUI_OCCSELECTOR_H
 #define HEXABLOCKGUI_OCCSELECTOR_H
 
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <LightApp_OCCSelector.h>
-#include "hexa_base.hxx"
 
-class HexaExport HEXABLOCKGUI_OCCSelector : public LightApp_OCCSelector
+class HEXABLOCK_EXPORT HEXABLOCKGUI_OCCSelector : public LightApp_OCCSelector
 {
 public:
     HEXABLOCKGUI_OCCSelector( OCCViewer_Viewer*, SUIT_SelectionMgr* );

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_OccGraphicView.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_OccGraphicView.hxx
index d269eb69234536a7891b17c84bee5c4c344a8e14..d1077517154d92fe5818f6a621b476abbf6f4911 100644 (file)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_OccGraphicView.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_OccGraphicView.hxx
@@ -22,6 +22,8 @@
 #ifndef _HEXABLOCKGUI_OCCGRAPHICVIEW_HXX_
 #define _HEXABLOCKGUI_OCCGRAPHICVIEW_HXX_
 
+#include "HEXABLOCKGUI_Export.hxx"
+
 #include <OCCViewer_ViewWindow.h>
 #include "HEXABLOCKGUI_SalomeTools.hxx"
 
@@ -32,8 +34,6 @@
 #include <QModelIndex>
 #include <QModelIndexList>
 
-#include "hexa_base.hxx"
-
 namespace HEXABLOCK
 {
 
@@ -44,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 50e7a16a358043d9386dfbf1bb976db195cdcfcd..87d1621ba6adb4bd0fb0ca39edcd79c3cf343054 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
@@ -20,7 +20,7 @@
 #ifndef _HEXABLOCKGUI_RESOURCE_HXX_
 #define _HEXABLOCKGUI_RESOURCE_HXX_
 
-#include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <QtGui>
 
@@ -29,7 +29,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 3965885500283f10af14943f775342d01787be0d..c5097fd756ed438aa4607704cdc645b1ade405df 100644 (file)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx
@@ -20,7 +20,7 @@
 #ifndef _HEXABLOCKGUI_SALOMETOOLS_HXX_
 #define _HEXABLOCKGUI_SALOMETOOLS_HXX_
 
-#include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <SalomeApp_Application.h>
 #include <SALOME_Actor.h>
@@ -41,48 +41,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 cccd3e303d487cb85455f7e5b7b787af20d3e129..92708129b6e87ccfda040a301fff027403aab31d 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.hxx
@@ -23,7 +23,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 #include "HEXABLOCKGUI_Exception.hxx"
 
 #ifdef _DEVDEBUG_
@@ -34,7 +34,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 d1b74ea1de5b726527889e4999d4d1941282e1a0..e5d0899996eed459a9813a1460923b8d4bc6eaf8 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.hxx
@@ -20,6 +20,8 @@
 #ifndef _HEXABLOCKGUI_VTKDOCUMENTGRAPHICVIEW_HXX_
 #define _HEXABLOCKGUI_VTKDOCUMENTGRAPHICVIEW_HXX_
 
+#include "HEXABLOCKGUI_Export.hxx"\r
+\r
 // SALOME GUI includes
 #include <LightApp_Displayer.h>
 #include <SUIT_ViewWindow.h>
@@ -53,7 +55,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 +73,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 +93,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 730c224fe01ba16c4541aeb0c58b8be8f3a7866d..6278d9c83ac4e4151abacf3155a1f2e458c2d9c1 100755 (executable)
--- a/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx
+++ b/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx
@@ -21,8 +21,7 @@
 #ifndef MYBASICGUI_POINTDLG_H
 #define MYBASICGUI_POINTDLG_H
 
-
-
+#include "HEXABLOCKGUI_Export.hxx"\r
 
 #include "MyGEOMBase_Skeleton.hxx"
 #include <QMap>
@@ -63,8 +62,7 @@ namespace HEXABLOCK
 // class    : MyBasicGUI_PointDlg
 // purpose  :
 //=================================================================================
-#include "hexa_base.hxx"
-typedef class HexaExport MyBasicGUI_PointDlg : public MyGEOMBase_Skeleton
+typedef class HEXABLOCK_EXPORT MyBasicGUI_PointDlg : public MyGEOMBase_Skeleton
 {
   Q_OBJECT
 
@@ -113,8 +111,8 @@ private slots:
   void                               ClickParamCoord( int );
   void                               onBtnPopup( QAction* );
   void                               updateSize();
-  void                               onRefPointChanged(const QString& pointName);
-  void                               onStartPointSelected(const QString& pointName);
+ // void                               onRefPointChanged(const QString& pointName);
+ // void                               onStartPointSelected(const QString& pointName);
   void                               onParamValueChanged(double newValue);
   void                               onXCoordChanged(double newValue);
   void                               onYCoordChanged(double newValue);

diff --git a/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx b/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx
index da14e2a693b552afbdea1e0ca8cd47203ba467a0..c38723cb5df0cf83e384a75fefd4574e613521f0 100755 (executable)
--- a/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx
+++ b/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx
@@ -20,8 +20,8 @@
 #ifndef MYGEOMBASE_SKELETON_H
 #define MYGEOMBASE_SKELETON_H
 
-
-
+#include "HEXABLOCKGUI_Export.hxx"\r
+\r
 #include "HEXABLOCKGUI_OccGraphicView.hxx"
 #include "HEXABLOCKGUI.hxx"
 #include "HEXABLOCKGUI_DocumentPanel.hxx"
@@ -43,14 +43,12 @@ class QPushButton;
 #  define DBL_DIGITS_DISPLAY 13
 #endif // COORD_MIN
 
-#include "hexa_base.hxx"
-
 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 1b3351050c12251aecce001c3d953b2232fdb56e..f745ea358ff61f65cbd2bf9a1242087531f01337 100755 (executable)
--- a/src/HEXABLOCKGUI/Resource.hxx
+++ b/src/HEXABLOCKGUI/Resource.hxx
@@ -20,7 +20,7 @@
 #ifndef _RESOURCE_HXX_
 #define _RESOURCE_HXX_
 
-#include "hexa_base.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <QColor>
 #include <QFont>
@@ -183,7 +183,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 f861f742830d73034fd12a955c37b28895694939..6172392509c678860a019fad5a2fb7cfb81175e6 100644 (file)
--- a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
+++ b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
@@ -22,6 +22,8 @@
 #ifndef KLINKITEMSELECTIONMODEL_H
 #define KLINKITEMSELECTIONMODEL_H
 
+#include "HEXABLOCKGUI_Export.hxx"\r
+
 #include <QtCore/QObject>
 #include <QtGui/QItemSelectionModel>
 #include <QtGui/QAbstractProxyModel>
@@ -36,7 +38,7 @@
 
 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 6af03c9fc1a5dd6ae30767fa4024f1a91df624b9..eae0c54444be048f60c50922f6c533274835e2a9 100644 (file)
--- a/src/HEXABLOCKGUI/kmodelindexproxymapper.hxx
+++ b/src/HEXABLOCKGUI/kmodelindexproxymapper.hxx
@@ -22,9 +22,9 @@
 #ifndef KMODELINDEXPROXYMAPPER_H
 #define KMODELINDEXPROXYMAPPER_H
 
-#include <QObject>
+#include "HEXABLOCKGUI_Export.hxx"\r
 
-#include "hexa_base.hxx"
+#include <QObject>
 
 // #include "kdeui_export.h"
 
@@ -33,7 +33,7 @@ class QModelIndex;
 class QItemSelection;
 class KModelIndexProxyMapperPrivate;
 
-class HexaExport KModelIndexProxyMapper : public QObject
+class HEXABLOCK_EXPORT KModelIndexProxyMapper : public QObject
 {
   Q_OBJECT
 public: