From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Mon, 3 Jul 2023 03:52:43 +0000 (-0600)
Subject: Standardize on 'template <typename X>.
X-Git-Tag: relicensing~771^2~2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d1757a271c2cea9a9bc3b23ece376272fcb168f;p=dealii.git

Standardize on 'template <typename X>.
---

diff --git a/include/deal.II/algorithms/any_data.h b/include/deal.II/algorithms/any_data.h
index d9c1ed57bb..fafba5b08d 100644
--- a/include/deal.II/algorithms/any_data.h
+++ b/include/deal.II/algorithms/any_data.h
@@ -186,7 +186,7 @@ public:
   is_type(const unsigned int i) const;
 
   /// List the contents to a stream
-  template <class StreamType>
+  template <typename StreamType>
   void
   list(StreamType &os) const;
 
@@ -448,7 +448,7 @@ AnyData::merge(const AnyData &other)
 }
 
 
-template <class StreamType>
+template <typename StreamType>
 inline void
 AnyData::list(StreamType &os) const
 {
diff --git a/include/deal.II/base/exceptions.h b/include/deal.II/base/exceptions.h
index 1ed204414e..b165b755a0 100644
--- a/include/deal.II/base/exceptions.h
+++ b/include/deal.II/base/exceptions.h
@@ -1421,7 +1421,7 @@ namespace deal_II_exceptions
      *
      * @ref ExceptionBase
      */
-    template <class ExceptionType>
+    template <typename ExceptionType>
     [[noreturn]] void
     issue_error_noreturn(ExceptionHandling handling,
                          const char *      file,
@@ -1471,7 +1471,7 @@ namespace deal_II_exceptions
      * @note This function is defined with a template for the same reasons as
      * issue_error_noreturn().
      */
-    template <class ExceptionType>
+    template <typename ExceptionType>
     void
     issue_error_nothrow(const char *  file,
                         int           line,
diff --git a/include/deal.II/base/index_set.h b/include/deal.II/base/index_set.h
index c9abbddc7a..647ce8810c 100644
--- a/include/deal.II/base/index_set.h
+++ b/include/deal.II/base/index_set.h
@@ -448,7 +448,7 @@ public:
    * Output a text representation of this IndexSet to the given stream. Used
    * for testing.
    */
-  template <class StreamType>
+  template <typename StreamType>
   void
   print(StreamType &out) const;
 
@@ -1960,7 +1960,7 @@ IndexSet::fill_binary_vector(Vector &vector) const
 
 
 
-template <class StreamType>
+template <typename StreamType>
 inline void
 IndexSet::print(StreamType &out) const
 {
diff --git a/include/deal.II/base/linear_index_iterator.h b/include/deal.II/base/linear_index_iterator.h
index ca71446db0..b3c1b2dcc7 100644
--- a/include/deal.II/base/linear_index_iterator.h
+++ b/include/deal.II/base/linear_index_iterator.h
@@ -135,7 +135,7 @@ DEAL_II_NAMESPACE_OPEN
  *
  * @note TransposeTable uses this template to implement its iterators.
  */
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 class LinearIndexIterator
 {
 public:
@@ -332,7 +332,7 @@ protected:
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline DerivedIterator &
 LinearIndexIterator<DerivedIterator, AccessorType>::operator=(
   const DerivedIterator &it)
@@ -344,7 +344,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator=(
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline DerivedIterator &
 LinearIndexIterator<DerivedIterator, AccessorType>::operator++()
 {
@@ -353,7 +353,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator++()
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline DerivedIterator
 LinearIndexIterator<DerivedIterator, AccessorType>::operator++(int)
 {
@@ -364,7 +364,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator++(int)
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline DerivedIterator &
 LinearIndexIterator<DerivedIterator, AccessorType>::operator--()
 {
@@ -373,7 +373,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator--()
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline DerivedIterator
 LinearIndexIterator<DerivedIterator, AccessorType>::operator--(int)
 {
@@ -384,7 +384,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator--(int)
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline DerivedIterator
 LinearIndexIterator<DerivedIterator, AccessorType>::operator+(
   const difference_type n) const
@@ -396,7 +396,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator+(
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline DerivedIterator
 LinearIndexIterator<DerivedIterator, AccessorType>::operator-(
   const difference_type n) const
@@ -408,7 +408,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator-(
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline DerivedIterator &
 LinearIndexIterator<DerivedIterator, AccessorType>::operator+=(
   const difference_type n)
@@ -419,7 +419,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator+=(
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline DerivedIterator &
 LinearIndexIterator<DerivedIterator, AccessorType>::operator-=(
   const difference_type n)
@@ -429,7 +429,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator-=(
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline
   typename LinearIndexIterator<DerivedIterator, AccessorType>::difference_type
   LinearIndexIterator<DerivedIterator, AccessorType>::operator-(
@@ -443,7 +443,7 @@ inline
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline typename LinearIndexIterator<DerivedIterator, AccessorType>::reference
 LinearIndexIterator<DerivedIterator, AccessorType>::operator*() const
 {
@@ -452,7 +452,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator*() const
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline typename LinearIndexIterator<DerivedIterator, AccessorType>::pointer
 LinearIndexIterator<DerivedIterator, AccessorType>::operator->() const
 {
@@ -461,7 +461,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator->() const
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline bool
 LinearIndexIterator<DerivedIterator, AccessorType>::operator<=(
   const DerivedIterator &other) const
@@ -471,7 +471,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator<=(
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline bool
 LinearIndexIterator<DerivedIterator, AccessorType>::operator>=(
   const DerivedIterator &other) const
@@ -481,7 +481,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator>=(
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline bool
 LinearIndexIterator<DerivedIterator, AccessorType>::operator<(
   const DerivedIterator &other) const
@@ -494,7 +494,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator<(
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline bool
 LinearIndexIterator<DerivedIterator, AccessorType>::operator>(
   const DerivedIterator &other) const
@@ -504,7 +504,7 @@ LinearIndexIterator<DerivedIterator, AccessorType>::operator>(
 
 
 
-template <class DerivedIterator, class AccessorType>
+template <typename DerivedIterator, typename AccessorType>
 inline LinearIndexIterator<DerivedIterator, AccessorType>::LinearIndexIterator(
   const AccessorType accessor)
   : accessor(accessor)
diff --git a/include/deal.II/base/mutable_bind.h b/include/deal.II/base/mutable_bind.h
index 7f153af4ca..1c73050dcb 100644
--- a/include/deal.II/base/mutable_bind.h
+++ b/include/deal.II/base/mutable_bind.h
@@ -93,21 +93,21 @@ namespace Utilities
      * Construct a MutableBind object specifying the function, and
      * each arguments separately.
      */
-    template <class FunctionType>
+    template <typename FunctionType>
     MutableBind(FunctionType function, FunctionArgs &&...arguments);
 
     /**
      * Construct a MutableBind object specifying the function, and
      * the arguments as a tuple.
      */
-    template <class FunctionType>
+    template <typename FunctionType>
     MutableBind(FunctionType function, TupleType &&arguments);
 
     /**
      * Construct a MutableBind object specifying only the function. By default,
      * the arguments are left to their default constructor values.
      */
-    template <class FunctionType>
+    template <typename FunctionType>
     MutableBind(FunctionType function);
 
     /**
@@ -221,7 +221,7 @@ namespace Utilities
 
 #ifndef DOXYGEN
   template <typename ReturnType, class... FunctionArgs>
-  template <class FunctionType>
+  template <typename FunctionType>
   MutableBind<ReturnType, FunctionArgs...>::MutableBind(
     FunctionType function,
     FunctionArgs &&...arguments)
@@ -232,7 +232,7 @@ namespace Utilities
 
 
   template <typename ReturnType, class... FunctionArgs>
-  template <class FunctionType>
+  template <typename FunctionType>
   MutableBind<ReturnType, FunctionArgs...>::MutableBind(FunctionType function,
                                                         TupleType && arguments)
     : function(function)
@@ -242,7 +242,7 @@ namespace Utilities
 
 
   template <typename ReturnType, class... FunctionArgs>
-  template <class FunctionType>
+  template <typename FunctionType>
   MutableBind<ReturnType, FunctionArgs...>::MutableBind(FunctionType function)
     : function(function)
   {}
diff --git a/include/deal.II/base/parameter_acceptor.h b/include/deal.II/base/parameter_acceptor.h
index 0c88ef62db..2898f0ea05 100644
--- a/include/deal.II/base/parameter_acceptor.h
+++ b/include/deal.II/base/parameter_acceptor.h
@@ -520,7 +520,7 @@ public:
    * See the documentation of ParameterHandler::add_parameter() for more
    * information.
    */
-  template <class ParameterType>
+  template <typename ParameterType>
   void
   add_parameter(const std::string &          entry,
                 ParameterType &              parameter,
@@ -724,7 +724,7 @@ public:
 
 
 // Inline and template functions
-template <class ParameterType>
+template <typename ParameterType>
 void
 ParameterAcceptor::add_parameter(const std::string &          entry,
                                  ParameterType &              parameter,
diff --git a/include/deal.II/base/parameter_handler.h b/include/deal.II/base/parameter_handler.h
index 3fd37b9211..fa4cf1c05b 100644
--- a/include/deal.II/base/parameter_handler.h
+++ b/include/deal.II/base/parameter_handler.h
@@ -1195,7 +1195,7 @@ public:
    * successfully can be queried by the functions get_entries_wrongly_not_set()
    * and assert_that_entries_have_been_set().
    */
-  template <class ParameterType>
+  template <typename ParameterType>
   void
   add_parameter(const std::string &          entry,
                 ParameterType &              parameter,
@@ -2331,7 +2331,7 @@ ParameterHandler::load(Archive &ar, const unsigned int)
 }
 
 
-template <class ParameterType>
+template <typename ParameterType>
 void
 ParameterHandler::add_parameter(const std::string &          entry,
                                 ParameterType &              parameter,
diff --git a/include/deal.II/base/path_search.h b/include/deal.II/base/path_search.h
index cfd25c7137..82fae2c051 100644
--- a/include/deal.II/base/path_search.h
+++ b/include/deal.II/base/path_search.h
@@ -149,7 +149,7 @@ public:
   /**
    * Show the paths and suffixes used for this object.
    */
-  template <class StreamType>
+  template <typename StreamType>
   void
   show(StreamType &stream) const;
 
@@ -258,7 +258,7 @@ private:
 /* ----------------------------- inline functions ------------------------- */
 
 
-template <class StreamType>
+template <typename StreamType>
 inline void
 PathSearch::show(StreamType &out) const
 {
diff --git a/include/deal.II/base/patterns.h b/include/deal.II/base/patterns.h
index 779a4aa551..01a762a2e5 100644
--- a/include/deal.II/base/patterns.h
+++ b/include/deal.II/base/patterns.h
@@ -1904,7 +1904,7 @@ namespace Patterns
     };
 
     // std::array
-    template <class ValueType, std::size_t N>
+    template <typename ValueType, std::size_t N>
     struct Convert<std::array<ValueType, N>>
     {
       using T = std::array<ValueType, N>;
diff --git a/include/deal.II/base/polynomial_space.h b/include/deal.II/base/polynomial_space.h
index 9cc21c8d84..279626fc3f 100644
--- a/include/deal.II/base/polynomial_space.h
+++ b/include/deal.II/base/polynomial_space.h
@@ -117,7 +117,7 @@ public:
   /**
    * Prints the list of the indices to <tt>out</tt>.
    */
-  template <class StreamType>
+  template <typename StreamType>
   void
   output_indices(StreamType &out) const;
 
@@ -313,7 +313,7 @@ PolynomialSpace<dim>::name() const
 
 
 template <int dim>
-template <class StreamType>
+template <typename StreamType>
 void
 PolynomialSpace<dim>::output_indices(StreamType &out) const
 {
diff --git a/include/deal.II/base/template_constraints.h b/include/deal.II/base/template_constraints.h
index d298064240..3e4f502502 100644
--- a/include/deal.II/base/template_constraints.h
+++ b/include/deal.II/base/template_constraints.h
@@ -235,7 +235,7 @@ struct is_base_of_all
  * parameter pack are equal to the `Type` given as first template
  * argument. The result is stored in the member variable `value`.
  */
-template <class Type, class... Types>
+template <typename Type, class... Types>
 struct all_same_as
 {
   static constexpr bool value = internal::TemplateConstraints::all_true<
@@ -250,7 +250,7 @@ struct all_same_as
  * parameter pack are equal to the `Type` given as first template
  * argument. The result is stored in the member variable `value`.
  */
-template <class Type, class... Types>
+template <typename Type, class... Types>
 struct is_same_as_any_of
 {
   static constexpr bool value = internal::TemplateConstraints::any_true<
diff --git a/include/deal.II/base/timer.h b/include/deal.II/base/timer.h
index d99e825cad..9d0966323a 100644
--- a/include/deal.II/base/timer.h
+++ b/include/deal.II/base/timer.h
@@ -160,7 +160,7 @@ public:
    * Print the data returned by Timer::get_last_lap_wall_time_data() to the
    * given stream.
    */
-  template <class StreamType>
+  template <typename StreamType>
   void
   print_last_lap_wall_time_data(StreamType &stream) const;
 
@@ -168,7 +168,7 @@ public:
    * Print the data returned by Timer::get_accumulated_wall_time_data() to the
    * given stream.
    */
-  template <class StreamType>
+  template <typename StreamType>
   void
   print_accumulated_wall_time_data(StreamType &stream) const;
 
@@ -918,7 +918,7 @@ Timer::get_accumulated_wall_time_data() const
 
 
 
-template <class StreamType>
+template <typename StreamType>
 inline void
 Timer::print_last_lap_wall_time_data(StreamType &stream) const
 {
@@ -930,7 +930,7 @@ Timer::print_last_lap_wall_time_data(StreamType &stream) const
 
 
 
-template <class StreamType>
+template <typename StreamType>
 inline void
 Timer::print_accumulated_wall_time_data(StreamType &stream) const
 {
diff --git a/include/deal.II/differentiation/sd/symengine_optimizer.h b/include/deal.II/differentiation/sd/symengine_optimizer.h
index 8bd56698d9..e9caa8b832 100644
--- a/include/deal.II/differentiation/sd/symengine_optimizer.h
+++ b/include/deal.II/differentiation/sd/symengine_optimizer.h
@@ -116,7 +116,7 @@ namespace Differentiation
     /**
      * Output operator that outputs the selected optimizer type.
      */
-    template <class StreamType>
+    template <typename StreamType>
     inline StreamType &
     operator<<(StreamType &s, OptimizerType o)
     {
@@ -268,7 +268,7 @@ namespace Differentiation
      * Output operator that outputs optimization flags as a set of or'd
      * text values.
      */
-    template <class StreamType>
+    template <typename StreamType>
     inline StreamType &
     operator<<(StreamType &s, OptimizationFlags o)
     {
diff --git a/include/deal.II/dofs/dof_tools.h b/include/deal.II/dofs/dof_tools.h
index e36b7043a7..fb0397d8db 100644
--- a/include/deal.II/dofs/dof_tools.h
+++ b/include/deal.II/dofs/dof_tools.h
@@ -52,7 +52,7 @@ namespace hp
   template <int dim, int spacedim>
   class FECollection;
 } // namespace hp
-template <class MeshType>
+template <typename MeshType>
 DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
 class InterGridMap;
 template <int dim, int spacedim>
diff --git a/include/deal.II/fe/fe_dg_vector.h b/include/deal.II/fe/fe_dg_vector.h
index 9ba197011c..d10d5774f2 100644
--- a/include/deal.II/fe/fe_dg_vector.h
+++ b/include/deal.II/fe/fe_dg_vector.h
@@ -49,7 +49,7 @@ DEAL_II_NAMESPACE_OPEN
  *
  * @ingroup febase
  */
-template <class PolynomialType, int dim, int spacedim = dim>
+template <typename PolynomialType, int dim, int spacedim = dim>
 class FE_DGVector : public FE_PolyTensor<dim, spacedim>
 {
 public:
diff --git a/include/deal.II/fe/fe_dg_vector.templates.h b/include/deal.II/fe/fe_dg_vector.templates.h
index 36d7a5c4cc..ac179c2965 100644
--- a/include/deal.II/fe/fe_dg_vector.templates.h
+++ b/include/deal.II/fe/fe_dg_vector.templates.h
@@ -32,7 +32,7 @@ DEAL_II_NAMESPACE_OPEN
 // TODO:[GK] deg+1 is wrong here and should be fixed after FiniteElementData was
 // cleaned up
 
-template <class PolynomialType, int dim, int spacedim>
+template <typename PolynomialType, int dim, int spacedim>
 FE_DGVector<PolynomialType, dim, spacedim>::FE_DGVector(const unsigned int deg,
                                                         MappingKind        map)
   : FE_PolyTensor<dim, spacedim>(
@@ -57,7 +57,7 @@ FE_DGVector<PolynomialType, dim, spacedim>::FE_DGVector(const unsigned int deg,
 }
 
 
-template <class PolynomialType, int dim, int spacedim>
+template <typename PolynomialType, int dim, int spacedim>
 std::unique_ptr<FiniteElement<dim, spacedim>>
 FE_DGVector<PolynomialType, dim, spacedim>::clone() const
 {
@@ -65,7 +65,7 @@ FE_DGVector<PolynomialType, dim, spacedim>::clone() const
 }
 
 
-template <class PolynomialType, int dim, int spacedim>
+template <typename PolynomialType, int dim, int spacedim>
 std::string
 FE_DGVector<PolynomialType, dim, spacedim>::get_name() const
 {
@@ -76,7 +76,7 @@ FE_DGVector<PolynomialType, dim, spacedim>::get_name() const
 }
 
 
-template <class PolynomialType, int dim, int spacedim>
+template <typename PolynomialType, int dim, int spacedim>
 std::vector<unsigned int>
 FE_DGVector<PolynomialType, dim, spacedim>::get_dpo_vector(
   const unsigned int deg)
@@ -88,7 +88,7 @@ FE_DGVector<PolynomialType, dim, spacedim>::get_dpo_vector(
 }
 
 
-template <class PolynomialType, int dim, int spacedim>
+template <typename PolynomialType, int dim, int spacedim>
 bool
 FE_DGVector<PolynomialType, dim, spacedim>::has_support_on_face(
   const unsigned int,
@@ -98,7 +98,7 @@ FE_DGVector<PolynomialType, dim, spacedim>::has_support_on_face(
 }
 
 
-template <class PolynomialType, int dim, int spacedim>
+template <typename PolynomialType, int dim, int spacedim>
 std::size_t
 FE_DGVector<PolynomialType, dim, spacedim>::memory_consumption() const
 {
diff --git a/include/deal.II/fe/fe_interface_values.h b/include/deal.II/fe/fe_interface_values.h
index dc6684e229..7a46e44f13 100644
--- a/include/deal.II/fe/fe_interface_values.h
+++ b/include/deal.II/fe/fe_interface_values.h
@@ -1443,7 +1443,7 @@ public:
    *   is initialized with an hp::FECollection, an hp::QCollection, and possibly
    *   an hp::MappingCollection).
    */
-  template <class CellIteratorType, class CellNeighborIteratorType>
+  template <typename CellIteratorType, typename CellNeighborIteratorType>
   void
   reinit(const CellIteratorType &        cell,
          const unsigned int              face_no,
@@ -1481,7 +1481,7 @@ public:
    * is initialized with an hp::FECollection, an hp::QCollection, and possibly
    * an hp::MappingCollection).
    */
-  template <class CellIteratorType>
+  template <typename CellIteratorType>
   void
   reinit(const CellIteratorType &cell,
          const unsigned int      face_no,
@@ -2308,7 +2308,7 @@ FEInterfaceValues<dim, spacedim>::FEInterfaceValues(
 
 
 template <int dim, int spacedim>
-template <class CellIteratorType, class CellNeighborIteratorType>
+template <typename CellIteratorType, typename CellNeighborIteratorType>
 void
 FEInterfaceValues<dim, spacedim>::reinit(
   const CellIteratorType &        cell,
@@ -2510,7 +2510,7 @@ FEInterfaceValues<dim, spacedim>::reinit(
 
 
 template <int dim, int spacedim>
-template <class CellIteratorType>
+template <typename CellIteratorType>
 void
 FEInterfaceValues<dim, spacedim>::reinit(const CellIteratorType &cell,
                                          const unsigned int      face_no,
diff --git a/include/deal.II/fe/fe_poly_face.h b/include/deal.II/fe/fe_poly_face.h
index ac4d04ff1f..a74603ba35 100644
--- a/include/deal.II/fe/fe_poly_face.h
+++ b/include/deal.II/fe/fe_poly_face.h
@@ -55,7 +55,7 @@ DEAL_II_NAMESPACE_OPEN
  * which cannot be implemented by this class but are left for implementation
  * in derived classes.
  */
-template <class PolynomialType,
+template <typename PolynomialType,
           int dim      = PolynomialType::dimension + 1,
           int spacedim = dim>
 class FE_PolyFace : public FiniteElement<dim, spacedim>
diff --git a/include/deal.II/fe/fe_poly_face.templates.h b/include/deal.II/fe/fe_poly_face.templates.h
index a6cd58f387..7f3aba00ba 100644
--- a/include/deal.II/fe/fe_poly_face.templates.h
+++ b/include/deal.II/fe/fe_poly_face.templates.h
@@ -28,7 +28,7 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-template <class PolynomialType, int dim, int spacedim>
+template <typename PolynomialType, int dim, int spacedim>
 FE_PolyFace<PolynomialType, dim, spacedim>::FE_PolyFace(
   const PolynomialType &        poly_space,
   const FiniteElementData<dim> &fe_data,
@@ -43,7 +43,7 @@ FE_PolyFace<PolynomialType, dim, spacedim>::FE_PolyFace(
 }
 
 
-template <class PolynomialType, int dim, int spacedim>
+template <typename PolynomialType, int dim, int spacedim>
 unsigned int
 FE_PolyFace<PolynomialType, dim, spacedim>::get_degree() const
 {
@@ -56,7 +56,7 @@ FE_PolyFace<PolynomialType, dim, spacedim>::get_degree() const
 //---------------------------------------------------------------------------
 
 
-template <class PolynomialType, int dim, int spacedim>
+template <typename PolynomialType, int dim, int spacedim>
 UpdateFlags
 FE_PolyFace<PolynomialType, dim, spacedim>::requires_update_flags(
   const UpdateFlags flags) const
@@ -76,7 +76,7 @@ FE_PolyFace<PolynomialType, dim, spacedim>::requires_update_flags(
 //---------------------------------------------------------------------------
 // Fill data of FEValues
 //---------------------------------------------------------------------------
-template <class PolynomialType, int dim, int spacedim>
+template <typename PolynomialType, int dim, int spacedim>
 void
 FE_PolyFace<PolynomialType, dim, spacedim>::fill_fe_values(
   const typename Triangulation<dim, spacedim>::cell_iterator &,
@@ -105,7 +105,7 @@ FE_PolyFace<PolynomialType, dim, spacedim>::fill_fe_values(
 
 
 
-template <class PolynomialType, int dim, int spacedim>
+template <typename PolynomialType, int dim, int spacedim>
 void
 FE_PolyFace<PolynomialType, dim, spacedim>::fill_fe_face_values(
   const typename Triangulation<dim, spacedim>::cell_iterator &,
@@ -198,7 +198,7 @@ FE_PolyFace<PolynomialType, dim, spacedim>::fill_fe_face_values(
 }
 
 
-template <class PolynomialType, int dim, int spacedim>
+template <typename PolynomialType, int dim, int spacedim>
 void
 FE_PolyFace<PolynomialType, dim, spacedim>::fill_fe_subface_values(
   const typename Triangulation<dim, spacedim>::cell_iterator &,
diff --git a/include/deal.II/fe/fe_update_flags.h b/include/deal.II/fe/fe_update_flags.h
index 6e2a7d42ae..f8e1028884 100644
--- a/include/deal.II/fe/fe_update_flags.h
+++ b/include/deal.II/fe/fe_update_flags.h
@@ -241,7 +241,7 @@ enum UpdateFlags
  *
  * @ref UpdateFlags
  */
-template <class StreamType>
+template <typename StreamType>
 inline StreamType &
 operator<<(StreamType &s, const UpdateFlags u)
 {
diff --git a/include/deal.II/fe/fe_values.h b/include/deal.II/fe/fe_values.h
index 6c179a2188..369b235ca3 100644
--- a/include/deal.II/fe/fe_values.h
+++ b/include/deal.II/fe/fe_values.h
@@ -69,7 +69,7 @@ namespace internal
    * A class whose specialization is used to define what type the curl of a
    * vector valued function corresponds to.
    */
-  template <int dim, class NumberType = double>
+  template <int dim, typename NumberType = double>
   struct CurlType;
 
   /**
@@ -78,7 +78,7 @@ namespace internal
    *
    * In 1d, the curl is a scalar.
    */
-  template <class NumberType>
+  template <typename NumberType>
   struct CurlType<1, NumberType>
   {
     using type = Tensor<1, 1, NumberType>;
@@ -90,7 +90,7 @@ namespace internal
    *
    * In 2d, the curl is a scalar.
    */
-  template <class NumberType>
+  template <typename NumberType>
   struct CurlType<2, NumberType>
   {
     using type = Tensor<1, 1, NumberType>;
@@ -102,7 +102,7 @@ namespace internal
    *
    * In 3d, the curl is a vector.
    */
-  template <class NumberType>
+  template <typename NumberType>
   struct CurlType<3, NumberType>
   {
     using type = Tensor<1, 3, NumberType>;
diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h
index cbfa05a523..7dc37934ba 100644
--- a/include/deal.II/grid/grid_tools.h
+++ b/include/deal.II/grid/grid_tools.h
@@ -99,7 +99,7 @@ namespace GridTools
 
 namespace internal
 {
-  template <int dim, int spacedim, class MeshType>
+  template <int dim, int spacedim, typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   class ActiveCellIterator
   {
@@ -1572,7 +1572,7 @@ namespace GridTools
    * @dealiiConceptRequires{
    *   concepts::is_triangulation_or_dof_handler<MeshType>}
    */
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES((concepts::is_triangulation_or_dof_handler<MeshType>))
 #ifndef _MSC_VER
   std::vector<typename MeshType::active_cell_iterator>
@@ -1908,7 +1908,7 @@ namespace GridTools
    *
    * @dealiiConceptRequires{concepts::is_triangulation_or_dof_handler<MeshType>}
    */
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::vector<typename MeshType::active_cell_iterator> get_active_child_cells(
     const typename MeshType::cell_iterator &cell);
@@ -1939,7 +1939,7 @@ namespace GridTools
    *
    * @dealiiConceptRequires{concepts::is_triangulation_or_dof_handler<MeshType>}
    */
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   void get_active_neighbors(
     const typename MeshType::active_cell_iterator &       cell,
@@ -1996,7 +1996,7 @@ namespace GridTools
    *
    * @dealiiConceptRequires{concepts::is_triangulation_or_dof_handler<MeshType>}
    */
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::
     vector<typename MeshType::active_cell_iterator> compute_active_cell_halo_layer(
@@ -2014,7 +2014,7 @@ namespace GridTools
    *
    * @dealiiConceptRequires{concepts::is_triangulation_or_dof_handler<MeshType>}
    */
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::
     vector<typename MeshType::cell_iterator> compute_cell_halo_layer_on_level(
@@ -2038,7 +2038,7 @@ namespace GridTools
    *
    * @dealiiConceptRequires{concepts::is_triangulation_or_dof_handler<MeshType>}
    */
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::vector<
     typename MeshType::
@@ -2094,7 +2094,7 @@ namespace GridTools
    *
    * @dealiiConceptRequires{concepts::is_triangulation_or_dof_handler<MeshType>}
    */
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::
     vector<typename MeshType::active_cell_iterator> compute_active_cell_layer_within_distance(
@@ -2127,7 +2127,7 @@ namespace GridTools
    *
    * @dealiiConceptRequires{concepts::is_triangulation_or_dof_handler<MeshType>}
    */
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::
     vector<typename MeshType::active_cell_iterator> compute_ghost_cell_layer_within_distance(
@@ -2151,7 +2151,7 @@ namespace GridTools
    *
    * @dealiiConceptRequires{concepts::is_triangulation_or_dof_handler<MeshType>}
    */
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::pair<
     Point<MeshType::space_dimension>,
@@ -2234,7 +2234,7 @@ namespace GridTools
    *
    * @dealiiConceptRequires{concepts::is_triangulation_or_dof_handler<MeshType>}
    */
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::
     vector<BoundingBox<MeshType::space_dimension>> compute_mesh_predicate_bounding_box(
@@ -2858,7 +2858,7 @@ namespace GridTools
    *
    * @dealiiConceptRequires{concepts::is_triangulation_or_dof_handler<MeshType>}
    */
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::vector<typename MeshType::active_cell_iterator> get_patch_around_cell(
     const typename MeshType::active_cell_iterator &cell);
@@ -3973,7 +3973,7 @@ namespace GridTools
 
 
 
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::vector<typename MeshType::active_cell_iterator> get_active_child_cells(
     const typename MeshType::cell_iterator &cell)
@@ -4000,7 +4000,7 @@ namespace GridTools
 
 
 
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   void get_active_neighbors(
     const typename MeshType::active_cell_iterator &       cell,
diff --git a/include/deal.II/grid/grid_tools_cache_update_flags.h b/include/deal.II/grid/grid_tools_cache_update_flags.h
index c2f4a5f867..55f85fd711 100644
--- a/include/deal.II/grid/grid_tools_cache_update_flags.h
+++ b/include/deal.II/grid/grid_tools_cache_update_flags.h
@@ -102,7 +102,7 @@ namespace GridTools
    *
    * @ref CacheUpdateFlags
    */
-  template <class StreamType>
+  template <typename StreamType>
   inline StreamType &
   operator<<(StreamType &s, const CacheUpdateFlags u)
   {
diff --git a/include/deal.II/grid/intergrid_map.h b/include/deal.II/grid/intergrid_map.h
index 0b9b0e1421..4dd0d3e215 100644
--- a/include/deal.II/grid/intergrid_map.h
+++ b/include/deal.II/grid/intergrid_map.h
@@ -112,7 +112,7 @@ DEAL_II_NAMESPACE_OPEN
  *
  * @dealiiConceptRequires{concepts::is_triangulation_or_dof_handler<MeshType>}
  */
-template <class MeshType>
+template <typename MeshType>
 DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
 class InterGridMap : public Subscriptor
 {
diff --git a/include/deal.II/grid/tria_iterator.h b/include/deal.II/grid/tria_iterator.h
index 97d7ef1bbb..b63b368577 100644
--- a/include/deal.II/grid/tria_iterator.h
+++ b/include/deal.II/grid/tria_iterator.h
@@ -478,7 +478,7 @@ public:
    * Print the iterator to a stream <code>out</code>. The format is
    * <tt>level.index</tt>.
    */
-  template <class StreamType>
+  template <typename StreamType>
   void
   print(StreamType &out) const;
 
@@ -1118,7 +1118,7 @@ TriaRawIterator<Accessor>::operator--()
 
 
 template <typename Accessor>
-template <class StreamType>
+template <typename StreamType>
 inline void
 TriaRawIterator<Accessor>::print(StreamType &out) const
 {
diff --git a/include/deal.II/hp/fe_values.h b/include/deal.II/hp/fe_values.h
index cfc41b4ee1..5f520d008a 100644
--- a/include/deal.II/hp/fe_values.h
+++ b/include/deal.II/hp/fe_values.h
@@ -64,7 +64,7 @@ namespace hp
    *
    * @ingroup hp
    */
-  template <int dim, int q_dim, class FEValuesType>
+  template <int dim, int q_dim, typename FEValuesType>
   class FEValuesBase : public Subscriptor
   {
   public:
@@ -690,7 +690,7 @@ namespace hp
 
 namespace hp
 {
-  template <int dim, int q_dim, class FEValuesType>
+  template <int dim, int q_dim, typename FEValuesType>
   inline const FEValuesType &
   FEValuesBase<dim, q_dim, FEValuesType>::get_present_fe_values() const
   {
@@ -699,7 +699,7 @@ namespace hp
 
 
 
-  template <int dim, int q_dim, class FEValuesType>
+  template <int dim, int q_dim, typename FEValuesType>
   inline const FECollection<dim, FEValuesType::space_dimension> &
   FEValuesBase<dim, q_dim, FEValuesType>::get_fe_collection() const
   {
@@ -708,7 +708,7 @@ namespace hp
 
 
 
-  template <int dim, int q_dim, class FEValuesType>
+  template <int dim, int q_dim, typename FEValuesType>
   inline const MappingCollection<dim, FEValuesType::space_dimension> &
   FEValuesBase<dim, q_dim, FEValuesType>::get_mapping_collection() const
   {
@@ -717,7 +717,7 @@ namespace hp
 
 
 
-  template <int dim, int q_dim, class FEValuesType>
+  template <int dim, int q_dim, typename FEValuesType>
   inline const QCollection<q_dim> &
   FEValuesBase<dim, q_dim, FEValuesType>::get_quadrature_collection() const
   {
@@ -726,7 +726,7 @@ namespace hp
 
 
 
-  template <int dim, int q_dim, class FEValuesType>
+  template <int dim, int q_dim, typename FEValuesType>
   inline UpdateFlags
   FEValuesBase<dim, q_dim, FEValuesType>::get_update_flags() const
   {
diff --git a/include/deal.II/lac/affine_constraints.templates.h b/include/deal.II/lac/affine_constraints.templates.h
index d951ddb6f4..759ecbd088 100644
--- a/include/deal.II/lac/affine_constraints.templates.h
+++ b/include/deal.II/lac/affine_constraints.templates.h
@@ -3149,7 +3149,7 @@ namespace internal
     // able to use functions like vector.block(1)(block_local_id), instead of
     // vector(global_id). This avoids transforming indices one-by-one later
     // on.
-    template <typename number, class BlockType>
+    template <typename number, typename BlockType>
     inline void
     make_block_starts(const BlockType &            block_object,
                       GlobalRowsFromLocal<number> &global_rows,
@@ -3186,7 +3186,7 @@ namespace internal
 
     // same as before, but for std::vector<uint> instead of
     // GlobalRowsFromLocal. Used in functions for sparsity patterns.
-    template <class BlockType>
+    template <typename BlockType>
     inline void
     make_block_starts(const BlockType &       block_object,
                       std::vector<size_type> &row_indices,
diff --git a/include/deal.II/lac/block_sparse_matrix_ez.h b/include/deal.II/lac/block_sparse_matrix_ez.h
index 7dcacc7ce3..5c3d3ea0a9 100644
--- a/include/deal.II/lac/block_sparse_matrix_ez.h
+++ b/include/deal.II/lac/block_sparse_matrix_ez.h
@@ -241,7 +241,7 @@ public:
    * existing row lengths and allocated row lengths. Otherwise, just the
    * relation of allocated and used entries is shown.
    */
-  template <class StreamType>
+  template <typename StreamType>
   void
   print_statistics(StreamType &s, bool full = false);
 
@@ -442,7 +442,7 @@ BlockSparseMatrixEZ<Number>::Tvmult_add(
 
 
 template <typename number>
-template <class StreamType>
+template <typename StreamType>
 inline void
 BlockSparseMatrixEZ<number>::print_statistics(StreamType &out, bool full)
 {
diff --git a/include/deal.II/lac/cuda_sparse_matrix.h b/include/deal.II/lac/cuda_sparse_matrix.h
index 6ad97a8d85..4b60f95120 100644
--- a/include/deal.II/lac/cuda_sparse_matrix.h
+++ b/include/deal.II/lac/cuda_sparse_matrix.h
@@ -159,7 +159,7 @@ namespace CUDAWrappers
      * quadratic matrices are printed first in their row. If it is false,
      * the elements in a row are written in ascending column order.
      */
-    template <class StreamType>
+    template <typename StreamType>
     void
     print(StreamType &out,
           const bool  across         = false,
@@ -404,7 +404,7 @@ namespace CUDAWrappers
 
 
   template <typename Number>
-  template <class StreamType>
+  template <typename StreamType>
   inline void
   SparseMatrix<Number>::print(StreamType &out,
                               const bool  across,
diff --git a/include/deal.II/lac/full_matrix.h b/include/deal.II/lac/full_matrix.h
index 0ab26570d5..8e54a51c63 100644
--- a/include/deal.II/lac/full_matrix.h
+++ b/include/deal.II/lac/full_matrix.h
@@ -487,7 +487,7 @@ public:
    * stream before setting these given values for output, and restores the
    * previous values after output.
    */
-  template <class StreamType>
+  template <typename StreamType>
   void
   print(StreamType &       s,
         const unsigned int width     = 5,
@@ -1421,7 +1421,7 @@ FullMatrix<number>::add(const size_type   row,
 
 
 template <typename number>
-template <class StreamType>
+template <typename StreamType>
 inline void
 FullMatrix<number>::print(StreamType &       s,
                           const unsigned int w,
diff --git a/include/deal.II/lac/solver_relaxation.h b/include/deal.II/lac/solver_relaxation.h
index ace14db6bc..585b11baa3 100644
--- a/include/deal.II/lac/solver_relaxation.h
+++ b/include/deal.II/lac/solver_relaxation.h
@@ -75,7 +75,7 @@ public:
    * R(x_k,b)$. The matrix <i>A</i> itself is only used to compute the
    * residual.
    */
-  template <typename MatrixType, class RelaxationType>
+  template <typename MatrixType, typename RelaxationType>
   void
   solve(const MatrixType &    A,
         VectorType &          x,
@@ -94,7 +94,7 @@ SolverRelaxation<VectorType>::SolverRelaxation(SolverControl &cn,
 
 
 template <typename VectorType>
-template <typename MatrixType, class RelaxationType>
+template <typename MatrixType, typename RelaxationType>
 void
 SolverRelaxation<VectorType>::solve(const MatrixType &    A,
                                     VectorType &          x,
diff --git a/include/deal.II/lac/sparse_matrix.h b/include/deal.II/lac/sparse_matrix.h
index 7b7a53eb15..135cf96f4a 100644
--- a/include/deal.II/lac/sparse_matrix.h
+++ b/include/deal.II/lac/sparse_matrix.h
@@ -1577,7 +1577,7 @@ public:
    * internal storage scheme. If it is false, the elements in a row are
    * written in ascending column order.
    */
-  template <class StreamType>
+  template <typename StreamType>
   void
   print(StreamType &out,
         const bool  across         = false,
@@ -2506,7 +2506,7 @@ SparseMatrix<number>::end(const size_type r)
 
 
 template <typename number>
-template <class StreamType>
+template <typename StreamType>
 inline void
 SparseMatrix<number>::print(StreamType &out,
                             const bool  across,
diff --git a/include/deal.II/lac/sparse_matrix_ez.h b/include/deal.II/lac/sparse_matrix_ez.h
index a78480b07f..63b4010480 100644
--- a/include/deal.II/lac/sparse_matrix_ez.h
+++ b/include/deal.II/lac/sparse_matrix_ez.h
@@ -414,7 +414,7 @@ public:
    * existing row lengths and allocated row lengths. Otherwise, just the
    * relation of allocated and used entries is shown.
    */
-  template <class StreamType>
+  template <typename StreamType>
   void
   print_statistics(StreamType &s, bool full = false);
 
@@ -1570,7 +1570,7 @@ SparseMatrixEZ<number>::conjugate_add(const MatrixTypeA &A,
 
 
 template <typename number>
-template <class StreamType>
+template <typename StreamType>
 inline void
 SparseMatrixEZ<number>::print_statistics(StreamType &out, bool full)
 {
diff --git a/include/deal.II/lac/trilinos_solver.h b/include/deal.II/lac/trilinos_solver.h
index 48f8b7979a..3172ad3003 100644
--- a/include/deal.II/lac/trilinos_solver.h
+++ b/include/deal.II/lac/trilinos_solver.h
@@ -1177,7 +1177,7 @@ namespace TrilinosWrappers
      * operators/preconditioners. For details, see
      * https://docs.trilinos.org/latest-release/packages/belos/doc/html/classBelos_1_1Operator.html.
      */
-    template <class OperatorType, typename VectorType>
+    template <typename OperatorType, typename VectorType>
     class OperatorWrapper
       : public Belos::Operator<typename VectorType::value_type>
     {
diff --git a/include/deal.II/meshworker/assemble_flags.h b/include/deal.II/meshworker/assemble_flags.h
index 8c28b08601..e9c772c2c2 100644
--- a/include/deal.II/meshworker/assemble_flags.h
+++ b/include/deal.II/meshworker/assemble_flags.h
@@ -111,7 +111,7 @@ namespace MeshWorker
    *
    * @ref AssembleFlags
    */
-  template <class StreamType>
+  template <typename StreamType>
   inline StreamType &
   operator<<(StreamType &s, AssembleFlags u)
   {
diff --git a/include/deal.II/meshworker/local_results.h b/include/deal.II/meshworker/local_results.h
index 6ddca48766..fa15acbe1f 100644
--- a/include/deal.II/meshworker/local_results.h
+++ b/include/deal.II/meshworker/local_results.h
@@ -385,7 +385,7 @@ namespace MeshWorker
     void
     reinit(const BlockIndices &local_sizes);
 
-    template <class StreamType>
+    template <typename StreamType>
     void
     print_debug(StreamType &os) const;
 
@@ -659,7 +659,7 @@ namespace MeshWorker
 
 
   template <typename number>
-  template <class StreamType>
+  template <typename StreamType>
   void
   LocalResults<number>::print_debug(StreamType &os) const
   {
diff --git a/include/deal.II/meshworker/mesh_loop.h b/include/deal.II/meshworker/mesh_loop.h
index eb212da85d..8af89aa03c 100644
--- a/include/deal.II/meshworker/mesh_loop.h
+++ b/include/deal.II/meshworker/mesh_loop.h
@@ -51,7 +51,7 @@ namespace MeshWorker
      * A helper class to provide a type definition for the underlying cell
      * iterator type.
      */
-    template <class CellIteratorType>
+    template <typename CellIteratorType>
     struct CellIteratorBaseType
     {
       /**
@@ -67,7 +67,7 @@ namespace MeshWorker
      * This specialization is for IteratorRange, which may have either a
      * TriaActiveIterator or a FilteredIterator as its base type.
      */
-    template <class CellIteratorType>
+    template <typename CellIteratorType>
     struct CellIteratorBaseType<IteratorOverIterators<CellIteratorType>>
     {
       /**
@@ -87,7 +87,7 @@ namespace MeshWorker
      * TriaActiveIterator as its base type, or may be nested with another
      * FilteredIterator as the type to iterate over.
      */
-    template <class CellIteratorType>
+    template <typename CellIteratorType>
     struct CellIteratorBaseType<FilteredIterator<CellIteratorType>>
     {
       /**
@@ -273,10 +273,10 @@ namespace MeshWorker
    *
    * @ingroup MeshWorker
    */
-  template <class CellIteratorType,
+  template <typename CellIteratorType,
             class ScratchData,
             class CopyData,
-            class CellIteratorBaseType =
+            typename CellIteratorBaseType =
               typename internal::CellIteratorBaseType<CellIteratorType>::type>
   void
   mesh_loop(
@@ -707,10 +707,10 @@ namespace MeshWorker
    *
    * @ingroup MeshWorker
    */
-  template <class CellIteratorType,
+  template <typename CellIteratorType,
             class ScratchData,
             class CopyData,
-            class CellIteratorBaseType =
+            typename CellIteratorBaseType =
               typename internal::CellIteratorBaseType<CellIteratorType>::type>
   void
   mesh_loop(
@@ -833,7 +833,7 @@ namespace MeshWorker
    *
    * @ingroup MeshWorker
    */
-  template <class CellIteratorType,
+  template <typename CellIteratorType,
             class ScratchData,
             class CopyData,
             class MainClass>
@@ -1013,11 +1013,11 @@ namespace MeshWorker
    *
    * @ingroup MeshWorker
    */
-  template <class CellIteratorType,
+  template <typename CellIteratorType,
             class ScratchData,
             class CopyData,
             class MainClass,
-            class CellIteratorBaseType =
+            typename CellIteratorBaseType =
               typename internal::CellIteratorBaseType<CellIteratorType>::type>
   void
   mesh_loop(IteratorRange<CellIteratorType> iterator_range,
diff --git a/include/deal.II/meshworker/vector_selector.h b/include/deal.II/meshworker/vector_selector.h
index 6224e6dc97..4eb2a48a49 100644
--- a/include/deal.II/meshworker/vector_selector.h
+++ b/include/deal.II/meshworker/vector_selector.h
@@ -150,14 +150,14 @@ namespace MeshWorker
     /**
      * Print the contents of the selection to the stream.
      */
-    template <class StreamType, typename DATA>
+    template <typename StreamType, typename DATA>
     void
     print(StreamType &s, const AnyData &v) const;
 
     /**
      * Print the number of selections to the stream.
      */
-    template <class StreamType>
+    template <typename StreamType>
     void
     print(StreamType &s) const;
 
@@ -521,7 +521,7 @@ namespace MeshWorker
   }
 
 
-  template <class StreamType>
+  template <typename StreamType>
   inline void
   VectorSelector::print(StreamType &s) const
   {
@@ -530,7 +530,7 @@ namespace MeshWorker
   }
 
 
-  template <class StreamType, typename DATA>
+  template <typename StreamType, typename DATA>
   inline void
   VectorSelector::print(StreamType &s, const AnyData &v) const
   {
diff --git a/include/deal.II/multigrid/mg_block_smoother.h b/include/deal.II/multigrid/mg_block_smoother.h
index ac321dfc82..45c0399041 100644
--- a/include/deal.II/multigrid/mg_block_smoother.h
+++ b/include/deal.II/multigrid/mg_block_smoother.h
@@ -47,7 +47,7 @@ DEAL_II_NAMESPACE_OPEN
  * smoother object. Therefore, the smoother object for each level must be
  * constructed by hand.
  */
-template <typename MatrixType, class RelaxationType, typename number>
+template <typename MatrixType, typename RelaxationType, typename number>
 class MGSmootherBlock : public MGSmoother<BlockVector<number>>
 {
 public:
@@ -73,7 +73,7 @@ public:
    * This function stores pointers to the level matrices and smoothing
    * operator for each level.
    */
-  template <class MGMatrixType, class MGRelaxationType>
+  template <typename MGMatrixType, typename MGRelaxationType>
   void
   initialize(const MGMatrixType &matrices, const MGRelaxationType &smoothers);
 
@@ -135,7 +135,7 @@ private:
 
 #ifndef DOXYGEN
 
-template <typename MatrixType, class RelaxationType, typename number>
+template <typename MatrixType, typename RelaxationType, typename number>
 inline MGSmootherBlock<MatrixType, RelaxationType, number>::MGSmootherBlock(
   const unsigned int steps,
   const bool         variable,
@@ -148,7 +148,7 @@ inline MGSmootherBlock<MatrixType, RelaxationType, number>::MGSmootherBlock(
 {}
 
 
-template <typename MatrixType, class RelaxationType, typename number>
+template <typename MatrixType, typename RelaxationType, typename number>
 inline void
 MGSmootherBlock<MatrixType, RelaxationType, number>::clear()
 {
@@ -161,8 +161,8 @@ MGSmootherBlock<MatrixType, RelaxationType, number>::clear()
 }
 
 
-template <typename MatrixType, class RelaxationType, typename number>
-template <class MGMatrixType, class MGRelaxationType>
+template <typename MatrixType, typename RelaxationType, typename number>
+template <typename MGMatrixType, typename MGRelaxationType>
 inline void
 MGSmootherBlock<MatrixType, RelaxationType, number>::initialize(
   const MGMatrixType &    m,
@@ -186,7 +186,7 @@ MGSmootherBlock<MatrixType, RelaxationType, number>::initialize(
 }
 
 
-template <typename MatrixType, class RelaxationType, typename number>
+template <typename MatrixType, typename RelaxationType, typename number>
 inline void
 MGSmootherBlock<MatrixType, RelaxationType, number>::set_reverse(
   const bool flag)
@@ -195,7 +195,7 @@ MGSmootherBlock<MatrixType, RelaxationType, number>::set_reverse(
 }
 
 
-template <typename MatrixType, class RelaxationType, typename number>
+template <typename MatrixType, typename RelaxationType, typename number>
 inline std::size_t
 MGSmootherBlock<MatrixType, RelaxationType, number>::memory_consumption() const
 {
@@ -205,7 +205,7 @@ MGSmootherBlock<MatrixType, RelaxationType, number>::memory_consumption() const
 }
 
 
-template <typename MatrixType, class RelaxationType, typename number>
+template <typename MatrixType, typename RelaxationType, typename number>
 inline void
 MGSmootherBlock<MatrixType, RelaxationType, number>::smooth(
   const unsigned int         level,
diff --git a/include/deal.II/multigrid/mg_smoother.h b/include/deal.II/multigrid/mg_smoother.h
index b805774a02..3fc5a9e332 100644
--- a/include/deal.II/multigrid/mg_smoother.h
+++ b/include/deal.II/multigrid/mg_smoother.h
@@ -181,7 +181,7 @@ namespace mg
    * the multigrid method must be used only with the vector associated to that
    * single block.
    */
-  template <class RelaxationType, typename VectorType>
+  template <typename RelaxationType, typename VectorType>
   class SmootherRelaxation : public MGLevelObject<RelaxationType>,
                              public MGSmoother<VectorType>
   {
@@ -292,7 +292,7 @@ namespace mg
  * float and @p double. Additional instantiations may be created by including
  * the file mg_smoother.templates.h.
  */
-template <typename MatrixType, class RelaxationType, typename VectorType>
+template <typename MatrixType, typename RelaxationType, typename VectorType>
 class MGSmootherRelaxation : public MGSmoother<VectorType>
 {
 public:
@@ -658,7 +658,7 @@ MGSmoother<VectorType>::set_transpose(const bool flag)
 
 namespace mg
 {
-  template <class RelaxationType, typename VectorType>
+  template <typename RelaxationType, typename VectorType>
   inline SmootherRelaxation<RelaxationType, VectorType>::SmootherRelaxation(
     const unsigned int steps,
     const bool         variable,
@@ -668,7 +668,7 @@ namespace mg
   {}
 
 
-  template <class RelaxationType, typename VectorType>
+  template <typename RelaxationType, typename VectorType>
   inline void
   SmootherRelaxation<RelaxationType, VectorType>::clear()
   {
@@ -676,7 +676,7 @@ namespace mg
   }
 
 
-  template <class RelaxationType, typename VectorType>
+  template <typename RelaxationType, typename VectorType>
   template <typename MatrixType2>
   inline void
   SmootherRelaxation<RelaxationType, VectorType>::initialize(
@@ -693,7 +693,7 @@ namespace mg
   }
 
 
-  template <class RelaxationType, typename VectorType>
+  template <typename RelaxationType, typename VectorType>
   template <typename MatrixType2, class DATA>
   inline void
   SmootherRelaxation<RelaxationType, VectorType>::initialize(
@@ -710,7 +710,7 @@ namespace mg
   }
 
 
-  template <class RelaxationType, typename VectorType>
+  template <typename RelaxationType, typename VectorType>
   inline void
   SmootherRelaxation<RelaxationType, VectorType>::smooth(
     const unsigned int level,
@@ -741,7 +741,7 @@ namespace mg
   }
 
 
-  template <class RelaxationType, typename VectorType>
+  template <typename RelaxationType, typename VectorType>
   inline void
   SmootherRelaxation<RelaxationType, VectorType>::apply(
     const unsigned int level,
@@ -778,7 +778,7 @@ namespace mg
   }
 
 
-  template <class RelaxationType, typename VectorType>
+  template <typename RelaxationType, typename VectorType>
   inline std::size_t
   SmootherRelaxation<RelaxationType, VectorType>::memory_consumption() const
   {
@@ -791,7 +791,7 @@ namespace mg
 
 //----------------------------------------------------------------------//
 
-template <typename MatrixType, class RelaxationType, typename VectorType>
+template <typename MatrixType, typename RelaxationType, typename VectorType>
 inline MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::
   MGSmootherRelaxation(const unsigned int steps,
                        const bool         variable,
@@ -802,7 +802,7 @@ inline MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::
 
 
 
-template <typename MatrixType, class RelaxationType, typename VectorType>
+template <typename MatrixType, typename RelaxationType, typename VectorType>
 inline void
 MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::clear()
 {
@@ -814,7 +814,7 @@ MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::clear()
 }
 
 
-template <typename MatrixType, class RelaxationType, typename VectorType>
+template <typename MatrixType, typename RelaxationType, typename VectorType>
 template <typename MatrixType2>
 inline void
 MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::initialize(
@@ -838,7 +838,7 @@ MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::initialize(
     }
 }
 
-template <typename MatrixType, class RelaxationType, typename VectorType>
+template <typename MatrixType, typename RelaxationType, typename VectorType>
 template <typename MatrixType2, class DATA>
 inline void
 MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::initialize(
@@ -865,7 +865,7 @@ MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::initialize(
     }
 }
 
-template <typename MatrixType, class RelaxationType, typename VectorType>
+template <typename MatrixType, typename RelaxationType, typename VectorType>
 template <typename MatrixType2, class DATA>
 inline void
 MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::initialize(
@@ -891,7 +891,7 @@ MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::initialize(
     }
 }
 
-template <typename MatrixType, class RelaxationType, typename VectorType>
+template <typename MatrixType, typename RelaxationType, typename VectorType>
 template <typename MatrixType2, class DATA>
 inline void
 MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::initialize(
@@ -921,7 +921,7 @@ MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::initialize(
 }
 
 
-template <typename MatrixType, class RelaxationType, typename VectorType>
+template <typename MatrixType, typename RelaxationType, typename VectorType>
 inline void
 MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::smooth(
   const unsigned int level,
@@ -952,7 +952,7 @@ MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::smooth(
 }
 
 
-template <typename MatrixType, class RelaxationType, typename VectorType>
+template <typename MatrixType, typename RelaxationType, typename VectorType>
 inline void
 MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::apply(
   const unsigned int level,
@@ -990,7 +990,7 @@ MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::apply(
 
 
 
-template <typename MatrixType, class RelaxationType, typename VectorType>
+template <typename MatrixType, typename RelaxationType, typename VectorType>
 inline std::size_t
 MGSmootherRelaxation<MatrixType, RelaxationType, VectorType>::
   memory_consumption() const
diff --git a/include/deal.II/multigrid/multigrid.h b/include/deal.II/multigrid/multigrid.h
index 27ef91def7..3ef46d160e 100644
--- a/include/deal.II/multigrid/multigrid.h
+++ b/include/deal.II/multigrid/multigrid.h
@@ -478,7 +478,7 @@ private:
    */
   SmartPointer<const MGMatrixBase<VectorType>, Multigrid<VectorType>> edge_up;
 
-  template <int dim, class OtherVectorType, class TRANSFER>
+  template <int dim, typename OtherVectorType, class TRANSFER>
   friend class PreconditionMG;
 };
 
@@ -529,7 +529,7 @@ public:
    *
    * This is the operator used by LAC iterative solvers.
    */
-  template <class OtherVectorType>
+  template <typename OtherVectorType>
   void
   vmult(OtherVectorType &dst, const OtherVectorType &src) const;
 
@@ -537,7 +537,7 @@ public:
    * Preconditioning operator. Calls the @p vcycle function of the @p MG
    * object passed to the constructor.
    */
-  template <class OtherVectorType>
+  template <typename OtherVectorType>
   void
   vmult_add(OtherVectorType &dst, const OtherVectorType &src) const;
 
@@ -546,7 +546,7 @@ public:
    *
    * Not implemented, but the definition may be needed.
    */
-  template <class OtherVectorType>
+  template <typename OtherVectorType>
   void
   Tvmult(OtherVectorType &dst, const OtherVectorType &src) const;
 
@@ -555,7 +555,7 @@ public:
    *
    * Not implemented, but the definition may be needed.
    */
-  template <class OtherVectorType>
+  template <typename OtherVectorType>
   void
   Tvmult_add(OtherVectorType &dst, const OtherVectorType &src) const;
 
@@ -866,7 +866,7 @@ PreconditionMG<dim, VectorType, TRANSFER>::empty() const
 }
 
 template <int dim, typename VectorType, class TRANSFER>
-template <class OtherVectorType>
+template <typename OtherVectorType>
 void
 PreconditionMG<dim, VectorType, TRANSFER>::vmult(
   OtherVectorType &      dst,
@@ -940,7 +940,7 @@ PreconditionMG<dim, VectorType, TRANSFER>::connect_transfer_to_global(
 
 
 template <int dim, typename VectorType, class TRANSFER>
-template <class OtherVectorType>
+template <typename OtherVectorType>
 void
 PreconditionMG<dim, VectorType, TRANSFER>::vmult_add(
   OtherVectorType &      dst,
@@ -958,7 +958,7 @@ PreconditionMG<dim, VectorType, TRANSFER>::vmult_add(
 
 
 template <int dim, typename VectorType, class TRANSFER>
-template <class OtherVectorType>
+template <typename OtherVectorType>
 void
 PreconditionMG<dim, VectorType, TRANSFER>::Tvmult(OtherVectorType &,
                                                   const OtherVectorType &) const
@@ -968,7 +968,7 @@ PreconditionMG<dim, VectorType, TRANSFER>::Tvmult(OtherVectorType &,
 
 
 template <int dim, typename VectorType, class TRANSFER>
-template <class OtherVectorType>
+template <typename OtherVectorType>
 void
 PreconditionMG<dim, VectorType, TRANSFER>::Tvmult_add(
   OtherVectorType &,
diff --git a/include/deal.II/non_matching/fe_values.h b/include/deal.II/non_matching/fe_values.h
index 1231d1f4e5..0f612e2550 100644
--- a/include/deal.II/non_matching/fe_values.h
+++ b/include/deal.II/non_matching/fe_values.h
@@ -520,7 +520,7 @@ namespace NonMatching
      * implemented, the passed values of these must equal
      * numbers::invalid_unsigned_int.
      */
-    template <class CellIteratorType, class CellNeighborIteratorType>
+    template <typename CellIteratorType, typename CellNeighborIteratorType>
     void
     reinit(const CellIteratorType &        cell,
            const unsigned int              face_no,
@@ -537,7 +537,7 @@ namespace NonMatching
      * FEInterfaceValues object can be retrieved for each region using the
      * functions get_inside_fe_values() or get_outside_fe_values().
      */
-    template <class CellIteratorType>
+    template <typename CellIteratorType>
     void
     reinit(const CellIteratorType &cell, const unsigned int face_no);
 
@@ -688,7 +688,7 @@ namespace NonMatching
   /*---------------------- Inline functions ---------------------*/
 
   template <int dim>
-  template <class CellIteratorType>
+  template <typename CellIteratorType>
   inline void
   FEInterfaceValues<dim>::reinit(const CellIteratorType &cell,
                                  const unsigned int      face_no)
@@ -706,7 +706,7 @@ namespace NonMatching
 
 
   template <int dim>
-  template <class CellIteratorType, class CellNeighborIteratorType>
+  template <typename CellIteratorType, typename CellNeighborIteratorType>
   inline void
   FEInterfaceValues<dim>::reinit(const CellIteratorType &        cell,
                                  const unsigned int              face_no,
diff --git a/include/deal.II/numerics/vector_tools_interpolate.h b/include/deal.II/numerics/vector_tools_interpolate.h
index 2f6e1d26ed..ba32e7aa48 100644
--- a/include/deal.II/numerics/vector_tools_interpolate.h
+++ b/include/deal.II/numerics/vector_tools_interpolate.h
@@ -35,7 +35,7 @@ template <typename number>
 class FullMatrix;
 template <int dim, typename Number>
 class Function;
-template <class MeshType>
+template <typename MeshType>
 DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
 class InterGridMap;
 template <int dim, int spacedim>
diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc
index dc1ba232a7..c38690b64b 100644
--- a/source/base/data_out_base.cc
+++ b/source/base/data_out_base.cc
@@ -2826,7 +2826,7 @@ namespace DataOutBase
   }
 
 
-  template <int dim, int spacedim, class StreamType>
+  template <int dim, int spacedim, typename StreamType>
   void
   write_data(const std::vector<Patch<dim, spacedim>> &patches,
              unsigned int                             n_data_sets,
diff --git a/source/dofs/dof_renumbering.cc b/source/dofs/dof_renumbering.cc
index e2f35e7d7f..5374a2437f 100644
--- a/source/dofs/dof_renumbering.cc
+++ b/source/dofs/dof_renumbering.cc
@@ -1265,7 +1265,7 @@ namespace DoFRenumbering
     // cell, renumbers DoF indices on it. The function starts renumbering with
     // 'next_free_dof_index' and returns the first still unused DoF index at the
     // end of its operation.
-    template <int dim, class CellIteratorType>
+    template <int dim, typename CellIteratorType>
     types::global_dof_index
     compute_hierarchical_recursive(
       const types::global_dof_index         next_free_dof_offset,
diff --git a/source/fe/mapping_cartesian.cc b/source/fe/mapping_cartesian.cc
index 9437ab5304..182a71a9f7 100644
--- a/source/fe/mapping_cartesian.cc
+++ b/source/fe/mapping_cartesian.cc
@@ -48,7 +48,7 @@ DeclExceptionMsg(
  * checking if the smallest BoundingBox that encloses the cell has the same
  * vertices as the cell itself.
  */
-template <class CellType>
+template <typename CellType>
 bool
 is_cartesian(const CellType &cell)
 {
diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index b8680497ea..51ef15235d 100644
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -495,7 +495,7 @@ namespace GridTools
       /**
        * Store the data about the given face @p face.
        */
-      template <class FaceIteratorType>
+      template <typename FaceIteratorType>
       void
       insert_face_data(const FaceIteratorType &face)
       {
@@ -534,7 +534,7 @@ namespace GridTools
     class FaceDataHelper<1>
     {
     public:
-      template <class FaceIteratorType>
+      template <typename FaceIteratorType>
       void
       insert_face_data(const FaceIteratorType &)
       {}
@@ -3083,7 +3083,7 @@ namespace GridTools
   {
     namespace BoundingBoxPredicate
     {
-      template <class MeshType>
+      template <typename MeshType>
       DEAL_II_CXX20_REQUIRES(
         concepts::is_triangulation_or_dof_handler<MeshType>)
       std::tuple<
@@ -3141,7 +3141,7 @@ namespace GridTools
 
 
 
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::
     vector<BoundingBox<MeshType::space_dimension>> compute_mesh_predicate_bounding_box(
diff --git a/source/grid/grid_tools_dof_handlers.cc b/source/grid/grid_tools_dof_handlers.cc
index fc5bfee757..56c197e655 100644
--- a/source/grid/grid_tools_dof_handlers.cc
+++ b/source/grid/grid_tools_dof_handlers.cc
@@ -189,7 +189,7 @@ namespace GridTools
 
 
 
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES((concepts::is_triangulation_or_dof_handler<MeshType>))
 #ifndef _MSC_VER
   std::vector<typename MeshType::active_cell_iterator>
@@ -761,7 +761,7 @@ namespace GridTools
 
 
 
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::
     vector<typename MeshType::active_cell_iterator> compute_active_cell_halo_layer(
@@ -799,7 +799,7 @@ namespace GridTools
 
 
 
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::
     vector<typename MeshType::cell_iterator> compute_cell_halo_layer_on_level(
@@ -844,7 +844,7 @@ namespace GridTools
 
   namespace
   {
-    template <class MeshType>
+    template <typename MeshType>
     DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
     bool contains_locally_owned_cells(
       const std::vector<typename MeshType::active_cell_iterator> &cells)
@@ -861,7 +861,7 @@ namespace GridTools
       return false;
     }
 
-    template <class MeshType>
+    template <typename MeshType>
     DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
     bool contains_artificial_cells(
       const std::vector<typename MeshType::active_cell_iterator> &cells)
@@ -881,7 +881,7 @@ namespace GridTools
 
 
 
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::vector<
     typename MeshType::
@@ -905,7 +905,7 @@ namespace GridTools
 
 
 
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::
     vector<typename MeshType::active_cell_iterator> compute_active_cell_layer_within_distance(
@@ -1050,7 +1050,7 @@ namespace GridTools
 
 
 
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::vector<
     typename MeshType::
@@ -1090,7 +1090,7 @@ namespace GridTools
 
 
 
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::pair<
     Point<MeshType::space_dimension>,
@@ -1426,7 +1426,7 @@ namespace GridTools
   }
 
 
-  template <class MeshType>
+  template <typename MeshType>
   DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
   std::vector<typename MeshType::active_cell_iterator> get_patch_around_cell(
     const typename MeshType::active_cell_iterator &cell)
diff --git a/source/grid/intergrid_map.cc b/source/grid/intergrid_map.cc
index 9d0b27f0c4..031abfffc4 100644
--- a/source/grid/intergrid_map.cc
+++ b/source/grid/intergrid_map.cc
@@ -33,7 +33,7 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-template <class MeshType>
+template <typename MeshType>
 DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
 InterGridMap<MeshType>::InterGridMap()
   : source_grid(nullptr, typeid(*this).name())
@@ -42,7 +42,7 @@ InterGridMap<MeshType>::InterGridMap()
 
 
 
-template <class MeshType>
+template <typename MeshType>
 DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
 void InterGridMap<MeshType>::make_mapping(const MeshType &source_grid,
                                           const MeshType &destination_grid)
@@ -98,7 +98,7 @@ void InterGridMap<MeshType>::make_mapping(const MeshType &source_grid,
 
 
 
-template <class MeshType>
+template <typename MeshType>
 DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
 void InterGridMap<MeshType>::set_mapping(const cell_iterator &src_cell,
                                          const cell_iterator &dst_cell)
@@ -137,7 +137,7 @@ void InterGridMap<MeshType>::set_mapping(const cell_iterator &src_cell,
 
 
 
-template <class MeshType>
+template <typename MeshType>
 DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
 void InterGridMap<MeshType>::set_entries_to_cell(const cell_iterator &src_cell,
                                                  const cell_iterator &dst_cell)
@@ -153,7 +153,7 @@ void InterGridMap<MeshType>::set_entries_to_cell(const cell_iterator &src_cell,
 }
 
 
-template <class MeshType>
+template <typename MeshType>
 DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
 typename InterGridMap<MeshType>::cell_iterator
   InterGridMap<MeshType>::operator[](const cell_iterator &source_cell) const
@@ -171,7 +171,7 @@ typename InterGridMap<MeshType>::cell_iterator
 
 
 
-template <class MeshType>
+template <typename MeshType>
 DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
 void InterGridMap<MeshType>::clear()
 {
@@ -182,7 +182,7 @@ void InterGridMap<MeshType>::clear()
 
 
 
-template <class MeshType>
+template <typename MeshType>
 DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
 const MeshType &InterGridMap<MeshType>::get_source_grid() const
 {
@@ -191,7 +191,7 @@ const MeshType &InterGridMap<MeshType>::get_source_grid() const
 
 
 
-template <class MeshType>
+template <typename MeshType>
 DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
 const MeshType &InterGridMap<MeshType>::get_destination_grid() const
 {
@@ -200,7 +200,7 @@ const MeshType &InterGridMap<MeshType>::get_destination_grid() const
 
 
 
-template <class MeshType>
+template <typename MeshType>
 DEAL_II_CXX20_REQUIRES(concepts::is_triangulation_or_dof_handler<MeshType>)
 std::size_t InterGridMap<MeshType>::memory_consumption() const
 {
diff --git a/source/hp/fe_values.cc b/source/hp/fe_values.cc
index 51e40fe29b..77e3da57cb 100644
--- a/source/hp/fe_values.cc
+++ b/source/hp/fe_values.cc
@@ -62,7 +62,7 @@ namespace hp
 
   // -------------------------- FEValuesBase -------------------------
 
-  template <int dim, int q_dim, class FEValuesType>
+  template <int dim, int q_dim, typename FEValuesType>
   FEValuesBase<dim, q_dim, FEValuesType>::FEValuesBase(
     const MappingCollection<dim, FEValuesType::space_dimension>
       &                                                     mapping_collection,
@@ -82,7 +82,7 @@ namespace hp
     , update_flags(update_flags)
   {}
 
-  template <int dim, int q_dim, class FEValuesType>
+  template <int dim, int q_dim, typename FEValuesType>
   FEValuesBase<dim, q_dim, FEValuesType>::FEValuesBase(
     const MappingCollection<dim, FEValuesType::space_dimension>
       &                                                     mapping_collection,
@@ -103,7 +103,7 @@ namespace hp
   {}
 
 
-  template <int dim, int q_dim, class FEValuesType>
+  template <int dim, int q_dim, typename FEValuesType>
   FEValuesBase<dim, q_dim, FEValuesType>::FEValuesBase(
     const FECollection<dim, FEValuesType::space_dimension> &fe_collection,
     const QCollection<q_dim> &                              q_collection,
@@ -117,7 +117,7 @@ namespace hp
   {}
 
 
-  template <int dim, int q_dim, class FEValuesType>
+  template <int dim, int q_dim, typename FEValuesType>
   FEValuesBase<dim, q_dim, FEValuesType>::FEValuesBase(
     const FECollection<dim, FEValuesType::space_dimension> &fe_collection,
     const std::vector<QCollection<q_dim>> &                 q_collection,
@@ -132,7 +132,7 @@ namespace hp
 
 
 
-  template <int dim, int q_dim, class FEValuesType>
+  template <int dim, int q_dim, typename FEValuesType>
   FEValuesBase<dim, q_dim, FEValuesType>::FEValuesBase(
     const FEValuesBase<dim, q_dim, FEValuesType> &other)
     : Subscriptor(other)
@@ -171,7 +171,7 @@ namespace hp
 
 
 
-  template <int dim, int q_dim, class FEValuesType>
+  template <int dim, int q_dim, typename FEValuesType>
   FEValuesType &
   FEValuesBase<dim, q_dim, FEValuesType>::select_fe_values(
     const unsigned int fe_index,
@@ -201,7 +201,7 @@ namespace hp
 
 
 
-  template <int dim, int q_dim, class FEValuesType>
+  template <int dim, int q_dim, typename FEValuesType>
   void
   FEValuesBase<dim, q_dim, FEValuesType>::precalculate_fe_values(
     const std::vector<unsigned int> &fe_indices,
@@ -238,7 +238,7 @@ namespace hp
 
 
 
-  template <int dim, int q_dim, class FEValuesType>
+  template <int dim, int q_dim, typename FEValuesType>
   void
   FEValuesBase<dim, q_dim, FEValuesType>::precalculate_fe_values()
   {
diff --git a/source/lac/block_sparsity_pattern.cc b/source/lac/block_sparsity_pattern.cc
index c2de6c6d6a..2c71280fb3 100644
--- a/source/lac/block_sparsity_pattern.cc
+++ b/source/lac/block_sparsity_pattern.cc
@@ -21,7 +21,7 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 BlockSparsityPatternBase<SparsityPatternType>::BlockSparsityPatternBase()
   : block_rows(0)
   , block_columns(0)
@@ -29,7 +29,7 @@ BlockSparsityPatternBase<SparsityPatternType>::BlockSparsityPatternBase()
 
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 BlockSparsityPatternBase<SparsityPatternType>::BlockSparsityPatternBase(
   const size_type block_rows,
   const size_type block_columns)
@@ -40,7 +40,7 @@ BlockSparsityPatternBase<SparsityPatternType>::BlockSparsityPatternBase(
 
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 BlockSparsityPatternBase<SparsityPatternType>::BlockSparsityPatternBase(
   const BlockSparsityPatternBase &s)
   : BlockSparsityPatternBase()
@@ -55,7 +55,7 @@ BlockSparsityPatternBase<SparsityPatternType>::BlockSparsityPatternBase(
 
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 void
 BlockSparsityPatternBase<SparsityPatternType>::reinit(
   const size_type new_block_rows,
@@ -73,7 +73,7 @@ BlockSparsityPatternBase<SparsityPatternType>::reinit(
 }
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 BlockSparsityPatternBase<SparsityPatternType> &
 BlockSparsityPatternBase<SparsityPatternType>::operator=(
   const BlockSparsityPatternBase<SparsityPatternType> &bsp)
@@ -92,7 +92,7 @@ BlockSparsityPatternBase<SparsityPatternType>::operator=(
 
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 typename BlockSparsityPatternBase<SparsityPatternType>::size_type
 BlockSparsityPatternBase<SparsityPatternType>::compute_n_rows() const
 {
@@ -106,7 +106,7 @@ BlockSparsityPatternBase<SparsityPatternType>::compute_n_rows() const
 
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 typename BlockSparsityPatternBase<SparsityPatternType>::size_type
 BlockSparsityPatternBase<SparsityPatternType>::compute_n_cols() const
 {
@@ -120,7 +120,7 @@ BlockSparsityPatternBase<SparsityPatternType>::compute_n_cols() const
 
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 void
 BlockSparsityPatternBase<SparsityPatternType>::collect_sizes()
 {
@@ -165,7 +165,7 @@ BlockSparsityPatternBase<SparsityPatternType>::collect_sizes()
 
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 void
 BlockSparsityPatternBase<SparsityPatternType>::compress()
 {
@@ -176,7 +176,7 @@ BlockSparsityPatternBase<SparsityPatternType>::compress()
 
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 bool
 BlockSparsityPatternBase<SparsityPatternType>::empty() const
 {
@@ -189,7 +189,7 @@ BlockSparsityPatternBase<SparsityPatternType>::empty() const
 
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 typename BlockSparsityPatternBase<SparsityPatternType>::size_type
 BlockSparsityPatternBase<SparsityPatternType>::max_entries_per_row() const
 {
@@ -208,7 +208,7 @@ BlockSparsityPatternBase<SparsityPatternType>::max_entries_per_row() const
 
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 typename BlockSparsityPatternBase<SparsityPatternType>::size_type
 BlockSparsityPatternBase<SparsityPatternType>::n_nonzero_elements() const
 {
@@ -221,7 +221,7 @@ BlockSparsityPatternBase<SparsityPatternType>::n_nonzero_elements() const
 
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 void
 BlockSparsityPatternBase<SparsityPatternType>::print(std::ostream &out) const
 {
@@ -278,7 +278,7 @@ BlockSparsityPatternBase<DynamicSparsityPattern>::print(std::ostream &out) const
 
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 void
 BlockSparsityPatternBase<SparsityPatternType>::print_gnuplot(
   std::ostream &out) const
@@ -305,7 +305,7 @@ BlockSparsityPatternBase<SparsityPatternType>::print_gnuplot(
 
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 void
 BlockSparsityPatternBase<SparsityPatternType>::print_svg(
   std::ostream &out) const
@@ -346,7 +346,7 @@ BlockSparsityPatternBase<SparsityPatternType>::print_svg(
 
 
 
-template <class SparsityPatternType>
+template <typename SparsityPatternType>
 std::size_t
 BlockSparsityPatternBase<SparsityPatternType>::memory_consumption() const
 {