From: abuhsing <abuhsing>
Date: Wed, 4 Dec 2013 15:36:45 +0000 (+0000)
Subject: Fusion V7_Main V7_3 _BR
X-Git-Tag: V7_4_0a1~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b7c023b12f8feb6907270bab2ccff7c50a0ec7f8;p=modules%2Fhexablock.git

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 b67044f..f844c41 100755
--- 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 a92eaa8..1872959 100755
--- 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 19dbf72..a44306e 100755
--- 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 5ca2f3a..5f52285 100755
--- 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 bd2fdb2..fcc7d46 100755
--- 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 33a2c4a..6ba6a00 100755
--- 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 34537f1..c4164c4 100644
--- 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 035b5a2..0f5c2ee 100755
--- 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 67c6889..d107751 100644
--- 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 5d442f2..87d1621 100755
--- 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 d5e92ad..c5097fd 100644
--- 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 433fb64..9270812 100755
--- 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 e15db18..e5d0899 100755
--- 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"
+
 // 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 555b1c7..6278d9c 100755
--- 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"
 
 #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 4544ee7..c38723c 100755
--- 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"
+
 #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 f75a2b9..f745ea3 100755
--- 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 558fff0..6172392 100644
--- a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
+++ b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
@@ -22,6 +22,8 @@
 #ifndef KLINKITEMSELECTIONMODEL_H
 #define KLINKITEMSELECTIONMODEL_H
 
+#include "HEXABLOCKGUI_Export.hxx"
+
 #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 8f93bf8..eae0c54 100644
--- 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"
 
-#include "hexa_base.hxx"
-#include "HEXABLOCKGUI_Export.hxx"
+#include <QObject>
 
 // #include "kdeui_export.h"