some remnaming

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

diff --git a/src/frontends/qt4/GuiVSpace.h b/src/frontends/qt4/GuiVSpace.h
index 755758a1dfb4815a4f380f156bf277eadb9ff482..fff6041a72239040d9d0c0a2e821948a73e6d5d6 100644 (file)
--- a/src/frontends/qt4/GuiVSpace.h
+++ b/src/frontends/qt4/GuiVSpace.h
@@ -11,62 +11,38 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef QVSPACE_H
-#define QVSPACE_H
-
-#include "GuiDialogView.h"
+#ifndef GUIVSPACE_H
+#define GUIVSPACE_H
 
+#include "GuiDialog.h"
+#include "ControlVSpace.h"
 #include "ui_VSpaceUi.h"
 
-#include <QDialog>
-
-class QCloseEvent;
-
 namespace lyx {
 namespace frontend {
 
-class ControlVSpace;
-
-class GuiVSpace;
-
-
-class GuiVSpaceDialog : public QDialog, public Ui::VSpaceUi {
+class GuiVSpaceDialog : public GuiDialog, public Ui::VSpaceUi
+{
        Q_OBJECT
 
 public:
-       GuiVSpaceDialog(GuiVSpace * form);
+       GuiVSpaceDialog(LyXView & lv);
 
-public Q_SLOTS:
+private Q_SLOTS:
        void change_adaptor();
-
-protected Q_SLOTS:
        void closeEvent(QCloseEvent *);
        void enableCustom(int);
 
 private:
-       GuiVSpace * form_;
-};
-
-
-
-class GuiVSpace
-       : public QController<ControlVSpace, GuiView<GuiVSpaceDialog> >
-{
-public:
-       ///
-       friend class GuiVSpaceDialog;
-       ///
-       GuiVSpace(Dialog &);
-private:
-       /// Build the dialog
-       virtual void build_dialog();
+       /// parent controller
+       ControlVSpace & controller();
        /// Apply from dialog
-       virtual void apply();
+       void applyView();
        /// Update the dialog
-       virtual void update_contents();
+       void updateContents();
 };
 
 } // namespace frontend
 } // namespace lyx
 
-#endif //QVSPACE_H
+#endif // GUIVSPACE_H