Revert "Fix commented out code"

[lyx.git] / src / Format.h

diff --git a/src/Format.h b/src/Format.h
index 75a60fe3d59b13c0b9c4a0599e5ffe230c430b3c..d1d6d74183cf8c78b8fb26c4fdaadc298308d3b0 100644 (file)
--- a/src/Format.h
+++ b/src/Format.h
@@ -12,12 +12,11 @@
 #ifndef FORMAT_H
 #define FORMAT_H
 
-#include "OutputParams.h"
-
 #include "support/strfwd.h"
 #include "support/trivstring.h"
 
 #include <vector>
+#include <string>
 
 namespace lyx {
 
@@ -25,6 +24,8 @@ namespace support { class FileName; }
 
 class Buffer;
 
+enum class Flavor : int;
+
 class Format {
 public:
        /// Flags for some format properties
@@ -219,9 +220,9 @@ private:
 };
 
 ///
-std::string flavor2format(OutputParams::FLAVOR flavor);
+std::string flavor2format(Flavor flavor);
 // Not currently used.
-// OutputParams::FLAVOR format2flavor(std::string fmt);
+// Flavor format2flavor(std::string fmt);
 
 /// The global instance.
 /// Implementation is in LyX.cpp.