cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 429d0ac1cc49bf6fe6939850f8295325728abed6..2c52c7b04cb4d6e991a57243aa8bf4fd104fed38 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -20,6 +20,7 @@
 
 #include "support/limited_stack.h"
 #include "support/types.h"
+#include "support/docstring.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/signal.hpp>
@@ -107,7 +108,7 @@ public:
        ///
        void insertStringAsLines(ParagraphList & plist,
                lyx::pit_type &, lyx::pos_type &,
-               LyXFont const &, std::string const &, bool);
+               LyXFont const &, lyx::docstring const &, bool);
        ///
        ParIterator getParFromID(int id) const;
        /// do we have a paragraph with this id?
@@ -116,7 +117,7 @@ public:
        /// This signal is emitted when some parsing error shows up.
        boost::signal<void(std::string)> errors;
        /// This signal is emitted when some message shows up.
-       boost::signal<void(std::string)> message;
+       boost::signal<void(lyx::docstring)> message;
        /// This signal is emitted when the buffer busy status change.
        boost::signal<void(bool)> busy;
        /// This signal is emitted when the buffer readonly status change.
@@ -155,14 +156,6 @@ public:
                           bool output_preamble = true,
                           bool output_body = true);
        ///
-       void makeLinuxDocFile(std::string const & filename,
-                             OutputParams const & runparams_in,
-                             bool only_body = false);
-       ///
-       void writeLinuxDocSource(std::ostream & os, std::string const & filename,
-                             OutputParams const & runparams_in,
-                             bool only_body = false);
-       ///
        void makeDocBookFile(std::string const & filename,
                             OutputParams const & runparams_in,
                             bool only_body = false);
@@ -173,7 +166,7 @@ public:
        /// returns the main language for the buffer (document)
        Language const * getLanguage() const;
        /// get l10n translated to the buffers language
-       std::string const B_(std::string const & l10n) const;
+       lyx::docstring const B_(std::string const & l10n) const;
 
        ///
        int runChktex();
@@ -240,13 +233,8 @@ public:
 
        /// returns \c true if the buffer contains a LaTeX document
        bool isLatex() const;
-       /// returns \c true if the buffer contains a LinuxDoc document
-       bool isLinuxDoc() const;
        /// returns \c true if the buffer contains a DocBook document
        bool isDocBook() const;
-       /** returns \c true if the buffer contains either a LinuxDoc
-           or DocBook document */
-       bool isSGML() const;
        /// returns \c true if the buffer contains a Wed document
        bool isLiterate() const;
 
@@ -353,7 +341,7 @@ public:
        StableDocIterator getAnchor() const { return anchor_; }
        ///
        void changeRefsIfUnique(std::string const & from, std::string const & to);
-       /// get source code (latex/docbook/linuxdoc) for some paragraphs, or all paragraphs
+       /// get source code (latex/docbook) for some paragraphs, or all paragraphs
        /// including preamble
        void getSourceCode(std::ostream & os, lyx::pit_type par_begin, lyx::pit_type par_end, bool full_source);
 
@@ -387,9 +375,6 @@ private:
 
        /// Container for all sort of Buffer dependant errors.
        std::map<std::string, ErrorList> errorLists_;
-
-       /// Empty Error List
-       ErrorList const emptyErrorList_;
 };
 
 #endif