diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 4991e6f937..6872786a18 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -111,10 +111,16 @@ * QFloatDialog.C: * ui/QFloatDialog.ui: fix bug 527 and more +2002-09-12 Angus Leeming + + * iconpalette.C (resizeEvent): compile fix. + + * QInclude.C (update_contents): remove lyxerr call. + 2002-09-08 John Levon * qfont_loader.C: fix bug 531 (emph()) - + 2002-09-08 John Levon * QMathDialog.C: diff --git a/src/frontends/qt2/QInclude.C b/src/frontends/qt2/QInclude.C index f78696cf53..e0bcbccf01 100644 --- a/src/frontends/qt2/QInclude.C +++ b/src/frontends/qt2/QInclude.C @@ -55,8 +55,6 @@ void QInclude::update_contents() dialog_->visiblespaceCB->setChecked(false); dialog_->visiblespaceCB->setEnabled(false); - lyxerr << cmdname << endl; - if (cmdname == "input") dialog_->typeCO->setCurrentItem(0); else if (!cmdname.empty()) { diff --git a/src/frontends/qt2/iconpalette.C b/src/frontends/qt2/iconpalette.C index 6141bfbdce..5136c2c33c 100644 --- a/src/frontends/qt2/iconpalette.C +++ b/src/frontends/qt2/iconpalette.C @@ -72,7 +72,7 @@ void IconPalette::resizeEvent(QResizeEvent * e) return; int cols(width() / button_size); - int rows = max(buttons_.size() / cols, 1U); + int rows = max(int(buttons_.size() / cols), 1); if (buttons_.size() % cols) ++rows;