summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2015-12-09 20:01:20 +0000
committertavmjong-free <tavmjong@free.fr>2015-12-09 20:01:20 +0000
commit97324d275423a8367fdd671cbdda8097f26b0b10 (patch)
tree730005ac9db6b76cccdab28388fc3314412e85f9 /src
parentRemove unnecesary headers for GTK3 (diff)
downloadinkscape-97324d275423a8367fdd671cbdda8097f26b0b10.tar.gz
inkscape-97324d275423a8367fdd671cbdda8097f26b0b10.zip
Remove unused header file.
(bzr r14522)
Diffstat (limited to 'src')
-rw-r--r--src/extension/execution-env.cpp2
-rw-r--r--src/extension/implementation/implementation.cpp1
-rw-r--r--src/extension/implementation/script.cpp1
-rw-r--r--src/extension/internal/bitmap/imagemagick.cpp1
-rw-r--r--src/extension/internal/bluredge.cpp2
-rw-r--r--src/extension/internal/filter/filter.cpp1
-rw-r--r--src/extension/internal/grid.cpp1
-rw-r--r--src/graphlayout.cpp1
-rw-r--r--src/removeoverlap.cpp1
-rw-r--r--src/ui/dialog/align-and-distribute.cpp1
-rw-r--r--src/ui/dialog/transformation.cpp1
-rw-r--r--src/util/CMakeLists.txt1
-rw-r--r--src/util/Makefile_insert1
-rw-r--r--src/util/glib-list-iterators.h237
-rw-r--r--src/widgets/pencil-toolbar.cpp1
15 files changed, 0 insertions, 253 deletions
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 27d19fdff..31491605b 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -30,8 +30,6 @@
#include "display/sp-canvas.h"
-#include "util/glib-list-iterators.h"
-
namespace Inkscape {
namespace Extension {
diff --git a/src/extension/implementation/implementation.cpp b/src/extension/implementation/implementation.cpp
index b0ff3e91c..92a8a2833 100644
--- a/src/extension/implementation/implementation.cpp
+++ b/src/extension/implementation/implementation.cpp
@@ -23,7 +23,6 @@
#include "desktop.h"
#include "ui/view/view.h"
-#include "util/glib-list-iterators.h"
namespace Inkscape {
namespace Extension {
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 52cc7a2ca..4a929fa08 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -42,7 +42,6 @@
#include "xml/node.h"
#include "xml/attribute-record.h"
-#include "util/glib-list-iterators.h"
#include "path-prefix.h"
#ifdef WIN32
diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
index 40d548a24..a235dcb0f 100644
--- a/src/extension/internal/bitmap/imagemagick.cpp
+++ b/src/extension/internal/bitmap/imagemagick.cpp
@@ -24,7 +24,6 @@
#include "selection.h"
#include "sp-object.h"
-#include "util/glib-list-iterators.h"
#include "extension/effect.h"
#include "extension/system.h"
diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp
index 9f19f8b3b..0e3aa98ce 100644
--- a/src/extension/internal/bluredge.cpp
+++ b/src/extension/internal/bluredge.cpp
@@ -22,8 +22,6 @@
#include "path-chemistry.h"
#include "sp-item.h"
-#include "util/glib-list-iterators.h"
-
#include "extension/effect.h"
#include "extension/system.h"
diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp
index 65162af22..25e89bbf3 100644
--- a/src/extension/internal/filter/filter.cpp
+++ b/src/extension/internal/filter/filter.cpp
@@ -11,7 +11,6 @@
#include "selection.h"
#include "document-private.h"
#include "sp-item.h"
-#include "util/glib-list-iterators.h"
#include "extension/extension.h"
#include "extension/effect.h"
#include "extension/system.h"
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index 8fd82b675..8a9c7a72f 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -24,7 +24,6 @@
#include "document.h"
#include "selection.h"
#include "sp-object.h"
-#include "util/glib-list-iterators.h"
#include "2geom/geom.h"
#include "svg/path-string.h"
diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp
index 39ffb6cc7..3956b39fe 100644
--- a/src/graphlayout.cpp
+++ b/src/graphlayout.cpp
@@ -25,7 +25,6 @@
#include "desktop.h"
#include "inkscape.h"
#include "sp-namedview.h"
-#include "util/glib-list-iterators.h"
#include "graphlayout.h"
#include "sp-path.h"
#include "sp-item.h"
diff --git a/src/removeoverlap.cpp b/src/removeoverlap.cpp
index 9ea75de0d..138577fb8 100644
--- a/src/removeoverlap.cpp
+++ b/src/removeoverlap.cpp
@@ -12,7 +12,6 @@
*/
#include <utility>
#include <2geom/transforms.h>
-#include "util/glib-list-iterators.h"
#include "sp-item.h"
#include "sp-item-transform.h"
#include "libvpsc/generate-constraints.h"
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 6a9c3db6b..9e7861217 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -42,7 +42,6 @@
#include "ui/icon-names.h"
#include "ui/tools/node-tool.h"
#include "ui/tool/multi-path-manipulator.h"
-#include "util/glib-list-iterators.h"
#include "verbs.h"
#include "widgets/icon.h"
#include "sp-root.h"
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index ae972bbbd..b7638e8c1 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -35,7 +35,6 @@
#include "sp-item-transform.h"
#include "macros.h"
#include "sp-item.h"
-#include "util/glib-list-iterators.h"
#include "ui/icon-names.h"
#include "widgets/icon.h"
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 8fd8c8c66..9680b6377 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -24,7 +24,6 @@ set(util_SRC
format.h
forward-pointer-iterator.h
function.h
- glib-list-iterators.h
list-container-test.h
list-container.h
list-copy.h
diff --git a/src/util/Makefile_insert b/src/util/Makefile_insert
index c23dffbca..2a778e660 100644
--- a/src/util/Makefile_insert
+++ b/src/util/Makefile_insert
@@ -25,7 +25,6 @@ util_libutil_a_SOURCES = \
util/format.h \
util/forward-pointer-iterator.h \
util/function.h \
- util/glib-list-iterators.h \
util/list.h \
util/list-container.h \
util/list-copy.h \
diff --git a/src/util/glib-list-iterators.h b/src/util/glib-list-iterators.h
deleted file mode 100644
index 6244e5b18..000000000
--- a/src/util/glib-list-iterators.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Inkscape::Util::GSListIterator - STL iterator for GSList
- * Inkscape::Util::GSListConstIterator - STL iterator for GSList
- * Inkscape::Util::GListIterator - STL iterator for GList
- * Inkscape::Util::GListConstIterator - STL iterator for GList
- *
- * Authors:
- * MenTaLguY <mental@rydia.net>
- *
- * Copyright (C) 2005 MenTaLguY
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#ifndef SEEN_INKSCAPE_GLIB_LIST_ITERATORS_H
-#define SEEN_INKSCAPE_GLIB_LIST_ITERATORS_H
-
-#include <cstddef>
-#include <iterator>
-#include <glib.h>
-
-namespace Inkscape {
-
-namespace Util {
-
-template <typename T> class GSListConstIterator;
-template <typename T> class GSListIterator;
-template <typename T> class GListConstIterator;
-template <typename T> class GListIterator;
-
-template <typename T>
-class GSListConstIterator<T *> {
-public:
- typedef std::forward_iterator_tag iterator_category;
- typedef T * const value_type G_GNUC_MAY_ALIAS;
- typedef std::ptrdiff_t difference_type;
- typedef value_type *pointer;
- typedef value_type &reference;
-
- GSListConstIterator(GSList const *list) : _list(list) {}
- // default copy
- // default assign
- GSList const *list() const { return _list; }
-
- reference operator*() const {
- return *reinterpret_cast<pointer>(&_list->data);
- }
-
- bool operator==(GSListConstIterator const &other) {
- return other._list == _list;
- }
- bool operator!=(GSListConstIterator const &other) {
- return other._list != _list;
- }
-
- GSListConstIterator &operator++() {
- _list = _list->next;
- return *this;
- }
- GSListConstIterator operator++(int) {
- GSListConstIterator saved=*this;
- _list = _list->next;
- return saved;
- }
-
-private:
- GSList const *_list;
-};
-
-template <typename T>
-class GSListIterator<T *> {
-public:
- typedef std::forward_iterator_tag iterator_category;
- typedef T *value_type G_GNUC_MAY_ALIAS;
- typedef std::ptrdiff_t difference_type;
- typedef value_type *pointer;
- typedef value_type &reference;
- typedef value_type const &const_reference;
-
- GSListIterator(GSList *list) : _list(list) {}
- // default copy
- // default assign
- operator GSListConstIterator<T *>() const { return _list; }
- GSList const *list() const { return _list; }
- GSList *list() { return _list; }
-
- const_reference operator*() const {
- return *reinterpret_cast<pointer>(&_list->data);
- }
- reference operator*() {
- return *reinterpret_cast<pointer>(&_list->data);
- }
-
- bool operator==(GSListIterator const &other) {
- return other._list == _list;
- }
- bool operator!=(GSListIterator const &other) {
- return other._list != _list;
- }
-
- GSListIterator &operator++() {
- _list = _list->next;
- return *this;
- }
- GSListIterator operator++(int) {
- GSListIterator saved=*this;
- _list = _list->next;
- return saved;
- }
-
-private:
- GSList *_list;
-};
-
-template <typename T>
-class GListConstIterator<T *> {
-public:
- typedef std::bidirectional_iterator_tag iterator_category;
- typedef T * const value_type G_GNUC_MAY_ALIAS;
- typedef std::ptrdiff_t difference_type;
- typedef value_type *pointer;
- typedef value_type &reference;
-
- GListConstIterator(GList const *list) : _list(list) {}
- // default copy
- // default assign
- GList const *list() const { return _list; }
-
- reference operator*() const {
- return *reinterpret_cast<pointer>(&_list->data);
- }
-
- bool operator==(GListConstIterator const &other) {
- return other._list == _list;
- }
- bool operator!=(GListConstIterator const &other) {
- return other._list != _list;
- }
-
- GListConstIterator &operator++() {
- _list = _list->next;
- return *this;
- }
- GListConstIterator operator++(int) {
- GListConstIterator saved=*this;
- _list = _list->next;
- return saved;
- }
-
- GListConstIterator &operator--() {
- _list = _list->prev;
- return *this;
- }
- GListConstIterator operator--(int) {
- GListConstIterator saved=*this;
- _list = _list->prev;
- return saved;
- }
-
-private:
- GList const *_list;
-};
-
-template <typename T>
-class GListIterator<T *> {
-public:
- typedef std::bidirectional_iterator_tag iterator_category;
- typedef T *value_type G_GNUC_MAY_ALIAS;
- typedef std::ptrdiff_t difference_type;
- typedef value_type *pointer;
- typedef value_type &reference;
- typedef value_type const &const_reference;
-
- GListIterator(GList *list) : _list(list) {}
- // default copy
- // default assign
- operator GSListConstIterator<T *>() const {
- return reinterpret_cast<GSList *>(_list);
- }
- operator GSListIterator<T *>() const {
- return reinterpret_cast<GSList *>(_list);
- }
- operator GListConstIterator<T *>() const { return _list; }
- GList const *list() const { return _list; }
- GList *list() { return _list; }
-
- const_reference operator*() const {
- return *reinterpret_cast<pointer>(&_list->data);
- }
- reference operator*() { return *reinterpret_cast<pointer>(&_list->data); }
-
- bool operator==(GListIterator const &other) {
- return other._list == _list;
- }
- bool operator!=(GListIterator const &other) {
- return other._list != _list;
- }
-
- GListIterator &operator++() {
- _list = _list->next;
- return *this;
- }
- GListIterator operator++(int) {
- GListIterator saved=*this;
- _list = _list->next;
- return saved;
- }
-
- GListIterator &operator--() {
- _list = _list->prev;
- return *this;
- }
- GListIterator operator--(int) {
- GListIterator saved=*this;
- _list = _list->prev;
- return saved;
- }
-
-private:
- GList *_list;
-};
-
-}
-
-}
-
-#endif
-/*
- 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 :
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index aed80a66f..94875ecc1 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -53,7 +53,6 @@
#include "live_effects/lpeobject.h"
#include "live_effects/lpeobject-reference.h"
#include "sp-lpe-item.h"
-#include "util/glib-list-iterators.h"
using Inkscape::UI::UXManager;
using Inkscape::UI::ToolboxFactory;