Replace LString.h with support/std_string.h,

[features.git] / src / frontends / qt2 / QCharacter.h

diff --git a/src/frontends/qt2/QCharacter.h b/src/frontends/qt2/QCharacter.h
index 7bee61c4a9dd46ec8d5b6907de499387a680c29a..e11999379322f71104148507a0219029a5066e59 100644 (file)
--- a/src/frontends/qt2/QCharacter.h
+++ b/src/frontends/qt2/QCharacter.h
@@ -1,61 +1,54 @@
 // -*- C++ -*-
 /**
  * \file QCharacter.h
- * Copyright 2001 The LyX Team.
- * See the file COPYING.
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author Edwin Leuven
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef QCHARACTER_H
 #define QCHARACTER_H
 
-#include "DialogBase.h"
-
-class LyXView;
-class Dialogs;
-class QCharacterDialog;
-
-class QCharacter : public DialogBase {
-public:
-       ///
-       QCharacter(LyXView *, Dialogs *);
-       ///
-       ~QCharacter();
-
-       /// Apply changes.
-       void apply();
-       /// Close connections.
-       void close();
 
-private:
+#include "QDialogView.h"
+#include "controllers/character.h"
+#include "controllers/frnt_lang.h"
 
-       /// Show the dialog.
-       void show();
-       /// Hide the dialog.
-       void hide();
-       /// Update the dialog.
-       void update(bool switched = false);
+#include "support/std_string.h"
 
-       /// Real GUI implementation.
-       QCharacterDialog * dialog_;
+#include <vector>
 
-       /// the LyXView we belong to.
-       LyXView * lv_;
 
-       /** Which Dialogs do we belong to?
-        *  Used so we can get at the signals we have to connect to.
-        */
-       Dialogs * d_;
+class ControlCharacter;
+class QCharacterDialog;
 
-       /// is the buffer readonly?
-       bool readonly;
 
-       /// Hide connection.
-       SigC::Connection h_;
+class QCharacter
+       : public QController<ControlCharacter, QView<QCharacterDialog> >
+{
+public:
+       friend class QCharacterDialog;
 
-       /// Update connection.
-       SigC::Connection u_;
+       QCharacter(Dialog &);
+private:
+       /// Apply changes
+       virtual void apply();
+       /// update
+       virtual void update_contents();
+       /// build the dialog
+       virtual void build_dialog();
+
+       std::vector<frnt::FamilyPair> family;
+       std::vector<frnt::SeriesPair> series;
+       std::vector<frnt::ShapePair>  shape;
+       std::vector<frnt::SizePair>   size;
+       std::vector<frnt::BarPair>    bar;
+       std::vector<frnt::ColorPair>  color;
+       std::vector<frnt::LanguagePair> language;
 };
 
 #endif // QCHARACTER_H