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 1b64cdbeeafbe4ef85cd8b27a6eada823b762213..42965a99a5d9c00cc911b058313d422d3710fafa 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -20,14 +20,14 @@
 #include "xformsBC.h"
 
 #include "controllers/helper_funcs.h" // getSecond
+#include "controllers/frnt_lang.h"
 
 #include "buffer.h"
 #include "converter.h"
 #include "format.h"
-#include "frnt_lang.h"
+#include "LColor.h"
 #include "lyxfont.h"
 
-#include "support/LAssert.h"
 #include "support/lstrings.h"
 #include "support/tostr.h"
 #include "support/path_defines.h"
@@ -38,6 +38,13 @@
 
 #include <iomanip>
 
+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::make_pair;
 using std::max;
@@ -45,8 +52,7 @@ using std::min;
 
 using std::pair;
 using std::vector;
-
-using namespace lyx::support;
+using std::string;
 
 
 namespace {
@@ -308,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);
@@ -341,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;