diff options
41 files changed, 52 insertions, 52 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 208f31716..0b1e3931b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -491,7 +491,7 @@ add_subdirectory(2geom) add_subdirectory(libavoid) add_subdirectory(libcola) add_subdirectory(libcroco) -add_subdirectory(libgc) +add_subdirectory(inkgc) add_subdirectory(libgdl) add_subdirectory(libuemf) add_subdirectory(libvpsc) diff --git a/src/Makefile.am b/src/Makefile.am index a8f69fbfc..cfbbd4015 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,7 @@ noinst_LIBRARIES = \ $(internal_GDL) \ libuemf/libuemf.a \ libcola/libcola.a \ - libgc/libgc.a \ + inkgc/libinkgc.a \ libvpsc/libvpsc.a \ livarot/libvarot.a \ 2geom/lib2geom.a \ @@ -117,7 +117,7 @@ include filters/Makefile_insert include helper/Makefile_insert include io/Makefile_insert include libcroco/Makefile_insert -include libgc/Makefile_insert +include inkgc/Makefile_insert include libgdl/Makefile_insert include libnrtype/Makefile_insert include libavoid/Makefile_insert diff --git a/src/composite-undo-stack-observer.h b/src/composite-undo-stack-observer.h index 00b1ab728..33afda48d 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 "libgc/gc-alloc.h" +#include "inkgc/gc-alloc.h" #include "undo-stack-observer.h" #include <list> diff --git a/src/debug/demangle.cpp b/src/debug/demangle.cpp index a6386ebd2..1d94f0eb9 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 "libgc/gc-alloc.h" +#include "inkgc/gc-alloc.h" namespace Inkscape { diff --git a/src/debug/gc-heap.h b/src/debug/gc-heap.h index ec35a6d2f..d120ddba9 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 "libgc/gc-core.h" +#include "inkgc/gc-core.h" #include "debug/heap.h" namespace Inkscape { diff --git a/src/debug/heap.cpp b/src/debug/heap.cpp index f522b737c..0135a9ceb 100644 --- a/src/debug/heap.cpp +++ b/src/debug/heap.cpp @@ -13,7 +13,7 @@ # include "config.h" #endif -#include "libgc/gc-alloc.h" +#include "inkgc/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 5e977c764..2eb81a0ba 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 "libgc/gc-alloc.h" +#include "inkgc/gc-alloc.h" namespace Inkscape { diff --git a/src/debug/simple-event.h b/src/debug/simple-event.h index 7786a58d2..03ce5d326 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 "libgc/gc-alloc.h" +#include "inkgc/gc-alloc.h" #include "debug/event.h" namespace Inkscape { 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; diff --git a/src/document-subset.h b/src/document-subset.h index 940124f83..2799ff173 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 "libgc/gc-managed.h" +#include "inkgc/gc-managed.h" #include "gc-anchored.h" class SPObject; diff --git a/src/document.h b/src/document.h index 42768b1be..a33b476cc 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 "libgc/gc-managed.h" +#include "inkgc/gc-managed.h" #include "gc-finalized.h" #include "gc-anchored.h" #include <glibmm/ustring.h> diff --git a/src/gc-anchored.h b/src/gc-anchored.h index a65c4f248..33305df5c 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 "libgc/gc-managed.h" +#include "inkgc/gc-managed.h" namespace Inkscape { diff --git a/src/gc-finalized.h b/src/gc-finalized.h index 2df479833..d39338643 100644 --- a/src/gc-finalized.h +++ b/src/gc-finalized.h @@ -18,7 +18,7 @@ #include <new> #include <cstddef> -#include "libgc/gc-core.h" +#include "inkgc/gc-core.h" namespace Inkscape { diff --git a/src/libgc/CMakeLists.txt b/src/inkgc/CMakeLists.txt index 22dd464e1..22dd464e1 100644 --- a/src/libgc/CMakeLists.txt +++ b/src/inkgc/CMakeLists.txt diff --git a/src/inkgc/Makefile_insert b/src/inkgc/Makefile_insert new file mode 100644 index 000000000..58aa39bb9 --- /dev/null +++ b/src/inkgc/Makefile_insert @@ -0,0 +1,13 @@ +## Makefile.am fragment sourced by src/Makefile.am. + +inkgc/all: inkgc/libinkgc.a + +inkgc/clean: + rm -f inkgc/libinkgc.a $(inkgc_libinkgc_a_OBJECTS) + +inkgc_libinkgc_a_SOURCES = \ + inkgc/gc.cpp \ + inkgc/gc-alloc.h \ + inkgc/gc-core.h \ + inkgc/gc-managed.h \ + inkgc/gc-soft-ptr.h diff --git a/src/libgc/gc-alloc.h b/src/inkgc/gc-alloc.h index 765b28b19..917ee972d 100644 --- a/src/libgc/gc-alloc.h +++ b/src/inkgc/gc-alloc.h @@ -17,7 +17,7 @@ #include <limits> #include <cstddef> -#include "libgc/gc-core.h" +#include "inkgc/gc-core.h" namespace Inkscape { diff --git a/src/libgc/gc-core.h b/src/inkgc/gc-core.h index d9d0bf4ff..d9d0bf4ff 100644 --- a/src/libgc/gc-core.h +++ b/src/inkgc/gc-core.h diff --git a/src/libgc/gc-managed.h b/src/inkgc/gc-managed.h index 9f6d9c2f6..f435d7802 100644 --- a/src/libgc/gc-managed.h +++ b/src/inkgc/gc-managed.h @@ -14,7 +14,7 @@ #ifndef SEEN_INKSCAPE_GC_MANAGED_H #define SEEN_INKSCAPE_GC_MANAGED_H -#include "libgc/gc-core.h" +#include "inkgc/gc-core.h" namespace Inkscape { diff --git a/src/libgc/gc-soft-ptr.h b/src/inkgc/gc-soft-ptr.h index bb26ebb04..45a3ddcf7 100644 --- a/src/libgc/gc-soft-ptr.h +++ b/src/inkgc/gc-soft-ptr.h @@ -13,7 +13,7 @@ #ifndef SEEN_INKSCAPE_GC_SOFT_PTR_H #define SEEN_INKSCAPE_GC_SOFT_PTR_H -#include "libgc/gc-core.h" +#include "inkgc/gc-core.h" namespace Inkscape { diff --git a/src/libgc/gc.cpp b/src/inkgc/gc.cpp index 044fc6065..90c02d9c8 100644 --- a/src/libgc/gc.cpp +++ b/src/inkgc/gc.cpp @@ -9,7 +9,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "libgc/gc-core.h" +#include "inkgc/gc-core.h" #include <stdexcept> #include <cstring> #include <string> diff --git a/src/inkview.cpp b/src/inkview.cpp index 5e96b56c5..2c667237e 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -47,7 +47,7 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "libgc/gc-core.h" +#include "inkgc/gc-core.h" #include "preferences.h" #include <glibmm/i18n.h> diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp index ca8ab3475..3bbc831d5 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 "libgc/gc-managed.h" +#include "inkgc/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 8e108635d..a304929c6 100644 --- a/src/layer-manager.h +++ b/src/layer-manager.h @@ -15,7 +15,7 @@ #include "document-subset.h" #include "gc-finalized.h" -#include "libgc/gc-soft-ptr.h" +#include "inkgc/gc-soft-ptr.h" class SPDesktop; class SPDocument; diff --git a/src/libgc/Makefile_insert b/src/libgc/Makefile_insert deleted file mode 100644 index e899a5b4a..000000000 --- a/src/libgc/Makefile_insert +++ /dev/null @@ -1,13 +0,0 @@ -## 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/main.cpp b/src/main.cpp index 5dd8b7cff..415118407 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -52,7 +52,7 @@ #include <glib-object.h> #include <gtk/gtk.h> -#include "libgc/gc-core.h" +#include "inkgc/gc-core.h" #ifdef AND #undef AND diff --git a/src/message-stack.h b/src/message-stack.h index e8d2aa202..ed0315cf5 100644 --- a/src/message-stack.h +++ b/src/message-stack.h @@ -22,7 +22,7 @@ #include <glibmm/ustring.h> #include <sigc++/sigc++.h> -#include "libgc/gc-managed.h" +#include "inkgc/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 e8c85241e..19e2ae1fd 100644 --- a/src/selection.h +++ b/src/selection.h @@ -19,10 +19,10 @@ #include <stddef.h> #include <sigc++/sigc++.h> -#include "libgc/gc-managed.h" +#include "inkgc/gc-managed.h" #include "gc-finalized.h" #include "gc-anchored.h" -#include "libgc/gc-soft-ptr.h" +#include "inkgc/gc-soft-ptr.h" #include "sp-item.h" diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index f1c19d18e..f1d0ff576 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 "libgc/gc-core.h" +#include "inkgc/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 ca46403a0..4e4b0278a 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 "libgc/gc-core.h" +#include "inkgc/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 1d3640646..8c3b6bad6 100644 --- a/src/ui/dialog/filedialogimpl-win32.h +++ b/src/ui/dialog/filedialogimpl-win32.h @@ -24,7 +24,7 @@ #include "filedialogimpl-gtkmm.h" -#include "libgc/gc-core.h" +#include "inkgc/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 e5fb6b563..c0bc884fa 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 "libgc/gc-core.h" +#include "inkgc/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 e8778d14c..a1c7d41bd 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 "libgc/gc-core.h" +#include "inkgc/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 8edff8709..21a5d0dfc 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 "libgc/gc-managed.h" +#include "inkgc/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 a2bcb3a23..dadb4764e 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 "libgc/gc-managed.h" +#include "inkgc/gc-managed.h" namespace Inkscape { diff --git a/src/util/list.h b/src/util/list.h index 05a35320d..563b6091c 100644 --- a/src/util/list.h +++ b/src/util/list.h @@ -12,7 +12,7 @@ #include <cstddef> #include <iterator> -#include "libgc/gc-managed.h" +#include "inkgc/gc-managed.h" #include "util/reference.h" namespace Inkscape { diff --git a/src/util/share.h b/src/util/share.h index 46685c593..8f1e7045a 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 "libgc/gc-core.h" +#include "inkgc/gc-core.h" #include <cstring> #include <cstddef> diff --git a/src/xml/attribute-record.h b/src/xml/attribute-record.h index 70691005e..7caeab6b6 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 "libgc/gc-managed.h" +#include "inkgc/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 968fe20dd..6e93a57da 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 "libgc/gc-managed.h" +#include "inkgc/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 bc63ca504..73e68daeb 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 "libgc/gc-managed.h" +#include "inkgc/gc-managed.h" #include "xml/node.h" namespace Inkscape { diff --git a/src/xml/log-builder.h b/src/xml/log-builder.h index e27a5e5ac..e94dd1daa 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 "libgc/gc-managed.h" +#include "inkgc/gc-managed.h" #include "xml/node-observer.h" namespace Inkscape { diff --git a/src/xml/subtree.h b/src/xml/subtree.h index 7b154bd65..bc6ae913a 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 "libgc/gc-managed.h" +#include "inkgc/gc-managed.h" #include "xml/composite-node-observer.h" namespace Inkscape { |