X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.h;h=ab1619f97e7372a30b189ec50a4817141ad1ee43;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=2d82153221c7584119e82a4dce8eb3bef1e53794;hpb=f4857dab04e15bfa6dd2e10159a95a5d93b53070;p=lyx.git

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 2d82153221..ab1619f97e 100644
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -25,6 +25,7 @@ namespace lyx {
 class Buffer;
 class BufferList;
 class ErrorItem;
+class IconvProcessor;
 class InsetBase;
 class LyXFunc;
 class LyXServer;
@@ -40,21 +41,23 @@ namespace frontend { class Application; }
 /// initial startup
 class LyX : boost::noncopyable {
 public:
+
+	LyX();
+	~LyX();
+
 	/**
 	 * Execute LyX. The startup sequence is as follows:
 	 * -# LyX::exec()
 	 * -# LyX::priv_exec()
 	 * -# lyx::createApplication()
-	 * -# LyX::exec2()
 	 * Step 3 is omitted if no gui is wanted. We need lyx::createApplication()
 	 * only to create the QApplication object in the qt frontend. All
 	 * attempts with static and dynamically allocated QApplication
 	 * objects lead either to harmless error messages on exit
 	 * ("Mutex destroy failure") or crashes (OS X).
 	 */
-	static int exec(int & argc, char * argv[]);
-	/// Execute LyX (inner execution loop, \sa exec)
-	int exec2(int & argc, char * argv[]);
+	int exec(int & argc, char * argv[]);
+
 	static LyX & ref();
 	static LyX const & cref();
 
@@ -66,7 +69,7 @@ public:
 	In GUI mode, after this function has been called, application_ leaves
 	the main event loop and returns from the call to Application::start().
 	*/
-	void quit(bool noask);
+	void quit();
 
 	///
 	BufferList & bufferList();
@@ -92,6 +95,9 @@ public:
 	kb_keymap & topLevelKeymap();
 	kb_keymap const & topLevelKeymap() const;
 
+	///
+	IconvProcessor & iconvProcessor();
+
 	LyXView * newLyXView();
 
 	/** redraw \c inset in all the BufferViews in which it is currently
@@ -100,11 +106,6 @@ public:
 	Buffer const * const updateInset(InsetBase const *) const;
 
 private:
-	static boost::scoped_ptr<LyX> singleton_;
-
-	LyX();
-	int priv_exec(int & argc, char * argv[]);
-
 	/// Do some cleanup in preparation of an exit.
 	void prepareExit();