Further cleanup of InsetFlex, InsetCollapsable and InsetLayout:

[lyx.git] / src / MenuBackend.cpp

diff --git a/src/MenuBackend.cpp b/src/MenuBackend.cpp
index d4e0e2b7df9b55ce53c5cfefeae56cab4ce170fd..ac3cbfa33937f09778dcf08b3de347441eabb39c 100644 (file)
--- a/src/MenuBackend.cpp
+++ b/src/MenuBackend.cpp
@@ -21,14 +21,13 @@
 #include "Buffer.h"
 #include "BufferList.h"
 #include "BufferParams.h"
+#include "Converter.h"
 #include "CutAndPaste.h"
 #include "debug.h"
-#include "Exporter.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "Format.h"
 #include "gettext.h"
-#include "Importer.h"
 #include "KeyMap.h"
 #include "Session.h"
 #include "LyXAction.h"
@@ -73,8 +72,7 @@ class MenuNamesEqual : public std::unary_function<Menu, bool> {
 public:
        MenuNamesEqual(docstring const & name)
                : name_(name) {}
-       bool operator()(Menu const & menu) const
-       {
+       bool operator()(Menu const & menu) const {
                return menu.name() == name_;
        }
 private:
@@ -139,10 +137,10 @@ docstring const MenuItem::binding(bool forgui) const
 
        // Get the keys bound to this action, but keep only the
        // first one later
-       KeyMap::Bindings bindings = theTopLevelKeymap().findbindings(func_);
+       KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(func_);
 
        if (bindings.size()) {
-               return bindings.begin()->print(forgui);
+               return bindings.begin()->print(KeySequence::ForGui);
        } else {
                LYXERR(Debug::KBMAP)
                        << "No binding for "
@@ -496,11 +494,12 @@ void expandDocuments(Menu & tomenu)
                
                // We cannot use a for loop as the buffer list cycles.
                do {
-                       docstring label = makeDisplayPath(b->fileName(), 20);
+                       docstring label = makeDisplayPath(b->absFileName(), 20);
                        if (!b->isClean()) label = label + "*";
                        if (ii < 10)
                                label = convert<docstring>(ii) + ". " + label + '|' + convert<docstring>(ii);
-                       tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BUFFER_SWITCH, b->fileName())));
+                       tomenu.add(MenuItem(MenuItem::Command, label,
+                               FuncRequest(LFUN_BUFFER_SWITCH, b->absFileName())));
                        
                        b = theBufferList().next(b);
                        ++ii;
@@ -544,19 +543,19 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
 
        switch (kind) {
        case MenuItem::ImportFormats:
-               formats = Importer::GetImportableFormats();
+               formats = theConverters().importableFormats();
                action = LFUN_BUFFER_IMPORT;
                break;
        case MenuItem::ViewFormats:
-               formats = Exporter::getExportableFormats(*buf, true);
+               formats = buf->exportableFormats(true);
                action = LFUN_BUFFER_VIEW;
                break;
        case MenuItem::UpdateFormats:
-               formats = Exporter::getExportableFormats(*buf, true);
+               formats = buf->exportableFormats(true);
                action = LFUN_BUFFER_UPDATE;
                break;
        default:
-               formats = Exporter::getExportableFormats(*buf, false);
+               formats = buf->exportableFormats(false);
                action = LFUN_BUFFER_EXPORT;
        }
        sort(formats.begin(), formats.end(), compare_format());
@@ -747,7 +746,7 @@ void expandToc(Menu & tomenu, Buffer const * buf)
        cbuf->structureChanged();
 
        // Add an entry for the master doc if this is a child doc
-       Buffer const * const master = buf->getMasterBuffer();
+       Buffer const * const master = buf->masterBuffer();
        if (buf != master) {
                ParIterator const pit = par_iterator_begin(master->inset());
                string const arg = convert<string>(pit->id());
@@ -857,7 +856,7 @@ void expandBranches(Menu & tomenu, Buffer const * buf)
                return;
        }
 
-       BufferParams const & params = buf->getMasterBuffer()->params();
+       BufferParams const & params = buf->masterBuffer()->params();
        if (params.branchlist().empty()) {
                tomenu.add(MenuItem(MenuItem::Command,
                                    _("No Branch in Document!"),