Forgot to add this files.

[lyx.git] / src / ImportLaTeX.C

diff --git a/src/ImportLaTeX.C b/src/ImportLaTeX.C
index 0151a1b1a299796b3876f0cbc50663164e06c6c9..acafd3b822ff046f03786dd6738c297783bd792b 100644 (file)
--- a/src/ImportLaTeX.C
+++ b/src/ImportLaTeX.C
@@ -1,14 +1,14 @@
 /* This file is part of
- * ======================================================
+ * ====================================================== 
  * 
  *           LyX, The Document Processor        
- *          Copyright (C) 1995 Matthias Ettrich
- *           Copyright (C) 1995-1998 The LyX Team.
+ *          Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
  *
- *           This file is Copyright (C) 1998
+ *           This file is Copyright 1998
  *           Asger Alstrup
  *
- *======================================================
+ * ====================================================== 
  */
 
 #include <config.h>
@@ -19,25 +19,17 @@
 
 #include "ImportLaTeX.h"
 #include "lyxrc.h"
-#include "syscall.h"
-#include "filetools.h"
+#include "support/syscall.h"
+#include "support/filetools.h"
 #include "bufferlist.h"
 
-extern LyXRC * lyxrc;
 extern BufferList bufferlist;
 
-//     $Id: ImportLaTeX.C,v 1.1 1999/09/27 18:44:36 larsbj Exp $
-
-#if !defined(lint) && !defined(WITH_WARNINGS)
-static char vcid[] = "$Id: ImportLaTeX.C,v 1.1 1999/09/27 18:44:36 larsbj Exp $";
-#endif /* lint */
-
-
 /*
  * CLASS ImportLaTeX
  */
 
-ImportLaTeX::ImportLaTeX(LString const & file)
+ImportLaTeX::ImportLaTeX(string const & file)
                : file(file)
 {
 }
@@ -46,12 +38,12 @@ ImportLaTeX::ImportLaTeX(LString const & file)
 Buffer * ImportLaTeX::run()
 {
        // run reLyX
-       LString tmp = lyxrc->relyx_command + " -f " + file;
+       string tmp = lyxrc.relyx_command + " -f " + file;
         Systemcalls one;
        Buffer * buf = 0;
-       int result= one.Startscript(Systemcalls::System, tmp);
-       if (result==0) {
-               LString filename = ChangeExtension(file, ".lyx", false);
+       int result = one.startscript(Systemcalls::System, tmp);
+       if (result == 0) {
+               string filename = ChangeExtension(file, ".lyx");
                // File was generated without problems. Load it.
                buf = bufferlist.loadLyXFile(filename);
        }