X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=b881f3d78f55f3c383c1ffbaa09bfe24008f2650;hb=ba62665f966508db5a4de6864f4aa7374c5a5356;hp=e3cc561eec2f083fdcb56e91cdcb88c6c499d590;hpb=aaa544313d576aa54dd97165d164a1f75a42ae02;p=lyx.git

diff --git a/src/lyx_main.C b/src/lyx_main.C
index e3cc561eec..b881f3d78f 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -58,7 +58,6 @@
 #include "support/package.h"
 #include "support/path.h"
 #include "support/systemcall.h"
-#include "support/unicode.h"
 
 #include <boost/bind.hpp>
 #include <boost/filesystem/operations.hpp>
@@ -150,7 +149,7 @@ void reconfigureUserLyXDir()
 /// The main application class private implementation.
 struct LyX::Singletons 
 {
-	Singletons(): iconv(ucs4_codeset, "UTF-8")
+	Singletons()
 	{
 		// Set the default User Interface language as soon as possible.
 		// The language used will be derived from the environment
@@ -172,9 +171,6 @@ struct LyX::Singletons
 	/// lyx session, containing lastfiles, lastfilepos, and lastopened
 	boost::scoped_ptr<Session> session_;
 
-	///
-	IconvProcessor iconv;
-
 	/// Files to load at start.
 	vector<FileName> files_to_load_;
 
@@ -331,12 +327,6 @@ Converters & LyX::systemConverters()
 }
 
 
-IconvProcessor & LyX::iconvProcessor()
-{
-	return pimpl_->iconv;
-}
-
-
 kb_keymap const & LyX::topLevelKeymap() const
 {
 	BOOST_ASSERT(pimpl_->toplevel_keymap_.get());
@@ -653,10 +643,10 @@ LyXView * LyX::newLyXView()
 	}
 	// if lyxrc returns (0,0), then use session info
 	else {
-		string val = session().sessionInfo().load("WindowWidth", false);
+		string val = session().sessionInfo().load("WindowWidth");
 		if (!val.empty())
 			width = convert<unsigned int>(val);
-		val = session().sessionInfo().load("WindowHeight", false);
+		val = session().sessionInfo().load("WindowHeight");
 		if (!val.empty())
 			height = convert<unsigned int>(val);
 		if (session().sessionInfo().load("WindowIsMaximized") == "yes")
@@ -1533,12 +1523,6 @@ Movers & theSystemMovers()
 }
 
 
-IconvProcessor & utf8ToUcs4()
-{
-	return LyX::ref().iconvProcessor();
-}
-
-
 Messages & getMessages(std::string const & language)
 {
 	return LyX::ref().getMessages(language);