Revert 23154.

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index 76f9d59fe3e1399e5c970c021004a92d733e05d9..982301a4e1cb9de265ae5571c1b1440ff6f08be5 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -14,10 +14,7 @@
 #ifndef LYX_H
 #define LYX_H
 
-#include <boost/scoped_ptr.hpp>
-#include <boost/noncopyable.hpp>
-
-#include <string>
+#include "support/strfwd.h"
 
 namespace lyx {
 
@@ -41,6 +38,7 @@ class KeyMap;
 class CmdDef;
 
 extern bool use_gui;
+extern bool quitting;
 
 namespace frontend {
 class Application;
@@ -48,7 +46,7 @@ class LyXView;
 }
 
 /// initial startup
-class LyX : boost::noncopyable {
+class LyX {
 public:
 
        LyX();
@@ -57,6 +55,11 @@ public:
        /// Execute LyX.
        int exec(int & argc, char * argv[]);
 
+       /// Try to exit LyX properly.
+       /// \p exit_code is 0 by default, if a non zero value is passed,
+       /// emergencyCleanup() will be called before exiting.
+       void exit(int exit_code = 0) const;
+
        static LyX & ref();
        static LyX const & cref();
 
@@ -104,20 +107,17 @@ public:
        ///
        frontend::LyXView * newLyXView();
 
-       /** redraw \c inset in all the BufferViews in which it is currently
-        *  visible. If successful return a pointer to the owning Buffer.
-        */
-       Buffer const * updateInset(Inset const *) const;
-
-       void hideDialogs(std::string const & name, Inset * inset) const;
-
        /// Execute batch commands if available.
        void execBatchCommands();
 
        ///
-       void addFileToLoad(support::FileName const &);
+       void addFileToLoad(std::string const &);
 
 private:
+       /// noncopyable
+       LyX(LyX const &);
+       void operator=(LyX const &);
+
        /// Do some cleanup in preparation of an exit.
        void prepareExit();
 
@@ -136,12 +136,6 @@ private:
        */
        void loadFiles();
 
-       /// Create a View, load files and restore GUI Session.
-       void restoreGuiSession();
-
-       /// Initialize RC font for the GUI.
-       void initGuiFont();
-
        /// initial LyX set up
        bool init();
        /// set up the default dead key bindings if requested
@@ -169,14 +163,13 @@ private:
        /// shows up a parsing error on screen
        void printError(ErrorItem const &);
 
+       /// Use the Pimpl idiom to hide the internals.
+       // Mostly used for singletons.
+       struct Impl;
+       Impl * pimpl_;
+
        /// has this user started lyx for the first time?
        bool first_start;
-       /// the parsed command line batch command if any
-       std::string batch_command;
-
-       /// Use the Pimpl idiom to hide the internals.
-       struct Singletons;
-       boost::scoped_ptr<Singletons> pimpl_;
 
        friend Movers & theMovers();
        friend Mover const & getMover(std::string  const & fmt);