From a609c4ecbcadb7b87e9a5956f8c95b4edefd829b Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Wed, 25 Feb 2015 14:27:51 -0500 Subject: Remove useless file (bzr r13945) --- src/display/CMakeLists.txt | 1 - src/display/Makefile_insert | 1 - src/display/nr-filter-utils.cpp | 21 --------------------- 3 files changed, 23 deletions(-) delete mode 100644 src/display/nr-filter-utils.cpp (limited to 'src/display') diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index 800c4d0d4..d4f8c16ff 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -42,7 +42,6 @@ set(display_SRC nr-filter-tile.cpp nr-filter-turbulence.cpp nr-filter-units.cpp - nr-filter-utils.cpp nr-filter.cpp nr-light.cpp nr-style.cpp diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert index 2355c3653..20e498981 100644 --- a/src/display/Makefile_insert +++ b/src/display/Makefile_insert @@ -90,7 +90,6 @@ ink_common_sources += \ display/nr-filter-types.h \ display/nr-filter-units.cpp \ display/nr-filter-units.h \ - display/nr-filter-utils.cpp \ display/nr-filter-utils.h \ display/nr-light.cpp \ display/nr-light.h \ diff --git a/src/display/nr-filter-utils.cpp b/src/display/nr-filter-utils.cpp deleted file mode 100644 index 1ba341791..000000000 --- a/src/display/nr-filter-utils.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "nr-filter-utils.h" - -namespace Inkscape { -namespace Filters { - -/* Everything moved to .h, because they were short functions that should - * get inlined */ - -} /* namespace Filters */ -} /* namespace Inkscape */ - -/* - 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:fileencoding=utf-8:textwidth=99 : -- cgit v1.2.3 From 5865f0044d4d75a2d988a8bf2ea3bc65ed6f4c18 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Wed, 25 Feb 2015 17:24:47 -0500 Subject: Isolate components of libgc (bzr r13946) --- src/display/nr-filter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/display') diff --git a/src/display/nr-filter.h b/src/display/nr-filter.h index 9a30efabd..4c42b6f28 100644 --- a/src/display/nr-filter.h +++ b/src/display/nr-filter.h @@ -18,7 +18,7 @@ #include "display/nr-filter-types.h" #include "svg/svg-length.h" #include "sp-filter-units.h" -#include "gc-managed.h" +#include "libgc/gc-managed.h" namespace Inkscape { class DrawingContext; -- cgit v1.2.3 From caefef71482531ff82c444d552f406cbfbd360b8 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Wed, 25 Feb 2015 18:08:51 -0500 Subject: Collect util/ into a static library (bzr r13948) --- src/display/canvas-axonomgrid.cpp | 2 +- src/display/canvas-grid.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/display') diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index 88c23bf62..a2df86823 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -50,7 +50,7 @@ #include "svg/svg-color.h" #include "2geom/line.h" #include "2geom/angle.h" -#include "util/mathfns.h" +#include "helper/mathfns.h" #include "round.h" #include "util/units.h" diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index 0f58096ce..9b9f64529 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -35,7 +35,7 @@ #include "ui/widget/registered-widget.h" #include "desktop.h" #include "sp-canvas-util.h" -#include "util/mathfns.h" +#include "helper/mathfns.h" #include "display/cairo-utils.h" #include "display/canvas-axonomgrid.h" @@ -50,7 +50,7 @@ #include "sp-root.h" #include "svg/svg-color.h" #include "svg/stringstream.h" -#include "util/mathfns.h" +#include "helper/mathfns.h" #include "xml/node-event-vector.h" #include "verbs.h" #include "display/sp-canvas.h" -- cgit v1.2.3 From 3b0e6ebad7223a61510fad03e241ceadfae961f0 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Wed, 25 Feb 2015 21:49:35 -0500 Subject: Rename libgc/ => inkgc/ to reflect difference from Boehm GC (bzr r13950) --- src/display/nr-filter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/display') diff --git a/src/display/nr-filter.h b/src/display/nr-filter.h index 4c42b6f28..211d8ddd9 100644 --- a/src/display/nr-filter.h +++ b/src/display/nr-filter.h @@ -18,7 +18,7 @@ #include "display/nr-filter-types.h" #include "svg/svg-length.h" #include "sp-filter-units.h" -#include "libgc/gc-managed.h" +#include "inkgc/gc-managed.h" namespace Inkscape { class DrawingContext; -- cgit v1.2.3