Trivial bits

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 4991e6f937cf1d26e49453f04e721979b80db704..6872786a18972486137e8c2b63c98a8ac0779fcd 100644 (file)
--- 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  <leeming@lyx.org>
+
+       * iconpalette.C (resizeEvent): compile fix.
+
+       * QInclude.C (update_contents): remove lyxerr call.
+
 2002-09-08  John Levon  <levon@movementarian.org>
 
        * qfont_loader.C: fix bug 531 (emph())
- 
+
 2002-09-08  John Levon  <levon@movementarian.org>
 
        * QMathDialog.C:

diff --git a/src/frontends/qt2/QInclude.C b/src/frontends/qt2/QInclude.C
index f78696cf531a842be784fb140f9c3b4dbb932a77..e0bcbccf01e397ec2c16520b709b6b3cd372b8d9 100644 (file)
--- 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 6141bfbdce79f967b14edd814e74c71872775e8d..5136c2c33c834eea5cd00ec92e0e45fe50f9c18f 100644 (file)
--- 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;