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 fbdd55707623e2bf6532a37cb538459d261b625d..d9d76dfd4d1e9faf0cfb540d003e82e5d6ad2d05 100644 (file)
--- a/src/frontends/xforms/FormPreferences.h
+++ b/src/frontends/xforms/FormPreferences.h
@@ -13,21 +13,19 @@
 #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 <utility> // pair
+
+#include <boost/scoped_ptr.hpp>
 
 class ControlPrefs;
 
 class Dialogs;
 class LyXRC;
 class LyXView;
+class NamedColor;
 class RGBColor;
 class FormColorpicker;
 
@@ -70,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_;
@@ -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);
                ///
@@ -148,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);
                ///
@@ -168,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_;
@@ -192,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);
                ///
@@ -230,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);
 
@@ -255,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);
                ///
@@ -282,7 +280,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);
                ///
@@ -294,7 +292,7 @@ private:
                ///
                boost::scoped_ptr<FD_preferences_language> dialog_;
                ///
-               std::vector<string> lang_;
+               std::vector<std::string> lang_;
        };
        ///
        friend class Language;
@@ -311,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);
 
@@ -335,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);
 
@@ -359,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);
 
@@ -384,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);
                ///
@@ -411,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);
 
@@ -436,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();
                ///
@@ -463,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);
                ///