inset-split: consider that freeSpacing() doesn't DEPM

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 6a5ded826013d56f8d8e089c9d7f26403c9c4280..578070eb6ce28c4780d4776e51f19b6d8d3b2256 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -16,14 +16,13 @@
 #define BUFFERPARAMS_H
 
 #include "Citation.h"
+#include "ColorCode.h"
 #include "DocumentClassPtr.h"
 #include "LayoutModuleList.h"
-#include "OutputParams.h"
 #include "paper.h"
 
-#include "insets/InsetQuotes.h"
-
 #include "support/copied_ptr.h"
+#include "support/types.h"
 
 #include <map>
 #include <vector>
@@ -36,20 +35,26 @@ class Author;
 class AuthorList;
 class BranchList;
 class Bullet;
+class Buffer;
 class DocumentClass;
 class Encoding;
 class Font;
 class Format;
 class IndicesList;
 class Language;
+class LaTeXFeatures;
 class LayoutFile;
 class LayoutFileIndex;
 class Length;
 class Lexer;
+class otexstream;
 class PDFOptions;
 class Spacing;
 class VSpace;
 
+enum class Flavor : int;
+enum class QuoteStyle : int;
+
 /** Buffer parameters.
  *  This class contains all the parameters for this buffer's use. Some
  *  work needs to be done on this class to make it nice. Now everything
@@ -124,7 +129,7 @@ public:
         */
        ParagraphSeparation paragraph_separation;
        ///
-       InsetQuotesParams::QuoteStyle quotes_style;
+       QuoteStyle quotes_style;
        ///
        bool dynamic_quotes;
        ///
@@ -193,8 +198,7 @@ public:
        /// return the default output format of the current backend
        std::string getDefaultOutputFormat() const;
        /// return the output flavor of \p format or the default
-       OutputParams::FLAVOR getOutputFlavor(
-                 std::string const & format = std::string()) const;
+       Flavor getOutputFlavor(std::string const & format = std::string()) const;
        ///
        bool isExportable(std::string const & format, bool need_viewable) const;
        ///
@@ -224,7 +228,7 @@ public:
        Font const getFont() const;
 
        /// translate quote style string to enum value
-       InsetQuotesParams::QuoteStyle getQuoteStyle(std::string const & qs) const;
+       QuoteStyle getQuoteStyle(std::string const & qs) const;
 
        /* these are for the PaperLayout */
        /// the papersize
@@ -613,7 +617,7 @@ private:
        ///
        void readIncludeonly(Lexer &);
        /// A cache for the default flavors
-       typedef std::map<std::string, OutputParams::FLAVOR> DefaultFlavorCache;
+       typedef std::map<std::string, Flavor> DefaultFlavorCache;
        ///
        mutable DefaultFlavorCache default_flavors_;
        /// the cite engine