DCQ : Clean up code

diff --git a/src/BooleanGUI/BooleanGUI_CommonDlg.cxx b/src/BooleanGUI/BooleanGUI_CommonDlg.cxx
index 7e881536f680cc0c19065d0eebe91615f9b51bf8..db7b47d14002059e5095268767ab2691e4fe9057 100644 (file)
--- a/src/BooleanGUI/BooleanGUI_CommonDlg.cxx
+++ b/src/BooleanGUI/BooleanGUI_CommonDlg.cxx
@@ -85,9 +85,6 @@ void BooleanGUI_CommonDlg::Init()
 {
   /* init variables */
   myEditCurrentArgument = GroupCommon->LineEdit1;
-
-  myShape1.Nullify();
-  myShape2.Nullify();
   myOkShape1 = myOkShape2 = false;
 
    /* signals and slots connections */
@@ -167,7 +164,6 @@ void BooleanGUI_CommonDlg::SelectionIntoArgument()
     myGeomShape1 = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
     if(!testResult)
       return;
-    myShape1 = S;
     GroupCommon->LineEdit1->setText(aString);
     myOkShape1 = true;
   }
@@ -175,7 +171,6 @@ void BooleanGUI_CommonDlg::SelectionIntoArgument()
     myGeomShape2 = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
     if(!testResult)
       return;
-    myShape2 = S;
     GroupCommon->LineEdit2->setText(aString);
     myOkShape2 = true;
   }

diff --git a/src/BooleanGUI/BooleanGUI_CommonDlg.h b/src/BooleanGUI/BooleanGUI_CommonDlg.h
index f592e6df0a9c4183bd0a66f4575c089fb086da5e..cb3b805f53fa8687431147172609c507893cb4ea 100644 (file)
--- a/src/BooleanGUI/BooleanGUI_CommonDlg.h
+++ b/src/BooleanGUI/BooleanGUI_CommonDlg.h
@@ -54,8 +54,6 @@ private:
 
     BooleanGUI* myBooleanGUI;
 
-    TopoDS_Shape myShape1;              /* topology used  */
-    TopoDS_Shape myShape2;              /* topology used  */
     GEOM::GEOM_Shape_var myGeomShape1;          /* is myShape1 */
     GEOM::GEOM_Shape_var myGeomShape2;          /* is myShape2 */
     bool myOkShape1;

diff --git a/src/BooleanGUI/BooleanGUI_CutDlg.cxx b/src/BooleanGUI/BooleanGUI_CutDlg.cxx
index d3aaf9785044f1066107eb6c4effab1e49b37b86..1cc08269d418ae5e35046e0bb73dda0dc8b4293e 100644 (file)
--- a/src/BooleanGUI/BooleanGUI_CutDlg.cxx
+++ b/src/BooleanGUI/BooleanGUI_CutDlg.cxx
@@ -84,9 +84,6 @@ void BooleanGUI_CutDlg::Init()
 {  
   /* init variables */
   myEditCurrentArgument = GroupCut->LineEdit1;
-
-  myShape1.Nullify();
-  myShape2.Nullify();
   myOkShape1 = myOkShape2 = false;
 
    /* signals and slots connections */
@@ -166,7 +163,6 @@ void BooleanGUI_CutDlg::SelectionIntoArgument()
     myGeomShape1 = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
     if(!testResult)
       return;
-    myShape1 = S;
     GroupCut->LineEdit1->setText(aString);
     myOkShape1 = true;
   }
@@ -174,7 +170,6 @@ void BooleanGUI_CutDlg::SelectionIntoArgument()
     myGeomShape2 = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
     if(!testResult)
       return;
-    myShape2 = S;
     GroupCut->LineEdit2->setText(aString);
     myOkShape2 = true;
   }

diff --git a/src/BooleanGUI/BooleanGUI_CutDlg.h b/src/BooleanGUI/BooleanGUI_CutDlg.h
index 46738f7f3c6a4be636c0381c89e029d590eeef25..212bdb176d75dadb08ab98c4b4e5d56afee891b7 100644 (file)
--- a/src/BooleanGUI/BooleanGUI_CutDlg.h
+++ b/src/BooleanGUI/BooleanGUI_CutDlg.h
@@ -54,8 +54,6 @@ private:
 
     BooleanGUI* myBooleanGUI;
 
-    TopoDS_Shape myShape1;   /* topology used to fuse */
-    TopoDS_Shape myShape2;   /* topology used to fuse */
     GEOM::GEOM_Shape_var myGeomShape1;          /* is myShape1 */
     GEOM::GEOM_Shape_var myGeomShape2;          /* is myShape2 */
     bool myOkShape1;        /* to check when arguments are defined */

diff --git a/src/BooleanGUI/BooleanGUI_FuseDlg.cxx b/src/BooleanGUI/BooleanGUI_FuseDlg.cxx
index 14a741cc3ca19b5131ec8c9e99e942bbb5b2155d..ea9ae1b3ac26dc76d012c5c9cf42144db2bbd0e0 100644 (file)
--- a/src/BooleanGUI/BooleanGUI_FuseDlg.cxx
+++ b/src/BooleanGUI/BooleanGUI_FuseDlg.cxx
@@ -84,9 +84,6 @@ void BooleanGUI_FuseDlg::Init()
 {
   /* init variables */
   myEditCurrentArgument = GroupFuse->LineEdit1;
-
-  myShape1.Nullify();
-  myShape2.Nullify();
   myOkShape1 = myOkShape2 = false;
 
    /* signals and slots connections */
@@ -166,7 +163,6 @@ void BooleanGUI_FuseDlg::SelectionIntoArgument()
     myGeomShape1 = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
     if(!testResult)
       return;
-    myShape1 = S;
     GroupFuse->LineEdit1->setText(aString);
     myOkShape1 = true;
   }
@@ -174,7 +170,6 @@ void BooleanGUI_FuseDlg::SelectionIntoArgument()
     myGeomShape2 = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
     if(!testResult)
       return;
-    myShape2 = S;
     GroupFuse->LineEdit2->setText(aString);
     myOkShape2 = true;
   }

diff --git a/src/BooleanGUI/BooleanGUI_FuseDlg.h b/src/BooleanGUI/BooleanGUI_FuseDlg.h
index 799eb0b9dd5b7ebe3a03a4ad29ecdd63775d85b5..6898e64aaa704365970301dd8dca6cd5822a7c68 100644 (file)
--- a/src/BooleanGUI/BooleanGUI_FuseDlg.h
+++ b/src/BooleanGUI/BooleanGUI_FuseDlg.h
@@ -54,8 +54,6 @@ private:
 
     BooleanGUI* myBooleanGUI;
 
-    TopoDS_Shape myShape1;   /* topology used to fuse */
-    TopoDS_Shape myShape2;   /* topology used to fuse */
     GEOM::GEOM_Shape_var myGeomShape1;          /* is myShape1 */
     GEOM::GEOM_Shape_var myGeomShape2;          /* is myShape2 */
     bool myOkShape1;        /* to check when arguments are defined */

diff --git a/src/BooleanGUI/BooleanGUI_SectionDlg.cxx b/src/BooleanGUI/BooleanGUI_SectionDlg.cxx
index d2c1c6a4a19f293f59153da63f2d4ce0865d78cf..51bae1f9e1570ef6d77da0347087f26b1f2a609b 100644 (file)
--- a/src/BooleanGUI/BooleanGUI_SectionDlg.cxx
+++ b/src/BooleanGUI/BooleanGUI_SectionDlg.cxx
@@ -85,9 +85,6 @@ void BooleanGUI_SectionDlg::Init()
 {  
   /* init variables */
   myEditCurrentArgument = GroupSection->LineEdit1;
-
-  myShape1.Nullify();
-  myShape2.Nullify();
   myOkShape1 = myOkShape2 = false;
 
    /* signals and slots connections */
@@ -167,7 +164,6 @@ void BooleanGUI_SectionDlg::SelectionIntoArgument()
     myGeomShape1 = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
     if(!testResult)
       return;
-    myShape1 = S;
     GroupSection->LineEdit1->setText(aString);
     myOkShape1 = true;
   }
@@ -175,7 +171,6 @@ void BooleanGUI_SectionDlg::SelectionIntoArgument()
     myGeomShape2 = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
     if(!testResult)
       return;
-    myShape2 = S;
     GroupSection->LineEdit2->setText(aString);
     myOkShape2 = true;
   }

diff --git a/src/BooleanGUI/BooleanGUI_SectionDlg.h b/src/BooleanGUI/BooleanGUI_SectionDlg.h
index badf2afdf7586149af1f21d17b5852e8ec8264bf..ef1f35282a7b406c1c45e1a329342d5ee868671a 100644 (file)
--- a/src/BooleanGUI/BooleanGUI_SectionDlg.h
+++ b/src/BooleanGUI/BooleanGUI_SectionDlg.h
@@ -54,8 +54,6 @@ private:
 
     BooleanGUI* myBooleanGUI;
 
-    TopoDS_Shape myShape1;   /* topology used to fuse */
-    TopoDS_Shape myShape2;   /* topology used to fuse */
     GEOM::GEOM_Shape_var myGeomShape1;          /* is myShape1 */
     GEOM::GEOM_Shape_var myGeomShape2;          /* is myShape2 */
     bool myOkShape1;        /* to check when arguments are defined */