LFUN_UNICODE_INSERT - unicode-insert

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index f8d5705007a5d11c942036ae65607f9e875c97f3..a95ec5334910b7d212329794aa3d1d082d691052 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -15,27 +15,28 @@
 #define LYX_MAIN_H
 
 #include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 
 #include <list>
 #include <string>
 #include <vector>
 
+namespace lyx {
+
 class Buffer;
 class BufferList;
 class ErrorItem;
 class InsetBase;
+class LyXFunc;
+class LyXServer;
+class LyXServerSocket;
 class LyXView;
+class Session;
 class kb_keymap;
 
-namespace lyx {
 extern bool use_gui;
-class Session;
-namespace frontend {
-class Application;
-}
-}
+
+namespace frontend { class Application; }
 
 /// initial startup
 class LyX : boost::noncopyable {
@@ -72,10 +73,27 @@ public:
        BufferList & bufferList();
        BufferList const & bufferList() const;
        ///
-       lyx::Session & session();
-       lyx::Session const & session() const;
+       Session & session();
+       Session const & session() const;
+       ///
+       LyXFunc & lyxFunc();
+       LyXFunc const & lyxFunc() const;
+       ///
+       LyXServer & server();
+       LyXServer const & server() const;
+       ///
+       LyXServerSocket & socket();
+       LyXServerSocket const & socket() const;
 
-       void addLyXView(LyXView * lyxview);
+       ///
+       frontend::Application & application();
+       frontend::Application const & application() const;
+
+       ///
+       kb_keymap & topLevelKeymap();
+       kb_keymap const & topLevelKeymap() const;
+
+       LyXView * newLyXView();
 
        /** redraw \c inset in all the BufferViews in which it is currently
         *  visible. If successful return a pointer to the owning Buffer.
@@ -105,6 +123,9 @@ private:
        /// Create a View and restore GUI Session.
        void restoreGuiSession(std::vector<std::string> const & files);
 
+       ///
+       void addLyXView(LyXView * lyxview);
+
        /// Initialize RC font for the GUI.
        void initGuiFont();
 
@@ -139,19 +160,17 @@ private:
        /// the parsed command line batch command if any
        std::string batch_command;
 
-       ///
-       boost::scoped_ptr<BufferList> buffer_list_;
-       /// lyx session, containing lastfiles, lastfilepos, and lastopened
-       boost::scoped_ptr<lyx::Session> session_;
+       /// Use the Pimpl idiom to hide the internals.
+       struct Singletons;
+       boost::scoped_ptr<Singletons> pimpl_;
        ///
        typedef std::list<LyXView *> ViewList;
        ViewList views_;
 
        ///
        bool geometryOption_;
-
-       ///
-       boost::scoped_ptr<lyx::frontend::Application> application_;
 };
 
+} // namespace lyx
+
 #endif // LYX_MAIN_H