Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / frontends / qt4 / GuiCharacter.h

diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h
index bf5d92fb90a1412d761b135838245740dd67a509..432478b51173a1d2818d756042dc695f9a10018f 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.h
+++ b/src/frontends/qt4/GuiCharacter.h
@@ -19,11 +19,8 @@
 #include "qt_helpers.h" // for LanguagePair
 #include "Font.h"
 
-#include <vector>
-
 
 namespace lyx {
-
 namespace frontend {
 
 enum FontState {
@@ -39,12 +36,13 @@ enum FontState {
        INHERIT
 };
 
+typedef std::pair<QString, FontFamily> FamilyPair;
 typedef std::pair<QString, FontFamily> FamilyPair;
 typedef std::pair<QString, FontSeries> SeriesPair;
 typedef std::pair<QString, FontShape>  ShapePair;
 typedef std::pair<QString, FontSize>   SizePair;
-typedef std::pair<QString, FontState> BarPair;
-typedef std::pair<QString, ColorCode> ColorPair;
+typedef std::pair<QString, FontState>  BarPair;
+typedef std::pair<QString, ColorCode>  ColorPair;
 
 class GuiCharacter : public GuiDialog, public Ui::CharacterUi
 {
@@ -62,13 +60,13 @@ private:
        /// update
        void updateContents();
 
-       std::vector<FamilyPair> family;
-       std::vector<SeriesPair> series;
-       std::vector<ShapePair>  shape;
-       std::vector<SizePair>   size;
-       std::vector<BarPair>    bar;
-       std::vector<ColorPair>  color;
-       std::vector<LanguagePair> language;
+       QList<FamilyPair> family;
+       QList<SeriesPair> series;
+       QList<ShapePair>  shape;
+       QList<SizePair>   size;
+       QList<BarPair>    bar;
+       QList<ColorPair>  color;
+       QList<LanguagePair> language;
 
        ///
        bool initialiseParams(std::string const & data);
@@ -79,7 +77,7 @@ private:
        ///
        bool isBufferDependent() const { return true; }
        ///
-       kb_action getLfun() const { return LFUN_FONT_FREE_UPDATE; }
+       FuncCode getLfun() const { return LFUN_FONT_FREE_UPDATE; }
 
        ///
        void setFamily(FontFamily);
@@ -94,7 +92,7 @@ private:
        ///
        void setColor(ColorCode);
        ///
-       void setLanguage(std::string const &);
+       void setLanguage(QString const &);
 
        ///
        FontFamily getFamily() const;
@@ -109,7 +107,7 @@ private:
        ///
        ColorCode getColor() const;
        ///
-       std::string getLanguage() const;
+       QString getLanguage() const;
 
 private:
        ///