Browse Source

Text: forward-declare the nasty STL types.

At the very least. The whole Renderer API needs to go, ugh.
pull/674/head
Vladimír Vondruš 2 years ago
parent
commit
06e4dae332
  1. 2
      doc/snippets/Text-gl.cpp
  2. 3
      src/Magnum/Text/Renderer.cpp
  3. 6
      src/Magnum/Text/Renderer.h
  4. 2
      src/Magnum/Text/Test/RendererGLTest.cpp
  5. 3
      src/Magnum/Text/Test/RendererTest.cpp

2
doc/snippets/Text-gl.cpp

@ -24,6 +24,8 @@
DEALINGS IN THE SOFTWARE.
*/
#include <string>
#include <tuple>
#include <Corrade/Containers/StringView.h>
#include <Corrade/PluginManager/Manager.h>

3
src/Magnum/Text/Renderer.cpp

@ -38,6 +38,9 @@
#include "Magnum/Text/Direction.h"
#ifdef MAGNUM_TARGET_GL
#include <string>
#include <tuple>
#include <vector>
#include <Corrade/Containers/Array.h>
#include <Corrade/Containers/ArrayViewStl.h> /** @todo remove once Renderer is STL-free */
#include <Corrade/Containers/StringStl.h> /** @todo remove once Renderer is STL-free */

6
src/Magnum/Text/Renderer.h

@ -35,9 +35,9 @@
#include "Magnum/Text/visibility.h"
#ifdef MAGNUM_TARGET_GL
#include <string>
#include <tuple>
#include <vector>
#include <Corrade/Utility/StlForwardTuple.h>
#include <Corrade/Utility/StlForwardVector.h>
#include <Corrade/Utility/StlForwardString.h>
#include "Magnum/DimensionTraits.h"
#include "Magnum/Math/Range.h"

2
src/Magnum/Text/Test/RendererGLTest.cpp

@ -24,6 +24,8 @@
DEALINGS IN THE SOFTWARE.
*/
#include <string>
#include <tuple>
#include <Corrade/Containers/Array.h>
#include <Corrade/Containers/StridedArrayView.h>
#include <Corrade/Containers/StringView.h>

3
src/Magnum/Text/Test/RendererTest.cpp

@ -24,6 +24,9 @@
DEALINGS IN THE SOFTWARE.
*/
#include <string>
#include <tuple>
#include <vector>
#include <Corrade/Containers/Array.h>
#include <Corrade/Containers/StridedArrayView.h>
#include <Corrade/Containers/String.h>

Loading…
Cancel
Save