ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-28 18:30:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Win32 Porting.

Browse Source 
Correction of Export/Import defines for Win32 platform.
Removed "using namespace std" from header files.
This commit is contained in:
abd 2008-10-03 11:07:03 +00:00
parent 8d0541f686
commit 417ce59dd7
24 changed files with 88 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BasicGUI/BasicGUI_CurveDlg.h
View File

@ -63,7 +63,7 @@ private :
DlgRef_1Sel_QTD* GroupPoints;
GEOM::ListOfGO_var myPoints;
list<GEOM::GEOM_Object_var> myOrderedSel;//!< This list used for managing orderes selection
std::list<GEOM::GEOM_Object_var> myOrderedSel;//!< This list used for managing orderes selection
private slots:
void ClickOnOk();

4
src/DlgRef/DlgRef_Skeleton_QTD.h
View File

@ -10,6 +10,8 @@
#ifndef DLGREF_SKELETON_QTD_H
#define DLGREF_SKELETON_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h>
#include <qdialog.h>
@ -25,7 +27,7 @@ class QLineEdit;
class QCheckBox;
class QPushButton;
class DlgRef_Skeleton_QTD : public QDialog
class GEOM_DLGREF_EXPORT DlgRef_Skeleton_QTD : public QDialog
{
Q_OBJECT

8
src/GEOMClient/GEOM_Client.cxx
View File

@ -26,8 +26,6 @@
// Module : GEOM
// $Header$
using namespace std;
#include <Standard_Stream.hxx>
#include <Standard_Stream.hxx>
@ -36,7 +34,7 @@ using namespace std;
#include "GEOM_Client.hxx"
#include <SALOMEconfig.h>
#include "OpUtil.hxx"
#include "Basics_Utils.hxx"
#include "utilities.h"
#include <BRep_Builder.hxx>
@ -60,7 +58,7 @@ using namespace std;
#define HST_CLIENT_LEN 256
using namespace std;
//=======================================================================
// function : Load()
@ -68,7 +66,7 @@ using namespace std;
//=======================================================================
TopoDS_Shape GEOM_Client::Load( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape )
{
string hst_client = GetHostname();
string hst_client = Kernel_Utils::GetHostname();
Engines::Container_var ctn_server = geom->GetContainerRef();
long pid_server = ctn_server->getPID();

22
src/GEOMClient/GEOM_Client.hxx
View File

@ -52,22 +52,14 @@ class TopoDS_Shape;
#include <Standard_Macro.hxx>
#endif
#ifdef WNT
#if defined GEOMCLIENT_EXPORTS
#if defined WIN32
#define GEOMCLIENT_EXPORT __declspec( dllexport )
#else
#define GEOMCLIENT_EXPORT
#endif
#else
#if defined WIN32
#define GEOMCLIENT_EXPORT __declspec( dllimport )
#else
#define GEOMCLIENT_EXPORT
#endif
#endif
#ifdef WIN32
# ifdef GEOMCLIENT_EXPORTS
# define GEOMCLIENT_EXPORT __declspec( dllexport )
# else
# define GEOMCLIENT_EXPORT __declspec( dllimport )
# endif
#else
#define GEOMCLIENT_EXPORT
# define GEOMCLIENT_EXPORT
#endif
//=====================================================================

4
src/GEOMGUI/GEOM_Displayer.h
View File

@ -29,8 +29,6 @@
#if !defined (__GEOM_DISPLAYER_H)
#define __GEOM_DISPLAYER_H
using namespace std;
#include "GEOM_GEOMGUI.hxx"
#include "SALOME_Prs.h"
@ -176,7 +174,7 @@ protected:
protected:
Handle(SALOME_InteractiveObject) myIO;
TopoDS_Shape myShape;
string myName;
std::string myName;
int myType;
SALOME_View* myViewFrame;

4
src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
View File

@ -21,8 +21,6 @@
#pragma warning( disable:4786 )
#endif
using namespace std;
#include <Standard_Stream.hxx>
#include <GEOMImpl_IBlocksOperations.hxx>
@ -99,6 +97,8 @@ using namespace std;
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
using namespace std;
//=============================================================================
/*!
* constructor:

10
src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx
View File

@ -21,8 +21,6 @@
#ifndef _GEOMImpl_IBlocksOperations_HXX_
#define _GEOMImpl_IBlocksOperations_HXX_
using namespace std;
#include "GEOM_IOperations.hxx"
#include <TopTools_ListOfShape.hxx>
@ -114,17 +112,17 @@ class GEOMImpl_IBlocksOperations : public GEOM_IOperations {
struct BCError {
BCErrorType error;
list<int> incriminated;
std::list<int> incriminated;
};
Standard_EXPORT Standard_Boolean CheckCompoundOfBlocksOld (Handle(GEOM_Object) theCompound,
list<BCError>& theErrors);
std::list<BCError>& theErrors);
Standard_EXPORT Standard_Boolean CheckCompoundOfBlocks (Handle(GEOM_Object) theCompound,
list<BCError>& theErrors);
std::list<BCError>& theErrors);
Standard_EXPORT TCollection_AsciiString PrintBCErrors (Handle(GEOM_Object) theCompound,
const list<BCError>& theErrors);
const std::list<BCError>& theErrors);
Standard_EXPORT Handle(GEOM_Object) RemoveExtraEdges (Handle(GEOM_Object) theShape);

2
src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
View File

@ -47,6 +47,8 @@
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
using namespace std;
//=============================================================================
/*!
* constructor:

10
src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx
View File

@ -17,8 +17,6 @@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
using namespace std;
#ifndef _GEOMImpl_ICurvesOperations_HXX_
#define _GEOMImpl_ICurvesOperations_HXX_
@ -36,7 +34,7 @@ class GEOMImpl_ICurvesOperations : public GEOM_IOperations {
Standard_EXPORT GEOMImpl_ICurvesOperations(GEOM_Engine* theEngine, int theDocID);
Standard_EXPORT ~GEOMImpl_ICurvesOperations();
Standard_EXPORT Handle(GEOM_Object) MakePolyline (list<Handle(GEOM_Object)> thePoints);
Standard_EXPORT Handle(GEOM_Object) MakePolyline (std::list<Handle(GEOM_Object)> thePoints);
Standard_EXPORT Handle(GEOM_Object) MakeCircleThreePnt (Handle(GEOM_Object) thePnt1,
Handle(GEOM_Object) thePnt2,
@ -60,11 +58,11 @@ class GEOMImpl_ICurvesOperations : public GEOM_IOperations {
Handle(GEOM_Object) thePnt3,
bool theSense);
Standard_EXPORT Handle(GEOM_Object) MakeSplineBezier (list<Handle(GEOM_Object)> thePoints);
Standard_EXPORT Handle(GEOM_Object) MakeSplineInterpolation (list<Handle(GEOM_Object)> thePoints);
Standard_EXPORT Handle(GEOM_Object) MakeSplineBezier (std::list<Handle(GEOM_Object)> thePoints);
Standard_EXPORT Handle(GEOM_Object) MakeSplineInterpolation (std::list<Handle(GEOM_Object)> thePoints);
Standard_EXPORT Handle(GEOM_Object) MakeSketcher (const char* theCommand,
list<double> theWorkingPlane);
std::list<double> theWorkingPlane);
Standard_EXPORT Handle(GEOM_Object) MakeSketcherOnPlane (const char* theCommand,
Handle(GEOM_Object) theWorkingPlane);
};

4
src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
View File

@ -24,8 +24,6 @@
#pragma warning( disable:4786 )
#endif
using namespace std;
#include <Standard_Stream.hxx>
#include <GEOMImpl_IHealingOperations.hxx>
@ -57,6 +55,8 @@ using namespace std;
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
using namespace std;
//=============================================================================
/*!

16
src/GEOMImpl/GEOMImpl_IHealingOperations.hxx
View File

@ -18,8 +18,6 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
using namespace std;
#ifndef _GEOMImpl_IHealingOperations_HXX_
#define _GEOMImpl_IHealingOperations_HXX_
@ -44,17 +42,17 @@ class GEOMImpl_IHealingOperations : public GEOM_IOperations {
const Handle(TColStd_HArray1OfExtendedString)& theValues );
// Retrieve default Shape Process parameters (from resource file)
Standard_EXPORT void GetShapeProcessParameters( list<string>& theOperations,
list<string>& theParams,
list<string>& theValues );
Standard_EXPORT void GetShapeProcessParameters( std::list<std::string>& theOperations,
std::list<std::string>& theParams,
std::list<std::string>& theValues );
// Retrieve default Shape Process parameters for given operator
Standard_EXPORT bool GetOperatorParameters( const string theOperation,
list<string>& theParams,
list<string>& theValues );
Standard_EXPORT bool GetOperatorParameters( const std::string theOperation,
std::list<std::string>& theParams,
std::list<std::string>& theValues );
// returns all parameters that are valid for the given operation (Shape Process operator)
Standard_EXPORT static bool GetParameters( const string theOperation, list<string>& theParams );
Standard_EXPORT static bool GetParameters( const std::string theOperation, std::list<std::string>& theParams );
Standard_EXPORT Handle(GEOM_Object) SuppressFaces( Handle(GEOM_Object) theObject,
const Handle(TColStd_HArray1OfInteger)& theFaces);

4
src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
View File

@ -18,8 +18,6 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
using namespace std;
#include <Standard_Stream.hxx>
#include <GEOMImpl_ILocalOperations.hxx>
@ -57,6 +55,8 @@ using namespace std;
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
using namespace std;
//=============================================================================
/*!
* constructor:

18
src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
View File

@ -21,8 +21,6 @@
#ifndef _GEOMImpl_ILocalOperations_HXX_
#define _GEOMImpl_ILocalOperations_HXX_
using namespace std;
#include "Utils_SALOME_Exception.hxx"
#include "GEOM_IOperations.hxx"
#include "GEOM_Engine.hxx"
@ -38,15 +36,15 @@ class GEOMImpl_ILocalOperations : public GEOM_IOperations {
Standard_EXPORT Handle(GEOM_Object) MakeFilletAll (Handle(GEOM_Object) theShape, double theR);
Standard_EXPORT Handle(GEOM_Object) MakeFilletEdges (Handle(GEOM_Object) theShape, double theR,
list<int> theEdges);
std::list<int> theEdges);
Standard_EXPORT Handle(GEOM_Object) MakeFilletEdgesR1R2 (Handle(GEOM_Object) theShape,
double theR1, double theR2,
list<int> theEdges);
std::list<int> theEdges);
Standard_EXPORT Handle(GEOM_Object) MakeFilletFaces (Handle(GEOM_Object) theShape, double theR,
list<int> theFaces);
std::list<int> theFaces);
Standard_EXPORT Handle(GEOM_Object) MakeFilletFacesR1R2 (Handle(GEOM_Object) theShape,
double theR1, double theR2,
list<int> theFaces);
std::list<int> theFaces);
Standard_EXPORT Handle(GEOM_Object) MakeChamferAll (Handle(GEOM_Object) theShape, double theD);
Standard_EXPORT Handle(GEOM_Object) MakeChamferEdge (Handle(GEOM_Object) theShape,
@ -57,16 +55,16 @@ class GEOMImpl_ILocalOperations : public GEOM_IOperations {
int theFace1, int theFace2);
Standard_EXPORT Handle(GEOM_Object) MakeChamferFaces (Handle(GEOM_Object) theShape,
double theD1, double theD2,
list<int> theFaces);
std::list<int> theFaces);
Standard_EXPORT Handle(GEOM_Object) MakeChamferFacesAD (Handle(GEOM_Object) theShape,
double theD, double theAngle,
list<int> theFaces);
std::list<int> theFaces);
Standard_EXPORT Handle(GEOM_Object) MakeChamferEdges (Handle(GEOM_Object) theShape,
double theD1, double theD2,
list<int> theEdges);
std::list<int> theEdges);
Standard_EXPORT Handle(GEOM_Object) MakeChamferEdgesAD (Handle(GEOM_Object) theShape,
double theD, double theAngle,
list<int> theEdges);
std::list<int> theEdges);
Standard_EXPORT Handle(GEOM_Object) MakeArchimede (Handle(GEOM_Object) theShape,
double theWeight, double theWaterDensity,
double theMeshingDeflection);

4
src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
View File

@ -23,7 +23,6 @@
// Project : SALOME
// $Header$
using namespace std;
#include <Standard_Stream.hxx>
@ -132,6 +131,9 @@ using namespace std;
#include <BRepClass3d_SolidClassifier.hxx>
#include <Precision.hxx>
using namespace std;
//=============================================================================
/*!
* constructor:

34
src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
View File

@ -28,8 +28,6 @@
#ifndef _GEOMImpl_IShapesOperations_HXX_
#define _GEOMImpl_IShapesOperations_HXX_
using namespace std;
#include "GEOM_IOperations.hxx"
#include "GEOMAlgo_State.hxx"
@ -56,20 +54,20 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
Standard_EXPORT Handle(GEOM_Object) MakeEdge (Handle(GEOM_Object) thePoint1,
Handle(GEOM_Object) thePoint2);
Standard_EXPORT Handle(GEOM_Object) MakeWire (list<Handle(GEOM_Object)> theEdgesAndWires);
Standard_EXPORT Handle(GEOM_Object) MakeWire (std::list<Handle(GEOM_Object)> theEdgesAndWires);
Standard_EXPORT Handle(GEOM_Object) MakeFace (Handle(GEOM_Object) theWire, const bool isPlanarWanted);
Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (list<Handle(GEOM_Object)> theWires,
Standard_EXPORT Handle(GEOM_Object) MakeFaceWires (std::list<Handle(GEOM_Object)> theWires,
const bool isPlanarWanted);
Standard_EXPORT Handle(GEOM_Object) MakeShell (list<Handle(GEOM_Object)> theShapes);
Standard_EXPORT Handle(GEOM_Object) MakeShell (std::list<Handle(GEOM_Object)> theShapes);
Standard_EXPORT Handle(GEOM_Object) MakeSolidShell (Handle(GEOM_Object) theShell);
Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (list<Handle(GEOM_Object)> theShells);
Standard_EXPORT Handle(GEOM_Object) MakeSolidShells (std::list<Handle(GEOM_Object)> theShells);
Standard_EXPORT Handle(GEOM_Object) MakeCompound (list<Handle(GEOM_Object)> theShapes);
Standard_EXPORT Handle(GEOM_Object) MakeCompound (std::list<Handle(GEOM_Object)> theShapes);
Standard_EXPORT Handle(GEOM_Object) MakeGlueFaces (Handle(GEOM_Object) theShape,
const Standard_Real theTolerance,
@ -80,7 +78,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
Standard_EXPORT Handle(GEOM_Object) MakeGlueFacesByList (Handle(GEOM_Object) theShape,
const Standard_Real theTolerance,
list<Handle(GEOM_Object)> theFaces,
std::list<Handle(GEOM_Object)> theFaces,
const Standard_Boolean doKeepNonSolids);
Standard_EXPORT Handle(TColStd_HSequenceOfTransient) MakeExplode (Handle(GEOM_Object) theShape,
@ -257,10 +255,10 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
* \retval Handle(TColStd_HSequenceOfTransient) - found shape objects
*/
Standard_EXPORT Handle(TColStd_HSequenceOfTransient)
GetShapesOnBox(const Handle(GEOM_Object)& theBox,
const Handle(GEOM_Object)& theShape,
const Standard_Integer theShapeType,
GEOMAlgo_State theState);
GetShapesOnBox(const Handle(GEOM_Object)& theBox,
const Handle(GEOM_Object)& theShape,
const Standard_Integer theShapeType,
GEOMAlgo_State theState);
/*!
* \brief Find IDs of subshapes complying with given status about surface
@ -320,7 +318,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
Standard_EXPORT static bool CheckTriangulation (const TopoDS_Shape& theShape);
private:
Handle(GEOM_Object) MakeShape (list<Handle(GEOM_Object)> theShapes,
Handle(GEOM_Object) MakeShape (std::list<Handle(GEOM_Object)> theShapes,
const Standard_Integer theObjectType,
const Standard_Integer theFunctionType,
const TCollection_AsciiString& theMethodName);
@ -404,11 +402,11 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
/*!
* \brief Find IDs of subshapes complying with given status about surface
* \param theBox - the box to check state of subshapes against
* \param theShape - the shape to explore
* \param theShapeType - type of subshape of theShape
* \param theState - required state
* \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
* \param theBox - the box to check state of subshapes against
* \param theShape - the shape to explore
* \param theShapeType - type of subshape of theShape
* \param theState - required state
* \retval Handle(TColStd_HSequenceOfInteger) - IDs of found subshapes
*/
Handle(TColStd_HSequenceOfInteger) getShapesOnBoxIDs(const Handle(GEOM_Object)& theBox,
const Handle(GEOM_Object)& theShape,

2
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -51,6 +51,8 @@
#include "SALOMEDS_Tool.hxx"
using namespace std;
//============================================================================
// function : GEOM_Gen_i()
// purpose : constructor to be called for servant creation.

2
src/GEOM_I/GEOM_IBlocksOperations_i.cc
View File

@ -31,6 +31,8 @@
#include <TColStd_HSequenceOfTransient.hxx>
#include <TColStd_HArray1OfInteger.hxx>
using namespace std;
//=============================================================================
/*!
* constructor:

2
src/GEOM_I/GEOM_ICurvesOperations_i.cc
View File

@ -27,6 +27,8 @@
#include "GEOM_Engine.hxx"
#include "GEOM_Object.hxx"
using namespace std;
//=============================================================================
/*!
* constructor:

2
src/GEOM_I/GEOM_IHealingOperations_i.cc
View File

@ -31,6 +31,8 @@
#include <TColStd_HSequenceOfTransient.hxx>
using namespace std;
//=============================================================================
/*!
* constructor:

2
src/GEOM_I/GEOM_ILocalOperations_i.cc
View File

@ -28,6 +28,8 @@
#include "GEOM_Engine.hxx"
#include "GEOM_Object.hxx"
using namespace std;
//=============================================================================
/*!
* constructor:

2
src/GEOM_I/GEOM_IShapesOperations_i.cc
View File

@ -31,6 +31,8 @@
#include <TColStd_HSequenceOfTransient.hxx>
#include <TColStd_HArray1OfInteger.hxx>
using namespace std;
//=============================================================================
/*!
* constructor:

2
src/GEOM_I/GEOM_Object_i.cc
View File

@ -42,6 +42,8 @@
#pragma warning( disable:4786 )
#endif
using namespace std;
//=============================================================================
/*!
* constructor:

2
src/GroupGUI/GroupGUI_GroupDlg.cxx
View File

@ -48,6 +48,8 @@
#include <TColStd_MapOfInteger.hxx>
#include <TColStd_DataMapIteratorOfDataMapOfIntegerInteger.hxx>
using namespace std;
enum { ALL_SUBSHAPES = 0, GET_IN_PLACE, SUBSHAPES_OF_SHAPE2 };
GroupGUI_GroupDlg::GroupGUI_GroupDlg(Mode mode, GeometryGUI* theGeometryGUI, QWidget* parent)

22
src/IGESExport/IGESExport.cxx
View File

@ -31,22 +31,14 @@
#include <TCollection_AsciiString.hxx>
#include <TopoDS_Shape.hxx>
#ifdef WNT
#if defined IGESEXPORT_EXPORTS
#if defined WIN32
#define IGESEXPORT_EXPORT __declspec( dllexport )
#else
#define IGESEXPORT_EXPORT
#endif
#else
#if defined WIN32
#define IGESEXPORT_EXPORT __declspec( dllimport )
#else
#define IGESEXPORT_EXPORT
#endif
#endif
#ifdef WIN32
# ifdef IGESEXPORT_EXPORTS
# define IGESEXPORT_EXPORT __declspec( dllexport )
# else
# define IGESEXPORT_EXPORT __declspec( dllimport )
# endif
#else
#define IGESEXPORT_EXPORT
# define IGESEXPORT_EXPORT
#endif
//=============================================================================