diff --git a/src/surfMesh/surfaceFormats/stl/STLpoint.H b/src/surfMesh/surfaceFormats/stl/STLpoint.H index 834a4cd196d5b9dde1f51f3157ae7a0fe9330d37..157e832ba5a66581799ac4049f1b30ef792929f3 100644 --- a/src/surfMesh/surfaceFormats/stl/STLpoint.H +++ b/src/surfMesh/surfaceFormats/stl/STLpoint.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,7 +28,6 @@ Description A vertex point representation for STL files. SourceFiles - STLpointI.H \*---------------------------------------------------------------------------*/ diff --git a/src/triSurface/triSurface/interfaces/STL/STLpoint.H b/src/triSurface/triSurface/interfaces/STL/STLpoint.H deleted file mode 100644 index 307fc3db3fe187b96052cf45df210f4631077248..0000000000000000000000000000000000000000 --- a/src/triSurface/triSurface/interfaces/STL/STLpoint.H +++ /dev/null @@ -1,89 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM 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 General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. - -Class - Foam::STLpoint - -Description - A vertex point representation for STL files. - -SourceFiles - STLpointI.H - -\*---------------------------------------------------------------------------*/ - -#ifndef STLpoint_H -#define STLpoint_H - -#include "point.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class STLpoint Declaration -\*---------------------------------------------------------------------------*/ - -class STLpoint -: - public Vector<float> -{ - -public: - - // Constructors - - //- Construct null - inline STLpoint(); - - //- Construct from components - inline STLpoint(float x, float y, float z); - - //- Construct from point - inline STLpoint(const point&); - - //- Construct from istream - inline STLpoint(Istream&); - - - // Member Operators - - inline operator point() const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "STLpointI.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/triSurface/triSurface/interfaces/STL/STLpointI.H b/src/triSurface/triSurface/interfaces/STL/STLpointI.H deleted file mode 100644 index f0fdd2c585324ab147602406a26cb2911ec5d2c9..0000000000000000000000000000000000000000 --- a/src/triSurface/triSurface/interfaces/STL/STLpointI.H +++ /dev/null @@ -1,64 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM 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 General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. - -\*---------------------------------------------------------------------------*/ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -inline STLpoint::STLpoint() -{} - -inline STLpoint::STLpoint(float x, float y, float z) -: - Vector<float>(x, y, z) -{} - -inline STLpoint::STLpoint(const point& pt) -: - Vector<float>(float(pt.x()), float(pt.y()), float(pt.z())) -{} - -inline STLpoint::STLpoint(Istream& is) -: - Vector<float>(is) -{} - - -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - -inline STLpoint::operator point() const -{ - return point(x(), y(), z()); -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* //