From 3aa344e9a40d97db7cd5a89671896bab70da33a4 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 2 Mar 2014 01:31:12 +0100 Subject: Added some consts. Turned functions to member functions. (bzr r13089) --- src/knotholder.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/knotholder.cpp') diff --git a/src/knotholder.cpp b/src/knotholder.cpp index 71bccca16..bef89f3af 100644 --- a/src/knotholder.cpp +++ b/src/knotholder.cpp @@ -103,10 +103,10 @@ void KnotHolder::update_knots() /** * Returns true if at least one of the KnotHolderEntities has the mouse hovering above it. */ -bool KnotHolder::knot_mouseover() -{ - for(std::list::iterator i = entity.begin(); i != entity.end(); ++i) { - SPKnot *knot = (*i)->knot; +bool KnotHolder::knot_mouseover() const { + for (std::list::const_iterator i = entity.begin(); i != entity.end(); ++i) { + const SPKnot *knot = (*i)->knot; + if (knot && (knot->flags & SP_KNOT_MOUSEOVER)) { return true; } -- cgit v1.2.3 From 3053ad943c47f23399ae172f32e7f5f630c53be9 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Fri, 28 Mar 2014 00:18:25 +0100 Subject: First step of refactoring SPKnot. (bzr r13223) --- src/knotholder.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/knotholder.cpp') diff --git a/src/knotholder.cpp b/src/knotholder.cpp index bef89f3af..cf87423d4 100644 --- a/src/knotholder.cpp +++ b/src/knotholder.cpp @@ -63,14 +63,12 @@ KnotHolder::KnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFun g_print ("Error! Throw an exception, please!\n"); } - //g_object_ref(G_OBJECT(item)); // TODO: is this still needed after C++-ification? sp_object_ref(item); sizeUpdatedConn = ControlManager::getManager().connectCtrlSizeChanged(sigc::mem_fun(*this, &KnotHolder::updateControlSizes)); } KnotHolder::~KnotHolder() { - //g_object_unref(G_OBJECT(item)); sp_object_unref(item); for (std::list::iterator i = entity.begin(); i != entity.end(); ++i) @@ -187,7 +185,7 @@ KnotHolder::knot_moved_handler(SPKnot *knot, Geom::Point const &p, guint state) } void -KnotHolder::knot_ungrabbed_handler(SPKnot */*knot*/) +KnotHolder::knot_ungrabbed_handler(SPKnot */*knot*/, guint) { this->dragging = false; -- cgit v1.2.3