Filename.relFilename -> Filename.relFileName

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34235 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index bf63d945343241bc9713ed55ea091aa3d010260d..d0e663475d4f91a28ae2355fc83be936ea635761 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -550,7 +550,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
 
        string const orig_file = params().filename.absFileName();
        // this is for dryrun and display purposes, do not use latexFilename
-       string const rel_file = params().filename.relFilename(buffer().filePath());
+       string const rel_file = params().filename.relFileName(buffer().filePath());
 
        // previewing source code, no file copying or file format conversion
        if (runparams.dryrun)
@@ -980,7 +980,7 @@ void InsetGraphics::validate(LaTeXFeatures & features) const
        if (features.runparams().nice) {
                Buffer const * masterBuffer = features.buffer().masterBuffer();
                string const rel_file = removeExtension(
-                       params().filename.relFilename(masterBuffer->filePath()));
+                       params().filename.relFileName(masterBuffer->filePath()));
                if (contains(rel_file, "."))
                        features.require("lyxdot");
        }

diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index ad7bc020132fd92580887bd962d80330f3898159..f75590d00daaa337c36f50da77167409d893f22e 100644 (file)
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
@@ -1072,7 +1072,7 @@ void DocFileName::erase()
 }
 
 
-string DocFileName::relFilename(string const & path) const
+string DocFileName::relFileName(string const & path) const
 {
        // FIXME UNICODE
        return to_utf8(relPath(path));
@@ -1081,7 +1081,7 @@ string DocFileName::relFilename(string const & path) const
 
 string DocFileName::outputFilename(string const & path) const
 {
-       return save_abs_path_ ? absFileName() : relFilename(path);
+       return save_abs_path_ ? absFileName() : relFileName(path);
 }
 
 

diff --git a/src/support/FileName.h b/src/support/FileName.h
index 97381d7892c7d34d9b618cadd617a796e6040468..f86b7684835076814d861c4cb555f387f2c1efef 100644 (file)
--- a/src/support/FileName.h
+++ b/src/support/FileName.h
@@ -263,7 +263,7 @@ public:
        ///
        bool saveAbsPath() const { return save_abs_path_; }
        /// \param buffer_path if empty, uses `pwd`
-       std::string relFilename(std::string const & buffer_path = empty_string()) const;
+       std::string relFileName(std::string const & buffer_path = empty_string()) const;
        /// \param buf_path if empty, uses `pwd`
        std::string outputFilename(std::string const & buf_path = empty_string()) const;