some remnaming

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

diff --git a/src/frontends/qt4/GuiFloat.h b/src/frontends/qt4/GuiFloat.h
index 7ef8c0fdfd073a0b324ce29b89adf4e768f375ce..881245d0ed6e1b93822735bddb8f9776359816a2 100644 (file)
--- a/src/frontends/qt4/GuiFloat.h
+++ b/src/frontends/qt4/GuiFloat.h
@@ -12,53 +12,31 @@
 #ifndef GUIFLOAT_H
 #define GUIFLOAT_H
 
-#include "GuiDialogView.h"
-#include "ui_FloatUi.h"
+#include "GuiDialog.h"
 #include "ControlFloat.h"
-
-#include <QDialog>
+#include "ui_FloatUi.h"
 
 namespace lyx {
 namespace frontend {
 
-class GuiFloat;
-
-class GuiFloatDialog : public QDialog, public Ui::FloatUi {
+class GuiFloatDialog : public GuiDialog, public Ui::FloatUi
+{
        Q_OBJECT
-public:
-       GuiFloatDialog(GuiFloat * form);
 
-protected Q_SLOTS:
-       virtual void change_adaptor();
+public:
+       GuiFloatDialog(LyXView & lv);
 
-protected:
-       virtual void closeEvent(QCloseEvent * e);
+private Q_SLOTS:
+       void change_adaptor();
 
 private:
-       GuiFloat * form_;
-};
-
-
-///
-class GuiFloat : public GuiView<GuiFloatDialog> {
-public:
-       ///
-       friend class GuiFloatDialog;
-       ///
-       GuiFloat(GuiDialog &);
-       /// parent controller
-       ControlFloat & controller()
-       { return static_cast<ControlFloat &>(this->getController()); }
+       void closeEvent(QCloseEvent * e);
        /// parent controller
-       ControlFloat const & controller() const
-       { return static_cast<ControlFloat const &>(this->getController()); }
-private:
+       ControlFloat & controller();
        /// Apply changes
-       virtual void apply();
+       void applyView();
        /// update
-       virtual void update_contents();
-       /// build the dialog
-       virtual void build_dialog();
+       void updateContents();
 };
 
 } // namespace frontend