From b6a764eef3f042b26fe58131a2f5bd909db82990 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Wed, 21 Apr 2010 01:19:22 +0000 Subject: [PATCH] FileName.mangledFilename -> FileName.mangledFileName git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34236 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ExternalSupport.cpp | 4 ++-- src/insets/InsetBibtex.cpp | 6 +++--- src/insets/InsetGraphics.cpp | 6 +++--- src/insets/InsetInclude.cpp | 8 ++++---- src/support/FileName.cpp | 2 +- src/support/FileName.h | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/insets/ExternalSupport.cpp b/src/insets/ExternalSupport.cpp index 5b830a697b..7796c796bc 100644 --- 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 5180461f1e..b932f91737 100644 --- 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 d0e663475d..bd657b2457 100644 --- 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 6d512b4b7d..bf23015447 100644 --- 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 f75590d00d..f37b6dffd0 100644 --- 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 f86b768483..269834b536 100644 --- 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;