small lyxerr fix, version to 1.4.0pre1

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

diff --git a/ChangeLog b/ChangeLog
index 627e32ee557c84f63774ed59110bd8cf43c7b587..8a65585900935863291312c7975b182647ebedf9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-18  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * configure.ac: set version to 1.4.0pre1
+
 2005-07-18  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * README: 

diff --git a/configure.ac b/configure.ac
index db689d8fae088c029939851b3731b2da2d6837cc..fecc88e735c833e7c4964bbe191d9fb5970d01bb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(lyx,1.4.0cvs,lyx-devel@lists.lyx.org)
+AC_INIT(lyx,1.4.0pre1,lyx-devel@lists.lyx.org)
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.C)
 AM_CONFIG_HEADER([src/config.h])
@@ -8,7 +8,7 @@ AM_CONFIG_HEADER([src/config.h])
 AC_CONFIG_AUX_DIR(config)
 
 PACKAGE=lyx${program_suffix}
-VERSION="1.4.0cvs"
+VERSION="1.4.0pre1"
 LYX_CHECK_VERSION
 
 dnl default maintainer mode to true for development versions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2ee30da2a4f5e0aa50a594ac8cdb91670a0bb244..f31a7fc6264e12ff97ad18639cd955d18c9d0ba8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-18  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * messages.C: supress some lyxerr messages
+
 2005-07-18  Juergen Vigna  <jug@lyx.org>
 
        * text.C (drawSelection): honor boundary when asking for cursorX.

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 304cda4495f52e180e86fc89693cb00c4d1cbafc..3740a04da23351607a66ad5cc62eab2511767fcf 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-18  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * insetbase.C (edit,editXY,index): supress some lyxerr messages
+
 2005-07-18  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * insettabular.C (doDispatch): try to fix handling of cursor UP/DOWN.

diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C
index 580739f316b86ce12e51def56cc256a967c669b9..4d4ab1565e797c920b6c5aad1a8d8db9a1977481 100644 (file)
--- a/src/insets/insetbase.C
+++ b/src/insets/insetbase.C
@@ -181,13 +181,16 @@ bool InsetBase::getStatus(LCursor &, FuncRequest const & cmd,
 
 void InsetBase::edit(LCursor &, bool)
 {
-       lyxerr << "InsetBase: edit left/right" << std::endl;
+       lyxerr[Debug::INSETS] << BOOST_CURRENT_FUNCTION
+                              << ": edit left/right" << std::endl;
 }
 
 
 InsetBase * InsetBase::editXY(LCursor &, int x, int y)
 {
-       lyxerr << "InsetBase: editXY x:" << x << " y: " << y << std::endl;
+       lyxerr[Debug::INSETS] << BOOST_CURRENT_FUNCTION
+                              << ": x=" << x << " y= " << y
+                              << std::endl;
        return this;
 }
 
@@ -195,9 +198,11 @@ InsetBase * InsetBase::editXY(LCursor &, int x, int y)
 InsetBase::idx_type InsetBase::index(row_type row, col_type col) const
 {
        if (row != 0)
-               lyxerr << "illegal row: " << row << std::endl;
+               lyxerr << BOOST_CURRENT_FUNCTION
+                       << ": illegal row: " << row << std::endl;
        if (col != 0)
-               lyxerr << "illegal col: " << col << std::endl;
+               lyxerr << BOOST_CURRENT_FUNCTION
+                       << ": illegal col: " << col << std::endl;
        return 0;
 }
 

diff --git a/src/messages.C b/src/messages.C
index 9c7a8deb5942eef00e800d40273869a87191862a..7c9db6142bd1c0bdf1c84f01198935838664e532 100644 (file)
--- a/src/messages.C
+++ b/src/messages.C
@@ -91,7 +91,8 @@ public:
                // strip off any encoding suffix, i.e., assume 8-bit po files
                string::size_type i = lang_.find(".");
                lang_ = lang_.substr(0, i);
-               lyxerr << "Messages: language(" << lang_ << ")" << std::endl;
+               lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION
+                                     << ": language(" << lang_ << ")" << std::endl;
        }
 
        ~Pimpl() {}
@@ -121,10 +122,12 @@ public:
                char const * c = bindtextdomain(PACKAGE, package().locale_dir().c_str());
                int e = errno;
                if (e) {
-                       lyxerr << "Error code: " << errno << std::endl;
-                       lyxerr << "Lang, mess: " << lang_ << " " << m << std::endl;
-                       lyxerr << "Directory:  " << package().locale_dir() << std::endl;
-                       lyxerr << "Rtn value:  " << c << std::endl;
+                       lyxerr[Debug::DEBUG]
+                                << BOOST_CURRENT_FUNCTION << '\n'
+                                << "Error code: " << errno << '\n'
+                                << "Lang, mess: " << lang_ << " " << m << '\n'
+                                << "Directory : " << package().locale_dir() << '\n'
+                                << "Rtn value : " << c << std::endl;
                }
                textdomain(PACKAGE);
                const char* msg = gettext(m.c_str());