diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-03-15 17:24:54 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-03-15 17:24:54 +0000 |
| commit | 5068de8914944f7316bdd5fbc3d1fbc61736a99f (patch) | |
| tree | d7ccf7e4babe1b72b98ef42c262b12d9a8ca870b /src/libnrtype | |
| parent | merge from trunk (r12201) (diff) | |
| parent | Fix missing Gtkmm/Glib headers for Gtk+ 3 build (diff) | |
| download | inkscape-5068de8914944f7316bdd5fbc3d1fbc61736a99f.tar.gz inkscape-5068de8914944f7316bdd5fbc3d1fbc61736a99f.zip | |
merge from trunk (r12209)
(bzr r11668.1.58)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/Layout-TNG-Output.cpp | 1 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG.h | 4 | ||||
| -rw-r--r-- | src/libnrtype/font-lister.cpp | 1 | ||||
| -rw-r--r-- | src/libnrtype/font-style-to-pos.h | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp index e97884f40..8ede0a38e 100644 --- a/src/libnrtype/Layout-TNG-Output.cpp +++ b/src/libnrtype/Layout-TNG-Output.cpp @@ -27,7 +27,6 @@ namespace Inkscape { namespace Extension { namespace Internal { class CairoRenderContext; - class CairoGlyphInfo; } } } diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h index f4a09f25b..0f5f08a53 100644 --- a/src/libnrtype/Layout-TNG.h +++ b/src/libnrtype/Layout-TNG.h @@ -34,9 +34,9 @@ namespace Inkscape { using Inkscape::Extension::Internal::CairoRenderContext; #endif -class SPStyle; +struct SPStyle; class Shape; -class SPPrintContext; +struct SPPrintContext; class SVGLength; class Path; class SPCurve; diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp index 712c17915..90900baba 100644 --- a/src/libnrtype/font-lister.cpp +++ b/src/libnrtype/font-lister.cpp @@ -2,7 +2,6 @@ # include <config.h> #endif -#include <gtkmm.h> #include <libnrtype/font-instance.h> #include <libnrtype/TextWrapper.h> #include <libnrtype/one-glyph.h> diff --git a/src/libnrtype/font-style-to-pos.h b/src/libnrtype/font-style-to-pos.h index 41ba6cf72..56eb391c2 100644 --- a/src/libnrtype/font-style-to-pos.h +++ b/src/libnrtype/font-style-to-pos.h @@ -3,7 +3,7 @@ #include <libnrtype/nr-type-pos-def.h> -class SPStyle; +struct SPStyle; NRTypePosDef font_style_to_pos(SPStyle const &style); |