Give more descriptive names to document file related variables and functions.

Makes searching through code for them easier.

5 files changed, 12 insertions, 12 deletions

diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 9ff9c0bc2..4bbd9b077 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -522,7 +522,7 @@ SPDocument *Script::open(Inkscape::Extension::Input *module,
     } // data_read
 
     if (mydoc != nullptr) {
-        mydoc->setBase(nullptr);
+        mydoc->setDocumentBase(nullptr);
         mydoc->changeUriAndHrefs(filenameArg);
     }
 
diff --git a/src/extension/implementation/xslt.cpp b/src/extension/implementation/xslt.cpp
index 7841a6506..1f2b79281 100644
--- a/src/extension/implementation/xslt.cpp
+++ b/src/extension/implementation/xslt.cpp
@@ -179,7 +179,7 @@ void XSLT::save(Inkscape::Extension::Output *module, SPDocument *doc, gchar cons
     }
 
     if (!sp_repr_save_rebased_file(repr->document(), tempfilename_out.c_str(), SP_SVG_NS_URI,
-                                   doc->getBase(), filename)) {
+                                   doc->getDocumentBase(), filename)) {
         throw Inkscape::Extension::Output::save_failed();
     }
 
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index 722826f19..f2192b9af 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -2041,7 +2041,7 @@ void OdfOutput::save(Inkscape::Extension::Output */*mod*/, SPDocument *doc, gcha
 {
     reset();
 
-    docBaseUri = Inkscape::URI::from_dirname(doc->getBase()).str();
+    docBaseUri = Inkscape::URI::from_dirname(doc->getDocumentBase()).str();
 
     ZipFile zf;
     preprocess(zf, doc->rroot);
diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp
index 99f893cd3..50a045a94 100644
--- a/src/extension/internal/svg.cpp
+++ b/src/extension/internal/svg.cpp
@@ -931,7 +931,7 @@ Svg::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filena
     }
 
     if (!sp_repr_save_rebased_file(rdoc, filename, SP_SVG_NS_URI,
-                                   doc->getBase(), //
+                                   doc->getDocumentBase(), //
                                    m_detachbase ? nullptr : filename)) {
         throw Inkscape::Extension::Output::save_failed();
     }
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index 412e5dcd4..05a62884c 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -137,7 +137,7 @@ SPDocument *open(Extension *key, gchar const *filename)
         }
     }
 
-    doc->setUri(filename);
+    doc->setDocumentUri(filename);
     if (!show) {
         imod->set_gui(true);
     }
@@ -288,7 +288,7 @@ save(Extension *key, SPDocument *doc, gchar const *filename, bool setextension,
 
 
     // remember attributes in case this is an unofficial save and/or overwrite fails
-    gchar *saved_uri = g_strdup(doc->getURI());
+    gchar *saved_uri = g_strdup(doc->getDocumentURI());
     gchar *saved_output_extension = nullptr;
     gchar *saved_dataloss = nullptr;
     bool saved_modified = doc->isModifiedSinceSave();
@@ -618,8 +618,8 @@ get_file_save_path (SPDocument *doc, FileSaveMethod method) {
         case FILE_SAVE_METHOD_SAVE_AS:
         {
             use_current_dir = prefs->getBool("/dialogs/save_as/use_current_dir", true);
-            if (doc->getURI() && use_current_dir) {
-                path = Glib::path_get_dirname(doc->getURI());
+            if (doc->getDocumentURI() && use_current_dir) {
+                path = Glib::path_get_dirname(doc->getDocumentURI());
             } else {
                 path = prefs->getString("/dialogs/save_as/path");
             }
@@ -630,15 +630,15 @@ get_file_save_path (SPDocument *doc, FileSaveMethod method) {
             break;
         case FILE_SAVE_METHOD_SAVE_COPY:
             use_current_dir = prefs->getBool("/dialogs/save_copy/use_current_dir", prefs->getBool("/dialogs/save_as/use_current_dir", true));
-            if (doc->getURI() && use_current_dir) {
-                path = Glib::path_get_dirname(doc->getURI());
+            if (doc->getDocumentURI() && use_current_dir) {
+                path = Glib::path_get_dirname(doc->getDocumentURI());
             } else {
                 path = prefs->getString("/dialogs/save_copy/path");
             }
             break;
         case FILE_SAVE_METHOD_INKSCAPE_SVG:
-            if (doc->getURI()) {
-                path = Glib::path_get_dirname(doc->getURI());
+            if (doc->getDocumentURI()) {
+                path = Glib::path_get_dirname(doc->getDocumentURI());
             } else {
                 // FIXME: should we use the save_as path here or something else? Maybe we should
                 // leave this as a choice to the user.