diff options
42 files changed, 69 insertions, 43 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 67b2d4918..208f31716 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -491,6 +491,7 @@ add_subdirectory(2geom) add_subdirectory(libavoid) add_subdirectory(libcola) add_subdirectory(libcroco) +add_subdirectory(libgc) add_subdirectory(libgdl) add_subdirectory(libuemf) add_subdirectory(libvpsc) diff --git a/src/Makefile.am b/src/Makefile.am index 1945c6f12..db70b3956 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,6 +29,7 @@ noinst_LIBRARIES = \ $(internal_GDL) \ libuemf/libuemf.a \ libcola/libcola.a \ + libgc/libgc.a \ libvpsc/libvpsc.a \ livarot/libvarot.a \ 2geom/lib2geom.a \ @@ -115,6 +116,7 @@ include filters/Makefile_insert include helper/Makefile_insert include io/Makefile_insert include libcroco/Makefile_insert +include libgc/Makefile_insert include libgdl/Makefile_insert include libnrtype/Makefile_insert include libavoid/Makefile_insert diff --git a/src/Makefile_insert b/src/Makefile_insert index 477180895..2bd457529 100644 --- a/src/Makefile_insert +++ b/src/Makefile_insert @@ -43,13 +43,8 @@ ink_common_sources += \ fill-or-stroke.h \ filter-chemistry.cpp filter-chemistry.h \ filter-enums.cpp filter-enums.h \ - gc-alloc.h \ - gc-anchored.h gc-anchored.cpp \ - gc-core.h \ - gc.cpp \ - gc-finalized.h gc-finalized.cpp \ - gc-managed.h \ - gc-soft-ptr.h \ + gc-anchored.cpp gc-anchored.h \ + gc-finalized.cpp gc-finalized.h \ gradient-chemistry.cpp gradient-chemistry.h \ gradient-drag.cpp gradient-drag.h \ graphlayout.cpp graphlayout.h \ diff --git a/src/composite-undo-stack-observer.h b/src/composite-undo-stack-observer.h index c93a2338b..00b1ab728 100644 --- a/src/composite-undo-stack-observer.h +++ b/src/composite-undo-stack-observer.h @@ -10,7 +10,7 @@ #ifndef SEEN_COMPOSITE_UNDO_COMMIT_OBSERVER_H #define SEEN_COMPOSITE_UNDO_COMMIT_OBSERVER_H -#include "gc-alloc.h" +#include "libgc/gc-alloc.h" #include "undo-stack-observer.h" #include <list> diff --git a/src/debug/demangle.cpp b/src/debug/demangle.cpp index 2b00fb8e9..a6386ebd2 100644 --- a/src/debug/demangle.cpp +++ b/src/debug/demangle.cpp @@ -14,7 +14,7 @@ #include <map> #include "debug/demangle.h" #include "util/format.h" -#include "gc-alloc.h" +#include "libgc/gc-alloc.h" namespace Inkscape { diff --git a/src/debug/gc-heap.h b/src/debug/gc-heap.h index 957f2067a..ec35a6d2f 100644 --- a/src/debug/gc-heap.h +++ b/src/debug/gc-heap.h @@ -12,7 +12,7 @@ #ifndef SEEN_INKSCAPE_DEBUG_GC_HEAP_H #define SEEN_INKSCAPE_DEBUG_GC_HEAP_H -#include "gc-core.h" +#include "libgc/gc-core.h" #include "debug/heap.h" namespace Inkscape { diff --git a/src/debug/heap.cpp b/src/debug/heap.cpp index 8e7a920ba..f522b737c 100644 --- a/src/debug/heap.cpp +++ b/src/debug/heap.cpp @@ -13,7 +13,7 @@ # include "config.h" #endif -#include "gc-alloc.h" +#include "libgc/gc-alloc.h" #include "debug/gc-heap.h" #include "debug/sysv-heap.h" #include <vector> diff --git a/src/debug/logger.cpp b/src/debug/logger.cpp index 485dbc365..5e977c764 100644 --- a/src/debug/logger.cpp +++ b/src/debug/logger.cpp @@ -15,7 +15,7 @@ #include "inkscape-version.h" #include "debug/logger.h" #include "debug/simple-event.h" -#include "gc-alloc.h" +#include "libgc/gc-alloc.h" namespace Inkscape { diff --git a/src/debug/simple-event.h b/src/debug/simple-event.h index 506ee1b03..7786a58d2 100644 --- a/src/debug/simple-event.h +++ b/src/debug/simple-event.h @@ -16,7 +16,7 @@ #include <vector> #include <glib.h> // g_assert() -#include "gc-alloc.h" +#include "libgc/gc-alloc.h" #include "debug/event.h" namespace Inkscape { 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; diff --git a/src/document-subset.h b/src/document-subset.h index 298b7872d..940124f83 100644 --- a/src/document-subset.h +++ b/src/document-subset.h @@ -14,7 +14,7 @@ #include <sigc++/connection.h> #include <sigc++/functors/slot.h> -#include "gc-managed.h" +#include "libgc/gc-managed.h" #include "gc-anchored.h" class SPObject; diff --git a/src/document.h b/src/document.h index 22c341eae..42768b1be 100644 --- a/src/document.h +++ b/src/document.h @@ -21,7 +21,7 @@ #include <sigc++/sigc++.h> #include "libcroco/cr-cascade.h" #include <2geom/forward.h> -#include "gc-managed.h" +#include "libgc/gc-managed.h" #include "gc-finalized.h" #include "gc-anchored.h" #include <glibmm/ustring.h> diff --git a/src/gc-allocator.h b/src/gc-allocator.h deleted file mode 100644 index e69de29bb..000000000 --- a/src/gc-allocator.h +++ /dev/null diff --git a/src/gc-anchored.h b/src/gc-anchored.h index 99b78c784..a65c4f248 100644 --- a/src/gc-anchored.h +++ b/src/gc-anchored.h @@ -9,7 +9,7 @@ #ifndef SEEN_INKSCAPE_GC_ANCHORED_H #define SEEN_INKSCAPE_GC_ANCHORED_H -#include "gc-managed.h" +#include "libgc/gc-managed.h" namespace Inkscape { diff --git a/src/gc-finalized.h b/src/gc-finalized.h index 814a2af18..2df479833 100644 --- a/src/gc-finalized.h +++ b/src/gc-finalized.h @@ -18,7 +18,7 @@ #include <new> #include <cstddef> -#include "gc-core.h" +#include "libgc/gc-core.h" namespace Inkscape { diff --git a/src/inkview.cpp b/src/inkview.cpp index 0b7b4d35c..5e96b56c5 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -47,7 +47,7 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "gc-core.h" +#include "libgc/gc-core.h" #include "preferences.h" #include <glibmm/i18n.h> diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp index b1e365fe2..ca8ab3475 100644 --- a/src/layer-manager.cpp +++ b/src/layer-manager.cpp @@ -11,7 +11,7 @@ #include <set> #include <sigc++/functors/mem_fun.h> #include <sigc++/adaptors/hide.h> -#include "gc-managed.h" +#include "libgc/gc-managed.h" #include "gc-finalized.h" #include "document.h" #include "desktop.h" diff --git a/src/layer-manager.h b/src/layer-manager.h index 9eea68004..8e108635d 100644 --- a/src/layer-manager.h +++ b/src/layer-manager.h @@ -15,7 +15,7 @@ #include "document-subset.h" #include "gc-finalized.h" -#include "gc-soft-ptr.h" +#include "libgc/gc-soft-ptr.h" class SPDesktop; class SPDocument; diff --git a/src/libgc/CMakeLists.txt b/src/libgc/CMakeLists.txt new file mode 100644 index 000000000..22dd464e1 --- /dev/null +++ b/src/libgc/CMakeLists.txt @@ -0,0 +1,15 @@ + +set(libgc_SRC + gc.cpp + + # ------- + # Headers + gc-alloc.h + gc-anchored.h + gc-core.h + gc-managed.h + gc-soft-ptr.h +) + +add_inkscape_lib(gc_LIB "${libgc_SRC}") +# add_inkscape_source("${libgc_SRC}") diff --git a/src/libgc/Makefile_insert b/src/libgc/Makefile_insert new file mode 100644 index 000000000..e899a5b4a --- /dev/null +++ b/src/libgc/Makefile_insert @@ -0,0 +1,13 @@ +## Makefile.am fragment sourced by src/Makefile.am. + +libgc/all: libgc/libgc.a + +libgc/clean: + rm -f libgc/libgc.a $(libgc_libgc_a_OBJECTS) + +libgc_libgc_a_SOURCES = \ + libgc/gc.cpp \ + libgc/gc-alloc.h \ + libgc/gc-core.h \ + libgc/gc-managed.h \ + libgc/gc-soft-ptr.h diff --git a/src/gc-alloc.h b/src/libgc/gc-alloc.h index ba672ae2c..765b28b19 100644 --- a/src/gc-alloc.h +++ b/src/libgc/gc-alloc.h @@ -17,7 +17,7 @@ #include <limits> #include <cstddef> -#include "gc-core.h" +#include "libgc/gc-core.h" namespace Inkscape { diff --git a/src/gc-core.h b/src/libgc/gc-core.h index d9d0bf4ff..d9d0bf4ff 100644 --- a/src/gc-core.h +++ b/src/libgc/gc-core.h diff --git a/src/gc-managed.h b/src/libgc/gc-managed.h index 74d224c9b..9f6d9c2f6 100644 --- a/src/gc-managed.h +++ b/src/libgc/gc-managed.h @@ -14,7 +14,7 @@ #ifndef SEEN_INKSCAPE_GC_MANAGED_H #define SEEN_INKSCAPE_GC_MANAGED_H -#include "gc-core.h" +#include "libgc/gc-core.h" namespace Inkscape { diff --git a/src/gc-soft-ptr.h b/src/libgc/gc-soft-ptr.h index 9e7304939..bb26ebb04 100644 --- a/src/gc-soft-ptr.h +++ b/src/libgc/gc-soft-ptr.h @@ -13,7 +13,7 @@ #ifndef SEEN_INKSCAPE_GC_SOFT_PTR_H #define SEEN_INKSCAPE_GC_SOFT_PTR_H -#include "gc-core.h" +#include "libgc/gc-core.h" namespace Inkscape { diff --git a/src/gc.cpp b/src/libgc/gc.cpp index 280a8b1dc..044fc6065 100644 --- a/src/gc.cpp +++ b/src/libgc/gc.cpp @@ -9,7 +9,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "gc-core.h" +#include "libgc/gc-core.h" #include <stdexcept> #include <cstring> #include <string> diff --git a/src/main.cpp b/src/main.cpp index 15576109d..5dd8b7cff 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -52,7 +52,7 @@ #include <glib-object.h> #include <gtk/gtk.h> -#include "gc-core.h" +#include "libgc/gc-core.h" #ifdef AND #undef AND diff --git a/src/message-stack.h b/src/message-stack.h index 42bf4e8a7..e8d2aa202 100644 --- a/src/message-stack.h +++ b/src/message-stack.h @@ -22,7 +22,7 @@ #include <glibmm/ustring.h> #include <sigc++/sigc++.h> -#include "gc-managed.h" +#include "libgc/gc-managed.h" #include "gc-finalized.h" #include "gc-anchored.h" #include "message.h" diff --git a/src/selection.h b/src/selection.h index 5964b20e8..e8c85241e 100644 --- a/src/selection.h +++ b/src/selection.h @@ -19,10 +19,10 @@ #include <stddef.h> #include <sigc++/sigc++.h> -#include "gc-managed.h" +#include "libgc/gc-managed.h" #include "gc-finalized.h" #include "gc-anchored.h" -#include "gc-soft-ptr.h" +#include "libgc/gc-soft-ptr.h" #include "sp-item.h" diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index 5802a1be3..f1c19d18e 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -32,7 +32,7 @@ #include <glibmm/ustring.h> #include <glibmm/i18n.h> #include <glib/gstdio.h> // for g_file_set_contents etc., used in _onGet and paste -#include "gc-core.h" +#include "libgc/gc-core.h" #include "xml/repr.h" #include "inkscape.h" #include "io/stringstream.h" diff --git a/src/ui/dialog/filedialog.cpp b/src/ui/dialog/filedialog.cpp index 00ed09551..ca46403a0 100644 --- a/src/ui/dialog/filedialog.cpp +++ b/src/ui/dialog/filedialog.cpp @@ -19,7 +19,7 @@ #include "filedialogimpl-gtkmm.h" #include "filedialog.h" -#include "gc-core.h" +#include "libgc/gc-core.h" #include "ui/dialog-events.h" #include "extension/output.h" #include "preferences.h" diff --git a/src/ui/dialog/filedialogimpl-win32.h b/src/ui/dialog/filedialogimpl-win32.h index f77249abd..1d3640646 100644 --- a/src/ui/dialog/filedialogimpl-win32.h +++ b/src/ui/dialog/filedialogimpl-win32.h @@ -24,7 +24,7 @@ #include "filedialogimpl-gtkmm.h" -#include "gc-core.h" +#include "libgc/gc-core.h" // define WINVER high enough so we get the correct OPENFILENAMEW size #ifndef WINVER #define WINVER 0x0500 diff --git a/src/ui/dialog/memory.cpp b/src/ui/dialog/memory.cpp index 0008eb284..e5fb6b563 100644 --- a/src/ui/dialog/memory.cpp +++ b/src/ui/dialog/memory.cpp @@ -20,7 +20,7 @@ #include <gtkmm/liststore.h> #include <gtkmm/treeview.h> -#include "gc-core.h" +#include "libgc/gc-core.h" #include "debug/heap.h" #include "verbs.h" diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp index c4dd9df98..e8778d14c 100644 --- a/src/ui/dialog/ocaldialogs.cpp +++ b/src/ui/dialog/ocaldialogs.cpp @@ -26,7 +26,7 @@ #include "path-prefix.h" #include "filedialogimpl-gtkmm.h" #include "ui/interface.h" -#include "gc-core.h" +#include "libgc/gc-core.h" #include "ui/dialog-events.h" #include "io/sys.h" #include "preferences.h" diff --git a/src/ui/view/view.h b/src/ui/view/view.h index 48f4d2549..8edff8709 100644 --- a/src/ui/view/view.h +++ b/src/ui/view/view.h @@ -15,7 +15,7 @@ #include <stddef.h> #include <sigc++/connection.h> #include "message.h" -#include "gc-managed.h" +#include "libgc/gc-managed.h" #include "gc-finalized.h" #include "gc-anchored.h" #include <2geom/forward.h> diff --git a/src/undo-stack-observer.h b/src/undo-stack-observer.h index 1057ace8f..a2bcb3a23 100644 --- a/src/undo-stack-observer.h +++ b/src/undo-stack-observer.h @@ -10,7 +10,7 @@ #ifndef SEEN_UNDO_COMMIT_OBSERVER_H #define SEEN_UNDO_COMMIT_OBSERVER_H -#include "gc-managed.h" +#include "libgc/gc-managed.h" namespace Inkscape { diff --git a/src/util/list.h b/src/util/list.h index de5a458e9..05a35320d 100644 --- a/src/util/list.h +++ b/src/util/list.h @@ -12,7 +12,7 @@ #include <cstddef> #include <iterator> -#include "gc-managed.h" +#include "libgc/gc-managed.h" #include "util/reference.h" namespace Inkscape { diff --git a/src/util/share.h b/src/util/share.h index 6b5e6a4ef..46685c593 100644 --- a/src/util/share.h +++ b/src/util/share.h @@ -12,7 +12,7 @@ #ifndef SEEN_INKSCAPE_UTIL_SHARE_H #define SEEN_INKSCAPE_UTIL_SHARE_H -#include "gc-core.h" +#include "libgc/gc-core.h" #include <cstring> #include <cstddef> diff --git a/src/xml/attribute-record.h b/src/xml/attribute-record.h index a61329b83..70691005e 100644 --- a/src/xml/attribute-record.h +++ b/src/xml/attribute-record.h @@ -6,7 +6,7 @@ #define SEEN_XML_SP_REPR_ATTR_H #include <glib.h> -#include "gc-managed.h" +#include "libgc/gc-managed.h" #include "util/share.h" #define SP_REPR_ATTRIBUTE_KEY(a) g_quark_to_string((a)->key) diff --git a/src/xml/composite-node-observer.h b/src/xml/composite-node-observer.h index 3e4b1673a..968fe20dd 100644 --- a/src/xml/composite-node-observer.h +++ b/src/xml/composite-node-observer.h @@ -15,7 +15,7 @@ #ifndef SEEN_INKSCAPE_XML_COMPOSITE_NODE_OBSERVER_H #define SEEN_INKSCAPE_XML_COMPOSITE_NODE_OBSERVER_H -#include "gc-managed.h" +#include "libgc/gc-managed.h" #include "xml/node-observer.h" #include "util/list-container.h" diff --git a/src/xml/event.h b/src/xml/event.h index d25ea0e07..bc63ca504 100644 --- a/src/xml/event.h +++ b/src/xml/event.h @@ -24,7 +24,7 @@ typedef unsigned int GQuark; #include <iterator> #include "util/share.h" #include "util/forward-pointer-iterator.h" -#include "gc-managed.h" +#include "libgc/gc-managed.h" #include "xml/node.h" namespace Inkscape { diff --git a/src/xml/log-builder.h b/src/xml/log-builder.h index aa8f2c1c6..e27a5e5ac 100644 --- a/src/xml/log-builder.h +++ b/src/xml/log-builder.h @@ -14,7 +14,7 @@ #ifndef SEEN_INKSCAPE_XML_LOG_BUILDER_H #define SEEN_INKSCAPE_XML_LOG_BUILDER_H -#include "gc-managed.h" +#include "libgc/gc-managed.h" #include "xml/node-observer.h" namespace Inkscape { diff --git a/src/xml/subtree.h b/src/xml/subtree.h index 11bf515f1..7b154bd65 100644 --- a/src/xml/subtree.h +++ b/src/xml/subtree.h @@ -15,7 +15,7 @@ #ifndef SEEN_INKSCAPE_XML_SUBTREE_H #define SEEN_INKSCAPE_XML_SUBTREE_H -#include "gc-managed.h" +#include "libgc/gc-managed.h" #include "xml/composite-node-observer.h" namespace Inkscape { |