From 5c8f9bc5257b05902323b107eb1a6cfb84c1c25c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Wed, 5 Sep 2007 20:52:35 +0000 Subject: [PATCH] compile fix. inclomplete transactioN??? git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20078 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiERT.h | 43 +++++++++++--------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/src/frontends/qt4/GuiERT.h b/src/frontends/qt4/GuiERT.h index d49f9d5ef2..1d1e53df65 100644 --- a/src/frontends/qt4/GuiERT.h +++ b/src/frontends/qt4/GuiERT.h @@ -12,50 +12,31 @@ #ifndef GUIERT_H #define GUIERT_H -#include "GuiDialogView.h" +#include "GuiDialog.h" #include "ControlERT.h" #include "ui_ERTUi.h" -#include - namespace lyx { namespace frontend { -class GuiERT; - -class GuiERTDialog : public QDialog, public Ui::ERTUi +class GuiERTDialog : public GuiDialog, public Ui::ERTUi { Q_OBJECT -public: - GuiERTDialog(GuiERT * form); -protected Q_SLOTS: - virtual void change_adaptor(); -protected: - virtual void closeEvent(QCloseEvent * e); -private: - GuiERT * form_; -}; - -class GuiERT : public GuiView -{ public: - /// constructor - GuiERT(GuiDialog &); - /// parent controller - ControlERT & controller() - { return static_cast(this->getController()); } - /// parent controller - ControlERT const & controller() const - { return static_cast(this->getController()); } + GuiERTDialog(LyXView & lv); + +private Q_SLOTS: + void change_adaptor(); + private: - friend class GuiERTDialog; + void closeEvent(QCloseEvent * e); + /// parent controller + ControlERT & controller() const; /// Apply changes - virtual void applyView(); + void applyView(); /// update - virtual void update_contents(); - /// build the dialog - virtual void build_dialog(); + void update_contents(); }; } // namespace frontend