Angus' patch to comment out debug mode's coloured frames

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2792 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2001-09-24 12:48:31 +00:00
parent 9c6e6a958a
commit 207bc5e3f4
6 changed files with 297 additions and 17 deletions

View File

@ -354,3 +354,292 @@ Tuukka:
:: Not a bug. It's allowed by LaTeX and there might be other reasons for
:: putting labels there. I won't add extra code to disable this.
Jean-Marc:
// cxx: Info: ../../../lyx-devel/src/mathed/array.C, line 98: conversion to
// integral type of smaller size could lose data (D:intconlosbit)
// return bf_.size();
// ---------------^
// cxx: Info: ../../../lyx-devel/src/mathed/formula.h, line 56:
// "void InsetFormula::write(std::ostream &) const" does not match
// "Inset::write" -- virtual function override intended? (D:nonfundec)
// void write(std::ostream &) const;
// -------------^
:: not a bug
// cxx: Info: ../../../lyx-devel/src/mathed/formula.h, line 58:
// "void InsetFormula::read(LyXLex &)" does not match "Inset::read" --
// virtual function override intended? (D:nonfundec)
// void read(LyXLex & lex);
// -------------^
:: not a bug
:: etc.
cxx: Info: ../../../lyx-devel/src/mathed/math_gridinset.h, line 94:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
int ncols() const { return colinfo_.size(); }
-----------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_gridinset.h, line 96:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
int nrows() const { return rowinfo_.size(); }
-----------------------------------^
// cxx: Info: ../../../lyx-devel/src/mathed/formulabase.C, line 63: function
// "<unnamed>::mathed_init_fonts" was declared but never referenced
// (D:declbutnotref)
// void mathed_init_fonts();
// -----^
//cxx: Info: ../../../lyx-devel/src/mathed/formulabase.C, line 65: function
// "<unnamed>::nicelabel" was declared but never referenced
// (D:declbutnotref)
//string nicelabel(string const & label)
//-------^
-----------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_gridinset.h, line 94:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
int ncols() const { return colinfo_.size(); }
-----------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_gridinset.h, line 96:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
int nrows() const { return rowinfo_.size(); }
-----------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_cursor.C, line 176:
label "__Unreachable1" was declared but never referenced
(D:declbutnotref)
lyxerr << "MC: " << what << "\n";
--------^
cxx: Warning: ../../../lyx-devel/src/mathed/math_cursor.C, line 193: statement
is unreachable (D:codeunreachable)
lyxerr << "\n\n\n=================vvvvvvvvvvvvv======================= "
--------^
cxx: Info: ../../../lyx-devel/src/mathed/math_cursor.C, line 193:
label "__Unreachable2" was declared but never referenced
(D:declbutnotref)
lyxerr << "\n\n\n=================vvvvvvvvvvvvv======================= "
--------^
cxx: Info: ../../../lyx-devel/src/mathed/math_cursor.C, line 351:
controlling expression is constant (D:boolexprconst)
while (1) {
---------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_cursor.C, line 597: conversion
to integral type of smaller size could lose data (D:intconlosbit)
pos() = pos() - s.size();
----------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_cursor.C, line 828: conversion
to integral type of smaller size could lose data (D:intconlosbit)
for (int i = Cursor_.size() - 1; i >= 0; --i) {
---------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_cursor.C, line 1049:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
return p ? p->valign() : 0;
---------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_cursor.C, line 1057:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
return p ? p->halign(idx % p->ncols()) : 0;
---------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_cursor.C, line 109: function
"<unnamed>::operator<<" was declared but never referenced
(D:declbutnotref)
std::ostream & operator<<(std::ostream & os, MathCursorPos const & p)
---------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_fracinset.h, line 30: type
qualifier on return type is meaningless (D:nousetypqualret)
char const name() const;
-------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_macro.h, line 54:
"void MathMacro::dump(std::ostream &) const" does not match
"MathInset::dump" -- virtual function override intended?
(D:nonfundec)
void dump(std::ostream & os) const;
-------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_macro.h, line 54:
"void MathMacro::dump(std::ostream &) const" does not match
"MathNestInset::dump" -- virtual function override intended?
(D:nonfundec)
void dump(std::ostream & os) const;
-------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_factory.C, line 29: conversion
to integral type of smaller size could lose data (D:intconlosbit)
return new MathSpecialCharInset(l->id);
------------------------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_fracinset.h, line 30: type
qualifier on return type is meaningless (D:nousetypqualret)
char const name() const;
-------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_gridinset.h, line 94:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
int ncols() const { return colinfo_.size(); }
-----------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_gridinset.h, line 96:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
int nrows() const { return rowinfo_.size(); }
-----------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_gridinset.C, line 71:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
int n = hh.size();
----------------^
cxx: Info: ../../../lyx-devel/src/mathed/../lyxlex.h, line 32: access
control not specified ("private" by default) (D:misaccspe)
class LyXLex : boost::noncopyable {
---------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_hash.C, line 177: conversion
to integral type of smaller size could lose data (D:intconlosbit)
tmp.token = tokenEnum(lex.getString());
----------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_hash.C, line 179: conversion
to integral type of smaller size could lose data (D:intconlosbit)
tmp.latex_font_id = lex.getInteger();
------------------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_macro.h, line 54:
"void MathMacro::dump(std::ostream &) const" does not match
"MathInset::dump" -- virtual function override intended?
(D:nonfundec)
void dump(std::ostream & os) const;
-------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_macro.h, line 54:
"void MathMacro::dump(std::ostream &) const" does not match
"MathNestInset::dump" -- virtual function override intended?
(D:nonfundec)
void dump(std::ostream & os) const;
-------------^
cxx: Info: ../../../lyx-devel/src/mathed/../layout.h, line 554: access
control not specified ("private" by default) (D:misaccspe)
class LyXTextClassList : boost::noncopyable {
-------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_macro.C, line 122: conversion
to integral type of smaller size could lose data (D:intconlosbit)
str[1] += i;
------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_macro.C, line 101:
variable "col" was set but never used (D:setbutnotused)
LColor::color col;
----------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_macro.h, line 54:
"void MathMacro::dump(std::ostream &) const" does not match
"MathInset::dump" -- virtual function override intended?
(D:nonfundec)
void dump(std::ostream & os) const;
-------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_macro.h, line 54:
"void MathMacro::dump(std::ostream &) const" does not match
"MathNestInset::dump" -- virtual function override intended?
(D:nonfundec)
void dump(std::ostream & os) const;
-------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_macroarg.C, line 21:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
str_[1] = '0' + n;
----------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_macro.h, line 54:
"void MathMacro::dump(std::ostream &) const" does not match
"MathInset::dump" -- virtual function override intended?
(D:nonfundec)
void dump(std::ostream & os) const;
-------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_macro.h, line 54:
"void MathMacro::dump(std::ostream &) const" does not match
"MathNestInset::dump" -- virtual function override intended?
(D:nonfundec)
void dump(std::ostream & os) const;
-------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_gridinset.h, line 94:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
int ncols() const { return colinfo_.size(); }
-----------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_gridinset.h, line 96:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
int nrows() const { return rowinfo_.size(); }
-----------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/../layout.h, line 554: access
control not specified ("private" by default) (D:misaccspe)
class LyXTextClassList : boost::noncopyable {
-------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_matrixinset.C, line 40:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
return it - array.begin();
-------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_nestinset.C, line 16:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
return cells_.size();
---------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_gridinset.h, line 94:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
int ncols() const { return colinfo_.size(); }
-----------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_gridinset.h, line 96:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
int nrows() const { return rowinfo_.size(); }
-----------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_macro.h, line 54:
"void MathMacro::dump(std::ostream &) const" does not match
"MathInset::dump" -- virtual function override intended?
(D:nonfundec)
void dump(std::ostream & os) const;
-------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_macro.h, line 54:
"void MathMacro::dump(std::ostream &) const" does not match
"MathNestInset::dump" -- virtual function override intended?
(D:nonfundec)
void dump(std::ostream & os) const;
-------------^
cxx: Info: ../../../lyx-devel/src/mathed/../lyxlex.h, line 32: access
control not specified ("private" by default) (D:misaccspe)
class LyXLex : boost::noncopyable {
---------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_parser.C, line 60: conversion
to integral type of smaller size could lose data (D:intconlosbit)
unsigned n = s.size();
---------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_parser.C, line 437:
controlling expression is constant (D:boolexprconst)
for (int row = 0; true; ++row) {
--------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_parser.C, line 786: conversion
to integral type of smaller size could lose data (D:intconlosbit)
MathArrayInset * m = new MathArrayInset(halign.size(), 1);
------------------------------------------------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_parser.C, line 804:
controlling expression is constant (D:boolexprconst)
while (1) {
-------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_gridinset.h, line 94:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
int ncols() const { return colinfo_.size(); }
-----------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_gridinset.h, line 96:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
int nrows() const { return rowinfo_.size(); }
-----------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_symbolinset.C, line 75:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
mathed_char_dim(code2(), size_, sym_->id,
------------------------------------------------^
cxx: Info: ../../../lyx-devel/src/mathed/math_symbolinset.C, line 92:
conversion to integral type of smaller size could lose data
(D:intconlosbit)
drawChar(pain, code2(), size_, x, y, sym_->id);
-----------------------------------------------------^

View File

@ -57,8 +57,7 @@ public:
///
void read(LyXLex & lex);
///
int latex(std::ostream &,
bool fragile, bool free_spc) const;
int latex(std::ostream &, bool fragile, bool free_spc) const;
///
int ascii(std::ostream &, int linelen) const;
///

View File

@ -60,13 +60,6 @@ int sel_x;
int sel_y;
bool sel_flag;
void mathed_init_fonts();
string nicelabel(string const & label)
{
return "(" + (label.empty() ? "#" : label) + ")";
}
void handleFont(BufferView * bv, MathTextCodes t)
{
if (mathcursor->selection())

View File

@ -49,8 +49,6 @@ public:
///
void read(LyXLex & lex);
///
void write(std::ostream & os) const;
///
int ascii(std::ostream &, int linelen) const;
///
int latex(std::ostream & os, bool fragile, bool free_spc) const;
@ -76,6 +74,8 @@ private:
MathMacroTemplate const & tmacro() const;
/// prefix in inset
string prefix() const;
///
void write(std::ostream & os) const;
};
#endif

View File

@ -171,16 +171,15 @@ MathInset * MathCursor::parInset(int i) const
void MathCursor::dump(char const * what) const
{
return;
#if 0
lyxerr << "MC: " << what << "\n";
for (unsigned i = 0; i < Cursor_.size(); ++i)
lyxerr << " i: " << i
<< " pos: " << Cursor_[i].pos_
<< " idx: " << Cursor_[i].idx_
<< " par: " << Cursor_[i].par_ << "\n";
//lyxerr << " sel: " << selection_ << " data: " << array() << "\n";
#endif
}

View File

@ -98,7 +98,7 @@ void MathMacro::draw(Painter & pain, int x, int y) const
metrics(size());
LColor::color col;
//LColor::color col;
if (mathcursor && mathcursor->isInside(this)) {
@ -123,10 +123,10 @@ void MathMacro::draw(Painter & pain, int x, int y) const
drawStr(pain, LM_TC_TEX, size(), x + 3, h, str);
h += std::max(c.descent(), ldes) + 5;
}
col = LColor::red;
//col = LColor::red;
} else {
expanded_.draw(pain, x + 3, y);
col = LColor::black;
//col = LColor::black;
}
//if (nargs() > 0)