![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/document.cpp b/src/document.cpp
index 3104ade288663e40d9b79b41266dceb9ca224419..702c58d5dc871025201e4792edcfe8eb3042252b 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
priv->partial = NULL;
}
- sp_document_clear_redo(this);
- sp_document_clear_undo(this);
+ SPDocumentUndo::clear_redo(this);
+ SPDocumentUndo::clear_undo(this);
if (root) {
root->releaseReferences();
if (oldSignalsConnected) {
g_signal_handlers_disconnect_by_func(G_OBJECT(INKSCAPE),
- reinterpret_cast<gpointer>(sp_document_reset_key),
+ reinterpret_cast<gpointer>(SPDocumentUndo::reset_key),
static_cast<gpointer>(this));
} else {
_selection_changed_connection.disconnect();
void
SPDocument::getPerspectivesInDefs(std::vector<Persp3D*> &list) {
SPDefs *defs = SP_ROOT(this->root)->defs;
- for (SPObject *i = sp_object_first_child(SP_OBJECT(defs)); i != NULL; i = SP_OBJECT_NEXT(i) ) {
+ for (SPObject *i = SP_OBJECT(defs)->first_child(); i != NULL; i = SP_OBJECT_NEXT(i) ) {
if (SP_IS_PERSP3D(i))
list.push_back(SP_PERSP3D(i));
}
}
SPDocument *
-sp_document_create(Inkscape::XML::Document *rdoc,
+SPDocument::createDoc(Inkscape::XML::Document *rdoc,
gchar const *uri,
gchar const *base,
gchar const *name,
document->setCurrentPersp3DImpl(persp_impl);
}
- sp_document_set_undo_sensitive(document, true);
+ SPDocumentUndo::set_undo_sensitive(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(sp_document_reset_key), document);
+ G_CALLBACK(SPDocumentUndo::reset_key), document);
g_signal_connect(G_OBJECT(INKSCAPE), "activate_desktop",
- G_CALLBACK(sp_document_reset_key), document);
+ 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));
* appears in document list.
*/
SPDocument *
-sp_document_new(gchar const *uri, unsigned int keepalive, bool make_new)
+SPDocument::createNewDoc(gchar const *uri, unsigned int keepalive, bool make_new)
{
SPDocument *doc;
Inkscape::XML::Document *rdoc;
//# These should be set by now
g_assert(name);
- doc = sp_document_create(rdoc, uri, base, name, keepalive);
+ doc = createDoc(rdoc, uri, base, name, keepalive);
g_free(base);
g_free(name);
}
SPDocument *
-sp_document_new_from_mem(gchar const *buffer, gint length, unsigned int keepalive)
+SPDocument::createNewDocFromMem(gchar const *buffer, gint length, unsigned int keepalive)
{
SPDocument *doc;
Inkscape::XML::Document *rdoc;
@@ -509,34 +509,34 @@ sp_document_new_from_mem(gchar const *buffer, gint length, unsigned int keepaliv
name = g_strdup_printf(_("Memory document %d"), ++doc_count);
- doc = sp_document_create(rdoc, NULL, NULL, name, keepalive);
+ doc = createDoc(rdoc, NULL, NULL, name, keepalive);
return doc;
}
SPDocument *
-sp_document_ref(SPDocument *doc)
+SPDocument::doRef()
{
- g_return_val_if_fail(doc != NULL, NULL);
- Inkscape::GC::anchor(doc);
- return doc;
+ g_return_val_if_fail(this != NULL, NULL);
+ Inkscape::GC::anchor(this);
+ return this;
}
SPDocument *
-sp_document_unref(SPDocument *doc)
+SPDocument::doUnref()
{
- g_return_val_if_fail(doc != NULL, NULL);
- Inkscape::GC::release(doc);
+ g_return_val_if_fail(this != NULL, NULL);
+ Inkscape::GC::release(this);
return NULL;
}
-gdouble sp_document_width(SPDocument *document)
+gdouble SPDocument::getWidth()
{
- g_return_val_if_fail(document != NULL, 0.0);
- g_return_val_if_fail(document->priv != NULL, 0.0);
- g_return_val_if_fail(document->root != NULL, 0.0);
+ 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);
- SPRoot *root = SP_ROOT(document->root);
+ SPRoot *root = SP_ROOT(this->root);
if (root->width.unit == SVGLength::PERCENT && root->viewBox_set)
return root->viewBox.x1 - root->viewBox.x0;
}
void
-sp_document_set_width (SPDocument *document, gdouble width, const SPUnit *unit)
+SPDocument::setWidth (gdouble width, const SPUnit *unit)
{
- SPRoot *root = SP_ROOT(document->root);
+ SPRoot *root = SP_ROOT(this->root);
if (root->width.unit == SVGLength::PERCENT && root->viewBox_set) { // set to viewBox=
root->viewBox.x1 = root->viewBox.x0 + sp_units_get_pixels (width, *unit);
SP_OBJECT (root)->updateRepr();
}
-void sp_document_set_height (SPDocument * document, gdouble height, const SPUnit *unit)
+void SPDocument::setHeight (gdouble height, const SPUnit *unit)
{
- SPRoot *root = SP_ROOT(document->root);
+ SPRoot *root = SP_ROOT(this->root);
if (root->height.unit == SVGLength::PERCENT && root->viewBox_set) { // set to viewBox=
root->viewBox.y1 = root->viewBox.y0 + sp_units_get_pixels (height, *unit);
@@ -596,45 +596,131 @@ void sp_document_set_height (SPDocument * document, gdouble height, const SPUnit
SP_OBJECT (root)->updateRepr();
}
-gdouble sp_document_height(SPDocument *document)
+gdouble SPDocument::getHeight()
{
- g_return_val_if_fail(document != NULL, 0.0);
- g_return_val_if_fail(document->priv != NULL, 0.0);
- g_return_val_if_fail(document->root != NULL, 0.0);
+ 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);
- SPRoot *root = SP_ROOT(document->root);
+ SPRoot *root = SP_ROOT(this->root);
if (root->height.unit == SVGLength::PERCENT && root->viewBox_set)
return root->viewBox.y1 - root->viewBox.y0;
return root->height.computed;
}
-Geom::Point sp_document_dimensions(SPDocument *doc)
+Geom::Point SPDocument::getDimensions()
{
- return Geom::Point(sp_document_width(doc), sp_document_height(doc));
+ 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
* and translating the document root into position.
+ * \param rect fit document size to this
+ * \param with_margins add margins to rect, by taking margins from this
+ * document's namedview (<sodipodi:namedview> "fit-margin-..."
+ * attributes, and "units")
*/
-void SPDocument::fitToRect(Geom::Rect const &rect)
+void SPDocument::fitToRect(Geom::Rect const &rect, bool with_margins)
{
double const w = rect.width();
double const h = rect.height();
- double const old_height = sp_document_height(this);
+ double const old_height = getHeight();
SPUnit const &px(sp_unit_get_by_id(SP_UNIT_PX));
- sp_document_set_width(this, w, &px);
- sp_document_set_height(this, h, &px);
+
+ /* in px */
+ double margin_top = 0.0;
+ double margin_left = 0.0;
+ double margin_right = 0.0;
+ double margin_bottom = 0.0;
+
+ 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) {
+ margin_units = sp_unit_get_by_abbreviation(units_abbr);
+ }
+ 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);
- Geom::Translate const tr(Geom::Point(0, (old_height - h))
- - to_2geom(rect.min()));
+
+ }
+ }
+
+ Geom::Rect const rect_with_margins(
+ rect.min() - Geom::Point(margin_left, margin_bottom),
+ rect.max() + Geom::Point(margin_right, margin_top));
+
+
+ setWidth(rect_with_margins.width(), &px);
+ setHeight(rect_with_margins.height(), &px);
+
+ Geom::Translate const tr(
+ Geom::Point(0, old_height - rect_with_margins.height())
+ - to_2geom(rect_with_margins.min()));
SP_GROUP(root)->translateChildItems(tr);
- SPNamedView *nv = sp_document_namedview(this, 0);
+
if(nv) {
- Geom::Translate tr2(-rect.min());
+ Geom::Translate tr2(-rect_with_margins.min());
nv->translateGuides(tr2);
// update the viewport so the drawing appears to stay where it was
}
}
-static void
-do_change_uri(SPDocument *const document, gchar const *const filename, bool const rebase)
+void
+SPDocument::do_change_uri(gchar const *const filename, bool const rebase)
{
- g_return_if_fail(document != NULL);
+ //g_return_if_fail(this != NULL);
gchar *new_base;
gchar *new_name;
@@ -664,32 +750,32 @@ do_change_uri(SPDocument *const document, gchar const *const filename, bool cons
} else {
new_uri = g_strdup_printf(_("Unnamed document %d"), ++doc_count);
new_base = NULL;
- new_name = g_strdup(document->uri);
+ new_name = g_strdup(this->uri);
}
// Update saveable repr attributes.
- Inkscape::XML::Node *repr = sp_document_repr_root(document);
+ Inkscape::XML::Node *repr = sp_document_repr_root(this);
// Changing uri in the document repr must not be not undoable.
- bool const saved = sp_document_get_undo_sensitive(document);
- sp_document_set_undo_sensitive(document, false);
+ bool const saved = SPDocumentUndo::get_undo_sensitive(this);
+ SPDocumentUndo::set_undo_sensitive(this, false);
if (rebase) {
- Inkscape::XML::rebase_hrefs(document, new_base, true);
+ Inkscape::XML::rebase_hrefs(this, new_base, true);
}
- repr->setAttribute("sodipodi:docname", document->name);
- sp_document_set_undo_sensitive(document, saved);
+ repr->setAttribute("sodipodi:docname", this->name);
+ SPDocumentUndo::set_undo_sensitive(this, saved);
- g_free(document->name);
- g_free(document->base);
- g_free(document->uri);
- document->name = new_name;
- document->base = new_base;
- document->uri = new_uri;
+ g_free(this->name);
+ g_free(this->base);
+ g_free(this->uri);
+ this->name = new_name;
+ this->base = new_base;
+ this->uri = new_uri;
- document->priv->uri_set_signal.emit(document->uri);
+ this->priv->uri_set_signal.emit(this->uri);
}
/**
@@ -699,11 +785,11 @@ do_change_uri(SPDocument *const document, gchar const *const filename, bool cons
*
* \see sp_document_change_uri_and_hrefs
*/
-void sp_document_set_uri(SPDocument *document, gchar const *filename)
+void SPDocument::setUri(gchar const *filename)
{
- g_return_if_fail(document != NULL);
+ //g_return_if_fail(this != NULL);
- do_change_uri(document, filename, false);
+ do_change_uri(filename, false);
}
/**
*
* \see sp_document_set_uri
*/
-void sp_document_change_uri_and_hrefs(SPDocument *document, gchar const *filename)
+void SPDocument::change_uri_and_hrefs(gchar const *filename)
{
- g_return_if_fail(document != NULL);
+ //g_return_if_fail(this != NULL);
- do_change_uri(document, filename, true);
+ do_change_uri(filename, true);
}
void
-sp_document_resized_signal_emit(SPDocument *doc, gdouble width, gdouble height)
+SPDocument::resized_signal_emit(gdouble width, gdouble height)
{
- g_return_if_fail(doc != NULL);
+ //g_return_if_fail(this != NULL);
- doc->priv->resized_signal.emit(width, height);
+ this->priv->resized_signal.emit(width, height);
}
sigc::connection SPDocument::connectModified(SPDocument::ModifiedSignal::slot_type slot)
/* Object modification root handler */
void
-sp_document_request_modified(SPDocument *doc)
+SPDocument::request_modified()
{
- if (!doc->modified_id) {
- doc->modified_id = g_idle_add_full(SP_DOCUMENT_UPDATE_PRIORITY,
- sp_document_idle_handler, doc, NULL);
+ if (!modified_id) {
+ modified_id = g_idle_add_full(SP_DOCUMENT_UPDATE_PRIORITY,
+ sp_document_idle_handler, this, NULL);
}
- if (!doc->rerouting_handler_id) {
- doc->rerouting_handler_id = g_idle_add_full(SP_DOCUMENT_REROUTING_PRIORITY,
- sp_document_rerouting_handler, doc, NULL);
+ if (!rerouting_handler_id) {
+ rerouting_handler_id = g_idle_add_full(SP_DOCUMENT_REROUTING_PRIORITY,
+ sp_document_rerouting_handler, this, NULL);
}
}
SPItemCtx ctx;
sp_document_setup_viewport (this, &ctx);
- bool saved = sp_document_get_undo_sensitive(this);
- sp_document_set_undo_sensitive(this, false);
+ bool saved = SPDocumentUndo::get_undo_sensitive(this);
+ SPDocumentUndo::set_undo_sensitive(this, false);
this->root->updateDisplay((SPCtx *)&ctx, 0);
- sp_document_set_undo_sensitive(this, saved);
+ SPDocumentUndo::set_undo_sensitive(this, saved);
}
this->_emitModified();
}
* since this typically indicates we're stuck in an update loop.
*/
gint
-sp_document_ensure_up_to_date(SPDocument *doc)
+SPDocument::ensure_up_to_date()
{
// Bring the document up-to-date, specifically via the following:
// 1a) Process all document updates.
int counter = 32;
for (unsigned int pass = 1; pass <= 2; ++pass) {
// Process document updates.
- while (!doc->_updateDocument()) {
+ while (!_updateDocument()) {
if (counter == 0) {
- g_warning("More than 32 iteration while updating document '%s'", doc->uri);
+ g_warning("More than 32 iteration while updating document '%s'", uri);
break;
}
counter--;
// changed objects and provide new routings. This may cause some objects
// to be modified, hence the second update pass.
if (pass == 1) {
- doc->router->processTransaction();
+ router->processTransaction();
}
}
- if (doc->modified_id) {
+ if (modified_id) {
/* Remove handler */
- g_source_remove(doc->modified_id);
- doc->modified_id = 0;
+ g_source_remove(modified_id);
+ modified_id = 0;
}
- if (doc->rerouting_handler_id) {
+ if (rerouting_handler_id) {
/* Remove handler */
- g_source_remove(doc->rerouting_handler_id);
- doc->rerouting_handler_id = 0;
+ g_source_remove(rerouting_handler_id);
+ rerouting_handler_id = 0;
}
return counter>0;
}
@@ -1043,7 +1129,7 @@ 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_first_child(SP_OBJECT(group)) ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
+ for (SPObject *o = SP_OBJECT(group)->first_child() ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
if (!SP_IS_ITEM(o)) {
continue;
}
@@ -1051,7 +1137,7 @@ static GSList *find_items_in_area(GSList *s, SPGroup *group, unsigned int dkey,
s = find_items_in_area(s, SP_GROUP(o), dkey, area, test);
} else {
SPItem *child = SP_ITEM(o);
- Geom::OptRect box = sp_item_bbox_desktop(child);
+ 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_first_child(SP_OBJECT(group)) ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
+ 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;
Returns the bottommost item from the list which is at the point, or NULL if none.
*/
SPItem*
-sp_document_item_from_list_at_point_bottom(unsigned int dkey, SPGroup *group, GSList const *list,
- Geom::Point const p, bool take_insensitive)
+SPDocument::item_from_list_at_point_bottom(unsigned int dkey, SPGroup *group, GSList const *list,Geom::Point const p, bool take_insensitive)
{
g_return_val_if_fail(group, NULL);
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
gdouble delta = prefs->getDouble("/options/cursortolerance/value", 1.0);
- for (SPObject *o = sp_object_first_child(SP_OBJECT(group)) ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
+ 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 = sp_item_get_arenaitem(item, dkey);
+ 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)
@@ -1101,7 +1186,7 @@ sp_document_item_from_list_at_point_bottom(unsigned int dkey, SPGroup *group, GS
}
if (SP_IS_GROUP(o)) {
- SPItem *found = sp_document_item_from_list_at_point_bottom(dkey, SP_GROUP(o), list, p, take_insensitive);
+ SPItem *found = item_from_list_at_point_bottom(dkey, SP_GROUP(o), list, p, take_insensitive);
if (found)
return found;
}
@@ -1125,7 +1210,7 @@ find_item_at_point(unsigned int dkey, SPGroup *group, Geom::Point const p, gbool
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
gdouble delta = prefs->getDouble("/options/cursortolerance/value", 1.0);
- for (SPObject *o = sp_object_first_child(SP_OBJECT(group)) ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
+ for (SPObject *o = SP_OBJECT(group)->first_child() ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
if (!SP_IS_ITEM(o)) continue;
if (upto && SP_ITEM(o) == upto)
@@ -1144,7 +1229,7 @@ find_item_at_point(unsigned int dkey, SPGroup *group, Geom::Point const p, gbool
} else {
SPItem *child = SP_ITEM(o);
- NRArenaItem *arenaitem = sp_item_get_arenaitem(child, dkey);
+ NRArenaItem *arenaitem = child->get_arenaitem(dkey);
// seen remembers the last (topmost) of items pickable at this point
if (arenaitem && nr_arena_item_invoke_pick(arenaitem, p, delta, 1) != NULL
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
gdouble delta = prefs->getDouble("/options/cursortolerance/value", 1.0);
- for (SPObject *o = sp_object_first_child(SP_OBJECT(group)) ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
+ 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) {
SPItem *newseen = find_group_at_point(dkey, SP_GROUP(o), p);
}
if (SP_IS_GROUP(o) && SP_GROUP(o)->effectiveLayerMode(dkey) != SPGroup::LAYER ) {
SPItem *child = SP_ITEM(o);
- NRArenaItem *arenaitem = sp_item_get_arenaitem(child, dkey);
+ NRArenaItem *arenaitem = child->get_arenaitem(dkey);
// seen remembers the last (topmost) of groups pickable at this point
if (arenaitem && nr_arena_item_invoke_pick(arenaitem, p, delta, 1) != NULL) {
*
*/
-GSList *sp_document_items_in_box(SPDocument *document, unsigned int dkey, Geom::Rect const &box)
+GSList *SPDocument::items_in_box(unsigned int dkey, Geom::Rect const &box)
{
- g_return_val_if_fail(document != NULL, NULL);
- g_return_val_if_fail(document->priv != NULL, NULL);
+ //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(document->root), dkey, box, is_within);
+ return find_items_in_area(NULL, SP_GROUP(this->root), dkey, box, is_within);
}
/*
@@ -1210,16 +1295,16 @@ GSList *sp_document_items_in_box(SPDocument *document, unsigned int dkey, Geom::
*
*/
-GSList *sp_document_partial_items_in_box(SPDocument *document, unsigned int dkey, Geom::Rect const &box)
+GSList *SPDocument::partial_items_in_box(unsigned int dkey, Geom::Rect const &box)
{
- g_return_val_if_fail(document != NULL, NULL);
- g_return_val_if_fail(document->priv != NULL, NULL);
+ //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(document->root), dkey, box, overlaps);
+ return find_items_in_area(NULL, SP_GROUP(this->root), dkey, box, overlaps);
}
GSList *
-sp_document_items_at_points(SPDocument *document, unsigned const key, std::vector<Geom::Point> points)
+SPDocument::items_at_points(unsigned const key, std::vector<Geom::Point> points)
{
GSList *items = NULL;
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -1231,7 +1316,7 @@ sp_document_items_at_points(SPDocument *document, unsigned const key, std::vecto
prefs->setDouble("/options/cursortolerance/value", 0.25);
for(unsigned int i = 0; i < points.size(); i++) {
- SPItem *item = sp_document_item_at_point(document, key, points[i],
+ SPItem *item = item_at_point(key, points[i],
false, NULL);
if (item && !g_slist_find(items, item))
items = g_slist_prepend (items, item);
@@ -1244,34 +1329,34 @@ sp_document_items_at_points(SPDocument *document, unsigned const key, std::vecto
}
SPItem *
-sp_document_item_at_point(SPDocument *document, unsigned const key, Geom::Point const p,
+SPDocument::item_at_point( unsigned const key, Geom::Point const p,
gboolean const into_groups, SPItem *upto)
{
- g_return_val_if_fail(document != NULL, NULL);
- g_return_val_if_fail(document->priv != NULL, NULL);
+ //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(document->root), p, into_groups, false, upto);
+ return find_item_at_point(key, SP_GROUP(this->root), p, into_groups, false, upto);
}
SPItem*
-sp_document_group_at_point(SPDocument *document, unsigned int key, Geom::Point const p)
+SPDocument::group_at_point(unsigned int key, Geom::Point const p)
{
- g_return_val_if_fail(document != NULL, NULL);
- g_return_val_if_fail(document->priv != NULL, NULL);
+ //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(document->root), p);
+ return find_group_at_point(key, SP_GROUP(this->root), p);
}
/* Resource management */
gboolean
-sp_document_add_resource(SPDocument *document, gchar const *key, SPObject *object)
+SPDocument::add_resource(gchar const *key, SPObject *object)
{
GSList *rlist;
GQuark q = g_quark_from_string(key);
- g_return_val_if_fail(document != NULL, 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);
@@ -1280,23 +1365,23 @@ sp_document_add_resource(SPDocument *document, gchar const *key, SPObject *objec
if (SP_OBJECT_IS_CLONED(object))
return FALSE;
- rlist = (GSList*)g_hash_table_lookup(document->priv->resources, key);
+ 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(document->priv->resources, (gpointer) key, rlist);
+ g_hash_table_insert(this->priv->resources, (gpointer) key, rlist);
- document->priv->resources_changed_signals[q].emit();
+ this->priv->resources_changed_signals[q].emit();
return TRUE;
}
gboolean
-sp_document_remove_resource(SPDocument *document, gchar const *key, SPObject *object)
+SPDocument::remove_resource(gchar const *key, SPObject *object)
{
GSList *rlist;
GQuark q = g_quark_from_string(key);
- g_return_val_if_fail(document != NULL, 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);
@@ -1305,33 +1390,32 @@ sp_document_remove_resource(SPDocument *document, gchar const *key, SPObject *ob
if (SP_OBJECT_IS_CLONED(object))
return FALSE;
- rlist = (GSList*)g_hash_table_lookup(document->priv->resources, key);
+ 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(document->priv->resources, (gpointer) key, rlist);
+ g_hash_table_insert(this->priv->resources, (gpointer) key, rlist);
- document->priv->resources_changed_signals[q].emit();
+ this->priv->resources_changed_signals[q].emit();
return TRUE;
}
GSList const *
-sp_document_get_resource_list(SPDocument *document, gchar const *key)
+SPDocument::get_resource_list(gchar const *key)
{
- g_return_val_if_fail(document != NULL, NULL);
+ //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(document->priv->resources, key);
+ return (GSList*)g_hash_table_lookup(this->priv->resources, key);
}
-sigc::connection sp_document_resources_changed_connect(SPDocument *document,
- gchar const *key,
+sigc::connection SPDocument::resources_changed_connect(gchar const *key,
SPDocument::ResourcesChangedSignal::slot_type slot)
{
GQuark q = g_quark_from_string(key);
- return document->priv->resources_changed_signals[q].connect(slot);
+ return this->priv->resources_changed_signals[q].connect(slot);
}
/* Helpers */
{
count++; // obj itself
- for (SPObject *i = sp_object_first_child(obj); i != NULL; i = SP_OBJECT_NEXT(i)) {
+ for (SPObject *i = obj->first_child(); i != NULL; i = SP_OBJECT_NEXT(i)) {
count = count_objects_recursive(i, count);
}
def->requestOrphanCollection();
}
} else {
- for (SPObject *i = sp_object_first_child(obj); i != NULL; i = SP_OBJECT_NEXT(i)) {
+ for (SPObject *i = obj->first_child(); i != NULL; i = SP_OBJECT_NEXT(i)) {
vacuum_document_recursive(i);
}
}
}
unsigned int
-vacuum_document(SPDocument *document)
+SPDocument::vacuum_document()
{
- unsigned int start = objects_in_document(document);
+ unsigned int start = objects_in_document(this);
unsigned int end;
unsigned int newend = start;
do {
end = newend;
- vacuum_document_recursive(SP_DOCUMENT_ROOT(document));
- document->collectOrphans();
+ vacuum_document_recursive(SP_DOCUMENT_ROOT(this));
+ this->collectOrphans();
iterations++;
- newend = objects_in_document(document);
+ newend = objects_in_document(this);
} while (iterations < 100 && newend < end);