Fusion V7_Main V7_3 _BR

 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 b67044fe37f417bae7b762f101acf37703d5e4d2..f844c41ee87e7eed3258371fe0c9233e8d508162 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>
@@ -28,8 +30,6 @@
 #include <QModelIndex>
 #include <QDockWidget>
 
-
-#include "HEXABLOCKGUI_Export.hxx"
 #include "klinkitemselectionmodel.hxx"
 
 #include <OB_Browser.h>

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx
index a92eaa88bc7423be8f0af68d97392421925fad52..18729593cabed13b95d7e3cfe2d418adf6c6d408 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx
@@ -20,10 +20,10 @@
 #ifndef _HEXABLOCKGUI_DOCUMENTITEM_HXX_
 #define _HEXABLOCKGUI_DOCUMENTITEM_HXX_
 
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <QStandardItem>
 
-#include "HEXABLOCKGUI_Export.hxx"
 #include "HexVertex.hxx"
 #include "HexEdge.hxx"
 #include "HexQuad.hxx"

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx
index 19dbf722dd1e238536fe933c8e3a3f9d0b245a46..a44306eae68ffc4f6ceabffd4a28bffe40b62ede 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx
@@ -20,12 +20,12 @@
 #ifndef _HEXABLOCKGUI_DOCUMENTMODEL_HXX_
 #define _HEXABLOCKGUI_DOCUMENTMODEL_HXX_
 
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <QTemporaryFile>
 #include <QStandardItemModel>
 #include <QSortFilterProxyModel>
 
-#include "HEXABLOCKGUI_Export.hxx"
 #include "HEXABLOCKGUI_DocumentItem.hxx"
 #include "HexDocument.hxx"
 #include "HexNewShape.hxx"

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx
index 5ca2f3aed65b609891e0844d080449f60941e1f5..5f522852a63cbf31bbb173a20389409ea341bee2 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
@@ -70,7 +72,6 @@
 #include "HexHexa.hxx"
 
 
-#include "HEXABLOCKGUI_Export.hxx"
 #include "HEXABLOCKGUI_DocumentSelectionModel.hxx"
 #include "HEXABLOCKGUI_DocumentModel.hxx"
 #include "HEXABLOCKGUI_VtkDocumentGraphicView.hxx"
@@ -78,7 +79,6 @@
 
 #include "klinkitemselectionmodel.hxx"
 
-
 Q_DECLARE_METATYPE(QModelIndex);
 
 namespace HEXABLOCK

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx
index bd2fdb23fc622df466cdde46111790f24f0f6a7d..fcc7d46ef8d401e39d38ab96cc14fefce311cda1 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx
@@ -20,7 +20,6 @@
 #ifndef _HEXABLOCKGUI_DOCUMENTSELECTIONMODEL_HXX_
 #define _HEXABLOCKGUI_DOCUMENTSELECTIONMODEL_HXX_
 
-#include "hexa_base.hxx"
 #include "HEXABLOCKGUI_Export.hxx"
 
 #include <QItemSelectionModel>

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Exception.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Exception.hxx
index 33a2c4a280cfadf480b62675f7a90f56168aff4f..6ba6a00083dc20cc64b6d27d33896bdf0403a289 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Exception.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Exception.hxx
@@ -20,7 +20,6 @@
 #ifndef __HEXABLOCKGUI_EXCEPTION_HXX__
 #define __HEXABLOCKGUI_EXCEPTION_HXX__
 
-#include "hexa_base.hxx"
 #include "HEXABLOCKGUI_Export.hxx"
 
 #include <string>

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_GraphicViewsHandler.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_GraphicViewsHandler.hxx
index 34537f1e4357f9e8a131e2e2ec522098eab44bc4..c4164c4b7d2d5b906af322fd3718045ac6a31463 100644 (file)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_GraphicViewsHandler.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_GraphicViewsHandler.hxx
@@ -28,7 +28,6 @@
 #include <QMap>
 
 //HEXABLOCK Includes
-#include "hexa_base.hxx"
 #include "HEXABLOCKGUI_Export.hxx"
 #include "HEXABLOCKGUI_VtkDocumentGraphicView.hxx"
 

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Model.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Model.hxx
index 035b5a2f200dfb8c5f5f612602d598d02e9d6d22..0f5c2eef33a126cd3860ff954fb9717d32a1fa2a 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Model.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Model.hxx
@@ -20,11 +20,10 @@
 #ifndef _HEXABLOCKGUI_MODEL_HXX_
 #define _HEXABLOCKGUI_MODEL_HXX_
 
-#include <SalomeApp_DataModel.h>
-
-#include "hexa_base.hxx"
 #include "HEXABLOCKGUI_Export.hxx"
 
+#include <SalomeApp_DataModel.h>
+
 class HEXABLOCK_EXPORT HEXABLOCKGUI_Model : public SalomeApp_DataModel
 {
     public:

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_OccGraphicView.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_OccGraphicView.hxx
index 67c68899d7912e4f934564b58722fc26f057929e..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"
-#include "HEXABLOCKGUI_Export.hxx"
 namespace HEXABLOCK
 {
 

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
index 5d442f238f7d990dc1390902a997592418b38660..87d1621ba6adb4bd0fb0ca39edcd79c3cf343054 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Resource.hxx
@@ -20,7 +20,6 @@
 #ifndef _HEXABLOCKGUI_RESOURCE_HXX_
 #define _HEXABLOCKGUI_RESOURCE_HXX_
 
-#include "hexa_base.hxx"
 #include "HEXABLOCKGUI_Export.hxx"
 
 #include <QtGui>

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx
index d5e92ad74463cb75dd128bfd63809bc6f2f1e957..c5097fd756ed438aa4607704cdc645b1ade405df 100644 (file)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx
@@ -20,7 +20,6 @@
 #ifndef _HEXABLOCKGUI_SALOMETOOLS_HXX_
 #define _HEXABLOCKGUI_SALOMETOOLS_HXX_
 
-#include "hexa_base.hxx"
 #include "HEXABLOCKGUI_Export.hxx"
 
 #include <SalomeApp_Application.h>

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.hxx
index 433fb64ba7e35569c31db43a1ad8f7903003ccbd..92708129b6e87ccfda040a301fff027403aab31d 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.hxx
@@ -23,7 +23,6 @@
 #include <iostream>
 #include <sstream>
 
-#include "hexa_base.hxx"
 #include "HEXABLOCKGUI_Export.hxx"
 #include "HEXABLOCKGUI_Exception.hxx"
 

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_VtkDocumentGraphicView.hxx
index e15db18aa5540ef3e6badf12fe6905e4e3cd1c05..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>
@@ -28,7 +30,6 @@
 #include <QAbstractItemView>
 #include <QMap>
 
-#include "HEXABLOCKGUI_Export.hxx"
 #include <HexVertex.hxx>
 #include <HexQuad.hxx>
 #include <HexEdge.hxx>

diff --git a/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx b/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx
index 555b1c730cfae8aaa80581c15b0045423f6ba260..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,6 @@ namespace HEXABLOCK
 // class    : MyBasicGUI_PointDlg
 // purpose  :
 //=================================================================================
-#include "hexa_base.hxx"
-#include "HEXABLOCKGUI_Export.hxx"
 typedef class HEXABLOCK_EXPORT MyBasicGUI_PointDlg : public MyGEOMBase_Skeleton
 {
   Q_OBJECT
@@ -114,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 4544ee70526bfc90c8a29ef7f8ff653c61b647ab..c38723cb5df0cf83e384a75fefd4574e613521f0 100755 (executable)
--- a/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx
+++ b/src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx
@@ -20,9 +20,8 @@
 #ifndef MYGEOMBASE_SKELETON_H
 #define MYGEOMBASE_SKELETON_H
 
-
-#include "HEXABLOCKGUI_Export.hxx"
-
+#include "HEXABLOCKGUI_Export.hxx"\r
+\r
 #include "HEXABLOCKGUI_OccGraphicView.hxx"
 #include "HEXABLOCKGUI.hxx"
 #include "HEXABLOCKGUI_DocumentPanel.hxx"
@@ -44,8 +43,6 @@ class QPushButton;
 #  define DBL_DIGITS_DISPLAY 13
 #endif // COORD_MIN
 
-#include "hexa_base.hxx"
-
 namespace HEXABLOCK
 {
 namespace GUI

diff --git a/src/HEXABLOCKGUI/Resource.hxx b/src/HEXABLOCKGUI/Resource.hxx
index f75a2b953ae245a2482b9d67eed47bf1514b09db..f745ea358ff61f65cbd2bf9a1242087531f01337 100755 (executable)
--- a/src/HEXABLOCKGUI/Resource.hxx
+++ b/src/HEXABLOCKGUI/Resource.hxx
@@ -20,7 +20,6 @@
 #ifndef _RESOURCE_HXX_
 #define _RESOURCE_HXX_
 
-#include "hexa_base.hxx"
 #include "HEXABLOCKGUI_Export.hxx"
 
 #include <QColor>

diff --git a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
index 558fff032fdae857bc4aabcac1421bc9732ece09..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>
@@ -32,7 +34,6 @@
 // #include "klinkitemselectionmodel_p.hxx"
 
 #include "hexa_base.hxx"
-#include "HEXABLOCKGUI_Export.hxx"
 #include "kmodelindexproxymapper.hxx"
 
 class KLinkItemSelectionModelPrivate;

diff --git a/src/HEXABLOCKGUI/kmodelindexproxymapper.hxx b/src/HEXABLOCKGUI/kmodelindexproxymapper.hxx
index 8f93bf87f6156584801b2eaf5b40cec81930d40d..eae0c54444be048f60c50922f6c533274835e2a9 100644 (file)
--- a/src/HEXABLOCKGUI/kmodelindexproxymapper.hxx
+++ b/src/HEXABLOCKGUI/kmodelindexproxymapper.hxx
@@ -22,10 +22,9 @@
 #ifndef KMODELINDEXPROXYMAPPER_H
 #define KMODELINDEXPROXYMAPPER_H
 
-#include <QObject>
+#include "HEXABLOCKGUI_Export.hxx"\r
 
-#include "hexa_base.hxx"
-#include "HEXABLOCKGUI_Export.hxx"
+#include <QObject>
 
 // #include "kdeui_export.h"