X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormPreferences.C;h=f8c5ac63b7616df2307c17ee9b930f3c7c8e364e;hb=4c6e0fe4226ce3b55d13726977f1e579f17c2ad1;hp=852ce0e4de6b2b51a956ca9e02dbf1e326aa06e1;hpb=eee532a581a7ffc9cc7b33ee675eef75c2f949e5;p=lyx.git

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 852ce0e4de..f8c5ac63b7 100644
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -5,69 +5,49 @@
  *
  * \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 "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 "support/LAssert.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 std::endl;
-using std::pair;
 using std::make_pair;
 using std::max;
 using std::min;
-using std::vector;
-using std::setw;
-using std::setfill;
 
-extern string user_lyxdir;
+using std::pair;
+using std::vector;
 
 using namespace lyx::support;
 
+
 namespace {
 
 // These should probably go inside the class definition...
@@ -92,17 +72,6 @@ pair<string,string> parseFontName(string const & name)
 }
 
 
-string const X11hexname(RGBColor const & col)
-{
-	ostringstream ostr;
-
-	ostr << '#' << std::setbase(16) << setfill('0')
-	     << setw(2) << col.r
-	     << setw(2) << col.g
-	     << setw(2) << col.b;
-
-	return STRCONV(ostr.str());
-}
 
 #if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL < 2)
 bool const scalableTabfolders = false;
@@ -330,7 +299,7 @@ void FormPreferences::apply()
 	// The "Save" button has been pressed.
 	if (controller().isClosing() && colors_.modifiedXformsPrefs) {
 		string const filename =
-			AddName(user_lyxdir, "preferences.xform");
+			AddName(user_lyxdir(), "preferences.xform");
 		colors_.modifiedXformsPrefs = !XformsColor::write(filename);
 	}
 }