From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Mon, 27 Sep 2004 00:08:33 +0000 (+0000)
Subject: add a const, use boost::assert
X-Git-Tag: 1.6.10~14995
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=026310cdb5bf2f7816f6262771bc6725f651ebb2;p=features.git

add a const, use boost::assert


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

diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index da09431f41..362747435a 100644
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-27  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* GXpmBtnTbl.C (construct): use Boost.Assert
+
+	* GToolbar.C (update): make items const
+
 2004-09-27  John Spray  <spray_john@users.sourceforge.net>
 
 	* GBC.C: Don't let the button controller set the label on GTK+
diff --git a/src/frontends/gtk/GToolbar.C b/src/frontends/gtk/GToolbar.C
index d27042cf37..d049872b78 100644
--- a/src/frontends/gtk/GToolbar.C
+++ b/src/frontends/gtk/GToolbar.C
@@ -269,7 +269,7 @@ void GToolbar::show(bool)
 
 void GToolbar::update()
 {
-	int items = toolbar_.get_n_items();
+	int const items = toolbar_.get_n_items();
 
 	for (int i = 0; i < items; ++i) {
 		Gtk::ToolItem * item = toolbar_.get_nth_item(i);
diff --git a/src/frontends/gtk/GXpmBtnTbl.C b/src/frontends/gtk/GXpmBtnTbl.C
index 53a6f5ef09..0db5c88306 100644
--- a/src/frontends/gtk/GXpmBtnTbl.C
+++ b/src/frontends/gtk/GXpmBtnTbl.C
@@ -14,7 +14,7 @@
 
 #include <gtkmm.h>
 
-#include <cassert>
+#include <boost/assert.hpp>
 
 
 void GXpmBtnTbl::GXpmBtn::setXpm(XpmData xpm)
@@ -65,10 +65,10 @@ GXpmBtnTbl::~GXpmBtnTbl()
 
 void GXpmBtnTbl::construct()
 {
-	assert(rows_);
-	assert(cols_);
+	BOOST_ASSERT(rows_);
+	BOOST_ASSERT(cols_);
 	btns_.reset(new GXpmBtn[rows_ * cols_]);
-	assert(btns_.get());
+	BOOST_ASSERT(btns_.get());
 
 	for (int row = 0; row < rows_; ++row)
 		for (int col = 0; col < cols_; ++col) {