summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/arc-context.cpp1
-rw-r--r--src/box3d-context.cpp2
-rw-r--r--src/display/sp-canvas-item.h2
-rw-r--r--src/draw-anchor.cpp4
-rw-r--r--src/event-context.cpp1
-rw-r--r--src/flood-context.cpp1
-rw-r--r--src/knot-holder-entity.cpp1
-rw-r--r--src/knot-holder-entity.h2
-rw-r--r--src/knotholder.cpp1
-rw-r--r--src/knotholder.h10
-rw-r--r--src/line-geometry.cpp1
-rw-r--r--src/line-geometry.h3
-rw-r--r--src/livarot/PathCutting.cpp1
-rw-r--r--src/object-edit.cpp2
-rw-r--r--src/rect-context.cpp1
-rw-r--r--src/select-context.cpp2
-rw-r--r--src/seltrans-handles.h1
-rw-r--r--src/seltrans.cpp1
-rw-r--r--src/spiral-context.cpp1
-rw-r--r--src/star-context.cpp1
-rw-r--r--src/text-context.cpp1
-rw-r--r--src/ui/control-manager.cpp2
-rw-r--r--src/vanishing-point.cpp1
23 files changed, 21 insertions, 22 deletions
diff --git a/src/arc-context.cpp b/src/arc-context.cpp
index b913ab9f0..dfd2ca9d9 100644
--- a/src/arc-context.cpp
+++ b/src/arc-context.cpp
@@ -35,7 +35,6 @@
#include "sp-metrics.h"
#include "xml/repr.h"
#include "xml/node-event-vector.h"
-#include "object-edit.h"
#include "preferences.h"
#include "message-context.h"
#include "desktop.h"
diff --git a/src/box3d-context.cpp b/src/box3d-context.cpp
index 5a94e3c68..72bcc5d8f 100644
--- a/src/box3d-context.cpp
+++ b/src/box3d-context.cpp
@@ -29,6 +29,7 @@
#include "desktop-handles.h"
#include "snap.h"
#include "display/curve.h"
+#include "display/sp-canvas-item.h"
#include "desktop.h"
#include "message-context.h"
#include "pixmaps/cursor-3dbox.xpm"
@@ -36,7 +37,6 @@
#include "box3d-context.h"
#include "sp-metrics.h"
#include <glibmm/i18n.h>
-#include "object-edit.h"
#include "xml/repr.h"
#include "xml/node-event-vector.h"
#include "preferences.h"
diff --git a/src/display/sp-canvas-item.h b/src/display/sp-canvas-item.h
index 7e4fe5510..ecbbd2758 100644
--- a/src/display/sp-canvas-item.h
+++ b/src/display/sp-canvas-item.h
@@ -89,8 +89,6 @@ SPCanvasItem *sp_canvas_item_new(SPCanvasGroup *parent, GType type, const gchar
G_END_DECLS
-#define sp_canvas_item_set g_object_set
-
void sp_canvas_item_affine_absolute(SPCanvasItem *item, Geom::Affine const &aff);
void sp_canvas_item_raise(SPCanvasItem *item, int positions);
diff --git a/src/draw-anchor.cpp b/src/draw-anchor.cpp
index 62a091608..591129d0b 100644
--- a/src/draw-anchor.cpp
+++ b/src/draw-anchor.cpp
@@ -82,14 +82,14 @@ SPDrawAnchor *sp_draw_anchor_test(SPDrawAnchor *anchor, Geom::Point w, gboolean
if ( activate && ( Geom::LInfty( w - dt->d2w(anchor->dp) ) <= (ctrl->box.width() / 2.0) ) ) {
if (!anchor->active) {
- sp_canvas_item_set((GtkObject *) anchor->ctrl, "fill_color", FILL_COLOR_MOUSEOVER, NULL);
+ g_object_set(anchor->ctrl, "fill_color", FILL_COLOR_MOUSEOVER, NULL);
anchor->active = TRUE;
}
return anchor;
}
if (anchor->active) {
- sp_canvas_item_set((GtkObject *) anchor->ctrl, "fill_color", FILL_COLOR_NORMAL, NULL);
+ g_object_set(anchor->ctrl, "fill_color", FILL_COLOR_NORMAL, NULL);
anchor->active = FALSE;
}
return NULL;
diff --git a/src/event-context.cpp b/src/event-context.cpp
index fbde681d8..a1f1d2b97 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -45,7 +45,6 @@
#include "preferences.h"
#include "message-context.h"
#include "gradient-drag.h"
-#include "object-edit.h"
#include "attributes.h"
#include "rubberband.h"
#include "selcue.h"
diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index c906ffdab..f09dec7f4 100644
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
@@ -47,7 +47,6 @@
#include "macros.h"
#include "message-context.h"
#include "message-stack.h"
-#include "object-edit.h"
#include "preferences.h"
#include "rubberband.h"
#include "selection.h"
diff --git a/src/knot-holder-entity.cpp b/src/knot-holder-entity.cpp
index 9f072d8f5..cb8f29f46 100644
--- a/src/knot-holder-entity.cpp
+++ b/src/knot-holder-entity.cpp
@@ -15,6 +15,7 @@
* Released under GNU GPL
*/
+#include "knot-holder-entity.h"
#include "knotholder.h"
#include "sp-item.h"
#include "style.h"
diff --git a/src/knot-holder-entity.h b/src/knot-holder-entity.h
index 07bd628fc..78ece7b05 100644
--- a/src/knot-holder-entity.h
+++ b/src/knot-holder-entity.h
@@ -34,8 +34,6 @@ namespace LivePathEffect {
typedef void (* SPKnotHolderSetFunc) (SPItem *item, Geom::Point const &p, Geom::Point const &origin, guint state);
typedef Geom::Point (* SPKnotHolderGetFunc) (SPItem *item);
-/* fixme: Think how to make callbacks most sensitive (Lauris) */
-typedef void (* SPKnotHolderReleasedFunc) (SPItem *item);
/**
* KnotHolderEntity definition.
diff --git a/src/knotholder.cpp b/src/knotholder.cpp
index 81c7e3890..a1ee3082b 100644
--- a/src/knotholder.cpp
+++ b/src/knotholder.cpp
@@ -19,6 +19,7 @@
#include "sp-shape.h"
#include "knot.h"
#include "knotholder.h"
+#include "knot-holder-entity.h"
#include "rect-context.h"
#include "sp-rect.h"
#include "arc-context.h"
diff --git a/src/knotholder.h b/src/knotholder.h
index 2d195e7b4..792a0c912 100644
--- a/src/knotholder.h
+++ b/src/knotholder.h
@@ -20,8 +20,8 @@
#include <glib.h>
#include "knot-enums.h"
#include <2geom/forward.h>
-#include "knot-holder-entity.h"
#include <list>
+#include <sigc++/connection.h>
namespace Inkscape {
namespace XML {
@@ -32,6 +32,14 @@ class PowerStrokePointArrayParamKnotHolderEntity;
}
}
+class KnotHolderEntity;
+class SPItem;
+class SPDesktop;
+class SPKnot;
+
+/* fixme: Think how to make callbacks most sensitive (Lauris) */
+typedef void (* SPKnotHolderReleasedFunc) (SPItem *item);
+
class KnotHolder {
public:
KnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler);
diff --git a/src/line-geometry.cpp b/src/line-geometry.cpp
index c88911bf4..e9f07f96f 100644
--- a/src/line-geometry.cpp
+++ b/src/line-geometry.cpp
@@ -15,6 +15,7 @@
#include "desktop-style.h"
#include "desktop-handles.h"
#include "display/sp-canvas.h"
+#include "display/sp-ctrlline.h"
#include "display/sodipodi-ctrl.h"
#include "ui/control-manager.h"
diff --git a/src/line-geometry.h b/src/line-geometry.h
index 472478e3b..dcd157d47 100644
--- a/src/line-geometry.h
+++ b/src/line-geometry.h
@@ -14,9 +14,8 @@
#include <boost/optional.hpp>
#include "glib.h"
-#include "display/sp-ctrlline.h"
#include "axis-manip.h" // FIXME: This is only for Box3D::epsilon; move that to a better location
-
+#include "2geom/point.h"
#include "document.h"
#include "ui/view/view.h"
diff --git a/src/livarot/PathCutting.cpp b/src/livarot/PathCutting.cpp
index e47ed8916..9e6226ccc 100644
--- a/src/livarot/PathCutting.cpp
+++ b/src/livarot/PathCutting.cpp
@@ -25,7 +25,6 @@
#include <2geom/affine.h>
#include <2geom/sbasis-to-bezier.h>
#include <2geom/curves.h>
-#include "../display/canvas-bpath.h"
#include "helper/geom-curves.h"
#include "helper/geom.h"
diff --git a/src/object-edit.cpp b/src/object-edit.cpp
index 773bd48e6..b91a6d1e9 100644
--- a/src/object-edit.cpp
+++ b/src/object-edit.cpp
@@ -17,7 +17,6 @@
#include "sp-item.h"
-#include "display/sp-canvas-item.h"
#include "sp-rect.h"
#include "box3d.h"
#include "sp-ellipse.h"
@@ -37,6 +36,7 @@
#include "object-edit.h"
#include "xml/repr.h"
#include <2geom/math-utils.h>
+#include "knot-holder-entity.h"
#define sp_round(v,m) (((v) < 0.0) ? ((ceil((v) / (m) - 0.5)) * (m)) : ((floor((v) / (m) + 0.5)) * (m)))
diff --git a/src/rect-context.cpp b/src/rect-context.cpp
index 86c466df7..537ab5c19 100644
--- a/src/rect-context.cpp
+++ b/src/rect-context.cpp
@@ -37,7 +37,6 @@
#include "rect-context.h"
#include "sp-metrics.h"
#include <glibmm/i18n.h>
-#include "object-edit.h"
#include "xml/repr.h"
#include "xml/node-event-vector.h"
#include "preferences.h"
diff --git a/src/select-context.cpp b/src/select-context.cpp
index ec90d3e53..06662d1e7 100644
--- a/src/select-context.cpp
+++ b/src/select-context.cpp
@@ -25,7 +25,6 @@
#include "document.h"
#include "document-undo.h"
#include "selection.h"
-#include "seltrans-handles.h"
#include "sp-cursor.h"
#include "pixmaps/cursor-select-m.xpm"
#include "pixmaps/cursor-select-d.xpm"
@@ -47,6 +46,7 @@
#include "seltrans.h"
#include "box3d.h"
#include "display/sp-canvas.h"
+#include "display/sp-canvas-item.h"
#include "display/drawing-item.h"
#if !GTK_CHECK_VERSION(2,22,0)
diff --git a/src/seltrans-handles.h b/src/seltrans-handles.h
index f58524c1a..f625ebd68 100644
--- a/src/seltrans-handles.h
+++ b/src/seltrans-handles.h
@@ -12,7 +12,6 @@
* Released under GNU GPL, read the file 'COPYING' for more information
*/
-#include "display/sodipodi-ctrl.h"
#include <2geom/forward.h>
#include <gdk/gdk.h>
#include "enums.h"
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index f480a4824..4b0ef284b 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -41,6 +41,7 @@
#include "verbs.h"
#include <glibmm/i18n.h>
#include "display/sp-ctrlline.h"
+#include "display/sodipodi-ctrl.h"
#include "preferences.h"
#include "xml/repr.h"
#include "mod360.h"
diff --git a/src/spiral-context.cpp b/src/spiral-context.cpp
index 8bef16d87..4e3829c4d 100644
--- a/src/spiral-context.cpp
+++ b/src/spiral-context.cpp
@@ -36,7 +36,6 @@
#include "spiral-context.h"
#include "sp-metrics.h"
#include <glibmm/i18n.h>
-#include "object-edit.h"
#include "xml/repr.h"
#include "xml/node-event-vector.h"
#include "preferences.h"
diff --git a/src/star-context.cpp b/src/star-context.cpp
index 3520bdb53..9570ad008 100644
--- a/src/star-context.cpp
+++ b/src/star-context.cpp
@@ -41,7 +41,6 @@
#include "preferences.h"
#include "xml/repr.h"
#include "xml/node-event-vector.h"
-#include "object-edit.h"
#include "context-fns.h"
#include "shape-editor.h"
#include "verbs.h"
diff --git a/src/text-context.cpp b/src/text-context.cpp
index a48134d75..ae5dac88c 100644
--- a/src/text-context.cpp
+++ b/src/text-context.cpp
@@ -34,7 +34,6 @@
#include "macros.h"
#include "message-context.h"
#include "message-stack.h"
-#include "object-edit.h"
#include "pixmaps/cursor-text-insert.xpm"
#include "pixmaps/cursor-text.xpm"
#include "preferences.h"
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index 6bd2d6fd8..b14f27b8b 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -315,7 +315,7 @@ void ControlManagerImpl::updateItem(SPCanvasItem *item)
if (_sizeChangers.count(item->ctrlType) && _manager.isSelected(item)) {
target += 2;
}
- sp_canvas_item_set(item, "size", target, NULL);
+ g_object_set(item, "size", target, NULL);
}
sp_canvas_item_request_update(item);
}
diff --git a/src/vanishing-point.cpp b/src/vanishing-point.cpp
index c80b60ba2..20758d37c 100644
--- a/src/vanishing-point.cpp
+++ b/src/vanishing-point.cpp
@@ -18,6 +18,7 @@
#include "desktop-handles.h"
#include "desktop.h"
#include "display/sp-canvas-item.h"
+#include "display/sp-ctrlline.h"
#include "event-context.h"
#include "xml/repr.h"
#include "perspective-line.h"
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 01:52:07 +0000