From 3f559fd17289f9753b03837f1844d10fc3460722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carsten=20Gr=C3=A4ser?= <graeser@mi.fu-berlin.de>
Date: Mon, 25 Mar 2013 15:32:09 +0000
Subject: [PATCH] Don't use deprecaed headers anymore

[[Imported from SVN: r8367]]
---
 .../assemblers/localassemblers/boundarymassassembler.hh     | 2 +-
 .../assemblers/localassemblers/convolutionassembler.hh      | 2 +-
 .../localassemblers/generalizedlaplaceassembler.hh          | 2 +-
 .../localassemblers/geononlinlinearizedstvenantassembler.hh | 2 +-
 .../localassemblers/geononlinstvenantfunctionalassembler.hh | 2 +-
 .../assemblers/localassemblers/h1functionalassembler.hh     | 2 +-
 .../assemblers/localassemblers/l2functionalassembler.hh     | 2 +-
 dune/fufem/assemblers/localassemblers/laplaceassembler.hh   | 2 +-
 .../fufem/assemblers/localassemblers/lumpedmassassembler.hh | 2 +-
 dune/fufem/assemblers/localassemblers/massassembler.hh      | 2 +-
 .../assemblers/localassemblers/neumannboundaryassembler.hh  | 2 +-
 .../localassemblers/normalstressboundaryassembler.hh        | 2 +-
 .../localassemblers/stvenantkirchhoffassembler.hh           | 2 +-
 .../localassemblers/subgridh1functionalassembler.hh         | 2 +-
 .../localassemblers/subgridl2functionalassembler.hh         | 2 +-
 dune/fufem/assemblers/localassemblers/viscosityassembler.hh | 2 +-
 dune/fufem/assemblers/localassemblers/vvlaplaceassembler.hh | 2 +-
 dune/fufem/discretizationerror.hh                           | 2 +-
 dune/fufem/functiontools/functionintegrator.hh              | 2 +-
 dune/fufem/mechanics/newpfeassembler.hh                     | 2 +-
 dune/fufem/neumannassembler.hh                              | 2 +-
 dune/fufem/quadraturerules/quadraturerulecache.hh           | 6 +++---
 dune/fufem/quadraturerules/refinedquadraturerule.hh         | 2 +-
 23 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/dune/fufem/assemblers/localassemblers/boundarymassassembler.hh b/dune/fufem/assemblers/localassemblers/boundarymassassembler.hh
index 2aa7e254..aa480144 100644
--- a/dune/fufem/assemblers/localassemblers/boundarymassassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/boundarymassassembler.hh
@@ -8,7 +8,7 @@
 #include <dune/istl/matrix.hh>
 
 #include "dune/fufem/staticmatrixtools.hh"
-#include "dune/fufem/functiontools/quadraturerulecache.hh"
+#include "dune/fufem/quadraturerules/quadraturerulecache.hh"
 
 #include "dune/fufem/assemblers/localoperatorassembler.hh"
 #include "dune/fufem/referenceelementhelper.hh"
diff --git a/dune/fufem/assemblers/localassemblers/convolutionassembler.hh b/dune/fufem/assemblers/localassemblers/convolutionassembler.hh
index 73b7dcb3..d98f60c7 100644
--- a/dune/fufem/assemblers/localassemblers/convolutionassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/convolutionassembler.hh
@@ -11,7 +11,7 @@
 #include <dune/istl/matrix.hh>
 
 #include "dune/fufem/staticmatrixtools.hh"
-#include "dune/fufem/functiontools/quadraturerulecache.hh"
+#include "dune/fufem/quadraturerules/quadraturerulecache.hh"
 
 
 
diff --git a/dune/fufem/assemblers/localassemblers/generalizedlaplaceassembler.hh b/dune/fufem/assemblers/localassemblers/generalizedlaplaceassembler.hh
index e3bf1665..ad2daffe 100644
--- a/dune/fufem/assemblers/localassemblers/generalizedlaplaceassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/generalizedlaplaceassembler.hh
@@ -11,7 +11,7 @@
 
 #include <dune/fufem/arithmetic.hh>
 
-#include <dune/fufem/functiontools/quadraturerulecache.hh>
+#include <dune/fufem/quadraturerules/quadraturerulecache.hh>
 
 #include <dune/fufem/assemblers/localoperatorassembler.hh>
 
diff --git a/dune/fufem/assemblers/localassemblers/geononlinlinearizedstvenantassembler.hh b/dune/fufem/assemblers/localassemblers/geononlinlinearizedstvenantassembler.hh
index 9b130ae9..f39fa154 100644
--- a/dune/fufem/assemblers/localassemblers/geononlinlinearizedstvenantassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/geononlinlinearizedstvenantassembler.hh
@@ -7,7 +7,7 @@
 
 #include <dune/istl/matrix.hh>
 
-#include "dune/fufem/functiontools/quadraturerulecache.hh"
+#include "dune/fufem/quadraturerules/quadraturerulecache.hh"
 
 #include "dune/fufem/assemblers/localoperatorassembler.hh"
 #include "dune/fufem/staticmatrixtools.hh"
diff --git a/dune/fufem/assemblers/localassemblers/geononlinstvenantfunctionalassembler.hh b/dune/fufem/assemblers/localassemblers/geononlinstvenantfunctionalassembler.hh
index d7f7bf1b..476b0ef6 100644
--- a/dune/fufem/assemblers/localassemblers/geononlinstvenantfunctionalassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/geononlinstvenantfunctionalassembler.hh
@@ -4,7 +4,7 @@
 #include <dune/common/fvector.hh>
 #include <dune/istl/bvector.hh>
 
-#include <dune/fufem/functiontools/quadraturerulecache.hh>
+#include <dune/fufem/quadraturerules/quadraturerulecache.hh>
 #include "dune/fufem/assemblers/localfunctionalassembler.hh"
 #include <dune/fufem/symmetrictensor.hh>
 #include <dune/fufem/functions/virtualgridfunction.hh>
diff --git a/dune/fufem/assemblers/localassemblers/h1functionalassembler.hh b/dune/fufem/assemblers/localassemblers/h1functionalassembler.hh
index 4d136b98..db8c2999 100644
--- a/dune/fufem/assemblers/localassemblers/h1functionalassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/h1functionalassembler.hh
@@ -7,7 +7,7 @@
 #include <dune/istl/bvector.hh>
 
 
-#include <dune/fufem/functiontools/quadraturerulecache.hh>
+#include <dune/fufem/quadraturerules/quadraturerulecache.hh>
 #include <dune/fufem/functions/virtualgridfunction.hh>
 
 #include <dune/fufem/assemblers/localfunctionalassembler.hh>
diff --git a/dune/fufem/assemblers/localassemblers/l2functionalassembler.hh b/dune/fufem/assemblers/localassemblers/l2functionalassembler.hh
index facca577..6c63212b 100644
--- a/dune/fufem/assemblers/localassemblers/l2functionalassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/l2functionalassembler.hh
@@ -6,7 +6,7 @@
 #include <dune/common/function.hh>
 #include <dune/istl/bvector.hh>
 
-#include <dune/fufem/functiontools/quadraturerulecache.hh>
+#include <dune/fufem/quadraturerules/quadraturerulecache.hh>
 #include <dune/fufem/functions/virtualgridfunction.hh>
 
 #include "dune/fufem/assemblers/localfunctionalassembler.hh"
diff --git a/dune/fufem/assemblers/localassemblers/laplaceassembler.hh b/dune/fufem/assemblers/localassemblers/laplaceassembler.hh
index 976519ac..1a0b15b8 100644
--- a/dune/fufem/assemblers/localassemblers/laplaceassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/laplaceassembler.hh
@@ -8,7 +8,7 @@
 #include <dune/istl/matrix.hh>
 
 #include "dune/fufem/staticmatrixtools.hh"
-#include "dune/fufem/functiontools/quadraturerulecache.hh"
+#include "dune/fufem/quadraturerules/quadraturerulecache.hh"
 
 #include "dune/fufem/assemblers/localoperatorassembler.hh"
 
diff --git a/dune/fufem/assemblers/localassemblers/lumpedmassassembler.hh b/dune/fufem/assemblers/localassemblers/lumpedmassassembler.hh
index 8cc532a5..2b0c8261 100644
--- a/dune/fufem/assemblers/localassemblers/lumpedmassassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/lumpedmassassembler.hh
@@ -8,7 +8,7 @@
 #include <dune/istl/matrix.hh>
 
 #include "dune/fufem/staticmatrixtools.hh"
-#include "dune/fufem/functiontools/quadraturerulecache.hh"
+#include "dune/fufem/quadraturerules/quadraturerulecache.hh"
 
 #include "dune/fufem/assemblers/localoperatorassembler.hh"
 
diff --git a/dune/fufem/assemblers/localassemblers/massassembler.hh b/dune/fufem/assemblers/localassemblers/massassembler.hh
index 35bb8ea0..1cb1b20c 100644
--- a/dune/fufem/assemblers/localassemblers/massassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/massassembler.hh
@@ -8,7 +8,7 @@
 #include <dune/istl/matrix.hh>
 
 #include "dune/fufem/staticmatrixtools.hh"
-#include "dune/fufem/functiontools/quadraturerulecache.hh"
+#include "dune/fufem/quadraturerules/quadraturerulecache.hh"
 
 #include "dune/fufem/assemblers/localoperatorassembler.hh"
 
diff --git a/dune/fufem/assemblers/localassemblers/neumannboundaryassembler.hh b/dune/fufem/assemblers/localassemblers/neumannboundaryassembler.hh
index 643ee0af..a42d6115 100644
--- a/dune/fufem/assemblers/localassemblers/neumannboundaryassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/neumannboundaryassembler.hh
@@ -8,7 +8,7 @@
 #include <dune/common/fvector.hh>
 #include <dune/istl/bvector.hh>
 
-#include <dune/fufem/functiontools/quadraturerulecache.hh>
+#include <dune/fufem/quadraturerules/quadraturerulecache.hh>
 #include <dune/fufem/functions/virtualgridfunction.hh>
 
 #include <dune/fufem/assemblers/localboundaryassembler.hh>
diff --git a/dune/fufem/assemblers/localassemblers/normalstressboundaryassembler.hh b/dune/fufem/assemblers/localassemblers/normalstressboundaryassembler.hh
index 7a73d82a..9137d520 100644
--- a/dune/fufem/assemblers/localassemblers/normalstressboundaryassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/normalstressboundaryassembler.hh
@@ -8,7 +8,7 @@
 #include "dune/fufem/assemblers/localboundaryassembler.hh"
 #include <dune/fufem/symmetrictensor.hh>
 #include <dune/fufem/functions/virtualgridfunction.hh>
-#include "dune/fufem/functiontools/quadraturerulecache.hh"
+#include "dune/fufem/quadraturerules/quadraturerulecache.hh"
 
 /** \brief Computes the normal stress of a linear elastic material as P0 data.  
  *
diff --git a/dune/fufem/assemblers/localassemblers/stvenantkirchhoffassembler.hh b/dune/fufem/assemblers/localassemblers/stvenantkirchhoffassembler.hh
index 3eead33b..819f2857 100644
--- a/dune/fufem/assemblers/localassemblers/stvenantkirchhoffassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/stvenantkirchhoffassembler.hh
@@ -7,7 +7,7 @@
 
 #include <dune/istl/matrix.hh>
 
-#include "dune/fufem/functiontools/quadraturerulecache.hh"
+#include "dune/fufem/quadraturerules/quadraturerulecache.hh"
 
 #include "dune/fufem/assemblers/localoperatorassembler.hh"
 #include "dune/fufem/staticmatrixtools.hh"
diff --git a/dune/fufem/assemblers/localassemblers/subgridh1functionalassembler.hh b/dune/fufem/assemblers/localassemblers/subgridh1functionalassembler.hh
index c8b29259..ca6bf5c1 100644
--- a/dune/fufem/assemblers/localassemblers/subgridh1functionalassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/subgridh1functionalassembler.hh
@@ -9,7 +9,7 @@
 #include <dune/fufem/functions/virtualgridfunction.hh>
 #include <dune/fufem/functions/virtualdifferentiablefunction.hh>
 #include <dune/fufem/functions/basisgridfunction.hh>
-#include "dune/fufem/functiontools/quadraturerulecache.hh"
+#include "dune/fufem/quadraturerules/quadraturerulecache.hh"
 #include "dune/fufem/functionspacebases/refinedp1nodalbasis.hh"
 
 
diff --git a/dune/fufem/assemblers/localassemblers/subgridl2functionalassembler.hh b/dune/fufem/assemblers/localassemblers/subgridl2functionalassembler.hh
index 8732b249..2450ef9e 100644
--- a/dune/fufem/assemblers/localassemblers/subgridl2functionalassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/subgridl2functionalassembler.hh
@@ -7,7 +7,7 @@
 #include <dune/istl/bvector.hh>
 
 #include <dune/fufem/functions/virtualgridfunction.hh>
-#include "dune/fufem/functiontools/quadraturerulecache.hh"
+#include "dune/fufem/quadraturerules/quadraturerulecache.hh"
 #include <dune/fufem/functions/basisgridfunction.hh>
 #include "dune/fufem/functionspacebases/refinedp1nodalbasis.hh"
 
diff --git a/dune/fufem/assemblers/localassemblers/viscosityassembler.hh b/dune/fufem/assemblers/localassemblers/viscosityassembler.hh
index c32e04be..aceef22b 100644
--- a/dune/fufem/assemblers/localassemblers/viscosityassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/viscosityassembler.hh
@@ -7,7 +7,7 @@
 
 #include <dune/istl/matrix.hh>
 
-#include "dune/fufem/functiontools/quadraturerulecache.hh"
+#include "dune/fufem/quadraturerules/quadraturerulecache.hh"
 
 #include "dune/fufem/assemblers/localoperatorassembler.hh"
 #include "dune/fufem/staticmatrixtools.hh"
diff --git a/dune/fufem/assemblers/localassemblers/vvlaplaceassembler.hh b/dune/fufem/assemblers/localassemblers/vvlaplaceassembler.hh
index c2a56a6e..cf70150f 100644
--- a/dune/fufem/assemblers/localassemblers/vvlaplaceassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/vvlaplaceassembler.hh
@@ -8,7 +8,7 @@
 #include <dune/istl/matrix.hh>
 
 #include "dune/fufem/staticmatrixtools.hh"
-#include "dune/fufem/functiontools/quadraturerulecache.hh"
+#include "dune/fufem/quadraturerules/quadraturerulecache.hh"
 
 #include "dune/fufem/assemblers/localoperatorassembler.hh"
 
diff --git a/dune/fufem/discretizationerror.hh b/dune/fufem/discretizationerror.hh
index 5137622e..b2bd1e5f 100644
--- a/dune/fufem/discretizationerror.hh
+++ b/dune/fufem/discretizationerror.hh
@@ -6,7 +6,7 @@
 #include <dune/geometry/quadraturerules.hh>
 
 #include <dune/fufem/functions/virtualgridfunction.hh>
-#include <dune/fufem/functiontools/quadraturerulecache.hh>
+#include <dune/fufem/quadraturerules/quadraturerulecache.hh>
 
 template <class GridView>
 class DiscretizationError
diff --git a/dune/fufem/functiontools/functionintegrator.hh b/dune/fufem/functiontools/functionintegrator.hh
index 7a3e41da..caff40a5 100644
--- a/dune/fufem/functiontools/functionintegrator.hh
+++ b/dune/fufem/functiontools/functionintegrator.hh
@@ -5,7 +5,7 @@
 
 #include <dune/geometry/quadraturerules.hh>
 
-#include <dune/fufem/functiontools/quadraturerulecache.hh>
+#include <dune/fufem/quadraturerules/quadraturerulecache.hh>
 #include <dune/fufem/functions/virtualgridfunction.hh>
 #include <dune/fufem/functions/basisgridfunction.hh>
 
diff --git a/dune/fufem/mechanics/newpfeassembler.hh b/dune/fufem/mechanics/newpfeassembler.hh
index c3365105..8d7cb8d9 100644
--- a/dune/fufem/mechanics/newpfeassembler.hh
+++ b/dune/fufem/mechanics/newpfeassembler.hh
@@ -7,7 +7,7 @@
 
 #include <dune/istl/matrix.hh>
 
-#include <dune/fufem/functiontools/quadraturerulecache.hh>
+#include <dune/fufem/quadraturerules/quadraturerulecache.hh>
 
 #include <dune/fufem/assemblers/localoperatorassembler.hh>
 #include <dune/fufem/staticmatrixtools.hh>
diff --git a/dune/fufem/neumannassembler.hh b/dune/fufem/neumannassembler.hh
index 6c46456b..3cb81803 100644
--- a/dune/fufem/neumannassembler.hh
+++ b/dune/fufem/neumannassembler.hh
@@ -17,7 +17,7 @@
 
 #include <dune/fufem/boundarypatch.hh>
 #include <dune/fufem/functionspacebases/p1nodalbasis.hh>
-#include "dune/fufem/functiontools/quadraturerulecache.hh"
+#include "dune/fufem/quadraturerules/quadraturerulecache.hh"
 
 template <class GridView, class VectorType>
 void assembleAndAddNeumannTerm(const BoundaryPatch<GridView>& neumannBoundary,
diff --git a/dune/fufem/quadraturerules/quadraturerulecache.hh b/dune/fufem/quadraturerules/quadraturerulecache.hh
index 61ccb1a6..f29cd580 100644
--- a/dune/fufem/quadraturerules/quadraturerulecache.hh
+++ b/dune/fufem/quadraturerules/quadraturerulecache.hh
@@ -9,10 +9,10 @@
 
 #include <dune/geometry/quadraturerules.hh>
 
-#include <dune/fufem/functiontools/refinedquadraturerule.hh>
-#include <dune/fufem/functiontools/compositequadraturerule.hh>
-#include <dune/fufem/refinedfehelper.hh>
+#include <dune/fufem/quadraturerules/refinedquadraturerule.hh>
+#include <dune/fufem/quadraturerules/compositequadraturerule.hh>
 #include <dune/fufem/quadraturerules/lumpingquadraturerule.hh>
+#include <dune/fufem/refinedfehelper.hh>
 
 
 
diff --git a/dune/fufem/quadraturerules/refinedquadraturerule.hh b/dune/fufem/quadraturerules/refinedquadraturerule.hh
index 07d6cd55..f9f99286 100644
--- a/dune/fufem/quadraturerules/refinedquadraturerule.hh
+++ b/dune/fufem/quadraturerules/refinedquadraturerule.hh
@@ -9,7 +9,7 @@
  */
 
 #include <dune/common/fmatrix.hh>
-#include <dune/fufem/functiontools/compositequadraturerule.hh>
+#include <dune/fufem/quadraturerules/compositequadraturerule.hh>
 
 
 template <class ct, int dim>
-- 
GitLab