fix crash due to invalidated iterator

[lyx.git] / src / frontends / controllers / character.h

diff --git a/src/frontends/controllers/character.h b/src/frontends/controllers/character.h
index a13b5576cb5175611d93db93005ae0bf23a4b6f3..9e4f2cc79e3f08a4aa2267515d5ce1e230c380ba 100644 (file)
--- a/src/frontends/controllers/character.h
+++ b/src/frontends/controllers/character.h
@@ -1,71 +1,72 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2001 The LyX Team.
+/**
+ * \file character.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ======================================================
+ * \author Angus Leeming
  *
- * \file character.h
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef CHARACTERHELPERS_H
 #define CHARACTERHELPERS_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 #include "lyxfont.h"
-#include "LColor.h"
+
+#include <utility>
+#include <vector>
+
+
+class LColor_color;
+
 
 /** Functions of use to the character GUI controller and view */
-namespace character {
-       ///
-       enum FONT_STATE {
-               ///
-               IGNORE,
-               ///
-               EMPH_TOGGLE,
-               ///
-               UNDERBAR_TOGGLE,
-               ///
-               NOUN_TOGGLE,
-               ///
-               INHERIT
-       };
+namespace lyx {
+namespace frontend {
 
+///
+enum FONT_STATE {
        ///
-       typedef std::pair<string, LyXFont::FONT_FAMILY> FamilyPair;
+       IGNORE,
        ///
-       typedef std::pair<string, LyXFont::FONT_SERIES> SeriesPair;
+       EMPH_TOGGLE,
        ///
-       typedef std::pair<string, LyXFont::FONT_SHAPE>  ShapePair;
+       UNDERBAR_TOGGLE,
        ///
-       typedef std::pair<string, LyXFont::FONT_SIZE>   SizePair;
+       NOUN_TOGGLE,
        ///
-       typedef std::pair<string, FONT_STATE> BarPair;
-       ///
-       typedef std::pair<string, LColor::color> ColorPair;
+       INHERIT
+};
 
-       ///
-       std::vector<FamilyPair> const getFamilyData();
-       ///
-       std::vector<SeriesPair> const getSeriesData();
-       ///
-       std::vector<ShapePair>  const getShapeData();
-       ///
-       std::vector<SizePair>   const getSizeData();
-       ///
-       std::vector<BarPair>    const getBarData();
-       ///
-       std::vector<ColorPair>  const getColorData();
-       ///
-       std::vector<string> const getLanguageData();
+///
+typedef std::pair<std::string, LyXFont::FONT_FAMILY> FamilyPair;
+///
+typedef std::pair<std::string, LyXFont::FONT_SERIES> SeriesPair;
+///
+typedef std::pair<std::string, LyXFont::FONT_SHAPE>  ShapePair;
+///
+typedef std::pair<std::string, LyXFont::FONT_SIZE>   SizePair;
+///
+typedef std::pair<std::string, FONT_STATE> BarPair;
+///
+typedef std::pair<std::string, LColor_color> ColorPair;
+
+///
+std::vector<FamilyPair>   const getFamilyData();
+///
+std::vector<SeriesPair>   const getSeriesData();
+///
+std::vector<ShapePair>    const getShapeData();
+///
+std::vector<SizePair>     const getSizeData();
+///
+std::vector<BarPair>      const getBarData();
+///
+std::vector<ColorPair>    const getColorData();
 
-} // namespace character
+} // namespace frontend
+} // namespace lyx
 
 #endif // CHARACTERHELPERS