From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 20 Apr 2009 15:40:01 +0000 (+0000)
Subject: Remove bogus ifdocstream constructor argument, which _may_ be the cause of
X-Git-Tag: 2.0.0~6774
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f3038bed06ffa2bbca79e4d37de5f6b54b8c6ffa;p=features.git

Remove bogus ifdocstream constructor argument, which _may_ be the cause of
tex2lyx woes under windows. It may also help chktex under windows
(does it works currently?)


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

diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index ed00fffa0e..4e3d28fb15 100644
--- a/src/support/docstream.cpp
+++ b/src/support/docstream.cpp
@@ -320,9 +320,9 @@ const char * iconv_codecvt_facet_exception::what() const throw()
 }
 
 
-ifdocstream::ifdocstream(string const & encoding) : base()
+ifdocstream::ifdocstream() : base()
 {
-	setEncoding(*this, encoding, in);
+	setEncoding(*this, "UTF-8", in);
 }
 
 
diff --git a/src/support/docstream.h b/src/support/docstream.h
index c15b27c288..056205df19 100644
--- a/src/support/docstream.h
+++ b/src/support/docstream.h
@@ -45,7 +45,7 @@ typedef std::basic_ostream<char_type> odocstream;
 class ifdocstream : public std::basic_ifstream<char_type> {
 	typedef std::basic_ifstream<char_type> base;
 public:
-	ifdocstream(std::string const & encoding = "UTF-8");
+	ifdocstream();
 	explicit ifdocstream(const char* s,
 		std::ios_base::openmode mode = std::ios_base::in,
 		std::string const & encoding = "UTF-8");