restore comment about boost::shared_ptr and dtor.

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 9a60901d84e293532f2b11f51c9fb5aa02163020..7de306c0d2ff05df806c38430ad9c823632d05d4 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -17,7 +17,7 @@
 
 #include "LyX.h"
 
-#include "BaseClassList.h"
+#include "LayoutFile.h"
 #include "Buffer.h"
 #include "BufferList.h"
 #include "CmdDef.h"
@@ -28,13 +28,13 @@
 #include "Encoding.h"
 #include "ErrorList.h"
 #include "Format.h"
+#include "FuncStatus.h"
 #include "KeyMap.h"
 #include "Language.h"
 #include "Lexer.h"
 #include "LyXAction.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
-#include "MenuBackend.h"
 #include "ModuleList.h"
 #include "Mover.h"
 #include "Server.h"
@@ -576,7 +576,7 @@ void LyX::execBatchCommands()
        // aknowledged.
 
        // if reconfiguration is needed.
-       while (baseclasslist.empty()) {
+       while (LayoutFileList::get().empty()) {
            switch (Alert::prompt(
                    _("No textclass is found"),
                    _("LyX cannot continue because no textclass is found. "
@@ -1080,7 +1080,7 @@ bool LyX::readUIFile(string const & name, bool include)
                        break;
                }
                case ui_menuset:
-                       theApp()->menuBackend().read(lex);
+                       theApp()->readMenus(lex);
                        break;
 
                case ui_toolbarset: