More requires --> required, for C++2a.

[lyx.git] / src / FontEnums.h

diff --git a/src/FontEnums.h b/src/FontEnums.h
index 0f4000e7e3b17c45afb5fb8f7ab161512aa91c0e..7c55c8cbc28bda012b540431092084b0b11c037f 100644 (file)
--- a/src/FontEnums.h
+++ b/src/FontEnums.h
@@ -97,35 +97,35 @@ enum FontShape {
 ///
 enum FontSize {
        ///
-       FONT_SIZE_TINY = 0,
+       TINY_SIZE = 0,
        ///
-       FONT_SIZE_SCRIPT,
+       SCRIPT_SIZE,
        ///
-       FONT_SIZE_FOOTNOTE,
+       FOOTNOTE_SIZE,
        ///
-       FONT_SIZE_SMALL,
+       SMALL_SIZE,
        ///
-       FONT_SIZE_NORMAL,
+       NORMAL_SIZE,
        ///
-       FONT_SIZE_LARGE,
+       LARGE_SIZE,
        ///
-       FONT_SIZE_LARGER,
+       LARGER_SIZE,
        ///
-       FONT_SIZE_LARGEST,
+       LARGEST_SIZE,
        ///
-       FONT_SIZE_HUGE,
+       HUGE_SIZE,
        ///
-       FONT_SIZE_HUGER,
+       HUGER_SIZE,
        ///
-       FONT_SIZE_INCREASE,
+       INCREASE_SIZE,
        ///
-       FONT_SIZE_DECREASE,
+       DECREASE_SIZE,
        ///
-       FONT_SIZE_INHERIT,
+       INHERIT_SIZE,
        ///
-       FONT_SIZE_IGNORE,
+       IGNORE_SIZE,
        ///
-       NUM_SIZE = FONT_SIZE_INCREASE
+       NUM_SIZE = INCREASE_SIZE
 };
 
 /// Used for emph, underbar, noun and latex toggles
@@ -146,19 +146,19 @@ enum FontState {
 /// Math styles
 enum MathStyle {
        ///
-       FONT_STYLE_SCRIPTSCRIPT = 0,
+       SCRIPTSCRIPT_STYLE = 0,
        ///
-       FONT_STYLE_SCRIPT,
+       SCRIPT_STYLE,
        ///
-       FONT_STYLE_TEXT,
+       TEXT_STYLE,
        ///
-       FONT_STYLE_DISPLAY,
+       DISPLAY_STYLE,
        ///
-       FONT_STYLE_INHERIT,
+       INHERIT_STYLE,
        ///
-       FONT_STYLE_IGNORE,
+       IGNORE_STYLE,
        /// the text and display fonts are the same
-       NUM_STYLE = FONT_STYLE_DISPLAY
+       NUM_STYLE = DISPLAY_STYLE
 };