module dune-vtk forced some namespace-adaptations

dune/vtk/datacollectors/curvedgeometrydatacollector.hh

@@ -11,7 +11,7 @@
 #include <dune/geometry/referenceelements.hh>
 #include <dune/grid/common/partitionset.hh>
 #include <dune/vtk/forward.hh>
-#include <dune/vtk/vtktypes.hh>
+#include <dune/vtk/types.hh>
 #include <dune/vtk/datacollectors/quadraticdatacollector.hh>
 
 namespace Dune {
@@ -27,11 +27,11 @@ namespace Dune {
  **/
 template <class GridView, class Geometry>
 class CurvedGeometryDataCollector
-    : public UnstructuredDataCollectorInterface<GridView,
+    : public Vtk::UnstructuredDataCollectorInterface<GridView,
         CurvedGeometryDataCollector<GridView,Geometry>, Partitions::All>
 {
   using Self = CurvedGeometryDataCollector;
-  using Super = UnstructuredDataCollectorInterface<GridView, Self, Partitions::All>;
+  using Super = Vtk::UnstructuredDataCollectorInterface<GridView, Self, Partitions::All>;
 
   using LocalCoord = typename GridView::template Codim<0>::Entity::Geometry::LocalCoordinate;
   using GlobalCoord = typename GridView::template Codim<0>::Entity::Geometry::GlobalCoordinate;
@@ -145,7 +145,7 @@ public: // methods forwarded to quadratic data collector
     return dataCollector_.numCells();
   }
 
-  Cells cellsImpl () const
+  Vtk::Cells cellsImpl () const
   {
     return dataCollector_.cells();
   }
@@ -158,7 +158,7 @@ public: // methods forwarded to quadratic data collector
 
 private:
   using Super::gridView_;
-  QuadraticDataCollector<GridView> dataCollector_;
+  Vtk::QuadraticDataCollector<GridView> dataCollector_;
   Mapping mapping_;
   const Parametrization* parametrization_ = nullptr;
 };

src/boundaryprojection.cc

@@ -13,7 +13,7 @@
 #include <dune/curvedgeometry/curvedgeometry.hh>
 #include <dune/geometry/quadraturerules.hh>
 #include <dune/grid/yaspgrid.hh>
-#include <dune/vtk/vtkwriter.hh>
+#include <dune/vtk/writer.hh>
 #include <dune/vtk/datacollectors/curvedgeometrydatacollector.hh>
 
 const int order = 3;

src/vtkwriter.cc

@@ -13,7 +13,7 @@
 #include <dune/curvedgeometry/curvedgeometry.hh>
 #include <dune/geometry/quadraturerules.hh>
 #include <dune/grid/yaspgrid.hh>
-#include <dune/vtk/vtkwriter.hh>
+#include <dune/vtk/writer.hh>
 #include <dune/vtk/datacollectors/curvedgeometrydatacollector.hh>
 
 const int order = 3;