cleanup and reorder initialisation code of GuiView and GuiToolbars. Move some things...

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index e7b18f40e393d652110ab93569ceb35e85ed037f..5d0cf3340c696e3e1758163aa9a5e5111002020a 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 {
 
@@ -48,7 +45,7 @@ class LyXView;
 }
 
 /// initial startup
-class LyX : boost::noncopyable {
+class LyX {
 public:
 
        LyX();
@@ -104,13 +101,6 @@ 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();
 
@@ -118,6 +108,10 @@ public:
        void addFileToLoad(support::FileName const &);
 
 private:
+       /// noncopyable
+       LyX(LyX const &);
+       void operator=(LyX const &);
+
        /// Do some cleanup in preparation of an exit.
        void prepareExit();
 
@@ -139,13 +133,8 @@ private:
        /// 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 key bindings
-       void defaultKeyBindings(KeyMap * kbmap);
        /// set up the default dead key bindings if requested
        void deadKeyBindings(KeyMap * kbmap);
        /** Check for the existence of the user's support directory and,
@@ -171,14 +160,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);