From 1f2d8bc4ce99e970cead4ca96c1859c383a9c043 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Sun, 31 Aug 2014 14:17:26 -0400 Subject: Header cleanup: stop using Glib types where they aren't truly needed. Eases GThread deprecation errors. (bzr r13341.1.190) --- src/sp-namedview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sp-namedview.cpp') diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index a01ba891e..1d9fa06a3 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -935,7 +935,7 @@ void SPNamedView::hide(SPDesktop const *desktop) views = g_slist_remove(views, desktop); } -void SPNamedView::activateGuides(gpointer desktop, gboolean active) +void SPNamedView::activateGuides(void* desktop, bool active) { g_assert(desktop != NULL); g_assert(g_slist_find(views, desktop)); -- cgit v1.2.3 From 380f71793aba455f86eae2c75532b24dc613e71d Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Fri, 3 Oct 2014 21:32:26 -0400 Subject: Refactor SPGuide to use more C++ (bzr r13341.1.241) --- src/sp-namedview.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/sp-namedview.cpp') diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index 1d9fa06a3..8b28347f1 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -956,14 +956,10 @@ static void sp_namedview_setup_guides(SPNamedView *nv) static void sp_namedview_show_single_guide(SPGuide* guide, bool show) { - for (GSList *v = guide->views; v != NULL; v = v->next) { - if (show) { - sp_canvas_item_show(SP_CANVAS_ITEM(v->data)); - sp_canvas_item_show(SP_CANVAS_ITEM(SP_GUIDELINE(v->data)->origin)); - } else { - sp_canvas_item_hide(SP_CANVAS_ITEM(v->data)); - sp_canvas_item_hide(SP_CANVAS_ITEM(SP_GUIDELINE(v->data)->origin)); - } + if (show) { + guide->showSPGuide(); + } else { + guide->hideSPGuide(); } } @@ -1156,9 +1152,9 @@ Inkscape::CanvasGrid * sp_namedview_get_first_enabled_grid(SPNamedView *namedvie void SPNamedView::translateGuides(Geom::Translate const &tr) { for (GSList *l = guides; l != NULL; l = l->next) { SPGuide &guide = *SP_GUIDE(l->data); - Geom::Point point_on_line = guide.point_on_line; + Geom::Point point_on_line = guide.getPoint(); point_on_line *= tr; - sp_guide_moveto(guide, point_on_line, true); + guide.moveto(point_on_line, true); } } -- cgit v1.2.3 From f0f92e6aad8d897fa206474754a7bd09220c993d Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Thu, 20 Nov 2014 10:22:42 +0100 Subject: Rename variable to better express its use. (units -> page_size_units) (bzr r13740) --- src/sp-namedview.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/sp-namedview.cpp') diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index 8b28347f1..b68421dc6 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -72,7 +72,7 @@ SPNamedView::SPNamedView() : SPObjectGroup(), snap_manager(this) { this->guidehicolor = 0; this->views = NULL; this->borderlayer = 0; - this->units = NULL; + this->page_size_units = NULL; this->window_x = 0; this->cy = 0; this->window_y = 0; @@ -581,6 +581,7 @@ void SPNamedView::set(unsigned int key, const gchar* value) { break; } case SP_ATTR_UNITS: { + // Only used in "Custom size" section of Document Properties dialog Inkscape::Util::Unit const *new_unit = NULL; if (value) { @@ -599,7 +600,7 @@ void SPNamedView::set(unsigned int key, const gchar* value) { /* fixme: Don't use g_log (see above). */ } } - this->units = new_unit; + this->page_size_units = new_unit; this->requestModified(SP_OBJECT_MODIFIED_FLAG); break; } -- cgit v1.2.3