X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCharacter.h;h=599807f0ae8a6b1a386a09593256e3cb453a88dc;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=3be1401f30c8fb376baa6e4e2e3b6e07c4db23da;hpb=9d23d76c8eb31562706bbe16c2f54f935bf290db;p=lyx.git

diff --git a/src/frontends/qt4/GuiCharacter.h b/src/frontends/qt4/GuiCharacter.h
index 3be1401f30..599807f0ae 100644
--- a/src/frontends/qt4/GuiCharacter.h
+++ b/src/frontends/qt4/GuiCharacter.h
@@ -16,11 +16,13 @@
 
 #include "GuiDialog.h"
 #include "ui_CharacterUi.h"
-#include "qt_helpers.h" // for LanguagePair
 #include "Font.h"
 
 #include <utility>
 
+#ifdef IGNORE
+#undef IGNORE
+#endif
 
 namespace lyx {
 namespace frontend {
@@ -35,6 +37,12 @@ enum FontState {
 	///
 	NOUN_TOGGLE,
 	///
+	STRIKEOUT_TOGGLE,
+	///
+	UULINE_TOGGLE,
+	///
+	UWAVE_TOGGLE,
+	///
 	INHERIT
 };
 
@@ -45,6 +53,7 @@ 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, QString>    LanguagePair;
 
 class GuiCharacter : public GuiDialog, public Ui::CharacterUi
 {
@@ -57,7 +66,7 @@ protected Q_SLOTS:
 	void change_adaptor();
 
 private:
-	/// Dialog inherited methods
+	/// \name Dialog inherited methods
 	//@{
 	void applyView();
 	void updateContents();
@@ -65,7 +74,9 @@ private:
 	void clearParams() {}
 	void dispatchParams();
 	bool isBufferDependent() const { return true; }
-	FuncCode getLfun() const { return LFUN_FONT_FREE_UPDATE; }
+	FuncCode getLfun() const { return LFUN_TEXTSTYLE_UPDATE; }
+	void saveSession() const;
+	void restoreSession();
 	//@}
 
 	///