FileName.mangledFilename -> FileName.mangledFileName

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

diff --git a/src/insets/ExternalSupport.cpp b/src/insets/ExternalSupport.cpp
index 5b830a697be560b81e7878fc80c4f9e171d9af95..7796c796bc2abdf3c45ab229dafab44d08c9fda8 100644 (file)
--- a/src/insets/ExternalSupport.cpp
+++ b/src/insets/ExternalSupport.cpp
@@ -88,7 +88,7 @@ string const doSubstitution(InsetExternalParams const & params,
                masterBuffer->temppath() :
                buffer.filePath();
        string const filename = external_in_tmpdir ?
-               params.filename.mangledFilename() :
+               params.filename.mangledFileName() :
                params.filename.outputFilename(parentpath);
        string const basename = changeExtension(
                        onlyFilename(filename), string());
@@ -246,7 +246,7 @@ void updateExternal(InsetExternalParams const & params,
        // We copy the source file to the temp dir and do the conversion
        // there if necessary
        FileName const temp_file(
-               makeAbsPath(params.filename.mangledFilename(),
+               makeAbsPath(params.filename.mangledFileName(),
                                     masterBuffer->temppath()));
        if (!params.filename.empty() && !params.filename.isDirectory()) {
                unsigned long const from_checksum = params.filename.checksum();

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 5180461f1eaa5230d75cc324a2551d7660706d67..b932f9173773c06a67831e15ca929a44cde8d5d4 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -267,9 +267,9 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const
 
                if (!runparams.inComment && !runparams.dryrun && !runparams.nice &&
                    not_from_texmf) {
-                       // mangledFilename() needs the extension
+                       // mangledFileName() needs the extension
                        DocFileName const in_file = DocFileName(try_in_file);
-                       database = removeExtension(in_file.mangledFilename());
+                       database = removeExtension(in_file.mangledFileName());
                        FileName const out_file = makeAbsPath(database + ".bib",
                                        buffer().masterBuffer()->temppath());
 
@@ -330,7 +330,7 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const
                    not_from_texmf) {
                        // use new style name
                        DocFileName const in_file = DocFileName(try_in_file);
-                       base = removeExtension(in_file.mangledFilename());
+                       base = removeExtension(in_file.mangledFileName());
                        FileName const out_file = makeAbsPath(base + ".bst",
                                        buffer().masterBuffer()->temppath());
                        bool const success = in_file.copyTo(out_file);

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index d0e663475d4f91a28ae2355fc83be936ea635761..bd657b2457c1819ffea811b96dc592dfe323a91c 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -487,11 +487,11 @@ copyToDirIfNeeded(DocFileName const & file, string const & dir)
        if (rtrim(onlyPath(file_in) , "/") == rtrim(dir, "/"))
                return make_pair(IDENTICAL_PATHS, file_in);
 
-       string mangled = file.mangledFilename();
+       string mangled = file.mangledFileName();
        if (file.isZipped()) {
                // We need to change _eps.gz to .eps.gz. The mangled name is
-               // still unique because of the counter in mangledFilename().
-               // We can't just call mangledFilename() with the zip
+               // still unique because of the counter in mangledFileName().
+               // We can't just call mangledFileName() with the zip
                // extension removed, because base.eps and base.eps.gz may
                // have different content but would get the same mangled
                // name in this case.

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 6d512b4b7d9aefe5180006806f7aae2e3c087a29..bf2301544748fc5fe58223d6be07e6d22e3eba88 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -494,11 +494,11 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
        // bug 5681
        if (type(params()) == LISTINGS) {
                exportfile = incfile;
-               mangled = DocFileName(included_file).mangledFilename();
+               mangled = DocFileName(included_file).mangledFileName();
        } else {
                exportfile = changeExtension(incfile, ".tex");
                mangled = DocFileName(changeExtension(included_file.absFileName(), ".tex")).
-                       mangledFilename();
+                       mangledFileName();
        }
 
        FileName const writefile(makeAbsPath(mangled, masterBuffer->temppath()));
@@ -750,7 +750,7 @@ int InsetInclude::docbook(odocstream & os, OutputParams const & runparams) const
        if (loadIfNeeded()) {
                Buffer * tmp = theBufferList().getBuffer(FileName(included_file));
 
-               string const mangled = writefile.mangledFilename();
+               string const mangled = writefile.mangledFileName();
                writefile = makeAbsPath(mangled,
                                        buffer().masterBuffer()->temppath());
                if (!runparams.nice)
@@ -795,7 +795,7 @@ void InsetInclude::validate(LaTeXFeatures & features) const
                writefile = included_file;
 
        if (!features.runparams().nice && !isVerbatim(params()) && !isListings(params())) {
-               incfile = DocFileName(writefile).mangledFilename();
+               incfile = DocFileName(writefile).mangledFileName();
                writefile = makeAbsPath(incfile,
                                        buffer().masterBuffer()->temppath()).absFileName();
        }

diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index f75590d00daaa337c36f50da77167409d893f22e..f37b6dffd052fac09aef9c9d9176a736511391d4 100644 (file)
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
@@ -1085,7 +1085,7 @@ string DocFileName::outputFilename(string const & path) const
 }
 
 
-string DocFileName::mangledFilename(string const & dir) const
+string DocFileName::mangledFileName(string const & dir) const
 {
        // We need to make sure that every DocFileName instance for a given
        // filename returns the same mangled name.

diff --git a/src/support/FileName.h b/src/support/FileName.h
index f86b7684835076814d861c4cb555f387f2c1efef..269834b53695b9b7817860133137e3200f1ab5f1 100644 (file)
--- a/src/support/FileName.h
+++ b/src/support/FileName.h
@@ -288,7 +288,7 @@ public:
         *  with @c dir.
         */
        std::string
-       mangledFilename(std::string const & dir = empty_string()) const;
+       mangledFileName(std::string const & dir = empty_string()) const;
 
        /// \return true if the file is compressed.
        bool isZipped() const;