From 8a1cacd44e5db6437463e31dca2b4e5d4893d075 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Mon, 3 Oct 2011 23:49:12 -0700
Subject: More forward.h purging.

(bzr r10665)
---
 src/libnrtype/FontFactory.h    |  4 +++-
 src/libnrtype/TextWrapper.h    |  2 +-
 src/libnrtype/font-glyph.h     |  1 -
 src/libnrtype/font-instance.h  |  4 +++-
 src/libnrtype/font-lister.h    |  1 -
 src/libnrtype/nrtype-forward.h | 20 --------------------
 6 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 src/libnrtype/nrtype-forward.h

(limited to 'src/libnrtype')

diff --git a/src/libnrtype/FontFactory.h b/src/libnrtype/FontFactory.h
index 9843ebcfb..58a98d1a9 100644
--- a/src/libnrtype/FontFactory.h
+++ b/src/libnrtype/FontFactory.h
@@ -23,7 +23,6 @@
 #include "nr-type-primitives.h"
 #include "nr-type-pos-def.h"
 #include "font-style-to-pos.h"
-#include <libnrtype/nrtype-forward.h>
 #include "../style.h"
 
 /* Freetype */
@@ -34,6 +33,9 @@
 #include <freetype/freetype.h>
 #endif
 
+
+class font_instance;
+
 namespace Glib
 {
     class ustring;
diff --git a/src/libnrtype/TextWrapper.h b/src/libnrtype/TextWrapper.h
index b4a3cc724..1f96851ef 100644
--- a/src/libnrtype/TextWrapper.h
+++ b/src/libnrtype/TextWrapper.h
@@ -13,7 +13,6 @@
 
 #include <pango/pango.h>
 
-#include <libnrtype/nrtype-forward.h>
 #include "libnrtype/boundary-type.h"
 
 // miscanellous but useful data for a given text: chunking into logical pieces
@@ -24,6 +23,7 @@ struct text_boundary;
 struct one_glyph;
 struct one_box;
 struct one_para;
+class font_instance;
 
 class text_wrapper {
 public:
diff --git a/src/libnrtype/font-glyph.h b/src/libnrtype/font-glyph.h
index b6954a482..3f136daaf 100644
--- a/src/libnrtype/font-glyph.h
+++ b/src/libnrtype/font-glyph.h
@@ -1,7 +1,6 @@
 #ifndef SEEN_LIBNRTYPE_FONT_GLYPH_H
 #define SEEN_LIBNRTYPE_FONT_GLYPH_H
 
-#include <libnrtype/nrtype-forward.h>
 #include <2geom/forward.h>
 
 // the info for a glyph in a font. it's totally resolution- and fontsize-independent
diff --git a/src/libnrtype/font-instance.h b/src/libnrtype/font-instance.h
index b66230d87..d00569984 100644
--- a/src/libnrtype/font-instance.h
+++ b/src/libnrtype/font-instance.h
@@ -7,10 +7,12 @@
 #include <require-config.h>
 #include "FontFactory.h"
 
-#include <libnrtype/nrtype-forward.h>
 #include <libnrtype/font-style.h>
 #include <2geom/d2.h>
 
+class font_factory;
+struct font_glyph;
+
 // the font_instance are the template of several raster_font; they provide metrics and outlines
 // that are drawn by the raster_font, so the raster_font needs info relative to the way the
 // font need to be drawn. note that fontsize is a scale factor in the transform matrix
diff --git a/src/libnrtype/font-lister.h b/src/libnrtype/font-lister.h
index 23c8548fe..57b3798a2 100644
--- a/src/libnrtype/font-lister.h
+++ b/src/libnrtype/font-lister.h
@@ -16,7 +16,6 @@
 
 #include <glibmm.h>
 #include <gtkmm.h>
-#include "nrtype-forward.h"
 #include "nr-type-primitives.h"
 
 namespace Inkscape
diff --git a/src/libnrtype/nrtype-forward.h b/src/libnrtype/nrtype-forward.h
deleted file mode 100644
index 6050ffa6b..000000000
--- a/src/libnrtype/nrtype-forward.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef SEEN_LIBNRTYPE_NRTYPE_FORWARD_H
-#define SEEN_LIBNRTYPE_NRTYPE_FORWARD_H
-
-class font_factory;
-struct font_glyph;
-class font_instance;
-struct font_style;
-
-#endif /* !SEEN_LIBNRTYPE_NRTYPE_FORWARD_H */
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
-- 
cgit v1.2.3