Fix dEPM crash:

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index a0b74578ace3540040035786ac6c08f2e9d94b60..9b228c6639efad34939b9e406f69d94aa7fabd0e 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -18,7 +18,6 @@
 #include <boost/utility.hpp>
 
 #include <string>
-#include <vector>
 
 namespace lyx {
 
@@ -45,17 +44,7 @@ public:
        LyX();
        ~LyX();
 
-       /**
-        * Execute LyX. The startup sequence is as follows:
-        * -# LyX::exec()
-        * -# LyX::priv_exec()
-        * -# lyx::createApplication()
-        * 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).
-        */
+       /// Execute LyX.
        int exec(int & argc, char * argv[]);
 
        static LyX & ref();
@@ -64,13 +53,6 @@ public:
        /// in the case of failure
        void emergencyCleanup() const;
 
-       /// Ask the LyX class to exit.
-       /**
-       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();
-
        ///
        BufferList & bufferList();
        BufferList const & bufferList() const;
@@ -115,16 +97,20 @@ private:
        /// Early exit during the initialisation process.
        void earlyExit(int status);
 
-       /// Initialise LyX and load files if asked.
+       /// Initialise LyX and fills-in the vector of files to be loaded.
        /**
-       \param files is filled in with the command-line file names.
        \return exit code failure if any.
        */
-       int loadFiles(int & argc, char * argv[],
-               std::vector<std::string> & files);
+       int init(int & argc, char * argv[]);
 
-       /// Create a View and restore GUI Session.
-       void restoreGuiSession(std::vector<std::string> const & files);
+       /// Load files passed at command-line.
+       /**
+       This method is used only in non-GUI mode.
+       */
+       void loadFiles();
+
+       /// Create a View, load files and restore GUI Session.
+       void restoreGuiSession();
 
        /// Initialize RC font for the GUI.
        void initGuiFont();
@@ -163,9 +149,6 @@ private:
        /// Use the Pimpl idiom to hide the internals.
        struct Singletons;
        boost::scoped_ptr<Singletons> pimpl_;
-
-       ///
-       bool geometryOption_;
 };
 
 } // namespace lyx