And here a patch which removes a lot of
warning about performance and some
signed/unsigned mismatches.
Peter
Index: DepTable.C
===================================================================
--- DepTable.C (Revision 13994)
+++ DepTable.C (Arbeitskopie)
@@ -253,5 +253,5 @@
}
deplist[nome] = di;
}
- return deplist.size();
+ return deplist.size() != 0;
}
Index: insets/insetbox.C
===================================================================
--- insets/insetbox.C (Revision 13994)
+++ insets/insetbox.C (Arbeitskopie)
@@ -545,7 +545,7 @@
token = lex.getString();
if (token == "has_inner_box") {
lex.next();
- inner_box = lex.getInteger();
+ inner_box = lex.getInteger() != 0;
} else {
lyxerr << "InsetBox::Read: Missing 'has_inner_box'-tag!" <<
endl;
lex.pushToken(token);
@@ -569,7 +569,7 @@
token = lex.getString();
if (token == "use_parbox") {
lex.next();
- use_parbox = lex.getInteger();
+ use_parbox = lex.getInteger() != 0;
} else {
lyxerr << "InsetBox::Read: Missing 'use_parbox'-tag!" << endl;
lex.pushToken(token);
Index: debug.h
===================================================================
--- debug.h (Revision 13994)
+++ debug.h (Arbeitskopie)
@@ -82,7 +82,7 @@
};
static bool match(type a, type b) {
- return (a & b);
+ return (a & b) != 0;
}
/** A function to convert symbolic string names on debug levels
Index: BufferView_pimpl.C
===================================================================
--- BufferView_pimpl.C (Revision 13994)
+++ BufferView_pimpl.C (Arbeitskopie)
@@ -708,8 +708,8 @@
theCoords.startUpdating();
// First drawing step
- ViewMetricsInfo vi = metrics(flags & Update::SinglePar);
- bool forceupdate(flags & (Update::Force | Update::SinglePar));
+ ViewMetricsInfo vi = metrics((flags & Update::SinglePar) != 0);
+ bool forceupdate((flags & (Update::Force | Update::SinglePar))
!= 0);
if ((flags & Update::FitCursor) && fitCursor()) {
forceupdate = true;
Index: Bidi.C
===================================================================
--- Bidi.C (Revision 13994)
+++ Bidi.C (Arbeitskopie)
@@ -188,9 +188,9 @@
return false;
}
- bool const rtl = level(pos - 1) % 2;
+ bool const rtl = (level(pos - 1) % 2) != 0;
bool const rtl2 = inRange(pos)
- ? level(pos) % 2
+ ? (level(pos) % 2) != 0
: par.isRightToLeftPar(buf.params());
return rtl != rtl2;
}
@@ -204,7 +204,7 @@
bool const rtl = font.isVisibleRightToLeft();
bool const rtl2 = inRange(pos)
- ? level(pos) % 2
+ ? (level(pos) % 2) != 0
: par.isRightToLeftPar(buf.params());
return rtl != rtl2;
}
Index: mathed/math_scriptinset.C
===================================================================
--- mathed/math_scriptinset.C (Revision 13994)
+++ mathed/math_scriptinset.C (Arbeitskopie)
@@ -325,7 +325,7 @@
bool MathScriptInset::has(bool up) const
{
- return idxOfScript(up);
+ return idxOfScript(up) != 0;
}
@@ -333,7 +333,7 @@
{
//lyxerr << "1up: " << bool(cell_1_is_up_) << endl;
//lyxerr << "hasUp: " << bool(idxOfScript(true)) << endl;
- return idxOfScript(true);
+ return idxOfScript(true) != 0;
}
@@ -341,7 +341,7 @@
{
//lyxerr << "1up: " << bool(cell_1_is_up_) << endl;
//lyxerr << "hasDown: " << bool(idxOfScript(false)) << endl;
- return idxOfScript(false);
+ return idxOfScript(false) != 0;
}
Index: mathed/math_extern.C
===================================================================
--- mathed/math_extern.C (Revision 13994)
+++ mathed/math_extern.C (Arbeitskopie)
@@ -202,7 +202,7 @@
{
istringstream is(charSequence(ar.begin(), ar.end()));
is >> i;
- return is;
+ return is != 0;
}
@@ -210,7 +210,7 @@
{
istringstream is(charSequence(ar.begin(), ar.end()));
is >> d;
- return is;
+ return is != 0;
}
Index: mathed/math_factory.C
===================================================================
--- mathed/math_factory.C (Revision 13994)
+++ mathed/math_factory.C (Arbeitskopie)
@@ -379,5 +379,5 @@
if (ar.size() != 1)
return false;
- return ar[0].nucleus();
+ return ar[0].nucleus() != 0;
}
Index: mathed/math_mathmlstream.h
===================================================================
--- mathed/math_mathmlstream.h (Revision 13994)
+++ mathed/math_mathmlstream.h (Arbeitskopie)
@@ -42,7 +42,7 @@
///
bool fragile() const { return fragile_; }
///
- bool latex() const { return latex_; }
+ bool latex() const { return latex_ != 0; }
///
std::ostream & os() { return os_; }
///
Index: mathed/math_support.C
===================================================================
--- mathed/math_support.C (Revision 13994)
+++ mathed/math_support.C (Arbeitskopie)
@@ -630,7 +630,7 @@
bool isFontName(string const & name)
{
- return lookupFont(name);
+ return lookupFont(name) != 0;
}
Index: paragraph_pimpl.h
===================================================================
--- paragraph_pimpl.h (Revision 13994)
+++ paragraph_pimpl.h (Arbeitskopie)
@@ -61,7 +61,7 @@
/// reject change
void rejectChange(lyx::pos_type start, lyx::pos_type end);
/// are we tracking changes ?
- bool tracking() const { return changes_.get(); }
+ bool tracking() const { return changes_.get() != 0; }
///
value_type getChar(lyx::pos_type pos) const;
Index: lyxfunc.C
===================================================================
--- lyxfunc.C (Revision 13994)
+++ lyxfunc.C (Arbeitskopie)
@@ -426,7 +426,7 @@
break;
case LFUN_LAYOUT_TABULAR:
- enable = cur.innerInsetOfType(InsetBase::TABULAR_CODE);
+ enable = cur.innerInsetOfType(InsetBase::TABULAR_CODE) != 0;
break;
case LFUN_LAYOUT:
@@ -524,7 +524,7 @@
else if (name == "vclog")
enable = buf->lyxvc().inUse();
else if (name == "view-source")
- enable = buf;
+ enable = buf != 0;
break;
}
Index: format.C
===================================================================
--- format.C (Revision 13994)
+++ format.C (Arbeitskopie)
@@ -111,7 +111,7 @@
{
if (name_.empty())
return false;
- return isdigit(name_[name_.length() - 1]);
+ return isdigit(name_[name_.length() - 1]) != 0;
}
Index: FuncStatus.C
===================================================================
--- FuncStatus.C (Revision 13994)
+++ FuncStatus.C (Arbeitskopie)
@@ -74,9 +74,9 @@
bool FuncStatus::onoff(bool b) const
{
if (b)
- return (v_ & ON);
+ return (v_ & ON) != 0;
else
- return (v_ & OFF);
+ return (v_ & OFF) != 0;
}
Index: bufferparams.C
===================================================================
--- bufferparams.C (Revision 13994)
+++ bufferparams.C (Arbeitskopie)
@@ -482,7 +482,7 @@
if (tok == "\\selected") {
lex.next();
if (branch_ptr)
-
branch_ptr->setSelected(lex.getInteger());
+
branch_ptr->setSelected(lex.getInteger() != 0);
}
// not yet operational
if (tok == "\\color") {
Index: frontends/qt4/QLPainter.C
===================================================================
--- frontends/qt4/QLPainter.C (Revision 13994)
+++ frontends/qt4/QLPainter.C (Arbeitskopie)
@@ -227,7 +227,7 @@
QString str;
str.setLength(ls);
- for (int i = 0; i < ls; ++i)
+ for (size_t i = 0; i < ls; ++i)
// Brain-dead MSVC wants at(i) rather than operator[]
str[i] = QChar(encoding->ucs(s[i]));
// HACK: QT3 refuses to show single compose characters
Index: frontends/qt4/QPrefsDialog.C
===================================================================
--- frontends/qt4/QPrefsDialog.C (Revision 13994)
+++ frontends/qt4/QPrefsDialog.C (Arbeitskopie)
@@ -537,7 +537,7 @@
void PrefColors::apply(LyXRC & rc) const
{
- for (int i = 0; i < lcolors_.size(); ++i) {
+ for (size_t i = 0; i < lcolors_.size(); ++i) {
if (prefcolors_[i]!=newcolors_[i])
form_->controller().setColor(lcolors_[i],
fromqstr(newcolors_[i]));
}
Index: frontends/qt4/QRef.C
===================================================================
--- frontends/qt4/QRef.C (Revision 13994)
+++ frontends/qt4/QRef.C (Arbeitskopie)
@@ -197,7 +197,7 @@
dialog_->refsLW->setCurrentRow(lastref);
dialog_->refsLW->clearSelection();
} else
- for (unsigned int i = 0; i < dialog_->refsLW->count(); ++i) {
+ for (int i = 0; i < dialog_->refsLW->count(); ++i) {
if (tmp == dialog_->refsLW->item(i)->text()) {
QListWidgetItem * const item =
dialog_->refsLW->item(i);
dialog_->refsLW->setItemSelected(item, true);
Index: frontends/controllers/ControlParagraph.C
===================================================================
--- frontends/controllers/ControlParagraph.C (Revision 13994)
+++ frontends/controllers/ControlParagraph.C (Arbeitskopie)
@@ -98,7 +98,7 @@
} else if (token == "\\aligndefault") {
aligndefault_ = static_cast<LyXAlignment>(Int);
} else {
- ininset_ = Int;
+ ininset_ = Int != 0;
}
}
if (nset != 3) {
Index: frontends/controllers/ButtonPolicies.h
===================================================================
--- frontends/controllers/ButtonPolicies.h (Revision 13994)
+++ frontends/controllers/ButtonPolicies.h (Arbeitskopie)
@@ -202,7 +202,7 @@
time to check that all the states have corresponding outputs.
*/
virtual bool buttonStatus(Button button) const {
- return button & outputs_[state_];
+ return (button & outputs_[state_] ) != 0;
}
/// Are we in a read-only state?
virtual bool isReadOnly() const {
@@ -239,7 +239,7 @@
virtual void input(SMInput);
/// Activation status of a button.
virtual bool buttonStatus(Button button) const {
- return button & outputs_[state_];
+ return (button & outputs_[state_]) != 0;
}
/// Are we in a read-only state?
virtual bool isReadOnly() const {
@@ -284,7 +284,7 @@
virtual void input(SMInput);
/// Activation status of a button.
virtual bool buttonStatus(Button button) const {
- return button & outputs_[state_];
+ return (button & outputs_[state_]) != 0;
}
/// Are we in a read-only state?
virtual bool isReadOnly() const {
@@ -327,7 +327,7 @@
virtual void input(SMInput);
/// Activation status of a button.
virtual bool buttonStatus(Button button) const {
- return button & outputs_[state_];
+ return (button & outputs_[state_])!= 0;
}
/// Are we in a read-only state?
virtual bool isReadOnly() const {
@@ -363,7 +363,7 @@
virtual void input(SMInput);
/// Activation status of a button.
virtual bool buttonStatus(Button button) const {
- return button & outputs_[state_];
+ return (button & outputs_[state_])!= 0;
}
/// Are we in a read-only state?
virtual bool isReadOnly() const {
@@ -396,7 +396,7 @@
virtual void input(SMInput);
/// Activation status of a button.
virtual bool buttonStatus(Button button) const {
- return button & outputs_[state_];
+ return (button & outputs_[state_]) != 0;
}
/// Are we in a read-only state?
virtual bool isReadOnly() const {
@@ -430,7 +430,7 @@
virtual void input(SMInput);
/// Activation status of a button.
virtual bool buttonStatus(Button button) const {
- return button & outputs_[state_];
+ return (button & outputs_[state_]) != 0;
}
/// Are we in a read-only state?
virtual bool isReadOnly() const {
Index: lyxlayout.C
===================================================================
--- lyxlayout.C (Revision 13994)
+++ lyxlayout.C (Arbeitskopie)
@@ -426,17 +426,17 @@
case LT_FILL_TOP: // fill top flag
if (lexrc.next())
- fill_top = lexrc.getInteger();
+ fill_top = lexrc.getInteger() != 0;
break;
case LT_FILL_BOTTOM: // fill bottom flag
if (lexrc.next())
- fill_bottom = lexrc.getInteger();
+ fill_bottom = lexrc.getInteger() != 0;
break;
case LT_NEWLINE: // newlines allowed?
if (lexrc.next())
- newline_allowed = lexrc.getInteger();
+ newline_allowed = lexrc.getInteger() != 0;
break;
case LT_ALIGN: // paragraph align
@@ -468,12 +468,12 @@
case LT_FREE_SPACING: // Allow for free spacing.
if (lexrc.next())
- free_spacing = lexrc.getInteger();
+ free_spacing = lexrc.getInteger() != 0;
break;
case LT_PASS_THRU: // Allow for pass thru.
if (lexrc.next())
- pass_thru = lexrc.getInteger();
+ pass_thru = lexrc.getInteger() != 0;
break;
case LT_SPACING: // setspace.sty
Index: lyxtextclass.C
===================================================================
--- lyxtextclass.C (Revision 13994)
+++ lyxtextclass.C (Arbeitskopie)
@@ -1062,7 +1062,7 @@
bool LyXTextClass::provides(LyXTextClass::Provides p) const
{
- return provides_ & p;
+ return (provides_ & p) != 0;
}
Index: encoding.C
===================================================================
--- encoding.C (Revision 13994)
+++ encoding.C (Arbeitskopie)
@@ -341,7 +341,7 @@
for (unsigned int i = 0; i < 256; ++i) {
lex.next();
string const tmp = lex.getString();
- table[i] = ::strtol(tmp.c_str(), 0 , 16);
+ table[i] =
static_cast<Uchar>(::strtol(tmp.c_str(), 0 , 16));
}
encodinglist[name] = Encoding(name, latexname, table);
if (lex.lex() != et_end)
