* src/text2.C: deleteEmptyParagraphMechanism(): fix a crash in

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index c79a2c08f7ef295c8118ee091815e2b191f2b79f..4145c78b842991f0f48065cebe6677cc2ad1df53 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -14,18 +14,16 @@
 #ifndef LYX_MAIN_H
 #define LYX_MAIN_H
 
-#include "support/filename.h"
-
 #include <boost/scoped_ptr.hpp>
 #include <boost/utility.hpp>
 
 #include <string>
-#include <vector>
 
 namespace lyx {
 
 class Buffer;
 class BufferList;
+class Converters;
 class ErrorItem;
 class IconvProcessor;
 class InsetBase;
@@ -33,6 +31,9 @@ class LyXFunc;
 class LyXServer;
 class LyXServerSocket;
 class LyXView;
+class Messages;
+class Mover;
+class Movers;
 class Session;
 class kb_keymap;
 
@@ -47,17 +48,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();
@@ -89,6 +80,17 @@ public:
        ///
        kb_keymap & topLevelKeymap();
        kb_keymap const & topLevelKeymap() const;
+       
+       ///
+       Converters & converters();
+       Converters & systemConverters();
+
+       ///
+       Messages & getMessages(std::string const & language);
+       ///
+       Messages & getGuiMessages();
+       ///
+       void setGuiLanguage(std::string const & language);
 
        ///
        IconvProcessor & iconvProcessor();
@@ -110,16 +112,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<support::FileName> & files);
+       int init(int & argc, char * argv[]);
+
+       /// Load files passed at command-line.
+       /**
+       This method is used only in non-GUI mode.
+       */
+       void loadFiles();
 
-       /// Create a View and restore GUI Session.
-       void restoreGuiSession(std::vector<support::FileName> const & files);
+       /// Create a View, load files and restore GUI Session.
+       void restoreGuiSession();
 
        /// Initialize RC font for the GUI.
        void initGuiFont();
@@ -140,7 +146,7 @@ private:
        /// read lyxrc/preferences
        bool readRcFile(std::string const & name);
        /// read the given ui (menu/toolbar) file
-       bool readUIFile(std::string const & name);
+       bool readUIFile(std::string const & name, bool include = false);
        /// read the given languages file
        bool readLanguagesFile(std::string const & name);
        /// read the given encodings file
@@ -158,6 +164,12 @@ private:
        /// 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);
+       friend void setMover(std::string const & fmt, std::string const & command);
+       friend Movers & theSystemMovers();
+       friend frontend::Application * theApp();
 };
 
 } // namespace lyx