![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/document.cpp b/src/document.cpp
index 702c58d5dc871025201e4792edcfe8eb3042252b..a473daa3ca640d341daf92bb280947ef7d8b784c 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
-#define __SP_DOCUMENT_C__
-
/** \file
* SPDocument manipulation
*
* Lauris Kaplinski <lauris@kaplinski.com>
* MenTaLguY <mental@rydia.net>
* bulia byak <buliabyak@users.sf.net>
+ * Jon A. Cruz <jon@joncruz.org>
+ * Abhishek Sharma
*
* Copyright (C) 2004-2005 MenTaLguY
* Copyright (C) 1999-2002 Lauris Kaplinski
#include <string>
#include <cstring>
-#include "application/application.h"
-#include "application/editor.h"
#include "desktop.h"
#include "dir-util.h"
#include "display/nr-arena-item.h"
#include "xml/repr.h"
#include "xml/rebase-hrefs.h"
+using Inkscape::DocumentUndo;
+
// Higher number means lower priority.
#define SP_DOCUMENT_UPDATE_PRIORITY (G_PRIORITY_HIGH_IDLE - 2)
base(0),
name(0),
priv(0), // reset in ctor
- actionkey(0),
+ actionkey(),
modified_id(0),
rerouting_handler_id(0),
profileManager(0), // deferred until after other initialization
priv->partial = NULL;
}
- SPDocumentUndo::clear_redo(this);
- SPDocumentUndo::clear_undo(this);
+ DocumentUndo::clearRedo(this);
+ DocumentUndo::clearUndo(this);
if (root) {
root->releaseReferences();
if (oldSignalsConnected) {
g_signal_handlers_disconnect_by_func(G_OBJECT(INKSCAPE),
- reinterpret_cast<gpointer>(SPDocumentUndo::reset_key),
+ reinterpret_cast<gpointer>(DocumentUndo::resetKey),
static_cast<gpointer>(this));
} else {
_selection_changed_connection.disconnect();
inkscape_unref();
keepalive = FALSE;
}
-
//delete this->_whiteboard_session_manager;
}
//current_persp3d_impl = persp->perspective_impl;
}
-void
-SPDocument::getPerspectivesInDefs(std::vector<Persp3D*> &list) {
+void SPDocument::getPerspectivesInDefs(std::vector<Persp3D*> &list) const
+{
SPDefs *defs = SP_ROOT(this->root)->defs;
- for (SPObject *i = SP_OBJECT(defs)->first_child(); i != NULL; i = SP_OBJECT_NEXT(i) ) {
- if (SP_IS_PERSP3D(i))
+ for (SPObject *i = defs->firstChild(); i; i = i->getNext() ) {
+ if (SP_IS_PERSP3D(i)) {
list.push_back(SP_PERSP3D(i));
+ }
}
}
void SPDocument::reset_key (void */*dummy*/)
{
- actionkey = NULL;
+ actionkey.clear();
}
-SPDocument *
-SPDocument::createDoc(Inkscape::XML::Document *rdoc,
- gchar const *uri,
- gchar const *base,
- gchar const *name,
- unsigned int keepalive)
+SPDocument *SPDocument::createDoc(Inkscape::XML::Document *rdoc,
+ gchar const *uri,
+ gchar const *base,
+ gchar const *name,
+ unsigned int keepalive)
{
- SPDocument *document;
- Inkscape::XML::Node *rroot;
- Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-
- rroot = rdoc->root();
+ SPDocument *document = new SPDocument();
- document = new SPDocument();
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ Inkscape::XML::Node *rroot = rdoc->root();
document->keepalive = keepalive;
// base is simply the part of the path before filename; e.g. when running "inkscape ../file.svg" the base is "../"
// which is why we use g_get_current_dir() in calculating the abs path above
//This is NULL for a new document
- if (base)
+ if (base) {
document->base = g_strdup(base);
- else
+ } else {
document->base = NULL;
+ }
document->name = g_strdup(name);
document->root = sp_object_repr_build_tree(document, rroot);
document->setCurrentPersp3DImpl(persp_impl);
}
- SPDocumentUndo::set_undo_sensitive(document, true);
+ DocumentUndo::setUndoSensitive(document, true);
// reset undo key when selection changes, so that same-key actions on different objects are not coalesced
- if (!Inkscape::NSApplication::Application::getNewGui()) {
- g_signal_connect(G_OBJECT(INKSCAPE), "change_selection",
- G_CALLBACK(SPDocumentUndo::reset_key), document);
- g_signal_connect(G_OBJECT(INKSCAPE), "activate_desktop",
- G_CALLBACK(SPDocumentUndo::reset_key), document);
- document->oldSignalsConnected = true;
- } else {
- document->_selection_changed_connection = Inkscape::NSApplication::Editor::connectSelectionChanged (sigc::mem_fun (*document, &SPDocument::reset_key));
- document->_desktop_activated_connection = Inkscape::NSApplication::Editor::connectDesktopActivated (sigc::mem_fun (*document, &SPDocument::reset_key));
- document->oldSignalsConnected = false;
- }
+ g_signal_connect(G_OBJECT(INKSCAPE), "change_selection",
+ G_CALLBACK(DocumentUndo::resetKey), document);
+ g_signal_connect(G_OBJECT(INKSCAPE), "activate_desktop",
+ G_CALLBACK(DocumentUndo::resetKey), document);
+ document->oldSignalsConnected = true;
return document;
}
* Fetches document from URI, or creates new, if NULL; public document
* appears in document list.
*/
-SPDocument *
-SPDocument::createNewDoc(gchar const *uri, unsigned int keepalive, bool make_new)
+SPDocument *SPDocument::createNewDoc(gchar const *uri, unsigned int keepalive, bool make_new)
{
SPDocument *doc;
Inkscape::XML::Document *rdoc;
@@ -489,8 +479,7 @@ SPDocument::createNewDoc(gchar const *uri, unsigned int keepalive, bool make_new
return doc;
}
-SPDocument *
-SPDocument::createNewDocFromMem(gchar const *buffer, gint length, unsigned int keepalive)
+SPDocument *SPDocument::createNewDocFromMem(gchar const *buffer, gint length, unsigned int keepalive)
{
SPDocument *doc;
Inkscape::XML::Document *rdoc;
@@ -514,25 +503,20 @@ SPDocument::createNewDocFromMem(gchar const *buffer, gint length, unsigned int k
return doc;
}
-SPDocument *
-SPDocument::doRef()
+SPDocument *SPDocument::doRef()
{
- g_return_val_if_fail(this != NULL, NULL);
Inkscape::GC::anchor(this);
return this;
}
-SPDocument *
-SPDocument::doUnref()
+SPDocument *SPDocument::doUnref()
{
- g_return_val_if_fail(this != NULL, NULL);
Inkscape::GC::release(this);
return NULL;
}
-gdouble SPDocument::getWidth()
+gdouble SPDocument::getWidth() const
{
- g_return_val_if_fail(this != NULL, 0.0);
g_return_val_if_fail(this->priv != NULL, 0.0);
g_return_val_if_fail(this->root != NULL, 0.0);
return root->width.computed;
}
-void
-SPDocument::setWidth (gdouble width, const SPUnit *unit)
+void SPDocument::setWidth(gdouble width, const SPUnit *unit)
{
SPRoot *root = SP_ROOT(this->root);
SP_OBJECT (root)->updateRepr();
}
-void SPDocument::setHeight (gdouble height, const SPUnit *unit)
+void SPDocument::setHeight(gdouble height, const SPUnit *unit)
{
SPRoot *root = SP_ROOT(this->root);
SP_OBJECT (root)->updateRepr();
}
-gdouble SPDocument::getHeight()
+gdouble SPDocument::getHeight() const
{
- g_return_val_if_fail(this != NULL, 0.0);
g_return_val_if_fail(this->priv != NULL, 0.0);
g_return_val_if_fail(this->root != NULL, 0.0);
return root->height.computed;
}
-Geom::Point SPDocument::getDimensions()
+Geom::Point SPDocument::getDimensions() const
{
return Geom::Point(getWidth(), getHeight());
}
-/**
- * Gets page fitting margin information from the namedview node in the XML.
- * \param nv_repr reference to this document's namedview
- * \param key the same key used by the RegisteredScalarUnit in
- * ui/widget/page-sizer.cpp
- * \param margin_units units for the margin
- * \param return_units units to return the result in
- * \param width width in px (for percentage margins)
- * \param height height in px (for percentage margins)
- * \param use_width true if the this key is left or right margins, false
- * otherwise. Used for percentage margins.
- * \return the margin size in px, else 0.0 if anything is invalid.
- */
-//static double getMarginLength(/*Inkscape::XML::Node * const nv_repr*/
-/* gchar const * const key,
- SPUnit const * const margin_units,
- SPUnit const * const return_units,
- double const width,
- double const height,
- bool const use_width)*/
-//{
- // double value;
- /*if (!sp_repr_get_double (nv_repr, key, &value)) {
- return 0.0;
- }*/
-/* if(!this->storeAsDouble(key,&value)) {
- return 0.0;
- }
- if (margin_units == &sp_unit_get_by_id (SP_UNIT_PERCENT)) {
- return (use_width)? width * value : height * value;
- }
- if (!sp_convert_distance (&value, margin_units, return_units)) {
- return 0.0;
- }
- return value;
-}*/
-
/**
* Given a Geom::Rect that may, for example, correspond to the bbox of an object,
* this function fits the canvas to that rect by resizing the canvas
SPNamedView *nv = sp_document_namedview(this, 0);
if (with_margins && nv) {
- //Inkscape::XML::Node *nv_repr = SP_OBJECT_REPR (nv);
if (nv != NULL) {
- //gchar const * const units_abbr = nv_repr->attribute("units");
gchar const * const units_abbr = nv->getAttribute("units");
SPUnit const *margin_units = NULL;
if (units_abbr != NULL) {
if (margin_units == NULL) {
margin_units = &px;
}
- /*
- margin_top = getMarginLength(nv_repr, "fit-margin-top",
- margin_units, &px, w, h, false);
- margin_left = getMarginLength(nv_repr, "fit-margin-left",
- margin_units, &px, w, h, true);
- margin_right = getMarginLength(nv_repr, "fit-margin-right",
- margin_units, &px, w, h, true);
- margin_bottom = getMarginLength(nv_repr, "fit-margin-bottom",
- margin_units, &px, w, h, false);*/
- margin_top = nv->getMarginLength("fit-margin-top",margin_units, &px, w, h, false);
- margin_top = nv->getMarginLength("fit-margin-left",margin_units, &px, w, h, true);
- margin_top = nv->getMarginLength("fit-margin-right",margin_units, &px, w, h, true);
- margin_top = nv->getMarginLength("fit-margin-bottom",margin_units, &px, w, h, false);
-
-
+ margin_top = nv->getMarginLength("fit-margin-top",margin_units, &px, w, h, false);
+ margin_top = nv->getMarginLength("fit-margin-left",margin_units, &px, w, h, true);
+ margin_top = nv->getMarginLength("fit-margin-right",margin_units, &px, w, h, true);
+ margin_top = nv->getMarginLength("fit-margin-bottom",margin_units, &px, w, h, false);
}
}
}
}
-void
-SPDocument::do_change_uri(gchar const *const filename, bool const rebase)
+void SPDocument::setBase( gchar const* base )
{
- //g_return_if_fail(this != NULL);
+ if (this->base) {
+ g_free(this->base);
+ this->base = 0;
+ }
+ if (base) {
+ this->base = g_strdup(base);
+ }
+}
- gchar *new_base;
- gchar *new_name;
- gchar *new_uri;
+void SPDocument::do_change_uri(gchar const *const filename, bool const rebase)
+{
+ gchar *new_base = 0;
+ gchar *new_name = 0;
+ gchar *new_uri = 0;
if (filename) {
#ifndef WIN32
}
// Update saveable repr attributes.
- Inkscape::XML::Node *repr = sp_document_repr_root(this);
+ Inkscape::XML::Node *repr = getReprRoot();
// Changing uri in the document repr must not be not undoable.
- bool const saved = SPDocumentUndo::get_undo_sensitive(this);
- SPDocumentUndo::set_undo_sensitive(this, false);
+ bool const saved = DocumentUndo::getUndoSensitive(this);
+ DocumentUndo::setUndoSensitive(this, false);
if (rebase) {
Inkscape::XML::rebase_hrefs(this, new_base, true);
}
repr->setAttribute("sodipodi:docname", this->name);
- SPDocumentUndo::set_undo_sensitive(this, saved);
+ DocumentUndo::setUndoSensitive(this, saved);
g_free(this->name);
*/
void SPDocument::setUri(gchar const *filename)
{
- //g_return_if_fail(this != NULL);
-
do_change_uri(filename, false);
}
*
* \see sp_document_set_uri
*/
-void SPDocument::change_uri_and_hrefs(gchar const *filename)
+void SPDocument::changeUriAndHrefs(gchar const *filename)
{
- //g_return_if_fail(this != NULL);
-
do_change_uri(filename, true);
}
-void
-SPDocument::resized_signal_emit(gdouble width, gdouble height)
+void SPDocument::emitResizedSignal(gdouble width, gdouble height)
{
- //g_return_if_fail(this != NULL);
-
this->priv->resized_signal.emit(width, height);
}
this->priv->undoStackObservers.remove(observer);
}
-SPObject *SPDocument::getObjectById(gchar const *id) {
+SPObject *SPDocument::getObjectById(gchar const *id) const
+{
g_return_val_if_fail(id != NULL, NULL);
GQuark idq = g_quark_from_string(id);
return priv->id_changed_signals[g_quark_from_string(id)].connect(slot);
}
-void SPDocument::bindObjectToRepr(Inkscape::XML::Node *repr, SPObject *object) {
+void SPDocument::bindObjectToRepr(Inkscape::XML::Node *repr, SPObject *object)
+{
if (object) {
g_assert(g_hash_table_lookup(priv->reprdef, repr) == NULL);
g_hash_table_insert(priv->reprdef, repr, object);
@@ -933,12 +868,14 @@ void SPDocument::bindObjectToRepr(Inkscape::XML::Node *repr, SPObject *object) {
}
}
-SPObject *SPDocument::getObjectByRepr(Inkscape::XML::Node *repr) {
+SPObject *SPDocument::getObjectByRepr(Inkscape::XML::Node *repr) const
+{
g_return_val_if_fail(repr != NULL, NULL);
return (SPObject*)g_hash_table_lookup(priv->reprdef, repr);
}
-Glib::ustring SPDocument::getLanguage() {
+Glib::ustring SPDocument::getLanguage() const
+{
gchar const *document_language = rdf_get_work_entity(this, rdf_find_entity("language"));
if (document_language) {
while (isspace(*document_language))
/* Object modification root handler */
-void
-SPDocument::request_modified()
+void SPDocument::requestModified()
{
if (!modified_id) {
modified_id = g_idle_add_full(SP_DOCUMENT_UPDATE_PRIORITY,
SPItemCtx ctx;
sp_document_setup_viewport (this, &ctx);
- bool saved = SPDocumentUndo::get_undo_sensitive(this);
- SPDocumentUndo::set_undo_sensitive(this, false);
+ bool saved = DocumentUndo::getUndoSensitive(this);
+ DocumentUndo::setUndoSensitive(this, false);
this->root->updateDisplay((SPCtx *)&ctx, 0);
- SPDocumentUndo::set_undo_sensitive(this, saved);
+ DocumentUndo::setUndoSensitive(this, saved);
}
this->_emitModified();
}
* more than 32 iterations. So we bail out if we hit 32 iterations,
* since this typically indicates we're stuck in an update loop.
*/
-gint
-SPDocument::ensure_up_to_date()
+gint SPDocument::ensureUpToDate()
{
// Bring the document up-to-date, specifically via the following:
// 1a) Process all document updates.
}
if (modified_id) {
- /* Remove handler */
+ // Remove handler
g_source_remove(modified_id);
modified_id = 0;
}
if (rerouting_handler_id) {
- /* Remove handler */
+ // Remove handler
g_source_remove(rerouting_handler_id);
rerouting_handler_id = 0;
}
@@ -1129,17 +1064,16 @@ static GSList *find_items_in_area(GSList *s, SPGroup *group, unsigned int dkey,
{
g_return_val_if_fail(SP_IS_GROUP(group), s);
- for (SPObject *o = SP_OBJECT(group)->first_child() ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
- if (!SP_IS_ITEM(o)) {
- continue;
- }
- if (SP_IS_GROUP(o) && SP_GROUP(o)->effectiveLayerMode(dkey) == SPGroup::LAYER ) {
- s = find_items_in_area(s, SP_GROUP(o), dkey, area, test);
- } else {
- SPItem *child = SP_ITEM(o);
- Geom::OptRect box = child->getBboxDesktop();
- if ( box && test(area, *box) && (take_insensitive || child->isVisibleAndUnlocked(dkey))) {
- s = g_slist_append(s, child);
+ for ( SPObject *o = group->firstChild() ; o ; o = o->getNext() ) {
+ if ( SP_IS_ITEM(o) ) {
+ if (SP_IS_GROUP(o) && SP_GROUP(o)->effectiveLayerMode(dkey) == SPGroup::LAYER ) {
+ s = find_items_in_area(s, SP_GROUP(o), dkey, area, test);
+ } else {
+ SPItem *child = SP_ITEM(o);
+ Geom::OptRect box = child->getBboxDesktop();
+ if ( box && test(area, *box) && (take_insensitive || child->isVisibleAndUnlocked(dkey))) {
+ s = g_slist_append(s, child);
+ }
}
}
}
*/
bool item_is_in_group(SPItem *item, SPGroup *group)
{
- for (SPObject *o = SP_OBJECT(group)->first_child() ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
- if (!SP_IS_ITEM(o)) continue;
- if (SP_ITEM(o) == item)
- return true;
- if (SP_IS_GROUP(o))
- if (item_is_in_group(item, SP_GROUP(o)))
- return true;
+ bool inGroup = false;
+ for ( SPObject *o = group->firstChild() ; o && !inGroup; o = o->getNext() ) {
+ if ( SP_IS_ITEM(o) ) {
+ if (SP_ITEM(o) == item) {
+ inGroup = true;
+ } else if ( SP_IS_GROUP(o) ) {
+ inGroup = item_is_in_group(item, SP_GROUP(o));
+ }
+ }
}
- return false;
+ return inGroup;
}
-/**
-Returns the bottommost item from the list which is at the point, or NULL if none.
-*/
-SPItem*
-SPDocument::item_from_list_at_point_bottom(unsigned int dkey, SPGroup *group, GSList const *list,Geom::Point const p, bool take_insensitive)
+SPItem *SPDocument::getItemFromListAtPointBottom(unsigned int dkey, SPGroup *group, GSList const *list,Geom::Point const p, bool take_insensitive)
{
g_return_val_if_fail(group, NULL);
+ SPItem *bottomMost = 0;
+
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
gdouble delta = prefs->getDouble("/options/cursortolerance/value", 1.0);
- for (SPObject *o = SP_OBJECT(group)->first_child() ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
-
- if (!SP_IS_ITEM(o)) continue;
-
- SPItem *item = SP_ITEM(o);
- NRArenaItem *arenaitem = item->get_arenaitem(dkey);
- if (arenaitem && nr_arena_item_invoke_pick(arenaitem, p, delta, 1) != NULL
- && (take_insensitive || item->isVisibleAndUnlocked(dkey))) {
- if (g_slist_find((GSList *) list, item) != NULL)
- return item;
- }
+ for ( SPObject *o = group->firstChild() ; o && !bottomMost; o = o->getNext() ) {
+ if ( SP_IS_ITEM(o) ) {
+ SPItem *item = SP_ITEM(o);
+ NRArenaItem *arenaitem = item->get_arenaitem(dkey);
+ if (arenaitem && nr_arena_item_invoke_pick(arenaitem, p, delta, 1) != NULL
+ && (take_insensitive || item->isVisibleAndUnlocked(dkey))) {
+ if (g_slist_find((GSList *) list, item) != NULL) {
+ bottomMost = item;
+ }
+ }
- if (SP_IS_GROUP(o)) {
- SPItem *found = item_from_list_at_point_bottom(dkey, SP_GROUP(o), list, p, take_insensitive);
- if (found)
- return found;
+ if ( !bottomMost && SP_IS_GROUP(o) ) {
+ // return null if not found:
+ bottomMost = getItemFromListAtPointBottom(dkey, SP_GROUP(o), list, p, take_insensitive);
+ }
}
-
}
- return NULL;
+ return bottomMost;
}
/**
@@ -1203,18 +1135,21 @@ items. If upto != NULL, then if item upto is encountered (at any level), stops s
upwards in z-order and returns what it has found so far (i.e. the found item is
guaranteed to be lower than upto).
*/
-SPItem*
-find_item_at_point(unsigned int dkey, SPGroup *group, Geom::Point const p, gboolean into_groups, bool take_insensitive = false, SPItem *upto = NULL)
+SPItem *find_item_at_point(unsigned int dkey, SPGroup *group, Geom::Point const p, gboolean into_groups, bool take_insensitive = false, SPItem *upto = NULL)
{
- SPItem *seen = NULL, *newseen = NULL;
+ SPItem *seen = NULL;
+ SPItem *newseen = NULL;
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
gdouble delta = prefs->getDouble("/options/cursortolerance/value", 1.0);
- for (SPObject *o = SP_OBJECT(group)->first_child() ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
- if (!SP_IS_ITEM(o)) continue;
+ for ( SPObject *o = group->firstChild() ; o ; o = o->getNext() ) {
+ if (!SP_IS_ITEM(o)) {
+ continue;
+ }
- if (upto && SP_ITEM(o) == upto)
+ if (upto && SP_ITEM(o) == upto) {
break;
+ }
if (SP_IS_GROUP(o) && (SP_GROUP(o)->effectiveLayerMode(dkey) == SPGroup::LAYER || into_groups)) {
// if nothing found yet, recurse into the group
@@ -1224,9 +1159,9 @@ find_item_at_point(unsigned int dkey, SPGroup *group, Geom::Point const p, gbool
newseen = NULL;
}
- if (item_is_in_group(upto, SP_GROUP(o)))
+ if (item_is_in_group(upto, SP_GROUP(o))) {
break;
-
+ }
} else {
SPItem *child = SP_ITEM(o);
NRArenaItem *arenaitem = child->get_arenaitem(dkey);
@@ -1245,15 +1180,16 @@ find_item_at_point(unsigned int dkey, SPGroup *group, Geom::Point const p, gbool
Returns the topmost non-layer group from the descendants of group which is at point
p, or NULL if none. Recurses into layers but not into groups.
*/
-SPItem*
-find_group_at_point(unsigned int dkey, SPGroup *group, Geom::Point const p)
+SPItem *find_group_at_point(unsigned int dkey, SPGroup *group, Geom::Point const p)
{
SPItem *seen = NULL;
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
gdouble delta = prefs->getDouble("/options/cursortolerance/value", 1.0);
- for (SPObject *o = SP_OBJECT(group)->first_child() ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
- if (!SP_IS_ITEM(o)) continue;
+ for ( SPObject *o = group->firstChild() ; o ; o = o->getNext() ) {
+ if (!SP_IS_ITEM(o)) {
+ continue;
+ }
if (SP_IS_GROUP(o) && SP_GROUP(o)->effectiveLayerMode(dkey) == SPGroup::LAYER) {
SPItem *newseen = find_group_at_point(dkey, SP_GROUP(o), p);
if (newseen) {
* Assumes box is normalized (and g_asserts it!)
*
*/
-
-GSList *SPDocument::items_in_box(unsigned int dkey, Geom::Rect const &box)
+GSList *SPDocument::getItemsInBox(unsigned int dkey, Geom::Rect const &box) const
{
- //g_return_val_if_fail(this != NULL, NULL);
g_return_val_if_fail(this->priv != NULL, NULL);
return find_items_in_area(NULL, SP_GROUP(this->root), dkey, box, is_within);
*
*/
-GSList *SPDocument::partial_items_in_box(unsigned int dkey, Geom::Rect const &box)
+GSList *SPDocument::getItemsPartiallyInBox(unsigned int dkey, Geom::Rect const &box) const
{
- //g_return_val_if_fail(this != NULL, NULL);
g_return_val_if_fail(this->priv != NULL, NULL);
return find_items_in_area(NULL, SP_GROUP(this->root), dkey, box, overlaps);
}
-GSList *
-SPDocument::items_at_points(unsigned const key, std::vector<Geom::Point> points)
+GSList *SPDocument::getItemsAtPoints(unsigned const key, std::vector<Geom::Point> points) const
{
GSList *items = NULL;
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -1316,7 +1248,7 @@ SPDocument::items_at_points(unsigned const key, std::vector<Geom::Point> points)
prefs->setDouble("/options/cursortolerance/value", 0.25);
for(unsigned int i = 0; i < points.size(); i++) {
- SPItem *item = item_at_point(key, points[i],
+ SPItem *item = getItemAtPoint(key, points[i],
false, NULL);
if (item && !g_slist_find(items, item))
items = g_slist_prepend (items, item);
@@ -1328,91 +1260,83 @@ SPDocument::items_at_points(unsigned const key, std::vector<Geom::Point> points)
return items;
}
-SPItem *
-SPDocument::item_at_point( unsigned const key, Geom::Point const p,
- gboolean const into_groups, SPItem *upto)
+SPItem *SPDocument::getItemAtPoint( unsigned const key, Geom::Point const p,
+ gboolean const into_groups, SPItem *upto) const
{
- //g_return_val_if_fail(this != NULL, NULL);
g_return_val_if_fail(this->priv != NULL, NULL);
return find_item_at_point(key, SP_GROUP(this->root), p, into_groups, false, upto);
}
-SPItem*
-SPDocument::group_at_point(unsigned int key, Geom::Point const p)
+SPItem *SPDocument::getGroupAtPoint(unsigned int key, Geom::Point const p) const
{
- //g_return_val_if_fail(this != NULL, NULL);
g_return_val_if_fail(this->priv != NULL, NULL);
return find_group_at_point(key, SP_GROUP(this->root), p);
}
-/* Resource management */
+// Resource management
-gboolean
-SPDocument::add_resource(gchar const *key, SPObject *object)
+bool SPDocument::addResource(gchar const *key, SPObject *object)
{
- GSList *rlist;
- GQuark q = g_quark_from_string(key);
+ g_return_val_if_fail(key != NULL, false);
+ g_return_val_if_fail(*key != '\0', false);
+ g_return_val_if_fail(object != NULL, false);
+ g_return_val_if_fail(SP_IS_OBJECT(object), false);
- //g_return_val_if_fail(this != NULL, FALSE);
- g_return_val_if_fail(key != NULL, FALSE);
- g_return_val_if_fail(*key != '\0', FALSE);
- g_return_val_if_fail(object != NULL, FALSE);
- g_return_val_if_fail(SP_IS_OBJECT(object), FALSE);
+ bool result = false;
- if (SP_OBJECT_IS_CLONED(object))
- return FALSE;
+ if ( !object->cloned ) {
+ GSList *rlist = (GSList*)g_hash_table_lookup(priv->resources, key);
+ g_return_val_if_fail(!g_slist_find(rlist, object), false);
+ rlist = g_slist_prepend(rlist, object);
+ g_hash_table_insert(priv->resources, (gpointer) key, rlist);
- rlist = (GSList*)g_hash_table_lookup(this->priv->resources, key);
- g_return_val_if_fail(!g_slist_find(rlist, object), FALSE);
- rlist = g_slist_prepend(rlist, object);
- g_hash_table_insert(this->priv->resources, (gpointer) key, rlist);
+ GQuark q = g_quark_from_string(key);
+ priv->resources_changed_signals[q].emit();
- this->priv->resources_changed_signals[q].emit();
+ result = true;
+ }
- return TRUE;
+ return result;
}
-gboolean
-SPDocument::remove_resource(gchar const *key, SPObject *object)
+bool SPDocument::removeResource(gchar const *key, SPObject *object)
{
- GSList *rlist;
- GQuark q = g_quark_from_string(key);
+ g_return_val_if_fail(key != NULL, false);
+ g_return_val_if_fail(*key != '\0', false);
+ g_return_val_if_fail(object != NULL, false);
+ g_return_val_if_fail(SP_IS_OBJECT(object), false);
- //g_return_val_if_fail(this != NULL, FALSE);
- g_return_val_if_fail(key != NULL, FALSE);
- g_return_val_if_fail(*key != '\0', FALSE);
- g_return_val_if_fail(object != NULL, FALSE);
- g_return_val_if_fail(SP_IS_OBJECT(object), FALSE);
+ bool result = false;
- if (SP_OBJECT_IS_CLONED(object))
- return FALSE;
+ if ( !object->cloned ) {
+ GSList *rlist = (GSList*)g_hash_table_lookup(priv->resources, key);
+ g_return_val_if_fail(rlist != NULL, false);
+ g_return_val_if_fail(g_slist_find(rlist, object), false);
+ rlist = g_slist_remove(rlist, object);
+ g_hash_table_insert(priv->resources, (gpointer) key, rlist);
- rlist = (GSList*)g_hash_table_lookup(this->priv->resources, key);
- g_return_val_if_fail(rlist != NULL, FALSE);
- g_return_val_if_fail(g_slist_find(rlist, object), FALSE);
- rlist = g_slist_remove(rlist, object);
- g_hash_table_insert(this->priv->resources, (gpointer) key, rlist);
+ GQuark q = g_quark_from_string(key);
+ priv->resources_changed_signals[q].emit();
- this->priv->resources_changed_signals[q].emit();
+ result = true;
+ }
- return TRUE;
+ return result;
}
-GSList const *
-SPDocument::get_resource_list(gchar const *key)
+GSList const *SPDocument::getResourceList(gchar const *key) const
{
- //g_return_val_if_fail(this != NULL, NULL);
g_return_val_if_fail(key != NULL, NULL);
g_return_val_if_fail(*key != '\0', NULL);
return (GSList*)g_hash_table_lookup(this->priv->resources, key);
}
-sigc::connection SPDocument::resources_changed_connect(gchar const *key,
- SPDocument::ResourcesChangedSignal::slot_type slot)
+sigc::connection SPDocument::connectResourcesChanged(gchar const *key,
+ SPDocument::ResourcesChangedSignal::slot_type slot)
{
GQuark q = g_quark_from_string(key);
return this->priv->resources_changed_signals[q].connect(slot);
@@ -1427,44 +1351,40 @@ sp_document_resource_list_free(gpointer /*key*/, gpointer value, gpointer /*data
return TRUE;
}
-unsigned int
-count_objects_recursive(SPObject *obj, unsigned int count)
+unsigned int count_objects_recursive(SPObject *obj, unsigned int count)
{
count++; // obj itself
- for (SPObject *i = obj->first_child(); i != NULL; i = SP_OBJECT_NEXT(i)) {
+ for ( SPObject *i = obj->firstChild(); i; i = i->getNext() ) {
count = count_objects_recursive(i, count);
}
return count;
}
-unsigned int
-objects_in_document(SPDocument *document)
+unsigned int objects_in_document(SPDocument *document)
{
- return count_objects_recursive(SP_DOCUMENT_ROOT(document), 0);
+ return count_objects_recursive(document->getRoot(), 0);
}
-void
-vacuum_document_recursive(SPObject *obj)
+void vacuum_document_recursive(SPObject *obj)
{
if (SP_IS_DEFS(obj)) {
- for (SPObject *def = obj->firstChild(); def; def = SP_OBJECT_NEXT(def)) {
- /* fixme: some inkscape-internal nodes in the future might not be collectable */
+ for ( SPObject *def = obj->firstChild(); def; def = def->getNext()) {
+ // fixme: some inkscape-internal nodes in the future might not be collectable
def->requestOrphanCollection();
}
} else {
- for (SPObject *i = obj->first_child(); i != NULL; i = SP_OBJECT_NEXT(i)) {
+ for ( SPObject *i = obj->firstChild(); i; i = i->getNext() ) {
vacuum_document_recursive(i);
}
}
}
-unsigned int
-SPDocument::vacuum_document()
+unsigned int SPDocument::vacuumDocument()
{
unsigned int start = objects_in_document(this);
- unsigned int end;
+ unsigned int end = start;
unsigned int newend = start;
unsigned int iterations = 0;
do {
end = newend;
- vacuum_document_recursive(SP_DOCUMENT_ROOT(this));
+ vacuum_document_recursive(root);
this->collectOrphans();
iterations++;
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :