summaryrefslogtreecommitdiffstats
path: root/src/document.h
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2016-02-17 23:38:22 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2016-02-17 23:38:22 +0000
commit109ec952f041590ee5f42ac6e7d6bd5c212c9441 (patch)
tree970539f1dfb648fb92a5d4f262ec8098c318a020 /src/document.h
parentTranslations: Update Icelandic translation (diff)
downloadinkscape-109ec952f041590ee5f42ac6e7d6bd5c212c9441.tar.gz
inkscape-109ec952f041590ee5f42ac6e7d6bd5c212c9441.zip
Fixes some regressions from rev14655
Fixed bugs: - https://launchpad.net/bugs/1546531 (bzr r14658)
Diffstat (limited to 'src/document.h')
-rw-r--r--src/document.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/document.h b/src/document.h
index b57cf205d..825049cd5 100644
--- a/src/document.h
+++ b/src/document.h
@@ -263,8 +263,8 @@ public:
const std::set<SPObject *> getResourceList(char const *key) const;
std::vector<SPItem*> getItemsInBox(unsigned int dkey, Geom::Rect const &box, bool into_groups = false) const;
std::vector<SPItem*> getItemsPartiallyInBox(unsigned int dkey, Geom::Rect const &box, bool into_groups = false) const;
- SPItem *getItemAtPoint(unsigned int key, Geom::Point const &p, bool into_groups, SPItem *upto = NULL) ;
- std::vector<SPItem*> getItemsAtPoints(unsigned const key, std::vector<Geom::Point> points, bool all_layers = true, size_t limit = 0) ;
+ SPItem *getItemAtPoint(unsigned int key, Geom::Point const &p, bool into_groups, SPItem *upto = NULL) const;
+ std::vector<SPItem*> getItemsAtPoints(unsigned const key, std::vector<Geom::Point> points, bool all_layers = true, size_t limit = 0) const ;
SPItem *getGroupAtPoint(unsigned int key, Geom::Point const &p) const;
void changeUriAndHrefs(char const *uri);
@@ -278,9 +278,9 @@ private:
void do_change_uri(char const *const filename, bool const rebase);
void setupViewport(SPItemCtx *ctx);
void importDefsNode(SPDocument *source, Inkscape::XML::Node *defs, Inkscape::XML::Node *target_defs);
- bool build_flat_item_list(unsigned int dkey, SPGroup *group, gboolean into_groups, bool take_insensitive = false, SPItem *upto = NULL);
- std::deque<SPItem*> _node_cache;
- bool _node_cache_valid;
+ void build_flat_item_list(unsigned int dkey, SPGroup *group, gboolean into_groups) const;
+ mutable std::deque<SPItem*> _node_cache;
+ mutable bool _node_cache_valid;
};
/*