diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-03-02 01:09:08 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-03-02 01:09:08 +0000 |
| commit | dc53920a347f1ac1157d863f91a18f206d134fd5 (patch) | |
| tree | ff9765299345e61fc42590dc3f17c042895b438f /src/knotholder.cpp | |
| parent | update to trunk (diff) | |
| parent | Added some consts. Turned functions to member functions. (diff) | |
| download | inkscape-dc53920a347f1ac1157d863f91a18f206d134fd5.tar.gz inkscape-dc53920a347f1ac1157d863f91a18f206d134fd5.zip | |
Resolving conflicts, maybe broken
(bzr r11950.1.264)
Diffstat (limited to 'src/knotholder.cpp')
| -rw-r--r-- | src/knotholder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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<KnotHolderEntity *>::iterator i = entity.begin(); i != entity.end(); ++i) { - SPKnot *knot = (*i)->knot; +bool KnotHolder::knot_mouseover() const { + for (std::list<KnotHolderEntity *>::const_iterator i = entity.begin(); i != entity.end(); ++i) { + const SPKnot *knot = (*i)->knot; + if (knot && (knot->flags & SP_KNOT_MOUSEOVER)) { return true; } |