diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2019-02-20 09:50:38 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2019-02-20 09:50:38 +0000 |
| commit | 774bee47ed685bd666173cb4d1664933217371c9 (patch) | |
| tree | 077955bb8b312b64b308fbd2ab1a32ee5989f605 /src/ui/dialog/export.cpp | |
| parent | Fix Window centering LPEDialog (diff) | |
| download | inkscape-774bee47ed685bd666173cb4d1664933217371c9.tar.gz inkscape-774bee47ed685bd666173cb4d1664933217371c9.zip | |
Give more descriptive names to document file related variables and functions.
Makes searching through code for them easier.
Diffstat (limited to 'src/ui/dialog/export.cpp')
| -rw-r--r-- | src/ui/dialog/export.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp index b02fbb5dc..d42d537fd 100644 --- a/src/ui/dialog/export.cpp +++ b/src/ui/dialog/export.cpp @@ -441,10 +441,10 @@ void Export::setTargetDesktop(SPDesktop *desktop) */ void Export::set_default_filename () { - if ( SP_ACTIVE_DOCUMENT && SP_ACTIVE_DOCUMENT->getURI() ) + if ( SP_ACTIVE_DOCUMENT && SP_ACTIVE_DOCUMENT->getDocumentURI() ) { SPDocument * doc = SP_ACTIVE_DOCUMENT; - const gchar *uri = doc->getURI(); + const gchar *uri = doc->getDocumentURI(); const gchar *text_extension = get_file_save_extension (Inkscape::Extension::FILE_SAVE_METHOD_SAVE_AS).c_str(); Inkscape::Extension::Output * oextension = nullptr; @@ -561,7 +561,7 @@ Glib::ustring Export::create_filepath_from_id (Glib::ustring id, const Glib::ust if (directory.empty()) { /* Grab document directory */ - const gchar* docURI = SP_ACTIVE_DOCUMENT->getURI(); + const gchar* docURI = SP_ACTIVE_DOCUMENT->getDocumentURI(); if (docURI) { directory = Glib::path_get_dirname(docURI); } @@ -952,8 +952,8 @@ Glib::ustring Export::absolutize_path_from_document_location (SPDocument *doc, c { Glib::ustring path; //Make relative paths go from the document location, if possible: - if (!Glib::path_is_absolute(filename) && doc->getURI()) { - Glib::ustring dirname = Glib::path_get_dirname(doc->getURI()); + if (!Glib::path_is_absolute(filename) && doc->getDocumentURI()) { + Glib::ustring dirname = Glib::path_get_dirname(doc->getDocumentURI()); if (!dirname.empty()) { path = Glib::build_filename(dirname, filename); } @@ -1236,7 +1236,7 @@ void Export::onExport () Inkscape::XML::Node * repr = *i; const gchar * temp_string; Glib::ustring dir = Glib::path_get_dirname(filename.c_str()); - const gchar* docURI=SP_ACTIVE_DOCUMENT->getURI(); + const gchar* docURI=SP_ACTIVE_DOCUMENT->getDocumentURI(); Glib::ustring docdir; if (docURI) { |