From 266ad9501daebf5330c481bb683ac604b605c3d8 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Wed, 21 Apr 2010 01:19:26 +0000 Subject: [PATCH] DocFileName::unzippedFilename -> DocFileName::unzippedFileName git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34239 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/InsetGraphics.cpp | 2 +- src/support/FileName.cpp | 4 ++-- src/support/FileName.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp index d7c1c74a68..4de0a5c03c 100644 --- a/src/insets/InsetGraphics.cpp +++ b/src/insets/InsetGraphics.cpp @@ -495,7 +495,7 @@ copyToDirIfNeeded(DocFileName const & file, string const & dir) // extension removed, because base.eps and base.eps.gz may // have different content but would get the same mangled // name in this case. - string const base = removeExtension(file.unzippedFilename()); + string const base = removeExtension(file.unzippedFileName()); string::size_type const ext_len = file_in.length() - base.length(); mangled[mangled.length() - ext_len] = '.'; } diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp index 0d6a2bdb6d..e68d1f7190 100644 --- a/src/support/FileName.cpp +++ b/src/support/FileName.cpp @@ -1157,9 +1157,9 @@ bool DocFileName::isZipped() const } -string DocFileName::unzippedFilename() const +string DocFileName::unzippedFileName() const { - return unzippedFileName(absFileName()); + return support::unzippedFileName(absFileName()); } diff --git a/src/support/FileName.h b/src/support/FileName.h index e1b732d957..23e6fd0d40 100644 --- a/src/support/FileName.h +++ b/src/support/FileName.h @@ -293,7 +293,7 @@ public: /// \return true if the file is compressed. bool isZipped() const; /// \return the absolute file name without its .gz, .z, .Z extension - std::string unzippedFilename() const; + std::string unzippedFileName() const; private: /// Records whether we should save (or export) the filename as a relative