From 951bf59ef41cd0cf016de3da6ab2792e2684a306 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 16 Apr 2017 10:46:55 +0200 Subject: [PATCH] remove superfluous classes BezierSurface and BSplineSurface --- src/Mod/Surface/App/AppSurface.cpp | 4 -- src/Mod/Surface/App/CMakeLists.txt | 4 -- src/Mod/Surface/App/FeatureBSplineSurface.cpp | 56 ------------------- src/Mod/Surface/App/FeatureBSplineSurface.h | 42 -------------- src/Mod/Surface/App/FeatureBezierSurface.cpp | 53 ------------------ src/Mod/Surface/App/FeatureBezierSurface.h | 42 -------------- 6 files changed, 201 deletions(-) delete mode 100644 src/Mod/Surface/App/FeatureBSplineSurface.cpp delete mode 100644 src/Mod/Surface/App/FeatureBSplineSurface.h delete mode 100644 src/Mod/Surface/App/FeatureBezierSurface.cpp delete mode 100644 src/Mod/Surface/App/FeatureBezierSurface.h diff --git a/src/Mod/Surface/App/AppSurface.cpp b/src/Mod/Surface/App/AppSurface.cpp index b2abc380c8..f76e43a52e 100644 --- a/src/Mod/Surface/App/AppSurface.cpp +++ b/src/Mod/Surface/App/AppSurface.cpp @@ -32,8 +32,6 @@ #include "FeatureSewing.h" #include "FeatureCut.h" #include "FeatureSurface.h" -#include "FeatureBezierSurface.h" -#include "FeatureBSplineSurface.h" #include #include @@ -80,8 +78,6 @@ PyMOD_INIT_FUNC(Surface) Surface::Sewing ::init(); Surface::Cut ::init(); Surface::SurfaceFeature ::init(); - Surface::BezierSurface ::init(); - Surface::BSplineSurface ::init(); PyMOD_Return(mod); } diff --git a/src/Mod/Surface/App/CMakeLists.txt b/src/Mod/Surface/App/CMakeLists.txt index 9b50ff5534..23b37c4bab 100644 --- a/src/Mod/Surface/App/CMakeLists.txt +++ b/src/Mod/Surface/App/CMakeLists.txt @@ -29,10 +29,6 @@ SET(Surface_SRCS FeatureSewing.h FeatureCut.cpp FeatureCut.h - FeatureBezierSurface.cpp - FeatureBezierSurface.h - FeatureBSplineSurface.cpp - FeatureBSplineSurface.h ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Surface/App/FeatureBSplineSurface.cpp b/src/Mod/Surface/App/FeatureBSplineSurface.cpp deleted file mode 100644 index 2b5409a223..0000000000 --- a/src/Mod/Surface/App/FeatureBSplineSurface.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2014-2015 Nathan Miller * - * Balázs Bámer * - * * - * This file is part of the FreeCAD CAx development system. * - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Library General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - * 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 Library General Public License for more details. * - * * - * You should have received a copy of the GNU Library General Public * - * License along with this library; see the file COPYING.LIB. If not, * - * write to the Free Software Foundation, Inc., 59 Temple Place, * - * Suite 330, Boston, MA 02111-1307, USA * - * * - ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif - -#include -#include - -#include "FeatureBSplineSurface.h" - - -using namespace Surface; - -PROPERTY_SOURCE(Surface::BSplineSurface, Surface::SurfaceFeature) - - -BSplineSurface::BSplineSurface() : SurfaceFeature() -{ -} diff --git a/src/Mod/Surface/App/FeatureBSplineSurface.h b/src/Mod/Surface/App/FeatureBSplineSurface.h deleted file mode 100644 index b0a190a386..0000000000 --- a/src/Mod/Surface/App/FeatureBSplineSurface.h +++ /dev/null @@ -1,42 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2014-2015 Nathan Miller * - * Balázs Bámer * - * * - * This file is part of the FreeCAD CAx development system. * - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Library General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - * 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 Library General Public License for more details. * - * * - * You should have received a copy of the GNU Library General Public * - * License along with this library; see the file COPYING.LIB. If not, * - * write to the Free Software Foundation, Inc., 59 Temple Place, * - * Suite 330, Boston, MA 02111-1307, USA * - * * - ***************************************************************************/ - -#ifndef SURFACE_FEATUREBSPLINESURFACE_H -#define SURFACE_FEATUREBSPLINESURFACE_H - -#include "FeatureSurface.h" - -namespace Surface -{ - -class SurfaceExport BSplineSurface : public SurfaceFeature -{ - PROPERTY_HEADER(Surface::BSplineSurface); - -public: - BSplineSurface(); -}; - -}//Namespace Surface - -#endif diff --git a/src/Mod/Surface/App/FeatureBezierSurface.cpp b/src/Mod/Surface/App/FeatureBezierSurface.cpp deleted file mode 100644 index 74ee4856f1..0000000000 --- a/src/Mod/Surface/App/FeatureBezierSurface.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2014-2015 Nathan Miller * - * Balázs Bámer * - * * - * This file is part of the FreeCAD CAx development system. * - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Library General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - * 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 Library General Public License for more details. * - * * - * You should have received a copy of the GNU Library General Public * - * License along with this library; see the file COPYING.LIB. If not, * - * write to the Free Software Foundation, Inc., 59 Temple Place, * - * Suite 330, Boston, MA 02111-1307, USA * - * * - ***************************************************************************/ - -#include "PreCompiled.h" -#ifndef _PreComp_ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif - -#include -#include - -#include "FeatureBezierSurface.h" - - -using namespace Surface; - -PROPERTY_SOURCE(Surface::BezierSurface, Surface::SurfaceFeature) - -BezierSurface::BezierSurface() : SurfaceFeature() -{ -} diff --git a/src/Mod/Surface/App/FeatureBezierSurface.h b/src/Mod/Surface/App/FeatureBezierSurface.h deleted file mode 100644 index 2250a47592..0000000000 --- a/src/Mod/Surface/App/FeatureBezierSurface.h +++ /dev/null @@ -1,42 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2014-2015 Nathan Miller * - * Balázs Bámer * - * * - * This file is part of the FreeCAD CAx development system. * - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Library General Public * - * License as published by the Free Software Foundation; either * - * version 2 of the License, or (at your option) any later version. * - * * - * 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 Library General Public License for more details. * - * * - * You should have received a copy of the GNU Library General Public * - * License along with this library; see the file COPYING.LIB. If not, * - * write to the Free Software Foundation, Inc., 59 Temple Place, * - * Suite 330, Boston, MA 02111-1307, USA * - * * - ***************************************************************************/ - -#ifndef SURFACE_FEATUREBEZIERSURFACE_H -#define SURFACE_FEATUREBEZIERSURFACE_H - -#include "FeatureSurface.h" - -namespace Surface -{ - -class SurfaceExport BezierSurface : public SurfaceFeature -{ - PROPERTY_HEADER(Surface::BezierSurface); - -public: - BezierSurface(); -}; - -}//Namespace Surface - -#endif