Move Color::color enum to ColorCode.h

[lyx.git] / src / frontends / LyXView.cpp

diff --git a/src/frontends/LyXView.cpp b/src/frontends/LyXView.cpp
index 72f625de43f1d7d936cbe05c715ca14f8fefcff9..4e9157772b4ceab765f51271ff07a4efaadaf378 100644 (file)
--- a/src/frontends/LyXView.cpp
+++ b/src/frontends/LyXView.cpp
@@ -22,7 +22,6 @@
 #include "BufferList.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "callback.h"
 #include "Cursor.h"
 #include "debug.h"
 #include "ErrorList.h"
@@ -106,11 +105,11 @@ Buffer const * LyXView::buffer() const
 void LyXView::setBuffer(Buffer * newBuffer)
 {
        BOOST_ASSERT(newBuffer);
-       busy(true);
+       setBusy(true);
 
        WorkArea * wa = workArea(*newBuffer);
        if (wa == 0) {
-               updateLabels(*newBuffer->getMasterBuffer());
+               updateLabels(*newBuffer->masterBuffer());
                wa = addWorkArea(*newBuffer);
        } else {
                //Disconnect the old buffer...there's no new one.
@@ -120,20 +119,20 @@ void LyXView::setBuffer(Buffer * newBuffer)
        connectBufferView(wa->bufferView());
        setCurrentWorkArea(wa);
 
-       busy(false);
+       setBusy(false);
 }
 
 
 Buffer * LyXView::loadLyXFile(FileName const & filename, bool tolastfiles)
 {
-       busy(true);
+       setBusy(true);
 
        Buffer * newBuffer = checkAndLoadLyXFile(filename);
 
        if (!newBuffer) {
                message(_("Document not loaded."));
                updateStatusBar();
-               busy(false);
+               setBusy(false);
                return 0;
        }
 
@@ -154,7 +153,7 @@ Buffer * LyXView::loadLyXFile(FileName const & filename, bool tolastfiles)
        if (tolastfiles)
                LyX::ref().session().lastFiles().add(filename);
 
-       busy(false);
+       setBusy(false);
        return newBuffer;
 }
 
@@ -219,7 +218,7 @@ void LyXView::updateDialog(string const & name, string const & data)
 }
 
 
-void LyXView::showReadonly(bool)
+void LyXView::setReadOnly(bool)
 {
        updateWindowTitle();
        getDialogs().updateBufferDependent(false);
@@ -250,7 +249,7 @@ void LyXView::autoSave()
        LYXERR(Debug::INFO) << "Running autoSave()" << endl;
 
        if (buffer())
-               lyx::autoSave(view());
+               view()->buffer().autoSave();
 }
 
 
@@ -268,7 +267,7 @@ void LyXView::updateWindowTitle()
 
        Buffer * buf = buffer();
        if (buf) {
-               string const cur_title = buf->fileName();
+               string const cur_title = buf->absFileName();
                if (!cur_title.empty()) {
                        maximize_title += ": " + makeDisplayPath(cur_title, 30);
                        minimize_title = lyx::from_utf8(onlyFilename(cur_title));