layout as string

[lyx.git] / src / LyXView.h

diff --git a/src/LyXView.h b/src/LyXView.h
index 40f44074adf6c4c887103e758d00634bb7dbffb4..cb2465781f7ac66ba11c53bb501e29c89c5e8a2a 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -11,8 +11,7 @@
 #include <sigc++/signal_system.h>
 
 #include "LString.h"
-#include "frontends/Timeout.h"
-#include "layout.h" // Just for LyXTextClass::size_type (sic)
+#include "support/types.h"
 
 class Buffer;
 class Toolbar;
@@ -23,6 +22,7 @@ class Menubar;
 class BufferView;
 class Dialogs;
 class LyXFunc;
+class Timeout;
 
 ///
 class LyXView : public SigC::Object, boost::noncopyable {
@@ -53,8 +53,7 @@ public:
        Toolbar * getToolbar() const;
 
        /// sets the layout in the toolbar layout combox
-       void setLayout(LyXTextClass::size_type layout);
-
+       void setLayout(string const & layout);
        /// update the toolbar
        void updateToolbar();
 
@@ -112,7 +111,7 @@ protected:
        ///
        Intl * intl;
        ///
-       Timeout autosave_timeout;
+       Timeout * autosave_timeout;
        /// A callback
        void AutoSave();
        ///
@@ -123,7 +122,7 @@ private:
        ///
        Dialogs * dialogs_;
        ///
-       virtual void setWindowTitle(string const &) = 0;
+       virtual void setWindowTitle(string const &, string const &) = 0;
        /** The last textclass layout list in the layout choice selector
          This should probably be moved to the toolbar, but for now it's
        here. (Asger) */