From 774bee47ed685bd666173cb4d1664933217371c9 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 20 Feb 2019 10:50:38 +0100
Subject: Give more descriptive names to document file related variables and
 functions. Makes searching through code for them easier.

---
 src/io/file-export-cmd.cpp  | 4 ++--
 src/io/resource-manager.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/io')

diff --git a/src/io/file-export-cmd.cpp b/src/io/file-export-cmd.cpp
index d9527f89a..03b738197 100644
--- a/src/io/file-export-cmd.cpp
+++ b/src/io/file-export-cmd.cpp
@@ -415,8 +415,8 @@ InkFileExportCmd::do_export_png(SPDocument *doc, std::string filename_in)
 
         if (filename_from_hint) {
             //Make relative paths go from the document location, if possible:
-            if (!Glib::path_is_absolute(filename_out) && doc->getURI()) {
-                std::string dirname = Glib::path_get_dirname(doc->getURI());
+            if (!Glib::path_is_absolute(filename_out) && doc->getDocumentURI()) {
+                std::string dirname = Glib::path_get_dirname(doc->getDocumentURI());
                 if (!dirname.empty()) {
                     filename_out = Glib::build_filename(dirname, filename_out);
                 }
diff --git a/src/io/resource-manager.cpp b/src/io/resource-manager.cpp
index 48ef6ff76..fc742cb80 100644
--- a/src/io/resource-manager.cpp
+++ b/src/io/resource-manager.cpp
@@ -232,7 +232,7 @@ std::vector<Glib::ustring> ResourceManagerImpl::findBrokenLinks( SPDocument *doc
                             uniques.insert(href);
                         }
                     } else {
-                        std::string combined = Glib::build_filename(doc->getBase(), uri);
+                        std::string combined = Glib::build_filename(doc->getDocumentBase(), uri);
                         if ( !Glib::file_test(combined, Glib::FILE_TEST_EXISTS) ) {
                             result.emplace_back(href);
                             uniques.insert(href);
@@ -328,7 +328,7 @@ bool ResourceManagerImpl::fixupBrokenLinks(SPDocument *doc)
     bool changed = false;
     if ( doc ) {
         // TODO debug g_message("FIXUP FIXUP FIXUP FIXUP FIXUP FIXUP FIXUP FIXUP FIXUP FIXUP");
-        // TODO debug g_message("      base is [%s]", doc->getBase());
+        // TODO debug g_message("      base is [%s]", doc->getDocumentBase());
 
         std::vector<Glib::ustring> brokenHrefs = findBrokenLinks(doc);
         if ( !brokenHrefs.empty() ) {
@@ -338,7 +338,7 @@ bool ResourceManagerImpl::fixupBrokenLinks(SPDocument *doc)
             }
         }
 
-        std::map<Glib::ustring, Glib::ustring> mapping = locateLinks(doc->getBase(), brokenHrefs);
+        std::map<Glib::ustring, Glib::ustring> mapping = locateLinks(doc->getDocumentBase(), brokenHrefs);
         for ( std::map<Glib::ustring, Glib::ustring>::iterator it = mapping.begin(); it != mapping.end(); ++it )
         {
             // TODO debug g_message("     [%s] ==> {%s}", it->first.c_str(), it->second.c_str());
-- 
cgit v1.2.3