the spellcheck cleanup

[lyx.git] / src / format.C

diff --git a/src/format.C b/src/format.C
index b8a0844bd1d1bd3d3d1d22ab05a5fe43d760f004..c91ce4c05b129831ae17116c75138c8ac07b440e 100644 (file)
--- a/src/format.C
+++ b/src/format.C
@@ -5,34 +5,45 @@
  *
  * \author Dekel Tsur
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #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
 
@@ -150,7 +161,7 @@ void Formats::setViewer(string const & name, string const & command)
 }
 
 
-bool Formats::view(Buffer const * buffer, string const & filename,
+bool Formats::view(Buffer const & buffer, string const & filename,
                   string const & format_name) const
 {
        if (filename.empty())
@@ -174,12 +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
-                   == BufferParams::ORIENTATION_LANDSCAPE)
+               if (buffer.params().orientation == ORIENTATION_LANDSCAPE)
                        command += 'r';
        }
 
@@ -189,9 +199,9 @@ 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);
+       buffer.message(_("Executing command: ") + command);
 
        Path p(OnlyPath(filename));
        Systemcall one;