compile fixes

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

diff --git a/src/BufferView.C b/src/BufferView.C
index 6d5b383eba80876f33898b8558d9854ff1ec67b9..c79b8d381a6166f0b35d4bbd3b0c2b7eea337cfb 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -250,7 +250,7 @@ bool BufferView::dispatch(FuncRequest const & ev)
 }
 
 
-void BufferView::moveCursorUpdate(bool selecting, bool fitcur = true)
+void BufferView::moveCursorUpdate(bool selecting, bool fitcur)
 {
        pimpl_->moveCursorUpdate(selecting, fitcur);
 }

diff --git a/src/ChangeLog b/src/ChangeLog
index 1fd8ac785ae8690bef6df801e2657c1dfe867383..6f03941eb89851284a460217a4fce50e17badba0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,15 @@
+2002-08-20  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * bufferlist.C (emergencyWrite): don't use fmt(...)
+
+       * text3.C: add using std::endl
+
+       * BufferView.C (moveCursorUpdate): remove default arg
 
 2002-08-20  André Pönitz <poenitz@gmx.net>
 
        * buffer.[Ch]: move inline functions to .C
-               
+
        * BufferView2.C:
        * BufferView_pimpl.C:
        * text.C:
@@ -49,10 +56,10 @@
        * Makefile.am: use $(variables) instead of @substitutions@
 
 2002-08-15  André Pönitz <poenitz@gmx.net>
-       
+
        * lyxfunc.C:
        * BufferView_pimpl.C: streamlining mathed <-> outer world
-       interaction 
+       interaction
 
        * commandtags.h:
        * LyXAction.C: remove unused LFUN_MATH

diff --git a/src/bufferlist.C b/src/bufferlist.C
index b515df300d5a3d313f6c8aee5f2713185148ff99..d8226677a1876c084eed5b46f617db6455eef9fb 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -304,9 +304,10 @@ void BufferList::emergencyWrite(Buffer * buf)
        if (buf->isClean())
                return;
 
-       lyxerr << fmt(_("lyx: Attempting to save document %s as..."),
-                     buf->isUnnamed() ? OnlyFilename(buf->fileName()).c_str()
-                     : buf->fileName().c_str()) << endl;
+       lyxerr << _("lyx: Attempting to save document ")
+              << (buf->isUnnamed() ? OnlyFilename(buf->fileName())
+                  : buf->fileName())
+              <<  _(" as...") << endl;
 
        // We try to save three places:
 

diff --git a/src/support/lyxmanip.h b/src/support/lyxmanip.h
index 9c066eaab342d17d5160e4f4581251b38d40b141..bc106bed79229554475b6625c90c7fd0b5eec7bb 100644 (file)
--- a/src/support/lyxmanip.h
+++ b/src/support/lyxmanip.h
@@ -26,7 +26,4 @@ std::ostream & operator<<(std::ostream & os, NewLineAndDepth_ const & nlad_)
        return os;
 }
 
-///
-std::string fmt(char const * fmtstr ...);
-
 #endif

diff --git a/src/text3.C b/src/text3.C
index 7ed8bedbb1748e21c96b8c53cfbfea617e4f8fbb..baf7d7318195020b307eb2b2301d9ea5c888fa43 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -28,6 +28,7 @@
 #include "insets/insetspecialchar.h"
 #include "insets/insettext.h"
 
+using std::endl;
 
 extern string current_layout;
 
@@ -114,7 +115,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                bv->finishChange();
                break;
 
-       case LFUN_WORDRIGHT: 
+       case LFUN_WORDRIGHT:
                if (!selection.mark())
                        bv->beforeChange(this);
                update(bv, false);
@@ -763,7 +764,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
                if (!clip.empty()) {
                        if (cmd.argument == "paragraph")
                                insertStringAsParagraphs(bv, clip);
-                       else 
+                       else
                                insertStringAsLines(bv, clip);
                        clearSelection();
                        update(bv);