Replace LString.h with support/std_string.h,

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

diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C
index e39db69e87821158c19b27c49bc1e276fe85a163..9500ef95cc3bfcc473d37c248207568f28320a62 100644 (file)
--- a/src/frontends/xforms/lyx_gui.C
+++ b/src/frontends/xforms/lyx_gui.C
@@ -6,43 +6,41 @@
  * \author Lars Gullik Bjønnes
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "lyx_gui.h"
+#include "ColorHandler.h"
+#include "xfont_loader.h"
+#include "xforms_helpers.h"
+#include "xformsImage.h"
+#include "XFormsView.h"
 
-#include "support/lyxlib.h"
-#include "support/os.h"
-#include "support/filetools.h"
-
+#include "bufferlist.h"
+#include "BufferView.h"
 #include "debug.h"
 #include "gettext.h"
-
 #include "lyx_main.h"
+#include "lyxfunc.h"
 #include "lyxrc.h"
-#include "lyxfont.h"
+#include "lyxserver.h"
+
 #include "graphics/LoaderQueue.h"
 
-// FIXME: move this stuff out again
-#include "bufferlist.h"
-#include "buffer_funcs.h"
-#include "lyxfunc.h"
-#include "lyxserver.h"
-#include "BufferView.h"
-#include "XFormsView.h"
+#include "support/lyxlib.h"
+#include "support/os.h"
+#include "support/filetools.h"
+#include "support/path_defines.h"
 
 #include "lyx_forms.h"
-#include "ColorHandler.h"
-#include "xforms_helpers.h"
-#include "xfont_loader.h"
-#include "xformsImage.h"
 
-#include "Lsstream.h"
+#include <boost/bind.hpp>
+
+#include "support/std_sstream.h"
 #include <iomanip>
 #include <fcntl.h>
-#include <boost/bind.hpp>
 
 using namespace lyx::support;
 
@@ -50,13 +48,14 @@ using namespace lyx::support;
 using std::exit;
 #endif
 
-using std::vector;
-using std::hex;
 using std::dec;
 using std::endl;
+using std::hex;
 using std::setbase;
 using std::setfill;
 using std::setw;
+using std::vector;
+
 
 extern BufferList bufferlist;
 
@@ -172,7 +171,7 @@ void 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);
@@ -187,7 +186,7 @@ void parse_init(int & argc, char * argv[])
 
 void 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;
@@ -289,9 +288,8 @@ void start(string const & batch, vector<string> const & files)
                view.view()->loadLyXFile(*cit, true);
 
        // handle the batch commands the user asked for
-       if (!batch.empty()) {
+       if (!batch.empty())
                view.getLyXFunc().dispatch(batch);
-       }
 
        // enter the event loop
        while (!finished) {