minimal effort implementation of:

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 550619784aa5ed4f3d7564f6659533e9601e7372..55fdd631b6e63258da3d4d1a11092d09b6b987f9 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -46,9 +46,9 @@ public:
         * objects lead either to harmless error messages on exit
         * ("Mutex destroy failure") or crashes (OS X).
         */
-       static void exec(int & argc, char * argv[]);
+       static int exec(int & argc, char * argv[]);
        /// Execute LyX (inner execution loop, \sa exec)
-       void exec2(int & argc, char * argv[]);
+       int exec2(int & argc, char * argv[]);
        static LyX & ref();
        static LyX const & cref();
 
@@ -58,7 +58,7 @@ public:
        lyx::Session & session();
        lyx::Session const & session() const;
 
-       void addLyXView(boost::shared_ptr<LyXView> const & lyxview);
+       void addLyXView(LyXView * lyxview);
 
        /** redraw \c inset in all the BufferViews in which it is currently
         *  visible. If successful return a pointer to the owning Buffer.
@@ -69,10 +69,10 @@ private:
        static boost::scoped_ptr<LyX> singleton_;
 
        LyX();
-       void priv_exec(int & argc, char * argv[]);
+       int priv_exec(int & argc, char * argv[]);
 
        /// initial LyX set up
-       void init();
+       bool init();
        /// set up the default key bindings
        void defaultKeyBindings(kb_keymap * kbmap);
        /// set up the default dead key bindings if requested
@@ -85,13 +85,13 @@ private:
         */
        bool queryUserLyXDir(bool explicit_userdir);
        /// read lyxrc/preferences
-       void readRcFile(std::string const & name);
+       bool readRcFile(std::string const & name);
        /// read the given ui (menu/toolbar) file
-       void readUIFile(std::string const & name);
+       bool readUIFile(std::string const & name);
        /// read the given languages file
-       void readLanguagesFile(std::string const & name);
+       bool readLanguagesFile(std::string const & name);
        /// read the given encodings file
-       void readEncodingsFile(std::string const & name);
+       bool readEncodingsFile(std::string const & name);
        /// parsing of non-gui LyX options. Returns true if gui
        bool easyParse(int & argc, char * argv[]);
        /// shows up a parsing error on screen
@@ -105,10 +105,10 @@ private:
        /// lyx session, containing lastfiles, lastfilepos, and lastopened
        boost::scoped_ptr<lyx::Session> session_;
        ///
-       typedef std::list<boost::shared_ptr<LyXView> > ViewList;
+       typedef std::list<LyXView *> ViewList;
        ViewList views_;
 
-       /// 
+       ///
        bool geometryOption_;
 
 };