Tiny clean-ups.

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

diff --git a/src/frontends/xforms/FormGraphics.h b/src/frontends/xforms/FormGraphics.h
index 5adb6c3a20026568de37b03511f4f67522bd0ab6..11ebe2646790b79620c1f43fc92e9e01a3ca1373 100644 (file)
--- a/src/frontends/xforms/FormGraphics.h
+++ b/src/frontends/xforms/FormGraphics.h
@@ -1,23 +1,20 @@
 // -*- C++ -*-
 /**
  * \file FormGraphics.h
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author Baruch Even
- * \author Herbert Voss
+ * \author Herbert Voß
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef FORMGRAPHICS_H
 #define FORMGRAPHICS_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
-#include "FormBase.h"
-#include "RadioButtonGroup.h"
+#include "FormDialogView.h"
 
 #include <boost/scoped_ptr.hpp>
 
@@ -31,10 +28,11 @@ struct FD_graphics_extra;
 
 /** This class provides an XForms implementation of the Graphics Dialog.
  */
-class FormGraphics : public FormCB<ControlGraphics, FormDB<FD_graphics> > {
+class FormGraphics
+       : public FormController<ControlGraphics, FormView<FD_graphics> > {
 public:
        ///
-       FormGraphics();
+       FormGraphics(Dialog &);
 private:
 
        /** Redraw the form (on receipt of a Signal indicating, for example,
@@ -47,7 +45,7 @@ private:
        /// Update dialog before/whilst showing it.
        virtual void update();
        /// Update the BoundingBox info.
-       void updateBB(string const & filename, string const & bb_inset);
+       void updateBB(std::string const & filename, std::string const & bb_inset);
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
 
@@ -59,7 +57,7 @@ private:
        boost::scoped_ptr<FD_graphics_extra> extra_;
 
        /// Store the LaTeX names for the rotation origins.
-       std::vector<string> origins_;
+       std::vector<std::string> origins_;
 };
 
 #endif  // FORMGRAPHICS_H