From: Wolfgang Bangerth Date: Thu, 30 Jul 2020 21:08:02 +0000 (-0600) Subject: Update an error text. X-Git-Tag: v9.3.0-rc1~1239^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10772%2Fhead;p=dealii.git Update an error text. --- diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h index 892262f335..83ac285f8b 100644 --- a/include/deal.II/grid/tria.h +++ b/include/deal.II/grid/tria.h @@ -48,9 +48,9 @@ DEAL_II_NAMESPACE_OPEN #ifdef signals # error \ - "The data type signals is already defined. You are most likely using the QT library \ -and using the signals keyword. You can either #include the Qt headers (or any conflicting headers) \ -after the deal.ii headers or you can define the QT_NO_KEYWORDS marco and use the Q_SIGNALS macro." + "The name 'signals' is already defined. You are most likely using the QT library \ +and using the 'signals' keyword. You can either #include the Qt headers (or any conflicting headers) \ +*after* the deal.II headers or you can define the 'QT_NO_KEYWORDS' macro and use the 'Q_SIGNALS' macro." #endif // Forward declarations diff --git a/include/deal.II/multigrid/multigrid.h b/include/deal.II/multigrid/multigrid.h index 07bbe2d3e7..74165f07f8 100644 --- a/include/deal.II/multigrid/multigrid.h +++ b/include/deal.II/multigrid/multigrid.h @@ -38,9 +38,9 @@ DEAL_II_NAMESPACE_OPEN #ifdef signals # error \ - "The data type signals is already defined. You are most likely using the QT library \ -and using the signals keyword. You can either #include the Qt headers (or any conflicting headers) \ -after the deal.ii headers or you can define the QT_NO_KEYWORDS marco and use the Q_SIGNALS macro." + "The name 'signals' is already defined. You are most likely using the QT library \ +and using the 'signals' keyword. You can either #include the Qt headers (or any conflicting headers) \ +*after* the deal.II headers or you can define the 'QT_NO_KEYWORDS' macro and use the 'Q_SIGNALS' macro." #endif /*!@addtogroup mg */