Merge branch 'master' of newgeom:newgeom

diff --git a/src/ConstructionPlugin/ConstructionPlugin_Plugin.h b/src/ConstructionPlugin/ConstructionPlugin_Plugin.h
index 1c772033befb7f89b1ce13ce01aacbc701919f82..95ab19376e52ed4921a86fd68f5ce4c382445201 100644 (file)
--- a/src/ConstructionPlugin/ConstructionPlugin_Plugin.h
+++ b/src/ConstructionPlugin/ConstructionPlugin_Plugin.h
@@ -2,8 +2,8 @@
 // Created:     31 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ConstructionPlugin_Plugin_HeaderFile
-#define ConstructionPlugin_Plugin_HeaderFile
+#ifndef ConstructionPlugin_Plugin_H_
+#define ConstructionPlugin_Plugin_H_
 
 
 #include "ConstructionPlugin.h"

diff --git a/src/ConstructionPlugin/ConstructionPlugin_Point.h b/src/ConstructionPlugin/ConstructionPlugin_Point.h
index a0dda28dd782103e9e37f42c4a77b0b3f6d47979..a5f183690e4e960ae6b5feda5570a26c3003f0e1 100644 (file)
--- a/src/ConstructionPlugin/ConstructionPlugin_Point.h
+++ b/src/ConstructionPlugin/ConstructionPlugin_Point.h
@@ -2,8 +2,8 @@
 // Created:     3 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ConstructionPlugin_Point_HeaderFile
-#define ConstructionPlugin_Point_HeaderFile
+#ifndef ConstructionPlugin_Point_H_
+#define ConstructionPlugin_Point_H_
 
 #include "ConstructionPlugin.h"
 #include <ModelAPI_Feature.h>

diff --git a/src/Events/Events_Listener.h b/src/Events/Events_Listener.h
index 2fdcb097f7d05f9b0089de36abf3665ea05fc966..5bac8dc8a8bf444330d716c3bd5f93f1fb5c36a2 100644 (file)
--- a/src/Events/Events_Listener.h
+++ b/src/Events/Events_Listener.h
@@ -2,8 +2,8 @@
 // Created:    Thu Mar 13 2014
 // Author:     Mikhail PONIKAROV
 
-#ifndef Events_Listener_HeaderFile
-#define Events_Listener_HeaderFile
+#ifndef Events_Listener_H_
+#define Events_Listener_H_
 
 #include <Events.h>
 class Events_Message;

diff --git a/src/Events/Events_Loop.h b/src/Events/Events_Loop.h
index d19dd4d4a39cee1fa832018961e49ea5b8702309..e7a0b3a2a04f6ce033c6a3424ed0d63d8a7a8eb4 100644 (file)
--- a/src/Events/Events_Loop.h
+++ b/src/Events/Events_Loop.h
@@ -2,8 +2,8 @@
 // Created:    Thu Mar 13 2014
 // Author:     Mikhail PONIKAROV
 
-#ifndef Events_Loop_HeaderFile
-#define Events_Loop_HeaderFile
+#ifndef Events_Loop_H_
+#define Events_Loop_H_
 
 #include <Events_Message.h>
 #include <Events_Listener.h>

diff --git a/src/Events/Events_Message.h b/src/Events/Events_Message.h
index 1d5a57d41e235d678320130a0ba6db57c9b885b6..fe829a46895ad8da1c6049ebe5978a3088fc9909 100644 (file)
--- a/src/Events/Events_Message.h
+++ b/src/Events/Events_Message.h
@@ -2,8 +2,8 @@
 // Created:    Thu Mar 13 2014
 // Author:     Mikhail PONIKAROV
 
-#ifndef Events_Message_HeaderFile
-#define Events_Message_HeaderFile
+#ifndef Events_Message_H_
+#define Events_Message_H_
 
 #include <Events.h>
 

diff --git a/src/Events/Events_MessageGroup.h b/src/Events/Events_MessageGroup.h
index b95f64d8716da83363c095a029ed8c331ec8edb1..46d7c420a5fd11d3913a779268de2d32d2f8ee6d 100644 (file)
--- a/src/Events/Events_MessageGroup.h
+++ b/src/Events/Events_MessageGroup.h
@@ -2,8 +2,8 @@
 // Created:    Thu Mar 13 2014
 // Author:     Mikhail PONIKAROV
 
-#ifndef Events_MessageGroup_HeaderFile
-#define Events_MessageGroup_HeaderFile
+#ifndef Events_MessageGroup_H_
+#define Events_MessageGroup_H_
 
 #include <Events_Message.h>
 

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h
index 4e92bd7cba5450ff1ac62c8c05663eeb11993662..f42a7d7f5c16aa535dc7b85aff22e06a5c643241 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h
@@ -2,8 +2,8 @@
 // Created:     30 May 2014
 // Author:      Vitaly SMETANNIKOV
 
-#ifndef FeaturesPlugin_Extrusion_HeaderFile
-#define FeaturesPlugin_Extrusion_HeaderFile
+#ifndef FeaturesPlugin_Extrusion_H_
+#define FeaturesPlugin_Extrusion_H_
 
 #include "FeaturesPlugin.h"
 #include <ModelAPI_Feature.h>

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Plugin.h b/src/FeaturesPlugin/FeaturesPlugin_Plugin.h
index 3ec8c12394cb4fdcd25a058db80749a363934f05..1b49efe5833a2308024bd31be37c84f729688ef6 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_Plugin.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_Plugin.h
@@ -2,8 +2,8 @@
 // Created:     07 July 2014
 // Author:      Vitaly SMETANNIKOV
 
-#ifndef FeaturesPlugin_Plugin_HeaderFile
-#define FeaturesPlugin_Plugin_HeaderFile
+#ifndef FeaturesPlugin_Plugin_H_
+#define FeaturesPlugin_Plugin_H_
 
 
 #include "FeaturesPlugin.h"

diff --git a/src/GeomAPI/GeomAPI_AISObject.h b/src/GeomAPI/GeomAPI_AISObject.h
index afd7ee95f0724d20d0cb23b1aa70732537ce768c..a874e5d3e8440f89b26c93f2468eb6b9371e0f21 100644 (file)
--- a/src/GeomAPI/GeomAPI_AISObject.h
+++ b/src/GeomAPI/GeomAPI_AISObject.h
@@ -2,8 +2,8 @@
 // Created:     25 Jun 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_AISObject_HeaderFile
-#define GeomAPI_AISObject_HeaderFile
+#ifndef GeomAPI_AISObject_H_
+#define GeomAPI_AISObject_H_
 
 #include <GeomAPI_Interface.h>
 

diff --git a/src/GeomAPI/GeomAPI_Circ.h b/src/GeomAPI/GeomAPI_Circ.h
index dda6923c66dd1daa9674e4f03d7e915dec856154..c74e76c014c04fafea01af06333bde7ae8390fef 100644 (file)
--- a/src/GeomAPI/GeomAPI_Circ.h
+++ b/src/GeomAPI/GeomAPI_Circ.h
@@ -2,8 +2,8 @@
 // Created:     24 Jun 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_Circ_HeaderFile
-#define GeomAPI_Circ_HeaderFile
+#ifndef GeomAPI_Circ_H_
+#define GeomAPI_Circ_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>

diff --git a/src/GeomAPI/GeomAPI_Circ2d.h b/src/GeomAPI/GeomAPI_Circ2d.h
index e95d8643c670fb551e31953f3ddc4d69a2f17c71..d4ec763e48391f3fd6f888f21f589ebbae92d24d 100644 (file)
--- a/src/GeomAPI/GeomAPI_Circ2d.h
+++ b/src/GeomAPI/GeomAPI_Circ2d.h
@@ -2,8 +2,8 @@
 // Created:     29 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_Circ2d_HeaderFile
-#define GeomAPI_Circ2d_HeaderFile
+#ifndef GeomAPI_Circ2d_H_
+#define GeomAPI_Circ2d_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>

diff --git a/src/GeomAPI/GeomAPI_Dir.h b/src/GeomAPI/GeomAPI_Dir.h
index 181c4672e283379cf4281c3a9f269db5b9a0544c..223eb745265177d8830209ec510effaa3f5f71f1 100644 (file)
--- a/src/GeomAPI/GeomAPI_Dir.h
+++ b/src/GeomAPI/GeomAPI_Dir.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Dir_HeaderFile
-#define GeomAPI_Dir_HeaderFile
+#ifndef GeomAPI_Dir_H_
+#define GeomAPI_Dir_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>

diff --git a/src/GeomAPI/GeomAPI_Dir2d.h b/src/GeomAPI/GeomAPI_Dir2d.h
index 4c9e6fc14a50cb194578190502f88e9f3e06b7ae..e31059f44cf904e4d2d990131b8f941fe97a5b62 100644 (file)
--- a/src/GeomAPI/GeomAPI_Dir2d.h
+++ b/src/GeomAPI/GeomAPI_Dir2d.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Dir2d_HeaderFile
-#define GeomAPI_Dir2d_HeaderFile
+#ifndef GeomAPI_Dir2d_H_
+#define GeomAPI_Dir2d_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>

diff --git a/src/GeomAPI/GeomAPI_Edge.h b/src/GeomAPI/GeomAPI_Edge.h
index 584e4756cddb172c1af973cf861129b3cfa9f0df..bd186c22b9659cc632cf5884fcd9b8ea19a1fb0e 100644 (file)
--- a/src/GeomAPI/GeomAPI_Edge.h
+++ b/src/GeomAPI/GeomAPI_Edge.h
@@ -2,8 +2,8 @@
 // Created:     24 Jul 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_Edge_HeaderFile
-#define GeomAPI_Edge_HeaderFile
+#ifndef GeomAPI_Edge_H_
+#define GeomAPI_Edge_H_
 
 #include <GeomAPI_Shape.h>
 

diff --git a/src/GeomAPI/GeomAPI_IPresentable.h b/src/GeomAPI/GeomAPI_IPresentable.h
index b28ed8bb06ed1b451d50ef3d300b5dc893417971..abb154170f2be91359af5c35a3dac59d970052f8 100644 (file)
--- a/src/GeomAPI/GeomAPI_IPresentable.h
+++ b/src/GeomAPI/GeomAPI_IPresentable.h
@@ -2,8 +2,8 @@
 // Created:     17 July 2014
 // Author:      Vitaly SMETANNIKOV
 
-#ifndef GeomAPI_IPresentable_HeaderFile
-#define GeomAPI_IPresentable_HeaderFile
+#ifndef GeomAPI_IPresentable_H_
+#define GeomAPI_IPresentable_H_
 
 #include "GeomAPI_AISObject.h"
 

diff --git a/src/GeomAPI/GeomAPI_Interface.h b/src/GeomAPI/GeomAPI_Interface.h
index f77131de6f821dc5fb1b52fad1dfaaa6965ee511..141571688a1da5e993494ac5e448907a30aec29c 100644 (file)
--- a/src/GeomAPI/GeomAPI_Interface.h
+++ b/src/GeomAPI/GeomAPI_Interface.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Interface_HeaderFile
-#define GeomAPI_Interface_HeaderFile
+#ifndef GeomAPI_Interface_H_
+#define GeomAPI_Interface_H_
 
 #include <GeomAPI.h>
 

diff --git a/src/GeomAPI/GeomAPI_Lin.h b/src/GeomAPI/GeomAPI_Lin.h
index 260b5ffeec63e8105d266c3dd08797bb5e95780b..b0b3e265f401701289aae249eecab73451f249d3 100644 (file)
--- a/src/GeomAPI/GeomAPI_Lin.h
+++ b/src/GeomAPI/GeomAPI_Lin.h
@@ -2,8 +2,8 @@
 // Created:     29 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_Lin_HeaderFile
-#define GeomAPI_Lin_HeaderFile
+#ifndef GeomAPI_Lin_H_
+#define GeomAPI_Lin_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>

diff --git a/src/GeomAPI/GeomAPI_Lin2d.h b/src/GeomAPI/GeomAPI_Lin2d.h
index 71136e035e255329808fe568ccad425f5f05e795..b213a0d4dbfcba82f637e5cdce04a653f5dfb3a1 100644 (file)
--- a/src/GeomAPI/GeomAPI_Lin2d.h
+++ b/src/GeomAPI/GeomAPI_Lin2d.h
@@ -2,8 +2,8 @@
 // Created:     29 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_Lin2d_HeaderFile
-#define GeomAPI_Lin2d_HeaderFile
+#ifndef GeomAPI_Lin2d_H_
+#define GeomAPI_Lin2d_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>

diff --git a/src/GeomAPI/GeomAPI_Pln.h b/src/GeomAPI/GeomAPI_Pln.h
index 217f743312f92f2cbc4ff700e2eac668387bd77b..c0d0d69f1335fe0a579e372993a150d2739c1b00 100644 (file)
--- a/src/GeomAPI/GeomAPI_Pln.h
+++ b/src/GeomAPI/GeomAPI_Pln.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Pln_HeaderFile
-#define GeomAPI_Pln_HeaderFile
+#ifndef GeomAPI_Pln_H_
+#define GeomAPI_Pln_H_
 
 #include <boost/shared_ptr.hpp>
 #include <GeomAPI_Interface.h>

diff --git a/src/GeomAPI/GeomAPI_Pnt.h b/src/GeomAPI/GeomAPI_Pnt.h
index 9be8ad0ec3d5a876f9664a55751f35fb2da60e6d..3991b0977ee1515d39efcad8b2007dba80310cef 100644 (file)
--- a/src/GeomAPI/GeomAPI_Pnt.h
+++ b/src/GeomAPI/GeomAPI_Pnt.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Pnt_HeaderFile
-#define GeomAPI_Pnt_HeaderFile
+#ifndef GeomAPI_Pnt_H_
+#define GeomAPI_Pnt_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>

diff --git a/src/GeomAPI/GeomAPI_Pnt2d.h b/src/GeomAPI/GeomAPI_Pnt2d.h
index 91aec7eee0b22864d460c5b2a3fc972ddab6b7f3..eaea875cc2debb9433ac25e3ddd798e98f40ebe3 100644 (file)
--- a/src/GeomAPI/GeomAPI_Pnt2d.h
+++ b/src/GeomAPI/GeomAPI_Pnt2d.h
@@ -2,8 +2,8 @@
 // Created:     29 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_Pnt2d_HeaderFile
-#define GeomAPI_Pnt2d_HeaderFile
+#ifndef GeomAPI_Pnt2d_H_
+#define GeomAPI_Pnt2d_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>

diff --git a/src/GeomAPI/GeomAPI_Shape.h b/src/GeomAPI/GeomAPI_Shape.h
index 9866616ccf9ebccb0469db2d0c0a173c43bd2fb5..4b526589f22c85d9c032bfb06fa4e879c19d9b97 100644 (file)
--- a/src/GeomAPI/GeomAPI_Shape.h
+++ b/src/GeomAPI/GeomAPI_Shape.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Shape_HeaderFile
-#define GeomAPI_Shape_HeaderFile
+#ifndef GeomAPI_Shape_H_
+#define GeomAPI_Shape_H_
 
 #include <GeomAPI_Interface.h>
 

diff --git a/src/GeomAPI/GeomAPI_XY.h b/src/GeomAPI/GeomAPI_XY.h
index 0f0187ae64f69a6a54b7f5a33a2ceff367ae035f..1ff89a8f6c13f25e1e7b81a5e38a7b840e7d1a79 100644 (file)
--- a/src/GeomAPI/GeomAPI_XY.h
+++ b/src/GeomAPI/GeomAPI_XY.h
@@ -2,8 +2,8 @@
 // Created:     30 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_XY_HeaderFile
-#define GeomAPI_XY_HeaderFile
+#ifndef GeomAPI_XY_H_
+#define GeomAPI_XY_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>

diff --git a/src/GeomAPI/GeomAPI_XYZ.h b/src/GeomAPI/GeomAPI_XYZ.h
index ffcaa9d8675e97f9c0cab0502a45ff46b44b0ecb..84036253585bb70f0e688e65136a34373a5dab5c 100644 (file)
--- a/src/GeomAPI/GeomAPI_XYZ.h
+++ b/src/GeomAPI/GeomAPI_XYZ.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_XYZ_HeaderFile
-#define GeomAPI_XYZ_HeaderFile
+#ifndef GeomAPI_XYZ_H_
+#define GeomAPI_XYZ_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_CompoundBuilder.h b/src/GeomAlgoAPI/GeomAlgoAPI_CompoundBuilder.h
index 5cca6ad87819960a48b5c3e54ac670ae7a94e790..ea727ef9e48d424aca21ebb27f65b452bea81464 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_CompoundBuilder.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_CompoundBuilder.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Natalia ERMOLAEVA
 
-#ifndef GeomAlgoAPI_CompoundBuilder_HeaderFile
-#define GeomAlgoAPI_CompoundBuilder_HeaderFile
+#ifndef GeomAlgoAPI_CompoundBuilder_H_
+#define GeomAlgoAPI_CompoundBuilder_H_
 
 #include <GeomAlgoAPI.h>
 #include <GeomAPI_Shape.h>

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.h b/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.h
index bb01b7bf52d96a912bfe33a1ef8ed72bfb7ad8c8..68c239278a088a83d8985babd7a26f0695eb45c2 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAlgoAPI_EdgeBuilder_HeaderFile
-#define GeomAlgoAPI_EdgeBuilder_HeaderFile
+#ifndef GeomAlgoAPI_EdgeBuilder_H_
+#define GeomAlgoAPI_EdgeBuilder_H_
 
 #include <GeomAlgoAPI.h>
 #include <GeomAPI_Edge.h>

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Extrusion.h b/src/GeomAlgoAPI/GeomAlgoAPI_Extrusion.h
index f2a098ceaf3ab2bdb4d99b8011e7dcf712c2597e..a41ae8db4c3d7f9c9ab2a1b27b59a95d1b79ec33 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Extrusion.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Extrusion.h
@@ -2,8 +2,8 @@
 // Created:     06 Jun 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAlgoAPI_Extrusion_HeaderFile
-#define GeomAlgoAPI_Extrusion_HeaderFile
+#ifndef GeomAlgoAPI_Extrusion_H_
+#define GeomAlgoAPI_Extrusion_H_
 
 #include <GeomAlgoAPI.h>
 #include <GeomAPI_Shape.h>

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.h b/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.h
index 5d6d731de0c092669735c9e44d242ea64403e8f0..d14357a93d24cb737dd60064ad63bc870b38dc4c 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAlgoAPI_FaceBuilder_HeaderFile
-#define GeomAlgoAPI_FaceBuilder_HeaderFile
+#ifndef GeomAlgoAPI_FaceBuilder_H_
+#define GeomAlgoAPI_FaceBuilder_H_
 
 #include <GeomAlgoAPI.h>
 #include <GeomAPI_Shape.h>

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_PointBuilder.h b/src/GeomAlgoAPI/GeomAlgoAPI_PointBuilder.h
index 2715062bbed60759b0ef54597374bc2fb7d797e3..7e24a360a5febebb786281232670e4246ea8dbc8 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_PointBuilder.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_PointBuilder.h
@@ -2,8 +2,8 @@
 // Created:     02 Jun 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAlgoAPI_PointBuilder_HeaderFile
-#define GeomAlgoAPI_PointBuilder_HeaderFile
+#ifndef GeomAlgoAPI_PointBuilder_H_
+#define GeomAlgoAPI_PointBuilder_H_
 
 #include <GeomAlgoAPI.h>
 #include <boost/shared_ptr.hpp>

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_SketchBuilder.h b/src/GeomAlgoAPI/GeomAlgoAPI_SketchBuilder.h
index c5817d9b002bb99359aac273409de99b85040520..1a75da2042591eb8f9539455ca5dc0a51f45b16b 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_SketchBuilder.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_SketchBuilder.h
@@ -2,8 +2,8 @@
 // Created:     02 Jun 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAlgoAPI_SketchBuilder_HeaderFile
-#define GeomAlgoAPI_SketchBuilder_HeaderFile
+#ifndef GeomAlgoAPI_SketchBuilder_H_
+#define GeomAlgoAPI_SketchBuilder_H_
 
 #include <GeomAlgoAPI.h>
 

diff --git a/src/GeomData/GeomData_Dir.h b/src/GeomData/GeomData_Dir.h
index 1b6dd6c64bf9090060cc596fcd69533c6bc204df..55688d100f35d2993200b107bde350288203b2f0 100644 (file)
--- a/src/GeomData/GeomData_Dir.h
+++ b/src/GeomData/GeomData_Dir.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomData_Dir_HeaderFile
-#define GeomData_Dir_HeaderFile
+#ifndef GeomData_Dir_H_
+#define GeomData_Dir_H_
 
 #include "GeomData.h"
 #include "GeomDataAPI_Dir.h"

diff --git a/src/GeomData/GeomData_Point.h b/src/GeomData/GeomData_Point.h
index 116039cf196daad35fe7e6e5aa6cfe3130bc79a5..6a306952705155a407679ef0a92acea528ff15c6 100644 (file)
--- a/src/GeomData/GeomData_Point.h
+++ b/src/GeomData/GeomData_Point.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomData_Point_HeaderFile
-#define GeomData_Point_HeaderFile
+#ifndef GeomData_Point_H_
+#define GeomData_Point_H_
 
 #include "GeomData.h"
 #include "GeomDataAPI_Point.h"

diff --git a/src/GeomData/GeomData_Point2D.h b/src/GeomData/GeomData_Point2D.h
index 8e3c124b3d45515ee57177707277c7035bf38d25..0041f5cfe0656e118e8df8fb73857b8289995cb6 100644 (file)
--- a/src/GeomData/GeomData_Point2D.h
+++ b/src/GeomData/GeomData_Point2D.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomData_Point2D_HeaderFile
-#define GeomData_Point2D_HeaderFile
+#ifndef GeomData_Point2D_H_
+#define GeomData_Point2D_H_
 
 #include "GeomData.h"
 #include "GeomDataAPI_Point2D.h"

diff --git a/src/GeomDataAPI/GeomDataAPI_Dir.h b/src/GeomDataAPI/GeomDataAPI_Dir.h
index a25c9faaf976137abbf605eda322fe2c7379576a..c2239633f044a4ac5545ac76a8075ecaa979855c 100644 (file)
--- a/src/GeomDataAPI/GeomDataAPI_Dir.h
+++ b/src/GeomDataAPI/GeomDataAPI_Dir.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomDataAPI_Dir_HeaderFile
-#define GeomDataAPI_Dir_HeaderFile
+#ifndef GeomDataAPI_Dir_H_
+#define GeomDataAPI_Dir_H_
 
 #include "GeomDataAPI.h"
 #include <ModelAPI_Attribute.h>

diff --git a/src/GeomDataAPI/GeomDataAPI_Point.h b/src/GeomDataAPI/GeomDataAPI_Point.h
index 5f08bde0264495703c61458ffacf5002b7aff05f..227a1be5146963e308e3a6cdb6ad0913a5964314 100644 (file)
--- a/src/GeomDataAPI/GeomDataAPI_Point.h
+++ b/src/GeomDataAPI/GeomDataAPI_Point.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomDataAPI_Point_HeaderFile
-#define GeomDataAPI_Point_HeaderFile
+#ifndef GeomDataAPI_Point_H_
+#define GeomDataAPI_Point_H_
 
 #include "GeomDataAPI.h"
 #include <ModelAPI_Attribute.h>

diff --git a/src/GeomDataAPI/GeomDataAPI_Point2D.h b/src/GeomDataAPI/GeomDataAPI_Point2D.h
index f5eb429382bffd9528137114adb9ed7b70938345..02249c24f69edd0e2f484df23dfea1111457dcb8 100644 (file)
--- a/src/GeomDataAPI/GeomDataAPI_Point2D.h
+++ b/src/GeomDataAPI/GeomDataAPI_Point2D.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomDataAPI_Point2D_HeaderFile
-#define GeomDataAPI_Point2D_HeaderFile
+#ifndef GeomDataAPI_Point2D_H_
+#define GeomDataAPI_Point2D_H_
 
 #include "GeomDataAPI.h"
 #include <ModelAPI_Attribute.h>

diff --git a/src/Model/Model_Application.h b/src/Model/Model_Application.h
index 9281f9ce6e4773565072d1c697508f315e09e63c..0d6bef7749ed8b756462430447c0c7dec59e8a31 100644 (file)
--- a/src/Model/Model_Application.h
+++ b/src/Model/Model_Application.h
@@ -3,8 +3,8 @@
 // Author:      Mikhail PONIKAROV
 // Copyright:   CEA 2011
 
-#ifndef Model_Application_HeaderFile
-#define Model_Application_HeaderFile
+#ifndef Model_Application_H_
+#define Model_Application_H_
 
 #include <Model_Document.h> 
 #include <TDocStd_Application.hxx>

diff --git a/src/Model/Model_AttributeBoolean.h b/src/Model/Model_AttributeBoolean.h
index 331fa139c11a55bfd5c53b5fdd9f1c01e6e6eeb2..8626cdc111417454cba5614d384c65e8bbc1405c 100644 (file)
--- a/src/Model/Model_AttributeBoolean.h
+++ b/src/Model/Model_AttributeBoolean.h
@@ -2,8 +2,8 @@
 // Created:     2 june 2014
 // Author:      Vitaly Smetannikov
 
-#ifndef Model_AttributeBoolean_HeaderFile
-#define Model_AttributeBoolean_HeaderFile
+#ifndef Model_AttributeBoolean_H_
+#define Model_AttributeBoolean_H_
 
 #include "Model.h"
 #include "ModelAPI_AttributeBoolean.h"

diff --git a/src/Model/Model_AttributeDocRef.h b/src/Model/Model_AttributeDocRef.h
index f3a3fcf899110239e308ce23c33abdb2098d7bc9..b17ddf14714133d437c007bc4bd286b3318f7417 100644 (file)
--- a/src/Model/Model_AttributeDocRef.h
+++ b/src/Model/Model_AttributeDocRef.h
@@ -2,8 +2,8 @@
 // Created:     2 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_AttributeDocRef_HeaderFile
-#define Model_AttributeDocRef_HeaderFile
+#ifndef Model_AttributeDocRef_H_
+#define Model_AttributeDocRef_H_
 
 #include "Model.h"
 #include "ModelAPI_AttributeDocRef.h"

diff --git a/src/Model/Model_AttributeDouble.h b/src/Model/Model_AttributeDouble.h
index 0079b639ced68fb7b877a666a5ddc967392bf757..5b206afe2e7db4c2865225ecac300285cb45909c 100644 (file)
--- a/src/Model/Model_AttributeDouble.h
+++ b/src/Model/Model_AttributeDouble.h
@@ -2,8 +2,8 @@
 // Created:     2 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_AttributeDouble_HeaderFile
-#define Model_AttributeDouble_HeaderFile
+#ifndef Model_AttributeDouble_H_
+#define Model_AttributeDouble_H_
 
 #include "Model.h"
 #include "ModelAPI_AttributeDouble.h"

diff --git a/src/Model/Model_AttributeRefAttr.h b/src/Model/Model_AttributeRefAttr.h
index 273cfd544102c0c5e183668e578d2d9914727c78..efb879c6d5f35a1e833708550221a10296f76ea2 100644 (file)
--- a/src/Model/Model_AttributeRefAttr.h
+++ b/src/Model/Model_AttributeRefAttr.h
@@ -2,8 +2,8 @@
 // Created:     8 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_AttributeRefAttr_HeaderFile
-#define Model_AttributeRefAttr_HeaderFile
+#ifndef Model_AttributeRefAttr_H_
+#define Model_AttributeRefAttr_H_
 
 #include "Model.h"
 #include "ModelAPI_AttributeRefAttr.h"

diff --git a/src/Model/Model_AttributeRefList.h b/src/Model/Model_AttributeRefList.h
index 7f797e2dec4d6ecbf221869c8a4691f4a9e3d5d0..87525753e1cab74ef7dba352a2fcdedc1937a280 100644 (file)
--- a/src/Model/Model_AttributeRefList.h
+++ b/src/Model/Model_AttributeRefList.h
@@ -2,8 +2,8 @@
 // Created:     8 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_AttributeRefList_HeaderFile
-#define Model_AttributeRefList_HeaderFile
+#ifndef Model_AttributeRefList_H_
+#define Model_AttributeRefList_H_
 
 #include "Model.h"
 #include "ModelAPI_AttributeRefList.h"

diff --git a/src/Model/Model_AttributeReference.h b/src/Model/Model_AttributeReference.h
index 82222550043618c949308fa5ddadb9c9568a3263..356a519b234793ebf14de3fd4133045809bee3f3 100644 (file)
--- a/src/Model/Model_AttributeReference.h
+++ b/src/Model/Model_AttributeReference.h
@@ -2,8 +2,8 @@
 // Created:     8 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_AttributeReference_HeaderFile
-#define Model_AttributeReference_HeaderFile
+#ifndef Model_AttributeReference_H_
+#define Model_AttributeReference_H_
 
 #include "Model.h"
 #include "ModelAPI_AttributeReference.h"

diff --git a/src/Model/Model_Data.h b/src/Model/Model_Data.h
index 7faa34331cf3e42130b06d4521ade472a0b1abca..cf002ad19daaf313c5a45c1358396e57f9bd18fb 100644 (file)
--- a/src/Model/Model_Data.h
+++ b/src/Model/Model_Data.h
@@ -2,8 +2,8 @@
 // Created:     21 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_Data_HeaderFile
-#define Model_Data_HeaderFile
+#ifndef Model_Data_H_
+#define Model_Data_H_
 
 #include "Model.h"
 #include <ModelAPI_Data.h>

diff --git a/src/Model/Model_Document.h b/src/Model/Model_Document.h
index 8bb19057c8ef1aea4c60479fa68aecbcc12017e6..4e8278ca531502dacf025f598576694e80becad6 100644 (file)
--- a/src/Model/Model_Document.h
+++ b/src/Model/Model_Document.h
@@ -2,8 +2,8 @@
 // Created:     28 Feb 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_Document_HeaderFile
-#define Model_Document_HeaderFile
+#ifndef Model_Document_H_
+#define Model_Document_H_
 
 #include <Model.h>
 #include <ModelAPI_Document.h>

diff --git a/src/Model/Model_Events.h b/src/Model/Model_Events.h
index 4125cf81c07aaf6cc91909faa012a50b28d370d4..f0031e1a8e50d98b3f1e981a8691f1155b92802f 100644 (file)
--- a/src/Model/Model_Events.h
+++ b/src/Model/Model_Events.h
@@ -2,8 +2,8 @@
 // Created:     10 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_Events_HeaderFile
-#define Model_Events_HeaderFile
+#ifndef Model_Events_H_
+#define Model_Events_H_
 
 #include <Model.h>
 #include <ModelAPI_Events.h>

diff --git a/src/Model/Model_PluginManager.h b/src/Model/Model_PluginManager.h
index 1819c56d5ac9902d2c20082a00bc72f5758aea05..3ae74bfc1c52c5136f158b5038b01fc6462324b0 100644 (file)
--- a/src/Model/Model_PluginManager.h
+++ b/src/Model/Model_PluginManager.h
@@ -2,8 +2,8 @@
 // Created:     20 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_PluginManager_HeaderFile
-#define Model_PluginManager_HeaderFile
+#ifndef Model_PluginManager_H_
+#define Model_PluginManager_H_
 
 #include "Model.h"
 #include <ModelAPI_PluginManager.h>

diff --git a/src/Model/Model_ResultBody.h b/src/Model/Model_ResultBody.h
index 13402b2b6c12bfc144041162a34cb40affd0ffa2..22a9b561cc0d69dee6b63fb9b285ba9ebd285f34 100644 (file)
--- a/src/Model/Model_ResultBody.h
+++ b/src/Model/Model_ResultBody.h
@@ -2,8 +2,8 @@
 // Created:     08 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_ResultBody_HeaderFile
-#define Model_ResultBody_HeaderFile
+#ifndef Model_ResultBody_H_
+#define Model_ResultBody_H_
 
 #include "Model.h"
 #include <ModelAPI_ResultBody.h>

diff --git a/src/Model/Model_ResultConstruction.h b/src/Model/Model_ResultConstruction.h
index fd04f2f7c642950909027891a55dd82537178a86..5c37e9961c05091e57676cc381059e95f6e86c84 100644 (file)
--- a/src/Model/Model_ResultConstruction.h
+++ b/src/Model/Model_ResultConstruction.h
@@ -2,8 +2,8 @@
 // Created:     07 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_ResultConstruction_HeaderFile
-#define Model_ResultConstruction_HeaderFile
+#ifndef Model_ResultConstruction_H_
+#define Model_ResultConstruction_H_
 
 #include "Model.h"
 #include <ModelAPI_ResultConstruction.h>

diff --git a/src/Model/Model_ResultPart.h b/src/Model/Model_ResultPart.h
index 4408690d849ee4cff62e7919a5000f9bf7254e8f..4123d69e37f640b37255510fc55c1bd612cc3f5d 100644 (file)
--- a/src/Model/Model_ResultPart.h
+++ b/src/Model/Model_ResultPart.h
@@ -2,8 +2,8 @@
 // Created:     07 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_ResultPart_HeaderFile
-#define Model_ResultPart_HeaderFile
+#ifndef Model_ResultPart_H_
+#define Model_ResultPart_H_
 
 #include "Model.h"
 #include <ModelAPI_ResultPart.h>

diff --git a/src/Model/Model_Update.h b/src/Model/Model_Update.h
index e5851910fd94d8e4646c72d0149bf6575e5c06f4..803dd6056f03bcfdd5520c0c7de8d7d4baaf4d00 100644 (file)
--- a/src/Model/Model_Update.h
+++ b/src/Model/Model_Update.h
@@ -2,8 +2,8 @@
 // Created:     25 Jun 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_Update_HeaderFile
-#define Model_Update_HeaderFile
+#ifndef Model_Update_H_
+#define Model_Update_H_
 
 #include "Model.h"
 #include "Events_Listener.h"

diff --git a/src/Model/Model_Validator.h b/src/Model/Model_Validator.h
index 45ad05c14f8535e5275380d803f6f1b91685d4b8..f748c42ca7163560919e3899c79cc04b5149b1f0 100644 (file)
--- a/src/Model/Model_Validator.h
+++ b/src/Model/Model_Validator.h
@@ -2,8 +2,8 @@
 // Created:     2 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_Validator_HeaderFile
-#define Model_Validator_HeaderFile
+#ifndef Model_Validator_H_
+#define Model_Validator_H_
 
 #include <Model.h>
 #include <ModelAPI_Validator.h>

diff --git a/src/ModelAPI/ModelAPI_Attribute.h b/src/ModelAPI/ModelAPI_Attribute.h
index 7ea04aa8e16e145d5482d6720ea2473daadbf432..5173855f9eafe03a9bc8560238cc7dab61833a34 100644 (file)
--- a/src/ModelAPI/ModelAPI_Attribute.h
+++ b/src/ModelAPI/ModelAPI_Attribute.h
@@ -2,8 +2,8 @@
 // Created:     2 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Attribute_HeaderFile
-#define ModelAPI_Attribute_HeaderFile
+#ifndef ModelAPI_Attribute_H_
+#define ModelAPI_Attribute_H_
 
 #include "ModelAPI.h"
 #include <string>

diff --git a/src/ModelAPI/ModelAPI_AttributeBoolean.h b/src/ModelAPI/ModelAPI_AttributeBoolean.h
index 038b93f6cbf7ad6df808ed0d4d7cdf7d94f0c3cb..8c5a0af8e2f95cd22591ebb880872cd9987918b9 100644 (file)
--- a/src/ModelAPI/ModelAPI_AttributeBoolean.h
+++ b/src/ModelAPI/ModelAPI_AttributeBoolean.h
@@ -2,8 +2,8 @@
 // Created:     2 june 2014
 // Author:      Vitaly Smetannikov
 
-#ifndef ModelAPI_AttributeBoolean_HeaderFile
-#define ModelAPI_AttributeBoolean_HeaderFile
+#ifndef ModelAPI_AttributeBoolean_H_
+#define ModelAPI_AttributeBoolean_H_
 
 #include "ModelAPI_Attribute.h"
 

diff --git a/src/ModelAPI/ModelAPI_AttributeDocRef.h b/src/ModelAPI/ModelAPI_AttributeDocRef.h
index 4765542cd06c7bc0edcd80db4369e52bac6d326d..b7f312bb1bfb602493818ad0aa1b7b07881ca732 100644 (file)
--- a/src/ModelAPI/ModelAPI_AttributeDocRef.h
+++ b/src/ModelAPI/ModelAPI_AttributeDocRef.h
@@ -2,8 +2,8 @@
 // Created:     2 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_AttributeDocRef_HeaderFile
-#define ModelAPI_AttributeDocRef_HeaderFile
+#ifndef ModelAPI_AttributeDocRef_H_
+#define ModelAPI_AttributeDocRef_H_
 
 #include "ModelAPI_Attribute.h"
 #include "ModelAPI_Document.h"

diff --git a/src/ModelAPI/ModelAPI_AttributeDouble.h b/src/ModelAPI/ModelAPI_AttributeDouble.h
index 8377573092c7d8012c63c3282fd4c14f5cf7d19e..163ebefe96959ba8c95e9800a836a9c008dad668 100644 (file)
--- a/src/ModelAPI/ModelAPI_AttributeDouble.h
+++ b/src/ModelAPI/ModelAPI_AttributeDouble.h
@@ -2,8 +2,8 @@
 // Created:     2 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_AttributeDouble_HeaderFile
-#define ModelAPI_AttributeDouble_HeaderFile
+#ifndef ModelAPI_AttributeDouble_H_
+#define ModelAPI_AttributeDouble_H_
 
 #include "ModelAPI_Attribute.h"
 

diff --git a/src/ModelAPI/ModelAPI_AttributeRefAttr.h b/src/ModelAPI/ModelAPI_AttributeRefAttr.h
index e2b425f0d76915baf6440017dceb5fcb67f34d83..be0bf6e1ec836a85f45af8df75c904ecf6179488 100644 (file)
--- a/src/ModelAPI/ModelAPI_AttributeRefAttr.h
+++ b/src/ModelAPI/ModelAPI_AttributeRefAttr.h
@@ -2,8 +2,8 @@
 // Created:     8 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_AttributeRefAttr_HeaderFile
-#define ModelAPI_AttributeRefAttr_HeaderFile
+#ifndef ModelAPI_AttributeRefAttr_H_
+#define ModelAPI_AttributeRefAttr_H_
 
 #include "ModelAPI_Attribute.h"
 #include "ModelAPI_Feature.h"

diff --git a/src/ModelAPI/ModelAPI_AttributeRefList.h b/src/ModelAPI/ModelAPI_AttributeRefList.h
index d6004f7af4fd1bf1d0c3318a22a91050c0c05ec5..d9948dd04d27a15e7d74032de20250fbbfbbe4b5 100644 (file)
--- a/src/ModelAPI/ModelAPI_AttributeRefList.h
+++ b/src/ModelAPI/ModelAPI_AttributeRefList.h
@@ -2,8 +2,8 @@
 // Created:     8 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_AttributeRefList_HeaderFile
-#define ModelAPI_AttributeRefList_HeaderFile
+#ifndef ModelAPI_AttributeRefList_H_
+#define ModelAPI_AttributeRefList_H_
 
 #include "ModelAPI_Attribute.h"
 #include "ModelAPI_Feature.h"

diff --git a/src/ModelAPI/ModelAPI_AttributeReference.h b/src/ModelAPI/ModelAPI_AttributeReference.h
index 89e24798e1a9f085cab44838051d7338371154eb..dd13cad06aa84d4c95a0e4feb16433abb3620c5b 100644 (file)
--- a/src/ModelAPI/ModelAPI_AttributeReference.h
+++ b/src/ModelAPI/ModelAPI_AttributeReference.h
@@ -2,8 +2,8 @@
 // Created:     8 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_AttributeReference_HeaderFile
-#define ModelAPI_AttributeReference_HeaderFile
+#ifndef ModelAPI_AttributeReference_H_
+#define ModelAPI_AttributeReference_H_
 
 #include "ModelAPI_Attribute.h"
 #include <ModelAPI_Feature.h>

diff --git a/src/ModelAPI/ModelAPI_Data.h b/src/ModelAPI/ModelAPI_Data.h
index c7ee92059613b76f6a390a019a171953ffe3de9f..0b69acb362b0272f81744bd8b43d49312f71c348 100644 (file)
--- a/src/ModelAPI/ModelAPI_Data.h
+++ b/src/ModelAPI/ModelAPI_Data.h
@@ -2,8 +2,8 @@
 // Created:     21 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Data_HeaderFile
-#define ModelAPI_Data_HeaderFile
+#ifndef ModelAPI_Data_H_
+#define ModelAPI_Data_H_
 
 #include "ModelAPI.h"
 #include <string>

diff --git a/src/ModelAPI/ModelAPI_Document.h b/src/ModelAPI/ModelAPI_Document.h
index ab055f32484a4db83d9d447192709832bd74c31f..5e0d2809143dbff673a2b34838d2197dcbb7ab5a 100644 (file)
--- a/src/ModelAPI/ModelAPI_Document.h
+++ b/src/ModelAPI/ModelAPI_Document.h
@@ -2,8 +2,8 @@
 // Created:     28 Feb 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Document_HeaderFile
-#define ModelAPI_Document_HeaderFile
+#ifndef ModelAPI_Document_H_
+#define ModelAPI_Document_H_
 
 #include <ModelAPI.h>
 #include <string>

diff --git a/src/ModelAPI/ModelAPI_Events.h b/src/ModelAPI/ModelAPI_Events.h
index 143f45e912e6a87d2560aeb463e602185d8d3d11..965a695afdaa92b17dd99bf8c5fa9c51db26749c 100644 (file)
--- a/src/ModelAPI/ModelAPI_Events.h
+++ b/src/ModelAPI/ModelAPI_Events.h
@@ -2,8 +2,8 @@
 // Created:     10 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Events_HeaderFile
-#define ModelAPI_Events_HeaderFile
+#ifndef ModelAPI_Events_H_
+#define ModelAPI_Events_H_
 
 #include <ModelAPI.h>
 #include <Events_MessageGroup.h>

diff --git a/src/ModelAPI/ModelAPI_Feature.h b/src/ModelAPI/ModelAPI_Feature.h
index a1d048af378b7ef274a7ee1b3109eb45b57ee20f..9f989074b57cccc560b49814218b7ef6d51ee945 100644 (file)
--- a/src/ModelAPI/ModelAPI_Feature.h
+++ b/src/ModelAPI/ModelAPI_Feature.h
@@ -2,8 +2,8 @@
 // Created:     21 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Feature_HeaderFile
-#define ModelAPI_Feature_HeaderFile
+#ifndef ModelAPI_Feature_H_
+#define ModelAPI_Feature_H_
 
 #include "ModelAPI_Object.h"
 #include "ModelAPI_PluginManager.h"

diff --git a/src/ModelAPI/ModelAPI_Object.h b/src/ModelAPI/ModelAPI_Object.h
index 7eb0cf97939b84d72f8fe26e8c19e89ec13cb0ed..d46fb76237c76ba2ca7a5b2c554a54b550e33509 100644 (file)
--- a/src/ModelAPI/ModelAPI_Object.h
+++ b/src/ModelAPI/ModelAPI_Object.h
@@ -2,8 +2,8 @@
 // Created:     19 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Object_HeaderFile
-#define ModelAPI_Object_HeaderFile
+#ifndef ModelAPI_Object_H_
+#define ModelAPI_Object_H_
 
 #include "ModelAPI.h"
 

diff --git a/src/ModelAPI/ModelAPI_Plugin.h b/src/ModelAPI/ModelAPI_Plugin.h
index fb65e0b142ecf3426cfd3094a94ac7b8b8b0f87e..31795c3f15c57590308904dd3a950129bfe5c741 100644 (file)
--- a/src/ModelAPI/ModelAPI_Plugin.h
+++ b/src/ModelAPI/ModelAPI_Plugin.h
@@ -2,8 +2,8 @@
 // Created:     31 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Plugin_HeaderFile
-#define ModelAPI_Plugin_HeaderFile
+#ifndef ModelAPI_Plugin_H_
+#define ModelAPI_Plugin_H_
 
 #include "ModelAPI.h"
 #include <string>

diff --git a/src/ModelAPI/ModelAPI_PluginManager.h b/src/ModelAPI/ModelAPI_PluginManager.h
index f23cf95815ecaaec462eea915dcf6f86f4b69098..355e9814f3fcfec38c28ebae6dd017193990cea3 100644 (file)
--- a/src/ModelAPI/ModelAPI_PluginManager.h
+++ b/src/ModelAPI/ModelAPI_PluginManager.h
@@ -2,8 +2,8 @@
 // Created:     20 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_PluginManager_HeaderFile
-#define ModelAPI_PluginManager_HeaderFile
+#ifndef ModelAPI_PluginManager_H_
+#define ModelAPI_PluginManager_H_
 
 #include "ModelAPI.h"
 #include <string>

diff --git a/src/ModelAPI/ModelAPI_Result.h b/src/ModelAPI/ModelAPI_Result.h
index 97077b11d8435faa8820cb2c90b6905157e1edce..4a3adbd763b87dc23f123761af6cc1bdb587c459 100644 (file)
--- a/src/ModelAPI/ModelAPI_Result.h
+++ b/src/ModelAPI/ModelAPI_Result.h
@@ -2,8 +2,8 @@
 // Created:     07 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Result_HeaderFile
-#define ModelAPI_Result_HeaderFile
+#ifndef ModelAPI_Result_H_
+#define ModelAPI_Result_H_
 
 #include "ModelAPI_Object.h"
 

diff --git a/src/ModelAPI/ModelAPI_ResultBody.h b/src/ModelAPI/ModelAPI_ResultBody.h
index debc96d3e4f281d4a1f0c344c6b6b6830d9e257d..cd484031a96601ec8b65e6c728787879582000f7 100644 (file)
--- a/src/ModelAPI/ModelAPI_ResultBody.h
+++ b/src/ModelAPI/ModelAPI_ResultBody.h
@@ -2,8 +2,8 @@
 // Created:     07 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_ResultBody_HeaderFile
-#define ModelAPI_ResultBody_HeaderFile
+#ifndef ModelAPI_ResultBody_H_
+#define ModelAPI_ResultBody_H_
 
 #include "ModelAPI_Result.h"
 #include <GeomAPI_Shape.h>

diff --git a/src/ModelAPI/ModelAPI_ResultConstruction.h b/src/ModelAPI/ModelAPI_ResultConstruction.h
index 231476e3c36c220125ce580eac3fc6b7a3da02c0..0a7cf17b6ed39458ce88df92e8b2502e590e5b2d 100644 (file)
--- a/src/ModelAPI/ModelAPI_ResultConstruction.h
+++ b/src/ModelAPI/ModelAPI_ResultConstruction.h
@@ -2,8 +2,8 @@
 // Created:     07 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_ResultConstruction_HeaderFile
-#define ModelAPI_ResultConstruction_HeaderFile
+#ifndef ModelAPI_ResultConstruction_H_
+#define ModelAPI_ResultConstruction_H_
 
 #include "ModelAPI_Result.h"
 #include <GeomAPI_Shape.h>

diff --git a/src/ModelAPI/ModelAPI_ResultParameters.h b/src/ModelAPI/ModelAPI_ResultParameters.h
index ee4c1430b34efe6c6b525d183f62ce7e2eb629b4..509e064ea1158da0dc74a74219b0e515e8d34e8e 100644 (file)
--- a/src/ModelAPI/ModelAPI_ResultParameters.h
+++ b/src/ModelAPI/ModelAPI_ResultParameters.h
@@ -2,8 +2,8 @@
 // Created:     07 Jul 2014
 // Author:      Vitaly SMETANNIKOV
 
-#ifndef ModelAPI_ResultParameters_HeaderFile
-#define ModelAPI_ResultParameters_HeaderFile
+#ifndef ModelAPI_ResultParameters_H_
+#define ModelAPI_ResultParameters_H_
 
 #include "ModelAPI_Result.h"
 

diff --git a/src/ModelAPI/ModelAPI_ResultPart.h b/src/ModelAPI/ModelAPI_ResultPart.h
index 2f6feb5e5bae06a44166cd607656b943661ee65d..73bfd1ca3d4a135da43c755212b264e467f7082f 100644 (file)
--- a/src/ModelAPI/ModelAPI_ResultPart.h
+++ b/src/ModelAPI/ModelAPI_ResultPart.h
@@ -2,8 +2,8 @@
 // Created:     07 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_ResultPart_HeaderFile
-#define ModelAPI_ResultPart_HeaderFile
+#ifndef ModelAPI_ResultPart_H_
+#define ModelAPI_ResultPart_H_
 
 #include "ModelAPI_Result.h"
 

diff --git a/src/ModelAPI/ModelAPI_Validator.h b/src/ModelAPI/ModelAPI_Validator.h
index 88ab1574c31b7f49142df8c8b6783eb078555e1f..bd53ecc24a349811a09755317f6d3821002fa115 100644 (file)
--- a/src/ModelAPI/ModelAPI_Validator.h
+++ b/src/ModelAPI/ModelAPI_Validator.h
@@ -2,8 +2,8 @@
 // Created:     2 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Validator_HeaderFile
-#define ModelAPI_Validator_HeaderFile
+#ifndef ModelAPI_Validator_H_
+#define ModelAPI_Validator_H_
 
 #include <ModelAPI.h>
 #include <boost/shared_ptr.hpp>

diff --git a/src/PartSetPlugin/PartSetPlugin_Duplicate.h b/src/PartSetPlugin/PartSetPlugin_Duplicate.h
index 57117a81330d1d33474189921a1fe0f8eb97c8fa..446b6f32556ba48dc01381f0e53df8cdd65e82bd 100644 (file)
--- a/src/PartSetPlugin/PartSetPlugin_Duplicate.h
+++ b/src/PartSetPlugin/PartSetPlugin_Duplicate.h
@@ -2,8 +2,8 @@
 // Created:     20 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef PartSetPlugin_Duplicate_HeaderFile
-#define PartSetPlugin_Duplicate_HeaderFile
+#ifndef PartSetPlugin_Duplicate_H_
+#define PartSetPlugin_Duplicate_H_
 
 #include "PartSetPlugin_Part.h"
 

diff --git a/src/PartSetPlugin/PartSetPlugin_Part.h b/src/PartSetPlugin/PartSetPlugin_Part.h
index 7eb27f5ac1cf99e5f6d8aa1d96d3d1ed44bee7d7..10cdebb856677bd48dd490f6f747f1e11c5f60a9 100644 (file)
--- a/src/PartSetPlugin/PartSetPlugin_Part.h
+++ b/src/PartSetPlugin/PartSetPlugin_Part.h
@@ -2,8 +2,8 @@
 // Created:     27 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef PartSetPlugin_Part_HeaderFile
-#define PartSetPlugin_Part_HeaderFile
+#ifndef PartSetPlugin_Part_H_
+#define PartSetPlugin_Part_H_
 
 #include "PartSetPlugin.h"
 #include <ModelAPI_Feature.h>

diff --git a/src/PartSetPlugin/PartSetPlugin_Plugin.h b/src/PartSetPlugin/PartSetPlugin_Plugin.h
index d1ccd314b37f5f138a97b6b5122b469f50d1fad1..1ffda8a7255ad7fc35aeb826ff8a856980a407ab 100644 (file)
--- a/src/PartSetPlugin/PartSetPlugin_Plugin.h
+++ b/src/PartSetPlugin/PartSetPlugin_Plugin.h
@@ -2,8 +2,8 @@
 // Created:     31 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef PartSetPlugin_Plugin_HeaderFile
-#define PartSetPlugin_Plugin_HeaderFile
+#ifndef PartSetPlugin_Plugin_H_
+#define PartSetPlugin_Plugin_H_
 
 
 #include "PartSetPlugin.h"

diff --git a/src/PartSetPlugin/PartSetPlugin_Remove.h b/src/PartSetPlugin/PartSetPlugin_Remove.h
index a24cc263281e9092616e2ba5cd4309629f8e0063..20ccef4a03219dcf242a858067da0a23132571f9 100644 (file)
--- a/src/PartSetPlugin/PartSetPlugin_Remove.h
+++ b/src/PartSetPlugin/PartSetPlugin_Remove.h
@@ -2,8 +2,8 @@
 // Created:     20 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef PartSetPlugin_Remove_HeaderFile
-#define PartSetPlugin_Remove_HeaderFile
+#ifndef PartSetPlugin_Remove_H_
+#define PartSetPlugin_Remove_H_
 
 #include "PartSetPlugin.h"
 #include <ModelAPI_Feature.h>

diff --git a/src/SketchPlugin/SketchPlugin_Arc.h b/src/SketchPlugin/SketchPlugin_Arc.h
index 66da16cfeef25f08ffdab09611acd1ec430b8eb3..3af4e2fd3a32c2f46c1b432972c67f040e3138eb 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Arc.h
+++ b/src/SketchPlugin/SketchPlugin_Arc.h
@@ -2,8 +2,8 @@
 // Created:     26 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef SketchPlugin_Arc_HeaderFile
-#define SketchPlugin_Arc_HeaderFile
+#ifndef SketchPlugin_Arc_H_
+#define SketchPlugin_Arc_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Feature.h>

diff --git a/src/SketchPlugin/SketchPlugin_Circle.h b/src/SketchPlugin/SketchPlugin_Circle.h
index 9d923654d49dde4c52a7fce087910754f4376608..3b8dc851b08eb92722823003a6bdc5c3e0e146b5 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Circle.h
+++ b/src/SketchPlugin/SketchPlugin_Circle.h
@@ -2,8 +2,8 @@
 // Created:     26 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef SketchPlugin_Circle_HeaderFile
-#define SketchPlugin_Circle_HeaderFile
+#ifndef SketchPlugin_Circle_H_
+#define SketchPlugin_Circle_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Feature.h>

diff --git a/src/SketchPlugin/SketchPlugin_Constraint.h b/src/SketchPlugin/SketchPlugin_Constraint.h
index 585de840aee202fe281062b81261f5067b1f9002..5417111e399fe5948c34226ce4b683443d018d7e 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Constraint.h
+++ b/src/SketchPlugin/SketchPlugin_Constraint.h
@@ -2,8 +2,8 @@
 // Created: 08 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_Constraint_HeaderFile
-#define SketchPlugin_Constraint_HeaderFile
+#ifndef SketchPlugin_Constraint_H_
+#define SketchPlugin_Constraint_H_
 
 #include "SketchPlugin.h"
 #include "SketchPlugin_Feature.h"

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
index 3670b45ed41c8e5858ea9bccaae22bce112528d3..6345f59dce9f7407eed63fc6541967623da122a0 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
@@ -2,8 +2,8 @@
 // Created: 08 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_ConstraintCoincidence_HeaderFile
-#define SketchPlugin_ConstraintCoincidence_HeaderFile
+#ifndef SketchPlugin_ConstraintCoincidence_H_
+#define SketchPlugin_ConstraintCoincidence_H_
 
 #include "SketchPlugin.h"
 #include "SketchPlugin_Constraint.h"

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintDistance.h b/src/SketchPlugin/SketchPlugin_ConstraintDistance.h
index 6a229544dd5d82395983afcbb578e7cbe7ce9001..afb687d09c49f1caa24932f4b821b6e9a38f556d 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintDistance.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintDistance.h
@@ -2,8 +2,8 @@
 // Created: 23 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_ConstraintDistance_HeaderFile
-#define SketchPlugin_ConstraintDistance_HeaderFile
+#ifndef SketchPlugin_ConstraintDistance_H_
+#define SketchPlugin_ConstraintDistance_H_
 
 #include "SketchPlugin.h"
 #include "SketchPlugin_Constraint.h"

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintLength.h b/src/SketchPlugin/SketchPlugin_ConstraintLength.h
index 342bdf1f56e631da377950fb5800d14f02575bb0..cc96258e31c7b34c3ced796cd0a513967d24a166 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintLength.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintLength.h
@@ -2,8 +2,8 @@
 // Created: 30 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_ConstraintLength_HeaderFile
-#define SketchPlugin_ConstraintLength_HeaderFile
+#ifndef SketchPlugin_ConstraintLength_H_
+#define SketchPlugin_ConstraintLength_H_
 
 #include "SketchPlugin.h"
 #include "SketchPlugin_Constraint.h"

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintParallel.h b/src/SketchPlugin/SketchPlugin_ConstraintParallel.h
index acfab864f1c5d93aacbd95cb0aa6ac3318fe7bad..0da78ca640301a9f3e265db8fd62f35ca80ada97 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintParallel.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintParallel.h
@@ -2,8 +2,8 @@
 // Created: 26 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_ConstraintParallel_HeaderFile
-#define SketchPlugin_ConstraintParallel_HeaderFile
+#ifndef SketchPlugin_ConstraintParallel_H_
+#define SketchPlugin_ConstraintParallel_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Sketch.h>

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.h b/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.h
index eb82abd6fc700ebad7a4300b8e92c7786568585c..33ad334e01bc5d3a5cb6c655557b38360e1045fa 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.h
@@ -2,8 +2,8 @@
 // Created: 26 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_ConstraintPerpendicular_HeaderFile
-#define SketchPlugin_ConstraintPerpendicular_HeaderFile
+#ifndef SketchPlugin_ConstraintPerpendicular_H_
+#define SketchPlugin_ConstraintPerpendicular_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Sketch.h>

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintRadius.h b/src/SketchPlugin/SketchPlugin_ConstraintRadius.h
index a604ef1202de0fae5442817ab734e7b9cb4f6321..829a15512f59ff273e78e255a52df18a6255d9e6 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintRadius.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintRadius.h
@@ -2,8 +2,8 @@
 // Created: 26 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_ConstraintRadius_HeaderFile
-#define SketchPlugin_ConstraintRadius_HeaderFile
+#ifndef SketchPlugin_ConstraintRadius_H_
+#define SketchPlugin_ConstraintRadius_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Sketch.h>

diff --git a/src/SketchPlugin/SketchPlugin_Feature.h b/src/SketchPlugin/SketchPlugin_Feature.h
index 7bd7ac8d7f6877f68a5e50af4e99eb19ea62ba73..093bf025856dc9c656f6107eb5cc1517fd56f26c 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Feature.h
+++ b/src/SketchPlugin/SketchPlugin_Feature.h
@@ -2,8 +2,8 @@
 // Created:     27 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef SketchPlugin_Feature_HeaderFile
-#define SketchPlugin_Feature_HeaderFile
+#ifndef SketchPlugin_Feature_H_
+#define SketchPlugin_Feature_H_
 
 #include "SketchPlugin.h"
 #include <ModelAPI_Feature.h>

diff --git a/src/SketchPlugin/SketchPlugin_Line.h b/src/SketchPlugin/SketchPlugin_Line.h
index ae301f82feb38f55a4fe3de2cfa27a8dac8d2f66..370f26bfb3ce35fcb18768089e543aaf80ee5b5e 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Line.h
+++ b/src/SketchPlugin/SketchPlugin_Line.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef SketchPlugin_Line_HeaderFile
-#define SketchPlugin_Line_HeaderFile
+#ifndef SketchPlugin_Line_H_
+#define SketchPlugin_Line_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Feature.h>

diff --git a/src/SketchPlugin/SketchPlugin_Plugin.h b/src/SketchPlugin/SketchPlugin_Plugin.h
index 408ae73cc2be30eacbf5e0211ed6c6aef3fcdae2..63f488ca531708b83dc9e659ae38e14424192852 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Plugin.h
+++ b/src/SketchPlugin/SketchPlugin_Plugin.h
@@ -2,8 +2,8 @@
 // Created:     31 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef SketchPlugin_Plugin_HeaderFile
-#define SketchPlugin_Plugin_HeaderFile
+#ifndef SketchPlugin_Plugin_H_
+#define SketchPlugin_Plugin_H_
 
 
 #include "SketchPlugin.h"

diff --git a/src/SketchPlugin/SketchPlugin_Point.h b/src/SketchPlugin/SketchPlugin_Point.h
index 33ec0467e244f3ceabf491f40194f3dceed103ca..c60526163583105af95e4be23f4607d084100b7a 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Point.h
+++ b/src/SketchPlugin/SketchPlugin_Point.h
@@ -2,8 +2,8 @@
 // Created: 07 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_Point_HeaderFile
-#define SketchPlugin_Point_HeaderFile
+#ifndef SketchPlugin_Point_H_
+#define SketchPlugin_Point_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Sketch.h>

diff --git a/src/SketchPlugin/SketchPlugin_Sketch.h b/src/SketchPlugin/SketchPlugin_Sketch.h
index 8a1d22db4701ad7fa263979b921ebc1058e9b67b..3c71a6505c29a65eb616adc9a7791d6a97888eb3 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Sketch.h
+++ b/src/SketchPlugin/SketchPlugin_Sketch.h
@@ -2,8 +2,8 @@
 // Created:     27 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef SketchPlugin_Sketch_HeaderFile
-#define SketchPlugin_Sketch_HeaderFile
+#ifndef SketchPlugin_Sketch_H_
+#define SketchPlugin_Sketch_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Feature.h>

diff --git a/src/SketchSolver/SketchSolver_Constraint.h b/src/SketchSolver/SketchSolver_Constraint.h
index 934415b344ebfeccc6e1526ed1b594d502b5122b..3f547d8d8a8a2ccd294f80bd8b1e74f65085d060 100644 (file)
--- a/src/SketchSolver/SketchSolver_Constraint.h
+++ b/src/SketchSolver/SketchSolver_Constraint.h
@@ -2,8 +2,8 @@
 // Created: 27 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchSolver_Constraint_Headerfile
-#define SketchSolver_Constraint_Headerfile
+#ifndef SketchSolver_Constraint_H_
+#define SketchSolver_Constraint_H_
 
 #include "SketchSolver.h"
 

diff --git a/src/SketchSolver/SketchSolver_ConstraintGroup.h b/src/SketchSolver/SketchSolver_ConstraintGroup.h
index 362c31b251059d6f186bfd947f43a9af46763f51..a648fc9b3eba400012d669a34c8f581f40558c80 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintGroup.h
+++ b/src/SketchSolver/SketchSolver_ConstraintGroup.h
@@ -2,8 +2,8 @@
 // Created: 27 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchSolver_ConstraintGroup_Headerfile
-#define SketchSolver_ConstraintGroup_Headerfile
+#ifndef SketchSolver_ConstraintGroup_H_
+#define SketchSolver_ConstraintGroup_H_
 
 #include "SketchSolver.h"
 #include <SketchSolver_Solver.h>

diff --git a/src/SketchSolver/SketchSolver_ConstraintManager.h b/src/SketchSolver/SketchSolver_ConstraintManager.h
index a12cc6d5da815f34fe8a3cd3fdf284b7495c27be..1f5f7f884ee7cc96b1eebc75f4e6e79b051ac39d 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintManager.h
+++ b/src/SketchSolver/SketchSolver_ConstraintManager.h
@@ -2,8 +2,8 @@
 // Created: 08 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchSolver_ConstraintManager_Headerfile
-#define SketchSolver_ConstraintManager_Headerfile
+#ifndef SketchSolver_ConstraintManager_H_
+#define SketchSolver_ConstraintManager_H_
 
 #include "SketchSolver.h"
 #include <SketchSolver_Solver.h>

diff --git a/src/SketchSolver/SketchSolver_Solver.h b/src/SketchSolver/SketchSolver_Solver.h
index 8a4f9964e95a7795389fc3563c538b99a22c91d2..412b0e1809cce674757c5a6c54b987c2aa2c1b8e 100644 (file)
--- a/src/SketchSolver/SketchSolver_Solver.h
+++ b/src/SketchSolver/SketchSolver_Solver.h
@@ -2,8 +2,8 @@
 // Created: 07 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchSolver_Solver_Headerfile
-#define SketchSolver_Solver_Headerfile
+#ifndef SketchSolver_Solver_H_
+#define SketchSolver_Solver_H_
 
 #include "SketchSolver.h"
 

diff --git a/src/XGUI/XGUI_ActionsMgr.cpp b/src/XGUI/XGUI_ActionsMgr.cpp
index 611976e2a91c3da4186b17d8acf72da68f951f9b..4bfb31b9d6e31eb7807415815e4a04f815149c66 100644 (file)
--- a/src/XGUI/XGUI_ActionsMgr.cpp
+++ b/src/XGUI/XGUI_ActionsMgr.cpp
@@ -9,18 +9,27 @@
 #include "XGUI_SalomeConnector.h"
 
 #include <ModuleBase_Operation.h>
+#include <Events_Error.h>
 
 #include <QAction>
 
 #ifdef _DEBUG
+#include <iostream>
 #include <QDebug>
 #endif
 
 
 XGUI_ActionsMgr::XGUI_ActionsMgr(XGUI_Workshop* theParent)
- : QObject(theParent), myOperationMgr(theParent->operationMgr())
+ : QObject(theParent),
+   myWorkshop(theParent),
+   myOperationMgr(theParent->operationMgr())
 {
-
+  // Default shortcuts
+  myShortcuts << QKeySequence::Save;
+  myShortcuts << QKeySequence::Undo;
+  myShortcuts << QKeySequence::Redo;
+  myShortcuts << QKeySequence::Open;
+  myShortcuts << QKeySequence::Close;
 }
 
 XGUI_ActionsMgr::~XGUI_ActionsMgr()
@@ -132,4 +141,19 @@ bool XGUI_ActionsMgr::isNested(const QString& theId) const
       return true;
   }
   return false;
-}
\ No newline at end of file
+}
+
+QKeySequence XGUI_ActionsMgr::registerShortcut(const QString& theKeySequence)
+{
+  if(theKeySequence.isEmpty()) {
+    return QKeySequence();
+  }
+  QKeySequence aResult(theKeySequence);
+  if(myShortcuts.contains(aResult)) {
+    QString aMessage = tr("Shortcut %1 is already defined. Ignore.").arg(theKeySequence);
+    Events_Error::send(aMessage.toStdString());
+    return QKeySequence();
+  }
+  myShortcuts.append(aResult);
+  return aResult;
+}

diff --git a/src/XGUI/XGUI_ActionsMgr.h b/src/XGUI/XGUI_ActionsMgr.h
index 89e3b70b7ae0139b985285456dd02305940588d0..5f8c4ab93a6131fc5249cc7a7479a06359706669 100644 (file)
--- a/src/XGUI/XGUI_ActionsMgr.h
+++ b/src/XGUI/XGUI_ActionsMgr.h
@@ -9,7 +9,9 @@
 
 #include <QObject>
 #include <QMap>
+#include <QList>
 #include <QStringList>
+#include <QKeySequence>
 
 class XGUI_Command;
 class XGUI_Workshop;
@@ -35,6 +37,8 @@ public:
 
   bool isNested(const QString& theId) const;
 
+  QKeySequence registerShortcut(const QString& theKeySequence);
+
 public slots:
   //! Update workbench actions according to OperationMgr state:
   //! No active operations: all actions but nested are available
@@ -58,7 +62,9 @@ protected:
 private:
   QMap<QString, QAction*> myActions;
   QMap<QString, QStringList> myNestedActions;
+  QList<QKeySequence> myShortcuts;
 
+  XGUI_Workshop* myWorkshop;
   XGUI_OperationMgr* myOperationMgr;
 };
 

diff --git a/src/XGUI/XGUI_Command.cpp b/src/XGUI/XGUI_Command.cpp
index b289f8014ec6b65c6efe2084978bebd0fe0a6068..01b3bf83595f4d8a4dd6d420da4e021285dc1d80 100644 (file)
--- a/src/XGUI/XGUI_Command.cpp
+++ b/src/XGUI/XGUI_Command.cpp
@@ -1,5 +1,5 @@
 #include "XGUI_Command.h"
-
+#include <QEvent>
 #include <QToolButton>
 
 XGUI_Command::XGUI_Command(const QString& theId, QObject * parent, bool isCheckable)
@@ -27,24 +27,22 @@ QWidget* XGUI_Command::createWidget(QWidget* theParent)
     QToolButton* aButton = new QToolButton(theParent);
     aButton->setIcon(icon());
     aButton->setText(text());
-    aButton->setStyleSheet("QToolButton::menu-indicator { image: none; }");
-    aButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    aButton->setAutoRaise(true);
-    aButton->setArrowType(Qt::NoArrow);
-    aButton->setCheckable(myCheckable);
-    aButton->setMinimumSize(MIN_BUTTON_WIDTH, MIN_BUTTON_HEIGHT);
-    aButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
     QKeySequence aKeys = shortcut();
     QString aToolTip = toolTip();
-    if (!aKeys.isEmpty())
-      aToolTip = aToolTip + " (" + aKeys.toString() + ")";
-    if (!aToolTip.isEmpty())
+    if (!aKeys.isEmpty()) {
+      aToolTip = QString("%1 (%2)").arg(aToolTip).arg(aKeys.toString());
+    }
+    if (!aToolTip.isEmpty()) {
       aButton->setToolTip(aToolTip);
+    }
+    aButton->setCheckable(myCheckable);
+    aButton->setAutoRaise(true);
+    aButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+    aButton->setMinimumSize(MIN_BUTTON_WIDTH, MIN_BUTTON_HEIGHT);
+    aButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
 
-    aButton->addAction(this);
     connect(aButton, SIGNAL(clicked()), this, SLOT(trigger()));
     connect(this, SIGNAL(toggled(bool)), aButton, SLOT(setChecked(bool)));
-    connect(this, SIGNAL(toggled(bool)), aButton, SLOT(setChecked(bool)));
     this->setCheckable(myCheckable);
 
     return aButton;

diff --git a/src/XGUI/XGUI_Command.h b/src/XGUI/XGUI_Command.h
index 4247a7ca4b8be681ee54c0649bd5aea6f4cbdadd..9367e83756404b43ca11b836642be6166de01249 100644 (file)
--- a/src/XGUI/XGUI_Command.h
+++ b/src/XGUI/XGUI_Command.h
@@ -4,6 +4,7 @@
 #include "XGUI.h"
 #include <QWidgetAction>
 
+
 #define MIN_BUTTON_HEIGHT 25
 #define MIN_BUTTON_WIDTH 60
 

diff --git a/src/XGUI/XGUI_MainMenu.cpp b/src/XGUI/XGUI_MainMenu.cpp
index 9f79a1db88b6fd44796cbd4e33577fbed8f552ee..a16076e54024327846d11e202388ea3930ffdaef 100644 (file)
--- a/src/XGUI/XGUI_MainMenu.cpp
+++ b/src/XGUI/XGUI_MainMenu.cpp
@@ -1,5 +1,6 @@
 #include <XGUI_MainMenu.h>
 #include <XGUI_Workbench.h>
+#include <XGUI_MenuGroupPanel.h>
 #include <XGUI_MainWindow.h>
 #include <XGUI_Command.h>
 
@@ -8,17 +9,27 @@
 #include <QLabel>
 #include <QDockWidget>
 #include <QEvent>
+#include <QPushButton>
+#include <QTabBar>
 
 XGUI_MainMenu::XGUI_MainMenu(XGUI_MainWindow *parent)
-    : QObject(parent), myDesktop(parent)
+    : QWidget(parent), myDesktop(parent)
 {
-  parent->setTabPosition(Qt::TopDockWidgetArea, QTabWidget::North);
-  myDesktop->setStyleSheet("QTabBar::tab {height: 24px;}");
-  myGeneralPage = addWorkbench(tr("General"));
+  myGeneralPage = new XGUI_MenuGroupPanel(this);
+  myGeneralPage->setObjectName("Default");
   myGeneralPage->parentWidget()->setMaximumWidth(200);
   myGeneralPage->installEventFilter(this);
-//  QString aStyle = myDesktop->styleSheet();
-//  aStyle += " QTabBar::tab {min-height: 24px;}";
+  myGeneralPage->setFrameStyle(QFrame::StyledPanel);
+
+  myMenuTabs = new QTabWidget(this);
+  myMenuTabs->setStyleSheet("QTabBar::tab {height: 24px;} QTabWidget:pane {border: 0px;}");
+  QHBoxLayout* aMainLayout = new QHBoxLayout(this);
+  aMainLayout->addWidget(myGeneralPage);
+  aMainLayout->addWidget(myMenuTabs);
+  aMainLayout->setContentsMargins(0, 2, 2, 0);
+  aMainLayout->setSpacing(2);
+  setLayout(aMainLayout);
+  setFixedHeight(menuHeight());
 }
 
 XGUI_MainMenu::~XGUI_MainMenu(void)
@@ -27,27 +38,13 @@ XGUI_MainMenu::~XGUI_MainMenu(void)
 
 XGUI_Workbench* XGUI_MainMenu::addWorkbench(const QString& theId, const QString& theTitle)
 {
-  QDockWidget* aDock = new QDockWidget(myDesktop);
-  aDock->setFeatures(QDockWidget::DockWidgetVerticalTitleBar);
-  aDock->setAllowedAreas(Qt::TopDockWidgetArea);
   QString aTitle = theTitle;
   if (aTitle.isEmpty()) {
     aTitle = tr(theId.toLatin1().constData());
   }
-  aDock->setWindowTitle(aTitle);
-  aDock->setMinimumHeight(30);
-  aDock->setContentsMargins(0, 0, 0, 0);
-
-  XGUI_Workbench* aPage = new XGUI_Workbench(aDock);
+  XGUI_Workbench* aPage = new XGUI_Workbench(myMenuTabs);
   aPage->setObjectName(theId);
-  aDock->setWidget(aPage);
-
-  myDesktop->addDockWidget(Qt::TopDockWidgetArea, aDock);
-  if (myMenuTabs.length() > 1) {
-    myDesktop->tabifyDockWidget(myMenuTabs.last(), aDock);
-  }
-
-  myMenuTabs.append(aDock);
+  myMenuTabs->addTab(aPage, aTitle);
   return aPage;
 }
 
@@ -71,24 +68,48 @@ bool XGUI_MainMenu::eventFilter(QObject *theWatched, QEvent *theEvent)
   return QObject::eventFilter(theWatched, theEvent);
 }
 
+void XGUI_MainMenu::insertConsole(QWidget* theConsole)
+{
+  int aConsoleTabId = myMenuTabs->addTab(theConsole, "Console");
+
+  QTabBar* aTabBar = myMenuTabs->findChild<QTabBar*>();
+  QPushButton* aCloseTabButton = new QPushButton();
+  aCloseTabButton->setFixedSize(16, 16);
+  aCloseTabButton->setIcon(QIcon(":pictures/wnd_close.png"));
+  aCloseTabButton->setFlat(true);
+  aTabBar->setTabButton(aConsoleTabId,
+                        QTabBar::RightSide,
+                        aCloseTabButton);
+
+  connect(aCloseTabButton, SIGNAL(clicked()),
+          myDesktop, SLOT(dockPythonConsole()));
+}
+
+void XGUI_MainMenu::removeConsole()
+{
+  const int kLastTab = myMenuTabs->count() - 1;
+  myMenuTabs->removeTab(kLastTab);
+}
+
 XGUI_Command* XGUI_MainMenu::feature(const QString& theId) const
 {
-  QList<QDockWidget*>::const_iterator aIt;
-  for (aIt = myMenuTabs.constBegin(); aIt != myMenuTabs.constEnd(); ++aIt) {
-    XGUI_Workbench* aWbn = static_cast<XGUI_Workbench*>((*aIt)->widget());
-    XGUI_Command* aCmd = aWbn->feature(theId);
-    if (aCmd)
-      return aCmd;
+  XGUI_Command* result;
+  result = myGeneralPage->feature(theId);
+  if (!result) {
+    for (int aTabIdx = 0; aTabIdx < myMenuTabs->count(); ++aTabIdx) {
+      XGUI_Workbench* aWbn = static_cast<XGUI_Workbench*>(myMenuTabs->widget(aTabIdx));
+      result = aWbn->feature(theId);
+      if (result) break;
+    }
   }
-  return 0;
+  return result;
 }
 
 QList<XGUI_Command*> XGUI_MainMenu::features() const
 {
-  QList<XGUI_Command*> aList;
-  QList<QDockWidget*>::const_iterator aIt;
-  for (aIt = myMenuTabs.constBegin(); aIt != myMenuTabs.constEnd(); ++aIt) {
-    XGUI_Workbench* aWbn = static_cast<XGUI_Workbench*>((*aIt)->widget());
+  QList<XGUI_Command*> aList = myGeneralPage->features();
+  for (int aTabIdx = 0; aTabIdx < myMenuTabs->count(); ++aTabIdx) {
+    XGUI_Workbench* aWbn = static_cast<XGUI_Workbench*>(myMenuTabs->widget(aTabIdx));
     aList.append(aWbn->features());
   }
   return aList;
@@ -97,11 +118,33 @@ QList<XGUI_Command*> XGUI_MainMenu::features() const
 QList<XGUI_Workbench*> XGUI_MainMenu::workbenches() const
 {
   QList<XGUI_Workbench*> aList;
-  aList.append(myGeneralPage);
-  foreach(QDockWidget* aDoc, myMenuTabs) {
-    XGUI_Workbench* aWb = dynamic_cast<XGUI_Workbench*>(aDoc->widget());
-    if (aWb)
+  for (int aTabIdx = 0; aTabIdx < myMenuTabs->count(); ++aTabIdx) {
+    XGUI_Workbench* aWb = dynamic_cast<XGUI_Workbench*>(myMenuTabs->widget(aTabIdx));
+    if (aWb) {
       aList.append(aWb);
+    }
   }
   return aList;
-}
\ No newline at end of file
+}
+
+int XGUI_MainMenu::menuItemSize() const
+{
+  //TODO(sbh, vsv): get this value from the preferences
+  static const ItemSize DEFAULT_ITEM_SIZE = Medium;
+  return (int) DEFAULT_ITEM_SIZE;
+}
+
+int XGUI_MainMenu::menuHeight() const
+{
+  // Default group has no tabs above --> one extra row
+  int rows = menuItemRowsCount() + 1;
+  const int kMarginsSpacings = 4;
+  return rows * menuItemSize() + kMarginsSpacings;
+}
+
+int XGUI_MainMenu::menuItemRowsCount() const
+{
+  //TODO(sbh, vsv): get this value from the preferences
+  static const int DEFAULT_ITEM_ROWS_COUNT = 3;
+  return DEFAULT_ITEM_ROWS_COUNT;
+}

diff --git a/src/XGUI/XGUI_MainMenu.h b/src/XGUI/XGUI_MainMenu.h
index 945ddcb8d9f890b6d90811986f280805c69dfb01..3be908792422bc615f555073b0c96bc855d37718 100644 (file)
--- a/src/XGUI/XGUI_MainMenu.h
+++ b/src/XGUI/XGUI_MainMenu.h
@@ -5,6 +5,7 @@
 #include <QObject>
 #include <QList>
 #include <QMap>
+#include <QWidget>
 
 class XGUI_Command;
 class XGUI_MainWindow;
@@ -17,14 +18,22 @@ class QAction;
 class QDockWidget;
 class QEvent;
 
-
 /**\class XGUI_MainMenu
  * \ingroup GUI
  * \brief Class for creation of main menu (set of workbenches)
  */
-class XGUI_EXPORT XGUI_MainMenu: public QObject
+class XGUI_EXPORT XGUI_MainMenu: public QWidget
 {
-Q_OBJECT
+  Q_OBJECT
+
+  //! Size of menu item
+  //TODO(sbh, vsv): Move to the settings
+  enum ItemSize {
+    Small = 20,
+    Medium = 25,
+    Large = 30
+  };
+
 public:
   XGUI_MainMenu(XGUI_MainWindow *parent);
   virtual ~XGUI_MainMenu();
@@ -36,10 +45,10 @@ public:
   XGUI_Workbench* findWorkbench(const QString& theId)  const;
 
   //! Returns General page (predefined workbench)
-  XGUI_Workbench* generalPage() const { return myGeneralPage; }
+  XGUI_MenuGroupPanel* generalPage() const { return myGeneralPage; }
 
   //! Rerturns last created workbench in dock widget container
-  QDockWidget* getLastDockWindow() const { return myMenuTabs.last(); }
+  //QDockWidget* getLastDockWindow() const;
 
   //! Returns already created command by its ID
   XGUI_Command* feature(const QString& theId) const;
@@ -51,10 +60,19 @@ public:
 
   virtual bool eventFilter(QObject *theWatched, QEvent *theEvent);
 
+  //! Displays given console as a tab in the workbench
+  void insertConsole(QWidget*);
+  //! Removes already created tab with python console
+  void removeConsole();
+
+  int menuItemSize() const;
+  int menuItemRowsCount() const;
+  int menuHeight() const;
+
 private:
   XGUI_MainWindow* myDesktop;
-  QList<QDockWidget*> myMenuTabs;
-  XGUI_Workbench* myGeneralPage;
+  QTabWidget* myMenuTabs;
+  XGUI_MenuGroupPanel* myGeneralPage;
 
   QMap<XGUI_Command*, bool> myCommandState;
 };

diff --git a/src/XGUI/XGUI_MainWindow.cpp b/src/XGUI/XGUI_MainWindow.cpp
index 1400fc0ccc7f4c502b092cbdae6bc5b93cd4532b..b989488c694c9c4b8f2959f7c54852bd8f4c1104 100644 (file)
--- a/src/XGUI/XGUI_MainWindow.cpp
+++ b/src/XGUI/XGUI_MainWindow.cpp
@@ -18,11 +18,11 @@
 
 XGUI_MainWindow::XGUI_MainWindow(QWidget* parent)
     : QMainWindow(parent), 
-    myPythonConsole(0)
+    myPythonConsole(0),
+    myIsConsoleDocked(false)
 {
   setWindowTitle(tr("New Geom"));
-  myMenuBar = new XGUI_MainMenu(this);
-
+  createMainMenu();
   QMdiArea* aMdiArea = new QMdiArea(this);
   aMdiArea->setContextMenuPolicy(Qt::ActionsContextMenu);
   setCentralWidget(aMdiArea);
@@ -67,15 +67,8 @@ QMdiArea* XGUI_MainWindow::mdiArea() const
 void XGUI_MainWindow::showPythonConsole()
 {
   if (!myPythonConsole) {
-
-    QDockWidget* aDoc = new QDockWidget(this);
-    aDoc->setFeatures(QDockWidget::AllDockWidgetFeatures | QDockWidget::DockWidgetVerticalTitleBar);
-    aDoc->setMinimumHeight(0);
-    aDoc->setWindowTitle("Console");
-    myPythonConsole = new PyConsole_EnhConsole( aDoc, new PyConsole_EnhInterp());
-    aDoc->setWidget(myPythonConsole);
-    addDockWidget(Qt::TopDockWidgetArea, aDoc);
-    tabifyDockWidget(myMenuBar->getLastDockWindow(), aDoc);
+    myPythonConsole = new PyConsole_EnhConsole(this, new PyConsole_EnhInterp());
+    undockPythonConsole();
   }
   myPythonConsole->parentWidget()->show();
 }
@@ -87,6 +80,44 @@ void XGUI_MainWindow::hidePythonConsole()
     myPythonConsole->parentWidget()->hide();
 }
 
+//******************************************************
+void XGUI_MainWindow::dockPythonConsole()
+{
+  if (!myPythonConsole)
+    return;
+  myMenuBar->removeConsole();
+  QDockWidget* aDock = new QDockWidget(this);
+  aDock->setFeatures(QDockWidget::AllDockWidgetFeatures |
+                     QDockWidget::DockWidgetVerticalTitleBar);
+  aDock->setAllowedAreas(Qt::LeftDockWidgetArea  |
+                         Qt::RightDockWidgetArea |
+                         Qt::BottomDockWidgetArea);
+  aDock->setMinimumHeight(0);
+  aDock->setWindowTitle("Console");
+  aDock->setWidget(myPythonConsole);
+  addDockWidget(Qt::BottomDockWidgetArea, aDock);
+  // Undock python console if widget is closed...
+  CloseEventWatcher* aWatcher =  new CloseEventWatcher(aDock);
+  connect(aWatcher, SIGNAL(widgetClosed()),
+          this,     SLOT(undockPythonConsole()));
+  aDock->installEventFilter(aWatcher);
+}
+
+void XGUI_MainWindow::undockPythonConsole()
+{
+  if (!myPythonConsole)
+    return;
+  QDockWidget* aDock = qobject_cast<QDockWidget*>(myPythonConsole->parentWidget());
+  //When the application starts console will be displayed as
+  //a wokbench tab, so there is no dock yet
+  if(aDock) {
+    aDock->hide();
+    aDock->setWidget(NULL);
+    aDock->deleteLater();
+  }
+  myMenuBar->insertConsole(myPythonConsole);
+}
+
 //******************************************************
 void XGUI_MainWindow::createSubWindow()
 {
@@ -205,3 +236,30 @@ void XGUI_MainWindow::closeEvent(QCloseEvent * event)
   emit exitKeySequence();
   event->ignore();
 }
+
+void XGUI_MainWindow::createMainMenu()
+{
+  myMenuBar = new XGUI_MainMenu(this);
+  QDockWidget* aMenuDock = new QDockWidget(this);
+  aMenuDock->setWidget(myMenuBar);
+  aMenuDock->setAllowedAreas(Qt::TopDockWidgetArea);
+  aMenuDock->setFeatures(QDockWidget::DockWidgetVerticalTitleBar);
+  aMenuDock->setWindowTitle(tr("General"));
+  addDockWidget(Qt::TopDockWidgetArea, aMenuDock);
+}
+
+CloseEventWatcher::CloseEventWatcher(QObject* theParent)
+    : QObject(theParent)
+{}
+
+bool CloseEventWatcher::eventFilter(QObject *obj, QEvent *event) {
+  if (event->type() == QEvent::Close) {
+    emit widgetClosed();
+    event->ignore();
+    return true;
+  } else {
+    // standard event processing
+    return QObject::eventFilter(obj, event);
+  }
+}
+

diff --git a/src/XGUI/XGUI_MainWindow.h b/src/XGUI/XGUI_MainWindow.h
index 010f9e309530b3cb12289015b259a85908bfdcee..2126834aad458c51900c72926f786ca14619ad54 100644 (file)
--- a/src/XGUI/XGUI_MainWindow.h
+++ b/src/XGUI/XGUI_MainWindow.h
@@ -44,6 +44,8 @@ public:
 public slots:
   void showPythonConsole();
   void hidePythonConsole();
+  void dockPythonConsole();
+  void undockPythonConsole();
 
   void createSubWindow();
   
@@ -59,12 +61,29 @@ signals:
 
 protected:
   void closeEvent(QCloseEvent* event);
+  void createMainMenu();
 
 private:
   XGUI_MainMenu* myMenuBar;
   XGUI_Viewer* myViewer;
 
   PyConsole_EnhConsole* myPythonConsole;
+  //! Python console can be a dock widget if true, else as the tab.
+  bool myIsConsoleDocked;
+};
+
+class XGUI_EXPORT CloseEventWatcher: public QObject {
+  Q_OBJECT
+
+ public:
+  CloseEventWatcher(QObject* theParent);
+
+ signals:
+  void widgetClosed();
+
+ protected:
+  bool eventFilter(QObject *obj, QEvent *);
+
 };
 
 #endif

diff --git a/src/XGUI/XGUI_MenuGroupPanel.cpp b/src/XGUI/XGUI_MenuGroupPanel.cpp
index 8d5d24b2146206e706922eff835521861c478797..f268c369122f0d70094eb6546747a7b1d506d71c 100644 (file)
--- a/src/XGUI/XGUI_MenuGroupPanel.cpp
+++ b/src/XGUI/XGUI_MenuGroupPanel.cpp
@@ -10,14 +10,17 @@
 #include <iostream>
 
 XGUI_MenuGroupPanel::XGUI_MenuGroupPanel(QWidget *parent)
-    : QWidget(parent), myNewRow(0), myNewCol(0), myMaxRow(1)
+    : QFrame(parent), myNewRow(0), myNewCol(0), myMaxRow(1)
 {
   myLayout = new QGridLayout(this);
   myLayout->setSpacing(0);
   myLayout->setMargin(0);
   myLayout->setContentsMargins(0, 0, 0, 0);
+  setFrameShape(QFrame::NoFrame);
 }
 
+
+
 void XGUI_MenuGroupPanel::addCommand(XGUI_Command* theAction)
 {
   myActions.append(theAction);
@@ -68,9 +71,9 @@ XGUI_Command* XGUI_MenuGroupPanel::addFeature(const QString& theId, const QStrin
 {
   XGUI_Command* aCommand = new XGUI_Command(theId, theIcon, theTitle, this, isCheckable);
   aCommand->setToolTip(theTip);
-  if (!theKeys.isEmpty())
+  if (!theKeys.isEmpty()) {
     aCommand->setShortcut(theKeys);
-
+  }
   addCommand(aCommand);
   return aCommand;
 }

diff --git a/src/XGUI/XGUI_MenuGroupPanel.h b/src/XGUI/XGUI_MenuGroupPanel.h
index b43ef75c6e7175e3561c7294da3ee111c6791841..07f51ed1eac140a981fbe492772bdea59233f3d0 100644 (file)
--- a/src/XGUI/XGUI_MenuGroupPanel.h
+++ b/src/XGUI/XGUI_MenuGroupPanel.h
@@ -2,20 +2,22 @@
 #define XGUI_MenuGroupPanel_H
 
 #include "XGUI.h"
-#include <QWidget>
+#include <QFrame>
 #include <QMap>
 
 class XGUI_Command;
 class QGridLayout;
 
+
 /**\class XGUI_MenuGroupPanel
  * \ingroup GUI
  * \brief Represents a one group in a page of main menu (workbench)
  */
-class XGUI_EXPORT XGUI_MenuGroupPanel: public QWidget
+class XGUI_EXPORT XGUI_MenuGroupPanel: public QFrame
 {
-Q_OBJECT
-public:
+  Q_OBJECT
+
+ public:
   explicit XGUI_MenuGroupPanel(QWidget *parent = 0);
 
   //! Adding a new feature (Command) in the group

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index 25e6166790f957fc9ba1116ad7096fb97538b35e..b25db3e105acd9f4adc0fe80195719baa747fc1d 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -168,10 +168,8 @@ void XGUI_Workshop::initMenu()
     salomeConnector()->addEditMenuSeparator();
     return;
   }
-  XGUI_Workbench* aPage = myMainWindow->menuObject()->generalPage();
-
   // File commands group
-  XGUI_MenuGroupPanel* aGroup = aPage->addGroup("Default");
+  XGUI_MenuGroupPanel* aGroup = myMainWindow->menuObject()->generalPage();
 
   XGUI_Command* aCommand;
 
@@ -212,11 +210,11 @@ void XGUI_Workshop::initMenu()
                                 QIcon(":pictures/close.png"), QKeySequence::Close);
   aCommand->connectTo(this, SLOT(onExit()));
   //FIXME: SBH's test action. Can be used for some GUI tests.
-  //#ifdef _DEBUG
-  //  aCommand = aGroup->addFeature("TEST_CMD", "Test!", "Private debug button",
-  //                                QIcon(":pictures/close.png"));
-  //  aCommand->connectTo(myActionsMgr, SLOT(update()));
-  //#endif
+//  #ifdef _DEBUG
+//    aCommand = aGroup->addFeature("TEST_CMD", "Test!", "Private debug button",
+//                                  QIcon(":pictures/close.png"), QKeySequence(), true);
+//    aCommand->connectTo(myMainWindow, SLOT(dockPythonConsole()));
+//  #endif
 }
 
 //******************************************************
@@ -452,15 +450,15 @@ void XGUI_Workshop::addFeature(const Config_FeatureMessage* theMessage)
   QString aWchName = QString::fromStdString(theMessage->workbenchId());
   QString aNestedFeatures = QString::fromStdString(theMessage->nestedFeatures());
   bool isUsePropPanel = theMessage->isUseInput();
-  QString aId = QString::fromStdString(theMessage->id());
+  QString aFeatureId = QString::fromStdString(theMessage->id());
   if (isSalomeMode()) {
     QAction* aAction = salomeConnector()->addFeature(aWchName,
-                              aId,
+                              aFeatureId,
                               QString::fromStdString(theMessage->text()),
                               QString::fromStdString(theMessage->tooltip()),
                               QIcon(theMessage->icon().c_str()),
                               QKeySequence(), isUsePropPanel);
-    salomeConnector()->setNestedActions(aId, aNestedFeatures.split(" "));
+    salomeConnector()->setNestedActions(aFeatureId, aNestedFeatures.split(" "));
     myActionsMgr->addCommand(aAction);
     myModule->featureCreated(aAction);
   } else {
@@ -476,12 +474,15 @@ void XGUI_Workshop::addFeature(const Config_FeatureMessage* theMessage)
     if (!aGroup) {
       aGroup = aPage->addGroup(aGroupName);
     }
-    //Create feature...
-    XGUI_Command* aCommand = aGroup->addFeature(aId,
+    // Check if hotkey sequence is already defined:
+    QKeySequence aHotKey = myActionsMgr->registerShortcut(
+        QString::fromStdString(theMessage->keysequence()));
+    // Create feature...
+    XGUI_Command* aCommand = aGroup->addFeature(aFeatureId,
                                                 QString::fromStdString(theMessage->text()),
                                                 QString::fromStdString(theMessage->tooltip()),
                                                 QIcon(theMessage->icon().c_str()),
-                                                QKeySequence(), isUsePropPanel);
+                                                aHotKey, isUsePropPanel);
     aCommand->setNestedCommands(aNestedFeatures.split(" ", QString::SkipEmptyParts));
     myActionsMgr->addCommand(aCommand);
     myModule->featureCreated(aCommand);
@@ -794,10 +795,8 @@ QList<QAction*> XGUI_Workshop::getModuleCommands() const
   } else {
     XGUI_MainMenu* aMenuBar = myMainWindow->menuObject();
     foreach (XGUI_Workbench* aWb, aMenuBar->workbenches()) {
-      if (aWb != aMenuBar->generalPage()) {
-        foreach(XGUI_Command* aCmd, aWb->features())
-          aCommands.append(aCmd);
-      }
+      foreach(XGUI_Command* aCmd, aWb->features())
+        aCommands.append(aCmd);
     }
   }
   return aCommands;
@@ -1086,4 +1085,4 @@ void XGUI_Workshop::displayGroupResults(DocumentPtr theDoc, std::string theGroup
 {
   for (int i = 0; i < theDoc->size(theGroup); i++)
     myDisplayer->display(theDoc->object(theGroup, i), false);
-}
\ No newline at end of file
+}