commit c19794a01360a26824ddcabd82cde810e4d1867a
Author: Richard Heck <[email protected]>
Date:   Thu Oct 20 22:56:40 2016 -0400

    These two routines are now redundant.
---
 src/Buffer.cpp                |    4 ++--
 src/BufferParams.cpp          |   17 ++---------------
 src/BufferParams.h            |    4 +---
 src/frontends/qt4/GuiView.cpp |    2 +-
 4 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 2dcdefe..0d62f5d 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2479,7 +2479,7 @@ bool Buffer::getStatus(FuncRequest const & cmd, 
FuncStatus & flag)
                size_t pos = format.find(' ');
                if (pos != string::npos)
                        format = format.substr(0, pos);
-               enable = params().isExportable(format);
+               enable = params().isExportable(format, false);
                if (!enable)
                        flag.message(bformat(
                                             _("Don't know how to export to 
format: %1$s"), arg));
@@ -2491,7 +2491,7 @@ bool Buffer::getStatus(FuncRequest const & cmd, 
FuncStatus & flag)
                break;
 
        case LFUN_BUILD_PROGRAM:
-               enable = params().isExportable("program");
+               enable = params().isExportable("program", false);
                break;
 
        case LFUN_BRANCH_ACTIVATE:
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index d56c15b..50870c5 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2391,9 +2391,9 @@ string BufferParams::bufferFormat() const
 }
 
 
-bool BufferParams::isExportable(string const & format) const
+bool BufferParams::isExportable(string const & format, bool need_viewable) 
const
 {
-       FormatList const & formats = exportableFormats(false);
+       FormatList const & formats = exportableFormats(need_viewable);
        FormatList::const_iterator fit = formats.begin();
        FormatList::const_iterator end = formats.end();
        for (; fit != end ; ++fit) {
@@ -2434,19 +2434,6 @@ FormatList const & BufferParams::exportableFormats(bool 
only_viewable) const
 }
 
 
-bool BufferParams::isExportableFormat(string const & format) const
-{
-       FormatList const & formats = exportableFormats(true);
-       FormatList::const_iterator fit = formats.begin();
-       FormatList::const_iterator end = formats.end();
-       for (; fit != end ; ++fit) {
-               if ((*fit)->name() == format)
-                       return true;
-       }
-       return false;
-}
-
-
 vector<string> BufferParams::backends() const
 {
        vector<string> v;
diff --git a/src/BufferParams.h b/src/BufferParams.h
index dcf4517..f1e8eac 100644
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -178,11 +178,9 @@ public:
        OutputParams::FLAVOR getOutputFlavor(
                  std::string const & format = std::string()) const;
        ///
-       bool isExportable(std::string const & format) const;
+       bool isExportable(std::string const & format, bool need_viewable) const;
        ///
        std::vector<const Format *> const & exportableFormats(bool 
only_viewable) const;
-       ///
-       bool isExportableFormat(std::string const & format) const;
        /// the backends appropriate for use with this document.
        /// so, e.g., latex is excluded , if we're using non-TeX fonts
        std::vector<std::string> backends() const;
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 3324ecd..42ee532 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1844,7 +1844,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, 
FuncStatus & flag)
                string format = to_utf8(cmd.argument());
                if (cmd.argument().empty())
                        format = doc_buffer->params().getDefaultOutputFormat();
-               enable = doc_buffer->params().isExportableFormat(format);
+               enable = doc_buffer->params().isExportable(format, true);
                break;
        }
 

Reply via email to