Patch by Richard Heck:

[lyx.git] / src / Format.cpp

diff --git a/src/Format.cpp b/src/Format.cpp
index bddaf0948e4c4650cbe7b577576205b82bd3049a..e2107a5bdcc0242781a4abb94f99d493024fce96 100644 (file)
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -16,10 +16,10 @@
 #include "LyXRC.h"
 #include "debug.h"
 #include "gettext.h"
-#include "LyXServerSocket.h"
+#include "ServerSocket.h"
 
 #include "frontends/Application.h"
-#include "frontends/Alert.h" //to be removed?
+#include "frontends/alert.h" //to be removed?
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
@@ -97,7 +97,7 @@ bool operator<(Format const & a, Format const & b)
 
 Format::Format(string const & n, string const & e, string const & p,
               string const & s, string const & v, string const & ed,
-               int flags)
+              int flags)
        : name_(n), extension_(e), prettyname_(p), shortcut_(s), viewer_(v),
          editor_(ed), flags_(flags)
 {}
@@ -220,15 +220,15 @@ void Formats::add(string const & name)
 
 void Formats::add(string const & name, string const & extension,
                  string const & prettyname, string const & shortcut,
-                  string const & viewer, string const & editor,
-                  int flags)
+                 string const & viewer, string const & editor,
+                 int flags)
 {
        FormatList::iterator it =
                find_if(formatlist.begin(), formatlist.end(),
                        FormatNamesEqual(name));
        if (it == formatlist.end())
                formatlist.push_back(Format(name, extension, prettyname,
-                                           shortcut, viewer, editor, flags));
+                                           shortcut, viewer, editor, flags));
        else
                *it = Format(name, extension, prettyname, shortcut, viewer,
                             editor, flags);
@@ -314,7 +314,7 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
 
        command = subst(command, token_from_format, quoteName(filename.toFilesystemEncoding()));
        command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding())));
-       command = subst(command, token_socket_format, quoteName(theLyXServerSocket().address()));
+       command = subst(command, token_socket_format, quoteName(theServerSocket().address()));
        LYXERR(Debug::FILES) << "Executing command: " << command << std::endl;
        // FIXME UNICODE utf8 can be wrong for files
        buffer.message(_("Executing command: ") + from_utf8(command));
@@ -373,7 +373,7 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename,
 
        command = subst(command, token_from_format, quoteName(filename.toFilesystemEncoding()));
        command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding())));
-       command = subst(command, token_socket_format, quoteName(theLyXServerSocket().address()));
+       command = subst(command, token_socket_format, quoteName(theServerSocket().address()));
        LYXERR(Debug::FILES) << "Executing command: " << command << std::endl;
        // FIXME UNICODE utf8 can be wrong for files
        buffer.message(_("Executing command: ") + from_utf8(command));