more 'informational' messages removed?

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index d94564d492d4ee8be92ff59615f46c3142f2aeab..ba2544d44549efd0ee3a7daf96321c581cb3a457 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -10,11 +10,6 @@
 
 #include <config.h>
 
-#include <fstream>
-#include <algorithm>
-#include <utility> 
-#include <iostream>
-
 #include "lyx_cb.h"
 #include "lyx_main.h"
 #include "buffer.h"
@@ -25,17 +20,26 @@
 #include "LyXView.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
+#include "gettext.h"
+#include "BufferView.h"
+#include "lyxtextclasslist.h"
+
+#include "insets/insetlabel.h"
+
 #include "frontends/Alert.h"
 #include "frontends/FileDialog.h"
 #include "frontends/GUIRunTime.h"
-#include "insets/insetlabel.h"
+
 #include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/syscall.h"
 #include "support/lstrings.h"
-#include "gettext.h"
-#include "BufferView.h"
+
+#include <fstream>
+#include <algorithm>
+#include <utility> 
+#include <iostream>
 
 using std::vector;
 using std::ifstream;
@@ -159,7 +163,7 @@ bool MenuWrite(BufferView * bv, Buffer * buffer)
 bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
 {
        string fname = buffer->fileName();
-       string oldname = fname;
+       string const oldname = fname;
 
        if (filename.empty()) {
 
@@ -476,7 +480,7 @@ void MenuInsertLabel(BufferView * bv, string const & arg)
        string label(arg);
        bv->owner()->prohibitInput();
        if (label.empty()) {
-               Paragraph * par = bv->text->cursor.par();
+               Paragraph * par = bv->getLyXText()->cursor.par();
                LyXLayout const * layout =
                        &textclasslist.Style(bv->buffer()->params.textclass,
                                             par->getLayout());