last Friday's text*.C -> text_func shuffle

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 1f9e957160b276b947a339ec1607600474a3ef91..edea4b9dda5e2e924b1581f1ef59a33be80db743 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -13,21 +13,26 @@
 #include <iostream>
 #include <boost/scoped_ptr.hpp>
 
-#include "debug.h"
-
 #include "lyxrc.h"
+
+#include "debug.h"
 #include "kbmap.h"
 #include "LyXAction.h"
 #include "intl.h"
-#include "support/path.h"
-#include "support/filetools.h"
-#include "support/LAssert.h"
-#include "support/userinfo.h"
 #include "converter.h"
 #include "format.h"
 #include "gettext.h"
 #include "lyxlex.h"
 
+#include "support/path.h"
+#include "support/tostr.h"
+#include "support/filetools.h"
+#include "support/LAssert.h"
+#include "support/lstrings.h"
+#include "support/userinfo.h"
+
+using namespace lyx::support;
+
 using std::ostream;
 using std::ofstream;
 using std::cout;
@@ -209,9 +214,9 @@ void LyXRC::setDefaults() {
        font_sizes[LyXFont::SIZE_HUGE] = 20.74;
        font_sizes[LyXFont::SIZE_HUGER] = 24.88;
        use_scalable_fonts = true;
-       roman_font_name = "times";
-       sans_font_name = "helvetica";
-       typewriter_font_name = "courier";
+       roman_font_name = "";
+       sans_font_name = "";
+       typewriter_font_name = "";
        popup_bold_font = "-*-helvetica-bold-r";
        popup_normal_font = "-*-helvetica-medium-r";
        font_norm = "iso8859-1";
@@ -257,14 +262,9 @@ void LyXRC::setDefaults() {
        preview_hashed_labels  = false;
        preview_scale_factor = 0.9;
 
-       /// These variables are not stored on disk (perhaps they
-       // should be moved from the LyXRC class).
-       use_gui = true;
-       pdf_mode = false;
-
-       user_name = lyx::user_name();
+       user_name = lyx::support::user_name();
 
-       user_email = lyx::user_email();
+       user_email = lyx::support::user_email();
 
        if (user_email.empty())
                user_email = _("email address unknown");