From 17674b902d210b610dc5e8001b3e50ca417500ba Mon Sep 17 00:00:00 2001
From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= <larsbj@gullik.org>
Date: Thu, 24 Aug 2000 23:10:28 +0000
Subject: [PATCH] up the LYX_FORMAT

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@986 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog               |  8 ++++++++
 src/ToolbarDefaults.C   |  2 +-
 src/buffer.C            |  3 ++-
 src/frontends/Menubar.C |  4 +++-
 src/frontends/Menubar.h |  1 +
 src/frontends/Toolbar.C | 13 +++++++++----
 src/lyx_gui.C           | 14 +++++++-------
 7 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9077ac84b5..54b1b4eaf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-08-25  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+	* some whitespace and comment changes.
+	
+	* src/lyx_gui.C (LyXGUI): use C++ style casts instead of C ones.
+
+	* src/buffer.C: up te LYX_FORMAT to 2.17
+
 2000-08-23  Juergen Vigna  <jug@sad.it>
 
 	* src/BufferView_pimpl.C (tripleClick): disable this when in a
diff --git a/src/ToolbarDefaults.C b/src/ToolbarDefaults.C
index 1a40c510b8..9c9d6eba7f 100644
--- a/src/ToolbarDefaults.C
+++ b/src/ToolbarDefaults.C
@@ -21,7 +21,7 @@
 #include "debug.h"
 #include "lyxlex.h"
 #if 1
-// only until we don't need access tot he NEW_INSETS or NEW_TABULAR anymore
+// only until we don't need access to the NEW_INSETS or NEW_TABULAR anymore
 #include "lyxparagraph.h"
 #endif
 
diff --git a/src/buffer.C b/src/buffer.C
index 742aad7b79..536f3c165a 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -110,7 +110,7 @@ extern void MenuExport(Buffer *, string const &);
 extern LyXAction lyxaction;
 
 
-static const float LYX_FORMAT = 2.16;
+static const float LYX_FORMAT = 2.17;
 
 extern int tex_code_break_column;
 
@@ -1099,6 +1099,7 @@ bool Buffer::readFile(LyXLex & lex, LyXParagraph * par)
 			format = lex.GetFloat();
 			if (format > 1) {
 				if (LYX_FORMAT - format > 0.05) {
+					
 					printf(_("Warning: need lyxformat %.2f but found %.2f\n"),
 					       LYX_FORMAT, format);
 				}
diff --git a/src/frontends/Menubar.C b/src/frontends/Menubar.C
index 3d74bf86dc..9404465d13 100644
--- a/src/frontends/Menubar.C
+++ b/src/frontends/Menubar.C
@@ -22,7 +22,8 @@
 
 using std::endl;
 
-Menubar::Menubar(LyXView * o, MenuBackend const &md)
+
+Menubar::Menubar(LyXView * o, MenuBackend const & md)
 {
 	pimpl_ = new Pimpl(o, md);
 }
@@ -45,6 +46,7 @@ void Menubar::openByName(string const & name)
 	pimpl_->openByName(name);
 }
 
+
 void Menubar::update()
 {
 	pimpl_->update();
diff --git a/src/frontends/Menubar.h b/src/frontends/Menubar.h
index 595ad77cec..f212798af8 100644
--- a/src/frontends/Menubar.h
+++ b/src/frontends/Menubar.h
@@ -46,6 +46,7 @@ public:
 	struct Pimpl;
 	friend struct Pimpl;
 private:
+	///
 	Pimpl * pimpl_;
 };
 #endif
diff --git a/src/frontends/Toolbar.C b/src/frontends/Toolbar.C
index dc2b46b5ab..7bf23601a3 100644
--- a/src/frontends/Toolbar.C
+++ b/src/frontends/Toolbar.C
@@ -67,23 +67,27 @@ void Toolbar::deactivate()
 	pimpl_->deactivate();
 }
 
+
 void Toolbar::update()
 {
 	pimpl_->update();
 }
 
 
-void Toolbar::setLayout(int layout) {
+void Toolbar::setLayout(int layout)
+{
 	pimpl_->setLayout(layout);
 }
 
 
-void Toolbar::updateLayoutList(bool force) {
+void Toolbar::updateLayoutList(bool force)
+{
 	pimpl_->updateLayoutList(force);
 }
 
 		
-void Toolbar::openLayoutList() {
+void Toolbar::openLayoutList()
+{
 	pimpl_->openLayoutList();
 }
 
@@ -96,7 +100,8 @@ void Toolbar::clearLayoutList()
 
 void Toolbar::push(int nth)
 {
-	pimpl_->push(nth);}
+	pimpl_->push(nth);
+}
 
 
 void Toolbar::add(string const & func, bool doclean)
diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 04d4c32f1c..3a90ea93fb 100644
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -102,7 +102,7 @@ int LyX_XErrHandler(Display * display, XErrorEvent * xeev)
 
 
 LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
-  : _owner(owner), lyxViews(0)
+	: _owner(owner), lyxViews(0)
 {
 	gui = GUI;
 	if (!gui)
@@ -114,12 +114,12 @@ LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
 	fl_initialize(argc, argv, "LyX", cmdopt, num_res);
 	fl_get_app_resources(res, num_res);
 
-	static const int geometryBitmask = XParseGeometry( geometry,
-                                                           &xpos,
-                                                           &ypos,
-                                                           (unsigned int *) &width,
-                                                           (unsigned int *) &height
-                                                         );
+	static const int geometryBitmask =
+		XParseGeometry( geometry,
+				&xpos,
+				&ypos,
+				reinterpret_cast<unsigned int *>(&width),
+				reinterpret_cast<unsigned int *>(&height));
 
 	Display * display = fl_get_display();
 	if (!display) {
-- 
2.39.2