cleanup some debug messages

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

diff --git a/src/ChangeLog b/src/ChangeLog
index cf344a934f929dd6c435048f7fda2c6439a85682..cd425edf9314bea7ff158c903aacaa92bd74a729 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-19  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * cursor.C (goUpDown): comment out some debug messages.
+
+       * counters.C (newCounter): make error messages more explicit
+       (these appear with some textclasses like beamer)
+
 2006-01-18  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * kbmap.C (defkey): 

diff --git a/src/counters.C b/src/counters.C
index 2ef261a3d99924e7720af960eeca8e3d230ac28d..573eeb63c35ee7311eb709a70727c1263a74ad91 100644 (file)
--- a/src/counters.C
+++ b/src/counters.C
@@ -81,7 +81,7 @@ void Counters::newCounter(string const & newc)
        CounterList::iterator const cit = counterList.find(newc);
        // if already exist give warning and return
        if (cit != counterList.end()) {
-               lyxerr << "The new counter already exists." << endl;
+               lyxerr << "New counter already exists: " << newc << endl;
                return;
        }
        counterList[newc];
@@ -94,14 +94,14 @@ void Counters::newCounter(string const & newc, string const & masterc)
        CounterList::iterator const cit = counterList.find(newc);
        // if already existant give warning and return
        if (cit != counterList.end()) {
-               lyxerr << "The new counter already exists." << endl;
+               lyxerr << "New counter already exists: " << newc << endl;
                return;
        }
        // then check if masterc exists
        CounterList::iterator const it = counterList.find(masterc);
        // if not give warning and return
        if (it == counterList.end()) {
-               lyxerr << "The master counter does not exist." << endl;
+               lyxerr << "Master counter does not exist: " << masterc << endl;
                return;
        }
 

diff --git a/src/cursor.C b/src/cursor.C
index 040458224330d1bfcd5ef1dca200095957c24997..a17317858194b3897017b8601d3a778e48c19568 100644 (file)
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -1019,10 +1019,10 @@ bool LCursor::goUpDown(bool up)
 
        // try to find an inset that knows better then we
        while (true) {
-               lyxerr << "updown: We are in " << &inset() << " idx: " << idx() << endl;
+               //lyxerr << "updown: We are in " << &inset() << " idx: " << idx() << endl;
                // ask inset first
                if (inset().idxUpDown(*this, up)) {
-                       lyxerr << "idxUpDown triggered" << endl;
+                       //lyxerr << "idxUpDown triggered" << endl;
                        // try to find best position within this inset
                        if (!selection())
                                setCursor(bruteFind2(*this, xo, yo));
@@ -1031,14 +1031,14 @@ bool LCursor::goUpDown(bool up)
 
                // no such inset found, just take something "above"
                if (!popLeft()) {
-                       lyxerr << "updown: popleft failed (strange case)" << endl;
+                       //lyxerr << "updown: popleft failed (strange case)" << endl;
                        int ylow  = up ? 0 : yo + 1;
                        int yhigh = up ? yo - 1 : bv().workHeight();
                        return bruteFind(*this, xo, yo, 0, bv().workWidth(), ylow, yhigh);
                }
 
                // any improvement so far?
-               lyxerr << "updown: popLeft succeeded" << endl;
+               //lyxerr << "updown: popLeft succeeded" << endl;
                int xnew;
                int ynew;
                getPos(xnew, ynew);

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index bbaf84e32fe97d2d3cbb8c83f750262f9959ce9f..8ca9244e0af6b4c98f8fe26fec9e7d9009b80c20 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-19  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * QLyXKeySym.C (initEncodings): make debug messages conditional on
+       KEY. 
+
 2006-01-08  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * ui/QRefDialogBase.ui: re-connect the refsLB->Selected signal

diff --git a/src/frontends/qt2/QLyXKeySym.C b/src/frontends/qt2/QLyXKeySym.C
index d15b87d747b062a2e3ef1978755fcef7ebbfecee..c6106a3cc57f3de20d2bcc2645d089626236ccd1 100644 (file)
--- a/src/frontends/qt2/QLyXKeySym.C
+++ b/src/frontends/qt2/QLyXKeySym.C
@@ -90,7 +90,7 @@ void initEncodings()
 
        if (s.find("UTF") != string::npos || s.find("utf") != string::npos) 
        //if (contains(c, "UTF") || contains(c, "utf"))
-               lyxerr << "Warning: this system's locale uses Unicode." << endl;
+               lyxerr[Debug::KEY]  << "Warning: this system's locale uses Unicode." << endl;
 
        // strip off any encoding suffix
        string::size_type i = s.find(".");
@@ -118,7 +118,7 @@ void initEncodings()
 
        // when no document open
        // use the appropriate encoding for the system language
-       lyxerr << "Language code:" << s << endl;
+       lyxerr[Debug::KEY] << "Language code:" << s << endl;
        for (Languages::const_iterator it=languages.begin(); it != languages.end(); ++it) {
                //lyxerr << it->second.code() << ":" << it->second.encodingStr() << ":" << it->second.encoding() << endl;
                if (it->second.code() == s) {
@@ -126,7 +126,7 @@ void initEncodings()
                        break;
                }
        }
-       lyxerr << "Setting new locale for Qt:" << s << endl;
+       lyxerr[Debug::KEY]  << "Setting new encoding for Qt:" << s << endl;
        QTextCodec * defaultCodec = encoding_map[s];
        encoding_map[""] = defaultCodec;
 

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 1b4af4926fe18d4f24b431020753f42effb8ae11..c211ed81abe9a3855af4b5238be32873c5453b23 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -421,7 +421,7 @@ string const InsetTabular::editMessage() const
 
 void InsetTabular::edit(LCursor & cur, bool left)
 {
-       lyxerr << "InsetTabular::edit: " << this << endl;
+       //lyxerr << "InsetTabular::edit: " << this << endl;
        finishUndo();
        cur.selection() = false;
        cur.push(*this);