X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormDocument.h;h=429d036e796c9bda8e74cbcdba8b2ef5f34322f3;hb=d5443737342903de489d527802cd2cdd38987d74;hp=3cd5084a785f94334db724fc7530e1c7e60b9197;hpb=1cad117882dc393b2d55174c6f2ab67920a54ce1;p=lyx.git

diff --git a/src/frontends/xforms/FormDocument.h b/src/frontends/xforms/FormDocument.h
index 3cd5084a78..429d036e79 100644
--- a/src/frontends/xforms/FormDocument.h
+++ b/src/frontends/xforms/FormDocument.h
@@ -12,7 +12,7 @@
 #ifndef FORM_DOCUMENT_H
 #define FORM_DOCUMENT_H
 
-#include "FormBase.h"
+#include "FormDialogView.h"
 #include "BranchList.h"
 
 #include <boost/scoped_ptr.hpp>
@@ -20,12 +20,13 @@
 #include "lyx_forms.h"
 #include <vector>
 
-class ControlDocument;
-
 class BufferParams;
 
-class FormColorpicker;
+namespace lyx {
+namespace frontend {
 
+class ControlDocument;
+class FormColorpicker;
 struct FD_document;
 struct FD_document_paper;
 struct FD_document_class;
@@ -34,22 +35,13 @@ struct FD_document_options;
 struct FD_document_bullet;
 struct FD_document_branch;
 
-namespace {
-
-enum GuiColors {
-	GUI_COLOR_CHOICE   = FL_FREE_COL15
-};
-
-
-}
-
-
 /** This class provides an XForms implementation of the FormDocument dialog.
  *  The table-layout-form here changes values for latex-tabulars
  */
-class FormDocument : public FormCB<ControlDocument, FormDB<FD_document> > {
+class FormDocument
+	: public FormController<ControlDocument, FormView<FD_document> > {
 public:
-	FormDocument();
+	FormDocument(Dialog &);
 private:
 	/** Redraw the form (on receipt of a Signal indicating, for example,
 	    that the xforms colours have been re-mapped). */
@@ -104,7 +96,7 @@ private:
 	///
 	bool language_apply(BufferParams &);
 	///
-	bool options_apply(BufferParams &);
+	void options_apply(BufferParams &);
 	///
 	void bullets_apply(BufferParams &);
 	///
@@ -143,4 +135,7 @@ private:
 	BranchList branchlist_;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif