the spellcheck cleanup

[lyx.git] / src / format.C

diff --git a/src/format.C b/src/format.C
index d69d4ecb12a5a5d6fa19b2f06a89981db9fefa84..c91ce4c05b129831ae17116c75138c8ac07b440e 100644 (file)
--- a/src/format.C
+++ b/src/format.C
@@ -12,27 +12,38 @@
 
 #include "format.h"
 #include "buffer.h"
-#include "buffer_funcs.h"
+#include "bufferparams.h"
 #include "lyxrc.h"
 #include "debug.h"
 #include "gettext.h"
-#include "LString.h"
+#include "lyxsocket.h"
 
 #include "frontends/Alert.h" //to be removed?
 
-#include "support/lstrings.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/systemcall.h"
 #include "support/lyxfunctional.h"
 
-using namespace lyx::support;
+using lyx::support::bformat;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::contains;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::Path;
+using lyx::support::QuoteName;
+using lyx::support::subst;
+using lyx::support::Systemcall;
 
+using std::string;
+
+extern LyXServerSocket * lyxsocket;
 
 namespace {
 
 string const token_from("$$i");
 string const token_path("$$p");
+string const token_socket("$$a");
 
 } //namespace anon
 
@@ -174,11 +185,11 @@ bool Formats::view(Buffer const & buffer, string const & filename,
        if (format_name == "dvi" &&
            !lyxrc.view_dvi_paper_option.empty()) {
                command += ' ' + lyxrc.view_dvi_paper_option;
-               string paper_size = buffer.params.paperSizeName();
+               string paper_size = buffer.params().paperSizeName();
                if (paper_size == "letter")
                        paper_size = "us";
                command += ' ' + paper_size;
-               if (buffer.params.orientation == ORIENTATION_LANDSCAPE)
+               if (buffer.params().orientation == ORIENTATION_LANDSCAPE)
                        command += 'r';
        }
 
@@ -188,7 +199,7 @@ bool Formats::view(Buffer const & buffer, string const & filename,
        command = subst(command, token_from,
                        QuoteName(OnlyFilename(filename)));
        command = subst(command, token_path, QuoteName(OnlyPath(filename)));
-
+       command = subst(command, token_socket, QuoteName(lyxsocket->address()));
        lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
        buffer.message(_("Executing command: ") + command);