small patch from Dekel, begin introducing the real boost framework, get rid of the...

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

diff --git a/src/frontends/xforms/FormTabular.h b/src/frontends/xforms/FormTabular.h
index b8fb925dca76fc88b749e47961df22aacfbc8e91..aa95b0fae1afba36c1d37c4d04fcd0590a78daaf 100644 (file)
--- a/src/frontends/xforms/FormTabular.h
+++ b/src/frontends/xforms/FormTabular.h
@@ -18,6 +18,8 @@
 #define FORMTABULAR_H
 
 #include "DialogBase.h"
+#include <boost/utility.hpp>
+
 #ifdef SIGC_CXX_NAMESPACES
 using SigC::Connection;
 #endif
@@ -35,48 +37,45 @@ struct FD_form_create_tabular;
 /** This class provides an XForms implementation of the FormTabular Dialog.
     The tabular dialog allows users to set/save their tabular.
  */
-class FormTabular : public DialogBase {
+class FormTabular : public DialogBase, public noncopyable {
 public:
-    /**@name Constructors and Destructors */
-    //@{
     /// #FormTabular x(LyXFunc ..., Dialogs ...);#
     FormTabular(LyXView *, Dialogs *);
     ///
     ~FormTabular();
-    //@}
-
-    /**@name Real per-instance Callback Methods */
-    //@{
+    ///
     static  int WMHideCB(FL_FORM *, void *);
+    ///
     static void CloseCB(FL_OBJECT *, long);
+    ///
     static void OKCB(FL_OBJECT *, long);
+    ///
     static void CancelCB(FL_OBJECT *, long);
+    ///
     static void ApplyCB(FL_OBJECT *, long);
+    ///
     static void InputCB(FL_OBJECT *, long);
-    //@}
 
 private:
-    FormTabular() {}
-    FormTabular(FormTabular &) : DialogBase() {}
-    
-    /**@name Slot Methods */
-    //@{
     /// Create the dialog if necessary, update it and display it.
     void show();
+    ///
     void show_create();
+    ///
     void showInset(InsetTabular *);
     /// Hide the dialog.
     void hide();
+    ///
     void hide_create();
+    ///
     void hideInset(InsetTabular *);
     /// Update the dialog.
     void update();
+    ///
     void updateInset(InsetTabular *);
+    ///
     bool local_update(bool);
-    //@}
     
-    /**@name Dialog internal methods */
-    //@{
     /// Apply from dialog
     void apply_create();
     /// Build the dialog
@@ -95,13 +94,7 @@ private:
     FD_form_longtable_options * build_longtable_options();
     ///
     FD_form_create_tabular * build_create_tabular();
-    ///
-    /// Explicitly free the dialog.
-    void free();
-    //@}
 
-    /**@name Private Data */
-    //@{
     /// Real GUI implementation.
     FD_form_tabular * dialog_;
     ///
@@ -114,16 +107,18 @@ private:
     FD_form_longtable_options * longtable_options_;
     ///
     FD_form_create_tabular * create_tabular_;
-    ///
+
     /// Which LyXView do we belong to?
     LyXView * lv_;
+    ///
     Dialogs * d_;
     /// Update connection.
     Connection u_;
     /// Hide connection.
     Connection h_;
-    //@}
+    ///
     InsetTabular * inset_;
+    ///
     int actCell_;
 };