change arg, inherit privatelu from noncopyable

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

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index eb811a10c0803874ff7cc59fd15da84201412c2e..f7889c3ed7d59cd782f18032d2ef7da34d7f23ec 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-17  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * Liason.[Ch] (setMinibuffer): change second arg to string
+
+       * Dialogs.h: inherit privately from noncopyable
+
 2001-04-03  John Levon  <moz@compsoc.man.ac.uk>
 
        * Dialogs.h: s/popup/dialog/

diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h
index a183a20657134dd8ca0131cd90866b0225c27536..f26139f23d5dc7bacfe20fbc6545d59368df8bc7 100644 (file)
--- a/src/frontends/Dialogs.h
+++ b/src/frontends/Dialogs.h
@@ -50,7 +50,7 @@ class InsetMinipage;
     The list of dialog signals isn't comprehensive but should be a good guide
     for any future additions.  Remember don't go overboard -- think minimal.
  */
-class Dialogs : public boost::noncopyable
+class Dialogs : boost::noncopyable
 {
 public:
        ///

diff --git a/src/frontends/Liason.C b/src/frontends/Liason.C
index 5b66b8a94dab74b1178b0c01028cffe2d8127687..85172e3cfe2fc348629d5fefc4e26e4ccfb23d99 100644 (file)
--- a/src/frontends/Liason.C
+++ b/src/frontends/Liason.C
@@ -26,8 +26,8 @@
 #include "support/path.h"
 #include "exporter.h"
 #include "converter.h"
-#include "minibuffer.h"
 #include "support/syscall.h"
+#include "lyxfunc.h"
 
 using std::endl;
 
@@ -155,9 +155,11 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp)
        return res == 0;
 }
 
-void setMinibuffer(LyXView * lv, char const * msg)
+
+void setMinibuffer(LyXView * lv, string const & msg)
 {
-       lv->getMiniBuffer()->Set(msg);
+       Assert(lv);
+       lv->message(msg);
 }
 
 } // namespace Liason

diff --git a/src/frontends/Liason.h b/src/frontends/Liason.h
index c40b4277aee787778202a6d7e890953c8cea7541..6a067d8227bd3227a4ed5f2f5244b61c6ca6ffa7 100644 (file)
--- a/src/frontends/Liason.h
+++ b/src/frontends/Liason.h
@@ -30,6 +30,8 @@
 #pragma interface
 #endif
 
+#include "LString.h"
+
 class PrinterParams;
 class Buffer;
 class LyXView;
@@ -52,7 +54,7 @@ namespace Liason {
        /// print the current buffer
        bool printBuffer(Buffer *, PrinterParams const &);
        /// set the minibuffer
-       void setMinibuffer(LyXView *, char const  * msg);
+       void setMinibuffer(LyXView *, string const & msg);
        //@}
 
 } // namespace Liason