From b0880bc63f518a23f4dae31b92f3cba3b51246fd Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 17 Oct 2007 07:06:20 +0000 Subject: [PATCH] *** empty log message *** --- src/BooleanGUI/BooleanGUI.cxx | 56 +++++++++++++++---------------- src/BooleanGUI/BooleanGUI.h | 62 ++++++++++++----------------------- 2 files changed, 47 insertions(+), 71 deletions(-) diff --git a/src/BooleanGUI/BooleanGUI.cxx b/src/BooleanGUI/BooleanGUI.cxx index 34ddff642..c1e72da54 100644 --- a/src/BooleanGUI/BooleanGUI.cxx +++ b/src/BooleanGUI/BooleanGUI.cxx @@ -1,46 +1,40 @@ -// GEOM GEOMGUI : GUI for Geometry component +// GEOM GEOMGUI : GUI for Geometry component // -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. // -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // +// File : BooleanGUI.cxx +// Author : Damien COQUERET, Open CASCADE S.A.S. // -// -// File : BooleanGUI.cxx -// Author : Damien COQUERET -// Module : GEOM -// $Header$ - #include "BooleanGUI.h" - -#include "SUIT_Desktop.h" #include "BooleanGUI_Dialog.h" -#include "GeometryGUI.h" - -using namespace std; +#include +#include //======================================================================= // function : BooleanGUI() // purpose : Constructor //======================================================================= -BooleanGUI::BooleanGUI( GeometryGUI* parent ) : GEOMGUI( parent ) +BooleanGUI::BooleanGUI( GeometryGUI* parent ) + : GEOMGUI( parent ) { } @@ -57,7 +51,7 @@ BooleanGUI::~BooleanGUI() // function : OnGUIEvent() // purpose : //======================================================================= -bool BooleanGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) +bool BooleanGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) { getGeometryGUI()->EmitSignalDeactivateDialog(); @@ -73,7 +67,7 @@ bool BooleanGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) else return false; - QDialog* aDlg = new BooleanGUI_Dialog( anOperation, getGeometryGUI(), parent, ""); + QDialog* aDlg = new BooleanGUI_Dialog( anOperation, getGeometryGUI(), parent ); aDlg->show(); return true; @@ -84,7 +78,9 @@ bool BooleanGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) //===================================================================================== extern "C" { -GEOM_BOOLEANGUI_EXPORT +#ifdef WIN32 + __declspec( dllexport ) +#endif GEOMGUI* GetLibGUI( GeometryGUI* parent ) { return new BooleanGUI( parent ); diff --git a/src/BooleanGUI/BooleanGUI.h b/src/BooleanGUI/BooleanGUI.h index 32d8f57e0..09096bcb1 100644 --- a/src/BooleanGUI/BooleanGUI.h +++ b/src/BooleanGUI/BooleanGUI.h @@ -1,58 +1,38 @@ -// GEOM GEOMGUI : GUI for Geometry component +// GEOM GEOMGUI : GUI for Geometry component // -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. // -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // +// File : BooleanGUI.h +// Author : Damien COQUERET, Open CASCADE S.A.S. // -// -// File : BooleanGUI.h -// Author : Damien COQUERET -// Module : GEOM #ifndef BOOLEANGUI_H #define BOOLEANGUI_H -#include "GEOMGUI.h" - -#ifdef WNT - #if defined BOOLEANGUI_EXPORTS - #if defined WIN32 - #define GEOM_BOOLEANGUI_EXPORT __declspec( dllexport ) - #else - #define GEOM_BOOLEANGUI_EXPORT - #endif - #else - #if defined WIN32 - #define GEOM_BOOLEANGUI_EXPORT __declspec( dllimport ) - #else - #define GEOM_BOOLEANGUI_EXPORT - #endif - #endif -#else - #define GEOM_BOOLEANGUI_EXPORT -#endif +#include //================================================================================= // class : BooleanGUI // purpose : //================================================================================= -class GEOM_BOOLEANGUI_EXPORT BooleanGUI : public GEOMGUI +class BooleanGUI : public GEOMGUI { public: enum BooleanOperation { COMMON = 1, CUT = 2, FUSE = 3, SECTION = 4 }; @@ -60,7 +40,7 @@ public: BooleanGUI( GeometryGUI* parent ); ~BooleanGUI(); - bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent); + bool OnGUIEvent( int, SUIT_Desktop* ); }; -#endif +#endif // BOOLEANGUI_H -- 2.39.2