LFUN_UNICODE_INSERT - unicode-insert

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 24b3f79c2fd6826151879c0b12dc02c85a8f146e..a95ec5334910b7d212329794aa3d1d082d691052 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -21,6 +21,8 @@
 #include <string>
 #include <vector>
 
+namespace lyx {
+
 class Buffer;
 class BufferList;
 class ErrorItem;
@@ -29,16 +31,12 @@ 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 {
@@ -75,8 +73,8 @@ 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;
@@ -88,14 +86,14 @@ public:
        LyXServerSocket const & socket() const;
 
        ///
-       lyx::frontend::Application & application();
-       lyx::frontend::Application const & application() const;
+       frontend::Application & application();
+       frontend::Application const & application() const;
 
        ///
        kb_keymap & topLevelKeymap();
        kb_keymap const & topLevelKeymap() const;
 
-       void addLyXView(LyXView * lyxview);
+       LyXView * newLyXView();
 
        /** redraw \c inset in all the BufferViews in which it is currently
         *  visible. If successful return a pointer to the owning Buffer.
@@ -125,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();
 
@@ -170,4 +171,6 @@ private:
        bool geometryOption_;
 };
 
+} // namespace lyx
+
 #endif // LYX_MAIN_H