Tiny clean-ups.

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

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 016498431a415ab2298d5756d38a7921034f8446..42965a99a5d9c00cc911b058313d422d3710fafa 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -5,67 +5,55 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#include "ControlPrefs.h"
 #include "FormPreferences.h"
+#include "ControlPrefs.h"
 #include "forms/form_preferences.h"
-#include "xformsBC.h"
-#include "ButtonController.h"
 
 #include "FormColorpicker.h"
-#include "Color.h"
-#include "input_validators.h"
 #include "forms_gettext.h"
-#include "xforms_helpers.h"
-#include "helper_funcs.h" // getSecond
+#include "input_validators.h"
+#include "xformsBC.h"
+
+#include "controllers/helper_funcs.h" // getSecond
+#include "controllers/frnt_lang.h"
 
 #include "buffer.h"
 #include "converter.h"
 #include "format.h"
-#include "debug.h"
-#include "language.h"
-#include "frnt_lang.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
 #include "LColor.h"
-#include "Lsstream.h"
-#include "funcrequest.h"
-#include "author.h"
+#include "lyxfont.h"
 
 #include "support/lstrings.h"
-#include "support/lyxfunctional.h"
-#include "support/lyxmanip.h"
 #include "support/tostr.h"
 #include "support/path_defines.h"
 #include "support/filetools.h"
-#include "support/LAssert.h"
-
-#include "graphics/GraphicsCache.h"
-#include "graphics/GraphicsTypes.h"
-
-#include <boost/bind.hpp>
 
 #include "lyx_forms.h"
 #include "combox.h"
 
-#include <utility>
 #include <iomanip>
-#include <X11/Xlib.h>
+
+using lyx::support::AddName;
+using lyx::support::ChangeExtension;
+using lyx::support::rtrim;
+using lyx::support::strToDbl;
+using lyx::support::trim;
+using lyx::support::user_lyxdir;
 
 using std::endl;
-using std::pair;
 using std::make_pair;
 using std::max;
 using std::min;
+
+using std::pair;
 using std::vector;
-using std::setw;
-using std::setfill;
+using std::string;
 
-using namespace lyx::support;
 
 namespace {
 
@@ -326,7 +314,7 @@ void FormPreferences::apply()
 
 string const FormPreferences::getFeedback(FL_OBJECT * ob)
 {
-       Assert(ob);
+       BOOST_ASSERT(ob);
 
        if (ob->form->fdui == colors_.dialog())
                return colors_.feedback(ob);
@@ -359,7 +347,7 @@ string const FormPreferences::getFeedback(FL_OBJECT * ob)
 
 ButtonPolicy::SMInput FormPreferences::input(FL_OBJECT * ob, long)
 {
-       Assert(ob);
+       BOOST_ASSERT(ob);
 
        bool valid = true;