diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-12-30 22:14:34 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-12-30 22:14:34 +0000 |
| commit | c2c87b6c05bda491b423488fa6a63b1c5f240749 (patch) | |
| tree | 3257115a0a9642e92d5da34228d01f4fbad8c8b5 /src/extension | |
| parent | add possibility to change the UI language (gettext) in preferences dialogue (diff) | |
| download | inkscape-c2c87b6c05bda491b423488fa6a63b1c5f240749.tar.gz inkscape-c2c87b6c05bda491b423488fa6a63b1c5f240749.zip | |
get rid of a lot of no longer needed "libnr/nr-..." includes.
(bzr r7045)
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/internal/emf-win32-print.cpp | 10 | ||||
| -rw-r--r-- | src/extension/internal/emf-win32-print.h | 2 | ||||
| -rw-r--r-- | src/extension/internal/latex-pstricks.cpp | 8 | ||||
| -rw-r--r-- | src/extension/internal/pdfinput/svg-builder.cpp | 1 | ||||
| -rw-r--r-- | src/extension/internal/pdfinput/svg-builder.h | 4 | ||||
| -rw-r--r-- | src/extension/internal/win32.cpp | 2 |
6 files changed, 3 insertions, 24 deletions
diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp index 4da7819ee..1de9bbfe0 100644 --- a/src/extension/internal/emf-win32-print.cpp +++ b/src/extension/internal/emf-win32-print.cpp @@ -30,16 +30,6 @@ //#include <signal.h> //#include <errno.h> -//#include "libnr/nr-point-matrix-ops.h" -//#include "libnr/nr-rect.h" -//#include "libnr/nr-matrix.h" -#include "libnr/nr-matrix-ops.h" -//#include "libnr/nr-matrix-scale-ops.h" -//#include "libnr/nr-matrix-translate-ops.h" -#include "libnr/nr-scale-translate-ops.h" -//#include "libnr/nr-translate-scale-ops.h" -//#include "libnr/nr-matrix-fns.h" -//#include "libnr/nr-pixblock.h" #include <2geom/pathvector.h> #include <2geom/rect.h> #include <2geom/bezier-curve.h> diff --git a/src/extension/internal/emf-win32-print.h b/src/extension/internal/emf-win32-print.h index ab9a1a4cf..5c1d8439d 100644 --- a/src/extension/internal/emf-win32-print.h +++ b/src/extension/internal/emf-win32-print.h @@ -20,8 +20,6 @@ #include "extension/implementation/implementation.h" //#include "extension/extension.h" -//#include "libnr/nr-matrix.h" -//#include "libnr/nr-rect.h" #include <2geom/pathvector.h> #include <stack> diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp index 84e493afa..789e5ea34 100644 --- a/src/extension/internal/latex-pstricks.cpp +++ b/src/extension/internal/latex-pstricks.cpp @@ -19,14 +19,6 @@ #include <signal.h> #include <errno.h> - -#include "libnr/nr-matrix.h" -#include "libnr/nr-matrix-ops.h" -#include "libnr/nr-matrix-scale-ops.h" -#include "libnr/nr-matrix-translate-ops.h" -#include "libnr/nr-scale-translate-ops.h" -#include "libnr/nr-translate-scale-ops.h" -#include <libnr/nr-matrix-fns.h> #include <2geom/pathvector.h> #include <2geom/sbasis-to-bezier.h> #include <2geom/bezier-curve.h> diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp index f58e37173..5a3015aef 100644 --- a/src/extension/internal/pdfinput/svg-builder.cpp +++ b/src/extension/internal/pdfinput/svg-builder.cpp @@ -34,7 +34,6 @@ #include "io/stringstream.h" #include "io/base64stream.h" #include "display/nr-filter-utils.h" -#include "libnr/nr-matrix-ops.h" #include "libnr/nr-macros.h" #include "libnrtype/font-instance.h" diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h index 28f7e1be3..29add9a62 100644 --- a/src/extension/internal/pdfinput/svg-builder.h +++ b/src/extension/internal/pdfinput/svg-builder.h @@ -26,8 +26,8 @@ namespace Inkscape { } } -#include "libnr/nr-point.h" -#include "libnr/nr-matrix.h" +#include <2geom/point.h> +#include <2geom/matrix.h> #include "CharTypes.h" class GooString; diff --git a/src/extension/internal/win32.cpp b/src/extension/internal/win32.cpp index 0fa70d734..21f278858 100644 --- a/src/extension/internal/win32.cpp +++ b/src/extension/internal/win32.cpp @@ -15,7 +15,7 @@ #include <glib/gmem.h> #include <libnr/nr-macros.h> -#include <libnr/nr-matrix.h> +#include <2geom/transforms.h> #include "display/nr-arena-item.h" #include "display/nr-arena.h" |