change "support/std_sstream.h" to <sstream>

[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..13e4607d86ac3960b19c0b8f0404d437606e9397 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,10 +38,11 @@
 #include "xfont_loader.h"
 #include "xformsImage.h"
 
-#include "Lsstream.h"
+#include <boost/bind.hpp>
+
+#include <sstream>
 #include <iomanip>
 #include <fcntl.h>
-#include <boost/bind.hpp>
 
 #include "gnome_helpers.h"
 #include <gtkmm/main.h>
@@ -50,6 +52,7 @@
 using std::exit;
 #endif
 
+using std::ostringstream;
 using std::vector;
 using std::hex;
 using std::dec;
@@ -165,9 +168,9 @@ void lyx_gui::parse_init(int & argc, char * argv[])
 
        XSetErrorHandler(LyX_XErrHandler);
 
-       lyxColorHandler.reset(new LyXColorHandler());
+       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 +185,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;