diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2019-04-06 18:54:25 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2019-04-06 18:54:25 +0000 |
| commit | 87eb273ceca7e4212a4bfbf2e04b616bac73a701 (patch) | |
| tree | 5974d5938b0a71bf48a5486c5d669c4767aa2341 /src/ui | |
| parent | CMake: Fix module FindDoubleConversion.cmake (diff) | |
| download | inkscape-87eb273ceca7e4212a4bfbf2e04b616bac73a701.tar.gz inkscape-87eb273ceca7e4212a4bfbf2e04b616bac73a701.zip | |
More document.h cleanup.
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/clipboard.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/print.cpp | 2 | ||||
| -rw-r--r-- | src/ui/tools/connector-tool.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/color-icc-selector.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widget/color-notebook.cpp | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index 4539c9cc9..4fbf2af62 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -1251,7 +1251,7 @@ void ClipboardManagerImpl::_onGet(Gtk::SelectionData &sel, guint /*info*/) unsigned long int height = (unsigned long int) (area.height() + 0.5); // read from namedview - Inkscape::XML::Node *nv = sp_repr_lookup_name (_clipboardSPDoc->rroot, "sodipodi:namedview"); + Inkscape::XML::Node *nv = _clipboardSPDoc->getReprNamedView(); if (nv && nv->attribute("pagecolor")) { bgcolor = sp_svg_read_color(nv->attribute("pagecolor"), 0xffffff00); } diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp index 2d908cefe..247f526bb 100644 --- a/src/ui/dialog/print.cpp +++ b/src/ui/dialog/print.cpp @@ -132,7 +132,7 @@ void Print::draw_page(const Glib::RefPtr<Gtk::PrintContext>& context, int /*page close(tmp_fd); guint32 bgcolor = 0x00000000; - Inkscape::XML::Node *nv = sp_repr_lookup_name (_workaround._doc->rroot, "sodipodi:namedview"); + Inkscape::XML::Node *nv = _workaround._doc->getReprNamedView(); if (nv && nv->attribute("pagecolor")){ bgcolor = sp_svg_read_color(nv->attribute("pagecolor"), 0xffffff00); } diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp index 5a1654e2f..d6ce66a9e 100644 --- a/src/ui/tools/connector-tool.cpp +++ b/src/ui/tools/connector-tool.cpp @@ -808,7 +808,7 @@ void ConnectorTool::_setSubsequentPoint(Geom::Point const p) Avoid::Point dst(d[Geom::X], d[Geom::Y]); if (!this->newConnRef) { - Avoid::Router *router = desktop->getDocument()->router; + Avoid::Router *router = desktop->getDocument()->getRouter(); this->newConnRef = new Avoid::ConnRef(router); this->newConnRef->setEndpoint(Avoid::VertID::src, src); if (this->isOrthogonal) diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp index f55dc5176..0970c779c 100644 --- a/src/ui/widget/color-icc-selector.cpp +++ b/src/ui/widget/color-icc-selector.cpp @@ -570,7 +570,7 @@ void ColorICCSelectorImpl::_switchToProfile(gchar const *name) tmp.icc = new SVGICCColor(); } tmp.icc->colorProfile = name; - Inkscape::ColorProfile *newProf = SP_ACTIVE_DOCUMENT->profileManager->find(name); + Inkscape::ColorProfile *newProf = SP_ACTIVE_DOCUMENT->getProfileManager()->find(name); if (newProf) { cmsHTRANSFORM trans = newProf->getTransfFromSRGB8(); if (trans) { @@ -813,7 +813,7 @@ void ColorICCSelectorImpl::_setProfile(SVGICCColor *profile) } if (profile) { - _prof = SP_ACTIVE_DOCUMENT->profileManager->find(profile->colorProfile.c_str()); + _prof = SP_ACTIVE_DOCUMENT->getProfileManager()->find(profile->colorProfile.c_str()); if (_prof && (asICColorProfileClassSig(_prof->getProfileClass()) != cmsSigNamedColorClass)) { #if HAVE_LIBLCMS1 _profChannelCount = _cmsChannelsOf(asICColorSpaceSig(_prof->getColorSpace())); diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp index f635b0665..963e5093d 100644 --- a/src/ui/widget/color-notebook.cpp +++ b/src/ui/widget/color-notebook.cpp @@ -277,7 +277,7 @@ void ColorNotebook::_updateICCButtons() gtk_widget_set_sensitive(_box_outofgamut, false); if (color.icc) { Inkscape::ColorProfile *target_profile = - SP_ACTIVE_DOCUMENT->profileManager->find(color.icc->colorProfile.c_str()); + SP_ACTIVE_DOCUMENT->getProfileManager()->find(color.icc->colorProfile.c_str()); if (target_profile) gtk_widget_set_sensitive(_box_outofgamut, target_profile->GamutCheck(color)); } @@ -285,7 +285,7 @@ void ColorNotebook::_updateICCButtons() /* update too-much-ink icon */ gtk_widget_set_sensitive(_box_toomuchink, false); if (color.icc) { - Inkscape::ColorProfile *prof = SP_ACTIVE_DOCUMENT->profileManager->find(color.icc->colorProfile.c_str()); + Inkscape::ColorProfile *prof = SP_ACTIVE_DOCUMENT->getProfileManager()->find(color.icc->colorProfile.c_str()); if (prof && CMSSystem::isPrintColorSpace(prof)) { gtk_widget_show(GTK_WIDGET(_box_toomuchink)); double ink_sum = 0; |
