replace LyXView::message() direct call with Buffer::message() boost signal emission.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14827 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index eeefd6d4f16e2b5d1262f9b6e0dae5e532626ad0..72e85937c80148171ddee3b4c77a9ea9378222d3 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -630,7 +630,8 @@ void BufferView::Pimpl::savePosition(unsigned int i)
                                      cursor_.paragraph().id(),
                                      cursor_.pos());
        if (i > 0)
-               owner_->message(bformat(_("Saved bookmark %1$d"), i));
+               // emit message signal.
+               buffer_->message(bformat(_("Saved bookmark %1$d"), i));
 }
 
 
@@ -663,7 +664,8 @@ void BufferView::Pimpl::restorePosition(unsigned int i)
        bv_->setCursor(makeDocIterator(par, min(par->size(), saved_positions[i].par_pos)));
 
        if (i > 0)
-               owner_->message(bformat(_("Moved to bookmark %1$d"), i));
+               // emit message signal.
+               buffer_->message(bformat(_("Moved to bookmark %1$d"), i));
 }
 
 
@@ -752,7 +754,8 @@ void BufferView::Pimpl::menuInsertLyXFile(string const & filenm)
 
                // check selected filename
                if (filename.empty()) {
-                       owner_->message(_("Canceled."));
+                       // emit message signal.
+                       buffer_->message(_("Canceled."));
                        return;
                }
        }
@@ -762,7 +765,8 @@ void BufferView::Pimpl::menuInsertLyXFile(string const & filenm)
        filename = fileSearch(string(), filename, "lyx");
 
        string const disp_fn = makeDisplayPath(filename);
-       owner_->message(bformat(_("Inserting document %1$s..."), disp_fn));
+       // emit message signal.
+       buffer_->message(bformat(_("Inserting document %1$s..."), disp_fn));
 
        string res;
        Buffer buf("", false);
@@ -776,7 +780,8 @@ void BufferView::Pimpl::menuInsertLyXFile(string const & filenm)
        } else
                res = _("Could not insert document %1$s");
 
-       owner_->message(bformat(res, disp_fn));
+       // emit message signal.
+       buffer_->message(bformat(res, disp_fn));
        buffer_->errors("Parse");
        resizeCurrentBuffer();
 }

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 028cd74f4b8aeb3ef692be403e68e004bf782ff3..9086b5fd3ec1b1053fca2a800c9d4f13dc31ef75 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -285,7 +285,8 @@ int AutoSaveBuffer::generateChild()
                                // It is dangerous to do this in the child,
                                // but safe in the parent, so...
                                if (pid == -1)
-                                       bv_.owner()->message(_("Autosave failed!"));
+                                       // emit message signal.
+                                       bv_.buffer()->message(_("Autosave failed!"));
                        }
                }
                if (pid == 0) { // we are the child so...
@@ -311,7 +312,8 @@ void autoSave(BufferView * bv)
                return;
        }
 
-       bv->owner()->message(_("Autosaving current document..."));
+       // emit message signal.
+       bv->buffer()->message(_("Autosaving current document..."));
 
        // create autosave filename
        string fname = bv->buffer()->filePath();
@@ -436,7 +438,8 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 // reconfigure the automatic settings.
 void reconfigure(BufferView * bv)
 {
-       bv->owner()->message(_("Running configure..."));
+       // emit message signal.
+       bv->buffer()->message(_("Running configure..."));
 
        // Run configure in user lyx directory
        Path p(package().user_support());
@@ -444,7 +447,8 @@ void reconfigure(BufferView * bv)
        Systemcall one;
        one.startscript(Systemcall::Wait, configure_command);
        p.pop();
-       bv->owner()->message(_("Reloading configuration..."));
+       // emit message signal.
+       bv->buffer()->message(_("Reloading configuration..."));
        lyxrc.read(libFileSearch(string(), "lyxrc.defaults"));
        // Re-read packages.lst
        LaTeXFeatures::getAvailable();

diff --git a/src/lyxfind.C b/src/lyxfind.C
index 14feb353e5518d7aac4cee337c8795c7df6ae242..61517f69e6f9f737e99c33d952ee684bb663b9ac 100644 (file)
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -288,7 +288,8 @@ void find(BufferView * bv, FuncRequest const & ev)
                                  casesensitive, matchword, forward);
 
        if (!found)
-               bv->owner()->message(_("String not found!"));
+               // emit message signal.
+               bv->buffer()->message(_("String not found!"));
 }
 
 
@@ -311,21 +312,24 @@ void replace(BufferView * bv, FuncRequest const & ev)
        bool all           = parse_bool(howto);
        bool forward       = parse_bool(howto);
 
-       LyXView * lv = bv->owner();
+       Buffer * buf = bv->buffer();
 
        int const replace_count = all
                ? ::replaceAll(bv, search, replace, casesensitive, matchword)
                : ::replace(bv, search, replace, casesensitive, matchword, forward);
 
        if (replace_count == 0) {
-               lv->message(_("String not found!"));
+               // emit message signal.
+               buf->message(_("String not found!"));
        } else {
                if (replace_count == 1) {
-                       lv->message(_("String has been replaced."));
+                       // emit message signal.
+                       buf->message(_("String has been replaced."));
                } else {
                        string str = convert<string>(replace_count);
                        str += _(" strings have been replaced.");
-                       lv->message(str);
+                       // emit message signal.
+                       buf->message(str);
                }
        }
 }