rename [io]docfstream to [io]fdocstream

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

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 54ea10f86edfabef5a152cf1301bd8c37a7bfe2c..d63160b6b6286bfb20809f37e8a4c77b35dab28a 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -962,7 +962,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
        string const encoding = runparams.encoding->iconvName();
        LYXERR(Debug::LATEX, "makeLaTeXFile encoding: " << encoding << "...");
 
-       odocfstream ofs;
+       ofdocstream ofs;
        try { ofs.reset(encoding); }
        catch (iconv_codecvt_facet_exception & e) {
                lyxerr << "Caught iconv exception: " << e.what() << endl;
@@ -1181,7 +1181,7 @@ void Buffer::makeDocBookFile(FileName const & fname,
 {
        LYXERR(Debug::LATEX, "makeDocBookFile...");
 
-       odocfstream ofs;
+       ofdocstream ofs;
        if (!openFileWrite(ofs, fname))
                return;
 

diff --git a/src/Buffer.h b/src/Buffer.h
index b80cee4c622a0a57ac1f140a8782fb841abf0e80..23ac227a8e3f5814242d80987c3c184ca3a52b58 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -185,14 +185,14 @@ public:
            encoding associated to \p os. Therefore you must not call this
            method with a string stream if the output is supposed to go to a
            file. \code
-           odocfstream ofs;
+           ofdocstream ofs;
            ofs.open("test.tex");
            writeLaTeXSource(ofs, ...);
            ofs.close();
            \endcode is NOT equivalent to \code
            odocstringstream oss;
            writeLaTeXSource(oss, ...);
-           odocfstream ofs;
+           ofdocstream ofs;
            ofs.open("test.tex");
            ofs << oss.str();
            ofs.close();

diff --git a/src/Chktex.cpp b/src/Chktex.cpp
index 20ee902876738a9d1f4d01bec583594acad6884f..8683203d3b040b959aaf11244972a9932066a991 100644 (file)
--- a/src/Chktex.cpp
+++ b/src/Chktex.cpp
@@ -67,7 +67,7 @@ int Chktex::scanLogFile(TeXErrors & terr)
        docstring token;
        // FIXME UNICODE
        // We have no idea what the encoding of the error file is
-       idocfstream ifs(tmp.toFilesystemEncoding().c_str());
+       ifdocstream ifs(tmp.toFilesystemEncoding().c_str());
        while (getline(ifs, token)) {
                docstring srcfile;
                docstring line;

diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index 72a420e371a846f630b5d91b97a37e9635ece6d0..91018f7d26a0e16bf827a5e7d8a24347a5489bdb 100644 (file)
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -556,7 +556,7 @@ void PreviewLoader::Impl::startLoading()
 
        // we use the encoding of the buffer
        Encoding const & enc = buffer_.params().encoding();
-       odocfstream of;
+       ofdocstream of;
        try { of.reset(enc.iconvName()); }
        catch (iconv_codecvt_facet_exception & e) {
                LYXERR0("Caught iconv exception: " << e.what()

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 9b0e77e7b6936654fddce7609c491bd4e296e007..0dd60da08a13c674e46939a6411ead76b8acfcc0 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -434,7 +434,7 @@ namespace {
        /// and further whitespace characters from the stream.
        /// @return true if a comma was found, false otherwise
        ///
-       bool removeWSAndComma(idocfstream & ifs) {
+       bool removeWSAndComma(ifdocstream & ifs) {
                char_type ch;
 
                if (!ifs)
@@ -477,7 +477,7 @@ namespace {
        ///
        /// @return true if a string of length > 0 could be read.
        ///
-       bool readTypeOrKey(docstring & val, idocfstream & ifs,
+       bool readTypeOrKey(docstring & val, ifdocstream & ifs,
                docstring const & delimChars, docstring const &illegalChars, 
                charCase chCase) {
 
@@ -532,7 +532,7 @@ namespace {
        /// the variable strings.
        /// @return true if reading was successfull (all single parts were delimited
        /// correctly)
-       bool readValue(docstring & val, idocfstream & ifs, const VarMap & strings) {
+       bool readValue(docstring & val, ifdocstream & ifs, const VarMap & strings) {
 
                char_type ch;
 
@@ -688,7 +688,7 @@ void InsetBibtex::fillWithBibKeys(BiblioInfo & keylist,
        support::FileNameList::const_iterator it = files.begin();
        support::FileNameList::const_iterator en = files.end();
        for (; it != en; ++ it) {
-               idocfstream ifs(it->toFilesystemEncoding().c_str(),
+               ifdocstream ifs(it->toFilesystemEncoding().c_str(),
                        ios_base::in, buffer().params().encoding().iconvName());
 
                char_type ch;

diff --git a/src/output.cpp b/src/output.cpp
index 47b48ffc6163122ba7adb2c4e2a665e53e6735d4..149ba78cea6e9a7fbf3b196784bf20b9cbe635eb 100644 (file)
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -49,7 +49,7 @@ bool openFileWrite(ofstream & ofs, FileName const & fname)
 }
 
 
-bool openFileWrite(odocfstream & ofs, FileName const & fname)
+bool openFileWrite(ofdocstream & ofs, FileName const & fname)
 {
        return doOpenFileWrite(ofs, fname);
 }

diff --git a/src/output.h b/src/output.h
index 2ab3058fbbec35efa16d1291ce13fa2ae8be5da9..4320943ea62e885a2b8c9b234d2c14f30eb32d77 100644 (file)
--- a/src/output.h
+++ b/src/output.h
@@ -20,7 +20,7 @@ namespace lyx {
 namespace support { class FileName; }
 
 bool openFileWrite(std::ofstream & ofs, support::FileName const & fname);
-bool openFileWrite(odocfstream & ofs, support::FileName const & fname);
+bool openFileWrite(ofdocstream & ofs, support::FileName const & fname);
 
 
 } // namespace lyx

diff --git a/src/output_plaintext.cpp b/src/output_plaintext.cpp
index 3ff3771049b5b49a31f18b2f5cd08abd7568b9fa..97e3ab11270c5fab649507d74e8ae2a679c32a88 100644 (file)
--- a/src/output_plaintext.cpp
+++ b/src/output_plaintext.cpp
@@ -34,7 +34,7 @@ namespace lyx {
 void writePlaintextFile(Buffer const & buf, FileName const & fname,
        OutputParams const & runparams)
 {
-       odocfstream ofs;
+       ofdocstream ofs;
        if (!openFileWrite(ofs, fname))
                return;
        writePlaintextFile(buf, ofs, runparams);

diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index 7777d1331585bea368e84ea109adc9293096028f..e5120bc63b1132a6d8beb0470c606417c63a1ea8 100644 (file)
--- a/src/support/docstream.cpp
+++ b/src/support/docstream.cpp
@@ -282,13 +282,13 @@ const char * iconv_codecvt_facet_exception::what() const throw()
 }
 
 
-idocfstream::idocfstream(string const & encoding) : base()
+ifdocstream::ifdocstream(string const & encoding) : base()
 {
        setEncoding(*this, encoding, in);
 }
 
 
-idocfstream::idocfstream(const char* s, ios_base::openmode mode,
+ifdocstream::ifdocstream(const char* s, ios_base::openmode mode,
                         string const & encoding)
        : base()
 {
@@ -297,13 +297,13 @@ idocfstream::idocfstream(const char* s, ios_base::openmode mode,
 }
 
 
-odocfstream::odocfstream(): base()
+ofdocstream::ofdocstream(): base()
 {
        setEncoding(*this, "UTF-8", out);
 }
 
 
-odocfstream::odocfstream(const char* s, ios_base::openmode mode,
+ofdocstream::ofdocstream(const char* s, ios_base::openmode mode,
                         string const & encoding)
        : base()
 {
@@ -312,7 +312,7 @@ odocfstream::odocfstream(const char* s, ios_base::openmode mode,
 }
 
 
-void odocfstream::reset(string const & encoding)
+void ofdocstream::reset(string const & encoding)
 {
        setEncoding(*this, encoding, out);
 }

diff --git a/src/support/docstream.h b/src/support/docstream.h
index c3a82260144ea665fff864853037e582c08e20c3..11eee7422c711f8457e20f91038bc57334c03400 100644 (file)
--- a/src/support/docstream.h
+++ b/src/support/docstream.h
@@ -42,26 +42,26 @@ typedef std::basic_ostream<char_type> odocstream;
 
 /// File stream for reading UTF8-encoded files with automatic conversion to
 /// UCS4.
-class idocfstream : public std::basic_ifstream<char_type> {
+class ifdocstream : public std::basic_ifstream<char_type> {
        typedef std::basic_ifstream<char_type> base;
 public:
-       idocfstream(std::string const & encoding = "UTF-8");
-       explicit idocfstream(const char* s,
+       ifdocstream(std::string const & encoding = "UTF-8");
+       explicit ifdocstream(const char* s,
                std::ios_base::openmode mode = std::ios_base::in,
                std::string const & encoding = "UTF-8");
-       ~idocfstream() {}
+       ~ifdocstream() {}
 };
 
 /// File stream for writing files in 8bit encoding \p encoding with automatic
 /// conversion from UCS4.
-class odocfstream : public std::basic_ofstream<char_type> {
+class ofdocstream : public std::basic_ofstream<char_type> {
        typedef std::basic_ofstream<char_type> base;
 public:
-       odocfstream();
-       explicit odocfstream(const char* s,
+       ofdocstream();
+       explicit ofdocstream(const char* s,
                std::ios_base::openmode mode = std::ios_base::out|std::ios_base::trunc,
                std::string const & encoding = "UTF-8");
-       ~odocfstream() {}
+       ~ofdocstream() {}
        ///
        void reset(std::string const & encoding);
 };