Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/FormTabular.h b/src/frontends/xforms/FormTabular.h
index 8908afddf68f6c6a38bc9da9f441033fb5342b07..1d7bbe249b7edd7d6d4d433bb3f5da77bf762e08 100644 (file)
--- a/src/frontends/xforms/FormTabular.h
+++ b/src/frontends/xforms/FormTabular.h
@@ -1,27 +1,25 @@
 // -*- 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>
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+class InsetTabular;
 
-#include "FormBase.h"
+namespace lyx {
+namespace frontend {
 
-class InsetTabular;
 class ControlTabular;
 struct FD_tabular;
 struct FD_tabular_options;
@@ -32,10 +30,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,
@@ -52,7 +51,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_;
@@ -70,4 +69,7 @@ private:
        int actCell_;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif // FORMTABULAR_H