some more changes

[lyx.git] / src / bufferlist.C

diff --git a/src/bufferlist.C b/src/bufferlist.C
index 3b69c1d0713dbf6f09509f515d1f5ab999262fb7..f185e713465307758ce320010ae103ea9a7283d3 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -28,7 +28,7 @@
 #include "bufferview_funcs.h"
 #include "BufferView.h"
 #include "gettext.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "vc-backend.h"
 #include "TextCache.h"
 #include "lyxtextclasslist.h"
@@ -294,7 +294,7 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir)
 void BufferList::emergencyWriteAll()
 {
        for_each(bstore.begin(), bstore.end(),
-                lyx::class_fun(*this, &BufferList::emergencyWrite));
+                lyx::void_class_fun(*this, &BufferList::emergencyWrite));
 }
 
 
@@ -482,14 +482,14 @@ Buffer * BufferList::newFile(string const & name, string tname, bool isNamed)
                                   MakeDisplayPath(tname));
                        // no template, start with empty buffer
                        b->paragraph = new Paragraph;
-                       b->paragraph->layout(textclasslist[b->params.textclass].defaultLayoutName());
+                       b->paragraph->layout(textclasslist[b->params.textclass].defaultLayout());
                }
        } else {  // start with empty buffer
                b->paragraph = new Paragraph;
-                       b->paragraph->layout(textclasslist[b->params.textclass].defaultLayoutName());
+                       b->paragraph->layout(textclasslist[b->params.textclass].defaultLayout());
        }
 
-       if (!lyxrc.new_ask_filename && !isNamed) {
+       if (!isNamed) {
                b->setUnnamed();
                b->setFileName(name);
        }