#include <boost/utility.hpp>
#include <string>
-#include <vector>
namespace lyx {
class Buffer;
class BufferList;
class ErrorItem;
+class IconvProcessor;
class InsetBase;
class LyXFunc;
class LyXServer;
/// initial startup
class LyX : boost::noncopyable {
public:
- /**
- * 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[]);
+
+ LyX();
+ ~LyX();
+
+ /// Execute LyX.
+ int exec(int & argc, char * argv[]);
+
static LyX & ref();
static LyX const & cref();
/// 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(bool noask);
-
///
BufferList & bufferList();
BufferList const & bufferList() const;
kb_keymap & topLevelKeymap();
kb_keymap const & topLevelKeymap() const;
+ ///
+ IconvProcessor & iconvProcessor();
+
LyXView * newLyXView();
/** redraw \c inset in all the BufferViews in which it is currently
*/
Buffer const * const updateInset(InsetBase const *) const;
-private:
- static boost::scoped_ptr<LyX> singleton_;
-
- LyX();
- int priv_exec(int & argc, char * argv[]);
+ /// Execute batch commands if available.
+ void execBatchCommands();
+private:
/// Do some cleanup in preparation of an exit.
void prepareExit();
/// Early exit during the initialisation process.
void earlyExit(int status);
- /// Initialise LyX and execute batch commands if available.
+ /// 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 execBatchCommands(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();
/// Use the Pimpl idiom to hide the internals.
struct Singletons;
boost::scoped_ptr<Singletons> pimpl_;
-
- ///
- bool geometryOption_;
};
} // namespace lyx