From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Tue, 20 Aug 2002 17:31:23 +0000 (+0000)
Subject: compile fixes
X-Git-Tag: 1.6.10~18522
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f7927c40c8723f966c2982dc7d6cfe760e975fe9;p=lyx.git

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 6d5b383eba..c79b8d381a 100644
--- 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 1fd8ac785a..6f03941eb8 100644
--- 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 b515df300d..d8226677a1 100644
--- 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 9c066eaab3..bc106bed79 100644
--- 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 7ed8bedbb1..baf7d73181 100644
--- 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);