Tiny clean-ups.

[lyx.git] / src / frontends / xforms / FormTabular.h

diff --git a/src/frontends/xforms/FormTabular.h b/src/frontends/xforms/FormTabular.h
index 68babe3c726b46d5f967b34b4d34405696745da7..e6e8529b863086a8efc8d68c53bca2f71fcb9cf2 100644 (file)
--- a/src/frontends/xforms/FormTabular.h
+++ b/src/frontends/xforms/FormTabular.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
 /**
  * \file FormTabular.h
- * Copyright 1995 Matthias Ettrich
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
  * \author Jürgen Vigna
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef FORMTABULAR_H
 #define FORMTABULAR_H
 
+#include "FormDialogView.h"
 #include <boost/scoped_ptr.hpp>
 
-
-#include "FormBase.h"
-
 class InsetTabular;
 class ControlTabular;
 struct FD_tabular;
@@ -29,10 +26,11 @@ struct FD_tabular_longtable;
 /** This class provides an XForms implementation of the FormTabular Dialog.
     The tabular dialog allows users to set/save their tabular.
  */
-class FormTabular : public FormCB<ControlTabular, FormDB<FD_tabular> > {
+class FormTabular
+       : public FormController<ControlTabular, FormView<FD_tabular> > {
 public:
 
-       FormTabular();
+       FormTabular(Dialog &);
 
 private:
        /** Redraw the form (on receipt of a Signal indicating, for example,
@@ -49,7 +47,7 @@ private:
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
        ///
-       virtual int checkLongtableOptions(FL_OBJECT *, string &);
+       virtual int checkLongtableOptions(FL_OBJECT *, std::string &);
 
        ///
        boost::scoped_ptr<FD_tabular_options> tabular_options_;