Tiny clean-ups.

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

diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h
index c94d3d90a518003f3b016fe6a112b3a3f5c99a45..d9d76dfd4d1e9faf0cfb540d003e82e5d6ad2d05 100644 (file)
--- a/src/frontends/xforms/FormPreferences.h
+++ b/src/frontends/xforms/FormPreferences.h
@@ -1,35 +1,34 @@
 // -*- C++ -*-
 /**
  * \file FormPreferences.h
- * Copyright 1999-2001 Allan Rae
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
  * \author Allan Rae
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef FORMPREFERENCES_H
 #define FORMPREFERENCES_H
 
-
 #include "FormBase.h"
-#include "Color.h" // NamedColor
 #include "xforms_helpers.h" // XformColor
 
-#include <boost/scoped_ptr.hpp>
+#include "lyx_forms.h"
 
-#include FORMS_H_LOCATION
-#include <utility> // pair
+#include <boost/scoped_ptr.hpp>
 
 class ControlPrefs;
 
-class Combox;
 class Dialogs;
+class LyXRC;
 class LyXView;
+class NamedColor;
 class RGBColor;
+class FormColorpicker;
+
 struct FD_preferences;
 struct FD_preferences_colors;
 struct FD_preferences_converters;
@@ -48,7 +47,7 @@ struct FD_preferences_spelloptions;
 
 
 /** This class provides an XForms implementation of the FormPreferences Dialog.
-    The preferences dialog allows users to set/save their preferences.
+ *  The preferences dialog allows users to set/save their preferences.
  */
 class FormPreferences : public FormCB<ControlPrefs, FormDB<FD_preferences> > {
 public:
@@ -69,7 +68,7 @@ private:
        /// Build the dialog
        virtual void build();
        /// control which feedback message is output
-       string const getFeedback(FL_OBJECT *);
+       std::string const getFeedback(FL_OBJECT *);
 
        /// Converters tabfolder
        boost::scoped_ptr<FD_preferences_inner_tab> converters_tab_;
@@ -89,8 +88,7 @@ private:
        public:
                ///
                enum GuiColors {
-                       GUI_COLOR_CHOICE   = FL_FREE_COL14,
-                       GUI_COLOR_HUE_DIAL = FL_FREE_COL15,
+                       GUI_COLOR_CHOICE   = FL_FREE_COL15,
                        GUI_COLOR_CURSOR   = FL_FREE_COL16
                };
                ///
@@ -102,7 +100,7 @@ private:
                ///
                void build();
                ///
-               string const feedback(FL_OBJECT const * const) const;
+               std::string const feedback(FL_OBJECT const * const) const;
                ///
                void input(FL_OBJECT const * const);
                ///
@@ -117,20 +115,16 @@ private:
                ///
                void InputBrowserLyX() const;
                ///
-               void InputHSV();
-               ///
-               void InputRGB();
-               ///
                void LoadBrowserLyX();
                ///
                void Modify();
-               ///
-               void SwitchColorSpace() const;
 
                ///
                FormPreferences & parent_;
                ///
                boost::scoped_ptr<FD_preferences_colors> dialog_;
+               ///
+               boost::scoped_ptr<FormColorpicker> picker_;
 
                /// A vector of LyX LColor GUI name and associated RGB color.
                std::vector<NamedColor> lyxColorDB;
@@ -152,7 +146,7 @@ private:
                ///
                void build();
                ///
-               string const feedback(FL_OBJECT const * const) const;
+               std::string const feedback(FL_OBJECT const * const) const;
                ///
                bool input(FL_OBJECT const * const);
                ///
@@ -172,9 +166,9 @@ private:
                ///
                bool Input();
                ///
-               string const GetFrom() const;
+               std::string const GetFrom() const;
                ///
-               string const GetTo() const;
+               std::string const GetTo() const;
 
                ///
                FormPreferences & parent_;
@@ -196,7 +190,7 @@ private:
                ///
                void build();
                ///
-               string const feedback(FL_OBJECT const * const) const;
+               std::string const feedback(FL_OBJECT const * const) const;
                ///
                bool input(FL_OBJECT const * const);
                ///
@@ -234,7 +228,7 @@ private:
                ///
                void build();
                ///
-               string const feedback(FL_OBJECT const * const) const;
+               std::string const feedback(FL_OBJECT const * const) const;
                ///
                void update(LyXRC const & rc);
 
@@ -259,7 +253,7 @@ private:
                ///
                void build();
                ///
-               string const feedback(FL_OBJECT const * const) const;
+               std::string const feedback(FL_OBJECT const * const) const;
                ///
                bool input(FL_OBJECT const * const);
                ///
@@ -286,13 +280,11 @@ private:
                ///
                void build();
                ///
-               string const feedback(FL_OBJECT const * const) const;
+               std::string const feedback(FL_OBJECT const * const) const;
                ///
                bool input(FL_OBJECT const * const);
                ///
                void update(LyXRC const & rc);
-               ///
-               static void ComboCB(int, void *, Combox *);
 
        private:
                ///
@@ -300,9 +292,7 @@ private:
                ///
                boost::scoped_ptr<FD_preferences_language> dialog_;
                ///
-               boost::scoped_ptr<Combox> combo_default_lang;
-               ///
-               std::vector<string> lang_;
+               std::vector<std::string> lang_;
        };
        ///
        friend class Language;
@@ -319,7 +309,7 @@ private:
                ///
                void build();
                ///
-               string const feedback(FL_OBJECT const * const) const;
+               std::string const feedback(FL_OBJECT const * const) const;
                ///
                void update(LyXRC const & rc);
 
@@ -343,7 +333,7 @@ private:
                ///
                void build();
                ///
-               string const feedback(FL_OBJECT const * const) const;
+               std::string const feedback(FL_OBJECT const * const) const;
                ///
                void update(LyXRC const & rc);
 
@@ -354,7 +344,7 @@ private:
                boost::scoped_ptr<FD_preferences_identity> dialog_;
        };
        friend class Identity;
- 
+
        ///
        class OutputsMisc {
        public:
@@ -367,7 +357,7 @@ private:
                ///
                void build();
                ///
-               string const feedback(FL_OBJECT const * const) const;
+               std::string const feedback(FL_OBJECT const * const) const;
                ///
                void update(LyXRC const & rc);
 
@@ -392,7 +382,7 @@ private:
                ///
                void build();
                ///
-               string const feedback(FL_OBJECT const * const) const;
+               std::string const feedback(FL_OBJECT const * const) const;
                ///
                bool input(FL_OBJECT const * const);
                ///
@@ -419,7 +409,7 @@ private:
                ///
                void build();
                ///
-               string const feedback(FL_OBJECT const * const) const;
+               std::string const feedback(FL_OBJECT const * const) const;
                ///
                void update(LyXRC const & rc);
 
@@ -444,7 +434,7 @@ private:
                ///
                void build();
                ///
-               string const feedback(FL_OBJECT const * const) const;
+               std::string const feedback(FL_OBJECT const * const) const;
                ///
                bool input();
                ///
@@ -471,7 +461,7 @@ private:
                ///
                void build();
                ///
-               string const feedback(FL_OBJECT const * const) const;
+               std::string const feedback(FL_OBJECT const * const) const;
                ///
                bool input(FL_OBJECT const * const);
                ///