Replace LString.h with support/std_string.h,

[features.git] / src / frontends / gnome / lyx_gui.C

diff --git a/src/frontends/gnome/lyx_gui.C b/src/frontends/gnome/lyx_gui.C
index 70bcade96776a26026b06bacf8a01633d5b65145..556e883d2689bb008603424fd0257ad4a1a207c1 100644 (file)
--- a/src/frontends/gnome/lyx_gui.C
+++ b/src/frontends/gnome/lyx_gui.C
@@ -1,12 +1,12 @@
 /**
- * \file xforms/lyx_gui.C
+ * \file gnome/lyx_gui.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
  * \author unknown
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -16,6 +16,7 @@
 #include "support/lyxlib.h"
 #include "support/os.h"
 #include "support/filetools.h"
+#include "support/path_defines.h"
 
 #include "debug.h"
 #include "gettext.h"
@@ -37,7 +38,7 @@
 #include "xfont_loader.h"
 #include "xformsImage.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include <iomanip>
 #include <fcntl.h>
 #include <boost/bind.hpp>
@@ -167,7 +168,7 @@ void lyx_gui::parse_init(int & argc, char * argv[])
 
        lyxColorHandler.reset(new LyXColorHandler());
 
-       using namespace grfx;
+       using namespace lyx::graphics;
 
        // connect the image loader based on the xforms library
        Image::newImage = boost::bind(&xformsImage::newImage);
@@ -182,7 +183,7 @@ void lyx_gui::parse_init(int & argc, char * argv[])
 
 void lyx_gui::parse_lyxrc()
 {
-       XformsColor::read(AddName(user_lyxdir, "preferences.xform"));
+       XformsColor::read(AddName(user_lyxdir(), "preferences.xform"));
 
        if (lyxrc.popup_font_encoding.empty())
                lyxrc.popup_font_encoding = lyxrc.font_norm;