zlib stuff

[lyx.git] / src / exporter.C

diff --git a/src/exporter.C b/src/exporter.C
index c84c7cd49d77d89c7fe0d0d5743f593a5478bacc..ee9e80bcbb94026abe11fad689c6038a1fefa76e 100644 (file)
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -12,20 +12,36 @@
 
 #include "exporter.h"
 #include "buffer.h"
-#include "lyx_cb.h" //ShowMessage()
+#include "buffer_funcs.h"
 #include "support/filetools.h"
 #include "lyxrc.h"
 #include "converter.h"
 #include "format.h"
 #include "frontends/Alert.h"
 #include "gettext.h"
-#include "BufferView.h"
 
 #include <algorithm>
 
+using namespace lyx::support;
+
 using std::vector;
 using std::find;
 
+
+namespace {
+
+vector<string> const Backends(Buffer const * buffer)
+{
+       vector<string> v;
+       if (buffer->params.getLyXTextClass().isTeXClassAvailable())
+               v.push_back(BufferFormat(*buffer));
+       v.push_back("text");
+       return v;
+}
+
+} //namespace anon
+
+
 bool Exporter::Export(Buffer * buffer, string const & format,
                      bool put_in_tempdir, string & result_file)
 {
@@ -90,11 +106,10 @@ bool Exporter::Export(Buffer * buffer, string const & format,
                return false;
 
        if (!put_in_tempdir)
-               ShowMessage(buffer,
-                           _("Document exported as ")
-                           + formats.prettyName(format)
-                           + _(" to file `")
-                           + MakeDisplayPath(result_file) +'\'');
+               buffer->message(_("Document exported as ")
+                                     + formats.prettyName(format)
+                                     + _(" to file `")
+                                     + MakeDisplayPath(result_file) +'\'');
        return true;
 }
 
@@ -141,26 +156,3 @@ Exporter::GetExportableFormats(Buffer const * buffer, bool only_viewable)
        }
        return result;
 }
-
-
-string const Exporter::BufferFormat(Buffer const * buffer)
-{
-       if (buffer->isLinuxDoc())
-               return "linuxdoc";
-       else if (buffer->isDocBook())
-               return "docbook";
-       else if (buffer->isLiterate())
-               return "literate";
-       else
-               return "latex";
-}
-
-
-vector<string> const Exporter::Backends(Buffer const * buffer)
-{
-       vector<string> v;
-       if (buffer->params.getLyXTextClass().isTeXClassAvailable())
-               v.push_back(BufferFormat(buffer));
-       v.push_back("text");
-       return v;
-}